feat(hero): 添加受击闪光效果并重构相关代码

新增FlashSprite组件实现受击闪光效果
重构HeroAnmComp和HeroViewComp以支持闪光效果
更新多个英雄prefab以包含闪光材质和组件
This commit is contained in:
2025-11-15 11:15:30 +08:00
parent 4af9a6fd9e
commit 46a779633a
28 changed files with 2800 additions and 862 deletions

View File

@@ -22,23 +22,20 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 12 "__id__": 14
}, },
{ {
"__id__": 24 "__id__": 26
}, },
{ {
"__id__": 35 "__id__": 37
}, },
{ {
"__id__": 44 "__id__": 46
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 53
},
{ {
"__id__": 55 "__id__": 55
}, },
@@ -50,10 +47,13 @@
}, },
{ {
"__id__": 61 "__id__": 61
},
{
"__id__": 63
} }
], ],
"_prefab": { "_prefab": {
"__id__": 63 "__id__": 65
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -106,10 +106,13 @@
}, },
{ {
"__id__": 9 "__id__": 9
},
{
"__id__": 11
} }
], ],
"_prefab": { "_prefab": {
"__id__": 11 "__id__": 13
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -299,6 +302,28 @@
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "406uXfKLJEbab+NVEqD1aS" "fileId": "406uXfKLJEbab+NVEqD1aS"
}, },
{
"__type__": "954e43Y+QJHNIUpmqTCWA7A",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 2
},
"_enabled": true,
"__prefab": {
"__id__": 12
},
"hitFlashMaterial": {
"__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810",
"__expectedType__": "cc.Material"
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "f9iLivg4dHhJksWCjvY9/w"
},
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
@@ -319,14 +344,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 13 "__id__": 15
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 12 "__id__": 14
}, },
"asset": { "asset": {
"__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -334,7 +359,7 @@
}, },
"fileId": "c46/YsCPVOJYA4mWEpNYRx", "fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": { "instance": {
"__id__": 14 "__id__": 16
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -347,15 +372,9 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 15
},
{ {
"__id__": 17 "__id__": 17
}, },
{
"__id__": 18
},
{ {
"__id__": 19 "__id__": 19
}, },
@@ -365,8 +384,14 @@
{ {
"__id__": 21 "__id__": 21
}, },
{
"__id__": 22
},
{ {
"__id__": 23 "__id__": 23
},
{
"__id__": 25
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -374,7 +399,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -390,7 +415,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -405,7 +430,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -421,7 +446,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -436,7 +461,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -446,7 +471,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 22 "__id__": 24
}, },
"propertyPath": [ "propertyPath": [
"_contentSize" "_contentSize"
@@ -466,7 +491,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
@@ -485,14 +510,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 25 "__id__": 27
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 24 "__id__": 26
}, },
"asset": { "asset": {
"__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -500,7 +525,7 @@
}, },
"fileId": "5fqU0L3/FOhKaco5UkHuWT", "fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": { "instance": {
"__id__": 26 "__id__": 28
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -513,23 +538,23 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 27
},
{ {
"__id__": 29 "__id__": 29
}, },
{
"__id__": 30
},
{ {
"__id__": 31 "__id__": 31
}, },
{ {
"__id__": 32 "__id__": 32
}, },
{
"__id__": 33
},
{ {
"__id__": 34 "__id__": 34
},
{
"__id__": 36
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -537,7 +562,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -553,7 +578,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -568,7 +593,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -584,7 +609,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -599,7 +624,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 33 "__id__": 35
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -620,7 +645,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
@@ -639,14 +664,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 36 "__id__": 38
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 35 "__id__": 37
}, },
"asset": { "asset": {
"__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -654,7 +679,7 @@
}, },
"fileId": "0d6ZXmA5dHkZxoGONDL2sE", "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
"instance": { "instance": {
"__id__": 37 "__id__": 39
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -667,20 +692,20 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 38
},
{ {
"__id__": 40 "__id__": 40
}, },
{
"__id__": 41
},
{ {
"__id__": 42 "__id__": 42
}, },
{ {
"__id__": 43 "__id__": 43
},
{
"__id__": 44
},
{
"__id__": 45
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -688,7 +713,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -704,7 +729,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -719,7 +744,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -735,7 +760,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -750,7 +775,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -764,14 +789,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 45 "__id__": 47
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 44 "__id__": 46
}, },
"asset": { "asset": {
"__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -779,7 +804,7 @@
}, },
"fileId": "91yoyAQGNDm5ziI7NUChZ+", "fileId": "91yoyAQGNDm5ziI7NUChZ+",
"instance": { "instance": {
"__id__": 46 "__id__": 48
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -792,20 +817,20 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 47
},
{ {
"__id__": 49 "__id__": 49
}, },
{
"__id__": 50
},
{ {
"__id__": 51 "__id__": 51
}, },
{ {
"__id__": 52 "__id__": 52
},
{
"__id__": 53
},
{
"__id__": 54
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -813,7 +838,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -829,7 +854,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -844,7 +869,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -860,7 +885,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -875,7 +900,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -892,7 +917,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 54 "__id__": 56
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -920,7 +945,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 56 "__id__": 58
}, },
"anm": { "anm": {
"__id__": 5 "__id__": 5
@@ -935,13 +960,12 @@
"__type__": "873f8d+SolMEo8DiTTxZRh4", "__type__": "873f8d+SolMEo8DiTTxZRh4",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {},
"node": { "node": {
"__id__": 1 "__id__": 1
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 58 "__id__": 60
}, },
"_id": "" "_id": ""
}, },
@@ -959,7 +983,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 60 "__id__": 62
}, },
"enabledContactListener": true, "enabledContactListener": true,
"bullet": false, "bullet": false,
@@ -993,7 +1017,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 62 "__id__": 64
}, },
"tag": 0, "tag": 0,
"_group": 4, "_group": 4,
@@ -1030,16 +1054,16 @@
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": [ "nestedPrefabInstanceRoots": [
{ {
"__id__": 44 "__id__": 46
}, },
{ {
"__id__": 35 "__id__": 37
}, },
{ {
"__id__": 24 "__id__": 26
}, },
{ {
"__id__": 12 "__id__": 14
} }
] ]
} }

View File

@@ -22,23 +22,20 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 12 "__id__": 14
}, },
{ {
"__id__": 24 "__id__": 26
}, },
{ {
"__id__": 35 "__id__": 37
}, },
{ {
"__id__": 44 "__id__": 46
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 53
},
{ {
"__id__": 55 "__id__": 55
}, },
@@ -50,10 +47,13 @@
}, },
{ {
"__id__": 61 "__id__": 61
},
{
"__id__": 63
} }
], ],
"_prefab": { "_prefab": {
"__id__": 63 "__id__": 65
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -106,10 +106,13 @@
}, },
{ {
"__id__": 9 "__id__": 9
},
{
"__id__": 11
} }
], ],
"_prefab": { "_prefab": {
"__id__": 11 "__id__": 13
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -299,6 +302,28 @@
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "406uXfKLJEbab+NVEqD1aS" "fileId": "406uXfKLJEbab+NVEqD1aS"
}, },
{
"__type__": "954e43Y+QJHNIUpmqTCWA7A",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 2
},
"_enabled": true,
"__prefab": {
"__id__": 12
},
"hitFlashMaterial": {
"__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810",
"__expectedType__": "cc.Material"
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "6cZu2rl69OR5+l1nRZerhd"
},
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
@@ -319,14 +344,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 13 "__id__": 15
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 12 "__id__": 14
}, },
"asset": { "asset": {
"__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -334,7 +359,7 @@
}, },
"fileId": "c46/YsCPVOJYA4mWEpNYRx", "fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": { "instance": {
"__id__": 14 "__id__": 16
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -347,15 +372,9 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 15
},
{ {
"__id__": 17 "__id__": 17
}, },
{
"__id__": 18
},
{ {
"__id__": 19 "__id__": 19
}, },
@@ -365,8 +384,14 @@
{ {
"__id__": 21 "__id__": 21
}, },
{
"__id__": 22
},
{ {
"__id__": 23 "__id__": 23
},
{
"__id__": 25
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -374,7 +399,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -390,7 +415,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -405,7 +430,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -421,7 +446,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -436,7 +461,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -446,7 +471,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 22 "__id__": 24
}, },
"propertyPath": [ "propertyPath": [
"_contentSize" "_contentSize"
@@ -466,7 +491,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
@@ -485,14 +510,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 25 "__id__": 27
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 24 "__id__": 26
}, },
"asset": { "asset": {
"__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -500,7 +525,7 @@
}, },
"fileId": "5fqU0L3/FOhKaco5UkHuWT", "fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": { "instance": {
"__id__": 26 "__id__": 28
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -513,23 +538,23 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 27
},
{ {
"__id__": 29 "__id__": 29
}, },
{
"__id__": 30
},
{ {
"__id__": 31 "__id__": 31
}, },
{ {
"__id__": 32 "__id__": 32
}, },
{
"__id__": 33
},
{ {
"__id__": 34 "__id__": 34
},
{
"__id__": 36
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -537,7 +562,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -553,7 +578,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -568,7 +593,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -584,7 +609,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -599,7 +624,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 33 "__id__": 35
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -620,7 +645,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
@@ -639,14 +664,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 36 "__id__": 38
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 35 "__id__": 37
}, },
"asset": { "asset": {
"__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -654,7 +679,7 @@
}, },
"fileId": "0d6ZXmA5dHkZxoGONDL2sE", "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
"instance": { "instance": {
"__id__": 37 "__id__": 39
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -667,20 +692,20 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 38
},
{ {
"__id__": 40 "__id__": 40
}, },
{
"__id__": 41
},
{ {
"__id__": 42 "__id__": 42
}, },
{ {
"__id__": 43 "__id__": 43
},
{
"__id__": 44
},
{
"__id__": 45
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -688,7 +713,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -704,7 +729,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -719,7 +744,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -735,7 +760,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -750,7 +775,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -764,14 +789,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 45 "__id__": 47
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 44 "__id__": 46
}, },
"asset": { "asset": {
"__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -779,7 +804,7 @@
}, },
"fileId": "91yoyAQGNDm5ziI7NUChZ+", "fileId": "91yoyAQGNDm5ziI7NUChZ+",
"instance": { "instance": {
"__id__": 46 "__id__": 48
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -792,20 +817,20 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 47
},
{ {
"__id__": 49 "__id__": 49
}, },
{
"__id__": 50
},
{ {
"__id__": 51 "__id__": 51
}, },
{ {
"__id__": 52 "__id__": 52
},
{
"__id__": 53
},
{
"__id__": 54
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -813,7 +838,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -829,7 +854,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -844,7 +869,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -860,7 +885,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -875,7 +900,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -892,7 +917,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 54 "__id__": 56
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -920,7 +945,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 56 "__id__": 58
}, },
"anm": { "anm": {
"__id__": 5 "__id__": 5
@@ -935,13 +960,12 @@
"__type__": "873f8d+SolMEo8DiTTxZRh4", "__type__": "873f8d+SolMEo8DiTTxZRh4",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {},
"node": { "node": {
"__id__": 1 "__id__": 1
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 58 "__id__": 60
}, },
"_id": "" "_id": ""
}, },
@@ -959,7 +983,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 60 "__id__": 62
}, },
"enabledContactListener": true, "enabledContactListener": true,
"bullet": false, "bullet": false,
@@ -993,7 +1017,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 62 "__id__": 64
}, },
"tag": 0, "tag": 0,
"_group": 4, "_group": 4,
@@ -1030,16 +1054,16 @@
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": [ "nestedPrefabInstanceRoots": [
{ {
"__id__": 44 "__id__": 46
}, },
{ {
"__id__": 35 "__id__": 37
}, },
{ {
"__id__": 24 "__id__": 26
}, },
{ {
"__id__": 12 "__id__": 14
} }
] ]
} }

