Merge branch 'oh/10171' of http://git.eoxnet.com/pan/heros into oh/10171

2025-11-12 14:46:29 +08:00
parent 86cd78e3c2 1915ffce8a
commit 60ca6f1d14
79 changed files with 4957 additions and 36 deletions
--- a/assets/resources/game/skill/atk/atk_f1.prefab
+++ b/assets/resources/game/skill/atk/atk_f1.prefab
@@ -175,10 +175,7 @@
      "b": 255,
      "a": 255
    },
-    "_spriteFrame": {
-      "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@c1e30",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_spriteFrame": null,
    "_type": 0,
    "_fillType": 0,
    "_sizeMode": 0,
--- a/assets/resources/game/skill/atk/atk_s4.prefab
+++ b/assets/resources/game/skill/atk/atk_s4.prefab
@@ -175,10 +175,7 @@
      "b": 255,
      "a": 255
    },
-    "_spriteFrame": {
-      "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@c1e30",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_spriteFrame": null,
    "_type": 0,
    "_fillType": 0,
    "_sizeMode": 0,