no message

2026-05-27 16:33:15 +08:00
parent 10ca83ce86
commit eec8d4d453
13 changed files with 922 additions and 224 deletions
--- a/Assets/_Game/Art/Environment/Animations/PostChange.controller.meta
+++ b/Assets/_Game/Art/Environment/Animations/PostChange.controller.meta
@@ -1,13 +1,2 @@
 fileFormatVersion: 2
-<<<<<<<< HEAD:Assets/Resources/Joywayer/Testings/Bosses/ChaoFeng/Fx_Dragon03_FallSmoke01.prefab.meta
-guid: f96afe6899cf6944b9b00e7f07db3e5b
-PrefabImporter:
-========
-guid: 7f2530a9712f5b046befc81fad14baeb
-NativeFormatImporter:
->>>>>>>> 0f017b70c9c361f912100f0acc2d848d7641aec1:Assets/Resources/Art/Animations/PostChange.controller.meta
-  externalObjects: {}
-  mainObjectFileID: 9100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+guid: 09baa1bf3a9c6e74e82879d04c9bf6b5
--- a/Assets/_Game/Art/Environment/Animations/PostChange01.anim.meta
+++ b/Assets/_Game/Art/Environment/Animations/PostChange01.anim.meta
@@ -1,14 +1,2 @@
 fileFormatVersion: 2
-<<<<<<<< HEAD:Assets/Scripts/Joywayer/Playable/CharacterMovement.meta
-guid: 8bf3664f0caeca14c80c229d5dd86320
-folderAsset: yes
-DefaultImporter:
-========
-guid: 59bcd4e4e1d03ac42963673db94db070
-NativeFormatImporter:
->>>>>>>> 0f017b70c9c361f912100f0acc2d848d7641aec1:Assets/Resources/Art/Animations/PostChange.anim.meta
-  externalObjects: {}
-  mainObjectFileID: 7400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+guid: 61a30b91f86e49946a373eca96a2f6fd
--- a/Assets/_Game/Art/Environment/Animations/PostChange02.anim.meta
+++ b/Assets/_Game/Art/Environment/Animations/PostChange02.anim.meta
@@ -1,8 +1,2 @@
 fileFormatVersion: 2
-guid: 7f7d76eee0f5f0a47bd6e5448a6167a5
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 7400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+guid: 7111ec1ab410ab646aebcc941d0fa95c