View File

@@ -22,23 +22,20 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 12 "__id__": 14
}, },
{ {
"__id__": 24 "__id__": 26
}, },
{ {
"__id__": 35 "__id__": 37
}, },
{ {
"__id__": 44 "__id__": 46
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 53
},
{ {
"__id__": 55 "__id__": 55
}, },
@@ -50,10 +47,13 @@
}, },
{ {
"__id__": 61 "__id__": 61
},
{
"__id__": 63
} }
], ],
"_prefab": { "_prefab": {
"__id__": 63 "__id__": 65
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -106,10 +106,13 @@
}, },
{ {
"__id__": 9 "__id__": 9
},
{
"__id__": 11
} }
], ],
"_prefab": { "_prefab": {
"__id__": 11 "__id__": 13
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -299,6 +302,28 @@
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "406uXfKLJEbab+NVEqD1aS" "fileId": "406uXfKLJEbab+NVEqD1aS"
}, },
{
"__type__": "954e43Y+QJHNIUpmqTCWA7A",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 2
},
"_enabled": true,
"__prefab": {
"__id__": 12
},
"hitFlashMaterial": {
"__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810",
"__expectedType__": "cc.Material"
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "e4zlwtvd5P+aVOci53P5lC"
},
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
@@ -319,14 +344,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 13 "__id__": 15
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 12 "__id__": 14
}, },
"asset": { "asset": {
"__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -334,7 +359,7 @@
}, },
"fileId": "c46/YsCPVOJYA4mWEpNYRx", "fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": { "instance": {
"__id__": 14 "__id__": 16
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -347,15 +372,9 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 15
},
{ {
"__id__": 17 "__id__": 17
}, },
{
"__id__": 18
},
{ {
"__id__": 19 "__id__": 19
}, },
@@ -365,8 +384,14 @@
{ {
"__id__": 21 "__id__": 21
}, },
{
"__id__": 22
},
{ {
"__id__": 23 "__id__": 23
},
{
"__id__": 25
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -374,7 +399,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -390,7 +415,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -405,7 +430,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -421,7 +446,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -436,7 +461,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -446,7 +471,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 22 "__id__": 24
}, },
"propertyPath": [ "propertyPath": [
"_contentSize" "_contentSize"
@@ -466,7 +491,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
@@ -485,14 +510,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 25 "__id__": 27
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 24 "__id__": 26
}, },
"asset": { "asset": {
"__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -500,7 +525,7 @@
}, },
"fileId": "5fqU0L3/FOhKaco5UkHuWT", "fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": { "instance": {
"__id__": 26 "__id__": 28
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -513,23 +538,23 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 27
},
{ {
"__id__": 29 "__id__": 29
}, },
{
"__id__": 30
},
{ {
"__id__": 31 "__id__": 31
}, },
{ {
"__id__": 32 "__id__": 32
}, },
{
"__id__": 33
},
{ {
"__id__": 34 "__id__": 34
},
{
"__id__": 36
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -537,7 +562,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -553,7 +578,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -568,7 +593,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -584,7 +609,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -599,7 +624,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 33 "__id__": 35
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -620,7 +645,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
@@ -639,14 +664,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 36 "__id__": 38
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 35 "__id__": 37
}, },
"asset": { "asset": {
"__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -654,7 +679,7 @@
}, },
"fileId": "0d6ZXmA5dHkZxoGONDL2sE", "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
"instance": { "instance": {
"__id__": 37 "__id__": 39
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -667,20 +692,20 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 38
},
{ {
"__id__": 40 "__id__": 40
}, },
{
"__id__": 41
},
{ {
"__id__": 42 "__id__": 42
}, },
{ {
"__id__": 43 "__id__": 43
},
{
"__id__": 44
},
{
"__id__": 45
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -688,7 +713,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -704,7 +729,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -719,7 +744,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -735,7 +760,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -750,7 +775,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -764,14 +789,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 45 "__id__": 47
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 44 "__id__": 46
}, },
"asset": { "asset": {
"__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -779,7 +804,7 @@
}, },
"fileId": "91yoyAQGNDm5ziI7NUChZ+", "fileId": "91yoyAQGNDm5ziI7NUChZ+",
"instance": { "instance": {
"__id__": 46 "__id__": 48
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -792,20 +817,20 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 47
},
{ {
"__id__": 49 "__id__": 49
}, },
{
"__id__": 50
},
{ {
"__id__": 51 "__id__": 51
}, },
{ {
"__id__": 52 "__id__": 52
},
{
"__id__": 53
},
{
"__id__": 54
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -813,7 +838,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -829,7 +854,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -844,7 +869,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -860,7 +885,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -875,7 +900,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -892,7 +917,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 54 "__id__": 56
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -920,7 +945,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 56 "__id__": 58
}, },
"anm": { "anm": {
"__id__": 5 "__id__": 5
@@ -935,13 +960,12 @@
"__type__": "873f8d+SolMEo8DiTTxZRh4", "__type__": "873f8d+SolMEo8DiTTxZRh4",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {},
"node": { "node": {
"__id__": 1 "__id__": 1
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 58 "__id__": 60
}, },
"_id": "" "_id": ""
}, },
@@ -959,7 +983,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 60 "__id__": 62
}, },
"enabledContactListener": true, "enabledContactListener": true,
"bullet": false, "bullet": false,
@@ -993,7 +1017,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 62 "__id__": 64
}, },
"tag": 0, "tag": 0,
"_group": 4, "_group": 4,
@@ -1030,16 +1054,16 @@
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": [ "nestedPrefabInstanceRoots": [
{ {
"__id__": 44 "__id__": 46
}, },
{ {
"__id__": 35 "__id__": 37
}, },
{ {
"__id__": 24 "__id__": 26
}, },
{ {
"__id__": 12 "__id__": 14
} }
] ]
} }

View File

@@ -22,23 +22,20 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 12 "__id__": 14
}, },
{ {
"__id__": 24 "__id__": 26
}, },
{ {
"__id__": 35 "__id__": 37
}, },
{ {
"__id__": 44 "__id__": 46
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 53
},
{ {
"__id__": 55 "__id__": 55
}, },
@@ -50,10 +47,13 @@
}, },
{ {
"__id__": 61 "__id__": 61
},
{
"__id__": 63
} }
], ],
"_prefab": { "_prefab": {
"__id__": 63 "__id__": 65
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -106,10 +106,13 @@
}, },
{ {
"__id__": 9 "__id__": 9
},
{
"__id__": 11
} }
], ],
"_prefab": { "_prefab": {
"__id__": 11 "__id__": 13
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -299,6 +302,28 @@
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "406uXfKLJEbab+NVEqD1aS" "fileId": "406uXfKLJEbab+NVEqD1aS"
}, },
{
"__type__": "954e43Y+QJHNIUpmqTCWA7A",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 2
},
"_enabled": true,
"__prefab": {
"__id__": 12
},
"hitFlashMaterial": {
"__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810",
"__expectedType__": "cc.Material"
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "beiAlRY51OUIUqmpz9SWoV"
},
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
@@ -319,14 +344,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 13 "__id__": 15
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 12 "__id__": 14
}, },
"asset": { "asset": {
"__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -334,7 +359,7 @@
}, },
"fileId": "c46/YsCPVOJYA4mWEpNYRx", "fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": { "instance": {
"__id__": 14 "__id__": 16
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -347,15 +372,9 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 15
},
{ {
"__id__": 17 "__id__": 17
}, },
{
"__id__": 18
},
{ {
"__id__": 19 "__id__": 19
}, },
@@ -365,8 +384,14 @@
{ {
"__id__": 21 "__id__": 21
}, },
{
"__id__": 22
},
{ {
"__id__": 23 "__id__": 23
},
{
"__id__": 25
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -374,7 +399,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -390,7 +415,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -405,7 +430,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -421,7 +446,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -436,7 +461,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -446,7 +471,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 22 "__id__": 24
}, },
"propertyPath": [ "propertyPath": [
"_contentSize" "_contentSize"
@@ -466,7 +491,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
@@ -485,14 +510,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 25 "__id__": 27
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 24 "__id__": 26
}, },
"asset": { "asset": {
"__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -500,7 +525,7 @@
}, },
"fileId": "5fqU0L3/FOhKaco5UkHuWT", "fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": { "instance": {
"__id__": 26 "__id__": 28
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -513,23 +538,23 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 27
},
{ {
"__id__": 29 "__id__": 29
}, },
{
"__id__": 30
},
{ {
"__id__": 31 "__id__": 31
}, },
{ {
"__id__": 32 "__id__": 32
}, },
{
"__id__": 33
},
{ {
"__id__": 34 "__id__": 34
},
{
"__id__": 36
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -537,7 +562,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -553,7 +578,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -568,7 +593,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -584,7 +609,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -599,7 +624,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 33 "__id__": 35
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -620,7 +645,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
@@ -639,14 +664,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 36 "__id__": 38
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 35 "__id__": 37
}, },
"asset": { "asset": {
"__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -654,7 +679,7 @@
}, },
"fileId": "0d6ZXmA5dHkZxoGONDL2sE", "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
"instance": { "instance": {
"__id__": 37 "__id__": 39
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -667,20 +692,20 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 38
},
{ {
"__id__": 40 "__id__": 40
}, },
{
"__id__": 41
},
{ {
"__id__": 42 "__id__": 42
}, },
{ {
"__id__": 43 "__id__": 43
},
{
"__id__": 44
},
{
"__id__": 45
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -688,7 +713,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -704,7 +729,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -719,7 +744,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -735,7 +760,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -750,7 +775,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -764,14 +789,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 45 "__id__": 47
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 44 "__id__": 46
}, },
"asset": { "asset": {
"__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -779,7 +804,7 @@
}, },
"fileId": "91yoyAQGNDm5ziI7NUChZ+", "fileId": "91yoyAQGNDm5ziI7NUChZ+",
"instance": { "instance": {
"__id__": 46 "__id__": 48
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -792,20 +817,20 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 47
},
{ {
"__id__": 49 "__id__": 49
}, },
{
"__id__": 50
},
{ {
"__id__": 51 "__id__": 51
}, },
{ {
"__id__": 52 "__id__": 52
},
{
"__id__": 53
},
{
"__id__": 54
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -813,7 +838,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -829,7 +854,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -844,7 +869,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -860,7 +885,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -875,7 +900,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -892,7 +917,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 54 "__id__": 56
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -920,7 +945,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 56 "__id__": 58
}, },
"anm": { "anm": {
"__id__": 5 "__id__": 5
@@ -935,13 +960,12 @@
"__type__": "873f8d+SolMEo8DiTTxZRh4", "__type__": "873f8d+SolMEo8DiTTxZRh4",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {},
"node": { "node": {
"__id__": 1 "__id__": 1
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 58 "__id__": 60
}, },
"_id": "" "_id": ""
}, },
@@ -959,7 +983,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 60 "__id__": 62
}, },
"enabledContactListener": false, "enabledContactListener": false,
"bullet": false, "bullet": false,
@@ -993,7 +1017,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 62 "__id__": 64
}, },
"tag": 0, "tag": 0,
"_group": 4, "_group": 4,
@@ -1030,16 +1054,16 @@
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": [ "nestedPrefabInstanceRoots": [
{ {
"__id__": 44 "__id__": 46
}, },
{ {
"__id__": 35 "__id__": 37
}, },
{ {
"__id__": 24 "__id__": 26
}, },
{ {
"__id__": 12 "__id__": 14
} }
] ]
} }

View File

@@ -22,23 +22,20 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 12 "__id__": 14
}, },
{ {
"__id__": 24 "__id__": 26
}, },
{ {
"__id__": 35 "__id__": 37
}, },
{ {
"__id__": 44 "__id__": 46
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 53
},
{ {
"__id__": 55 "__id__": 55
}, },
@@ -50,10 +47,13 @@
}, },
{ {
"__id__": 61 "__id__": 61
},
{
"__id__": 63
} }
], ],
"_prefab": { "_prefab": {
"__id__": 63 "__id__": 65
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -106,10 +106,13 @@
}, },
{ {
"__id__": 9 "__id__": 9
},
{
"__id__": 11
} }
], ],
"_prefab": { "_prefab": {
"__id__": 11 "__id__": 13
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -299,6 +302,28 @@
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "406uXfKLJEbab+NVEqD1aS" "fileId": "406uXfKLJEbab+NVEqD1aS"
}, },
{
"__type__": "954e43Y+QJHNIUpmqTCWA7A",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 2
},
"_enabled": true,
"__prefab": {
"__id__": 12
},
"hitFlashMaterial": {
"__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810",
"__expectedType__": "cc.Material"
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "b4+2TVK9JC7p5lhflMVjuO"
},
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
@@ -319,14 +344,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 13 "__id__": 15
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 12 "__id__": 14
}, },
"asset": { "asset": {
"__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -334,7 +359,7 @@
}, },
"fileId": "c46/YsCPVOJYA4mWEpNYRx", "fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": { "instance": {
"__id__": 14 "__id__": 16
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -347,15 +372,9 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 15
},
{ {
"__id__": 17 "__id__": 17
}, },
{
"__id__": 18
},
{ {
"__id__": 19 "__id__": 19
}, },
@@ -365,8 +384,14 @@
{ {
"__id__": 21 "__id__": 21
}, },
{
"__id__": 22
},
{ {
"__id__": 23 "__id__": 23
},
{
"__id__": 25
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -374,7 +399,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -390,7 +415,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -405,7 +430,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -421,7 +446,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -436,7 +461,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -446,7 +471,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 22 "__id__": 24
}, },
"propertyPath": [ "propertyPath": [
"_contentSize" "_contentSize"
@@ -466,7 +491,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
@@ -485,14 +510,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 25 "__id__": 27
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 24 "__id__": 26
}, },
"asset": { "asset": {
"__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -500,7 +525,7 @@
}, },
"fileId": "5fqU0L3/FOhKaco5UkHuWT", "fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": { "instance": {
"__id__": 26 "__id__": 28
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -513,23 +538,23 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 27
},
{ {
"__id__": 29 "__id__": 29
}, },
{
"__id__": 30
},
{ {
"__id__": 31 "__id__": 31
}, },
{ {
"__id__": 32 "__id__": 32
}, },
{
"__id__": 33
},
{ {
"__id__": 34 "__id__": 34
},
{
"__id__": 36
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -537,7 +562,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -553,7 +578,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -568,7 +593,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -584,7 +609,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -599,7 +624,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 33 "__id__": 35
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -620,7 +645,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
@@ -639,14 +664,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 36 "__id__": 38
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 35 "__id__": 37
}, },
"asset": { "asset": {
"__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -654,7 +679,7 @@
}, },
"fileId": "0d6ZXmA5dHkZxoGONDL2sE", "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
"instance": { "instance": {
"__id__": 37 "__id__": 39
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -667,20 +692,20 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 38
},
{ {
"__id__": 40 "__id__": 40
}, },
{
"__id__": 41
},
{ {
"__id__": 42 "__id__": 42
}, },
{ {
"__id__": 43 "__id__": 43
},
{
"__id__": 44
},
{
"__id__": 45
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -688,7 +713,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -704,7 +729,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -719,7 +744,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -735,7 +760,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -750,7 +775,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -764,14 +789,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 45 "__id__": 47
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 44 "__id__": 46
}, },
"asset": { "asset": {
"__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -779,7 +804,7 @@
}, },
"fileId": "91yoyAQGNDm5ziI7NUChZ+", "fileId": "91yoyAQGNDm5ziI7NUChZ+",
"instance": { "instance": {
"__id__": 46 "__id__": 48
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -792,20 +817,20 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 47
},
{ {
"__id__": 49 "__id__": 49
}, },
{
"__id__": 50
},
{ {
"__id__": 51 "__id__": 51
}, },
{ {
"__id__": 52 "__id__": 52
},
{
"__id__": 53
},
{
"__id__": 54
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -813,7 +838,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -829,7 +854,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -844,7 +869,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -860,7 +885,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -875,7 +900,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -892,7 +917,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 54 "__id__": 56
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -920,7 +945,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 56 "__id__": 58
}, },
"anm": { "anm": {
"__id__": 5 "__id__": 5
@@ -935,13 +960,12 @@
"__type__": "873f8d+SolMEo8DiTTxZRh4", "__type__": "873f8d+SolMEo8DiTTxZRh4",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {},
"node": { "node": {
"__id__": 1 "__id__": 1
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 58 "__id__": 60
}, },
"_id": "" "_id": ""
}, },
@@ -959,7 +983,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 60 "__id__": 62
}, },
"enabledContactListener": true, "enabledContactListener": true,
"bullet": false, "bullet": false,
@@ -993,7 +1017,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 62 "__id__": 64
}, },
"tag": 0, "tag": 0,
"_group": 4, "_group": 4,
@@ -1030,16 +1054,16 @@
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": [ "nestedPrefabInstanceRoots": [
{ {
"__id__": 44 "__id__": 46
}, },
{ {
"__id__": 35 "__id__": 37
}, },
{ {
"__id__": 24 "__id__": 26
}, },
{ {
"__id__": 12 "__id__": 14
} }
] ]
} }

