diff --git a/assets/resources/game/heros/hh1.prefab b/assets/resources/game/heros/hh1.prefab index 3b247fa1..4f9a8e98 100644 --- a/assets/resources/game/heros/hh1.prefab +++ b/assets/resources/game/heros/hh1.prefab @@ -22,35 +22,38 @@ "__id__": 2 }, { - "__id__": 14 + "__id__": 10 }, { - "__id__": 26 + "__id__": 22 + }, + { + "__id__": 34 } ], "_active": true, "_components": [ - { - "__id__": 37 - }, - { - "__id__": 39 - }, - { - "__id__": 41 - }, - { - "__id__": 43 - }, { "__id__": 45 }, { "__id__": 47 + }, + { + "__id__": 49 + }, + { + "__id__": 51 + }, + { + "__id__": 53 + }, + { + "__id__": 55 } ], "_prefab": { - "__id__": 49 + "__id__": 57 }, "_lpos": { "__type__": "cc.Vec3", @@ -81,6 +84,118 @@ }, "_id": "" }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_prefab": { + "__id__": 3 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 2 + }, + "asset": { + "__uuid__": "1e4a101d-7d40-4611-8ccf-f2408bed7bf2", + "__expectedType__": "cc.Prefab" + }, + "fileId": "68mbLQeptP8Kf2mAvL01yn", + "instance": { + "__id__": 4 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "f6MWrw7vdOXIjVGPHorLsn", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 5 + }, + { + "__id__": 7 + }, + { + "__id__": 8 + }, + { + "__id__": 9 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_name" + ], + "value": "shadow" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "68mbLQeptP8Kf2mAvL01yn" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 5, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, { "__type__": "cc.Node", "_name": "anm", @@ -92,24 +207,24 @@ "_children": [], "_active": true, "_components": [ - { - "__id__": 3 - }, - { - "__id__": 5 - }, - { - "__id__": 7 - }, - { - "__id__": 9 - }, { "__id__": 11 + }, + { + "__id__": 13 + }, + { + "__id__": 15 + }, + { + "__id__": 17 + }, + { + "__id__": 19 } ], "_prefab": { - "__id__": 13 + "__id__": 21 }, "_lpos": { "__type__": "cc.Vec3", @@ -146,11 +261,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 4 + "__id__": 12 }, "_contentSize": { "__type__": "cc.Size", @@ -174,11 +289,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 6 + "__id__": 14 }, "_id": "" }, @@ -192,11 +307,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 8 + "__id__": 16 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -240,11 +355,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 10 + "__id__": 18 }, "hitFlashMaterial": { "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810", @@ -278,11 +393,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 12 + "__id__": 20 }, "playOnLoad": false, "_clips": [ @@ -334,14 +449,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 15 + "__id__": 23 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 14 + "__id__": 22 }, "asset": { "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", @@ -349,7 +464,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 16 + "__id__": 24 }, "targetOverrides": null }, @@ -362,26 +477,26 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 17 - }, - { - "__id__": 19 - }, - { - "__id__": 20 - }, - { - "__id__": 21 - }, - { - "__id__": 22 - }, - { - "__id__": 23 - }, { "__id__": 25 + }, + { + "__id__": 27 + }, + { + "__id__": 28 + }, + { + "__id__": 29 + }, + { + "__id__": 30 + }, + { + "__id__": 31 + }, + { + "__id__": 33 } ], "removedComponents": [] @@ -389,7 +504,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 26 }, "propertyPath": [ "_name" @@ -405,7 +520,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 26 }, "propertyPath": [ "_lpos" @@ -420,7 +535,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 26 }, "propertyPath": [ "_lrot" @@ -436,7 +551,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 26 }, "propertyPath": [ "_euler" @@ -451,7 +566,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 26 }, "propertyPath": [ "_active" @@ -461,7 +576,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 24 + "__id__": 32 }, "propertyPath": [ "_contentSize" @@ -481,7 +596,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 26 }, "propertyPath": [ "_lscale" @@ -500,14 +615,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 27 + "__id__": 35 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 26 + "__id__": 34 }, "asset": { "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", @@ -515,7 +630,7 @@ }, "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { - "__id__": 28 + "__id__": 36 }, "targetOverrides": null }, @@ -529,22 +644,22 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 29 + "__id__": 37 }, { - "__id__": 31 + "__id__": 39 }, { - "__id__": 32 + "__id__": 40 }, { - "__id__": 33 + "__id__": 41 }, { - "__id__": 34 + "__id__": 42 }, { - "__id__": 36 + "__id__": 44 } ], "removedComponents": [] @@ -552,7 +667,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 38 }, "propertyPath": [ "_name" @@ -568,7 +683,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 38 }, "propertyPath": [ "_lpos" @@ -583,7 +698,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 38 }, "propertyPath": [ "_lrot" @@ -599,7 +714,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 38 }, "propertyPath": [ "_euler" @@ -614,7 +729,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 35 + "__id__": 43 }, "propertyPath": [ "_lpos" @@ -635,7 +750,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 38 }, "propertyPath": [ "_lscale" @@ -657,7 +772,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 38 + "__id__": 46 }, "_contentSize": { "__type__": "cc.Size", @@ -685,10 +800,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 40 + "__id__": 48 }, "anm": { - "__id__": 5 + "__id__": 13 }, "_id": "" }, @@ -706,7 +821,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 42 + "__id__": 50 }, "debugMode": false, "_id": "" @@ -725,7 +840,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 52 }, "enabledContactListener": true, "bullet": false, @@ -759,7 +874,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 54 }, "tag": 0, "_group": 4, @@ -793,7 +908,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 56 }, "playOnLoad": false, "_clips": [], @@ -817,10 +932,13 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 26 + "__id__": 34 }, { - "__id__": 14 + "__id__": 22 + }, + { + "__id__": 2 } ] } diff --git a/assets/resources/game/heros/hh2.prefab b/assets/resources/game/heros/hh2.prefab index 7a53d965..99648735 100644 --- a/assets/resources/game/heros/hh2.prefab +++ b/assets/resources/game/heros/hh2.prefab @@ -22,35 +22,38 @@ "__id__": 2 }, { - "__id__": 14 + "__id__": 10 }, { - "__id__": 26 + "__id__": 22 + }, + { + "__id__": 34 } ], "_active": true, "_components": [ - { - "__id__": 37 - }, - { - "__id__": 39 - }, - { - "__id__": 41 - }, - { - "__id__": 43 - }, { "__id__": 45 }, { "__id__": 47 + }, + { + "__id__": 49 + }, + { + "__id__": 51 + }, + { + "__id__": 53 + }, + { + "__id__": 55 } ], "_prefab": { - "__id__": 49 + "__id__": 57 }, "_lpos": { "__type__": "cc.Vec3", @@ -81,6 +84,118 @@ }, "_id": "" }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_prefab": { + "__id__": 3 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 2 + }, + "asset": { + "__uuid__": "1e4a101d-7d40-4611-8ccf-f2408bed7bf2", + "__expectedType__": "cc.Prefab" + }, + "fileId": "68mbLQeptP8Kf2mAvL01yn", + "instance": { + "__id__": 4 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "09x8z+WzxA1LtUw9dOiivf", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 5 + }, + { + "__id__": 7 + }, + { + "__id__": 8 + }, + { + "__id__": 9 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_name" + ], + "value": "shadow" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "68mbLQeptP8Kf2mAvL01yn" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 5, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, { "__type__": "cc.Node", "_name": "anm", @@ -92,24 +207,24 @@ "_children": [], "_active": true, "_components": [ - { - "__id__": 3 - }, - { - "__id__": 5 - }, - { - "__id__": 7 - }, - { - "__id__": 9 - }, { "__id__": 11 + }, + { + "__id__": 13 + }, + { + "__id__": 15 + }, + { + "__id__": 17 + }, + { + "__id__": 19 } ], "_prefab": { - "__id__": 13 + "__id__": 21 }, "_lpos": { "__type__": "cc.Vec3", @@ -146,11 +261,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 4 + "__id__": 12 }, "_contentSize": { "__type__": "cc.Size", @@ -174,11 +289,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 6 + "__id__": 14 }, "_id": "" }, @@ -192,11 +307,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 8 + "__id__": 16 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -240,11 +355,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 10 + "__id__": 18 }, "hitFlashMaterial": { "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810", @@ -278,11 +393,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 12 + "__id__": 20 }, "playOnLoad": false, "_clips": [ @@ -334,14 +449,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 15 + "__id__": 23 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 14 + "__id__": 22 }, "asset": { "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", @@ -349,7 +464,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 16 + "__id__": 24 }, "targetOverrides": null }, @@ -362,26 +477,26 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 17 - }, - { - "__id__": 19 - }, - { - "__id__": 20 - }, - { - "__id__": 21 - }, - { - "__id__": 22 - }, - { - "__id__": 23 - }, { "__id__": 25 + }, + { + "__id__": 27 + }, + { + "__id__": 28 + }, + { + "__id__": 29 + }, + { + "__id__": 30 + }, + { + "__id__": 31 + }, + { + "__id__": 33 } ], "removedComponents": [] @@ -389,7 +504,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 26 }, "propertyPath": [ "_name" @@ -405,7 +520,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 26 }, "propertyPath": [ "_lpos" @@ -420,7 +535,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 26 }, "propertyPath": [ "_lrot" @@ -436,7 +551,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 26 }, "propertyPath": [ "_euler" @@ -451,7 +566,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 26 }, "propertyPath": [ "_active" @@ -461,7 +576,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 24 + "__id__": 32 }, "propertyPath": [ "_contentSize" @@ -481,7 +596,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 26 }, "propertyPath": [ "_lscale" @@ -500,14 +615,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 27 + "__id__": 35 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 26 + "__id__": 34 }, "asset": { "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", @@ -515,7 +630,7 @@ }, "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { - "__id__": 28 + "__id__": 36 }, "targetOverrides": null }, @@ -529,22 +644,22 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 29 + "__id__": 37 }, { - "__id__": 31 + "__id__": 39 }, { - "__id__": 32 + "__id__": 40 }, { - "__id__": 33 + "__id__": 41 }, { - "__id__": 34 + "__id__": 42 }, { - "__id__": 36 + "__id__": 44 } ], "removedComponents": [] @@ -552,7 +667,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 38 }, "propertyPath": [ "_name" @@ -568,7 +683,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 38 }, "propertyPath": [ "_lpos" @@ -583,7 +698,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 38 }, "propertyPath": [ "_lrot" @@ -599,7 +714,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 38 }, "propertyPath": [ "_euler" @@ -614,7 +729,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 35 + "__id__": 43 }, "propertyPath": [ "_lpos" @@ -635,7 +750,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 38 }, "propertyPath": [ "_lscale" @@ -657,7 +772,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 38 + "__id__": 46 }, "_contentSize": { "__type__": "cc.Size", @@ -685,10 +800,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 40 + "__id__": 48 }, "anm": { - "__id__": 5 + "__id__": 13 }, "_id": "" }, @@ -706,7 +821,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 42 + "__id__": 50 }, "debugMode": false, "_id": "" @@ -725,7 +840,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 52 }, "enabledContactListener": true, "bullet": false, @@ -759,7 +874,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 54 }, "tag": 0, "_group": 4, @@ -793,7 +908,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 56 }, "playOnLoad": false, "_clips": [], @@ -817,10 +932,13 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 26 + "__id__": 34 }, { - "__id__": 14 + "__id__": 22 + }, + { + "__id__": 2 } ] } diff --git a/assets/resources/game/heros/hk1.prefab b/assets/resources/game/heros/hk1.prefab index 2ecf0ec2..150fb141 100644 --- a/assets/resources/game/heros/hk1.prefab +++ b/assets/resources/game/heros/hk1.prefab @@ -22,35 +22,38 @@ "__id__": 2 }, { - "__id__": 14 + "__id__": 10 }, { - "__id__": 26 + "__id__": 22 + }, + { + "__id__": 34 } ], "_active": true, "_components": [ - { - "__id__": 37 - }, - { - "__id__": 39 - }, - { - "__id__": 41 - }, - { - "__id__": 43 - }, { "__id__": 45 }, { "__id__": 47 + }, + { + "__id__": 49 + }, + { + "__id__": 51 + }, + { + "__id__": 53 + }, + { + "__id__": 55 } ], "_prefab": { - "__id__": 49 + "__id__": 57 }, "_lpos": { "__type__": "cc.Vec3", @@ -81,6 +84,118 @@ }, "_id": "" }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_prefab": { + "__id__": 3 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 2 + }, + "asset": { + "__uuid__": "1e4a101d-7d40-4611-8ccf-f2408bed7bf2", + "__expectedType__": "cc.Prefab" + }, + "fileId": "68mbLQeptP8Kf2mAvL01yn", + "instance": { + "__id__": 4 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "ddCDv7+IhHBJLaCJOa4ZWR", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 5 + }, + { + "__id__": 7 + }, + { + "__id__": 8 + }, + { + "__id__": 9 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_name" + ], + "value": "shadow" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "68mbLQeptP8Kf2mAvL01yn" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 5, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, { "__type__": "cc.Node", "_name": "anm", @@ -92,24 +207,24 @@ "_children": [], "_active": true, "_components": [ - { - "__id__": 3 - }, - { - "__id__": 5 - }, - { - "__id__": 7 - }, - { - "__id__": 9 - }, { "__id__": 11 + }, + { + "__id__": 13 + }, + { + "__id__": 15 + }, + { + "__id__": 17 + }, + { + "__id__": 19 } ], "_prefab": { - "__id__": 13 + "__id__": 21 }, "_lpos": { "__type__": "cc.Vec3", @@ -146,11 +261,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 4 + "__id__": 12 }, "_contentSize": { "__type__": "cc.Size", @@ -174,11 +289,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 6 + "__id__": 14 }, "_id": "" }, @@ -192,11 +307,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 8 + "__id__": 16 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -240,11 +355,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 10 + "__id__": 18 }, "hitFlashMaterial": { "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810", @@ -278,11 +393,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 12 + "__id__": 20 }, "playOnLoad": false, "_clips": [ @@ -334,14 +449,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 15 + "__id__": 23 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 14 + "__id__": 22 }, "asset": { "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", @@ -349,7 +464,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 16 + "__id__": 24 }, "targetOverrides": null }, @@ -362,26 +477,26 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 17 - }, - { - "__id__": 19 - }, - { - "__id__": 20 - }, - { - "__id__": 21 - }, - { - "__id__": 22 - }, - { - "__id__": 23 - }, { "__id__": 25 + }, + { + "__id__": 27 + }, + { + "__id__": 28 + }, + { + "__id__": 29 + }, + { + "__id__": 30 + }, + { + "__id__": 31 + }, + { + "__id__": 33 } ], "removedComponents": [] @@ -389,7 +504,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 26 }, "propertyPath": [ "_name" @@ -405,7 +520,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 26 }, "propertyPath": [ "_lpos" @@ -420,7 +535,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 26 }, "propertyPath": [ "_lrot" @@ -436,7 +551,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 26 }, "propertyPath": [ "_euler" @@ -451,7 +566,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 26 }, "propertyPath": [ "_active" @@ -461,7 +576,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 24 + "__id__": 32 }, "propertyPath": [ "_contentSize" @@ -481,7 +596,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 26 }, "propertyPath": [ "_lscale" @@ -500,14 +615,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 27 + "__id__": 35 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 26 + "__id__": 34 }, "asset": { "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", @@ -515,7 +630,7 @@ }, "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { - "__id__": 28 + "__id__": 36 }, "targetOverrides": null }, @@ -529,22 +644,22 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 29 + "__id__": 37 }, { - "__id__": 31 + "__id__": 39 }, { - "__id__": 32 + "__id__": 40 }, { - "__id__": 33 + "__id__": 41 }, { - "__id__": 34 + "__id__": 42 }, { - "__id__": 36 + "__id__": 44 } ], "removedComponents": [] @@ -552,7 +667,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 38 }, "propertyPath": [ "_name" @@ -568,7 +683,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 38 }, "propertyPath": [ "_lpos" @@ -583,7 +698,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 38 }, "propertyPath": [ "_lrot" @@ -599,7 +714,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 38 }, "propertyPath": [ "_euler" @@ -614,7 +729,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 35 + "__id__": 43 }, "propertyPath": [ "_lpos" @@ -635,7 +750,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 38 }, "propertyPath": [ "_lscale" @@ -657,7 +772,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 38 + "__id__": 46 }, "_contentSize": { "__type__": "cc.Size", @@ -685,10 +800,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 40 + "__id__": 48 }, "anm": { - "__id__": 5 + "__id__": 13 }, "_id": "" }, @@ -706,7 +821,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 42 + "__id__": 50 }, "debugMode": false, "_id": "" @@ -725,7 +840,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 52 }, "enabledContactListener": true, "bullet": false, @@ -759,7 +874,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 54 }, "tag": 0, "_group": 4, @@ -793,7 +908,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 56 }, "playOnLoad": false, "_clips": [], @@ -817,10 +932,13 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 26 + "__id__": 34 }, { - "__id__": 14 + "__id__": 22 + }, + { + "__id__": 2 } ] } diff --git a/assets/resources/game/heros/hk2.prefab b/assets/resources/game/heros/hk2.prefab index c9e18286..2e935055 100644 --- a/assets/resources/game/heros/hk2.prefab +++ b/assets/resources/game/heros/hk2.prefab @@ -22,35 +22,38 @@ "__id__": 2 }, { - "__id__": 14 + "__id__": 15 }, { - "__id__": 26 + "__id__": 27 + }, + { + "__id__": 39 } ], "_active": true, "_components": [ { - "__id__": 37 + "__id__": 50 }, { - "__id__": 39 + "__id__": 52 }, { - "__id__": 41 + "__id__": 54 }, { - "__id__": 43 + "__id__": 56 }, { - "__id__": 45 + "__id__": 58 }, { - "__id__": 47 + "__id__": 60 } ], "_prefab": { - "__id__": 49 + "__id__": 62 }, "_lpos": { "__type__": "cc.Vec3", @@ -83,18 +86,39 @@ }, { "__type__": "cc.Node", - "_name": "anm", "_objFlags": 0, - "__editorExtras__": {}, "_parent": { "__id__": 1 }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 3 - }, + "_prefab": { + "__id__": 3 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 2 + }, + "asset": { + "__uuid__": "1e4a101d-7d40-4611-8ccf-f2408bed7bf2", + "__expectedType__": "cc.Prefab" + }, + "fileId": "68mbLQeptP8Kf2mAvL01yn", + "instance": { + "__id__": 4 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "7dHkDo/dNBOrS6Xt9bVrps", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ { "__id__": 5 }, @@ -106,15 +130,143 @@ }, { "__id__": 11 + }, + { + "__id__": 13 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_name" + ], + "value": "shadow" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "68mbLQeptP8Kf2mAvL01yn" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 8 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 5, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "68mbLQeptP8Kf2mAvL01yn" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 10 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "68mbLQeptP8Kf2mAvL01yn" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 12 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "68mbLQeptP8Kf2mAvL01yn" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 14 + }, + "propertyPath": [ + "_active" + ], + "value": true + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "68mbLQeptP8Kf2mAvL01yn" + ] + }, + { + "__type__": "cc.Node", + "_name": "anm", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 16 + }, + { + "__id__": 18 + }, + { + "__id__": 20 + }, + { + "__id__": 22 + }, + { + "__id__": 24 } ], "_prefab": { - "__id__": 13 + "__id__": 26 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -25, + "y": -27.031, "z": 0 }, "_lrot": { @@ -126,8 +278,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -1, - "y": 1, + "x": -1.1, + "y": 1.1, "z": 1 }, "_mobility": 0, @@ -146,11 +298,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 15 }, "_enabled": true, "__prefab": { - "__id__": 4 + "__id__": 17 }, "_contentSize": { "__type__": "cc.Size", @@ -174,11 +326,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 15 }, "_enabled": true, "__prefab": { - "__id__": 6 + "__id__": 19 }, "_id": "" }, @@ -192,11 +344,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 15 }, "_enabled": true, "__prefab": { - "__id__": 8 + "__id__": 21 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -240,11 +392,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 15 }, "_enabled": true, "__prefab": { - "__id__": 10 + "__id__": 23 }, "hitFlashMaterial": { "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810", @@ -278,11 +430,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 15 }, "_enabled": true, "__prefab": { - "__id__": 12 + "__id__": 25 }, "playOnLoad": false, "_clips": [ @@ -334,14 +486,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 15 + "__id__": 28 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 14 + "__id__": 27 }, "asset": { "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", @@ -349,7 +501,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 16 + "__id__": 29 }, "targetOverrides": null }, @@ -363,25 +515,25 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 17 + "__id__": 30 }, { - "__id__": 19 + "__id__": 32 }, { - "__id__": 20 + "__id__": 33 }, { - "__id__": 21 + "__id__": 34 }, { - "__id__": 22 + "__id__": 35 }, { - "__id__": 23 + "__id__": 36 }, { - "__id__": 25 + "__id__": 38 } ], "removedComponents": [] @@ -389,7 +541,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 31 }, "propertyPath": [ "_name" @@ -405,7 +557,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 31 }, "propertyPath": [ "_lpos" @@ -420,7 +572,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 31 }, "propertyPath": [ "_lrot" @@ -436,7 +588,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 31 }, "propertyPath": [ "_euler" @@ -451,7 +603,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 31 }, "propertyPath": [ "_active" @@ -461,7 +613,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 24 + "__id__": 37 }, "propertyPath": [ "_contentSize" @@ -481,7 +633,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 31 }, "propertyPath": [ "_lscale" @@ -500,14 +652,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 27 + "__id__": 40 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 26 + "__id__": 39 }, "asset": { "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", @@ -515,7 +667,7 @@ }, "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { - "__id__": 28 + "__id__": 41 }, "targetOverrides": null }, @@ -529,22 +681,22 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 29 + "__id__": 42 }, { - "__id__": 31 + "__id__": 44 }, { - "__id__": 32 + "__id__": 45 }, { - "__id__": 33 + "__id__": 46 }, { - "__id__": 34 + "__id__": 47 }, { - "__id__": 36 + "__id__": 49 } ], "removedComponents": [] @@ -552,7 +704,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 43 }, "propertyPath": [ "_name" @@ -568,7 +720,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 43 }, "propertyPath": [ "_lpos" @@ -583,7 +735,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 43 }, "propertyPath": [ "_lrot" @@ -599,7 +751,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 43 }, "propertyPath": [ "_euler" @@ -614,7 +766,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 35 + "__id__": 48 }, "propertyPath": [ "_lpos" @@ -635,7 +787,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 43 }, "propertyPath": [ "_lscale" @@ -657,7 +809,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 38 + "__id__": 51 }, "_contentSize": { "__type__": "cc.Size", @@ -685,10 +837,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 40 + "__id__": 53 }, "anm": { - "__id__": 5 + "__id__": 18 }, "_id": "" }, @@ -706,7 +858,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 42 + "__id__": 55 }, "debugMode": false, "_id": "" @@ -725,7 +877,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 57 }, "enabledContactListener": true, "bullet": false, @@ -759,7 +911,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 59 }, "tag": 0, "_group": 4, @@ -793,7 +945,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 61 }, "playOnLoad": false, "_clips": [], @@ -817,10 +969,13 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 26 + "__id__": 39 }, { - "__id__": 14 + "__id__": 27 + }, + { + "__id__": 2 } ] } diff --git a/assets/resources/game/heros/hk3.prefab b/assets/resources/game/heros/hk3.prefab index 09fa872e..b2416cb2 100644 --- a/assets/resources/game/heros/hk3.prefab +++ b/assets/resources/game/heros/hk3.prefab @@ -22,35 +22,38 @@ "__id__": 2 }, { - "__id__": 14 + "__id__": 10 }, { - "__id__": 26 + "__id__": 22 + }, + { + "__id__": 34 } ], "_active": true, "_components": [ - { - "__id__": 37 - }, - { - "__id__": 39 - }, - { - "__id__": 41 - }, - { - "__id__": 43 - }, { "__id__": 45 }, { "__id__": 47 + }, + { + "__id__": 49 + }, + { + "__id__": 51 + }, + { + "__id__": 53 + }, + { + "__id__": 55 } ], "_prefab": { - "__id__": 49 + "__id__": 57 }, "_lpos": { "__type__": "cc.Vec3", @@ -81,6 +84,118 @@ }, "_id": "" }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_prefab": { + "__id__": 3 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 2 + }, + "asset": { + "__uuid__": "1e4a101d-7d40-4611-8ccf-f2408bed7bf2", + "__expectedType__": "cc.Prefab" + }, + "fileId": "68mbLQeptP8Kf2mAvL01yn", + "instance": { + "__id__": 4 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "45sqtWpPxA6JSxQ5BBEc63", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 5 + }, + { + "__id__": 7 + }, + { + "__id__": 8 + }, + { + "__id__": 9 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_name" + ], + "value": "shadow" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "68mbLQeptP8Kf2mAvL01yn" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 5, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, { "__type__": "cc.Node", "_name": "anm", @@ -92,24 +207,24 @@ "_children": [], "_active": true, "_components": [ - { - "__id__": 3 - }, - { - "__id__": 5 - }, - { - "__id__": 7 - }, - { - "__id__": 9 - }, { "__id__": 11 + }, + { + "__id__": 13 + }, + { + "__id__": 15 + }, + { + "__id__": 17 + }, + { + "__id__": 19 } ], "_prefab": { - "__id__": 13 + "__id__": 21 }, "_lpos": { "__type__": "cc.Vec3", @@ -146,11 +261,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 4 + "__id__": 12 }, "_contentSize": { "__type__": "cc.Size", @@ -174,11 +289,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 6 + "__id__": 14 }, "_id": "" }, @@ -192,11 +307,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 8 + "__id__": 16 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -240,11 +355,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 10 + "__id__": 18 }, "hitFlashMaterial": { "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810", @@ -278,11 +393,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 12 + "__id__": 20 }, "playOnLoad": false, "_clips": [ @@ -334,14 +449,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 15 + "__id__": 23 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 14 + "__id__": 22 }, "asset": { "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", @@ -349,7 +464,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 16 + "__id__": 24 }, "targetOverrides": null }, @@ -362,26 +477,26 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 17 - }, - { - "__id__": 19 - }, - { - "__id__": 20 - }, - { - "__id__": 21 - }, - { - "__id__": 22 - }, - { - "__id__": 23 - }, { "__id__": 25 + }, + { + "__id__": 27 + }, + { + "__id__": 28 + }, + { + "__id__": 29 + }, + { + "__id__": 30 + }, + { + "__id__": 31 + }, + { + "__id__": 33 } ], "removedComponents": [] @@ -389,7 +504,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 26 }, "propertyPath": [ "_name" @@ -405,7 +520,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 26 }, "propertyPath": [ "_lpos" @@ -420,7 +535,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 26 }, "propertyPath": [ "_lrot" @@ -436,7 +551,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 26 }, "propertyPath": [ "_euler" @@ -451,7 +566,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 26 }, "propertyPath": [ "_active" @@ -461,7 +576,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 24 + "__id__": 32 }, "propertyPath": [ "_contentSize" @@ -481,7 +596,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 26 }, "propertyPath": [ "_lscale" @@ -500,14 +615,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 27 + "__id__": 35 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 26 + "__id__": 34 }, "asset": { "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", @@ -515,7 +630,7 @@ }, "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { - "__id__": 28 + "__id__": 36 }, "targetOverrides": null }, @@ -529,22 +644,22 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 29 + "__id__": 37 }, { - "__id__": 31 + "__id__": 39 }, { - "__id__": 32 + "__id__": 40 }, { - "__id__": 33 + "__id__": 41 }, { - "__id__": 34 + "__id__": 42 }, { - "__id__": 36 + "__id__": 44 } ], "removedComponents": [] @@ -552,7 +667,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 38 }, "propertyPath": [ "_name" @@ -568,7 +683,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 38 }, "propertyPath": [ "_lpos" @@ -583,7 +698,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 38 }, "propertyPath": [ "_lrot" @@ -599,7 +714,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 38 }, "propertyPath": [ "_euler" @@ -614,7 +729,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 35 + "__id__": 43 }, "propertyPath": [ "_lpos" @@ -635,7 +750,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 38 }, "propertyPath": [ "_lscale" @@ -657,7 +772,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 38 + "__id__": 46 }, "_contentSize": { "__type__": "cc.Size", @@ -685,10 +800,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 40 + "__id__": 48 }, "anm": { - "__id__": 5 + "__id__": 13 }, "_id": "" }, @@ -706,7 +821,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 42 + "__id__": 50 }, "debugMode": false, "_id": "" @@ -725,7 +840,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 52 }, "enabledContactListener": true, "bullet": false, @@ -759,7 +874,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 54 }, "tag": 0, "_group": 4, @@ -793,7 +908,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 56 }, "playOnLoad": false, "_clips": [], @@ -817,10 +932,13 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 26 + "__id__": 34 }, { - "__id__": 14 + "__id__": 22 + }, + { + "__id__": 2 } ] } diff --git a/assets/script/game/common/config/GameEvent.ts b/assets/script/game/common/config/GameEvent.ts index 62c21aba..514abd84 100644 --- a/assets/script/game/common/config/GameEvent.ts +++ b/assets/script/game/common/config/GameEvent.ts @@ -63,6 +63,7 @@ export enum GameEvent { HeroUnlock = "HeroUnlock", MonDead = "MonDead", HeroDead = "HeroDead", + HeroSell = "HeroSell", GOLD_UPDATE = "GOLD_UPDATE", DIAMOND_UPDATE = "DIAMOND_UPDATE", MEAT_UPDATE = "MEAT_UPDATE", diff --git a/assets/script/game/hero/Hero.ts b/assets/script/game/hero/Hero.ts index f26f13a5..79c4ede1 100644 --- a/assets/script/game/hero/Hero.ts +++ b/assets/script/game/hero/Hero.ts @@ -300,12 +300,6 @@ export class BattleEntityLifecycleSystem extends ecs.ComblockSystem const label = this.resolveLabel(heroAttrs); if (heroAttrs) { mLogger.log(heroAttrs.debugMode, 'BattleEntityLifecycle', `${label}离开世界: ${heroAttrs.hero_name}`); - if (heroAttrs.fac === FacSet.HERO) { - oops.message.dispatchEvent(GameEvent.HeroDead, { - eid: e.eid, - model: heroAttrs - }); - } } else { mLogger.log(true, 'BattleEntityLifecycle', `${label}离开世界: 实体ID ${e.eid}`); } diff --git a/assets/script/game/map/HInfoComp.ts b/assets/script/game/map/HInfoComp.ts index 80459bf8..017149a2 100644 --- a/assets/script/game/map/HInfoComp.ts +++ b/assets/script/game/map/HInfoComp.ts @@ -309,6 +309,9 @@ export class HInfoComp extends CCComp { // 使用统一经济管理入口出售英雄（按等级计算卖价） MissionEconomy.executeSellHero(heroLv); + // 派发英雄出售事件，通知 MissionCardComp 更新场上英雄数量 + oops.message.dispatchEvent(GameEvent.HeroSell, { eid: this.eid }); + this.isClosing = true; oops.gui.remove(UIID.HInfo); } diff --git a/assets/script/game/map/MissionCardComp.ts b/assets/script/game/map/MissionCardComp.ts index e7720f70..93546db3 100644 --- a/assets/script/game/map/MissionCardComp.ts +++ b/assets/script/game/map/MissionCardComp.ts @@ -257,6 +257,7 @@ export class MissionCardComp extends CCComp { oops.message.on(GameEvent.CoinAdd, this.onCoinAdd, this); oops.message.on(GameEvent.MasterCalled, this.onMasterCalled, this); oops.message.on(GameEvent.HeroDead, this.onHeroDead, this); + oops.message.on(GameEvent.HeroSell, this.onHeroSell, this); oops.message.on(GameEvent.UseHeroCard, this.onUseHeroCard, this); oops.message.on(GameEvent.UseSpecialCard, this.onUseSpecialCard, this); oops.message.on(GameEvent.CardPoolUpgrade, this.onCardPoolUpgrade, this); @@ -337,6 +338,7 @@ export class MissionCardComp extends CCComp { oops.message.off(GameEvent.CoinAdd, this.onCoinAdd, this); oops.message.off(GameEvent.MasterCalled, this.onMasterCalled, this); oops.message.off(GameEvent.HeroDead, this.onHeroDead, this); + oops.message.off(GameEvent.HeroSell, this.onHeroSell, this); oops.message.off(GameEvent.UseHeroCard, this.onUseHeroCard, this); oops.message.off(GameEvent.UseSpecialCard, this.onUseSpecialCard, this); oops.message.off(GameEvent.CardPoolUpgrade, this.onCardPoolUpgrade, this); @@ -372,6 +374,11 @@ export class MissionCardComp extends CCComp { this.updateHeroNumUI(true, false); } + /** 英雄被出售事件回调：更新英雄数量 UI */ + private onHeroSell() { + this.updateHeroNumUI(true, false); + } + /** * 使用英雄卡的 guard 校验（由 CardComp 通过 UseHeroCard 事件调用）： * - 当前英雄数 < 上限 → 允许使用。 @@ -847,7 +854,7 @@ export class MissionCardComp extends CCComp { let count = 0; ecs.query(ecs.allOf(HeroAttrsComp)).forEach((entity: ecs.Entity) => { const model = entity.get(HeroAttrsComp); - if (model && model.fac === FacSet.HERO && !model.is_dead) { + if (model && model.fac === FacSet.HERO ) { count++; } }); @@ -972,8 +979,8 @@ export class MissionCardComp extends CCComp { private getMissionHeroMaxNum(): number { - const missionData = this.getMissionData(); - return Math.max(FightSet.HERO_MAX_NUM, Math.floor(missionData?.hero_max_num ?? FightSet.HERO_MAX_NUM)); + + return FightSet.HERO_MAX_NUM } private syncMissionHeroData(count?: number) {