From 511459c66c1b1b6904fc771cb3bc9f20fa83aa8d Mon Sep 17 00:00:00 2001 From: walkpan Date: Sun, 5 Jan 2025 09:10:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E8=83=BD=E5=8A=A8=E7=94=BB=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/resources/game/heros/a1.prefab | 686 +- assets/resources/game/heros/a2.prefab | 262 +- assets/resources/game/heros/a3.prefab | 288 +- assets/resources/game/heros/a4.prefab | 288 +- assets/resources/game/heros/animtor/atk.anim | 30 - .../game/heros/animtor/atk.anim.meta | 1 - assets/resources/game/heros/animtor/idle.anim | 30 - .../game/heros/animtor/idle.anim.meta | 1 - assets/resources/game/heros/animtor/max.anim | 30 - .../game/heros/animtor/max.anim.meta | 1 - assets/resources/game/heros/animtor/move.anim | 30 - .../game/heros/animtor/move.anim.meta | 1 - assets/resources/game/heros/animtor/up.prefab | 104 +- assets/resources/game/heros/cz1.prefab | 283 +- assets/resources/game/heros/d1.prefab | 283 +- assets/resources/game/heros/d2.prefab | 283 +- assets/resources/game/heros/ft1.prefab | 261 +- assets/resources/game/heros/h1.prefab | 261 +- assets/resources/game/heros/ice1.prefab | 261 +- assets/resources/game/heros/k1.prefab | 283 +- assets/resources/game/heros/k2.prefab | 261 +- assets/resources/game/heros/k3.prefab | 261 +- assets/resources/game/heros/k5.prefab | 261 +- assets/resources/game/heros/m1.prefab | 261 +- assets/resources/game/heros/m3.prefab | 261 +- assets/resources/game/heros/mgem1.prefab | 261 +- assets/resources/game/heros/mgem2.prefab | 261 +- assets/resources/game/heros/mgem3.prefab | 261 +- assets/resources/game/heros/mor1.prefab | 261 +- assets/resources/game/heros/mor2.prefab | 261 +- assets/resources/game/heros/mor3.prefab | 261 +- assets/resources/game/heros/n1.prefab | 283 +- assets/resources/game/heros/pld1.prefab | 261 +- .../{shaders.meta => game/skills/anm.meta} | 2 +- assets/resources/game/skills/anm/ab.anim | 100 + assets/resources/game/skills/anm/ab.anim.meta | 13 + assets/resources/game/skills/anm/bwind.anim | 229 + .../resources/game/skills/anm/bwind.anim.meta | 13 + assets/resources/game/skills/anm/fires.anim | 209 + .../resources/game/skills/anm/fires.anim.meta | 13 + assets/resources/game/skills/anm/ice.anim | 120 + .../resources/game/skills/anm/ice.anim.meta | 13 + assets/resources/game/skills/arrow.prefab | 4 +- .../resources/game/skills/arrow_bule.prefab | 387 + .../game/skills/arrow_bule.prefab.meta | 13 + .../resources/game/skills/arrow_yellow.prefab | 387 + .../game/skills/arrow_yellow.prefab.meta | 13 + assets/resources/game/skills/atked-001.prefab | 200 + .../game/skills/atked-001.prefab.meta | 13 + assets/resources/game/skills/atked.prefab | 221 +- assets/resources/game/skills/atked/atked.anim | 407 +- .../resources/game/skills/atked/slash9.atlas | 34 + .../slash9.atlas.meta} | 2 +- .../resources/game/skills/atked/slash9.json | 47 + .../slash9.json.meta} | 2 +- assets/resources/game/skills/atked/slash9.png | Bin 0 -> 17174 bytes .../slash9.png.meta} | 10 +- assets/resources/game/skills/base/xiexia.anim | 130 +- assets/resources/game/skills/buff.prefab | 115 +- .../resources/game/skills/buff/buffshow.anim | 200 + .../game/skills/buff/buffshow.anim.meta | 13 + assets/resources/game/skills/buff1.prefab | 284 + .../resources/game/skills/buff1.prefab.meta | 13 + assets/resources/game/skills/buff2.prefab | 268 + .../resources/game/skills/buff2.prefab.meta | 13 + assets/resources/game/skills/bwind.prefab | 526 + .../resources/game/skills/bwind.prefab.meta | 13 + assets/resources/game/skills/dadao.prefab | 250 +- assets/resources/game/skills/fire.prefab | 99 +- assets/resources/game/skills/fire/bs.anim | 100 + .../resources/game/skills/fire/bs.anim.meta | 13 + .../game/skills/fire/buff_fire.atlas | 41 - .../resources/game/skills/fire/buff_fire.json | 47 - .../resources/game/skills/fire/buff_fire.png | Bin 124923 -> 0 bytes .../game/skills/fire/dbaoz.atlas.txt | 139 + .../game/skills/fire/dbaoz.atlas.txt.meta | 11 + assets/resources/game/skills/fire/dbaoz.json | 1234 ++ .../dbaoz.json.meta} | 2 +- assets/resources/game/skills/fire/dbaoz.png | Bin 0 -> 41970 bytes .../dbaoz.png.meta} | 10 +- assets/resources/game/skills/fires.prefab | 526 + .../resources/game/skills/fires.prefab.meta | 13 + .../resources/game/skills/heath/jiaxue.anim | 609 +- assets/resources/game/skills/heathed.prefab | 15 +- assets/resources/game/skills/ice.meta | 9 - assets/resources/game/skills/ice.prefab | 101 +- .../game/skills/ice/buff_thunder.atlas | 41 - .../game/skills/ice/buff_thunder.atlas.meta | 12 - .../game/skills/ice/buff_thunder.json | 47 - .../game/skills/ice/buff_thunder.png | Bin 155631 -> 0 bytes assets/resources/game/skills/iced.prefab | 483 +- assets/resources/game/skills/skills.plist | 4230 +++++- .../resources/game/skills/skills.plist.meta | 11168 +++++++++++++++- assets/resources/game/skills/skills.png | Bin 116863 -> 512225 bytes assets/resources/game/skills/yun.prefab | 26 +- assets/resources/materials.meta | 9 - .../resources/materials/hit-flash-white.mtl | 32 - .../materials/hit-flash-white.mtl.meta | 1 - assets/resources/materials/inline-glow.mtl | 41 - .../resources/materials/inline-glow.mtl.meta | 11 - .../builtin-sprite-hit-flash-white.effect | 97 - ...builtin-sprite-hit-flash-white.effect.meta | 15 - .../shaders/builtin-sprite-inline-glow.effect | 172 - .../builtin-sprite-inline-glow.effect.meta | 11 - assets/script/Main.ts | 6 +- assets/script/game/common/config/SkillSet.ts | 57 +- assets/script/game/common/config/heroSet.ts | 10 +- assets/script/game/hero/BuffComp.ts | 37 +- assets/script/game/hero/HeroViewComp.ts | 94 +- assets/script/game/map/HeroHomeComp.ts | 14 +- assets/script/game/map/MissionHomeComp.ts | 2 +- assets/script/game/skills/LineCom.ts | 26 +- assets/script/game/skills/Skill.ts | 27 +- assets/script/game/skills/SkillCom.ts | 11 +- assets/script/game/skills/TgCom.ts | 30 + assets/script/game/skills/TgCom.ts.meta | 9 + assets/script/game/skills/timedCom.ts | 20 + assets/script/game/skills/timedCom.ts.meta | 1 + 118 files changed, 22272 insertions(+), 8796 deletions(-) delete mode 100644 assets/resources/game/heros/animtor/atk.anim delete mode 100644 assets/resources/game/heros/animtor/atk.anim.meta delete mode 100644 assets/resources/game/heros/animtor/idle.anim delete mode 100644 assets/resources/game/heros/animtor/idle.anim.meta delete mode 100644 assets/resources/game/heros/animtor/max.anim delete mode 100644 assets/resources/game/heros/animtor/max.anim.meta delete mode 100644 assets/resources/game/heros/animtor/move.anim delete mode 100644 assets/resources/game/heros/animtor/move.anim.meta rename assets/resources/{shaders.meta => game/skills/anm.meta} (70%) create mode 100644 assets/resources/game/skills/anm/ab.anim create mode 100644 assets/resources/game/skills/anm/ab.anim.meta create mode 100644 assets/resources/game/skills/anm/bwind.anim create mode 100644 assets/resources/game/skills/anm/bwind.anim.meta create mode 100644 assets/resources/game/skills/anm/fires.anim create mode 100644 assets/resources/game/skills/anm/fires.anim.meta create mode 100644 assets/resources/game/skills/anm/ice.anim create mode 100644 assets/resources/game/skills/anm/ice.anim.meta create mode 100644 assets/resources/game/skills/arrow_bule.prefab create mode 100644 assets/resources/game/skills/arrow_bule.prefab.meta create mode 100644 assets/resources/game/skills/arrow_yellow.prefab create mode 100644 assets/resources/game/skills/arrow_yellow.prefab.meta create mode 100644 assets/resources/game/skills/atked-001.prefab create mode 100644 assets/resources/game/skills/atked-001.prefab.meta create mode 100644 assets/resources/game/skills/atked/slash9.atlas rename assets/resources/game/skills/{fire/buff_fire.atlas.meta => atked/slash9.atlas.meta} (73%) create mode 100644 assets/resources/game/skills/atked/slash9.json rename assets/resources/game/skills/{fire/buff_fire.json.meta => atked/slash9.json.meta} (72%) create mode 100644 assets/resources/game/skills/atked/slash9.png rename assets/resources/game/skills/{fire/buff_fire.png.meta => atked/slash9.png.meta} (71%) create mode 100644 assets/resources/game/skills/buff/buffshow.anim create mode 100644 assets/resources/game/skills/buff/buffshow.anim.meta create mode 100644 assets/resources/game/skills/buff1.prefab create mode 100644 assets/resources/game/skills/buff1.prefab.meta create mode 100644 assets/resources/game/skills/buff2.prefab create mode 100644 assets/resources/game/skills/buff2.prefab.meta create mode 100644 assets/resources/game/skills/bwind.prefab create mode 100644 assets/resources/game/skills/bwind.prefab.meta create mode 100644 assets/resources/game/skills/fire/bs.anim create mode 100644 assets/resources/game/skills/fire/bs.anim.meta delete mode 100644 assets/resources/game/skills/fire/buff_fire.atlas delete mode 100644 assets/resources/game/skills/fire/buff_fire.json delete mode 100644 assets/resources/game/skills/fire/buff_fire.png create mode 100644 assets/resources/game/skills/fire/dbaoz.atlas.txt create mode 100644 assets/resources/game/skills/fire/dbaoz.atlas.txt.meta create mode 100644 assets/resources/game/skills/fire/dbaoz.json rename assets/resources/game/skills/{ice/buff_thunder.json.meta => fire/dbaoz.json.meta} (72%) create mode 100644 assets/resources/game/skills/fire/dbaoz.png rename assets/resources/game/skills/{ice/buff_thunder.png.meta => fire/dbaoz.png.meta} (71%) create mode 100644 assets/resources/game/skills/fires.prefab create mode 100644 assets/resources/game/skills/fires.prefab.meta delete mode 100644 assets/resources/game/skills/ice.meta delete mode 100644 assets/resources/game/skills/ice/buff_thunder.atlas delete mode 100644 assets/resources/game/skills/ice/buff_thunder.atlas.meta delete mode 100644 assets/resources/game/skills/ice/buff_thunder.json delete mode 100644 assets/resources/game/skills/ice/buff_thunder.png delete mode 100644 assets/resources/materials.meta delete mode 100644 assets/resources/materials/hit-flash-white.mtl delete mode 100644 assets/resources/materials/hit-flash-white.mtl.meta delete mode 100644 assets/resources/materials/inline-glow.mtl delete mode 100644 assets/resources/materials/inline-glow.mtl.meta delete mode 100644 assets/resources/shaders/builtin-sprite-hit-flash-white.effect delete mode 100644 assets/resources/shaders/builtin-sprite-hit-flash-white.effect.meta delete mode 100644 assets/resources/shaders/builtin-sprite-inline-glow.effect delete mode 100644 assets/resources/shaders/builtin-sprite-inline-glow.effect.meta create mode 100644 assets/script/game/skills/TgCom.ts create mode 100644 assets/script/game/skills/TgCom.ts.meta create mode 100644 assets/script/game/skills/timedCom.ts create mode 100644 assets/script/game/skills/timedCom.ts.meta diff --git a/assets/resources/game/heros/a1.prefab b/assets/resources/game/heros/a1.prefab index 79a78aa1..412f306d 100644 --- a/assets/resources/game/heros/a1.prefab +++ b/assets/resources/game/heros/a1.prefab @@ -34,50 +34,44 @@ "__id__": 37 }, { - "__id__": 50 + "__id__": 68 }, { - "__id__": 59 + "__id__": 77 }, { - "__id__": 69 + "__id__": 91 }, { - "__id__": 78 + "__id__": 100 }, { - "__id__": 86 - }, - { - "__id__": 94 - }, - { - "__id__": 102 + "__id__": 109 } ], "_active": true, "_components": [ - { - "__id__": 110 - }, - { - "__id__": 112 - }, - { - "__id__": 114 - }, - { - "__id__": 116 - }, { "__id__": 118 }, { "__id__": 120 + }, + { + "__id__": 122 + }, + { + "__id__": 124 + }, + { + "__id__": 126 + }, + { + "__id__": 128 } ], "_prefab": { - "__id__": 122 + "__id__": 130 }, "_lpos": { "__type__": "cc.Vec3", @@ -747,6 +741,33 @@ }, { "__id__": 48 + }, + { + "__id__": 50 + }, + { + "__id__": 52 + }, + { + "__id__": 54 + }, + { + "__id__": 56 + }, + { + "__id__": 58 + }, + { + "__id__": 60 + }, + { + "__id__": 62 + }, + { + "__id__": 64 + }, + { + "__id__": 66 } ], "removedComponents": [] @@ -865,6 +886,195 @@ "dfDOq9MhxDoay0LMIRMSnQ" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 51 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": -17.5, + "y": 17.5, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f60pl2DlJHe6zROFPhESAb" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 53 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 17.5, + "y": 17.5, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "6bjiVyWdBBN7a7lOHtLLD8" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 55 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": -17.5, + "y": 49.5, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "61mV3EVoRKSqEzNf4Jad08" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 57 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 17.5, + "y": 49.5, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "ecvY99Eo5C/rTXtT/OP/IO" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 59 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": -17.5, + "y": 81.5, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f84+vnF/VEqYDK3tF0QuGp" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 61 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 17.5, + "y": 81.5, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "caZq97Sx5I7YS9d1NCXwnN" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 63 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": -17.5, + "y": 113.5, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "6eVlyjXGxOpaWylzxjBKt9" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 65 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 17.5, + "y": 113.5, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "23G4FX3a9EFo2aB6kZKTBQ" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 67 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": -17.5, + "y": 145.5, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "11Pq/Z8VFIsKq4V6G/f3kU" + ] + }, { "__type__": "cc.Node", "_objFlags": 0, @@ -872,14 +1082,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 51 + "__id__": 69 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 50 + "__id__": 68 }, "asset": { "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", @@ -887,7 +1097,7 @@ }, "fileId": "0d6ZXmA5dHkZxoGONDL2sE", "instance": { - "__id__": 52 + "__id__": 70 }, "targetOverrides": null }, @@ -901,19 +1111,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 53 + "__id__": 71 }, { - "__id__": 55 + "__id__": 73 }, { - "__id__": 56 + "__id__": 74 }, { - "__id__": 57 + "__id__": 75 }, { - "__id__": 58 + "__id__": 76 } ], "removedComponents": [] @@ -921,7 +1131,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 54 + "__id__": 72 }, "propertyPath": [ "_name" @@ -937,7 +1147,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 54 + "__id__": 72 }, "propertyPath": [ "_lpos" @@ -952,7 +1162,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 54 + "__id__": 72 }, "propertyPath": [ "_lrot" @@ -968,7 +1178,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 54 + "__id__": 72 }, "propertyPath": [ "_euler" @@ -983,7 +1193,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 54 + "__id__": 72 }, "propertyPath": [ "_active" @@ -997,14 +1207,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 60 + "__id__": 78 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 59 + "__id__": 77 }, "asset": { "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", @@ -1012,7 +1222,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 61 + "__id__": 79 }, "targetOverrides": null }, @@ -1026,22 +1236,28 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 62 + "__id__": 80 }, { - "__id__": 64 + "__id__": 82 }, { - "__id__": 65 + "__id__": 83 }, { - "__id__": 66 + "__id__": 84 }, { - "__id__": 67 + "__id__": 85 }, { - "__id__": 68 + "__id__": 86 + }, + { + "__id__": 87 + }, + { + "__id__": 89 } ], "removedComponents": [] @@ -1049,7 +1265,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 63 + "__id__": 81 }, "propertyPath": [ "_name" @@ -1065,7 +1281,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 63 + "__id__": 81 }, "propertyPath": [ "_lpos" @@ -1080,7 +1296,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 63 + "__id__": 81 }, "propertyPath": [ "_lrot" @@ -1096,7 +1312,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 63 + "__id__": 81 }, "propertyPath": [ "_euler" @@ -1111,7 +1327,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 63 + "__id__": 81 }, "propertyPath": [ "_lscale" @@ -1126,13 +1342,45 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 63 + "__id__": 81 }, "propertyPath": [ "_active" ], "value": false }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 88 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "bczw9AVWRKvbioC0BzckLA" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 90 + }, + "propertyPath": [ + "_active" + ], + "value": true + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "87+cbUTwZOXIIFCkVHG/aJ" + ] + }, { "__type__": "cc.Node", "_objFlags": 0, @@ -1140,14 +1388,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 70 + "__id__": 92 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 91 }, "asset": { "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", @@ -1155,7 +1403,7 @@ }, "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { - "__id__": 71 + "__id__": 93 }, "targetOverrides": null }, @@ -1169,19 +1417,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 72 + "__id__": 94 }, { - "__id__": 74 + "__id__": 96 }, { - "__id__": 75 + "__id__": 97 }, { - "__id__": 76 + "__id__": 98 }, { - "__id__": 77 + "__id__": 99 } ], "removedComponents": [] @@ -1189,7 +1437,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 73 + "__id__": 95 }, "propertyPath": [ "_name" @@ -1205,7 +1453,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 73 + "__id__": 95 }, "propertyPath": [ "_lpos" @@ -1220,7 +1468,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 73 + "__id__": 95 }, "propertyPath": [ "_lrot" @@ -1236,7 +1484,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 73 + "__id__": 95 }, "propertyPath": [ "_euler" @@ -1251,7 +1499,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 73 + "__id__": 95 }, "propertyPath": [ "_active" @@ -1265,14 +1513,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 79 + "__id__": 101 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 78 + "__id__": 100 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1280,7 +1528,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 80 + "__id__": 102 }, "targetOverrides": null }, @@ -1294,16 +1542,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 81 + "__id__": 103 }, { - "__id__": 83 + "__id__": 105 }, { - "__id__": 84 + "__id__": 106 }, { - "__id__": 85 + "__id__": 107 + }, + { + "__id__": 108 } ], "removedComponents": [] @@ -1311,7 +1562,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 82 + "__id__": 104 }, "propertyPath": [ "_name" @@ -1327,7 +1578,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 82 + "__id__": 104 }, "propertyPath": [ "_lpos" @@ -1342,7 +1593,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 82 + "__id__": 104 }, "propertyPath": [ "_lrot" @@ -1358,7 +1609,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 82 + "__id__": 104 }, "propertyPath": [ "_euler" @@ -1370,6 +1621,16 @@ "z": 0 } }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 104 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, { "__type__": "cc.Node", "_objFlags": 0, @@ -1377,14 +1638,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 87 + "__id__": 110 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 86 + "__id__": 109 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1392,7 +1653,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 88 + "__id__": 111 }, "targetOverrides": null }, @@ -1406,16 +1667,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 89 + "__id__": 112 }, { - "__id__": 91 + "__id__": 114 }, { - "__id__": 92 + "__id__": 115 }, { - "__id__": 93 + "__id__": 116 + }, + { + "__id__": 117 } ], "removedComponents": [] @@ -1423,7 +1687,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 90 + "__id__": 113 }, "propertyPath": [ "_name" @@ -1439,7 +1703,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 90 + "__id__": 113 }, "propertyPath": [ "_lpos" @@ -1454,7 +1718,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 90 + "__id__": 113 }, "propertyPath": [ "_lrot" @@ -1470,7 +1734,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 90 + "__id__": 113 }, "propertyPath": [ "_euler" @@ -1482,229 +1746,15 @@ "z": 0 } }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 95 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 94 - }, - "asset": { - "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408", - "__expectedType__": "cc.Prefab" - }, - "fileId": "d9UYSvjCpD24d1H7HhaHEv", - "instance": { - "__id__": 96 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "0ewDiapJpAYLaWH2R6lXxr", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 100 - }, - { - "__id__": 101 - } - ], - "removedComponents": [] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 98 + "__id__": 113 }, "propertyPath": [ - "_name" + "_active" ], - "value": "iced" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "d9UYSvjCpD24d1H7HhaHEv" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 98 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 98 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 98 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 103 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 102 - }, - "asset": { - "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d", - "__expectedType__": "cc.Prefab" - }, - "fileId": "afovdb7bBEUpz+8xJHMv4X", - "instance": { - "__id__": 104 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "6b9aHiCxROPbUBWUnq7xb+", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 105 - }, - { - "__id__": 107 - }, - { - "__id__": 108 - }, - { - "__id__": 109 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_name" - ], - "value": "yun" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "afovdb7bBEUpz+8xJHMv4X" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 87.398, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } + "value": false }, { "__type__": "cc.UITransform", @@ -1716,7 +1766,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 111 + "__id__": 119 }, "_contentSize": { "__type__": "cc.Size", @@ -1744,7 +1794,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 113 + "__id__": 121 }, "enabledContactListener": true, "bullet": true, @@ -1778,7 +1828,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 115 + "__id__": 123 }, "tag": 0, "_group": 4, @@ -1812,7 +1862,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 117 + "__id__": 125 }, "anm": { "__id__": 22 @@ -1833,7 +1883,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 119 + "__id__": 127 }, "_id": "" }, @@ -1851,7 +1901,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 121 + "__id__": 129 }, "_id": "" }, @@ -1872,25 +1922,19 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 102 + "__id__": 109 }, { - "__id__": 94 + "__id__": 100 }, { - "__id__": 86 + "__id__": 91 }, { - "__id__": 78 + "__id__": 77 }, { - "__id__": 69 - }, - { - "__id__": 59 - }, - { - "__id__": 50 + "__id__": 68 }, { "__id__": 37 diff --git a/assets/resources/game/heros/a2.prefab b/assets/resources/game/heros/a2.prefab index c6379130..dd1b9064 100644 --- a/assets/resources/game/heros/a2.prefab +++ b/assets/resources/game/heros/a2.prefab @@ -47,37 +47,31 @@ }, { "__id__": 84 - }, - { - "__id__": 92 - }, - { - "__id__": 100 } ], "_active": true, "_components": [ { - "__id__": 108 + "__id__": 92 }, { - "__id__": 110 + "__id__": 94 }, { - "__id__": 112 + "__id__": 96 }, { - "__id__": 114 + "__id__": 98 }, { - "__id__": 116 + "__id__": 100 }, { - "__id__": 118 + "__id__": 102 } ], "_prefab": { - "__id__": 120 + "__id__": 104 }, "_lpos": { "__type__": "cc.Vec3", @@ -1463,230 +1457,6 @@ "z": 0 } }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 93 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 92 - }, - "asset": { - "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408", - "__expectedType__": "cc.Prefab" - }, - "fileId": "d9UYSvjCpD24d1H7HhaHEv", - "instance": { - "__id__": 94 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "19vIMfRaJFYqJrmnPMgqT7", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 98 - }, - { - "__id__": 99 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 96 - }, - "propertyPath": [ - "_name" - ], - "value": "iced" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "d9UYSvjCpD24d1H7HhaHEv" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 96 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 96 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 96 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 101 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 100 - }, - "asset": { - "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d", - "__expectedType__": "cc.Prefab" - }, - "fileId": "afovdb7bBEUpz+8xJHMv4X", - "instance": { - "__id__": 102 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "ec2znuxyxNpKybyUExk/2a", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 103 - }, - { - "__id__": 105 - }, - { - "__id__": 106 - }, - { - "__id__": 107 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_name" - ], - "value": "yun" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "afovdb7bBEUpz+8xJHMv4X" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 87.398, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, { "__type__": "cc.UITransform", "_name": "", @@ -1697,7 +1467,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 109 + "__id__": 93 }, "_contentSize": { "__type__": "cc.Size", @@ -1725,7 +1495,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 111 + "__id__": 95 }, "enabledContactListener": true, "bullet": true, @@ -1759,7 +1529,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 113 + "__id__": 97 }, "tag": 0, "_group": 4, @@ -1793,7 +1563,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 115 + "__id__": 99 }, "anm": { "__id__": 22 @@ -1814,7 +1584,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 117 + "__id__": 101 }, "_id": "" }, @@ -1832,7 +1602,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 119 + "__id__": 103 }, "_id": "" }, @@ -1852,12 +1622,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 100 - }, - { - "__id__": 92 - }, { "__id__": 84 }, diff --git a/assets/resources/game/heros/a3.prefab b/assets/resources/game/heros/a3.prefab index c003367c..727c799b 100644 --- a/assets/resources/game/heros/a3.prefab +++ b/assets/resources/game/heros/a3.prefab @@ -47,37 +47,31 @@ }, { "__id__": 84 - }, - { - "__id__": 93 - }, - { - "__id__": 102 } ], "_active": true, "_components": [ { - "__id__": 111 + "__id__": 93 }, { - "__id__": 113 + "__id__": 95 }, { - "__id__": 115 + "__id__": 97 }, { - "__id__": 117 + "__id__": 99 }, { - "__id__": 119 + "__id__": 101 }, { - "__id__": 121 + "__id__": 103 } ], "_prefab": { - "__id__": 123 + "__id__": 105 }, "_lpos": { "__type__": "cc.Vec3", @@ -1476,256 +1470,6 @@ ], "value": false }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 94 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 93 - }, - "asset": { - "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408", - "__expectedType__": "cc.Prefab" - }, - "fileId": "d9UYSvjCpD24d1H7HhaHEv", - "instance": { - "__id__": 95 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "12NBcnkm1MCJPEHzAM2nRn", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 99 - }, - { - "__id__": 100 - }, - { - "__id__": 101 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_name" - ], - "value": "iced" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "d9UYSvjCpD24d1H7HhaHEv" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 103 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 102 - }, - "asset": { - "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d", - "__expectedType__": "cc.Prefab" - }, - "fileId": "afovdb7bBEUpz+8xJHMv4X", - "instance": { - "__id__": 104 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "4aLAZnmcZAM7K1Wqp9ZP8J", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 105 - }, - { - "__id__": 107 - }, - { - "__id__": 108 - }, - { - "__id__": 109 - }, - { - "__id__": 110 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_name" - ], - "value": "yun" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "afovdb7bBEUpz+8xJHMv4X" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 87.398, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, { "__type__": "cc.UITransform", "_name": "", @@ -1736,7 +1480,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 94 }, "_contentSize": { "__type__": "cc.Size", @@ -1764,7 +1508,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 96 }, "enabledContactListener": true, "bullet": true, @@ -1798,7 +1542,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 98 }, "tag": 0, "_group": 4, @@ -1832,7 +1576,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 100 }, "anm": { "__id__": 22 @@ -1853,7 +1597,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 120 + "__id__": 102 }, "_id": "" }, @@ -1871,7 +1615,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 122 + "__id__": 104 }, "_id": "" }, @@ -1891,12 +1635,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 102 - }, - { - "__id__": 93 - }, { "__id__": 84 }, diff --git a/assets/resources/game/heros/a4.prefab b/assets/resources/game/heros/a4.prefab index 87183e60..6711a3b0 100644 --- a/assets/resources/game/heros/a4.prefab +++ b/assets/resources/game/heros/a4.prefab @@ -47,37 +47,31 @@ }, { "__id__": 84 - }, - { - "__id__": 93 - }, - { - "__id__": 102 } ], "_active": true, "_components": [ { - "__id__": 111 + "__id__": 93 }, { - "__id__": 113 + "__id__": 95 }, { - "__id__": 115 + "__id__": 97 }, { - "__id__": 117 + "__id__": 99 }, { - "__id__": 119 + "__id__": 101 }, { - "__id__": 121 + "__id__": 103 } ], "_prefab": { - "__id__": 123 + "__id__": 105 }, "_lpos": { "__type__": "cc.Vec3", @@ -1476,256 +1470,6 @@ ], "value": false }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 94 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 93 - }, - "asset": { - "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408", - "__expectedType__": "cc.Prefab" - }, - "fileId": "d9UYSvjCpD24d1H7HhaHEv", - "instance": { - "__id__": 95 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "12NBcnkm1MCJPEHzAM2nRn", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 99 - }, - { - "__id__": 100 - }, - { - "__id__": 101 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_name" - ], - "value": "iced" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "d9UYSvjCpD24d1H7HhaHEv" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 103 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 102 - }, - "asset": { - "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d", - "__expectedType__": "cc.Prefab" - }, - "fileId": "afovdb7bBEUpz+8xJHMv4X", - "instance": { - "__id__": 104 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "4aLAZnmcZAM7K1Wqp9ZP8J", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 105 - }, - { - "__id__": 107 - }, - { - "__id__": 108 - }, - { - "__id__": 109 - }, - { - "__id__": 110 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_name" - ], - "value": "yun" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "afovdb7bBEUpz+8xJHMv4X" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 87.398, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, { "__type__": "cc.UITransform", "_name": "", @@ -1736,7 +1480,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 94 }, "_contentSize": { "__type__": "cc.Size", @@ -1764,7 +1508,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 96 }, "enabledContactListener": true, "bullet": true, @@ -1798,7 +1542,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 98 }, "tag": 0, "_group": 4, @@ -1832,7 +1576,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 100 }, "anm": { "__id__": 22 @@ -1853,7 +1597,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 120 + "__id__": 102 }, "_id": "" }, @@ -1871,7 +1615,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 122 + "__id__": 104 }, "_id": "" }, @@ -1891,12 +1635,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 102 - }, - { - "__id__": 93 - }, { "__id__": 84 }, diff --git a/assets/resources/game/heros/animtor/atk.anim b/assets/resources/game/heros/animtor/atk.anim deleted file mode 100644 index 625c86ad..00000000 --- a/assets/resources/game/heros/animtor/atk.anim +++ /dev/null @@ -1,30 +0,0 @@ -[ - { - "__type__": "cc.AnimationClip", - "_name": "atk", - "_objFlags": 0, - "__editorExtras__": { - "embeddedPlayerGroups": [] - }, - "_native": "", - "sample": 32, - "speed": 1, - "wrapMode": 1, - "enableTrsBlending": false, - "_duration": 0, - "_hash": 500763545, - "_tracks": [], - "_exoticAnimation": null, - "_events": [], - "_embeddedPlayers": [], - "_additiveSettings": { - "__id__": 1 - }, - "_auxiliaryCurveEntries": [] - }, - { - "__type__": "cc.AnimationClipAdditiveSettings", - "enabled": false, - "refClip": null - } -] \ No newline at end of file diff --git a/assets/resources/game/heros/animtor/atk.anim.meta b/assets/resources/game/heros/animtor/atk.anim.meta deleted file mode 100644 index 2d9bcc6a..00000000 --- a/assets/resources/game/heros/animtor/atk.anim.meta +++ /dev/null @@ -1 +0,0 @@ -{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"679c2c1d-b22b-4836-aff5-006eae878253","files":[".cconb"],"subMetas":{},"userData":{"name":"atk"}} diff --git a/assets/resources/game/heros/animtor/idle.anim b/assets/resources/game/heros/animtor/idle.anim deleted file mode 100644 index aa91510b..00000000 --- a/assets/resources/game/heros/animtor/idle.anim +++ /dev/null @@ -1,30 +0,0 @@ -[ - { - "__type__": "cc.AnimationClip", - "_name": "idle", - "_objFlags": 0, - "__editorExtras__": { - "embeddedPlayerGroups": [] - }, - "_native": "", - "sample": 24, - "speed": 1, - "wrapMode": 2, - "enableTrsBlending": false, - "_duration": 0, - "_hash": 500763545, - "_tracks": [], - "_exoticAnimation": null, - "_events": [], - "_embeddedPlayers": [], - "_additiveSettings": { - "__id__": 1 - }, - "_auxiliaryCurveEntries": [] - }, - { - "__type__": "cc.AnimationClipAdditiveSettings", - "enabled": false, - "refClip": null - } -] \ No newline at end of file diff --git a/assets/resources/game/heros/animtor/idle.anim.meta b/assets/resources/game/heros/animtor/idle.anim.meta deleted file mode 100644 index 4f0d0e4a..00000000 --- a/assets/resources/game/heros/animtor/idle.anim.meta +++ /dev/null @@ -1 +0,0 @@ -{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"df0e2a46-c764-4dc8-88c5-14cffc8f3046","files":[".cconb"],"subMetas":{},"userData":{"name":"idle"}} diff --git a/assets/resources/game/heros/animtor/max.anim b/assets/resources/game/heros/animtor/max.anim deleted file mode 100644 index 2c061c7b..00000000 --- a/assets/resources/game/heros/animtor/max.anim +++ /dev/null @@ -1,30 +0,0 @@ -[ - { - "__type__": "cc.AnimationClip", - "_name": "max", - "_objFlags": 0, - "__editorExtras__": { - "embeddedPlayerGroups": [] - }, - "_native": "", - "sample": 24, - "speed": 1, - "wrapMode": 1, - "enableTrsBlending": false, - "_duration": 0, - "_hash": 500763545, - "_tracks": [], - "_exoticAnimation": null, - "_events": [], - "_embeddedPlayers": [], - "_additiveSettings": { - "__id__": 1 - }, - "_auxiliaryCurveEntries": [] - }, - { - "__type__": "cc.AnimationClipAdditiveSettings", - "enabled": false, - "refClip": null - } -] \ No newline at end of file diff --git a/assets/resources/game/heros/animtor/max.anim.meta b/assets/resources/game/heros/animtor/max.anim.meta deleted file mode 100644 index 7beac75b..00000000 --- a/assets/resources/game/heros/animtor/max.anim.meta +++ /dev/null @@ -1 +0,0 @@ -{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"28ead812-8e25-461e-91e9-47b2f183b9ee","files":[".cconb"],"subMetas":{},"userData":{"name":"max"}} diff --git a/assets/resources/game/heros/animtor/move.anim b/assets/resources/game/heros/animtor/move.anim deleted file mode 100644 index 4b4162c6..00000000 --- a/assets/resources/game/heros/animtor/move.anim +++ /dev/null @@ -1,30 +0,0 @@ -[ - { - "__type__": "cc.AnimationClip", - "_name": "move", - "_objFlags": 0, - "__editorExtras__": { - "embeddedPlayerGroups": [] - }, - "_native": "", - "sample": 24, - "speed": 1, - "wrapMode": 2, - "enableTrsBlending": false, - "_duration": 0, - "_hash": 500763545, - "_tracks": [], - "_exoticAnimation": null, - "_events": [], - "_embeddedPlayers": [], - "_additiveSettings": { - "__id__": 1 - }, - "_auxiliaryCurveEntries": [] - }, - { - "__type__": "cc.AnimationClipAdditiveSettings", - "enabled": false, - "refClip": null - } -] \ No newline at end of file diff --git a/assets/resources/game/heros/animtor/move.anim.meta b/assets/resources/game/heros/animtor/move.anim.meta deleted file mode 100644 index 332d24f2..00000000 --- a/assets/resources/game/heros/animtor/move.anim.meta +++ /dev/null @@ -1 +0,0 @@ -{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"5a362eb3-fb37-4af2-8c61-a0ebf620bea6","files":[".cconb"],"subMetas":{},"userData":{"name":"move"}} diff --git a/assets/resources/game/heros/animtor/up.prefab b/assets/resources/game/heros/animtor/up.prefab index 8f28b23a..100fad9a 100644 --- a/assets/resources/game/heros/animtor/up.prefab +++ b/assets/resources/game/heros/animtor/up.prefab @@ -24,6 +24,9 @@ ], "_active": false, "_components": [ + { + "__id__": 8 + }, { "__id__": 10 } @@ -62,7 +65,7 @@ }, { "__type__": "cc.Node", - "_name": "update icon", + "_name": "anm", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -76,18 +79,15 @@ }, { "__id__": 5 - }, - { - "__id__": 7 } ], "_prefab": { - "__id__": 9 + "__id__": 7 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": -13.706, "z": 0 }, "_lrot": { @@ -99,8 +99,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 1.1, + "y": 1.1, "z": 1 }, "_mobility": 0, @@ -127,19 +127,19 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 32, - "height": 32 + "width": 187.1199951171875, + "height": 208.8300018310547 }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 + "x": 0.4559106444245401, + "y": 0 }, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "59w6B4voxPLbBRJS6D/8Tw" + "fileId": "5dV3a9PoRMNJbWFElTQtRu" }, { "__type__": "cc.Sprite", @@ -159,17 +159,14 @@ "_color": { "__type__": "cc.Color", "r": 255, - "g": 224, - "b": 0, - "a": 248 - }, - "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@9bca6", - "__expectedType__": "cc.SpriteFrame" + "g": 255, + "b": 255, + "a": 255 }, + "_spriteFrame": null, "_type": 0, "_fillType": 0, - "_sizeMode": 0, + "_sizeMode": 1, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -184,36 +181,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "cdOeT0qmpIi6jldcUOUtxZ" - }, - { - "__type__": "cc.Animation", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 8 - }, - "playOnLoad": true, - "_clips": [ - { - "__uuid__": "661bbd46-b8fb-4fec-889e-66b609c100d2", - "__expectedType__": "cc.AnimationClip" - } - ], - "_defaultClip": { - "__uuid__": "661bbd46-b8fb-4fec-889e-66b609c100d2", - "__expectedType__": "cc.AnimationClip" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "60W1QqMQZFJKkr3W/Pwt6h" + "fileId": "02lt/an6hH26+wRCltUZDD" }, { "__type__": "cc.PrefabInfo", @@ -223,7 +191,7 @@ "asset": { "__id__": 0 }, - "fileId": "af1HjpKyBHG4vhWGkoGErt", + "fileId": "0bPxM5oyhJv4AXKVJ3RAro", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -238,7 +206,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 11 + "__id__": 9 }, "_contentSize": { "__type__": "cc.Size", @@ -256,6 +224,35 @@ "__type__": "cc.CompPrefabInfo", "fileId": "c4cLOq+ZBFrrQPOey6spoq" }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 11 + }, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "5b0c6934-43af-44c6-a4d5-6fa512dc5f1e", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "5b0c6934-43af-44c6-a4d5-6fa512dc5f1e", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "35/vae6axF+JYYzKSF9zBG" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -265,6 +262,7 @@ "__id__": 0 }, "fileId": "91yoyAQGNDm5ziI7NUChZ+", + "instance": null, "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/resources/game/heros/cz1.prefab b/assets/resources/game/heros/cz1.prefab index a3855b1c..6fea9048 100644 --- a/assets/resources/game/heros/cz1.prefab +++ b/assets/resources/game/heros/cz1.prefab @@ -47,37 +47,31 @@ }, { "__id__": 85 - }, - { - "__id__": 93 - }, - { - "__id__": 102 } ], "_active": true, "_components": [ { - "__id__": 111 + "__id__": 94 }, { - "__id__": 113 + "__id__": 96 }, { - "__id__": 115 + "__id__": 98 }, { - "__id__": 117 + "__id__": 100 }, { - "__id__": 119 + "__id__": 102 }, { - "__id__": 121 + "__id__": 104 } ], "_prefab": { - "__id__": 123 + "__id__": 106 }, "_lpos": { "__type__": "cc.Vec3", @@ -1410,6 +1404,9 @@ }, { "__id__": 92 + }, + { + "__id__": 93 } ], "removedComponents": [] @@ -1476,250 +1473,10 @@ "z": 0 } }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 94 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 93 - }, - "asset": { - "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408", - "__expectedType__": "cc.Prefab" - }, - "fileId": "d9UYSvjCpD24d1H7HhaHEv", - "instance": { - "__id__": 95 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "1aOY3KPddI9JOm97ykUtTp", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 99 - }, - { - "__id__": 100 - }, - { - "__id__": 101 - } - ], - "removedComponents": [] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_name" - ], - "value": "iced" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "d9UYSvjCpD24d1H7HhaHEv" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 103 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 102 - }, - "asset": { - "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d", - "__expectedType__": "cc.Prefab" - }, - "fileId": "afovdb7bBEUpz+8xJHMv4X", - "instance": { - "__id__": 104 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "04y4Hn4IZHuaXO4Pcjf6QL", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 105 - }, - { - "__id__": 107 - }, - { - "__id__": 108 - }, - { - "__id__": 109 - }, - { - "__id__": 110 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_name" - ], - "value": "yun" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "afovdb7bBEUpz+8xJHMv4X" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 87.398, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 + "__id__": 89 }, "propertyPath": [ "_active" @@ -1736,7 +1493,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 95 }, "_contentSize": { "__type__": "cc.Size", @@ -1764,7 +1521,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 97 }, "enabledContactListener": true, "bullet": true, @@ -1798,7 +1555,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 99 }, "tag": 0, "_group": 4, @@ -1832,7 +1589,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 101 }, "anm": { "__id__": 22 @@ -1853,7 +1610,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 120 + "__id__": 103 }, "_id": "" }, @@ -1871,7 +1628,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 122 + "__id__": 105 }, "_id": "" }, @@ -1891,12 +1648,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 102 - }, - { - "__id__": 93 - }, { "__id__": 85 }, diff --git a/assets/resources/game/heros/d1.prefab b/assets/resources/game/heros/d1.prefab index 3cd919c5..870ae7c8 100644 --- a/assets/resources/game/heros/d1.prefab +++ b/assets/resources/game/heros/d1.prefab @@ -47,37 +47,31 @@ }, { "__id__": 85 - }, - { - "__id__": 93 - }, - { - "__id__": 102 } ], "_active": true, "_components": [ { - "__id__": 111 + "__id__": 94 }, { - "__id__": 113 + "__id__": 96 }, { - "__id__": 115 + "__id__": 98 }, { - "__id__": 117 + "__id__": 100 }, { - "__id__": 119 + "__id__": 102 }, { - "__id__": 121 + "__id__": 104 } ], "_prefab": { - "__id__": 123 + "__id__": 106 }, "_lpos": { "__type__": "cc.Vec3", @@ -1410,6 +1404,9 @@ }, { "__id__": 92 + }, + { + "__id__": 93 } ], "removedComponents": [] @@ -1476,250 +1473,10 @@ "z": 0 } }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 94 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 93 - }, - "asset": { - "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408", - "__expectedType__": "cc.Prefab" - }, - "fileId": "d9UYSvjCpD24d1H7HhaHEv", - "instance": { - "__id__": 95 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "1aOY3KPddI9JOm97ykUtTp", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 99 - }, - { - "__id__": 100 - }, - { - "__id__": 101 - } - ], - "removedComponents": [] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_name" - ], - "value": "iced" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "d9UYSvjCpD24d1H7HhaHEv" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 103 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 102 - }, - "asset": { - "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d", - "__expectedType__": "cc.Prefab" - }, - "fileId": "afovdb7bBEUpz+8xJHMv4X", - "instance": { - "__id__": 104 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "04y4Hn4IZHuaXO4Pcjf6QL", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 105 - }, - { - "__id__": 107 - }, - { - "__id__": 108 - }, - { - "__id__": 109 - }, - { - "__id__": 110 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_name" - ], - "value": "yun" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "afovdb7bBEUpz+8xJHMv4X" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 87.398, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 + "__id__": 89 }, "propertyPath": [ "_active" @@ -1736,7 +1493,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 95 }, "_contentSize": { "__type__": "cc.Size", @@ -1764,7 +1521,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 97 }, "enabledContactListener": true, "bullet": true, @@ -1798,7 +1555,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 99 }, "tag": 0, "_group": 4, @@ -1832,7 +1589,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 101 }, "anm": { "__id__": 22 @@ -1853,7 +1610,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 120 + "__id__": 103 }, "_id": "" }, @@ -1871,7 +1628,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 122 + "__id__": 105 }, "_id": "" }, @@ -1891,12 +1648,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 102 - }, - { - "__id__": 93 - }, { "__id__": 85 }, diff --git a/assets/resources/game/heros/d2.prefab b/assets/resources/game/heros/d2.prefab index 8d7dc61d..baa89144 100644 --- a/assets/resources/game/heros/d2.prefab +++ b/assets/resources/game/heros/d2.prefab @@ -47,37 +47,31 @@ }, { "__id__": 85 - }, - { - "__id__": 93 - }, - { - "__id__": 102 } ], "_active": true, "_components": [ { - "__id__": 111 + "__id__": 94 }, { - "__id__": 113 + "__id__": 96 }, { - "__id__": 115 + "__id__": 98 }, { - "__id__": 117 + "__id__": 100 }, { - "__id__": 119 + "__id__": 102 }, { - "__id__": 121 + "__id__": 104 } ], "_prefab": { - "__id__": 123 + "__id__": 106 }, "_lpos": { "__type__": "cc.Vec3", @@ -1410,6 +1404,9 @@ }, { "__id__": 92 + }, + { + "__id__": 93 } ], "removedComponents": [] @@ -1476,250 +1473,10 @@ "z": 0 } }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 94 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 93 - }, - "asset": { - "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408", - "__expectedType__": "cc.Prefab" - }, - "fileId": "d9UYSvjCpD24d1H7HhaHEv", - "instance": { - "__id__": 95 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "1aOY3KPddI9JOm97ykUtTp", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 99 - }, - { - "__id__": 100 - }, - { - "__id__": 101 - } - ], - "removedComponents": [] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_name" - ], - "value": "iced" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "d9UYSvjCpD24d1H7HhaHEv" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 103 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 102 - }, - "asset": { - "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d", - "__expectedType__": "cc.Prefab" - }, - "fileId": "afovdb7bBEUpz+8xJHMv4X", - "instance": { - "__id__": 104 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "04y4Hn4IZHuaXO4Pcjf6QL", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 105 - }, - { - "__id__": 107 - }, - { - "__id__": 108 - }, - { - "__id__": 109 - }, - { - "__id__": 110 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_name" - ], - "value": "yun" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "afovdb7bBEUpz+8xJHMv4X" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 87.398, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 + "__id__": 89 }, "propertyPath": [ "_active" @@ -1736,7 +1493,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 95 }, "_contentSize": { "__type__": "cc.Size", @@ -1764,7 +1521,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 97 }, "enabledContactListener": true, "bullet": true, @@ -1798,7 +1555,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 99 }, "tag": 0, "_group": 4, @@ -1832,7 +1589,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 101 }, "anm": { "__id__": 22 @@ -1853,7 +1610,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 120 + "__id__": 103 }, "_id": "" }, @@ -1871,7 +1628,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 122 + "__id__": 105 }, "_id": "" }, @@ -1891,12 +1648,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 102 - }, - { - "__id__": 93 - }, { "__id__": 85 }, diff --git a/assets/resources/game/heros/ft1.prefab b/assets/resources/game/heros/ft1.prefab index da05c272..65148b40 100644 --- a/assets/resources/game/heros/ft1.prefab +++ b/assets/resources/game/heros/ft1.prefab @@ -47,37 +47,31 @@ }, { "__id__": 87 - }, - { - "__id__": 95 - }, - { - "__id__": 103 } ], "_active": true, "_components": [ { - "__id__": 111 + "__id__": 96 }, { - "__id__": 113 + "__id__": 98 }, { - "__id__": 115 + "__id__": 100 }, { - "__id__": 117 + "__id__": 102 }, { - "__id__": 119 + "__id__": 104 }, { - "__id__": 121 + "__id__": 106 } ], "_prefab": { - "__id__": 123 + "__id__": 108 }, "_lpos": { "__type__": "cc.Vec3", @@ -1429,6 +1423,9 @@ }, { "__id__": 94 + }, + { + "__id__": 95 } ], "removedComponents": [] @@ -1495,229 +1492,15 @@ "z": 0 } }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 96 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 95 - }, - "asset": { - "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408", - "__expectedType__": "cc.Prefab" - }, - "fileId": "d9UYSvjCpD24d1H7HhaHEv", - "instance": { - "__id__": 97 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "84huy4k/VOL5ykMOpg0H5B", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 101 - }, - { - "__id__": 102 - } - ], - "removedComponents": [] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 99 + "__id__": 91 }, "propertyPath": [ - "_name" + "_active" ], - "value": "iced" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "d9UYSvjCpD24d1H7HhaHEv" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 99 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 99 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 99 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 104 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 103 - }, - "asset": { - "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d", - "__expectedType__": "cc.Prefab" - }, - "fileId": "afovdb7bBEUpz+8xJHMv4X", - "instance": { - "__id__": 105 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "61izU9WRVJ255b6c6Hu27c", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 106 - }, - { - "__id__": 108 - }, - { - "__id__": 109 - }, - { - "__id__": 110 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 107 - }, - "propertyPath": [ - "_name" - ], - "value": "yun" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "afovdb7bBEUpz+8xJHMv4X" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 107 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 87.398, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 107 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 107 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } + "value": false }, { "__type__": "cc.UITransform", @@ -1729,7 +1512,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 97 }, "_contentSize": { "__type__": "cc.Size", @@ -1757,7 +1540,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 99 }, "enabledContactListener": true, "bullet": true, @@ -1791,7 +1574,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 101 }, "tag": 0, "_group": 4, @@ -1825,7 +1608,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 103 }, "anm": { "__id__": 22 @@ -1846,7 +1629,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 120 + "__id__": 105 }, "_id": "" }, @@ -1864,7 +1647,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 122 + "__id__": 107 }, "_id": "" }, @@ -1884,12 +1667,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 103 - }, - { - "__id__": 95 - }, { "__id__": 87 }, diff --git a/assets/resources/game/heros/h1.prefab b/assets/resources/game/heros/h1.prefab index d21da204..62a1a162 100644 --- a/assets/resources/game/heros/h1.prefab +++ b/assets/resources/game/heros/h1.prefab @@ -47,37 +47,31 @@ }, { "__id__": 87 - }, - { - "__id__": 95 - }, - { - "__id__": 103 } ], "_active": true, "_components": [ { - "__id__": 111 + "__id__": 96 }, { - "__id__": 113 + "__id__": 98 }, { - "__id__": 115 + "__id__": 100 }, { - "__id__": 117 + "__id__": 102 }, { - "__id__": 119 + "__id__": 104 }, { - "__id__": 121 + "__id__": 106 } ], "_prefab": { - "__id__": 123 + "__id__": 108 }, "_lpos": { "__type__": "cc.Vec3", @@ -1429,6 +1423,9 @@ }, { "__id__": 94 + }, + { + "__id__": 95 } ], "removedComponents": [] @@ -1495,229 +1492,15 @@ "z": 0 } }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 96 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 95 - }, - "asset": { - "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408", - "__expectedType__": "cc.Prefab" - }, - "fileId": "d9UYSvjCpD24d1H7HhaHEv", - "instance": { - "__id__": 97 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "84huy4k/VOL5ykMOpg0H5B", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 101 - }, - { - "__id__": 102 - } - ], - "removedComponents": [] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 99 + "__id__": 91 }, "propertyPath": [ - "_name" + "_active" ], - "value": "iced" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "d9UYSvjCpD24d1H7HhaHEv" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 99 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 99 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 99 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 104 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 103 - }, - "asset": { - "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d", - "__expectedType__": "cc.Prefab" - }, - "fileId": "afovdb7bBEUpz+8xJHMv4X", - "instance": { - "__id__": 105 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "61izU9WRVJ255b6c6Hu27c", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 106 - }, - { - "__id__": 108 - }, - { - "__id__": 109 - }, - { - "__id__": 110 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 107 - }, - "propertyPath": [ - "_name" - ], - "value": "yun" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "afovdb7bBEUpz+8xJHMv4X" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 107 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 87.398, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 107 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 107 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } + "value": false }, { "__type__": "cc.UITransform", @@ -1729,7 +1512,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 97 }, "_contentSize": { "__type__": "cc.Size", @@ -1757,7 +1540,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 99 }, "enabledContactListener": true, "bullet": true, @@ -1791,7 +1574,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 101 }, "tag": 0, "_group": 4, @@ -1825,7 +1608,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 103 }, "anm": { "__id__": 22 @@ -1846,7 +1629,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 120 + "__id__": 105 }, "_id": "" }, @@ -1864,7 +1647,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 122 + "__id__": 107 }, "_id": "" }, @@ -1884,12 +1667,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 103 - }, - { - "__id__": 95 - }, { "__id__": 87 }, diff --git a/assets/resources/game/heros/ice1.prefab b/assets/resources/game/heros/ice1.prefab index 77eb7ca6..1c2d90bb 100644 --- a/assets/resources/game/heros/ice1.prefab +++ b/assets/resources/game/heros/ice1.prefab @@ -47,37 +47,31 @@ }, { "__id__": 87 - }, - { - "__id__": 95 - }, - { - "__id__": 103 } ], "_active": true, "_components": [ { - "__id__": 111 + "__id__": 96 }, { - "__id__": 113 + "__id__": 98 }, { - "__id__": 115 + "__id__": 100 }, { - "__id__": 117 + "__id__": 102 }, { - "__id__": 119 + "__id__": 104 }, { - "__id__": 121 + "__id__": 106 } ], "_prefab": { - "__id__": 123 + "__id__": 108 }, "_lpos": { "__type__": "cc.Vec3", @@ -1429,6 +1423,9 @@ }, { "__id__": 94 + }, + { + "__id__": 95 } ], "removedComponents": [] @@ -1495,229 +1492,15 @@ "z": 0 } }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 96 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 95 - }, - "asset": { - "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408", - "__expectedType__": "cc.Prefab" - }, - "fileId": "d9UYSvjCpD24d1H7HhaHEv", - "instance": { - "__id__": 97 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "84huy4k/VOL5ykMOpg0H5B", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 101 - }, - { - "__id__": 102 - } - ], - "removedComponents": [] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 99 + "__id__": 91 }, "propertyPath": [ - "_name" + "_active" ], - "value": "iced" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "d9UYSvjCpD24d1H7HhaHEv" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 99 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 99 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 99 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 104 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 103 - }, - "asset": { - "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d", - "__expectedType__": "cc.Prefab" - }, - "fileId": "afovdb7bBEUpz+8xJHMv4X", - "instance": { - "__id__": 105 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "61izU9WRVJ255b6c6Hu27c", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 106 - }, - { - "__id__": 108 - }, - { - "__id__": 109 - }, - { - "__id__": 110 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 107 - }, - "propertyPath": [ - "_name" - ], - "value": "yun" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "afovdb7bBEUpz+8xJHMv4X" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 107 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 87.398, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 107 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 107 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } + "value": false }, { "__type__": "cc.UITransform", @@ -1729,7 +1512,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 97 }, "_contentSize": { "__type__": "cc.Size", @@ -1757,7 +1540,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 99 }, "enabledContactListener": true, "bullet": true, @@ -1791,7 +1574,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 101 }, "tag": 0, "_group": 4, @@ -1825,7 +1608,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 103 }, "anm": { "__id__": 22 @@ -1846,7 +1629,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 120 + "__id__": 105 }, "_id": "" }, @@ -1864,7 +1647,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 122 + "__id__": 107 }, "_id": "" }, @@ -1884,12 +1667,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 103 - }, - { - "__id__": 95 - }, { "__id__": 87 }, diff --git a/assets/resources/game/heros/k1.prefab b/assets/resources/game/heros/k1.prefab index 83946030..c190e132 100644 --- a/assets/resources/game/heros/k1.prefab +++ b/assets/resources/game/heros/k1.prefab @@ -47,37 +47,31 @@ }, { "__id__": 85 - }, - { - "__id__": 93 - }, - { - "__id__": 102 } ], "_active": true, "_components": [ { - "__id__": 111 + "__id__": 94 }, { - "__id__": 113 + "__id__": 96 }, { - "__id__": 115 + "__id__": 98 }, { - "__id__": 117 + "__id__": 100 }, { - "__id__": 119 + "__id__": 102 }, { - "__id__": 121 + "__id__": 104 } ], "_prefab": { - "__id__": 123 + "__id__": 106 }, "_lpos": { "__type__": "cc.Vec3", @@ -1410,6 +1404,9 @@ }, { "__id__": 92 + }, + { + "__id__": 93 } ], "removedComponents": [] @@ -1476,250 +1473,10 @@ "z": 0 } }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 94 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 93 - }, - "asset": { - "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408", - "__expectedType__": "cc.Prefab" - }, - "fileId": "d9UYSvjCpD24d1H7HhaHEv", - "instance": { - "__id__": 95 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "1aOY3KPddI9JOm97ykUtTp", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 99 - }, - { - "__id__": 100 - }, - { - "__id__": 101 - } - ], - "removedComponents": [] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_name" - ], - "value": "iced" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "d9UYSvjCpD24d1H7HhaHEv" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 103 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 102 - }, - "asset": { - "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d", - "__expectedType__": "cc.Prefab" - }, - "fileId": "afovdb7bBEUpz+8xJHMv4X", - "instance": { - "__id__": 104 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "04y4Hn4IZHuaXO4Pcjf6QL", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 105 - }, - { - "__id__": 107 - }, - { - "__id__": 108 - }, - { - "__id__": 109 - }, - { - "__id__": 110 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_name" - ], - "value": "yun" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "afovdb7bBEUpz+8xJHMv4X" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 87.398, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 + "__id__": 89 }, "propertyPath": [ "_active" @@ -1736,7 +1493,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 95 }, "_contentSize": { "__type__": "cc.Size", @@ -1764,7 +1521,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 97 }, "enabledContactListener": true, "bullet": true, @@ -1798,7 +1555,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 99 }, "tag": 0, "_group": 4, @@ -1832,7 +1589,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 101 }, "anm": { "__id__": 22 @@ -1853,7 +1610,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 120 + "__id__": 103 }, "_id": "" }, @@ -1871,7 +1628,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 122 + "__id__": 105 }, "_id": "" }, @@ -1891,12 +1648,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 102 - }, - { - "__id__": 93 - }, { "__id__": 85 }, diff --git a/assets/resources/game/heros/k2.prefab b/assets/resources/game/heros/k2.prefab index 360a62ec..7167cffe 100644 --- a/assets/resources/game/heros/k2.prefab +++ b/assets/resources/game/heros/k2.prefab @@ -47,37 +47,31 @@ }, { "__id__": 84 - }, - { - "__id__": 92 - }, - { - "__id__": 100 } ], "_active": true, "_components": [ { - "__id__": 108 + "__id__": 93 }, { - "__id__": 110 + "__id__": 95 }, { - "__id__": 112 + "__id__": 97 }, { - "__id__": 114 + "__id__": 99 }, { - "__id__": 116 + "__id__": 101 }, { - "__id__": 118 + "__id__": 103 } ], "_prefab": { - "__id__": 120 + "__id__": 105 }, "_lpos": { "__type__": "cc.Vec3", @@ -1397,6 +1391,9 @@ }, { "__id__": 91 + }, + { + "__id__": 92 } ], "removedComponents": [] @@ -1463,229 +1460,15 @@ "z": 0 } }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 93 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 92 - }, - "asset": { - "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408", - "__expectedType__": "cc.Prefab" - }, - "fileId": "d9UYSvjCpD24d1H7HhaHEv", - "instance": { - "__id__": 94 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "e6llDYf3dMMJcAq5ztcTqd", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 98 - }, - { - "__id__": 99 - } - ], - "removedComponents": [] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 96 + "__id__": 88 }, "propertyPath": [ - "_name" + "_active" ], - "value": "iced" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "d9UYSvjCpD24d1H7HhaHEv" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 96 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 96 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 96 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 101 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 100 - }, - "asset": { - "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d", - "__expectedType__": "cc.Prefab" - }, - "fileId": "afovdb7bBEUpz+8xJHMv4X", - "instance": { - "__id__": 102 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "b1RN6YNJZHF7aCZEs/6AA+", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 103 - }, - { - "__id__": 105 - }, - { - "__id__": 106 - }, - { - "__id__": 107 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_name" - ], - "value": "yun" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "afovdb7bBEUpz+8xJHMv4X" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 87.398, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } + "value": false }, { "__type__": "cc.UITransform", @@ -1697,7 +1480,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 109 + "__id__": 94 }, "_contentSize": { "__type__": "cc.Size", @@ -1725,7 +1508,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 111 + "__id__": 96 }, "enabledContactListener": true, "bullet": true, @@ -1759,7 +1542,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 113 + "__id__": 98 }, "tag": 0, "_group": 4, @@ -1793,7 +1576,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 115 + "__id__": 100 }, "anm": { "__id__": 22 @@ -1814,7 +1597,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 117 + "__id__": 102 }, "_id": "" }, @@ -1832,7 +1615,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 119 + "__id__": 104 }, "_id": "" }, @@ -1852,12 +1635,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 100 - }, - { - "__id__": 92 - }, { "__id__": 84 }, diff --git a/assets/resources/game/heros/k3.prefab b/assets/resources/game/heros/k3.prefab index 3c236016..f06faea9 100644 --- a/assets/resources/game/heros/k3.prefab +++ b/assets/resources/game/heros/k3.prefab @@ -47,37 +47,31 @@ }, { "__id__": 87 - }, - { - "__id__": 95 - }, - { - "__id__": 103 } ], "_active": true, "_components": [ { - "__id__": 111 + "__id__": 96 }, { - "__id__": 113 + "__id__": 98 }, { - "__id__": 115 + "__id__": 100 }, { - "__id__": 117 + "__id__": 102 }, { - "__id__": 119 + "__id__": 104 }, { - "__id__": 121 + "__id__": 106 } ], "_prefab": { - "__id__": 123 + "__id__": 108 }, "_lpos": { "__type__": "cc.Vec3", @@ -1429,6 +1423,9 @@ }, { "__id__": 94 + }, + { + "__id__": 95 } ], "removedComponents": [] @@ -1495,229 +1492,15 @@ "z": 0 } }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 96 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 95 - }, - "asset": { - "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408", - "__expectedType__": "cc.Prefab" - }, - "fileId": "d9UYSvjCpD24d1H7HhaHEv", - "instance": { - "__id__": 97 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "84huy4k/VOL5ykMOpg0H5B", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 101 - }, - { - "__id__": 102 - } - ], - "removedComponents": [] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 99 + "__id__": 91 }, "propertyPath": [ - "_name" + "_active" ], - "value": "iced" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "d9UYSvjCpD24d1H7HhaHEv" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 99 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 99 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 99 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 104 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 103 - }, - "asset": { - "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d", - "__expectedType__": "cc.Prefab" - }, - "fileId": "afovdb7bBEUpz+8xJHMv4X", - "instance": { - "__id__": 105 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "61izU9WRVJ255b6c6Hu27c", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 106 - }, - { - "__id__": 108 - }, - { - "__id__": 109 - }, - { - "__id__": 110 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 107 - }, - "propertyPath": [ - "_name" - ], - "value": "yun" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "afovdb7bBEUpz+8xJHMv4X" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 107 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 87.398, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 107 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 107 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } + "value": false }, { "__type__": "cc.UITransform", @@ -1729,7 +1512,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 97 }, "_contentSize": { "__type__": "cc.Size", @@ -1757,7 +1540,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 99 }, "enabledContactListener": true, "bullet": true, @@ -1791,7 +1574,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 101 }, "tag": 0, "_group": 4, @@ -1825,7 +1608,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 103 }, "anm": { "__id__": 22 @@ -1846,7 +1629,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 120 + "__id__": 105 }, "_id": "" }, @@ -1864,7 +1647,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 122 + "__id__": 107 }, "_id": "" }, @@ -1884,12 +1667,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 103 - }, - { - "__id__": 95 - }, { "__id__": 87 }, diff --git a/assets/resources/game/heros/k5.prefab b/assets/resources/game/heros/k5.prefab index 8030f39a..111d2072 100644 --- a/assets/resources/game/heros/k5.prefab +++ b/assets/resources/game/heros/k5.prefab @@ -47,37 +47,31 @@ }, { "__id__": 87 - }, - { - "__id__": 95 - }, - { - "__id__": 103 } ], "_active": true, "_components": [ { - "__id__": 111 + "__id__": 96 }, { - "__id__": 113 + "__id__": 98 }, { - "__id__": 115 + "__id__": 100 }, { - "__id__": 117 + "__id__": 102 }, { - "__id__": 119 + "__id__": 104 }, { - "__id__": 121 + "__id__": 106 } ], "_prefab": { - "__id__": 123 + "__id__": 108 }, "_lpos": { "__type__": "cc.Vec3", @@ -1429,6 +1423,9 @@ }, { "__id__": 94 + }, + { + "__id__": 95 } ], "removedComponents": [] @@ -1495,229 +1492,15 @@ "z": 0 } }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 96 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 95 - }, - "asset": { - "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408", - "__expectedType__": "cc.Prefab" - }, - "fileId": "d9UYSvjCpD24d1H7HhaHEv", - "instance": { - "__id__": 97 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "84huy4k/VOL5ykMOpg0H5B", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 101 - }, - { - "__id__": 102 - } - ], - "removedComponents": [] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 99 + "__id__": 91 }, "propertyPath": [ - "_name" + "_active" ], - "value": "iced" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "d9UYSvjCpD24d1H7HhaHEv" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 99 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 99 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 99 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 104 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 103 - }, - "asset": { - "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d", - "__expectedType__": "cc.Prefab" - }, - "fileId": "afovdb7bBEUpz+8xJHMv4X", - "instance": { - "__id__": 105 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "61izU9WRVJ255b6c6Hu27c", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 106 - }, - { - "__id__": 108 - }, - { - "__id__": 109 - }, - { - "__id__": 110 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 107 - }, - "propertyPath": [ - "_name" - ], - "value": "yun" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "afovdb7bBEUpz+8xJHMv4X" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 107 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 87.398, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 107 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 107 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } + "value": false }, { "__type__": "cc.UITransform", @@ -1729,7 +1512,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 97 }, "_contentSize": { "__type__": "cc.Size", @@ -1757,7 +1540,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 99 }, "enabledContactListener": true, "bullet": true, @@ -1791,7 +1574,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 101 }, "tag": 0, "_group": 4, @@ -1825,7 +1608,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 103 }, "anm": { "__id__": 22 @@ -1846,7 +1629,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 120 + "__id__": 105 }, "_id": "" }, @@ -1864,7 +1647,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 122 + "__id__": 107 }, "_id": "" }, @@ -1884,12 +1667,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 103 - }, - { - "__id__": 95 - }, { "__id__": 87 }, diff --git a/assets/resources/game/heros/m1.prefab b/assets/resources/game/heros/m1.prefab index 458b6c31..3b26e889 100644 --- a/assets/resources/game/heros/m1.prefab +++ b/assets/resources/game/heros/m1.prefab @@ -47,37 +47,31 @@ }, { "__id__": 87 - }, - { - "__id__": 95 - }, - { - "__id__": 103 } ], "_active": true, "_components": [ { - "__id__": 111 + "__id__": 96 }, { - "__id__": 113 + "__id__": 98 }, { - "__id__": 115 + "__id__": 100 }, { - "__id__": 117 + "__id__": 102 }, { - "__id__": 119 + "__id__": 104 }, { - "__id__": 121 + "__id__": 106 } ], "_prefab": { - "__id__": 123 + "__id__": 108 }, "_lpos": { "__type__": "cc.Vec3", @@ -1429,6 +1423,9 @@ }, { "__id__": 94 + }, + { + "__id__": 95 } ], "removedComponents": [] @@ -1495,229 +1492,15 @@ "z": 0 } }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 96 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 95 - }, - "asset": { - "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408", - "__expectedType__": "cc.Prefab" - }, - "fileId": "d9UYSvjCpD24d1H7HhaHEv", - "instance": { - "__id__": 97 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "84huy4k/VOL5ykMOpg0H5B", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 101 - }, - { - "__id__": 102 - } - ], - "removedComponents": [] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 99 + "__id__": 91 }, "propertyPath": [ - "_name" + "_active" ], - "value": "iced" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "d9UYSvjCpD24d1H7HhaHEv" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 99 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 99 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 99 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 104 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 103 - }, - "asset": { - "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d", - "__expectedType__": "cc.Prefab" - }, - "fileId": "afovdb7bBEUpz+8xJHMv4X", - "instance": { - "__id__": 105 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "61izU9WRVJ255b6c6Hu27c", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 106 - }, - { - "__id__": 108 - }, - { - "__id__": 109 - }, - { - "__id__": 110 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 107 - }, - "propertyPath": [ - "_name" - ], - "value": "yun" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "afovdb7bBEUpz+8xJHMv4X" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 107 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 87.398, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 107 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 107 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } + "value": false }, { "__type__": "cc.UITransform", @@ -1729,7 +1512,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 97 }, "_contentSize": { "__type__": "cc.Size", @@ -1757,7 +1540,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 99 }, "enabledContactListener": true, "bullet": true, @@ -1791,7 +1574,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 101 }, "tag": 0, "_group": 4, @@ -1825,7 +1608,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 103 }, "anm": { "__id__": 22 @@ -1846,7 +1629,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 120 + "__id__": 105 }, "_id": "" }, @@ -1864,7 +1647,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 122 + "__id__": 107 }, "_id": "" }, @@ -1884,12 +1667,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 103 - }, - { - "__id__": 95 - }, { "__id__": 87 }, diff --git a/assets/resources/game/heros/m3.prefab b/assets/resources/game/heros/m3.prefab index a06f2b31..031dc9c7 100644 --- a/assets/resources/game/heros/m3.prefab +++ b/assets/resources/game/heros/m3.prefab @@ -47,37 +47,31 @@ }, { "__id__": 87 - }, - { - "__id__": 95 - }, - { - "__id__": 103 } ], "_active": true, "_components": [ { - "__id__": 111 + "__id__": 96 }, { - "__id__": 113 + "__id__": 98 }, { - "__id__": 115 + "__id__": 100 }, { - "__id__": 117 + "__id__": 102 }, { - "__id__": 119 + "__id__": 104 }, { - "__id__": 121 + "__id__": 106 } ], "_prefab": { - "__id__": 123 + "__id__": 108 }, "_lpos": { "__type__": "cc.Vec3", @@ -1429,6 +1423,9 @@ }, { "__id__": 94 + }, + { + "__id__": 95 } ], "removedComponents": [] @@ -1495,229 +1492,15 @@ "z": 0 } }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 96 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 95 - }, - "asset": { - "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408", - "__expectedType__": "cc.Prefab" - }, - "fileId": "d9UYSvjCpD24d1H7HhaHEv", - "instance": { - "__id__": 97 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "84huy4k/VOL5ykMOpg0H5B", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 101 - }, - { - "__id__": 102 - } - ], - "removedComponents": [] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 99 + "__id__": 91 }, "propertyPath": [ - "_name" + "_active" ], - "value": "iced" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "d9UYSvjCpD24d1H7HhaHEv" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 99 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 99 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 99 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 104 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 103 - }, - "asset": { - "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d", - "__expectedType__": "cc.Prefab" - }, - "fileId": "afovdb7bBEUpz+8xJHMv4X", - "instance": { - "__id__": 105 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "61izU9WRVJ255b6c6Hu27c", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 106 - }, - { - "__id__": 108 - }, - { - "__id__": 109 - }, - { - "__id__": 110 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 107 - }, - "propertyPath": [ - "_name" - ], - "value": "yun" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "afovdb7bBEUpz+8xJHMv4X" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 107 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 87.398, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 107 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 107 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } + "value": false }, { "__type__": "cc.UITransform", @@ -1729,7 +1512,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 97 }, "_contentSize": { "__type__": "cc.Size", @@ -1757,7 +1540,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 99 }, "enabledContactListener": true, "bullet": true, @@ -1791,7 +1574,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 101 }, "tag": 0, "_group": 4, @@ -1825,7 +1608,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 103 }, "anm": { "__id__": 22 @@ -1846,7 +1629,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 120 + "__id__": 105 }, "_id": "" }, @@ -1864,7 +1647,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 122 + "__id__": 107 }, "_id": "" }, @@ -1884,12 +1667,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 103 - }, - { - "__id__": 95 - }, { "__id__": 87 }, diff --git a/assets/resources/game/heros/mgem1.prefab b/assets/resources/game/heros/mgem1.prefab index 3e3c8f0c..92deafcc 100644 --- a/assets/resources/game/heros/mgem1.prefab +++ b/assets/resources/game/heros/mgem1.prefab @@ -47,37 +47,31 @@ }, { "__id__": 84 - }, - { - "__id__": 92 - }, - { - "__id__": 100 } ], "_active": true, "_components": [ { - "__id__": 108 + "__id__": 93 }, { - "__id__": 110 + "__id__": 95 }, { - "__id__": 112 + "__id__": 97 }, { - "__id__": 114 + "__id__": 99 }, { - "__id__": 116 + "__id__": 101 }, { - "__id__": 118 + "__id__": 103 } ], "_prefab": { - "__id__": 120 + "__id__": 105 }, "_lpos": { "__type__": "cc.Vec3", @@ -1397,6 +1391,9 @@ }, { "__id__": 91 + }, + { + "__id__": 92 } ], "removedComponents": [] @@ -1463,229 +1460,15 @@ "z": 0 } }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 93 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 92 - }, - "asset": { - "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408", - "__expectedType__": "cc.Prefab" - }, - "fileId": "d9UYSvjCpD24d1H7HhaHEv", - "instance": { - "__id__": 94 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "99zRQcosxLt6p2085sDxGH", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 98 - }, - { - "__id__": 99 - } - ], - "removedComponents": [] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 96 + "__id__": 88 }, "propertyPath": [ - "_name" + "_active" ], - "value": "iced" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "d9UYSvjCpD24d1H7HhaHEv" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 96 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 96 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 96 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 101 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 100 - }, - "asset": { - "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d", - "__expectedType__": "cc.Prefab" - }, - "fileId": "afovdb7bBEUpz+8xJHMv4X", - "instance": { - "__id__": 102 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "e0uy6G8clHppu/v8RCjoAT", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 103 - }, - { - "__id__": 105 - }, - { - "__id__": 106 - }, - { - "__id__": 107 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_name" - ], - "value": "yun" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "afovdb7bBEUpz+8xJHMv4X" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 87.398, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } + "value": false }, { "__type__": "cc.UITransform", @@ -1697,7 +1480,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 109 + "__id__": 94 }, "_contentSize": { "__type__": "cc.Size", @@ -1725,7 +1508,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 111 + "__id__": 96 }, "enabledContactListener": true, "bullet": true, @@ -1759,7 +1542,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 113 + "__id__": 98 }, "tag": 0, "_group": 4, @@ -1793,7 +1576,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 115 + "__id__": 100 }, "anm": { "__id__": 22 @@ -1814,7 +1597,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 117 + "__id__": 102 }, "_id": "" }, @@ -1832,7 +1615,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 119 + "__id__": 104 }, "_id": "" }, @@ -1852,12 +1635,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 100 - }, - { - "__id__": 92 - }, { "__id__": 84 }, diff --git a/assets/resources/game/heros/mgem2.prefab b/assets/resources/game/heros/mgem2.prefab index c45c5ef8..f0f32204 100644 --- a/assets/resources/game/heros/mgem2.prefab +++ b/assets/resources/game/heros/mgem2.prefab @@ -47,37 +47,31 @@ }, { "__id__": 84 - }, - { - "__id__": 92 - }, - { - "__id__": 100 } ], "_active": true, "_components": [ { - "__id__": 108 + "__id__": 93 }, { - "__id__": 110 + "__id__": 95 }, { - "__id__": 112 + "__id__": 97 }, { - "__id__": 114 + "__id__": 99 }, { - "__id__": 116 + "__id__": 101 }, { - "__id__": 118 + "__id__": 103 } ], "_prefab": { - "__id__": 120 + "__id__": 105 }, "_lpos": { "__type__": "cc.Vec3", @@ -1397,6 +1391,9 @@ }, { "__id__": 91 + }, + { + "__id__": 92 } ], "removedComponents": [] @@ -1463,229 +1460,15 @@ "z": 0 } }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 93 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 92 - }, - "asset": { - "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408", - "__expectedType__": "cc.Prefab" - }, - "fileId": "d9UYSvjCpD24d1H7HhaHEv", - "instance": { - "__id__": 94 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "99zRQcosxLt6p2085sDxGH", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 98 - }, - { - "__id__": 99 - } - ], - "removedComponents": [] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 96 + "__id__": 88 }, "propertyPath": [ - "_name" + "_active" ], - "value": "iced" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "d9UYSvjCpD24d1H7HhaHEv" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 96 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 96 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 96 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 101 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 100 - }, - "asset": { - "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d", - "__expectedType__": "cc.Prefab" - }, - "fileId": "afovdb7bBEUpz+8xJHMv4X", - "instance": { - "__id__": 102 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "e0uy6G8clHppu/v8RCjoAT", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 103 - }, - { - "__id__": 105 - }, - { - "__id__": 106 - }, - { - "__id__": 107 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_name" - ], - "value": "yun" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "afovdb7bBEUpz+8xJHMv4X" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 87.398, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } + "value": false }, { "__type__": "cc.UITransform", @@ -1697,7 +1480,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 109 + "__id__": 94 }, "_contentSize": { "__type__": "cc.Size", @@ -1725,7 +1508,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 111 + "__id__": 96 }, "enabledContactListener": true, "bullet": true, @@ -1759,7 +1542,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 113 + "__id__": 98 }, "tag": 0, "_group": 4, @@ -1793,7 +1576,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 115 + "__id__": 100 }, "anm": { "__id__": 22 @@ -1814,7 +1597,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 117 + "__id__": 102 }, "_id": "" }, @@ -1832,7 +1615,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 119 + "__id__": 104 }, "_id": "" }, @@ -1852,12 +1635,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 100 - }, - { - "__id__": 92 - }, { "__id__": 84 }, diff --git a/assets/resources/game/heros/mgem3.prefab b/assets/resources/game/heros/mgem3.prefab index 73a3b219..df313d6d 100644 --- a/assets/resources/game/heros/mgem3.prefab +++ b/assets/resources/game/heros/mgem3.prefab @@ -47,37 +47,31 @@ }, { "__id__": 84 - }, - { - "__id__": 92 - }, - { - "__id__": 100 } ], "_active": true, "_components": [ { - "__id__": 108 + "__id__": 93 }, { - "__id__": 110 + "__id__": 95 }, { - "__id__": 112 + "__id__": 97 }, { - "__id__": 114 + "__id__": 99 }, { - "__id__": 116 + "__id__": 101 }, { - "__id__": 118 + "__id__": 103 } ], "_prefab": { - "__id__": 120 + "__id__": 105 }, "_lpos": { "__type__": "cc.Vec3", @@ -1397,6 +1391,9 @@ }, { "__id__": 91 + }, + { + "__id__": 92 } ], "removedComponents": [] @@ -1463,229 +1460,15 @@ "z": 0 } }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 93 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 92 - }, - "asset": { - "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408", - "__expectedType__": "cc.Prefab" - }, - "fileId": "d9UYSvjCpD24d1H7HhaHEv", - "instance": { - "__id__": 94 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "99zRQcosxLt6p2085sDxGH", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 98 - }, - { - "__id__": 99 - } - ], - "removedComponents": [] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 96 + "__id__": 88 }, "propertyPath": [ - "_name" + "_active" ], - "value": "iced" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "d9UYSvjCpD24d1H7HhaHEv" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 96 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 96 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 96 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 101 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 100 - }, - "asset": { - "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d", - "__expectedType__": "cc.Prefab" - }, - "fileId": "afovdb7bBEUpz+8xJHMv4X", - "instance": { - "__id__": 102 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "e0uy6G8clHppu/v8RCjoAT", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 103 - }, - { - "__id__": 105 - }, - { - "__id__": 106 - }, - { - "__id__": 107 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_name" - ], - "value": "yun" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "afovdb7bBEUpz+8xJHMv4X" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 87.398, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } + "value": false }, { "__type__": "cc.UITransform", @@ -1697,7 +1480,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 109 + "__id__": 94 }, "_contentSize": { "__type__": "cc.Size", @@ -1725,7 +1508,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 111 + "__id__": 96 }, "enabledContactListener": true, "bullet": true, @@ -1759,7 +1542,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 113 + "__id__": 98 }, "tag": 0, "_group": 4, @@ -1793,7 +1576,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 115 + "__id__": 100 }, "anm": { "__id__": 22 @@ -1814,7 +1597,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 117 + "__id__": 102 }, "_id": "" }, @@ -1832,7 +1615,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 119 + "__id__": 104 }, "_id": "" }, @@ -1852,12 +1635,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 100 - }, - { - "__id__": 92 - }, { "__id__": 84 }, diff --git a/assets/resources/game/heros/mor1.prefab b/assets/resources/game/heros/mor1.prefab index 77461a28..769170ff 100644 --- a/assets/resources/game/heros/mor1.prefab +++ b/assets/resources/game/heros/mor1.prefab @@ -47,37 +47,31 @@ }, { "__id__": 84 - }, - { - "__id__": 92 - }, - { - "__id__": 100 } ], "_active": true, "_components": [ { - "__id__": 108 + "__id__": 93 }, { - "__id__": 110 + "__id__": 95 }, { - "__id__": 112 + "__id__": 97 }, { - "__id__": 114 + "__id__": 99 }, { - "__id__": 116 + "__id__": 101 }, { - "__id__": 118 + "__id__": 103 } ], "_prefab": { - "__id__": 120 + "__id__": 105 }, "_lpos": { "__type__": "cc.Vec3", @@ -1397,6 +1391,9 @@ }, { "__id__": 91 + }, + { + "__id__": 92 } ], "removedComponents": [] @@ -1463,229 +1460,15 @@ "z": 0 } }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 93 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 92 - }, - "asset": { - "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408", - "__expectedType__": "cc.Prefab" - }, - "fileId": "d9UYSvjCpD24d1H7HhaHEv", - "instance": { - "__id__": 94 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69OKMBf75O2LnuusCy37FF", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 98 - }, - { - "__id__": 99 - } - ], - "removedComponents": [] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 96 + "__id__": 88 }, "propertyPath": [ - "_name" + "_active" ], - "value": "iced" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "d9UYSvjCpD24d1H7HhaHEv" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 96 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 96 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 96 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 101 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 100 - }, - "asset": { - "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d", - "__expectedType__": "cc.Prefab" - }, - "fileId": "afovdb7bBEUpz+8xJHMv4X", - "instance": { - "__id__": 102 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "1fLKKb9s9L6JlwgxtnCbax", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 103 - }, - { - "__id__": 105 - }, - { - "__id__": 106 - }, - { - "__id__": 107 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_name" - ], - "value": "yun" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "afovdb7bBEUpz+8xJHMv4X" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 87.398, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } + "value": false }, { "__type__": "cc.UITransform", @@ -1697,7 +1480,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 109 + "__id__": 94 }, "_contentSize": { "__type__": "cc.Size", @@ -1725,7 +1508,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 111 + "__id__": 96 }, "enabledContactListener": true, "bullet": true, @@ -1759,7 +1542,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 113 + "__id__": 98 }, "tag": 0, "_group": 4, @@ -1793,7 +1576,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 115 + "__id__": 100 }, "anm": { "__id__": 22 @@ -1814,7 +1597,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 117 + "__id__": 102 }, "_id": "" }, @@ -1832,7 +1615,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 119 + "__id__": 104 }, "_id": "" }, @@ -1852,12 +1635,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 100 - }, - { - "__id__": 92 - }, { "__id__": 84 }, diff --git a/assets/resources/game/heros/mor2.prefab b/assets/resources/game/heros/mor2.prefab index 435e0f91..b1f60382 100644 --- a/assets/resources/game/heros/mor2.prefab +++ b/assets/resources/game/heros/mor2.prefab @@ -47,37 +47,31 @@ }, { "__id__": 84 - }, - { - "__id__": 92 - }, - { - "__id__": 100 } ], "_active": true, "_components": [ { - "__id__": 108 + "__id__": 93 }, { - "__id__": 110 + "__id__": 95 }, { - "__id__": 112 + "__id__": 97 }, { - "__id__": 114 + "__id__": 99 }, { - "__id__": 116 + "__id__": 101 }, { - "__id__": 118 + "__id__": 103 } ], "_prefab": { - "__id__": 120 + "__id__": 105 }, "_lpos": { "__type__": "cc.Vec3", @@ -1397,6 +1391,9 @@ }, { "__id__": 91 + }, + { + "__id__": 92 } ], "removedComponents": [] @@ -1463,229 +1460,15 @@ "z": 0 } }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 93 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 92 - }, - "asset": { - "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408", - "__expectedType__": "cc.Prefab" - }, - "fileId": "d9UYSvjCpD24d1H7HhaHEv", - "instance": { - "__id__": 94 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "5bdvKKcMZLsq2rcJ27QpHF", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 98 - }, - { - "__id__": 99 - } - ], - "removedComponents": [] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 96 + "__id__": 88 }, "propertyPath": [ - "_name" + "_active" ], - "value": "iced" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "d9UYSvjCpD24d1H7HhaHEv" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 96 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 96 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 96 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 101 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 100 - }, - "asset": { - "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d", - "__expectedType__": "cc.Prefab" - }, - "fileId": "afovdb7bBEUpz+8xJHMv4X", - "instance": { - "__id__": 102 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "8cIYP8bmJESbqNX/IpaLk3", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 103 - }, - { - "__id__": 105 - }, - { - "__id__": 106 - }, - { - "__id__": 107 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_name" - ], - "value": "yun" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "afovdb7bBEUpz+8xJHMv4X" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 87.398, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } + "value": false }, { "__type__": "cc.UITransform", @@ -1697,7 +1480,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 109 + "__id__": 94 }, "_contentSize": { "__type__": "cc.Size", @@ -1725,7 +1508,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 111 + "__id__": 96 }, "enabledContactListener": true, "bullet": true, @@ -1759,7 +1542,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 113 + "__id__": 98 }, "tag": 0, "_group": 4, @@ -1793,7 +1576,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 115 + "__id__": 100 }, "anm": { "__id__": 22 @@ -1814,7 +1597,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 117 + "__id__": 102 }, "_id": "" }, @@ -1832,7 +1615,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 119 + "__id__": 104 }, "_id": "" }, @@ -1852,12 +1635,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 100 - }, - { - "__id__": 92 - }, { "__id__": 84 }, diff --git a/assets/resources/game/heros/mor3.prefab b/assets/resources/game/heros/mor3.prefab index 1ec44c68..d31c8cbb 100644 --- a/assets/resources/game/heros/mor3.prefab +++ b/assets/resources/game/heros/mor3.prefab @@ -47,37 +47,31 @@ }, { "__id__": 84 - }, - { - "__id__": 92 - }, - { - "__id__": 100 } ], "_active": true, "_components": [ { - "__id__": 108 + "__id__": 93 }, { - "__id__": 110 + "__id__": 95 }, { - "__id__": 112 + "__id__": 97 }, { - "__id__": 114 + "__id__": 99 }, { - "__id__": 116 + "__id__": 101 }, { - "__id__": 118 + "__id__": 103 } ], "_prefab": { - "__id__": 120 + "__id__": 105 }, "_lpos": { "__type__": "cc.Vec3", @@ -1397,6 +1391,9 @@ }, { "__id__": 91 + }, + { + "__id__": 92 } ], "removedComponents": [] @@ -1463,229 +1460,15 @@ "z": 0 } }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 93 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 92 - }, - "asset": { - "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408", - "__expectedType__": "cc.Prefab" - }, - "fileId": "d9UYSvjCpD24d1H7HhaHEv", - "instance": { - "__id__": 94 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "99zRQcosxLt6p2085sDxGH", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 98 - }, - { - "__id__": 99 - } - ], - "removedComponents": [] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 96 + "__id__": 88 }, "propertyPath": [ - "_name" + "_active" ], - "value": "iced" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "d9UYSvjCpD24d1H7HhaHEv" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 96 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 96 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 96 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 101 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 100 - }, - "asset": { - "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d", - "__expectedType__": "cc.Prefab" - }, - "fileId": "afovdb7bBEUpz+8xJHMv4X", - "instance": { - "__id__": 102 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "e0uy6G8clHppu/v8RCjoAT", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 103 - }, - { - "__id__": 105 - }, - { - "__id__": 106 - }, - { - "__id__": 107 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_name" - ], - "value": "yun" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "afovdb7bBEUpz+8xJHMv4X" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 87.398, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } + "value": false }, { "__type__": "cc.UITransform", @@ -1697,7 +1480,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 109 + "__id__": 94 }, "_contentSize": { "__type__": "cc.Size", @@ -1725,7 +1508,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 111 + "__id__": 96 }, "enabledContactListener": true, "bullet": true, @@ -1759,7 +1542,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 113 + "__id__": 98 }, "tag": 0, "_group": 4, @@ -1793,7 +1576,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 115 + "__id__": 100 }, "anm": { "__id__": 22 @@ -1814,7 +1597,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 117 + "__id__": 102 }, "_id": "" }, @@ -1832,7 +1615,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 119 + "__id__": 104 }, "_id": "" }, @@ -1852,12 +1635,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 100 - }, - { - "__id__": 92 - }, { "__id__": 84 }, diff --git a/assets/resources/game/heros/n1.prefab b/assets/resources/game/heros/n1.prefab index adada48e..dd4c04dc 100644 --- a/assets/resources/game/heros/n1.prefab +++ b/assets/resources/game/heros/n1.prefab @@ -47,37 +47,31 @@ }, { "__id__": 85 - }, - { - "__id__": 93 - }, - { - "__id__": 102 } ], "_active": true, "_components": [ { - "__id__": 111 + "__id__": 94 }, { - "__id__": 113 + "__id__": 96 }, { - "__id__": 115 + "__id__": 98 }, { - "__id__": 117 + "__id__": 100 }, { - "__id__": 119 + "__id__": 102 }, { - "__id__": 121 + "__id__": 104 } ], "_prefab": { - "__id__": 123 + "__id__": 106 }, "_lpos": { "__type__": "cc.Vec3", @@ -1410,6 +1404,9 @@ }, { "__id__": 92 + }, + { + "__id__": 93 } ], "removedComponents": [] @@ -1476,250 +1473,10 @@ "z": 0 } }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 94 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 93 - }, - "asset": { - "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408", - "__expectedType__": "cc.Prefab" - }, - "fileId": "d9UYSvjCpD24d1H7HhaHEv", - "instance": { - "__id__": 95 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "1aOY3KPddI9JOm97ykUtTp", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 99 - }, - { - "__id__": 100 - }, - { - "__id__": 101 - } - ], - "removedComponents": [] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_name" - ], - "value": "iced" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "d9UYSvjCpD24d1H7HhaHEv" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 103 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 102 - }, - "asset": { - "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d", - "__expectedType__": "cc.Prefab" - }, - "fileId": "afovdb7bBEUpz+8xJHMv4X", - "instance": { - "__id__": 104 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "04y4Hn4IZHuaXO4Pcjf6QL", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 105 - }, - { - "__id__": 107 - }, - { - "__id__": 108 - }, - { - "__id__": 109 - }, - { - "__id__": 110 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_name" - ], - "value": "yun" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "afovdb7bBEUpz+8xJHMv4X" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 87.398, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 106 + "__id__": 89 }, "propertyPath": [ "_active" @@ -1736,7 +1493,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 95 }, "_contentSize": { "__type__": "cc.Size", @@ -1764,7 +1521,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 97 }, "enabledContactListener": true, "bullet": true, @@ -1798,7 +1555,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 99 }, "tag": 0, "_group": 4, @@ -1832,7 +1589,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 101 }, "anm": { "__id__": 22 @@ -1853,7 +1610,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 120 + "__id__": 103 }, "_id": "" }, @@ -1871,7 +1628,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 122 + "__id__": 105 }, "_id": "" }, @@ -1891,12 +1648,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 102 - }, - { - "__id__": 93 - }, { "__id__": 85 }, diff --git a/assets/resources/game/heros/pld1.prefab b/assets/resources/game/heros/pld1.prefab index fbe6e107..374a9bd6 100644 --- a/assets/resources/game/heros/pld1.prefab +++ b/assets/resources/game/heros/pld1.prefab @@ -47,37 +47,31 @@ }, { "__id__": 84 - }, - { - "__id__": 92 - }, - { - "__id__": 100 } ], "_active": true, "_components": [ { - "__id__": 108 + "__id__": 93 }, { - "__id__": 110 + "__id__": 95 }, { - "__id__": 112 + "__id__": 97 }, { - "__id__": 114 + "__id__": 99 }, { - "__id__": 116 + "__id__": 101 }, { - "__id__": 118 + "__id__": 103 } ], "_prefab": { - "__id__": 120 + "__id__": 105 }, "_lpos": { "__type__": "cc.Vec3", @@ -1397,6 +1391,9 @@ }, { "__id__": 91 + }, + { + "__id__": 92 } ], "removedComponents": [] @@ -1463,229 +1460,15 @@ "z": 0 } }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 93 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 92 - }, - "asset": { - "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408", - "__expectedType__": "cc.Prefab" - }, - "fileId": "d9UYSvjCpD24d1H7HhaHEv", - "instance": { - "__id__": 94 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "5dQX+bIJBO9pQ0tafL2OvS", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 98 - }, - { - "__id__": 99 - } - ], - "removedComponents": [] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 96 + "__id__": 88 }, "propertyPath": [ - "_name" + "_active" ], - "value": "iced" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "d9UYSvjCpD24d1H7HhaHEv" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 96 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 96 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 96 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 101 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 100 - }, - "asset": { - "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d", - "__expectedType__": "cc.Prefab" - }, - "fileId": "afovdb7bBEUpz+8xJHMv4X", - "instance": { - "__id__": 102 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "5dYGeRIQBP0bRtIccOVkWQ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 103 - }, - { - "__id__": 105 - }, - { - "__id__": 106 - }, - { - "__id__": 107 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_name" - ], - "value": "yun" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "afovdb7bBEUpz+8xJHMv4X" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 87.398, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 104 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } + "value": false }, { "__type__": "cc.UITransform", @@ -1697,7 +1480,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 109 + "__id__": 94 }, "_contentSize": { "__type__": "cc.Size", @@ -1725,7 +1508,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 111 + "__id__": 96 }, "enabledContactListener": true, "bullet": true, @@ -1759,7 +1542,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 113 + "__id__": 98 }, "tag": 0, "_group": 4, @@ -1793,7 +1576,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 115 + "__id__": 100 }, "anm": { "__id__": 22 @@ -1814,7 +1597,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 117 + "__id__": 102 }, "_id": "" }, @@ -1832,7 +1615,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 119 + "__id__": 104 }, "_id": "" }, @@ -1852,12 +1635,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 100 - }, - { - "__id__": 92 - }, { "__id__": 84 }, diff --git a/assets/resources/shaders.meta b/assets/resources/game/skills/anm.meta similarity index 70% rename from assets/resources/shaders.meta rename to assets/resources/game/skills/anm.meta index a05db410..902f3436 100644 --- a/assets/resources/shaders.meta +++ b/assets/resources/game/skills/anm.meta @@ -2,7 +2,7 @@ "ver": "1.2.0", "importer": "directory", "imported": true, - "uuid": "9ecd9621-f033-4d21-8d2c-b33850a80f94", + "uuid": "0ba0acca-c1af-4094-8db1-4659281bfb3d", "files": [], "subMetas": {}, "userData": {} diff --git a/assets/resources/game/skills/anm/ab.anim b/assets/resources/game/skills/anm/ab.anim new file mode 100644 index 00000000..80a43f14 --- /dev/null +++ b/assets/resources/game/skills/anm/ab.anim @@ -0,0 +1,100 @@ +[ + { + "__type__": "cc.AnimationClip", + "_name": "ab", + "_objFlags": 0, + "__editorExtras__": { + "embeddedPlayerGroups": [] + }, + "_native": "", + "sample": 24, + "speed": 1, + "wrapMode": 2, + "enableTrsBlending": false, + "_duration": 0.2916666666666667, + "_hash": 500763545, + "_tracks": [ + { + "__id__": 1 + } + ], + "_exoticAnimation": null, + "_events": [], + "_embeddedPlayers": [], + "_additiveSettings": { + "__id__": 7 + }, + "_auxiliaryCurveEntries": [] + }, + { + "__type__": "cc.animation.ObjectTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 2 + }, + "proxy": null + }, + "_channel": { + "__id__": 5 + } + }, + { + "__type__": "cc.animation.TrackPath", + "_paths": [ + { + "__id__": 3 + }, + { + "__id__": 4 + }, + "spriteFrame" + ] + }, + { + "__type__": "cc.animation.HierarchyPath", + "path": "skill" + }, + { + "__type__": "cc.animation.ComponentPath", + "component": "cc.Sprite" + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 6 + } + }, + { + "__type__": "cc.ObjectCurve", + "_times": [ + 0, + 0.08333333333333333, + 0.16666666666666666, + 0.25 + ], + "_values": [ + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@03573", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@03573", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@ad52b", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@03573", + "__expectedType__": "cc.SpriteFrame" + } + ] + }, + { + "__type__": "cc.AnimationClipAdditiveSettings", + "enabled": false, + "refClip": null + } +] \ No newline at end of file diff --git a/assets/resources/game/skills/anm/ab.anim.meta b/assets/resources/game/skills/anm/ab.anim.meta new file mode 100644 index 00000000..84ca30fe --- /dev/null +++ b/assets/resources/game/skills/anm/ab.anim.meta @@ -0,0 +1,13 @@ +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "981ef7be-92cf-44d5-a3db-fa233d44a2d8", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "ab" + } +} diff --git a/assets/resources/game/skills/anm/bwind.anim b/assets/resources/game/skills/anm/bwind.anim new file mode 100644 index 00000000..1b387499 --- /dev/null +++ b/assets/resources/game/skills/anm/bwind.anim @@ -0,0 +1,229 @@ +[ + { + "__type__": "cc.AnimationClip", + "_name": "fires", + "_objFlags": 0, + "__editorExtras__": { + "embeddedPlayerGroups": [] + }, + "_native": "", + "sample": 24, + "speed": 1, + "wrapMode": 2, + "enableTrsBlending": false, + "_duration": 0.7916666666666666, + "_hash": 500763545, + "_tracks": [ + { + "__id__": 1 + }, + { + "__id__": 7 + } + ], + "_exoticAnimation": null, + "_events": [], + "_embeddedPlayers": [], + "_additiveSettings": { + "__id__": 13 + }, + "_auxiliaryCurveEntries": [] + }, + { + "__type__": "cc.animation.ObjectTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 2 + }, + "proxy": null + }, + "_channel": { + "__id__": 5 + } + }, + { + "__type__": "cc.animation.TrackPath", + "_paths": [ + { + "__id__": 3 + }, + { + "__id__": 4 + }, + "spriteFrame" + ] + }, + { + "__type__": "cc.animation.HierarchyPath", + "path": "Node" + }, + { + "__type__": "cc.animation.ComponentPath", + "component": "cc.Sprite" + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 6 + } + }, + { + "__type__": "cc.ObjectCurve", + "_times": [ + 0, + 0.08333333333333333, + 0.16666666666666666, + 0.25, + 0.3333333333333333, + 0.4166666666666667, + 0.5, + 0.5833333333333334, + 0.6666666666666666, + 0.75 + ], + "_values": [ + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@6362e", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@cfc16", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@81b3a", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@8f1d3", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@73c9f", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@7c0a7", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@defde", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@eda1b", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@292c1", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@7cda1", + "__expectedType__": "cc.SpriteFrame" + } + ] + }, + { + "__type__": "cc.animation.ObjectTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 8 + }, + "proxy": null + }, + "_channel": { + "__id__": 11 + } + }, + { + "__type__": "cc.animation.TrackPath", + "_paths": [ + { + "__id__": 9 + }, + { + "__id__": 10 + }, + "spriteFrame" + ] + }, + { + "__type__": "cc.animation.HierarchyPath", + "path": "Node-001" + }, + { + "__type__": "cc.animation.ComponentPath", + "component": "cc.Sprite" + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 12 + } + }, + { + "__type__": "cc.ObjectCurve", + "_times": [ + 0, + 0.08333333333333333, + 0.16666666666666666, + 0.25, + 0.3333333333333333, + 0.4166666666666667, + 0.5, + 0.5833333333333334, + 0.6666666666666666, + 0.75 + ], + "_values": [ + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@12d13", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@b650b", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@52873", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@2198d", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@647a5", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@8541b", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@c0a82", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@7c419", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@c9ee6", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@67364", + "__expectedType__": "cc.SpriteFrame" + } + ] + }, + { + "__type__": "cc.AnimationClipAdditiveSettings", + "enabled": false, + "refClip": null + } +] \ No newline at end of file diff --git a/assets/resources/game/skills/anm/bwind.anim.meta b/assets/resources/game/skills/anm/bwind.anim.meta new file mode 100644 index 00000000..eaa87595 --- /dev/null +++ b/assets/resources/game/skills/anm/bwind.anim.meta @@ -0,0 +1,13 @@ +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "237f574c-a090-4f43-ba72-9027a709bb92", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "bwind" + } +} diff --git a/assets/resources/game/skills/anm/fires.anim b/assets/resources/game/skills/anm/fires.anim new file mode 100644 index 00000000..cb0a1a8b --- /dev/null +++ b/assets/resources/game/skills/anm/fires.anim @@ -0,0 +1,209 @@ +[ + { + "__type__": "cc.AnimationClip", + "_name": "fires", + "_objFlags": 0, + "__editorExtras__": { + "embeddedPlayerGroups": [] + }, + "_native": "", + "sample": 24, + "speed": 1, + "wrapMode": 2, + "enableTrsBlending": false, + "_duration": 0.625, + "_hash": 500763545, + "_tracks": [ + { + "__id__": 1 + }, + { + "__id__": 7 + } + ], + "_exoticAnimation": null, + "_events": [], + "_embeddedPlayers": [], + "_additiveSettings": { + "__id__": 13 + }, + "_auxiliaryCurveEntries": [] + }, + { + "__type__": "cc.animation.ObjectTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 2 + }, + "proxy": null + }, + "_channel": { + "__id__": 5 + } + }, + { + "__type__": "cc.animation.TrackPath", + "_paths": [ + { + "__id__": 3 + }, + { + "__id__": 4 + }, + "spriteFrame" + ] + }, + { + "__type__": "cc.animation.HierarchyPath", + "path": "Node" + }, + { + "__type__": "cc.animation.ComponentPath", + "component": "cc.Sprite" + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 6 + } + }, + { + "__type__": "cc.ObjectCurve", + "_times": [ + 0, + 0.08333333333333333, + 0.16666666666666666, + 0.25, + 0.3333333333333333, + 0.4166666666666667, + 0.5, + 0.5833333333333334 + ], + "_values": [ + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@407df", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@e5575", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@3b74a", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@8df0f", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@7840a", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@25eb1", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@ea953", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@5ae5d", + "__expectedType__": "cc.SpriteFrame" + } + ] + }, + { + "__type__": "cc.animation.ObjectTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 8 + }, + "proxy": null + }, + "_channel": { + "__id__": 11 + } + }, + { + "__type__": "cc.animation.TrackPath", + "_paths": [ + { + "__id__": 9 + }, + { + "__id__": 10 + }, + "spriteFrame" + ] + }, + { + "__type__": "cc.animation.HierarchyPath", + "path": "Node-001" + }, + { + "__type__": "cc.animation.ComponentPath", + "component": "cc.Sprite" + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 12 + } + }, + { + "__type__": "cc.ObjectCurve", + "_times": [ + 0, + 0.08333333333333333, + 0.16666666666666666, + 0.25, + 0.3333333333333333, + 0.4166666666666667, + 0.5, + 0.5833333333333334 + ], + "_values": [ + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@407df", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@e5575", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@3b74a", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@8df0f", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@7840a", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@25eb1", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@ea953", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@5ae5d", + "__expectedType__": "cc.SpriteFrame" + } + ] + }, + { + "__type__": "cc.AnimationClipAdditiveSettings", + "enabled": false, + "refClip": null + } +] \ No newline at end of file diff --git a/assets/resources/game/skills/anm/fires.anim.meta b/assets/resources/game/skills/anm/fires.anim.meta new file mode 100644 index 00000000..e611ce93 --- /dev/null +++ b/assets/resources/game/skills/anm/fires.anim.meta @@ -0,0 +1,13 @@ +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "19a66a4d-224d-4d28-b2a2-e4d650bbf561", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "fires" + } +} diff --git a/assets/resources/game/skills/anm/ice.anim b/assets/resources/game/skills/anm/ice.anim new file mode 100644 index 00000000..86bb172f --- /dev/null +++ b/assets/resources/game/skills/anm/ice.anim @@ -0,0 +1,120 @@ +[ + { + "__type__": "cc.AnimationClip", + "_name": "ice", + "_objFlags": 0, + "__editorExtras__": { + "embeddedPlayerGroups": [] + }, + "_native": "", + "sample": 24, + "speed": 1, + "wrapMode": 2, + "enableTrsBlending": false, + "_duration": 0.625, + "_hash": 500763545, + "_tracks": [ + { + "__id__": 1 + } + ], + "_exoticAnimation": null, + "_events": [], + "_embeddedPlayers": [], + "_additiveSettings": { + "__id__": 7 + }, + "_auxiliaryCurveEntries": [] + }, + { + "__type__": "cc.animation.ObjectTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 2 + }, + "proxy": null + }, + "_channel": { + "__id__": 5 + } + }, + { + "__type__": "cc.animation.TrackPath", + "_paths": [ + { + "__id__": 3 + }, + { + "__id__": 4 + }, + "spriteFrame" + ] + }, + { + "__type__": "cc.animation.HierarchyPath", + "path": "skill" + }, + { + "__type__": "cc.animation.ComponentPath", + "component": "cc.Sprite" + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 6 + } + }, + { + "__type__": "cc.ObjectCurve", + "_times": [ + 0, + 0.08333333333333333, + 0.16666666666666666, + 0.25, + 0.3333333333333333, + 0.4166666666666667, + 0.5, + 0.5833333333333334 + ], + "_values": [ + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@70000", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@11efd", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@038eb", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@a8353", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@b2098", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@446d9", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@1df17", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@4275b", + "__expectedType__": "cc.SpriteFrame" + } + ] + }, + { + "__type__": "cc.AnimationClipAdditiveSettings", + "enabled": false, + "refClip": null + } +] \ No newline at end of file diff --git a/assets/resources/game/skills/anm/ice.anim.meta b/assets/resources/game/skills/anm/ice.anim.meta new file mode 100644 index 00000000..f28be3ad --- /dev/null +++ b/assets/resources/game/skills/anm/ice.anim.meta @@ -0,0 +1,13 @@ +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "afb1a09b-ec12-4908-9b46-d8b95960bd11", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "ice" + } +} diff --git a/assets/resources/game/skills/arrow.prefab b/assets/resources/game/skills/arrow.prefab index c04c69e0..da2301aa 100644 --- a/assets/resources/game/skills/arrow.prefab +++ b/assets/resources/game/skills/arrow.prefab @@ -295,8 +295,8 @@ }, "_size": { "__type__": "cc.Size", - "width": 11.4, - "height": 7.8 + "width": 60, + "height": 10 }, "_id": "" }, diff --git a/assets/resources/game/skills/arrow_bule.prefab b/assets/resources/game/skills/arrow_bule.prefab new file mode 100644 index 00000000..cc2153f9 --- /dev/null +++ b/assets/resources/game/skills/arrow_bule.prefab @@ -0,0 +1,387 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "arrow_bule", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "arrow_bule", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": null, + "_children": [ + { + "__id__": 2 + } + ], + "_active": true, + "_components": [ + { + "__id__": 8 + }, + { + "__id__": 10 + }, + { + "__id__": 12 + }, + { + "__id__": 14 + }, + { + "__id__": 16 + }, + { + "__id__": 18 + } + ], + "_prefab": { + "__id__": 20 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "skill", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 3 + }, + { + "__id__": 5 + } + ], + "_prefab": { + "__id__": 7 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 2, + "y": 2, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 4 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 60, + "height": 13 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "0bXCTL/l1A5YZuQAHcNimF" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 6 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@c3f86", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "b9QUlReiVJ7ZDxbXwpC4IM" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "9fUsJF0/xIH6lvrQ3ar5z7", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 9 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 40, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.49664333316829656, + "y": 0.5156666649712457 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "63NP9yq3hEUKD/OZZZ5t7x" + }, + { + "__type__": "cc.RigidBody2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 11 + }, + "enabledContactListener": true, + "bullet": true, + "awakeOnLoad": true, + "_group": 4, + "_type": 2, + "_allowSleep": false, + "_gravityScale": 0, + "_linearDamping": 0, + "_angularDamping": 0, + "_linearVelocity": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_angularVelocity": 0, + "_fixedRotation": false, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f1VxV09PdOkofzgGv1tsZE" + }, + { + "__type__": "cc.BoxCollider2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 13 + }, + "tag": 8, + "_group": 4, + "_density": 1, + "_sensor": true, + "_friction": 0.2, + "_restitution": 0, + "_offset": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_size": { + "__type__": "cc.Size", + "width": 100, + "height": 30 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "23eik112JPZYGiI8mJalTK" + }, + { + "__type__": "45646oIyIdA24W+0c5rdELD", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 15 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "bcCcCZuuJMgIWRgtrud9x7" + }, + { + "__type__": "20503VOc7ZA84sbp8G72pxZ", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "18XBHN4s1Ov7Mg9VnmEPCS" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 19 + }, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "981ef7be-92cf-44d5-a3db-fa233d44a2d8", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "981ef7be-92cf-44d5-a3db-fa233d44a2d8", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "02vCVFFYtJl6v3JAJsnnzv" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "instance": null, + "targetOverrides": null + } +] \ No newline at end of file diff --git a/assets/resources/game/skills/arrow_bule.prefab.meta b/assets/resources/game/skills/arrow_bule.prefab.meta new file mode 100644 index 00000000..41eba687 --- /dev/null +++ b/assets/resources/game/skills/arrow_bule.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.50", + "importer": "prefab", + "imported": true, + "uuid": "5b1f4db1-c12b-4774-adf5-5a93ae538911", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "arrow_bule" + } +} diff --git a/assets/resources/game/skills/arrow_yellow.prefab b/assets/resources/game/skills/arrow_yellow.prefab new file mode 100644 index 00000000..491b9351 --- /dev/null +++ b/assets/resources/game/skills/arrow_yellow.prefab @@ -0,0 +1,387 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "arrow_yellow", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "arrow_yellow", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": null, + "_children": [ + { + "__id__": 2 + } + ], + "_active": true, + "_components": [ + { + "__id__": 8 + }, + { + "__id__": 10 + }, + { + "__id__": 12 + }, + { + "__id__": 14 + }, + { + "__id__": 16 + }, + { + "__id__": 18 + } + ], + "_prefab": { + "__id__": 20 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "skill", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 3 + }, + { + "__id__": 5 + } + ], + "_prefab": { + "__id__": 7 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0.7071067811865475, + "w": 0.7071067811865476 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 90 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 4 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 91, + "height": 325 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "0bXCTL/l1A5YZuQAHcNimF" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 6 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@03573", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "b9QUlReiVJ7ZDxbXwpC4IM" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "9fUsJF0/xIH6lvrQ3ar5z7", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 9 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 40, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.49664333316829656, + "y": 0.5156666649712457 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "63NP9yq3hEUKD/OZZZ5t7x" + }, + { + "__type__": "cc.RigidBody2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 11 + }, + "enabledContactListener": true, + "bullet": true, + "awakeOnLoad": true, + "_group": 4, + "_type": 2, + "_allowSleep": false, + "_gravityScale": 0, + "_linearDamping": 0, + "_angularDamping": 0, + "_linearVelocity": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_angularVelocity": 0, + "_fixedRotation": false, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f1VxV09PdOkofzgGv1tsZE" + }, + { + "__type__": "cc.BoxCollider2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 13 + }, + "tag": 8, + "_group": 4, + "_density": 1, + "_sensor": true, + "_friction": 0.2, + "_restitution": 0, + "_offset": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_size": { + "__type__": "cc.Size", + "width": 100, + "height": 30 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "23eik112JPZYGiI8mJalTK" + }, + { + "__type__": "45646oIyIdA24W+0c5rdELD", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 15 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "bcCcCZuuJMgIWRgtrud9x7" + }, + { + "__type__": "20503VOc7ZA84sbp8G72pxZ", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "18XBHN4s1Ov7Mg9VnmEPCS" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 19 + }, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "981ef7be-92cf-44d5-a3db-fa233d44a2d8", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "981ef7be-92cf-44d5-a3db-fa233d44a2d8", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "02vCVFFYtJl6v3JAJsnnzv" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "instance": null, + "targetOverrides": null + } +] \ No newline at end of file diff --git a/assets/resources/game/skills/arrow_yellow.prefab.meta b/assets/resources/game/skills/arrow_yellow.prefab.meta new file mode 100644 index 00000000..9f5a141a --- /dev/null +++ b/assets/resources/game/skills/arrow_yellow.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.50", + "importer": "prefab", + "imported": true, + "uuid": "b1744e06-b2ce-490e-8abe-ac6b727c4d9b", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "arrow_yellow" + } +} diff --git a/assets/resources/game/skills/atked-001.prefab b/assets/resources/game/skills/atked-001.prefab new file mode 100644 index 00000000..7f76cfd7 --- /dev/null +++ b/assets/resources/game/skills/atked-001.prefab @@ -0,0 +1,200 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "atked-001", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "atked-001", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": null, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 2 + }, + { + "__id__": 4 + }, + { + "__id__": 6 + }, + { + "__id__": 8 + } + ], + "_prefab": { + "__id__": 10 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 6.112, + "y": 45.573, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": -0.3826834323650898, + "w": 0.9238795325112867 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.6, + "y": 0.6, + "z": 1 + }, + "_mobility": 0, + "_layer": 1, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": -45 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 3 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 104, + "height": 75 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a7pn5tzA1BSI1AfdpVsHh7" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 5 + }, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "7f70c168-c8b1-4e19-b5fa-8c158d473b8c", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "7f70c168-c8b1-4e19-b5fa-8c158d473b8c", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "63z5ZyjTNKYbn+kEVB1s3W" + }, + { + "__type__": "0f3c4JhFbFO2rEFqBJJ7hFv", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 7 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "32SLcINL1JHZ+vIyextzaC" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 9 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@217d7", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "6a6OJ3ojRESpISXVA3HH+0" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "cfqCWnxbFLNoQMedQXsav3", + "instance": null, + "targetOverrides": null + } +] \ No newline at end of file diff --git a/assets/resources/game/skills/atked-001.prefab.meta b/assets/resources/game/skills/atked-001.prefab.meta new file mode 100644 index 00000000..27aa6c6d --- /dev/null +++ b/assets/resources/game/skills/atked-001.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.50", + "importer": "prefab", + "imported": true, + "uuid": "9cd3470a-0d8b-4826-a563-e12cbd5ebada", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "atked-001" + } +} diff --git a/assets/resources/game/skills/atked.prefab b/assets/resources/game/skills/atked.prefab index e5958b4a..20e7b4be 100644 --- a/assets/resources/game/skills/atked.prefab +++ b/assets/resources/game/skills/atked.prefab @@ -17,25 +17,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": null, - "_children": [ - { - "__id__": 2 - } - ], + "_children": [], "_active": true, "_components": [ + { + "__id__": 2 + }, + { + "__id__": 4 + }, + { + "__id__": 6 + }, { "__id__": 8 - }, - { - "__id__": 10 - }, - { - "__id__": 12 } ], "_prefab": { - "__id__": 14 + "__id__": 10 }, "_lpos": { "__type__": "cc.Vec3", @@ -47,13 +46,13 @@ "__type__": "cc.Quat", "x": 0, "y": 0, - "z": 0, - "w": 1 + "z": -0.3826834323650898, + "w": 0.9238795325112867 }, "_lscale": { "__type__": "cc.Vec3", - "x": 0, - "y": 0, + "x": 0.6, + "y": 0.6, "z": 1 }, "_mobility": 0, @@ -62,146 +61,10 @@ "__type__": "cc.Vec3", "x": 0, "y": 0, - "z": 0 + "z": -45 }, "_id": "" }, - { - "__type__": "cc.Node", - "_name": "anm", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 3 - }, - { - "__id__": 5 - } - ], - "_prefab": { - "__id__": 7 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1.5, - "y": 1.5, - "z": 1 - }, - "_mobility": 0, - "_layer": 1, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 4 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 186, - "height": 195 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "85eMREL6NEy6EiyhIx4cDl" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 6 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@b65a5", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "2d/HLiPCRNT7WDjT3Cr19y" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "74yyW7kjJH9LMu38Jfs5Sb", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, { "__type__": "cc.UITransform", "_name": "", @@ -212,12 +75,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 9 + "__id__": 3 }, "_contentSize": { "__type__": "cc.Size", - "width": 100, - "height": 100 + "width": 104, + "height": 75 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -240,7 +103,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 11 + "__id__": 5 }, "playOnLoad": true, "_clips": [ @@ -269,7 +132,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 13 + "__id__": 7 }, "_id": "" }, @@ -277,6 +140,48 @@ "__type__": "cc.CompPrefabInfo", "fileId": "32SLcINL1JHZ+vIyextzaC" }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 9 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": null, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "6a6OJ3ojRESpISXVA3HH+0" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/atked/atked.anim b/assets/resources/game/skills/atked/atked.anim index 8f125a2b..07b85174 100644 --- a/assets/resources/game/skills/atked/atked.anim +++ b/assets/resources/game/skills/atked/atked.anim @@ -7,27 +7,30 @@ "embeddedPlayerGroups": [] }, "_native": "", - "sample": 60, + "sample": 24, "speed": 1, "wrapMode": 1, "enableTrsBlending": false, - "_duration": 0.15, + "_duration": 0.375, "_hash": 500763545, "_tracks": [ { "__id__": 1 + }, + { + "__id__": 6 } ], "_exoticAnimation": null, "_events": [], "_embeddedPlayers": [], "_additiveSettings": { - "__id__": 11 + "__id__": 17 }, "_auxiliaryCurveEntries": [] }, { - "__type__": "cc.animation.VectorTrack", + "__type__": "cc.animation.ObjectTrack", "_binding": { "__type__": "cc.animation.TrackBinding", "path": { @@ -35,150 +38,97 @@ }, "proxy": null }, - "_channels": [ - { - "__id__": 3 - }, - { - "__id__": 5 - }, - { - "__id__": 7 - }, - { - "__id__": 9 - } - ], - "_nComponents": 3 - }, - { - "__type__": "cc.animation.TrackPath", - "_paths": [ - "scale" - ] - }, - { - "__type__": "cc.animation.Channel", - "_curve": { + "_channel": { "__id__": 4 } }, { - "__type__": "cc.RealCurve", - "_times": [ - 0, - 0.15 - ], - "_values": [ + "__type__": "cc.animation.TrackPath", + "_paths": [ { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 0, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null + "__id__": 3 }, - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 0.3, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - } - ], - "preExtrapolation": 1, - "postExtrapolation": 1 + "spriteFrame" + ] + }, + { + "__type__": "cc.animation.ComponentPath", + "component": "cc.Sprite" }, { "__type__": "cc.animation.Channel", "_curve": { - "__id__": 6 + "__id__": 5 } }, { - "__type__": "cc.RealCurve", + "__type__": "cc.ObjectCurve", "_times": [ 0, - 0.15 + 0.08333333333333333, + 0.16666666666666666, + 0.25, + 0.3333333333333333 ], "_values": [ { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 0, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@07243", + "__expectedType__": "cc.SpriteFrame" }, { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 0.4000000059604645, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - } - ], - "preExtrapolation": 1, - "postExtrapolation": 1 - }, - { - "__type__": "cc.animation.Channel", - "_curve": { - "__id__": 8 - } - }, - { - "__type__": "cc.RealCurve", - "_times": [ - 0, - 0.15 - ], - "_values": [ - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 1, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@55d08", + "__expectedType__": "cc.SpriteFrame" }, { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 1, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@36291", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@4052b", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@e928b", + "__expectedType__": "cc.SpriteFrame" } - ], - "preExtrapolation": 1, - "postExtrapolation": 1 + ] + }, + { + "__type__": "cc.animation.ColorTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 7 + }, + "proxy": null + }, + "_channels": [ + { + "__id__": 9 + }, + { + "__id__": 11 + }, + { + "__id__": 13 + }, + { + "__id__": 15 + } + ] + }, + { + "__type__": "cc.animation.TrackPath", + "_paths": [ + { + "__id__": 8 + }, + "color" + ] + }, + { + "__type__": "cc.animation.ComponentPath", + "component": "cc.Sprite" }, { "__type__": "cc.animation.Channel", @@ -188,8 +138,211 @@ }, { "__type__": "cc.RealCurve", - "_times": [], - "_values": [], + "_times": [ + 0, + 0.2916666567325592, + 0.3333333432674408 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 255, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 255, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 255, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 12 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.2916666567325592, + 0.3333333432674408 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 255, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 255, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 255, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 14 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.2916666567325592, + 0.3333333432674408 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 255, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 255, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 255, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 16 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.2916666567325592, + 0.3333333432674408 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 255, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 100, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + } + ], "preExtrapolation": 1, "postExtrapolation": 1 }, diff --git a/assets/resources/game/skills/atked/slash9.atlas b/assets/resources/game/skills/atked/slash9.atlas new file mode 100644 index 00000000..9211acbd --- /dev/null +++ b/assets/resources/game/skills/atked/slash9.atlas @@ -0,0 +1,34 @@ + +slash9.png +size: 277,108 +format: RGBA8888 +filter: Linear,Linear +repeat: none +slash9_00006 + rotate: true + xy: 2, 4 + size: 102, 73 + orig: 148, 75 + offset: 45, 1 + index: -1 +slash9_00007 + rotate: true + xy: 77, 4 + size: 102, 69 + orig: 153, 77 + offset: 50, 7 + index: -1 +slash9_00008 + rotate: true + xy: 148, 2 + size: 104, 64 + orig: 162, 84 + offset: 57, 19 + index: -1 +slash9_00009 + rotate: true + xy: 214, 2 + size: 104, 61 + orig: 166, 89 + offset: 61, 27 + index: -1 diff --git a/assets/resources/game/skills/fire/buff_fire.atlas.meta b/assets/resources/game/skills/atked/slash9.atlas.meta similarity index 73% rename from assets/resources/game/skills/fire/buff_fire.atlas.meta rename to assets/resources/game/skills/atked/slash9.atlas.meta index 11c02061..c2a34729 100644 --- a/assets/resources/game/skills/fire/buff_fire.atlas.meta +++ b/assets/resources/game/skills/atked/slash9.atlas.meta @@ -2,7 +2,7 @@ "ver": "1.0.1", "importer": "*", "imported": true, - "uuid": "cdd07012-c99d-49a2-a54b-e67588fc2d58", + "uuid": "8fc09e22-e242-4b20-b306-b1b65c7bc62a", "files": [ ".atlas", ".json" diff --git a/assets/resources/game/skills/atked/slash9.json b/assets/resources/game/skills/atked/slash9.json new file mode 100644 index 00000000..f08b1c16 --- /dev/null +++ b/assets/resources/game/skills/atked/slash9.json @@ -0,0 +1,47 @@ +{ +"skeleton": { + "hash": "lFfjZSvL4itj6YxoiP/PtBsDjyE=", + "spine": "3.8.75", + "x": -83, + "y": -44.5, + "width": 166, + "height": 89, + "images": "./slash9/", + "audio": "D:/исходники/VFX/s/slash9/slash9" +}, +"bones": [ + { "name": "root" } +], +"slots": [ + { "name": "slash9_00001", "bone": "root", "attachment": "slash9_00009" } +], +"skins": [ + { + "name": "default", + "attachments": { + "slash9_00001": { + "slash9_00006": { "width": 148, "height": 75 }, + "slash9_00007": { "width": 153, "height": 77 }, + "slash9_00008": { "width": 162, "height": 84 }, + "slash9_00009": { "width": 166, "height": 89 } + } + } + } +], +"animations": { + "animation": { + "slots": { + "slash9_00001": { + "attachment": [ + { "name": null }, + { "time": 0.0333, "name": "slash9_00006" }, + { "time": 0.0667, "name": "slash9_00007" }, + { "time": 0.1, "name": "slash9_00008" }, + { "time": 0.1333, "name": "slash9_00009" }, + { "time": 0.1667, "name": null } + ] + } + } + } +} +} \ No newline at end of file diff --git a/assets/resources/game/skills/fire/buff_fire.json.meta b/assets/resources/game/skills/atked/slash9.json.meta similarity index 72% rename from assets/resources/game/skills/fire/buff_fire.json.meta rename to assets/resources/game/skills/atked/slash9.json.meta index eb769d67..160059e6 100644 --- a/assets/resources/game/skills/fire/buff_fire.json.meta +++ b/assets/resources/game/skills/atked/slash9.json.meta @@ -2,7 +2,7 @@ "ver": "1.2.6", "importer": "spine-data", "imported": true, - "uuid": "e0945cf8-8c31-4008-bcdd-25ec8045d0a4", + "uuid": "f6aac092-b804-4402-97ee-83b00c8b7d40", "files": [ ".json" ], diff --git a/assets/resources/game/skills/atked/slash9.png b/assets/resources/game/skills/atked/slash9.png new file mode 100644 index 0000000000000000000000000000000000000000..e64946e6896e3669ef670881af2e1cc2a1e5802d GIT binary patch literal 17174 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