View File

@@ -22,23 +22,20 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 12 "__id__": 14
}, },
{ {
"__id__": 24 "__id__": 26
}, },
{ {
"__id__": 35 "__id__": 37
}, },
{ {
"__id__": 44 "__id__": 46
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 53
},
{ {
"__id__": 55 "__id__": 55
}, },
@@ -50,10 +47,13 @@
}, },
{ {
"__id__": 61 "__id__": 61
},
{
"__id__": 63
} }
], ],
"_prefab": { "_prefab": {
"__id__": 63 "__id__": 65
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -106,10 +106,13 @@
}, },
{ {
"__id__": 9 "__id__": 9
},
{
"__id__": 11
} }
], ],
"_prefab": { "_prefab": {
"__id__": 11 "__id__": 13
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -299,6 +302,28 @@
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "406uXfKLJEbab+NVEqD1aS" "fileId": "406uXfKLJEbab+NVEqD1aS"
}, },
{
"__type__": "954e43Y+QJHNIUpmqTCWA7A",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 2
},
"_enabled": true,
"__prefab": {
"__id__": 12
},
"hitFlashMaterial": {
"__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810",
"__expectedType__": "cc.Material"
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "35IEDlwu9Ch7vrlwlSwNdw"
},
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
@@ -319,14 +344,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 13 "__id__": 15
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 12 "__id__": 14
}, },
"asset": { "asset": {
"__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -334,7 +359,7 @@
}, },
"fileId": "c46/YsCPVOJYA4mWEpNYRx", "fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": { "instance": {
"__id__": 14 "__id__": 16
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -347,15 +372,9 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 15
},
{ {
"__id__": 17 "__id__": 17
}, },
{
"__id__": 18
},
{ {
"__id__": 19 "__id__": 19
}, },
@@ -365,8 +384,14 @@
{ {
"__id__": 21 "__id__": 21
}, },
{
"__id__": 22
},
{ {
"__id__": 23 "__id__": 23
},
{
"__id__": 25
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -374,7 +399,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -390,7 +415,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -405,7 +430,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -421,7 +446,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -436,7 +461,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -446,7 +471,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 22 "__id__": 24
}, },
"propertyPath": [ "propertyPath": [
"_contentSize" "_contentSize"
@@ -466,7 +491,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
@@ -485,14 +510,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 25 "__id__": 27
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 24 "__id__": 26
}, },
"asset": { "asset": {
"__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -500,7 +525,7 @@
}, },
"fileId": "5fqU0L3/FOhKaco5UkHuWT", "fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": { "instance": {
"__id__": 26 "__id__": 28
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -513,23 +538,23 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 27
},
{ {
"__id__": 29 "__id__": 29
}, },
{
"__id__": 30
},
{ {
"__id__": 31 "__id__": 31
}, },
{ {
"__id__": 32 "__id__": 32
}, },
{
"__id__": 33
},
{ {
"__id__": 34 "__id__": 34
},
{
"__id__": 36
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -537,7 +562,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -553,7 +578,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -568,7 +593,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -584,7 +609,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -599,7 +624,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 33 "__id__": 35
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -620,7 +645,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
@@ -639,14 +664,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 36 "__id__": 38
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 35 "__id__": 37
}, },
"asset": { "asset": {
"__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -654,7 +679,7 @@
}, },
"fileId": "0d6ZXmA5dHkZxoGONDL2sE", "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
"instance": { "instance": {
"__id__": 37 "__id__": 39
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -667,20 +692,20 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 38
},
{ {
"__id__": 40 "__id__": 40
}, },
{
"__id__": 41
},
{ {
"__id__": 42 "__id__": 42
}, },
{ {
"__id__": 43 "__id__": 43
},
{
"__id__": 44
},
{
"__id__": 45
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -688,7 +713,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -704,7 +729,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -719,7 +744,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -735,7 +760,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -750,7 +775,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -764,14 +789,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 45 "__id__": 47
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 44 "__id__": 46
}, },
"asset": { "asset": {
"__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -779,7 +804,7 @@
}, },
"fileId": "91yoyAQGNDm5ziI7NUChZ+", "fileId": "91yoyAQGNDm5ziI7NUChZ+",
"instance": { "instance": {
"__id__": 46 "__id__": 48
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -792,20 +817,20 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 47
},
{ {
"__id__": 49 "__id__": 49
}, },
{
"__id__": 50
},
{ {
"__id__": 51 "__id__": 51
}, },
{ {
"__id__": 52 "__id__": 52
},
{
"__id__": 53
},
{
"__id__": 54
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -813,7 +838,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -829,7 +854,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -844,7 +869,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -860,7 +885,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -875,7 +900,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -892,7 +917,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 54 "__id__": 56
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -920,7 +945,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 56 "__id__": 58
}, },
"anm": { "anm": {
"__id__": 5 "__id__": 5
@@ -935,13 +960,12 @@
"__type__": "873f8d+SolMEo8DiTTxZRh4", "__type__": "873f8d+SolMEo8DiTTxZRh4",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {},
"node": { "node": {
"__id__": 1 "__id__": 1
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 58 "__id__": 60
}, },
"_id": "" "_id": ""
}, },
@@ -959,7 +983,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 60 "__id__": 62
}, },
"enabledContactListener": true, "enabledContactListener": true,
"bullet": false, "bullet": false,
@@ -993,7 +1017,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 62 "__id__": 64
}, },
"tag": 0, "tag": 0,
"_group": 4, "_group": 4,
@@ -1030,16 +1054,16 @@
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": [ "nestedPrefabInstanceRoots": [
{ {
"__id__": 44 "__id__": 46
}, },
{ {
"__id__": 35 "__id__": 37
}, },
{ {
"__id__": 24 "__id__": 26
}, },
{ {
"__id__": 12 "__id__": 14
} }
] ]
} }

View File

@@ -22,23 +22,20 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 12 "__id__": 14
}, },
{ {
"__id__": 24 "__id__": 26
}, },
{ {
"__id__": 35 "__id__": 37
}, },
{ {
"__id__": 44 "__id__": 46
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 53
},
{ {
"__id__": 55 "__id__": 55
}, },
@@ -50,10 +47,13 @@
}, },
{ {
"__id__": 61 "__id__": 61
},
{
"__id__": 63
} }
], ],
"_prefab": { "_prefab": {
"__id__": 63 "__id__": 65
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -106,10 +106,13 @@
}, },
{ {
"__id__": 9 "__id__": 9
},
{
"__id__": 11
} }
], ],
"_prefab": { "_prefab": {
"__id__": 11 "__id__": 13
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -299,6 +302,28 @@
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "406uXfKLJEbab+NVEqD1aS" "fileId": "406uXfKLJEbab+NVEqD1aS"
}, },
{
"__type__": "954e43Y+QJHNIUpmqTCWA7A",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 2
},
"_enabled": true,
"__prefab": {
"__id__": 12
},
"hitFlashMaterial": {
"__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810",
"__expectedType__": "cc.Material"
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "71mx/IdRVDz5H8mz6V7BsE"
},
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
@@ -319,14 +344,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 13 "__id__": 15
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 12 "__id__": 14
}, },
"asset": { "asset": {
"__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -334,7 +359,7 @@
}, },
"fileId": "c46/YsCPVOJYA4mWEpNYRx", "fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": { "instance": {
"__id__": 14 "__id__": 16
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -347,15 +372,9 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 15
},
{ {
"__id__": 17 "__id__": 17
}, },
{
"__id__": 18
},
{ {
"__id__": 19 "__id__": 19
}, },
@@ -365,8 +384,14 @@
{ {
"__id__": 21 "__id__": 21
}, },
{
"__id__": 22
},
{ {
"__id__": 23 "__id__": 23
},
{
"__id__": 25
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -374,7 +399,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -390,7 +415,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -405,7 +430,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -421,7 +446,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -436,7 +461,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -446,7 +471,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 22 "__id__": 24
}, },
"propertyPath": [ "propertyPath": [
"_contentSize" "_contentSize"
@@ -466,7 +491,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
@@ -485,14 +510,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 25 "__id__": 27
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 24 "__id__": 26
}, },
"asset": { "asset": {
"__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -500,7 +525,7 @@
}, },
"fileId": "5fqU0L3/FOhKaco5UkHuWT", "fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": { "instance": {
"__id__": 26 "__id__": 28
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -513,23 +538,23 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 27
},
{ {
"__id__": 29 "__id__": 29
}, },
{
"__id__": 30
},
{ {
"__id__": 31 "__id__": 31
}, },
{ {
"__id__": 32 "__id__": 32
}, },
{
"__id__": 33
},
{ {
"__id__": 34 "__id__": 34
},
{
"__id__": 36
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -537,7 +562,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -553,7 +578,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -568,7 +593,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -584,7 +609,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -599,7 +624,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 33 "__id__": 35
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -620,7 +645,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
@@ -639,14 +664,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 36 "__id__": 38
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 35 "__id__": 37
}, },
"asset": { "asset": {
"__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -654,7 +679,7 @@
}, },
"fileId": "0d6ZXmA5dHkZxoGONDL2sE", "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
"instance": { "instance": {
"__id__": 37 "__id__": 39
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -667,20 +692,20 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 38
},
{ {
"__id__": 40 "__id__": 40
}, },
{
"__id__": 41
},
{ {
"__id__": 42 "__id__": 42
}, },
{ {
"__id__": 43 "__id__": 43
},
{
"__id__": 44
},
{
"__id__": 45
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -688,7 +713,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -704,7 +729,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -719,7 +744,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -735,7 +760,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -750,7 +775,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -764,14 +789,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 45 "__id__": 47
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 44 "__id__": 46
}, },
"asset": { "asset": {
"__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -779,7 +804,7 @@
}, },
"fileId": "91yoyAQGNDm5ziI7NUChZ+", "fileId": "91yoyAQGNDm5ziI7NUChZ+",
"instance": { "instance": {
"__id__": 46 "__id__": 48
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -792,20 +817,20 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 47
},
{ {
"__id__": 49 "__id__": 49
}, },
{
"__id__": 50
},
{ {
"__id__": 51 "__id__": 51
}, },
{ {
"__id__": 52 "__id__": 52
},
{
"__id__": 53
},
{
"__id__": 54
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -813,7 +838,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -829,7 +854,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -844,7 +869,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -860,7 +885,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -875,7 +900,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -892,7 +917,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 54 "__id__": 56
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -920,7 +945,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 56 "__id__": 58
}, },
"anm": { "anm": {
"__id__": 5 "__id__": 5
@@ -935,13 +960,12 @@
"__type__": "873f8d+SolMEo8DiTTxZRh4", "__type__": "873f8d+SolMEo8DiTTxZRh4",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {},
"node": { "node": {
"__id__": 1 "__id__": 1
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 58 "__id__": 60
}, },
"_id": "" "_id": ""
}, },
@@ -959,7 +983,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 60 "__id__": 62
}, },
"enabledContactListener": true, "enabledContactListener": true,
"bullet": false, "bullet": false,
@@ -993,7 +1017,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 62 "__id__": 64
}, },
"tag": 0, "tag": 0,
"_group": 4, "_group": 4,
@@ -1030,16 +1054,16 @@
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": [ "nestedPrefabInstanceRoots": [
{ {
"__id__": 44 "__id__": 46
}, },
{ {
"__id__": 35 "__id__": 37
}, },
{ {
"__id__": 24 "__id__": 26
}, },
{ {
"__id__": 12 "__id__": 14
} }
] ]
} }

View File

@@ -22,23 +22,20 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 12 "__id__": 14
}, },
{ {
"__id__": 24 "__id__": 26
}, },
{ {
"__id__": 35 "__id__": 37
}, },
{ {
"__id__": 44 "__id__": 46
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 53
},
{ {
"__id__": 55 "__id__": 55
}, },
@@ -50,10 +47,13 @@
}, },
{ {
"__id__": 61 "__id__": 61
},
{
"__id__": 63
} }
], ],
"_prefab": { "_prefab": {
"__id__": 63 "__id__": 65
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -106,10 +106,13 @@
}, },
{ {
"__id__": 9 "__id__": 9
},
{
"__id__": 11
} }
], ],
"_prefab": { "_prefab": {
"__id__": 11 "__id__": 13
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -296,6 +299,28 @@
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "1dn32Q7fxNOrkpyNeazdIo" "fileId": "1dn32Q7fxNOrkpyNeazdIo"
}, },
{
"__type__": "954e43Y+QJHNIUpmqTCWA7A",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 2
},
"_enabled": true,
"__prefab": {
"__id__": 12
},
"hitFlashMaterial": {
"__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810",
"__expectedType__": "cc.Material"
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "devH7HFXJH/5FNGHYdEhes"
},
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
@@ -316,14 +341,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 13 "__id__": 15
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 12 "__id__": 14
}, },
"asset": { "asset": {
"__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -331,7 +356,7 @@
}, },
"fileId": "c46/YsCPVOJYA4mWEpNYRx", "fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": { "instance": {
"__id__": 14 "__id__": 16
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -344,15 +369,9 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 15
},
{ {
"__id__": 17 "__id__": 17
}, },
{
"__id__": 18
},
{ {
"__id__": 19 "__id__": 19
}, },
@@ -362,8 +381,14 @@
{ {
"__id__": 21 "__id__": 21
}, },
{
"__id__": 22
},
{ {
"__id__": 23 "__id__": 23
},
{
"__id__": 25
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -371,7 +396,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -387,7 +412,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -402,7 +427,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -418,7 +443,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -433,7 +458,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -443,7 +468,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 22 "__id__": 24
}, },
"propertyPath": [ "propertyPath": [
"_contentSize" "_contentSize"
@@ -463,7 +488,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
@@ -482,14 +507,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 25 "__id__": 27
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 24 "__id__": 26
}, },
"asset": { "asset": {
"__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -497,7 +522,7 @@
}, },
"fileId": "5fqU0L3/FOhKaco5UkHuWT", "fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": { "instance": {
"__id__": 26 "__id__": 28
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -510,23 +535,23 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 27
},
{ {
"__id__": 29 "__id__": 29
}, },
{
"__id__": 30
},
{ {
"__id__": 31 "__id__": 31
}, },
{ {
"__id__": 32 "__id__": 32
}, },
{
"__id__": 33
},
{ {
"__id__": 34 "__id__": 34
},
{
"__id__": 36
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -534,7 +559,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -550,7 +575,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -565,7 +590,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -581,7 +606,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -596,7 +621,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 33 "__id__": 35
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -617,7 +642,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
@@ -636,14 +661,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 36 "__id__": 38
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 35 "__id__": 37
}, },
"asset": { "asset": {
"__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -651,7 +676,7 @@
}, },
"fileId": "0d6ZXmA5dHkZxoGONDL2sE", "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
"instance": { "instance": {
"__id__": 37 "__id__": 39
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -664,20 +689,20 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 38
},
{ {
"__id__": 40 "__id__": 40
}, },
{
"__id__": 41
},
{ {
"__id__": 42 "__id__": 42
}, },
{ {
"__id__": 43 "__id__": 43
},
{
"__id__": 44
},
{
"__id__": 45
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -685,7 +710,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -701,7 +726,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -716,7 +741,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -732,7 +757,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -747,7 +772,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -761,14 +786,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 45 "__id__": 47
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 44 "__id__": 46
}, },
"asset": { "asset": {
"__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -776,7 +801,7 @@
}, },
"fileId": "91yoyAQGNDm5ziI7NUChZ+", "fileId": "91yoyAQGNDm5ziI7NUChZ+",
"instance": { "instance": {
"__id__": 46 "__id__": 48
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -789,20 +814,20 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 47
},
{ {
"__id__": 49 "__id__": 49
}, },
{
"__id__": 50
},
{ {
"__id__": 51 "__id__": 51
}, },
{ {
"__id__": 52 "__id__": 52
},
{
"__id__": 53
},
{
"__id__": 54
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -810,7 +835,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -826,7 +851,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -841,7 +866,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -857,7 +882,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -872,7 +897,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -889,7 +914,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 54 "__id__": 56
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -917,7 +942,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 56 "__id__": 58
}, },
"anm": { "anm": {
"__id__": 5 "__id__": 5
@@ -932,13 +957,12 @@
"__type__": "873f8d+SolMEo8DiTTxZRh4", "__type__": "873f8d+SolMEo8DiTTxZRh4",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {},
"node": { "node": {
"__id__": 1 "__id__": 1
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 58 "__id__": 60
}, },
"_id": "" "_id": ""
}, },
@@ -956,7 +980,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 60 "__id__": 62
}, },
"enabledContactListener": true, "enabledContactListener": true,
"bullet": false, "bullet": false,
@@ -990,7 +1014,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 62 "__id__": 64
}, },
"tag": 0, "tag": 0,
"_group": 4, "_group": 4,
@@ -1027,16 +1051,16 @@
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": [ "nestedPrefabInstanceRoots": [
{ {
"__id__": 44 "__id__": 46
}, },
{ {
"__id__": 35 "__id__": 37
}, },
{ {
"__id__": 24 "__id__": 26
}, },
{ {
"__id__": 12 "__id__": 14
} }
] ]
} }

View File

@@ -22,23 +22,20 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 12 "__id__": 14
}, },
{ {
"__id__": 24 "__id__": 26
}, },
{ {
"__id__": 35 "__id__": 37
}, },
{ {
"__id__": 44 "__id__": 46
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 53
},
{ {
"__id__": 55 "__id__": 55
}, },
@@ -50,10 +47,13 @@
}, },
{ {
"__id__": 61 "__id__": 61
},
{
"__id__": 63
} }
], ],
"_prefab": { "_prefab": {
"__id__": 63 "__id__": 65
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -106,10 +106,13 @@
}, },
{ {
"__id__": 9 "__id__": 9
},
{
"__id__": 11
} }
], ],
"_prefab": { "_prefab": {
"__id__": 11 "__id__": 13
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -299,6 +302,28 @@
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "1dn32Q7fxNOrkpyNeazdIo" "fileId": "1dn32Q7fxNOrkpyNeazdIo"
}, },
{
"__type__": "954e43Y+QJHNIUpmqTCWA7A",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 2
},
"_enabled": true,
"__prefab": {
"__id__": 12
},
"hitFlashMaterial": {
"__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810",
"__expectedType__": "cc.Material"
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "65HGZeqCFG6I9S+QXhV5Iy"
},
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
@@ -319,14 +344,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 13 "__id__": 15
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 12 "__id__": 14
}, },
"asset": { "asset": {
"__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -334,7 +359,7 @@
}, },
"fileId": "c46/YsCPVOJYA4mWEpNYRx", "fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": { "instance": {
"__id__": 14 "__id__": 16
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -347,15 +372,9 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 15
},
{ {
"__id__": 17 "__id__": 17
}, },
{
"__id__": 18
},
{ {
"__id__": 19 "__id__": 19
}, },
@@ -365,8 +384,14 @@
{ {
"__id__": 21 "__id__": 21
}, },
{
"__id__": 22
},
{ {
"__id__": 23 "__id__": 23
},
{
"__id__": 25
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -374,7 +399,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -390,7 +415,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -405,7 +430,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -421,7 +446,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -436,7 +461,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -446,7 +471,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 22 "__id__": 24
}, },
"propertyPath": [ "propertyPath": [
"_contentSize" "_contentSize"
@@ -466,7 +491,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
@@ -485,14 +510,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 25 "__id__": 27
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 24 "__id__": 26
}, },
"asset": { "asset": {
"__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -500,7 +525,7 @@
}, },
"fileId": "5fqU0L3/FOhKaco5UkHuWT", "fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": { "instance": {
"__id__": 26 "__id__": 28
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -513,23 +538,23 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 27
},
{ {
"__id__": 29 "__id__": 29
}, },
{
"__id__": 30
},
{ {
"__id__": 31 "__id__": 31
}, },
{ {
"__id__": 32 "__id__": 32
}, },
{
"__id__": 33
},
{ {
"__id__": 34 "__id__": 34
},
{
"__id__": 36
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -537,7 +562,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -553,7 +578,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -568,7 +593,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -584,7 +609,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -599,7 +624,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 33 "__id__": 35
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -620,7 +645,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
@@ -639,14 +664,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 36 "__id__": 38
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 35 "__id__": 37
}, },
"asset": { "asset": {
"__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -654,7 +679,7 @@
}, },
"fileId": "0d6ZXmA5dHkZxoGONDL2sE", "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
"instance": { "instance": {
"__id__": 37 "__id__": 39
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -667,20 +692,20 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 38
},
{ {
"__id__": 40 "__id__": 40
}, },
{
"__id__": 41
},
{ {
"__id__": 42 "__id__": 42
}, },
{ {
"__id__": 43 "__id__": 43
},
{
"__id__": 44
},
{
"__id__": 45
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -688,7 +713,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -704,7 +729,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -719,7 +744,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -735,7 +760,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -750,7 +775,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -764,14 +789,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 45 "__id__": 47
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 44 "__id__": 46
}, },
"asset": { "asset": {
"__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -779,7 +804,7 @@
}, },
"fileId": "91yoyAQGNDm5ziI7NUChZ+", "fileId": "91yoyAQGNDm5ziI7NUChZ+",
"instance": { "instance": {
"__id__": 46 "__id__": 48
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -792,20 +817,20 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 47
},
{ {
"__id__": 49 "__id__": 49
}, },
{
"__id__": 50
},
{ {
"__id__": 51 "__id__": 51
}, },
{ {
"__id__": 52 "__id__": 52
},
{
"__id__": 53
},
{
"__id__": 54
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -813,7 +838,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -829,7 +854,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -844,7 +869,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -860,7 +885,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -875,7 +900,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -892,7 +917,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 54 "__id__": 56
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -920,7 +945,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 56 "__id__": 58
}, },
"anm": { "anm": {
"__id__": 5 "__id__": 5
@@ -935,13 +960,12 @@
"__type__": "873f8d+SolMEo8DiTTxZRh4", "__type__": "873f8d+SolMEo8DiTTxZRh4",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {},
"node": { "node": {
"__id__": 1 "__id__": 1
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 58 "__id__": 60
}, },
"_id": "" "_id": ""
}, },
@@ -959,7 +983,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 60 "__id__": 62
}, },
"enabledContactListener": true, "enabledContactListener": true,
"bullet": false, "bullet": false,
@@ -993,7 +1017,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 62 "__id__": 64
}, },
"tag": 0, "tag": 0,
"_group": 4, "_group": 4,
@@ -1030,16 +1054,16 @@
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": [ "nestedPrefabInstanceRoots": [
{ {
"__id__": 44 "__id__": 46
}, },
{ {
"__id__": 35 "__id__": 37
}, },
{ {
"__id__": 24 "__id__": 26
}, },
{ {
"__id__": 12 "__id__": 14
} }
] ]
} }

View File

@@ -22,23 +22,20 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 12 "__id__": 14
}, },
{ {
"__id__": 24 "__id__": 26
}, },
{ {
"__id__": 35 "__id__": 37
}, },
{ {
"__id__": 44 "__id__": 46
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 53
},
{ {
"__id__": 55 "__id__": 55
}, },
@@ -50,10 +47,13 @@
}, },
{ {
"__id__": 61 "__id__": 61
},
{
"__id__": 63
} }
], ],
"_prefab": { "_prefab": {
"__id__": 63 "__id__": 65
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -106,10 +106,13 @@
}, },
{ {
"__id__": 9 "__id__": 9
},
{
"__id__": 11
} }
], ],
"_prefab": { "_prefab": {
"__id__": 11 "__id__": 13
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -299,6 +302,28 @@
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "1dn32Q7fxNOrkpyNeazdIo" "fileId": "1dn32Q7fxNOrkpyNeazdIo"
}, },
{
"__type__": "954e43Y+QJHNIUpmqTCWA7A",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 2
},
"_enabled": true,
"__prefab": {
"__id__": 12
},
"hitFlashMaterial": {
"__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810",
"__expectedType__": "cc.Material"
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "e4XOt+7BBBWYCH6pjBzbHe"
},
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
@@ -319,14 +344,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 13 "__id__": 15
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 12 "__id__": 14
}, },
"asset": { "asset": {
"__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -334,7 +359,7 @@
}, },
"fileId": "c46/YsCPVOJYA4mWEpNYRx", "fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": { "instance": {
"__id__": 14 "__id__": 16
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -347,15 +372,9 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 15
},
{ {
"__id__": 17 "__id__": 17
}, },
{
"__id__": 18
},
{ {
"__id__": 19 "__id__": 19
}, },
@@ -365,8 +384,14 @@
{ {
"__id__": 21 "__id__": 21
}, },
{
"__id__": 22
},
{ {
"__id__": 23 "__id__": 23
},
{
"__id__": 25
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -374,7 +399,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -390,7 +415,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -405,7 +430,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -421,7 +446,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -436,7 +461,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -446,7 +471,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 22 "__id__": 24
}, },
"propertyPath": [ "propertyPath": [
"_contentSize" "_contentSize"
@@ -466,7 +491,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
@@ -485,14 +510,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 25 "__id__": 27
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 24 "__id__": 26
}, },
"asset": { "asset": {
"__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -500,7 +525,7 @@
}, },
"fileId": "5fqU0L3/FOhKaco5UkHuWT", "fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": { "instance": {
"__id__": 26 "__id__": 28
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -513,23 +538,23 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 27
},
{ {
"__id__": 29 "__id__": 29
}, },
{
"__id__": 30
},
{ {
"__id__": 31 "__id__": 31
}, },
{ {
"__id__": 32 "__id__": 32
}, },
{
"__id__": 33
},
{ {
"__id__": 34 "__id__": 34
},
{
"__id__": 36
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -537,7 +562,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -553,7 +578,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -568,7 +593,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -584,7 +609,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -599,7 +624,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 33 "__id__": 35
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -620,7 +645,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
@@ -639,14 +664,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 36 "__id__": 38
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 35 "__id__": 37
}, },
"asset": { "asset": {
"__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -654,7 +679,7 @@
}, },
"fileId": "0d6ZXmA5dHkZxoGONDL2sE", "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
"instance": { "instance": {
"__id__": 37 "__id__": 39
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -667,20 +692,20 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 38
},
{ {
"__id__": 40 "__id__": 40
}, },
{
"__id__": 41
},
{ {
"__id__": 42 "__id__": 42
}, },
{ {
"__id__": 43 "__id__": 43
},
{
"__id__": 44
},
{
"__id__": 45
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -688,7 +713,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -704,7 +729,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -719,7 +744,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -735,7 +760,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -750,7 +775,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -764,14 +789,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 45 "__id__": 47
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 44 "__id__": 46
}, },
"asset": { "asset": {
"__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -779,7 +804,7 @@
}, },
"fileId": "91yoyAQGNDm5ziI7NUChZ+", "fileId": "91yoyAQGNDm5ziI7NUChZ+",
"instance": { "instance": {
"__id__": 46 "__id__": 48
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -792,20 +817,20 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 47
},
{ {
"__id__": 49 "__id__": 49
}, },
{
"__id__": 50
},
{ {
"__id__": 51 "__id__": 51
}, },
{ {
"__id__": 52 "__id__": 52
},
{
"__id__": 53
},
{
"__id__": 54
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -813,7 +838,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -829,7 +854,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -844,7 +869,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -860,7 +885,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -875,7 +900,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -892,7 +917,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 54 "__id__": 56
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -920,7 +945,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 56 "__id__": 58
}, },
"anm": { "anm": {
"__id__": 5 "__id__": 5
@@ -935,13 +960,12 @@
"__type__": "873f8d+SolMEo8DiTTxZRh4", "__type__": "873f8d+SolMEo8DiTTxZRh4",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {},
"node": { "node": {
"__id__": 1 "__id__": 1
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 58 "__id__": 60
}, },
"_id": "" "_id": ""
}, },
@@ -959,7 +983,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 60 "__id__": 62
}, },
"enabledContactListener": true, "enabledContactListener": true,
"bullet": false, "bullet": false,
@@ -993,7 +1017,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 62 "__id__": 64
}, },
"tag": 0, "tag": 0,
"_group": 4, "_group": 4,
@@ -1030,16 +1054,16 @@
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": [ "nestedPrefabInstanceRoots": [
{ {
"__id__": 44 "__id__": 46
}, },
{ {
"__id__": 35 "__id__": 37
}, },
{ {
"__id__": 24 "__id__": 26
}, },
{ {
"__id__": 12 "__id__": 14
} }
] ]
} }

