更新

2025-12-17 04:19:38 -05:00
parent 7c1cb7e8e1
commit d15957c719
4315 changed files with 8260710 additions and 2940 deletions
--- a/VFXs/MasterStylizedFX/Prefabs/Hit/PunchHitBlue.prefab.meta
+++ b/VFXs/MasterStylizedFX/Prefabs/Hit/PunchHitBlue.prefab.meta
@@ -0,0 +1,13 @@
+fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/MasterStylizedFX/Materials/DefaultWhite.mat.meta
+guid: 206618aad9894104183fe33ff4e7183e
+NativeFormatImporter:
+========
+guid: 6280e8f4a796a83438e50bf21981e66b
+PrefabImporter:
+>>>>>>>> 196b627 (加入闪电，以及更新击中):Assets/MasterStylizedFX/Prefabs/Hit/PunchHitBlue.prefab.meta
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: