feat(map): 新增英雄出售事件并更新场上英雄数量UI

- 新增GameEvent.HeroSell事件枚举,在英雄出售时派发通知
- 在HInfoComp中添加事件派发代码,在MissionCardComp中注册监听更新UI
- 调整英雄统计逻辑与事件派发逻辑,简化最大英雄数量获取函数
- 为多款英雄预制体添加影子显示组件
This commit is contained in:
walkpan
2026-05-24 22:34:20 +08:00
parent 429c07cc79
commit dfaa55b864
9 changed files with 1073 additions and 441 deletions

View File

@@ -22,35 +22,38 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 14 "__id__": 10
}, },
{ {
"__id__": 26 "__id__": 22
},
{
"__id__": 34
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 37
},
{
"__id__": 39
},
{
"__id__": 41
},
{
"__id__": 43
},
{ {
"__id__": 45 "__id__": 45
}, },
{ {
"__id__": 47 "__id__": 47
},
{
"__id__": 49
},
{
"__id__": 51
},
{
"__id__": 53
},
{
"__id__": 55
} }
], ],
"_prefab": { "_prefab": {
"__id__": 49 "__id__": 57
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -81,6 +84,118 @@
}, },
"_id": "" "_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", "__type__": "cc.Node",
"_name": "anm", "_name": "anm",
@@ -92,24 +207,24 @@
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 3
},
{
"__id__": 5
},
{
"__id__": 7
},
{
"__id__": 9
},
{ {
"__id__": 11 "__id__": 11
},
{
"__id__": 13
},
{
"__id__": 15
},
{
"__id__": 17
},
{
"__id__": 19
} }
], ],
"_prefab": { "_prefab": {
"__id__": 13 "__id__": 21
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -146,11 +261,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 2 "__id__": 10
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 4 "__id__": 12
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -174,11 +289,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 2 "__id__": 10
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 6 "__id__": 14
}, },
"_id": "" "_id": ""
}, },
@@ -192,11 +307,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 2 "__id__": 10
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 8 "__id__": 16
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
@@ -240,11 +355,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 2 "__id__": 10
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 10 "__id__": 18
}, },
"hitFlashMaterial": { "hitFlashMaterial": {
"__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810", "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810",
@@ -278,11 +393,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 2 "__id__": 10
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 12 "__id__": 20
}, },
"playOnLoad": false, "playOnLoad": false,
"_clips": [ "_clips": [
@@ -334,14 +449,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 15 "__id__": 23
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 14 "__id__": 22
}, },
"asset": { "asset": {
"__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -349,7 +464,7 @@
}, },
"fileId": "c46/YsCPVOJYA4mWEpNYRx", "fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": { "instance": {
"__id__": 16 "__id__": 24
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -362,26 +477,26 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 17
},
{
"__id__": 19
},
{
"__id__": 20
},
{
"__id__": 21
},
{
"__id__": 22
},
{
"__id__": 23
},
{ {
"__id__": 25 "__id__": 25
},
{
"__id__": 27
},
{
"__id__": 28
},
{
"__id__": 29
},
{
"__id__": 30
},
{
"__id__": 31
},
{
"__id__": 33
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -389,7 +504,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 18 "__id__": 26
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -405,7 +520,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 18 "__id__": 26
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -420,7 +535,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 18 "__id__": 26
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -436,7 +551,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 18 "__id__": 26
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -451,7 +566,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 18 "__id__": 26
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -461,7 +576,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 24 "__id__": 32
}, },
"propertyPath": [ "propertyPath": [
"_contentSize" "_contentSize"
@@ -481,7 +596,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 18 "__id__": 26
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
@@ -500,14 +615,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 27 "__id__": 35
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 26 "__id__": 34
}, },
"asset": { "asset": {
"__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -515,7 +630,7 @@
}, },
"fileId": "5fqU0L3/FOhKaco5UkHuWT", "fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": { "instance": {
"__id__": 28 "__id__": 36
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -529,22 +644,22 @@
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "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": [] "removedComponents": []
@@ -552,7 +667,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 30 "__id__": 38
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -568,7 +683,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 30 "__id__": 38
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -583,7 +698,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 30 "__id__": 38
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -599,7 +714,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 30 "__id__": 38
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -614,7 +729,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 35 "__id__": 43
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -635,7 +750,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 30 "__id__": 38
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
@@ -657,7 +772,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 38 "__id__": 46
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -685,10 +800,10 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 40 "__id__": 48
}, },
"anm": { "anm": {
"__id__": 5 "__id__": 13
}, },
"_id": "" "_id": ""
}, },
@@ -706,7 +821,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 42 "__id__": 50
}, },
"debugMode": false, "debugMode": false,
"_id": "" "_id": ""
@@ -725,7 +840,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 44 "__id__": 52
}, },
"enabledContactListener": true, "enabledContactListener": true,
"bullet": false, "bullet": false,
@@ -759,7 +874,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 46 "__id__": 54
}, },
"tag": 0, "tag": 0,
"_group": 4, "_group": 4,
@@ -793,7 +908,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 48 "__id__": 56
}, },
"playOnLoad": false, "playOnLoad": false,
"_clips": [], "_clips": [],
@@ -817,10 +932,13 @@
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": [ "nestedPrefabInstanceRoots": [
{ {
"__id__": 26 "__id__": 34
}, },
{ {
"__id__": 14 "__id__": 22
},
{
"__id__": 2
} }
] ]
} }

View File

@@ -22,35 +22,38 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 14 "__id__": 10
}, },
{ {
"__id__": 26 "__id__": 22
},
{
"__id__": 34
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 37
},
{
"__id__": 39
},
{
"__id__": 41
},
{
"__id__": 43
},
{ {
"__id__": 45 "__id__": 45
}, },
{ {
"__id__": 47 "__id__": 47
},
{
"__id__": 49
},
{
"__id__": 51
},
{
"__id__": 53
},
{
"__id__": 55
} }
], ],
"_prefab": { "_prefab": {
"__id__": 49 "__id__": 57
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -81,6 +84,118 @@
}, },
"_id": "" "_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", "__type__": "cc.Node",
"_name": "anm", "_name": "anm",
@@ -92,24 +207,24 @@
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 3
},
{
"__id__": 5
},
{
"__id__": 7
},
{
"__id__": 9
},
{ {
"__id__": 11 "__id__": 11
},
{
"__id__": 13
},
{
"__id__": 15
},
{
"__id__": 17
},
{
"__id__": 19
} }
], ],
"_prefab": { "_prefab": {
"__id__": 13 "__id__": 21
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -146,11 +261,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 2 "__id__": 10
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 4 "__id__": 12
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -174,11 +289,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 2 "__id__": 10
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 6 "__id__": 14
}, },
"_id": "" "_id": ""
}, },
@@ -192,11 +307,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 2 "__id__": 10
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 8 "__id__": 16
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
@@ -240,11 +355,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 2 "__id__": 10
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 10 "__id__": 18
}, },
"hitFlashMaterial": { "hitFlashMaterial": {
"__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810", "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810",
@@ -278,11 +393,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 2 "__id__": 10
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 12 "__id__": 20
}, },
"playOnLoad": false, "playOnLoad": false,
"_clips": [ "_clips": [
@@ -334,14 +449,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 15 "__id__": 23
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 14 "__id__": 22
}, },
"asset": { "asset": {
"__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -349,7 +464,7 @@
}, },
"fileId": "c46/YsCPVOJYA4mWEpNYRx", "fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": { "instance": {
"__id__": 16 "__id__": 24
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -362,26 +477,26 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 17
},
{
"__id__": 19
},
{
"__id__": 20
},
{
"__id__": 21
},
{
"__id__": 22
},
{
"__id__": 23
},
{ {
"__id__": 25 "__id__": 25
},
{
"__id__": 27
},
{
"__id__": 28
},
{
"__id__": 29
},
{
"__id__": 30
},
{
"__id__": 31
},
{
"__id__": 33
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -389,7 +504,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 18 "__id__": 26
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -405,7 +520,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 18 "__id__": 26
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -420,7 +535,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 18 "__id__": 26
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -436,7 +551,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 18 "__id__": 26
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -451,7 +566,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 18 "__id__": 26
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -461,7 +576,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 24 "__id__": 32
}, },
"propertyPath": [ "propertyPath": [
"_contentSize" "_contentSize"
@@ -481,7 +596,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 18 "__id__": 26
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
@@ -500,14 +615,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 27 "__id__": 35
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 26 "__id__": 34
}, },
"asset": { "asset": {
"__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -515,7 +630,7 @@
}, },
"fileId": "5fqU0L3/FOhKaco5UkHuWT", "fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": { "instance": {
"__id__": 28 "__id__": 36
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -529,22 +644,22 @@
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "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": [] "removedComponents": []
@@ -552,7 +667,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 30 "__id__": 38
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -568,7 +683,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 30 "__id__": 38
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -583,7 +698,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 30 "__id__": 38
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -599,7 +714,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 30 "__id__": 38
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -614,7 +729,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 35 "__id__": 43
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -635,7 +750,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 30 "__id__": 38
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
@@ -657,7 +772,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 38 "__id__": 46
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -685,10 +800,10 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 40 "__id__": 48
}, },
"anm": { "anm": {
"__id__": 5 "__id__": 13
}, },
"_id": "" "_id": ""
}, },
@@ -706,7 +821,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 42 "__id__": 50
}, },
"debugMode": false, "debugMode": false,
"_id": "" "_id": ""
@@ -725,7 +840,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 44 "__id__": 52
}, },
"enabledContactListener": true, "enabledContactListener": true,
"bullet": false, "bullet": false,
@@ -759,7 +874,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 46 "__id__": 54
}, },
"tag": 0, "tag": 0,
"_group": 4, "_group": 4,
@@ -793,7 +908,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 48 "__id__": 56
}, },
"playOnLoad": false, "playOnLoad": false,
"_clips": [], "_clips": [],
@@ -817,10 +932,13 @@
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": [ "nestedPrefabInstanceRoots": [
{ {
"__id__": 26 "__id__": 34
}, },
{ {
"__id__": 14 "__id__": 22
},
{
"__id__": 2
} }
] ]
} }

View File

@@ -22,35 +22,38 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 14 "__id__": 10
}, },
{ {
"__id__": 26 "__id__": 22
},
{
"__id__": 34
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 37
},
{
"__id__": 39
},
{
"__id__": 41
},
{
"__id__": 43
},
{ {
"__id__": 45 "__id__": 45
}, },
{ {
"__id__": 47 "__id__": 47
},
{
"__id__": 49
},
{
"__id__": 51
},
{
"__id__": 53
},
{
"__id__": 55
} }
], ],
"_prefab": { "_prefab": {
"__id__": 49 "__id__": 57
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -81,6 +84,118 @@
}, },
"_id": "" "_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", "__type__": "cc.Node",
"_name": "anm", "_name": "anm",
@@ -92,24 +207,24 @@
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 3
},
{
"__id__": 5
},
{
"__id__": 7
},
{
"__id__": 9
},
{ {
"__id__": 11 "__id__": 11
},
{
"__id__": 13
},
{
"__id__": 15
},
{
"__id__": 17
},
{
"__id__": 19
} }
], ],
"_prefab": { "_prefab": {
"__id__": 13 "__id__": 21
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -146,11 +261,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 2 "__id__": 10
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 4 "__id__": 12
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -174,11 +289,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 2 "__id__": 10
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 6 "__id__": 14
}, },
"_id": "" "_id": ""
}, },
@@ -192,11 +307,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 2 "__id__": 10
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 8 "__id__": 16
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
@@ -240,11 +355,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 2 "__id__": 10
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 10 "__id__": 18
}, },
"hitFlashMaterial": { "hitFlashMaterial": {
"__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810", "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810",
@@ -278,11 +393,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 2 "__id__": 10
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 12 "__id__": 20
}, },
"playOnLoad": false, "playOnLoad": false,
"_clips": [ "_clips": [
@@ -334,14 +449,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 15 "__id__": 23
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 14 "__id__": 22
}, },
"asset": { "asset": {
"__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -349,7 +464,7 @@
}, },
"fileId": "c46/YsCPVOJYA4mWEpNYRx", "fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": { "instance": {
"__id__": 16 "__id__": 24
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -362,26 +477,26 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 17
},
{
"__id__": 19
},
{
"__id__": 20
},
{
"__id__": 21
},
{
"__id__": 22
},
{
"__id__": 23
},
{ {
"__id__": 25 "__id__": 25
},
{
"__id__": 27
},
{
"__id__": 28
},
{
"__id__": 29
},
{
"__id__": 30
},
{
"__id__": 31
},
{
"__id__": 33
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -389,7 +504,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 18 "__id__": 26
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -405,7 +520,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 18 "__id__": 26
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -420,7 +535,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 18 "__id__": 26
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -436,7 +551,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 18 "__id__": 26
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -451,7 +566,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 18 "__id__": 26
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -461,7 +576,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 24 "__id__": 32
}, },
"propertyPath": [ "propertyPath": [
"_contentSize" "_contentSize"
@@ -481,7 +596,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 18 "__id__": 26
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
@@ -500,14 +615,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 27 "__id__": 35
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 26 "__id__": 34
}, },
"asset": { "asset": {
"__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -515,7 +630,7 @@
}, },
"fileId": "5fqU0L3/FOhKaco5UkHuWT", "fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": { "instance": {
"__id__": 28 "__id__": 36
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -529,22 +644,22 @@
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "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": [] "removedComponents": []
@@ -552,7 +667,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 30 "__id__": 38
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -568,7 +683,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 30 "__id__": 38
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -583,7 +698,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 30 "__id__": 38
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -599,7 +714,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 30 "__id__": 38
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -614,7 +729,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 35 "__id__": 43
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -635,7 +750,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 30 "__id__": 38
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
@@ -657,7 +772,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 38 "__id__": 46
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -685,10 +800,10 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 40 "__id__": 48
}, },
"anm": { "anm": {
"__id__": 5 "__id__": 13
}, },
"_id": "" "_id": ""
}, },
@@ -706,7 +821,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 42 "__id__": 50
}, },
"debugMode": false, "debugMode": false,
"_id": "" "_id": ""
@@ -725,7 +840,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 44 "__id__": 52
}, },
"enabledContactListener": true, "enabledContactListener": true,
"bullet": false, "bullet": false,
@@ -759,7 +874,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 46 "__id__": 54
}, },
"tag": 0, "tag": 0,
"_group": 4, "_group": 4,
@@ -793,7 +908,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 48 "__id__": 56
}, },
"playOnLoad": false, "playOnLoad": false,
"_clips": [], "_clips": [],
@@ -817,10 +932,13 @@
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": [ "nestedPrefabInstanceRoots": [
{ {
"__id__": 26 "__id__": 34
}, },
{ {
"__id__": 14 "__id__": 22
},
{
"__id__": 2
} }
] ]
} }

View File

@@ -22,35 +22,38 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 14 "__id__": 15
}, },
{ {
"__id__": 26 "__id__": 27
},
{
"__id__": 39
} }
], ],
"_active": true, "_active": true,
"_components": [ "_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": { "_prefab": {
"__id__": 49 "__id__": 62
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -83,18 +86,39 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "anm",
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 1 "__id__": 1
}, },
"_children": [], "_prefab": {
"_active": true,
"_components": [
{
"__id__": 3 "__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 "__id__": 5
}, },
@@ -106,15 +130,143 @@
}, },
{ {
"__id__": 11 "__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": { "_prefab": {
"__id__": 13 "__id__": 26
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": -25, "y": -27.031,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
@@ -126,8 +278,8 @@
}, },
"_lscale": { "_lscale": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": -1, "x": -1.1,
"y": 1, "y": 1.1,
"z": 1 "z": 1
}, },
"_mobility": 0, "_mobility": 0,
@@ -146,11 +298,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 2 "__id__": 15
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 4 "__id__": 17
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -174,11 +326,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 2 "__id__": 15
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 6 "__id__": 19
}, },
"_id": "" "_id": ""
}, },
@@ -192,11 +344,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 2 "__id__": 15
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 8 "__id__": 21
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
@@ -240,11 +392,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 2 "__id__": 15
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 10 "__id__": 23
}, },
"hitFlashMaterial": { "hitFlashMaterial": {
"__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810", "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810",
@@ -278,11 +430,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 2 "__id__": 15
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 12 "__id__": 25
}, },
"playOnLoad": false, "playOnLoad": false,
"_clips": [ "_clips": [
@@ -334,14 +486,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 15 "__id__": 28
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 14 "__id__": 27
}, },
"asset": { "asset": {
"__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -349,7 +501,7 @@
}, },
"fileId": "c46/YsCPVOJYA4mWEpNYRx", "fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": { "instance": {
"__id__": 16 "__id__": 29
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -363,25 +515,25 @@
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "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": [] "removedComponents": []
@@ -389,7 +541,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 18 "__id__": 31
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -405,7 +557,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 18 "__id__": 31
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -420,7 +572,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 18 "__id__": 31
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -436,7 +588,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 18 "__id__": 31
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -451,7 +603,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 18 "__id__": 31
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -461,7 +613,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 24 "__id__": 37
}, },
"propertyPath": [ "propertyPath": [
"_contentSize" "_contentSize"
@@ -481,7 +633,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 18 "__id__": 31
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
@@ -500,14 +652,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 27 "__id__": 40
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 26 "__id__": 39
}, },
"asset": { "asset": {
"__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -515,7 +667,7 @@
}, },
"fileId": "5fqU0L3/FOhKaco5UkHuWT", "fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": { "instance": {
"__id__": 28 "__id__": 41
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -529,22 +681,22 @@
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "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": [] "removedComponents": []
@@ -552,7 +704,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 30 "__id__": 43
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -568,7 +720,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 30 "__id__": 43
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -583,7 +735,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 30 "__id__": 43
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -599,7 +751,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 30 "__id__": 43
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -614,7 +766,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 35 "__id__": 48
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -635,7 +787,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 30 "__id__": 43
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
@@ -657,7 +809,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 38 "__id__": 51
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -685,10 +837,10 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 40 "__id__": 53
}, },
"anm": { "anm": {
"__id__": 5 "__id__": 18
}, },
"_id": "" "_id": ""
}, },
@@ -706,7 +858,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 42 "__id__": 55
}, },
"debugMode": false, "debugMode": false,
"_id": "" "_id": ""
@@ -725,7 +877,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 44 "__id__": 57
}, },
"enabledContactListener": true, "enabledContactListener": true,
"bullet": false, "bullet": false,
@@ -759,7 +911,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 46 "__id__": 59
}, },
"tag": 0, "tag": 0,
"_group": 4, "_group": 4,
@@ -793,7 +945,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 48 "__id__": 61
}, },
"playOnLoad": false, "playOnLoad": false,
"_clips": [], "_clips": [],
@@ -817,10 +969,13 @@
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": [ "nestedPrefabInstanceRoots": [
{ {
"__id__": 26 "__id__": 39
}, },
{ {
"__id__": 14 "__id__": 27
},
{
"__id__": 2
} }
] ]
} }

View File

@@ -22,35 +22,38 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 14 "__id__": 10
}, },
{ {
"__id__": 26 "__id__": 22
},
{
"__id__": 34
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 37
},
{
"__id__": 39
},
{
"__id__": 41
},
{
"__id__": 43
},
{ {
"__id__": 45 "__id__": 45
}, },
{ {
"__id__": 47 "__id__": 47
},
{
"__id__": 49
},
{
"__id__": 51
},
{
"__id__": 53
},
{
"__id__": 55
} }
], ],
"_prefab": { "_prefab": {
"__id__": 49 "__id__": 57
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -81,6 +84,118 @@
}, },
"_id": "" "_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", "__type__": "cc.Node",
"_name": "anm", "_name": "anm",
@@ -92,24 +207,24 @@
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 3
},
{
"__id__": 5
},
{
"__id__": 7
},
{
"__id__": 9
},
{ {
"__id__": 11 "__id__": 11
},
{
"__id__": 13
},
{
"__id__": 15
},
{
"__id__": 17
},
{
"__id__": 19
} }
], ],
"_prefab": { "_prefab": {
"__id__": 13 "__id__": 21
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -146,11 +261,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 2 "__id__": 10
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 4 "__id__": 12
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -174,11 +289,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 2 "__id__": 10
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 6 "__id__": 14
}, },
"_id": "" "_id": ""
}, },
@@ -192,11 +307,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 2 "__id__": 10
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 8 "__id__": 16
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
@@ -240,11 +355,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 2 "__id__": 10
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 10 "__id__": 18
}, },
"hitFlashMaterial": { "hitFlashMaterial": {
"__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810", "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810",
@@ -278,11 +393,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 2 "__id__": 10
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 12 "__id__": 20
}, },
"playOnLoad": false, "playOnLoad": false,
"_clips": [ "_clips": [
@@ -334,14 +449,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 15 "__id__": 23
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 14 "__id__": 22
}, },
"asset": { "asset": {
"__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -349,7 +464,7 @@
}, },
"fileId": "c46/YsCPVOJYA4mWEpNYRx", "fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": { "instance": {
"__id__": 16 "__id__": 24
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -362,26 +477,26 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 17
},
{
"__id__": 19
},
{
"__id__": 20
},
{
"__id__": 21
},
{
"__id__": 22
},
{
"__id__": 23
},
{ {
"__id__": 25 "__id__": 25
},
{
"__id__": 27
},
{
"__id__": 28
},
{
"__id__": 29
},
{
"__id__": 30
},
{
"__id__": 31
},
{
"__id__": 33
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -389,7 +504,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 18 "__id__": 26
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -405,7 +520,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 18 "__id__": 26
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -420,7 +535,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 18 "__id__": 26
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -436,7 +551,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 18 "__id__": 26
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -451,7 +566,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 18 "__id__": 26
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -461,7 +576,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 24 "__id__": 32
}, },
"propertyPath": [ "propertyPath": [
"_contentSize" "_contentSize"
@@ -481,7 +596,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 18 "__id__": 26
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
@@ -500,14 +615,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 27 "__id__": 35
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 26 "__id__": 34
}, },
"asset": { "asset": {
"__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -515,7 +630,7 @@
}, },
"fileId": "5fqU0L3/FOhKaco5UkHuWT", "fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": { "instance": {
"__id__": 28 "__id__": 36
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -529,22 +644,22 @@
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "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": [] "removedComponents": []
@@ -552,7 +667,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 30 "__id__": 38
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -568,7 +683,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 30 "__id__": 38
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -583,7 +698,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 30 "__id__": 38
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -599,7 +714,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 30 "__id__": 38
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -614,7 +729,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 35 "__id__": 43
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -635,7 +750,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 30 "__id__": 38
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
@@ -657,7 +772,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 38 "__id__": 46
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -685,10 +800,10 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 40 "__id__": 48
}, },
"anm": { "anm": {
"__id__": 5 "__id__": 13
}, },
"_id": "" "_id": ""
}, },
@@ -706,7 +821,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 42 "__id__": 50
}, },
"debugMode": false, "debugMode": false,
"_id": "" "_id": ""
@@ -725,7 +840,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 44 "__id__": 52
}, },
"enabledContactListener": true, "enabledContactListener": true,
"bullet": false, "bullet": false,
@@ -759,7 +874,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 46 "__id__": 54
}, },
"tag": 0, "tag": 0,
"_group": 4, "_group": 4,
@@ -793,7 +908,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 48 "__id__": 56
}, },
"playOnLoad": false, "playOnLoad": false,
"_clips": [], "_clips": [],
@@ -817,10 +932,13 @@
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": [ "nestedPrefabInstanceRoots": [
{ {
"__id__": 26 "__id__": 34
}, },
{ {
"__id__": 14 "__id__": 22
},
{
"__id__": 2
} }
] ]
} }

View File

@@ -63,6 +63,7 @@ export enum GameEvent {
HeroUnlock = "HeroUnlock", HeroUnlock = "HeroUnlock",
MonDead = "MonDead", MonDead = "MonDead",
HeroDead = "HeroDead", HeroDead = "HeroDead",
HeroSell = "HeroSell",
GOLD_UPDATE = "GOLD_UPDATE", GOLD_UPDATE = "GOLD_UPDATE",
DIAMOND_UPDATE = "DIAMOND_UPDATE", DIAMOND_UPDATE = "DIAMOND_UPDATE",
MEAT_UPDATE = "MEAT_UPDATE", MEAT_UPDATE = "MEAT_UPDATE",

View File

@@ -300,12 +300,6 @@ export class BattleEntityLifecycleSystem extends ecs.ComblockSystem
const label = this.resolveLabel(heroAttrs); const label = this.resolveLabel(heroAttrs);
if (heroAttrs) { if (heroAttrs) {
mLogger.log(heroAttrs.debugMode, 'BattleEntityLifecycle', `${label}离开世界: ${heroAttrs.hero_name}`); 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 { } else {
mLogger.log(true, 'BattleEntityLifecycle', `${label}离开世界: 实体ID ${e.eid}`); mLogger.log(true, 'BattleEntityLifecycle', `${label}离开世界: 实体ID ${e.eid}`);
} }

View File

@@ -309,6 +309,9 @@ export class HInfoComp extends CCComp {
// 使用统一经济管理入口出售英雄(按等级计算卖价) // 使用统一经济管理入口出售英雄(按等级计算卖价)
MissionEconomy.executeSellHero(heroLv); MissionEconomy.executeSellHero(heroLv);
// 派发英雄出售事件,通知 MissionCardComp 更新场上英雄数量
oops.message.dispatchEvent(GameEvent.HeroSell, { eid: this.eid });
this.isClosing = true; this.isClosing = true;
oops.gui.remove(UIID.HInfo); oops.gui.remove(UIID.HInfo);
} }

View File

@@ -257,6 +257,7 @@ export class MissionCardComp extends CCComp {
oops.message.on(GameEvent.CoinAdd, this.onCoinAdd, this); oops.message.on(GameEvent.CoinAdd, this.onCoinAdd, this);
oops.message.on(GameEvent.MasterCalled, this.onMasterCalled, this); oops.message.on(GameEvent.MasterCalled, this.onMasterCalled, this);
oops.message.on(GameEvent.HeroDead, this.onHeroDead, 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.UseHeroCard, this.onUseHeroCard, this);
oops.message.on(GameEvent.UseSpecialCard, this.onUseSpecialCard, this); oops.message.on(GameEvent.UseSpecialCard, this.onUseSpecialCard, this);
oops.message.on(GameEvent.CardPoolUpgrade, this.onCardPoolUpgrade, 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.CoinAdd, this.onCoinAdd, this);
oops.message.off(GameEvent.MasterCalled, this.onMasterCalled, this); oops.message.off(GameEvent.MasterCalled, this.onMasterCalled, this);
oops.message.off(GameEvent.HeroDead, this.onHeroDead, 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.UseHeroCard, this.onUseHeroCard, this);
oops.message.off(GameEvent.UseSpecialCard, this.onUseSpecialCard, this); oops.message.off(GameEvent.UseSpecialCard, this.onUseSpecialCard, this);
oops.message.off(GameEvent.CardPoolUpgrade, this.onCardPoolUpgrade, this); oops.message.off(GameEvent.CardPoolUpgrade, this.onCardPoolUpgrade, this);
@@ -372,6 +374,11 @@ export class MissionCardComp extends CCComp {
this.updateHeroNumUI(true, false); this.updateHeroNumUI(true, false);
} }
/** 英雄被出售事件回调:更新英雄数量 UI */
private onHeroSell() {
this.updateHeroNumUI(true, false);
}
/** /**
* 使用英雄卡的 guard 校验(由 CardComp 通过 UseHeroCard 事件调用): * 使用英雄卡的 guard 校验(由 CardComp 通过 UseHeroCard 事件调用):
* - 当前英雄数 < 上限 → 允许使用。 * - 当前英雄数 < 上限 → 允许使用。
@@ -847,7 +854,7 @@ export class MissionCardComp extends CCComp {
let count = 0; let count = 0;
ecs.query(ecs.allOf(HeroAttrsComp)).forEach((entity: ecs.Entity) => { ecs.query(ecs.allOf(HeroAttrsComp)).forEach((entity: ecs.Entity) => {
const model = entity.get(HeroAttrsComp); const model = entity.get(HeroAttrsComp);
if (model && model.fac === FacSet.HERO && !model.is_dead) { if (model && model.fac === FacSet.HERO ) {
count++; count++;
} }
}); });
@@ -972,8 +979,8 @@ export class MissionCardComp extends CCComp {
private getMissionHeroMaxNum(): number { 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) { private syncMissionHeroData(count?: number) {