View File

@@ -22,23 +22,20 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 12 "__id__": 14
}, },
{ {
"__id__": 24 "__id__": 26
}, },
{ {
"__id__": 35 "__id__": 37
}, },
{ {
"__id__": 44 "__id__": 46
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 53
},
{ {
"__id__": 55 "__id__": 55
}, },
@@ -50,10 +47,13 @@
}, },
{ {
"__id__": 61 "__id__": 61
},
{
"__id__": 63
} }
], ],
"_prefab": { "_prefab": {
"__id__": 63 "__id__": 65
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -106,10 +106,13 @@
}, },
{ {
"__id__": 9 "__id__": 9
},
{
"__id__": 11
} }
], ],
"_prefab": { "_prefab": {
"__id__": 11 "__id__": 13
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -299,6 +302,28 @@
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "1dn32Q7fxNOrkpyNeazdIo" "fileId": "1dn32Q7fxNOrkpyNeazdIo"
}, },
{
"__type__": "954e43Y+QJHNIUpmqTCWA7A",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 2
},
"_enabled": true,
"__prefab": {
"__id__": 12
},
"hitFlashMaterial": {
"__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810",
"__expectedType__": "cc.Material"
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "d05NTLi3pF055eJmK0otVJ"
},
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
@@ -319,14 +344,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 13 "__id__": 15
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 12 "__id__": 14
}, },
"asset": { "asset": {
"__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -334,7 +359,7 @@
}, },
"fileId": "c46/YsCPVOJYA4mWEpNYRx", "fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": { "instance": {
"__id__": 14 "__id__": 16
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -347,15 +372,9 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 15
},
{ {
"__id__": 17 "__id__": 17
}, },
{
"__id__": 18
},
{ {
"__id__": 19 "__id__": 19
}, },
@@ -365,8 +384,14 @@
{ {
"__id__": 21 "__id__": 21
}, },
{
"__id__": 22
},
{ {
"__id__": 23 "__id__": 23
},
{
"__id__": 25
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -374,7 +399,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -390,7 +415,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -405,7 +430,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -421,7 +446,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -436,7 +461,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -446,7 +471,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 22 "__id__": 24
}, },
"propertyPath": [ "propertyPath": [
"_contentSize" "_contentSize"
@@ -466,7 +491,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 16 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
@@ -485,14 +510,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 25 "__id__": 27
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 24 "__id__": 26
}, },
"asset": { "asset": {
"__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -500,7 +525,7 @@
}, },
"fileId": "5fqU0L3/FOhKaco5UkHuWT", "fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": { "instance": {
"__id__": 26 "__id__": 28
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -513,23 +538,23 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 27
},
{ {
"__id__": 29 "__id__": 29
}, },
{
"__id__": 30
},
{ {
"__id__": 31 "__id__": 31
}, },
{ {
"__id__": 32 "__id__": 32
}, },
{
"__id__": 33
},
{ {
"__id__": 34 "__id__": 34
},
{
"__id__": 36
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -537,7 +562,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -553,7 +578,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -568,7 +593,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -584,7 +609,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -599,7 +624,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 33 "__id__": 35
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -620,7 +645,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 28 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
@@ -639,14 +664,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 36 "__id__": 38
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 35 "__id__": 37
}, },
"asset": { "asset": {
"__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -654,7 +679,7 @@
}, },
"fileId": "0d6ZXmA5dHkZxoGONDL2sE", "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
"instance": { "instance": {
"__id__": 37 "__id__": 39
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -667,20 +692,20 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 38
},
{ {
"__id__": 40 "__id__": 40
}, },
{
"__id__": 41
},
{ {
"__id__": 42 "__id__": 42
}, },
{ {
"__id__": 43 "__id__": 43
},
{
"__id__": 44
},
{
"__id__": 45
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -688,7 +713,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -704,7 +729,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -719,7 +744,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -735,7 +760,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -750,7 +775,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -764,14 +789,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 45 "__id__": 47
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 44 "__id__": 46
}, },
"asset": { "asset": {
"__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -779,7 +804,7 @@
}, },
"fileId": "91yoyAQGNDm5ziI7NUChZ+", "fileId": "91yoyAQGNDm5ziI7NUChZ+",
"instance": { "instance": {
"__id__": 46 "__id__": 48
}, },
"targetOverrides": null "targetOverrides": null
}, },
@@ -792,20 +817,20 @@
"mountedChildren": [], "mountedChildren": [],
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{
"__id__": 47
},
{ {
"__id__": 49 "__id__": 49
}, },
{
"__id__": 50
},
{ {
"__id__": 51 "__id__": 51
}, },
{ {
"__id__": 52 "__id__": 52
},
{
"__id__": 53
},
{
"__id__": 54
} }
], ],
"removedComponents": [] "removedComponents": []
@@ -813,7 +838,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
@@ -829,7 +854,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
@@ -844,7 +869,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
@@ -860,7 +885,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
@@ -875,7 +900,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 50
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
@@ -892,7 +917,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 54 "__id__": 56
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@@ -920,7 +945,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 56 "__id__": 58
}, },
"anm": { "anm": {
"__id__": 5 "__id__": 5
@@ -941,7 +966,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 58 "__id__": 60
}, },
"_id": "" "_id": ""
}, },
@@ -959,7 +984,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 60 "__id__": 62
}, },
"enabledContactListener": true, "enabledContactListener": true,
"bullet": false, "bullet": false,
@@ -993,7 +1018,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 62 "__id__": 64
}, },
"tag": 0, "tag": 0,
"_group": 4, "_group": 4,
@@ -1030,16 +1055,16 @@
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": [ "nestedPrefabInstanceRoots": [
{ {
"__id__": 44 "__id__": 46
}, },
{ {
"__id__": 35 "__id__": 37
}, },
{ {
"__id__": 24 "__id__": 26
}, },
{ {
"__id__": 12 "__id__": 14
} }
] ]
} }

View File

@@ -1,17 +1,19 @@
import { _decorator, Animation, AnimationState, CCClass, Component, } from "cc"; import { _decorator, Animation, AnimationState, CCClass, Component, } from "cc";
import { HeroViewComp } from "./HeroViewComp"; import { HeroViewComp } from "./HeroViewComp";
import { FacSet } from "../common/config/GameSet"; import { FacSet } from "../common/config/GameSet";
import { FlashSprite } from "./hit-flash-white/scripts/FlashSprite";
const { ccclass, property } = _decorator; const { ccclass, property } = _decorator;
@ccclass('HeroAnmComp') @ccclass('HeroAnmComp')
export default class HeroAnmComp extends Component{ export default class HeroAnmComp extends Component{
fsSprite:FlashSprite = null!;
private anmcon:any=null private anmcon:any=null
private _hasStop = true; private _hasStop = true;
private default_anim:string='Idle' private default_anim:string='Idle'
anms:any[]=["idle","move","stun","dead","buff","atk0","atk1","atk2","max0","max1"] anms:any[]=["idle","move","stun","dead","buff","atk0","atk1","atk2","max0","max1"]
onLoad () { onLoad () {
this.anmcon=this.node.getComponent(Animation) this.anmcon=this.node.getComponent(Animation)
this.fsSprite = this.node.getComponent(FlashSprite);
this.anmcon.on(Animation.EventType.FINISHED, this.onAnimationFinished, this); this.anmcon.on(Animation.EventType.FINISHED, this.onAnimationFinished, this);
} }
@@ -25,6 +27,9 @@ export default class HeroAnmComp extends Component{
this.anmcon.play(this.default_anim) this.anmcon.play(this.default_anim)
} }
} }
atked(){
this.fsSprite.clickFlash();
}
move () { move () {
if(this.anmcon.getState("move").isPlaying) return if(this.anmcon.getState("move").isPlaying) return
this.anmcon.play("move") this.anmcon.play("move")

View File

@@ -66,6 +66,9 @@ export class HeroSpine extends Component {
break break
} }
} }
do_atked(){
this.anm.atked()
}
dead(){ dead(){
// console.log("do dead"); // console.log("do dead");
this.anm.dead() this.anm.dead()

View File

@@ -14,7 +14,7 @@ import { Tooltip } from "../skill/Tooltip";
import { timedCom } from "../skill/timedCom"; import { timedCom } from "../skill/timedCom";
import { HeroInfo, HType } from "../common/config/heroSet"; import { HeroInfo, HType } from "../common/config/heroSet";
import { Timer } from "db://oops-framework/core/common/timer/Timer"; import { Timer } from "db://oops-framework/core/common/timer/Timer";
import { FlashSprite } from "./materials/scripts/FlashSprite";
const { ccclass, property } = _decorator; const { ccclass, property } = _decorator;
@@ -38,7 +38,6 @@ export class HeroViewComp extends CCComp {
// 血条显示相关 // 血条显示相关
hpBarShowTime:number = 5; // 血条显示持续时间(秒) hpBarShowTime:number = 5; // 血条显示持续时间(秒)
hpBarShowCD:number = 0; // 血条显示计时器 hpBarShowCD:number = 0; // 血条显示计时器
fsSprite:FlashSprite = null!;
// ==================== UI 节点引用 ==================== // ==================== UI 节点引用 ====================
private top_node: Node = null!; private top_node: Node = null!;
@@ -103,7 +102,6 @@ export class HeroViewComp extends CCComp {
this.top_node = this.node.getChildByName("top"); this.top_node = this.node.getChildByName("top");
let hp_y = this.node.getComponent(UITransform).height+10; let hp_y = this.node.getComponent(UITransform).height+10;
this.top_node.setPosition(0, hp_y, 0); this.top_node.setPosition(0, hp_y, 0);
this.fsSprite = this.node.getComponent(FlashSprite);
} }
@@ -217,7 +215,7 @@ export class HeroViewComp extends CCComp {
/** 受击特效 */ /** 受击特效 */
private in_atked(anm: string = "atked", scale: number = 1) { private in_atked(anm: string = "atked", scale: number = 1) {
this.fsSprite.clickFlash(); this.as.do_atked()
// var path = "game/skill/end/" + anm; // var path = "game/skill/end/" + anm;
// var prefab: Prefab = oops.res.get(path, Prefab)!; // var prefab: Prefab = oops.res.get(path, Prefab)!;
// var node = instantiate(prefab); // var node = instantiate(prefab);

View File

@@ -0,0 +1,9 @@
{
"ver": "1.2.0",
"importer": "directory",
"imported": true,
"uuid": "0463b128-1ee2-4cee-972b-eaf9fee2bf6c",
"files": [],
"subMetas": {},
"userData": {}
}

View File

@@ -0,0 +1,9 @@
{
"ver": "1.2.0",
"importer": "directory",
"imported": true,
"uuid": "044ce6c2-4a58-4a83-8a5b-f6d7f89a3aa3",
"files": [],
"subMetas": {},
"userData": {}
}

View File

@@ -0,0 +1,31 @@
{
"__type__": "cc.Material",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"_native": "",
"_effectAsset": {
"__uuid__": "b8d82f81-c2f9-40e5-805b-922f0c170a79",
"__expectedType__": "cc.EffectAsset"
},
"_techIdx": 0,
"_defines": [
{
"USE_TEXTURE": true
}
],
"_states": [
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
}
],
"_props": [
{}
]
}

View File

@@ -0,0 +1,11 @@
{
"ver": "1.0.21",
"importer": "material",
"imported": true,
"uuid": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810",
"files": [
".json"
],
"subMetas": {},
"userData": {}
}

View File

@@ -0,0 +1,9 @@
{
"ver": "1.2.0",
"importer": "directory",
"imported": true,
"uuid": "e091410c-c7b6-4416-ae99-38697c103286",
"files": [],
"subMetas": {},
"userData": {}
}

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,11 @@
{
"ver": "1.1.50",
"importer": "scene",
"imported": true,
"uuid": "5e1d3eb2-c300-4627-94c7-2ee03b8314f1",
"files": [
".json"
],
"subMetas": {},
"userData": {}
}

View File

@@ -0,0 +1,9 @@
{
"ver": "1.2.0",
"importer": "directory",
"imported": true,
"uuid": "e4743688-2ecb-436b-8826-69fcb4485b73",
"files": [],
"subMetas": {},
"userData": {}
}

View File

@@ -0,0 +1,29 @@
import { _decorator, color, Component, Material, Node, Sprite } from 'cc';
const { ccclass, property } = _decorator;
@ccclass('FlashSprite')
export class FlashSprite extends Component {
@property(Material)
hitFlashMaterial: Material;
orginalFlashMaterial: Material;
sprite: Sprite;
start() {
this.sprite = this.node.getComponent(Sprite);
this.orginalFlashMaterial = this.sprite.getRenderMaterial(0);
}
update(deltaTime: number) {
}
public clickFlash() {
this.sprite.setSharedMaterial(this.hitFlashMaterial, 0);
this.scheduleOnce(() => {
this.sprite.setSharedMaterial(this.orginalFlashMaterial, 0);
}, 0.1);
}
}

View File

@@ -0,0 +1,9 @@
{
"ver": "4.0.24",
"importer": "typescript",
"imported": true,
"uuid": "954e4dd8-f902-4734-8529-9aa4c2580ec0",
"files": [],
"subMetas": {},
"userData": {}
}

View File

@@ -0,0 +1,9 @@
{
"ver": "1.2.0",
"importer": "directory",
"imported": true,
"uuid": "5553e1ee-12b8-410b-833c-33586c917944",
"files": [],
"subMetas": {},
"userData": {}
}

View File

@@ -0,0 +1,97 @@
// Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd.
CCEffect %{
techniques:
- passes:
- vert: sprite-vs:vert
frag: sprite-fs:frag
depthStencilState:
depthTest: false
depthWrite: false
blendState:
targets:
- blend: true
blendSrc: src_alpha
blendDst: one_minus_src_alpha
blendDstAlpha: one_minus_src_alpha
rasterizerState:
cullMode: none
properties:
alphaThreshold: { value: 0.5 }
}%
CCProgram sprite-vs %{
precision highp float;
#include <builtin/uniforms/cc-global>
#if USE_LOCAL
#include <builtin/uniforms/cc-local>
#endif
#if SAMPLE_FROM_RT
#include <common/common-define>
#endif
in vec3 a_position;
in vec2 a_texCoord;
in vec4 a_color;
out vec4 color;
out vec2 uv0;
out vec4 lightColor;
vec4 vert () {
vec4 pos = vec4(a_position, 1);
#if USE_LOCAL
pos = cc_matWorld * pos;
#endif
#if USE_PIXEL_ALIGNMENT
pos = cc_matView * pos;
pos.xyz = floor(pos.xyz);
pos = cc_matProj * pos;
#else
pos = cc_matViewProj * pos;
#endif
uv0 = a_texCoord;
#if SAMPLE_FROM_RT
CC_HANDLE_RT_SAMPLE_FLIP(uv0);
#endif
color = a_color;
lightColor = a_color;
return pos;
}
}%
CCProgram sprite-fs %{
precision highp float;
#include <builtin/internal/embedded-alpha>
#include <builtin/internal/alpha-test>
in vec4 color;
in vec4 lightColor;
#if USE_TEXTURE
in vec2 uv0;
#pragma builtin(local)
layout(set = 2, binding = 12) uniform sampler2D cc_spriteTexture;
#endif
vec4 frag () {
vec4 o = vec4(1, 1, 1, 1);
#if USE_TEXTURE
o *= CCSampleWithAlphaSeparated(cc_spriteTexture, uv0);
#if IS_GRAY
float gray = 0.2126 * o.r + 0.7152 * o.g + 0.0722 * o.b;
o.r = o.g = o.b = gray;
#endif
#endif
o.rgb = o.rgb * (1.0 - lightColor.a) + lightColor.rgb * lightColor.a;
o *= color;
ALPHA_TEST(o);
return o;
}
}%

View File

@@ -0,0 +1,11 @@
{
"ver": "1.7.1",
"importer": "effect",
"imported": true,
"uuid": "b8d82f81-c2f9-40e5-805b-922f0c170a79",
"files": [
".json"
],
"subMetas": {},
"userData": {}
}

View File

@@ -0,0 +1,9 @@
{
"ver": "1.2.0",
"importer": "directory",
"imported": true,
"uuid": "0463b128-1ee2-4cee-972b-eaf9fee2bf6c",
"files": [],
"subMetas": {},
"userData": {}
}