diff --git a/assets/resources/game/map/map_rpg.prefab b/assets/resources/game/map/map_rpg.prefab
index 830e602e..f6490def 100644
--- a/assets/resources/game/map/map_rpg.prefab
+++ b/assets/resources/game/map/map_rpg.prefab
@@ -28,17 +28,17 @@
"_active": true,
"_components": [
{
- "__id__": 74
+ "__id__": 80
},
{
- "__id__": 76
+ "__id__": 82
},
{
- "__id__": 78
+ "__id__": 84
}
],
"_prefab": {
- "__id__": 80
+ "__id__": 86
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -197,17 +197,17 @@
"_active": true,
"_components": [
{
- "__id__": 67
+ "__id__": 73
},
{
- "__id__": 69
+ "__id__": 75
},
{
- "__id__": 71
+ "__id__": 77
}
],
"_prefab": {
- "__id__": 73
+ "__id__": 79
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -251,23 +251,23 @@
"__id__": 8
},
{
- "__id__": 24
+ "__id__": 30
},
{
- "__id__": 28
+ "__id__": 34
},
{
- "__id__": 58
+ "__id__": 64
}
],
"_active": true,
"_components": [
{
- "__id__": 64
+ "__id__": 70
}
],
"_prefab": {
- "__id__": 66
+ "__id__": 72
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -314,14 +314,14 @@
"_active": true,
"_components": [
{
- "__id__": 19
+ "__id__": 25
},
{
- "__id__": 21
+ "__id__": 27
}
],
"_prefab": {
- "__id__": 23
+ "__id__": 29
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -363,16 +363,19 @@
"_children": [
{
"__id__": 10
+ },
+ {
+ "__id__": 16
}
],
"_active": true,
"_components": [
{
- "__id__": 16
+ "__id__": 22
}
],
"_prefab": {
- "__id__": 18
+ "__id__": 24
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -519,7 +522,10 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
- "_atlas": null,
+ "_atlas": {
+ "__uuid__": "d7d869bc-06aa-4876-806f-487e68b96780",
+ "__expectedType__": "cc.SpriteAtlas"
+ },
"_id": ""
},
{
@@ -539,6 +545,142 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
+ {
+ "__type__": "cc.Node",
+ "_name": "bg2",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 9
+ },
+ "_children": [],
+ "_active": false,
+ "_components": [
+ {
+ "__id__": 17
+ },
+ {
+ "__id__": 19
+ }
+ ],
+ "_prefab": {
+ "__id__": 21
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 172.436,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1.8,
+ "y": 1.8,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 16
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 18
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 486,
+ "height": 996
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "010MZyoXhD44DuO1nUOzGj"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 16
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 20
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_spriteFrame": {
+ "__uuid__": "d7d869bc-06aa-4876-806f-487e68b96780@a50c6",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ "_type": 0,
+ "_fillType": 0,
+ "_sizeMode": 1,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_useGrayscale": false,
+ "_atlas": null,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "17OW107cRBB5YXDgBYGWPr"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "44D1H02g9Gv6PWLQtr/CQU",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
{
"__type__": "cc.UITransform",
"_name": "",
@@ -549,7 +691,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 17
+ "__id__": 23
},
"_contentSize": {
"__type__": "cc.Size",
@@ -590,7 +732,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 20
+ "__id__": 26
},
"_contentSize": {
"__type__": "cc.Size",
@@ -618,7 +760,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 22
+ "__id__": 28
},
"bgImg": null,
"_id": ""
@@ -652,11 +794,11 @@
"_active": true,
"_components": [
{
- "__id__": 25
+ "__id__": 31
}
],
"_prefab": {
- "__id__": 27
+ "__id__": 33
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -693,11 +835,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 24
+ "__id__": 30
},
"_enabled": true,
"__prefab": {
- "__id__": 26
+ "__id__": 32
},
"_contentSize": {
"__type__": "cc.Size",
@@ -738,661 +880,24 @@
},
"_children": [
{
- "__id__": 29
+ "__id__": 35
},
{
- "__id__": 33
+ "__id__": 39
},
{
- "__id__": 37
+ "__id__": 43
},
{
- "__id__": 41
+ "__id__": 47
},
{
- "__id__": 45
- },
- {
- "__id__": 49
- }
- ],
- "_active": true,
- "_components": [
- {
- "__id__": 53
+ "__id__": 51
},
{
"__id__": 55
}
],
- "_prefab": {
- "__id__": 57
- },
- "_lpos": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_lrot": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- },
- "_lscale": {
- "__type__": "cc.Vec3",
- "x": 1,
- "y": 1,
- "z": 1
- },
- "_mobility": 0,
- "_layer": 1,
- "_euler": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_id": ""
- },
- {
- "__type__": "cc.Node",
- "_name": "LINE3",
- "_objFlags": 0,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 28
- },
- "_children": [],
- "_active": true,
- "_components": [
- {
- "__id__": 30
- }
- ],
- "_prefab": {
- "__id__": 32
- },
- "_lpos": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_lrot": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- },
- "_lscale": {
- "__type__": "cc.Vec3",
- "x": 1,
- "y": 1,
- "z": 1
- },
- "_mobility": 0,
- "_layer": 1,
- "_euler": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_id": ""
- },
- {
- "__type__": "cc.UITransform",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 29
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 31
- },
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 100,
- "height": 100
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0.5,
- "y": 0.5
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "a5LMIIbHtOKK10K5do5dSQ"
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__id__": 0
- },
- "fileId": "a6CBSkrzZIurlX0D/HzXDp",
- "instance": null,
- "targetOverrides": null,
- "nestedPrefabInstanceRoots": null
- },
- {
- "__type__": "cc.Node",
- "_name": "LINE1",
- "_objFlags": 0,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 28
- },
- "_children": [],
- "_active": true,
- "_components": [
- {
- "__id__": 34
- }
- ],
- "_prefab": {
- "__id__": 36
- },
- "_lpos": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_lrot": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- },
- "_lscale": {
- "__type__": "cc.Vec3",
- "x": 1,
- "y": 1,
- "z": 1
- },
- "_mobility": 0,
- "_layer": 1,
- "_euler": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_id": ""
- },
- {
- "__type__": "cc.UITransform",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 33
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 35
- },
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 100,
- "height": 100
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0.5,
- "y": 0.5
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "b8C5CFg5lM4oUHMeSrc/sV"
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__id__": 0
- },
- "fileId": "4dcNJaDM1CLI9q3fIqHZ/U",
- "instance": null,
- "targetOverrides": null,
- "nestedPrefabInstanceRoots": null
- },
- {
- "__type__": "cc.Node",
- "_name": "HERO",
- "_objFlags": 0,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 28
- },
- "_children": [],
- "_active": true,
- "_components": [
- {
- "__id__": 38
- }
- ],
- "_prefab": {
- "__id__": 40
- },
- "_lpos": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_lrot": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- },
- "_lscale": {
- "__type__": "cc.Vec3",
- "x": 1,
- "y": 1,
- "z": 1
- },
- "_mobility": 0,
- "_layer": 1,
- "_euler": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_id": ""
- },
- {
- "__type__": "cc.UITransform",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 37
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 39
- },
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 100,
- "height": 100
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0.5,
- "y": 0.5
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "dasmpuTSVM7qA3QW9/3XjQ"
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__id__": 0
- },
- "fileId": "eaiasKNEFO6qvodGhL4a0b",
- "instance": null,
- "targetOverrides": null,
- "nestedPrefabInstanceRoots": null
- },
- {
- "__type__": "cc.Node",
- "_name": "LINE2",
- "_objFlags": 0,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 28
- },
- "_children": [],
- "_active": true,
- "_components": [
- {
- "__id__": 42
- }
- ],
- "_prefab": {
- "__id__": 44
- },
- "_lpos": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_lrot": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- },
- "_lscale": {
- "__type__": "cc.Vec3",
- "x": 1,
- "y": 1,
- "z": 1
- },
- "_mobility": 0,
- "_layer": 1,
- "_euler": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_id": ""
- },
- {
- "__type__": "cc.UITransform",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 41
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 43
- },
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 100,
- "height": 100
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0.5,
- "y": 0.5
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "ea767WaZRHo4s0bZQfN8zP"
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__id__": 0
- },
- "fileId": "60UdPtJn9ALLHCveLwT1bT",
- "instance": null,
- "targetOverrides": null,
- "nestedPrefabInstanceRoots": null
- },
- {
- "__type__": "cc.Node",
- "_name": "LINE4",
- "_objFlags": 0,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 28
- },
- "_children": [],
- "_active": true,
- "_components": [
- {
- "__id__": 46
- }
- ],
- "_prefab": {
- "__id__": 48
- },
- "_lpos": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_lrot": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- },
- "_lscale": {
- "__type__": "cc.Vec3",
- "x": 1,
- "y": 1,
- "z": 1
- },
- "_mobility": 0,
- "_layer": 1,
- "_euler": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_id": ""
- },
- {
- "__type__": "cc.UITransform",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 45
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 47
- },
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 100,
- "height": 100
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0.5,
- "y": 0.5
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "141kciXbJMsYSI6X6J/esh"
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__id__": 0
- },
- "fileId": "5f0OKGVDRCNKxvM3xSrqhv",
- "instance": null,
- "targetOverrides": null,
- "nestedPrefabInstanceRoots": null
- },
- {
- "__type__": "cc.Node",
- "_name": "SKILL",
- "_objFlags": 0,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 28
- },
- "_children": [],
- "_active": true,
- "_components": [
- {
- "__id__": 50
- }
- ],
- "_prefab": {
- "__id__": 52
- },
- "_lpos": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_lrot": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- },
- "_lscale": {
- "__type__": "cc.Vec3",
- "x": 1,
- "y": 1,
- "z": 1
- },
- "_mobility": 0,
- "_layer": 1,
- "_euler": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_id": ""
- },
- {
- "__type__": "cc.UITransform",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 49
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 51
- },
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 100,
- "height": 100
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0.5,
- "y": 0.5
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "47rZJ0Uv9HkIhkIUzm2ES9"
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__id__": 0
- },
- "fileId": "f0bFfyrcRF77DMu5a9MYtG",
- "instance": null,
- "targetOverrides": null,
- "nestedPrefabInstanceRoots": null
- },
- {
- "__type__": "cc.UITransform",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 28
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 54
- },
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 100,
- "height": 100
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0,
- "y": 0
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "f91Y4OCX1NFKfSWOAvmdSa"
- },
- {
- "__type__": "6639ayo4DFKZYCU2OBZzyb+",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 28
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 56
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "6fzmfjcbNPK6tOzQOKJfRV"
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__id__": 0
- },
- "fileId": "77ZGG4JjxGiol1pDVFrjGQ",
- "instance": null,
- "targetOverrides": null,
- "nestedPrefabInstanceRoots": null
- },
- {
- "__type__": "cc.Node",
- "_name": "SkillLayer",
- "_objFlags": 512,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 7
- },
- "_children": [],
"_active": true,
"_components": [
{
@@ -1434,14 +939,542 @@
},
"_id": ""
},
+ {
+ "__type__": "cc.Node",
+ "_name": "LINE3",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 34
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 36
+ }
+ ],
+ "_prefab": {
+ "__id__": 38
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1,
+ "y": 1,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
+ "__id__": 35
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 37
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 100,
+ "height": 100
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "a5LMIIbHtOKK10K5do5dSQ"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "a6CBSkrzZIurlX0D/HzXDp",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "LINE1",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 34
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 40
+ }
+ ],
+ "_prefab": {
+ "__id__": 42
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1,
+ "y": 1,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 39
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 41
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 100,
+ "height": 100
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "b8C5CFg5lM4oUHMeSrc/sV"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "4dcNJaDM1CLI9q3fIqHZ/U",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "HERO",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 34
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 44
+ }
+ ],
+ "_prefab": {
+ "__id__": 46
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1,
+ "y": 1,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 43
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 45
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 100,
+ "height": 100
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "dasmpuTSVM7qA3QW9/3XjQ"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "eaiasKNEFO6qvodGhL4a0b",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "LINE2",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 34
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 48
+ }
+ ],
+ "_prefab": {
+ "__id__": 50
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1,
+ "y": 1,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 47
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 49
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 100,
+ "height": 100
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "ea767WaZRHo4s0bZQfN8zP"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "60UdPtJn9ALLHCveLwT1bT",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "LINE4",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 34
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 52
+ }
+ ],
+ "_prefab": {
+ "__id__": 54
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1,
+ "y": 1,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 51
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 53
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 100,
+ "height": 100
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "141kciXbJMsYSI6X6J/esh"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "5f0OKGVDRCNKxvM3xSrqhv",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "SKILL",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 34
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 56
+ }
+ ],
+ "_prefab": {
"__id__": 58
},
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1,
+ "y": 1,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 55
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 57
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 100,
+ "height": 100
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "47rZJ0Uv9HkIhkIUzm2ES9"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "f0bFfyrcRF77DMu5a9MYtG",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 34
+ },
"_enabled": true,
"__prefab": {
"__id__": 60
@@ -1451,6 +1484,115 @@
"width": 100,
"height": 100
},
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "f91Y4OCX1NFKfSWOAvmdSa"
+ },
+ {
+ "__type__": "6639ayo4DFKZYCU2OBZzyb+",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 34
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 62
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "6fzmfjcbNPK6tOzQOKJfRV"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "77ZGG4JjxGiol1pDVFrjGQ",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "SkillLayer",
+ "_objFlags": 512,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 7
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 65
+ },
+ {
+ "__id__": 67
+ }
+ ],
+ "_prefab": {
+ "__id__": 69
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1,
+ "y": 1,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 64
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 66
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 100,
+ "height": 100
+ },
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
@@ -1468,11 +1610,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 58
+ "__id__": 64
},
"_enabled": true,
"__prefab": {
- "__id__": 62
+ "__id__": 68
},
"light": null,
"_id": ""
@@ -1504,7 +1646,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 65
+ "__id__": 71
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1545,7 +1687,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 68
+ "__id__": 74
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1573,7 +1715,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 70
+ "__id__": 76
},
"camera": {
"__id__": 3
@@ -1582,16 +1724,16 @@
"__id__": 7
},
"mapLayer": {
- "__id__": 21
+ "__id__": 27
},
"floorLayer": {
- "__id__": 24
+ "__id__": 30
},
"entityLayer": {
- "__id__": 55
+ "__id__": 61
},
"SkillLayer": {
- "__id__": 61
+ "__id__": 67
},
"isFollowPlayer": true,
"_id": ""
@@ -1610,7 +1752,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 72
+ "__id__": 78
},
"_id": ""
},
@@ -1641,7 +1783,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 75
+ "__id__": 81
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1669,7 +1811,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 77
+ "__id__": 83
},
"_cameraComponent": {
"__id__": 3
@@ -1691,7 +1833,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 79
+ "__id__": 85
},
"_alignFlags": 45,
"_target": null,
diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab
index 9e0c05b7..7b3f2f34 100644
--- a/assets/resources/gui/role_controller.prefab
+++ b/assets/resources/gui/role_controller.prefab
@@ -25,26 +25,26 @@
"__id__": 677
},
{
- "__id__": 1186
+ "__id__": 1194
},
{
- "__id__": 1195
+ "__id__": 1203
}
],
"_active": true,
"_components": [
{
- "__id__": 1241
+ "__id__": 1249
},
{
- "__id__": 1243
+ "__id__": 1251
},
{
- "__id__": 1245
+ "__id__": 1253
}
],
"_prefab": {
- "__id__": 1247
+ "__id__": 1255
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -14437,41 +14437,44 @@
"__id__": 686
},
{
- "__id__": 692
+ "__id__": 694
},
{
- "__id__": 720
+ "__id__": 700
},
{
- "__id__": 1073
+ "__id__": 728
},
{
- "__id__": 1090
+ "__id__": 1081
},
{
- "__id__": 1131
+ "__id__": 1098
},
{
- "__id__": 1154
+ "__id__": 1139
+ },
+ {
+ "__id__": 1162
}
],
"_active": true,
"_components": [
{
- "__id__": 1177
+ "__id__": 1185
},
{
- "__id__": 1179
+ "__id__": 1187
},
{
- "__id__": 1181
+ "__id__": 1189
},
{
- "__id__": 1183
+ "__id__": 1191
}
],
"_prefab": {
- "__id__": 1185
+ "__id__": 1193
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -14529,7 +14532,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
- "y": 275,
+ "y": 0,
"z": 0
},
"_lrot": {
@@ -14569,8 +14572,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 229,
- "height": 63
+ "width": 153.1914893617021,
+ "height": 272.3404255319149
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -14606,7 +14609,7 @@
"a": 255
},
"_spriteFrame": {
- "__uuid__": "deedea09-8f2b-400f-9803-4cfd38e45d1a@21123",
+ "__uuid__": "deedea09-8f2b-400f-9803-4cfd38e45d1a@58cb7",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
@@ -14643,12 +14646,12 @@
"__prefab": {
"__id__": 684
},
- "_alignFlags": 4,
+ "_alignFlags": 45,
"_target": null,
- "_left": 245.5,
- "_right": 245.5,
- "_top": 947.097,
- "_bottom": 275,
+ "_left": 0,
+ "_right": 0,
+ "_top": 0,
+ "_bottom": 0,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
@@ -14657,8 +14660,8 @@
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
- "_originalWidth": 540,
- "_originalHeight": 1900,
+ "_originalWidth": 229,
+ "_originalHeight": 63,
"_alignMode": 2,
"_lockFlags": 0,
"_id": ""
@@ -14682,7 +14685,7 @@
},
{
"__type__": "cc.Node",
- "_name": "hero",
+ "_name": "bg2",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
@@ -14696,10 +14699,188 @@
},
{
"__id__": 689
+ },
+ {
+ "__id__": 691
}
],
"_prefab": {
- "__id__": 691
+ "__id__": 693
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": -1,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 4.7,
+ "y": 4.7,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1073741824,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 686
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 688
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 153.61702127659575,
+ "height": 272.7659574468085
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "3fwrO90BxPGIHz2cpuzgmO"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 686
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 690
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_spriteFrame": {
+ "__uuid__": "d7d869bc-06aa-4876-806f-487e68b96780@eb5f8",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ "_type": 0,
+ "_fillType": 0,
+ "_sizeMode": 0,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_useGrayscale": false,
+ "_atlas": {
+ "__uuid__": "d7d869bc-06aa-4876-806f-487e68b96780",
+ "__expectedType__": "cc.SpriteAtlas"
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "c8Dw75a6RANJhZgw9tHZXg"
+ },
+ {
+ "__type__": "cc.Widget",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 686
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 692
+ },
+ "_alignFlags": 45,
+ "_target": null,
+ "_left": -1,
+ "_right": -1,
+ "_top": -1,
+ "_bottom": -1,
+ "_horizontalCenter": 0,
+ "_verticalCenter": 0,
+ "_isAbsLeft": true,
+ "_isAbsRight": true,
+ "_isAbsTop": true,
+ "_isAbsBottom": true,
+ "_isAbsHorizontalCenter": true,
+ "_isAbsVerticalCenter": true,
+ "_originalWidth": 229,
+ "_originalHeight": 63,
+ "_alignMode": 2,
+ "_lockFlags": 0,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "13wq2tFTJFfrGX6dXD9UPB"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "9b/wzscV5BUaE020voDXyc",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "hero",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 677
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 695
+ },
+ {
+ "__id__": 697
+ }
+ ],
+ "_prefab": {
+ "__id__": 699
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -14736,11 +14917,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 686
+ "__id__": 694
},
"_enabled": true,
"__prefab": {
- "__id__": 688
+ "__id__": 696
},
"_contentSize": {
"__type__": "cc.Size",
@@ -14764,11 +14945,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 686
+ "__id__": 694
},
"_enabled": true,
"__prefab": {
- "__id__": 690
+ "__id__": 698
},
"_alignFlags": 20,
"_target": null,
@@ -14817,29 +14998,29 @@
},
"_children": [
{
- "__id__": 693
- },
- {
- "__id__": 699
+ "__id__": 701
},
{
"__id__": 707
+ },
+ {
+ "__id__": 715
}
],
"_active": true,
"_components": [
{
- "__id__": 713
+ "__id__": 721
},
{
- "__id__": 715
+ "__id__": 723
},
{
- "__id__": 717
+ "__id__": 725
}
],
"_prefab": {
- "__id__": 719
+ "__id__": 727
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -14876,20 +15057,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 692
+ "__id__": 700
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 694
+ "__id__": 702
},
{
- "__id__": 696
+ "__id__": 704
}
],
"_prefab": {
- "__id__": 698
+ "__id__": 706
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -14926,11 +15107,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 693
+ "__id__": 701
},
"_enabled": true,
"__prefab": {
- "__id__": 695
+ "__id__": 703
},
"_contentSize": {
"__type__": "cc.Size",
@@ -14954,11 +15135,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 693
+ "__id__": 701
},
"_enabled": true,
"__prefab": {
- "__id__": 697
+ "__id__": 705
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -15015,23 +15196,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 692
+ "__id__": 700
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 700
+ "__id__": 708
},
{
- "__id__": 702
+ "__id__": 710
},
{
- "__id__": 704
+ "__id__": 712
}
],
"_prefab": {
- "__id__": 706
+ "__id__": 714
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -15068,11 +15249,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 699
+ "__id__": 707
},
"_enabled": true,
"__prefab": {
- "__id__": 701
+ "__id__": 709
},
"_contentSize": {
"__type__": "cc.Size",
@@ -15096,11 +15277,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 699
+ "__id__": 707
},
"_enabled": true,
"__prefab": {
- "__id__": 703
+ "__id__": 711
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -15164,11 +15345,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 699
+ "__id__": 707
},
"_enabled": true,
"__prefab": {
- "__id__": 705
+ "__id__": 713
},
"_alignFlags": 1,
"_target": null,
@@ -15213,20 +15394,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 692
+ "__id__": 700
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 708
+ "__id__": 716
},
{
- "__id__": 710
+ "__id__": 718
}
],
"_prefab": {
- "__id__": 712
+ "__id__": 720
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -15263,11 +15444,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 707
+ "__id__": 715
},
"_enabled": true,
"__prefab": {
- "__id__": 709
+ "__id__": 717
},
"_contentSize": {
"__type__": "cc.Size",
@@ -15291,11 +15472,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 707
+ "__id__": 715
},
"_enabled": true,
"__prefab": {
- "__id__": 711
+ "__id__": 719
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -15372,11 +15553,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 692
+ "__id__": 700
},
"_enabled": true,
"__prefab": {
- "__id__": 714
+ "__id__": 722
},
"_contentSize": {
"__type__": "cc.Size",
@@ -15400,11 +15581,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 692
+ "__id__": 700
},
"_enabled": false,
"__prefab": {
- "__id__": 716
+ "__id__": 724
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -15442,11 +15623,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 692
+ "__id__": 700
},
"_enabled": true,
"__prefab": {
- "__id__": 718
+ "__id__": 726
},
"_alignFlags": 20,
"_target": null,
@@ -15495,23 +15676,23 @@
},
"_children": [
{
- "__id__": 721
+ "__id__": 729
},
{
- "__id__": 729
+ "__id__": 737
}
],
"_active": true,
"_components": [
{
- "__id__": 1068
+ "__id__": 1076
},
{
- "__id__": 1070
+ "__id__": 1078
}
],
"_prefab": {
- "__id__": 1072
+ "__id__": 1080
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -15548,23 +15729,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 720
+ "__id__": 728
},
"_children": [],
"_active": false,
"_components": [
{
- "__id__": 722
+ "__id__": 730
},
{
- "__id__": 724
+ "__id__": 732
},
{
- "__id__": 726
+ "__id__": 734
}
],
"_prefab": {
- "__id__": 728
+ "__id__": 736
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -15601,11 +15782,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 721
+ "__id__": 729
},
"_enabled": true,
"__prefab": {
- "__id__": 723
+ "__id__": 731
},
"_contentSize": {
"__type__": "cc.Size",
@@ -15629,11 +15810,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 721
+ "__id__": 729
},
"_enabled": true,
"__prefab": {
- "__id__": 725
+ "__id__": 733
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -15677,11 +15858,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 721
+ "__id__": 729
},
"_enabled": true,
"__prefab": {
- "__id__": 727
+ "__id__": 735
},
"_alignFlags": 45,
"_target": null,
@@ -15726,30 +15907,30 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 720
+ "__id__": 728
},
"_children": [
{
- "__id__": 730
+ "__id__": 738
},
{
- "__id__": 749
+ "__id__": 757
},
{
- "__id__": 979
+ "__id__": 987
},
{
- "__id__": 985
+ "__id__": 993
}
],
"_active": true,
"_components": [
{
- "__id__": 1065
+ "__id__": 1073
}
],
"_prefab": {
- "__id__": 1067
+ "__id__": 1075
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -15784,17 +15965,17 @@
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
- "__id__": 729
+ "__id__": 737
},
"_prefab": {
- "__id__": 731
+ "__id__": 739
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 730
+ "__id__": 738
},
"asset": {
"__uuid__": "e6194357-1151-49a8-ba79-224f45ed688c",
@@ -15802,7 +15983,7 @@
},
"fileId": "05DREFeeFN3J6MVw6Ib9Zw",
"instance": {
- "__id__": 732
+ "__id__": 740
},
"targetOverrides": null
},
@@ -15816,25 +15997,10 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 733
+ "__id__": 741
},
{
- "__id__": 735
- },
- {
- "__id__": 736
- },
- {
- "__id__": 737
- },
- {
- "__id__": 738
- },
- {
- "__id__": 740
- },
- {
- "__id__": 742
+ "__id__": 743
},
{
"__id__": 744
@@ -15846,7 +16012,22 @@
"__id__": 746
},
{
- "__id__": 747
+ "__id__": 748
+ },
+ {
+ "__id__": 750
+ },
+ {
+ "__id__": 752
+ },
+ {
+ "__id__": 753
+ },
+ {
+ "__id__": 754
+ },
+ {
+ "__id__": 755
}
],
"removedComponents": []
@@ -15854,7 +16035,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 734
+ "__id__": 742
},
"propertyPath": [
"_name"
@@ -15870,7 +16051,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 734
+ "__id__": 742
},
"propertyPath": [
"_lpos"
@@ -15885,7 +16066,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 734
+ "__id__": 742
},
"propertyPath": [
"_lrot"
@@ -15901,7 +16082,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 734
+ "__id__": 742
},
"propertyPath": [
"_euler"
@@ -15916,7 +16097,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 739
+ "__id__": 747
},
"propertyPath": [
"_contentSize"
@@ -15936,7 +16117,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 741
+ "__id__": 749
},
"propertyPath": [
"_contentSize"
@@ -15956,7 +16137,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 743
+ "__id__": 751
},
"propertyPath": [
"_left"
@@ -15972,7 +16153,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 743
+ "__id__": 751
},
"propertyPath": [
"_right"
@@ -15982,7 +16163,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 743
+ "__id__": 751
},
"propertyPath": [
"_top"
@@ -15992,7 +16173,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 743
+ "__id__": 751
},
"propertyPath": [
"_bottom"
@@ -16002,7 +16183,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 748
+ "__id__": 756
},
"propertyPath": [
"_spriteFrame"
@@ -16024,42 +16205,42 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 729
+ "__id__": 737
},
"_children": [
{
- "__id__": 750
+ "__id__": 758
},
{
- "__id__": 788
+ "__id__": 796
},
{
- "__id__": 826
+ "__id__": 834
},
{
- "__id__": 858
+ "__id__": 866
},
{
- "__id__": 896
+ "__id__": 904
},
{
- "__id__": 936
+ "__id__": 944
}
],
"_active": true,
"_components": [
{
- "__id__": 972
+ "__id__": 980
},
{
- "__id__": 974
+ "__id__": 982
},
{
- "__id__": 976
+ "__id__": 984
}
],
"_prefab": {
- "__id__": 978
+ "__id__": 986
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -16096,27 +16277,27 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 749
+ "__id__": 757
},
"_children": [
{
- "__id__": 751
- },
- {
- "__id__": 771
+ "__id__": 759
},
{
"__id__": 779
+ },
+ {
+ "__id__": 787
}
],
"_active": true,
"_components": [
{
- "__id__": 785
+ "__id__": 793
}
],
"_prefab": {
- "__id__": 787
+ "__id__": 795
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -16151,17 +16332,17 @@
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
- "__id__": 750
+ "__id__": 758
},
"_prefab": {
- "__id__": 752
+ "__id__": 760
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 751
+ "__id__": 759
},
"asset": {
"__uuid__": "5674600e-6428-4c31-9433-d5e8cdeeb9ac",
@@ -16169,7 +16350,7 @@
},
"fileId": "a93vi9kpZL3rMNveBNKF4B",
"instance": {
- "__id__": 753
+ "__id__": 761
},
"targetOverrides": null
},
@@ -16183,29 +16364,17 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 754
+ "__id__": 762
},
{
- "__id__": 756
- },
- {
- "__id__": 757
- },
- {
- "__id__": 758
- },
- {
- "__id__": 759
- },
- {
- "__id__": 761
- },
- {
- "__id__": 763
+ "__id__": 764
},
{
"__id__": 765
},
+ {
+ "__id__": 766
+ },
{
"__id__": 767
},
@@ -16213,7 +16382,19 @@
"__id__": 769
},
{
- "__id__": 770
+ "__id__": 771
+ },
+ {
+ "__id__": 773
+ },
+ {
+ "__id__": 775
+ },
+ {
+ "__id__": 777
+ },
+ {
+ "__id__": 778
}
],
"removedComponents": []
@@ -16221,7 +16402,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 755
+ "__id__": 763
},
"propertyPath": [
"_name"
@@ -16237,7 +16418,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 755
+ "__id__": 763
},
"propertyPath": [
"_lpos"
@@ -16252,7 +16433,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 755
+ "__id__": 763
},
"propertyPath": [
"_lrot"
@@ -16268,7 +16449,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 755
+ "__id__": 763
},
"propertyPath": [
"_euler"
@@ -16283,7 +16464,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 760
+ "__id__": 768
},
"propertyPath": [
"_contentSize"
@@ -16303,7 +16484,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 762
+ "__id__": 770
},
"propertyPath": [
"_progress"
@@ -16319,7 +16500,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 764
+ "__id__": 772
},
"propertyPath": [
"_right"
@@ -16335,7 +16516,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 766
+ "__id__": 774
},
"propertyPath": [
"_contentSize"
@@ -16355,7 +16536,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 768
+ "__id__": 776
},
"propertyPath": [
"_lpos"
@@ -16376,7 +16557,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 766
+ "__id__": 774
},
"propertyPath": [
"_anchorPoint"
@@ -16390,7 +16571,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 762
+ "__id__": 770
},
"propertyPath": [
"_totalLength"
@@ -16403,23 +16584,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 750
+ "__id__": 758
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 772
+ "__id__": 780
},
{
- "__id__": 774
+ "__id__": 782
},
{
- "__id__": 776
+ "__id__": 784
}
],
"_prefab": {
- "__id__": 778
+ "__id__": 786
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -16456,11 +16637,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 771
+ "__id__": 779
},
"_enabled": true,
"__prefab": {
- "__id__": 773
+ "__id__": 781
},
"_contentSize": {
"__type__": "cc.Size",
@@ -16484,11 +16665,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 771
+ "__id__": 779
},
"_enabled": true,
"__prefab": {
- "__id__": 775
+ "__id__": 783
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -16552,11 +16733,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 771
+ "__id__": 779
},
"_enabled": true,
"__prefab": {
- "__id__": 777
+ "__id__": 785
},
"_alignFlags": 32,
"_target": null,
@@ -16601,20 +16782,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 750
+ "__id__": 758
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 780
+ "__id__": 788
},
{
- "__id__": 782
+ "__id__": 790
}
],
"_prefab": {
- "__id__": 784
+ "__id__": 792
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -16651,11 +16832,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 779
+ "__id__": 787
},
"_enabled": true,
"__prefab": {
- "__id__": 781
+ "__id__": 789
},
"_contentSize": {
"__type__": "cc.Size",
@@ -16679,11 +16860,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 779
+ "__id__": 787
},
"_enabled": true,
"__prefab": {
- "__id__": 783
+ "__id__": 791
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -16760,11 +16941,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 750
+ "__id__": 758
},
"_enabled": true,
"__prefab": {
- "__id__": 786
+ "__id__": 794
},
"_contentSize": {
"__type__": "cc.Size",
@@ -16801,27 +16982,27 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 749
+ "__id__": 757
},
"_children": [
{
- "__id__": 789
- },
- {
- "__id__": 809
+ "__id__": 797
},
{
"__id__": 817
+ },
+ {
+ "__id__": 825
}
],
"_active": true,
"_components": [
{
- "__id__": 823
+ "__id__": 831
}
],
"_prefab": {
- "__id__": 825
+ "__id__": 833
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -16856,17 +17037,17 @@
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
- "__id__": 788
+ "__id__": 796
},
"_prefab": {
- "__id__": 790
+ "__id__": 798
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 789
+ "__id__": 797
},
"asset": {
"__uuid__": "5674600e-6428-4c31-9433-d5e8cdeeb9ac",
@@ -16874,7 +17055,7 @@
},
"fileId": "a93vi9kpZL3rMNveBNKF4B",
"instance": {
- "__id__": 791
+ "__id__": 799
},
"targetOverrides": null
},
@@ -16888,25 +17069,10 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 792
+ "__id__": 800
},
{
- "__id__": 794
- },
- {
- "__id__": 795
- },
- {
- "__id__": 796
- },
- {
- "__id__": 797
- },
- {
- "__id__": 799
- },
- {
- "__id__": 801
+ "__id__": 802
},
{
"__id__": 803
@@ -16915,10 +17081,25 @@
"__id__": 804
},
{
- "__id__": 806
+ "__id__": 805
},
{
- "__id__": 808
+ "__id__": 807
+ },
+ {
+ "__id__": 809
+ },
+ {
+ "__id__": 811
+ },
+ {
+ "__id__": 812
+ },
+ {
+ "__id__": 814
+ },
+ {
+ "__id__": 816
}
],
"removedComponents": []
@@ -16926,7 +17107,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 793
+ "__id__": 801
},
"propertyPath": [
"_name"
@@ -16942,7 +17123,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 793
+ "__id__": 801
},
"propertyPath": [
"_lpos"
@@ -16957,7 +17138,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 793
+ "__id__": 801
},
"propertyPath": [
"_lrot"
@@ -16973,7 +17154,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 793
+ "__id__": 801
},
"propertyPath": [
"_euler"
@@ -16988,7 +17169,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 798
+ "__id__": 806
},
"propertyPath": [
"_contentSize"
@@ -17008,7 +17189,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 800
+ "__id__": 808
},
"propertyPath": [
"_contentSize"
@@ -17028,7 +17209,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 802
+ "__id__": 810
},
"propertyPath": [
"_lpos"
@@ -17049,7 +17230,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 798
+ "__id__": 806
},
"propertyPath": [
"_anchorPoint"
@@ -17063,7 +17244,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 805
+ "__id__": 813
},
"propertyPath": [
"_totalLength"
@@ -17079,7 +17260,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 807
+ "__id__": 815
},
"propertyPath": [
"_right"
@@ -17095,7 +17276,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 805
+ "__id__": 813
},
"propertyPath": [
"_progress"
@@ -17108,23 +17289,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 788
+ "__id__": 796
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 810
+ "__id__": 818
},
{
- "__id__": 812
+ "__id__": 820
},
{
- "__id__": 814
+ "__id__": 822
}
],
"_prefab": {
- "__id__": 816
+ "__id__": 824
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -17161,11 +17342,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 809
+ "__id__": 817
},
"_enabled": true,
"__prefab": {
- "__id__": 811
+ "__id__": 819
},
"_contentSize": {
"__type__": "cc.Size",
@@ -17189,11 +17370,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 809
+ "__id__": 817
},
"_enabled": true,
"__prefab": {
- "__id__": 813
+ "__id__": 821
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -17257,11 +17438,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 809
+ "__id__": 817
},
"_enabled": true,
"__prefab": {
- "__id__": 815
+ "__id__": 823
},
"_alignFlags": 32,
"_target": null,
@@ -17306,20 +17487,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 788
+ "__id__": 796
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 818
+ "__id__": 826
},
{
- "__id__": 820
+ "__id__": 828
}
],
"_prefab": {
- "__id__": 822
+ "__id__": 830
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -17356,11 +17537,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 817
+ "__id__": 825
},
"_enabled": true,
"__prefab": {
- "__id__": 819
+ "__id__": 827
},
"_contentSize": {
"__type__": "cc.Size",
@@ -17384,11 +17565,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 817
+ "__id__": 825
},
"_enabled": true,
"__prefab": {
- "__id__": 821
+ "__id__": 829
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -17465,11 +17646,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 788
+ "__id__": 796
},
"_enabled": true,
"__prefab": {
- "__id__": 824
+ "__id__": 832
},
"_contentSize": {
"__type__": "cc.Size",
@@ -17506,27 +17687,27 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 749
+ "__id__": 757
},
"_children": [
{
- "__id__": 827
+ "__id__": 835
},
{
- "__id__": 843
+ "__id__": 851
},
{
- "__id__": 849
+ "__id__": 857
}
],
"_active": false,
"_components": [
{
- "__id__": 855
+ "__id__": 863
}
],
"_prefab": {
- "__id__": 857
+ "__id__": 865
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -17561,17 +17742,17 @@
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
- "__id__": 826
+ "__id__": 834
},
"_prefab": {
- "__id__": 828
+ "__id__": 836
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 827
+ "__id__": 835
},
"asset": {
"__uuid__": "5674600e-6428-4c31-9433-d5e8cdeeb9ac",
@@ -17579,7 +17760,7 @@
},
"fileId": "a93vi9kpZL3rMNveBNKF4B",
"instance": {
- "__id__": 829
+ "__id__": 837
},
"targetOverrides": null
},
@@ -17592,32 +17773,32 @@
"mountedChildren": [],
"mountedComponents": [],
"propertyOverrides": [
- {
- "__id__": 830
- },
- {
- "__id__": 832
- },
- {
- "__id__": 833
- },
- {
- "__id__": 834
- },
- {
- "__id__": 835
- },
- {
- "__id__": 837
- },
{
"__id__": 838
},
{
"__id__": 840
},
+ {
+ "__id__": 841
+ },
{
"__id__": 842
+ },
+ {
+ "__id__": 843
+ },
+ {
+ "__id__": 845
+ },
+ {
+ "__id__": 846
+ },
+ {
+ "__id__": 848
+ },
+ {
+ "__id__": 850
}
],
"removedComponents": []
@@ -17625,7 +17806,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 831
+ "__id__": 839
},
"propertyPath": [
"_name"
@@ -17641,7 +17822,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 831
+ "__id__": 839
},
"propertyPath": [
"_lpos"
@@ -17656,7 +17837,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 831
+ "__id__": 839
},
"propertyPath": [
"_lrot"
@@ -17672,7 +17853,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 831
+ "__id__": 839
},
"propertyPath": [
"_euler"
@@ -17687,7 +17868,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 836
+ "__id__": 844
},
"propertyPath": [
"_contentSize"
@@ -17707,7 +17888,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 836
+ "__id__": 844
},
"propertyPath": [
"_anchorPoint"
@@ -17721,7 +17902,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 839
+ "__id__": 847
},
"propertyPath": [
"_contentSize"
@@ -17741,7 +17922,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 841
+ "__id__": 849
},
"propertyPath": [
"_totalLength"
@@ -17757,7 +17938,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 841
+ "__id__": 849
},
"propertyPath": [
"_progress"
@@ -17770,20 +17951,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 826
+ "__id__": 834
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 844
+ "__id__": 852
},
{
- "__id__": 846
+ "__id__": 854
}
],
"_prefab": {
- "__id__": 848
+ "__id__": 856
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -17820,11 +18001,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 843
+ "__id__": 851
},
"_enabled": true,
"__prefab": {
- "__id__": 845
+ "__id__": 853
},
"_contentSize": {
"__type__": "cc.Size",
@@ -17848,11 +18029,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 843
+ "__id__": 851
},
"_enabled": true,
"__prefab": {
- "__id__": 847
+ "__id__": 855
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -17929,20 +18110,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 826
+ "__id__": 834
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 850
+ "__id__": 858
},
{
- "__id__": 852
+ "__id__": 860
}
],
"_prefab": {
- "__id__": 854
+ "__id__": 862
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -17979,11 +18160,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 849
+ "__id__": 857
},
"_enabled": true,
"__prefab": {
- "__id__": 851
+ "__id__": 859
},
"_contentSize": {
"__type__": "cc.Size",
@@ -18007,11 +18188,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 849
+ "__id__": 857
},
"_enabled": true,
"__prefab": {
- "__id__": 853
+ "__id__": 861
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -18088,11 +18269,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 826
+ "__id__": 834
},
"_enabled": true,
"__prefab": {
- "__id__": 856
+ "__id__": 864
},
"_contentSize": {
"__type__": "cc.Size",
@@ -18129,27 +18310,27 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 749
+ "__id__": 757
},
"_children": [
{
- "__id__": 859
- },
- {
- "__id__": 879
+ "__id__": 867
},
{
"__id__": 887
+ },
+ {
+ "__id__": 895
}
],
"_active": true,
"_components": [
{
- "__id__": 893
+ "__id__": 901
}
],
"_prefab": {
- "__id__": 895
+ "__id__": 903
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -18184,17 +18365,17 @@
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
- "__id__": 858
+ "__id__": 866
},
"_prefab": {
- "__id__": 860
+ "__id__": 868
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 859
+ "__id__": 867
},
"asset": {
"__uuid__": "5674600e-6428-4c31-9433-d5e8cdeeb9ac",
@@ -18202,7 +18383,7 @@
},
"fileId": "a93vi9kpZL3rMNveBNKF4B",
"instance": {
- "__id__": 861
+ "__id__": 869
},
"targetOverrides": null
},
@@ -18216,25 +18397,10 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 862
+ "__id__": 870
},
{
- "__id__": 864
- },
- {
- "__id__": 865
- },
- {
- "__id__": 866
- },
- {
- "__id__": 867
- },
- {
- "__id__": 869
- },
- {
- "__id__": 871
+ "__id__": 872
},
{
"__id__": 873
@@ -18243,10 +18409,25 @@
"__id__": 874
},
{
- "__id__": 876
+ "__id__": 875
},
{
- "__id__": 878
+ "__id__": 877
+ },
+ {
+ "__id__": 879
+ },
+ {
+ "__id__": 881
+ },
+ {
+ "__id__": 882
+ },
+ {
+ "__id__": 884
+ },
+ {
+ "__id__": 886
}
],
"removedComponents": []
@@ -18254,7 +18435,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 863
+ "__id__": 871
},
"propertyPath": [
"_name"
@@ -18270,7 +18451,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 863
+ "__id__": 871
},
"propertyPath": [
"_lpos"
@@ -18285,7 +18466,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 863
+ "__id__": 871
},
"propertyPath": [
"_lrot"
@@ -18301,7 +18482,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 863
+ "__id__": 871
},
"propertyPath": [
"_euler"
@@ -18316,7 +18497,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 868
+ "__id__": 876
},
"propertyPath": [
"_contentSize"
@@ -18336,7 +18517,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 870
+ "__id__": 878
},
"propertyPath": [
"_contentSize"
@@ -18356,7 +18537,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 872
+ "__id__": 880
},
"propertyPath": [
"_lpos"
@@ -18377,7 +18558,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 868
+ "__id__": 876
},
"propertyPath": [
"_anchorPoint"
@@ -18391,7 +18572,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 875
+ "__id__": 883
},
"propertyPath": [
"_totalLength"
@@ -18407,7 +18588,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 877
+ "__id__": 885
},
"propertyPath": [
"_right"
@@ -18423,7 +18604,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 875
+ "__id__": 883
},
"propertyPath": [
"_progress"
@@ -18436,23 +18617,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 858
+ "__id__": 866
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 880
+ "__id__": 888
},
{
- "__id__": 882
+ "__id__": 890
},
{
- "__id__": 884
+ "__id__": 892
}
],
"_prefab": {
- "__id__": 886
+ "__id__": 894
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -18489,11 +18670,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 879
+ "__id__": 887
},
"_enabled": true,
"__prefab": {
- "__id__": 881
+ "__id__": 889
},
"_contentSize": {
"__type__": "cc.Size",
@@ -18517,11 +18698,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 879
+ "__id__": 887
},
"_enabled": true,
"__prefab": {
- "__id__": 883
+ "__id__": 891
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -18585,11 +18766,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 879
+ "__id__": 887
},
"_enabled": true,
"__prefab": {
- "__id__": 885
+ "__id__": 893
},
"_alignFlags": 32,
"_target": null,
@@ -18634,20 +18815,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 858
+ "__id__": 866
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 888
+ "__id__": 896
},
{
- "__id__": 890
+ "__id__": 898
}
],
"_prefab": {
- "__id__": 892
+ "__id__": 900
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -18684,11 +18865,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 887
+ "__id__": 895
},
"_enabled": true,
"__prefab": {
- "__id__": 889
+ "__id__": 897
},
"_contentSize": {
"__type__": "cc.Size",
@@ -18712,11 +18893,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 887
+ "__id__": 895
},
"_enabled": true,
"__prefab": {
- "__id__": 891
+ "__id__": 899
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -18793,11 +18974,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 858
+ "__id__": 866
},
"_enabled": true,
"__prefab": {
- "__id__": 894
+ "__id__": 902
},
"_contentSize": {
"__type__": "cc.Size",
@@ -18834,27 +19015,27 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 749
+ "__id__": 757
},
"_children": [
{
- "__id__": 897
+ "__id__": 905
},
{
- "__id__": 917
+ "__id__": 925
},
{
- "__id__": 927
+ "__id__": 935
}
],
"_active": true,
"_components": [
{
- "__id__": 933
+ "__id__": 941
}
],
"_prefab": {
- "__id__": 935
+ "__id__": 943
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -18889,17 +19070,17 @@
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
- "__id__": 896
+ "__id__": 904
},
"_prefab": {
- "__id__": 898
+ "__id__": 906
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 897
+ "__id__": 905
},
"asset": {
"__uuid__": "5674600e-6428-4c31-9433-d5e8cdeeb9ac",
@@ -18907,7 +19088,7 @@
},
"fileId": "a93vi9kpZL3rMNveBNKF4B",
"instance": {
- "__id__": 899
+ "__id__": 907
},
"targetOverrides": null
},
@@ -18921,25 +19102,10 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 900
+ "__id__": 908
},
{
- "__id__": 902
- },
- {
- "__id__": 903
- },
- {
- "__id__": 904
- },
- {
- "__id__": 905
- },
- {
- "__id__": 907
- },
- {
- "__id__": 909
+ "__id__": 910
},
{
"__id__": 911
@@ -18948,10 +19114,25 @@
"__id__": 912
},
{
- "__id__": 914
+ "__id__": 913
},
{
- "__id__": 916
+ "__id__": 915
+ },
+ {
+ "__id__": 917
+ },
+ {
+ "__id__": 919
+ },
+ {
+ "__id__": 920
+ },
+ {
+ "__id__": 922
+ },
+ {
+ "__id__": 924
}
],
"removedComponents": []
@@ -18959,7 +19140,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 901
+ "__id__": 909
},
"propertyPath": [
"_name"
@@ -18975,7 +19156,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 901
+ "__id__": 909
},
"propertyPath": [
"_lpos"
@@ -18990,7 +19171,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 901
+ "__id__": 909
},
"propertyPath": [
"_lrot"
@@ -19006,7 +19187,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 901
+ "__id__": 909
},
"propertyPath": [
"_euler"
@@ -19021,7 +19202,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 906
+ "__id__": 914
},
"propertyPath": [
"_contentSize"
@@ -19041,7 +19222,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 908
+ "__id__": 916
},
"propertyPath": [
"_contentSize"
@@ -19061,7 +19242,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 910
+ "__id__": 918
},
"propertyPath": [
"_lpos"
@@ -19082,7 +19263,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 906
+ "__id__": 914
},
"propertyPath": [
"_anchorPoint"
@@ -19096,7 +19277,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 913
+ "__id__": 921
},
"propertyPath": [
"_totalLength"
@@ -19112,7 +19293,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 915
+ "__id__": 923
},
"propertyPath": [
"_right"
@@ -19128,7 +19309,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 913
+ "__id__": 921
},
"propertyPath": [
"_progress"
@@ -19141,26 +19322,26 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 896
+ "__id__": 904
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 918
+ "__id__": 926
},
{
- "__id__": 920
+ "__id__": 928
},
{
- "__id__": 922
+ "__id__": 930
},
{
- "__id__": 924
+ "__id__": 932
}
],
"_prefab": {
- "__id__": 926
+ "__id__": 934
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -19197,11 +19378,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 917
+ "__id__": 925
},
"_enabled": true,
"__prefab": {
- "__id__": 919
+ "__id__": 927
},
"_contentSize": {
"__type__": "cc.Size",
@@ -19225,11 +19406,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 917
+ "__id__": 925
},
"_enabled": true,
"__prefab": {
- "__id__": 921
+ "__id__": 929
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -19293,11 +19474,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 917
+ "__id__": 925
},
"_enabled": true,
"__prefab": {
- "__id__": 923
+ "__id__": 931
},
"_alignFlags": 34,
"_target": null,
@@ -19329,11 +19510,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 917
+ "__id__": 925
},
"_enabled": true,
"__prefab": {
- "__id__": 925
+ "__id__": 933
},
"_alignFlags": 0,
"_target": null,
@@ -19378,20 +19559,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 896
+ "__id__": 904
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 928
+ "__id__": 936
},
{
- "__id__": 930
+ "__id__": 938
}
],
"_prefab": {
- "__id__": 932
+ "__id__": 940
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -19428,11 +19609,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 927
+ "__id__": 935
},
"_enabled": true,
"__prefab": {
- "__id__": 929
+ "__id__": 937
},
"_contentSize": {
"__type__": "cc.Size",
@@ -19456,11 +19637,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 927
+ "__id__": 935
},
"_enabled": true,
"__prefab": {
- "__id__": 931
+ "__id__": 939
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -19537,11 +19718,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 896
+ "__id__": 904
},
"_enabled": true,
"__prefab": {
- "__id__": 934
+ "__id__": 942
},
"_contentSize": {
"__type__": "cc.Size",
@@ -19578,27 +19759,27 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 749
+ "__id__": 757
},
"_children": [
{
- "__id__": 937
+ "__id__": 945
},
{
- "__id__": 953
+ "__id__": 961
},
{
- "__id__": 963
+ "__id__": 971
}
],
"_active": false,
"_components": [
{
- "__id__": 969
+ "__id__": 977
}
],
"_prefab": {
- "__id__": 971
+ "__id__": 979
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -19633,17 +19814,17 @@
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
- "__id__": 936
+ "__id__": 944
},
"_prefab": {
- "__id__": 938
+ "__id__": 946
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 937
+ "__id__": 945
},
"asset": {
"__uuid__": "5674600e-6428-4c31-9433-d5e8cdeeb9ac",
@@ -19651,7 +19832,7 @@
},
"fileId": "a93vi9kpZL3rMNveBNKF4B",
"instance": {
- "__id__": 939
+ "__id__": 947
},
"targetOverrides": null
},
@@ -19664,32 +19845,32 @@
"mountedChildren": [],
"mountedComponents": [],
"propertyOverrides": [
- {
- "__id__": 940
- },
- {
- "__id__": 942
- },
- {
- "__id__": 943
- },
- {
- "__id__": 944
- },
- {
- "__id__": 945
- },
- {
- "__id__": 947
- },
{
"__id__": 948
},
{
"__id__": 950
},
+ {
+ "__id__": 951
+ },
{
"__id__": 952
+ },
+ {
+ "__id__": 953
+ },
+ {
+ "__id__": 955
+ },
+ {
+ "__id__": 956
+ },
+ {
+ "__id__": 958
+ },
+ {
+ "__id__": 960
}
],
"removedComponents": []
@@ -19697,7 +19878,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 941
+ "__id__": 949
},
"propertyPath": [
"_name"
@@ -19713,7 +19894,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 941
+ "__id__": 949
},
"propertyPath": [
"_lpos"
@@ -19728,7 +19909,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 941
+ "__id__": 949
},
"propertyPath": [
"_lrot"
@@ -19744,7 +19925,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 941
+ "__id__": 949
},
"propertyPath": [
"_euler"
@@ -19759,7 +19940,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 946
+ "__id__": 954
},
"propertyPath": [
"_contentSize"
@@ -19779,7 +19960,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 946
+ "__id__": 954
},
"propertyPath": [
"_anchorPoint"
@@ -19793,7 +19974,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 949
+ "__id__": 957
},
"propertyPath": [
"_contentSize"
@@ -19813,7 +19994,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 951
+ "__id__": 959
},
"propertyPath": [
"_totalLength"
@@ -19829,7 +20010,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 951
+ "__id__": 959
},
"propertyPath": [
"_progress"
@@ -19842,26 +20023,26 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 936
+ "__id__": 944
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 954
+ "__id__": 962
},
{
- "__id__": 956
+ "__id__": 964
},
{
- "__id__": 958
+ "__id__": 966
},
{
- "__id__": 960
+ "__id__": 968
}
],
"_prefab": {
- "__id__": 962
+ "__id__": 970
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -19898,11 +20079,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 953
+ "__id__": 961
},
"_enabled": true,
"__prefab": {
- "__id__": 955
+ "__id__": 963
},
"_contentSize": {
"__type__": "cc.Size",
@@ -19926,11 +20107,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 953
+ "__id__": 961
},
"_enabled": true,
"__prefab": {
- "__id__": 957
+ "__id__": 965
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -19994,11 +20175,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 953
+ "__id__": 961
},
"_enabled": true,
"__prefab": {
- "__id__": 959
+ "__id__": 967
},
"_alignFlags": 34,
"_target": null,
@@ -20030,11 +20211,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 953
+ "__id__": 961
},
"_enabled": true,
"__prefab": {
- "__id__": 961
+ "__id__": 969
},
"_alignFlags": 0,
"_target": null,
@@ -20079,20 +20260,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 936
+ "__id__": 944
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 964
+ "__id__": 972
},
{
- "__id__": 966
+ "__id__": 974
}
],
"_prefab": {
- "__id__": 968
+ "__id__": 976
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -20129,11 +20310,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 963
+ "__id__": 971
},
"_enabled": true,
"__prefab": {
- "__id__": 965
+ "__id__": 973
},
"_contentSize": {
"__type__": "cc.Size",
@@ -20157,11 +20338,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 963
+ "__id__": 971
},
"_enabled": true,
"__prefab": {
- "__id__": 967
+ "__id__": 975
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -20238,11 +20419,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 936
+ "__id__": 944
},
"_enabled": true,
"__prefab": {
- "__id__": 970
+ "__id__": 978
},
"_contentSize": {
"__type__": "cc.Size",
@@ -20279,11 +20460,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 749
+ "__id__": 757
},
"_enabled": true,
"__prefab": {
- "__id__": 973
+ "__id__": 981
},
"_contentSize": {
"__type__": "cc.Size",
@@ -20307,11 +20488,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 749
+ "__id__": 757
},
"_enabled": true,
"__prefab": {
- "__id__": 975
+ "__id__": 983
},
"_alignFlags": 45,
"_target": null,
@@ -20343,11 +20524,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 749
+ "__id__": 757
},
"_enabled": true,
"__prefab": {
- "__id__": 977
+ "__id__": 985
},
"_resizeMode": 0,
"_layoutType": 3,
@@ -20394,20 +20575,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 729
+ "__id__": 737
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 980
+ "__id__": 988
},
{
- "__id__": 982
+ "__id__": 990
}
],
"_prefab": {
- "__id__": 984
+ "__id__": 992
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -20444,11 +20625,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 979
+ "__id__": 987
},
"_enabled": true,
"__prefab": {
- "__id__": 981
+ "__id__": 989
},
"_contentSize": {
"__type__": "cc.Size",
@@ -20472,11 +20653,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 979
+ "__id__": 987
},
"_enabled": true,
"__prefab": {
- "__id__": 983
+ "__id__": 991
},
"_alignFlags": 40,
"_target": null,
@@ -20521,12 +20702,9 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 729
+ "__id__": 737
},
"_children": [
- {
- "__id__": 986
- },
{
"__id__": 994
},
@@ -20534,23 +20712,26 @@
"__id__": 1002
},
{
- "__id__": 1030
+ "__id__": 1010
+ },
+ {
+ "__id__": 1038
}
],
"_active": true,
"_components": [
{
- "__id__": 1058
+ "__id__": 1066
},
{
- "__id__": 1060
+ "__id__": 1068
},
{
- "__id__": 1062
+ "__id__": 1070
}
],
"_prefab": {
- "__id__": 1064
+ "__id__": 1072
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -20587,183 +20768,8 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 985
- },
- "_children": [],
- "_active": true,
- "_components": [
- {
- "__id__": 987
- },
- {
- "__id__": 989
- },
- {
- "__id__": 991
- }
- ],
- "_prefab": {
"__id__": 993
},
- "_lpos": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_lrot": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- },
- "_lscale": {
- "__type__": "cc.Vec3",
- "x": 1,
- "y": 1,
- "z": 1
- },
- "_mobility": 0,
- "_layer": 1073741824,
- "_euler": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_id": ""
- },
- {
- "__type__": "cc.UITransform",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 986
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 988
- },
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 630,
- "height": 200
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0.5,
- "y": 0.5
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "dfXQnbWhFDxZghe0mMjmP5"
- },
- {
- "__type__": "cc.Sprite",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 986
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 990
- },
- "_customMaterial": null,
- "_srcBlendFactor": 2,
- "_dstBlendFactor": 4,
- "_color": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 255
- },
- "_spriteFrame": {
- "__uuid__": "deedea09-8f2b-400f-9803-4cfd38e45d1a@36750",
- "__expectedType__": "cc.SpriteFrame"
- },
- "_type": 1,
- "_fillType": 0,
- "_sizeMode": 0,
- "_fillCenter": {
- "__type__": "cc.Vec2",
- "x": 0,
- "y": 0
- },
- "_fillStart": 0,
- "_fillRange": 0,
- "_isTrimmedMode": true,
- "_useGrayscale": false,
- "_atlas": null,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "054reOD9BEkZ+HqgfUC3l/"
- },
- {
- "__type__": "cc.Widget",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 986
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 992
- },
- "_alignFlags": 45,
- "_target": null,
- "_left": 10,
- "_right": 10,
- "_top": 0,
- "_bottom": 0,
- "_horizontalCenter": 0,
- "_verticalCenter": 0,
- "_isAbsLeft": true,
- "_isAbsRight": true,
- "_isAbsTop": true,
- "_isAbsBottom": true,
- "_isAbsHorizontalCenter": true,
- "_isAbsVerticalCenter": true,
- "_originalWidth": 133,
- "_originalHeight": 45,
- "_alignMode": 2,
- "_lockFlags": 0,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "edX16tRAFOPocMnAvdcZdr"
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__id__": 0
- },
- "fileId": "98YnFtG5FI159sTIKHyP8x",
- "instance": null,
- "targetOverrides": null,
- "nestedPrefabInstanceRoots": null
- },
- {
- "__type__": "cc.Node",
- "_name": "Divider",
- "_objFlags": 0,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 985
- },
"_children": [],
"_active": true,
"_components": [
@@ -20821,6 +20827,181 @@
"__prefab": {
"__id__": 996
},
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 630,
+ "height": 200
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "dfXQnbWhFDxZghe0mMjmP5"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 994
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 998
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_spriteFrame": {
+ "__uuid__": "deedea09-8f2b-400f-9803-4cfd38e45d1a@36750",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ "_type": 1,
+ "_fillType": 0,
+ "_sizeMode": 0,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_useGrayscale": false,
+ "_atlas": null,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "054reOD9BEkZ+HqgfUC3l/"
+ },
+ {
+ "__type__": "cc.Widget",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 994
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 1000
+ },
+ "_alignFlags": 45,
+ "_target": null,
+ "_left": 10,
+ "_right": 10,
+ "_top": 0,
+ "_bottom": 0,
+ "_horizontalCenter": 0,
+ "_verticalCenter": 0,
+ "_isAbsLeft": true,
+ "_isAbsRight": true,
+ "_isAbsTop": true,
+ "_isAbsBottom": true,
+ "_isAbsHorizontalCenter": true,
+ "_isAbsVerticalCenter": true,
+ "_originalWidth": 133,
+ "_originalHeight": 45,
+ "_alignMode": 2,
+ "_lockFlags": 0,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "edX16tRAFOPocMnAvdcZdr"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "98YnFtG5FI159sTIKHyP8x",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "Divider",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 993
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 1003
+ },
+ {
+ "__id__": 1005
+ },
+ {
+ "__id__": 1007
+ }
+ ],
+ "_prefab": {
+ "__id__": 1009
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1,
+ "y": 1,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1073741824,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 1002
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 1004
+ },
"_contentSize": {
"__type__": "cc.Size",
"width": 550,
@@ -20843,11 +21024,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 994
+ "__id__": 1002
},
"_enabled": true,
"__prefab": {
- "__id__": 998
+ "__id__": 1006
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -20888,11 +21069,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 994
+ "__id__": 1002
},
"_enabled": true,
"__prefab": {
- "__id__": 1000
+ "__id__": 1008
},
"_alignFlags": 42,
"_target": null,
@@ -20937,27 +21118,27 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 985
+ "__id__": 993
},
"_children": [
{
- "__id__": 1003
+ "__id__": 1011
},
{
- "__id__": 1011
+ "__id__": 1019
}
],
"_active": true,
"_components": [
{
- "__id__": 1025
+ "__id__": 1033
},
{
- "__id__": 1027
+ "__id__": 1035
}
],
"_prefab": {
- "__id__": 1029
+ "__id__": 1037
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -20994,23 +21175,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1002
+ "__id__": 1010
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 1004
+ "__id__": 1012
},
{
- "__id__": 1006
+ "__id__": 1014
},
{
- "__id__": 1008
+ "__id__": 1016
}
],
"_prefab": {
- "__id__": 1010
+ "__id__": 1018
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -21047,11 +21228,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1003
+ "__id__": 1011
},
"_enabled": true,
"__prefab": {
- "__id__": 1005
+ "__id__": 1013
},
"_contentSize": {
"__type__": "cc.Size",
@@ -21075,11 +21256,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1003
+ "__id__": 1011
},
"_enabled": true,
"__prefab": {
- "__id__": 1007
+ "__id__": 1015
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -21123,11 +21304,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1003
+ "__id__": 1011
},
"_enabled": true,
"__prefab": {
- "__id__": 1009
+ "__id__": 1017
},
"_alignFlags": 10,
"_target": null,
@@ -21172,24 +21353,24 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1002
+ "__id__": 1010
},
"_children": [
{
- "__id__": 1012
+ "__id__": 1020
}
],
"_active": true,
"_components": [
{
- "__id__": 1020
+ "__id__": 1028
},
{
- "__id__": 1022
+ "__id__": 1030
}
],
"_prefab": {
- "__id__": 1024
+ "__id__": 1032
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -21226,23 +21407,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1011
+ "__id__": 1019
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 1013
+ "__id__": 1021
},
{
- "__id__": 1015
+ "__id__": 1023
},
{
- "__id__": 1017
+ "__id__": 1025
}
],
"_prefab": {
- "__id__": 1019
+ "__id__": 1027
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -21279,11 +21460,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1012
+ "__id__": 1020
},
"_enabled": true,
"__prefab": {
- "__id__": 1014
+ "__id__": 1022
},
"_contentSize": {
"__type__": "cc.Size",
@@ -21307,11 +21488,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1012
+ "__id__": 1020
},
"_enabled": true,
"__prefab": {
- "__id__": 1016
+ "__id__": 1024
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -21375,11 +21556,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1012
+ "__id__": 1020
},
"_enabled": true,
"__prefab": {
- "__id__": 1018
+ "__id__": 1026
},
"_alignFlags": 45,
"_target": null,
@@ -21424,11 +21605,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1011
+ "__id__": 1019
},
"_enabled": true,
"__prefab": {
- "__id__": 1021
+ "__id__": 1029
},
"_contentSize": {
"__type__": "cc.Size",
@@ -21452,11 +21633,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1011
+ "__id__": 1019
},
"_enabled": true,
"__prefab": {
- "__id__": 1023
+ "__id__": 1031
},
"_alignFlags": 45,
"_target": null,
@@ -21501,11 +21682,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1002
+ "__id__": 1010
},
"_enabled": true,
"__prefab": {
- "__id__": 1026
+ "__id__": 1034
},
"_contentSize": {
"__type__": "cc.Size",
@@ -21529,11 +21710,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1002
+ "__id__": 1010
},
"_enabled": true,
"__prefab": {
- "__id__": 1028
+ "__id__": 1036
},
"_alignFlags": 41,
"_target": null,
@@ -21578,27 +21759,27 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 985
+ "__id__": 993
},
"_children": [
{
- "__id__": 1031
+ "__id__": 1039
},
{
- "__id__": 1039
+ "__id__": 1047
}
],
"_active": true,
"_components": [
{
- "__id__": 1053
+ "__id__": 1061
},
{
- "__id__": 1055
+ "__id__": 1063
}
],
"_prefab": {
- "__id__": 1057
+ "__id__": 1065
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -21635,23 +21816,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1030
+ "__id__": 1038
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 1032
+ "__id__": 1040
},
{
- "__id__": 1034
+ "__id__": 1042
},
{
- "__id__": 1036
+ "__id__": 1044
}
],
"_prefab": {
- "__id__": 1038
+ "__id__": 1046
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -21688,11 +21869,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1031
+ "__id__": 1039
},
"_enabled": true,
"__prefab": {
- "__id__": 1033
+ "__id__": 1041
},
"_contentSize": {
"__type__": "cc.Size",
@@ -21716,11 +21897,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1031
+ "__id__": 1039
},
"_enabled": true,
"__prefab": {
- "__id__": 1035
+ "__id__": 1043
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -21764,11 +21945,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1031
+ "__id__": 1039
},
"_enabled": true,
"__prefab": {
- "__id__": 1037
+ "__id__": 1045
},
"_alignFlags": 10,
"_target": null,
@@ -21813,24 +21994,24 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1030
+ "__id__": 1038
},
"_children": [
{
- "__id__": 1040
+ "__id__": 1048
}
],
"_active": true,
"_components": [
{
- "__id__": 1048
+ "__id__": 1056
},
{
- "__id__": 1050
+ "__id__": 1058
}
],
"_prefab": {
- "__id__": 1052
+ "__id__": 1060
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -21867,23 +22048,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1039
+ "__id__": 1047
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 1041
+ "__id__": 1049
},
{
- "__id__": 1043
+ "__id__": 1051
},
{
- "__id__": 1045
+ "__id__": 1053
}
],
"_prefab": {
- "__id__": 1047
+ "__id__": 1055
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -21920,11 +22101,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1040
+ "__id__": 1048
},
"_enabled": true,
"__prefab": {
- "__id__": 1042
+ "__id__": 1050
},
"_contentSize": {
"__type__": "cc.Size",
@@ -21948,11 +22129,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1040
+ "__id__": 1048
},
"_enabled": true,
"__prefab": {
- "__id__": 1044
+ "__id__": 1052
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -22016,11 +22197,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1040
+ "__id__": 1048
},
"_enabled": true,
"__prefab": {
- "__id__": 1046
+ "__id__": 1054
},
"_alignFlags": 45,
"_target": null,
@@ -22065,11 +22246,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1039
+ "__id__": 1047
},
"_enabled": true,
"__prefab": {
- "__id__": 1049
+ "__id__": 1057
},
"_contentSize": {
"__type__": "cc.Size",
@@ -22093,11 +22274,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1039
+ "__id__": 1047
},
"_enabled": true,
"__prefab": {
- "__id__": 1051
+ "__id__": 1059
},
"_alignFlags": 45,
"_target": null,
@@ -22142,11 +22323,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1030
+ "__id__": 1038
},
"_enabled": true,
"__prefab": {
- "__id__": 1054
+ "__id__": 1062
},
"_contentSize": {
"__type__": "cc.Size",
@@ -22170,11 +22351,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1030
+ "__id__": 1038
},
"_enabled": true,
"__prefab": {
- "__id__": 1056
+ "__id__": 1064
},
"_alignFlags": 44,
"_target": null,
@@ -22219,11 +22400,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 985
+ "__id__": 993
},
"_enabled": true,
"__prefab": {
- "__id__": 1059
+ "__id__": 1067
},
"_contentSize": {
"__type__": "cc.Size",
@@ -22247,11 +22428,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 985
+ "__id__": 993
},
"_enabled": false,
"__prefab": {
- "__id__": 1061
+ "__id__": 1069
},
"_resizeMode": 0,
"_layoutType": 1,
@@ -22285,11 +22466,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 985
+ "__id__": 993
},
"_enabled": true,
"__prefab": {
- "__id__": 1063
+ "__id__": 1071
},
"_alignFlags": 44,
"_target": null,
@@ -22334,11 +22515,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 729
+ "__id__": 737
},
"_enabled": true,
"__prefab": {
- "__id__": 1066
+ "__id__": 1074
},
"_contentSize": {
"__type__": "cc.Size",
@@ -22375,11 +22556,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 720
+ "__id__": 728
},
"_enabled": true,
"__prefab": {
- "__id__": 1069
+ "__id__": 1077
},
"_contentSize": {
"__type__": "cc.Size",
@@ -22403,11 +22584,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 720
+ "__id__": 728
},
"_enabled": true,
"__prefab": {
- "__id__": 1071
+ "__id__": 1079
},
"_alignFlags": 44,
"_target": null,
@@ -22453,14 +22634,14 @@
"__id__": 677
},
"_prefab": {
- "__id__": 1074
+ "__id__": 1082
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 1073
+ "__id__": 1081
},
"asset": {
"__uuid__": "b111b7ce-9621-4519-b4b8-7a5a64c2e98e",
@@ -22468,7 +22649,7 @@
},
"fileId": "24rlgXRJ9AHLGpMW+aYyEx",
"instance": {
- "__id__": 1075
+ "__id__": 1083
},
"targetOverrides": null
},
@@ -22482,31 +22663,31 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 1076
- },
- {
- "__id__": 1078
- },
- {
- "__id__": 1079
- },
- {
- "__id__": 1080
- },
- {
- "__id__": 1081
- },
- {
- "__id__": 1083
- },
- {
- "__id__": 1085
+ "__id__": 1084
},
{
"__id__": 1086
},
+ {
+ "__id__": 1087
+ },
{
"__id__": 1088
+ },
+ {
+ "__id__": 1089
+ },
+ {
+ "__id__": 1091
+ },
+ {
+ "__id__": 1093
+ },
+ {
+ "__id__": 1094
+ },
+ {
+ "__id__": 1096
}
],
"removedComponents": []
@@ -22514,7 +22695,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1077
+ "__id__": 1085
},
"propertyPath": [
"_name"
@@ -22530,7 +22711,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1077
+ "__id__": 1085
},
"propertyPath": [
"_lpos"
@@ -22545,7 +22726,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1077
+ "__id__": 1085
},
"propertyPath": [
"_lrot"
@@ -22561,7 +22742,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1077
+ "__id__": 1085
},
"propertyPath": [
"_euler"
@@ -22576,7 +22757,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1082
+ "__id__": 1090
},
"propertyPath": [
"clickEvents",
@@ -22593,14 +22774,14 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1082
+ "__id__": 1090
},
"propertyPath": [
"clickEvents",
"0"
],
"value": {
- "__id__": 1084
+ "__id__": 1092
}
},
{
@@ -22616,19 +22797,19 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1082
+ "__id__": 1090
},
"propertyPath": [
"_target"
],
"value": {
- "__id__": 1073
+ "__id__": 1081
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1087
+ "__id__": 1095
},
"propertyPath": [
"_bottom"
@@ -22644,7 +22825,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1089
+ "__id__": 1097
},
"propertyPath": [
"_spriteFrame"
@@ -22669,33 +22850,33 @@
"__id__": 677
},
"_children": [
- {
- "__id__": 1091
- },
{
"__id__": 1099
},
{
"__id__": 1107
+ },
+ {
+ "__id__": 1115
}
],
"_active": true,
"_components": [
{
- "__id__": 1121
+ "__id__": 1129
},
{
- "__id__": 1123
+ "__id__": 1131
},
{
- "__id__": 1126
+ "__id__": 1134
},
{
- "__id__": 1128
+ "__id__": 1136
}
],
"_prefab": {
- "__id__": 1130
+ "__id__": 1138
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -22732,23 +22913,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1090
+ "__id__": 1098
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 1092
+ "__id__": 1100
},
{
- "__id__": 1094
+ "__id__": 1102
},
{
- "__id__": 1096
+ "__id__": 1104
}
],
"_prefab": {
- "__id__": 1098
+ "__id__": 1106
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -22785,11 +22966,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1091
+ "__id__": 1099
},
"_enabled": true,
"__prefab": {
- "__id__": 1093
+ "__id__": 1101
},
"_contentSize": {
"__type__": "cc.Size",
@@ -22813,11 +22994,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1091
+ "__id__": 1099
},
"_enabled": true,
"__prefab": {
- "__id__": 1095
+ "__id__": 1103
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -22861,11 +23042,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1091
+ "__id__": 1099
},
"_enabled": true,
"__prefab": {
- "__id__": 1097
+ "__id__": 1105
},
"_alignFlags": 45,
"_target": null,
@@ -22910,23 +23091,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1090
+ "__id__": 1098
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 1100
+ "__id__": 1108
},
{
- "__id__": 1102
+ "__id__": 1110
},
{
- "__id__": 1104
+ "__id__": 1112
}
],
"_prefab": {
- "__id__": 1106
+ "__id__": 1114
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -22963,11 +23144,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1099
+ "__id__": 1107
},
"_enabled": true,
"__prefab": {
- "__id__": 1101
+ "__id__": 1109
},
"_contentSize": {
"__type__": "cc.Size",
@@ -22991,11 +23172,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1099
+ "__id__": 1107
},
"_enabled": true,
"__prefab": {
- "__id__": 1103
+ "__id__": 1111
},
"_alignFlags": 32,
"_target": null,
@@ -23027,11 +23208,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1099
+ "__id__": 1107
},
"_enabled": true,
"__prefab": {
- "__id__": 1105
+ "__id__": 1113
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -23108,27 +23289,27 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1090
+ "__id__": 1098
},
"_children": [
{
- "__id__": 1108
+ "__id__": 1116
}
],
"_active": true,
"_components": [
{
- "__id__": 1114
+ "__id__": 1122
},
{
- "__id__": 1116
+ "__id__": 1124
},
{
- "__id__": 1118
+ "__id__": 1126
}
],
"_prefab": {
- "__id__": 1120
+ "__id__": 1128
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -23165,20 +23346,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1107
+ "__id__": 1115
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 1109
+ "__id__": 1117
},
{
- "__id__": 1111
+ "__id__": 1119
}
],
"_prefab": {
- "__id__": 1113
+ "__id__": 1121
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -23215,11 +23396,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1108
+ "__id__": 1116
},
"_enabled": true,
"__prefab": {
- "__id__": 1110
+ "__id__": 1118
},
"_contentSize": {
"__type__": "cc.Size",
@@ -23243,11 +23424,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1108
+ "__id__": 1116
},
"_enabled": true,
"__prefab": {
- "__id__": 1112
+ "__id__": 1120
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -23324,11 +23505,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1107
+ "__id__": 1115
},
"_enabled": true,
"__prefab": {
- "__id__": 1115
+ "__id__": 1123
},
"_contentSize": {
"__type__": "cc.Size",
@@ -23352,11 +23533,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1107
+ "__id__": 1115
},
"_enabled": true,
"__prefab": {
- "__id__": 1117
+ "__id__": 1125
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -23397,11 +23578,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1107
+ "__id__": 1115
},
"_enabled": true,
"__prefab": {
- "__id__": 1119
+ "__id__": 1127
},
"_alignFlags": 8,
"_target": null,
@@ -23446,11 +23627,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1090
+ "__id__": 1098
},
"_enabled": true,
"__prefab": {
- "__id__": 1122
+ "__id__": 1130
},
"_contentSize": {
"__type__": "cc.Size",
@@ -23474,15 +23655,15 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1090
+ "__id__": 1098
},
"_enabled": true,
"__prefab": {
- "__id__": 1124
+ "__id__": 1132
},
"clickEvents": [
{
- "__id__": 1125
+ "__id__": 1133
}
],
"_interactable": true,
@@ -23522,7 +23703,7 @@
"_duration": 0.3,
"_zoomScale": 1.3,
"_target": {
- "__id__": 1090
+ "__id__": 1098
},
"_id": ""
},
@@ -23546,11 +23727,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1090
+ "__id__": 1098
},
"_enabled": true,
"__prefab": {
- "__id__": 1127
+ "__id__": 1135
},
"_alignFlags": 4,
"_target": null,
@@ -23582,11 +23763,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1090
+ "__id__": 1098
},
"_enabled": true,
"__prefab": {
- "__id__": 1129
+ "__id__": 1137
},
"_id": ""
},
@@ -23617,23 +23798,23 @@
},
"_children": [
{
- "__id__": 1132
+ "__id__": 1140
}
],
"_active": true,
"_components": [
{
- "__id__": 1146
+ "__id__": 1154
},
{
- "__id__": 1148
+ "__id__": 1156
},
{
- "__id__": 1151
+ "__id__": 1159
}
],
"_prefab": {
- "__id__": 1153
+ "__id__": 1161
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -23670,27 +23851,27 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1131
+ "__id__": 1139
},
"_children": [
{
- "__id__": 1133
+ "__id__": 1141
}
],
"_active": true,
"_components": [
{
- "__id__": 1139
+ "__id__": 1147
},
{
- "__id__": 1141
+ "__id__": 1149
},
{
- "__id__": 1143
+ "__id__": 1151
}
],
"_prefab": {
- "__id__": 1145
+ "__id__": 1153
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -23727,20 +23908,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1132
+ "__id__": 1140
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 1134
+ "__id__": 1142
},
{
- "__id__": 1136
+ "__id__": 1144
}
],
"_prefab": {
- "__id__": 1138
+ "__id__": 1146
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -23777,11 +23958,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1133
+ "__id__": 1141
},
"_enabled": true,
"__prefab": {
- "__id__": 1135
+ "__id__": 1143
},
"_contentSize": {
"__type__": "cc.Size",
@@ -23805,11 +23986,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1133
+ "__id__": 1141
},
"_enabled": true,
"__prefab": {
- "__id__": 1137
+ "__id__": 1145
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -23863,11 +24044,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1132
+ "__id__": 1140
},
"_enabled": true,
"__prefab": {
- "__id__": 1140
+ "__id__": 1148
},
"_contentSize": {
"__type__": "cc.Size",
@@ -23891,11 +24072,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1132
+ "__id__": 1140
},
"_enabled": true,
"__prefab": {
- "__id__": 1142
+ "__id__": 1150
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -23939,11 +24120,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1132
+ "__id__": 1140
},
"_enabled": true,
"__prefab": {
- "__id__": 1144
+ "__id__": 1152
},
"_alignFlags": 45,
"_target": null,
@@ -23988,11 +24169,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1131
+ "__id__": 1139
},
"_enabled": true,
"__prefab": {
- "__id__": 1147
+ "__id__": 1155
},
"_contentSize": {
"__type__": "cc.Size",
@@ -24016,15 +24197,15 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1131
+ "__id__": 1139
},
"_enabled": true,
"__prefab": {
- "__id__": 1149
+ "__id__": 1157
},
"clickEvents": [
{
- "__id__": 1150
+ "__id__": 1158
}
],
"_interactable": true,
@@ -24064,7 +24245,7 @@
"_duration": 0.1,
"_zoomScale": 0.8,
"_target": {
- "__id__": 1131
+ "__id__": 1139
},
"_id": ""
},
@@ -24088,11 +24269,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1131
+ "__id__": 1139
},
"_enabled": true,
"__prefab": {
- "__id__": 1152
+ "__id__": 1160
},
"_alignFlags": 4,
"_target": null,
@@ -24141,23 +24322,23 @@
},
"_children": [
{
- "__id__": 1155
+ "__id__": 1163
}
],
"_active": true,
"_components": [
{
- "__id__": 1169
+ "__id__": 1177
},
{
- "__id__": 1171
+ "__id__": 1179
},
{
- "__id__": 1174
+ "__id__": 1182
}
],
"_prefab": {
- "__id__": 1176
+ "__id__": 1184
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -24194,27 +24375,27 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1154
+ "__id__": 1162
},
"_children": [
{
- "__id__": 1156
+ "__id__": 1164
}
],
"_active": true,
"_components": [
{
- "__id__": 1162
+ "__id__": 1170
},
{
- "__id__": 1164
+ "__id__": 1172
},
{
- "__id__": 1166
+ "__id__": 1174
}
],
"_prefab": {
- "__id__": 1168
+ "__id__": 1176
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -24251,20 +24432,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1155
+ "__id__": 1163
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 1157
+ "__id__": 1165
},
{
- "__id__": 1159
+ "__id__": 1167
}
],
"_prefab": {
- "__id__": 1161
+ "__id__": 1169
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -24301,11 +24482,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1156
+ "__id__": 1164
},
"_enabled": true,
"__prefab": {
- "__id__": 1158
+ "__id__": 1166
},
"_contentSize": {
"__type__": "cc.Size",
@@ -24329,11 +24510,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1156
+ "__id__": 1164
},
"_enabled": true,
"__prefab": {
- "__id__": 1160
+ "__id__": 1168
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -24387,11 +24568,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1155
+ "__id__": 1163
},
"_enabled": true,
"__prefab": {
- "__id__": 1163
+ "__id__": 1171
},
"_contentSize": {
"__type__": "cc.Size",
@@ -24415,11 +24596,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1155
+ "__id__": 1163
},
"_enabled": true,
"__prefab": {
- "__id__": 1165
+ "__id__": 1173
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -24463,11 +24644,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1155
+ "__id__": 1163
},
"_enabled": true,
"__prefab": {
- "__id__": 1167
+ "__id__": 1175
},
"_alignFlags": 45,
"_target": null,
@@ -24512,11 +24693,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1154
+ "__id__": 1162
},
"_enabled": true,
"__prefab": {
- "__id__": 1170
+ "__id__": 1178
},
"_contentSize": {
"__type__": "cc.Size",
@@ -24540,15 +24721,15 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1154
+ "__id__": 1162
},
"_enabled": true,
"__prefab": {
- "__id__": 1172
+ "__id__": 1180
},
"clickEvents": [
{
- "__id__": 1173
+ "__id__": 1181
}
],
"_interactable": true,
@@ -24588,7 +24769,7 @@
"_duration": 0.1,
"_zoomScale": 0.8,
"_target": {
- "__id__": 1154
+ "__id__": 1162
},
"_id": ""
},
@@ -24612,11 +24793,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1154
+ "__id__": 1162
},
"_enabled": true,
"__prefab": {
- "__id__": 1175
+ "__id__": 1183
},
"_alignFlags": 4,
"_target": null,
@@ -24665,7 +24846,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 1178
+ "__id__": 1186
},
"_contentSize": {
"__type__": "cc.Size",
@@ -24693,7 +24874,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 1180
+ "__id__": 1188
},
"_alignFlags": 21,
"_target": null,
@@ -24729,7 +24910,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 1182
+ "__id__": 1190
},
"_id": ""
},
@@ -24747,7 +24928,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 1184
+ "__id__": 1192
},
"_id": ""
},
@@ -24775,14 +24956,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 1187
+ "__id__": 1195
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 1186
+ "__id__": 1194
},
"asset": {
"__uuid__": "26bff847-cd29-48a5-bbfa-c3e2dbda688d",
@@ -24790,7 +24971,7 @@
},
"fileId": "5a9CMsVQhKP5Y+UJfTKPbx",
"instance": {
- "__id__": 1188
+ "__id__": 1196
},
"targetOverrides": null
},
@@ -24804,19 +24985,19 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 1189
+ "__id__": 1197
},
{
- "__id__": 1191
+ "__id__": 1199
},
{
- "__id__": 1192
+ "__id__": 1200
},
{
- "__id__": 1193
+ "__id__": 1201
},
{
- "__id__": 1194
+ "__id__": 1202
}
],
"removedComponents": []
@@ -24824,7 +25005,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1190
+ "__id__": 1198
},
"propertyPath": [
"_name"
@@ -24840,7 +25021,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1190
+ "__id__": 1198
},
"propertyPath": [
"_lpos"
@@ -24855,7 +25036,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1190
+ "__id__": 1198
},
"propertyPath": [
"_lrot"
@@ -24871,7 +25052,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1190
+ "__id__": 1198
},
"propertyPath": [
"_euler"
@@ -24886,7 +25067,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1190
+ "__id__": 1198
},
"propertyPath": [
"_active"
@@ -24903,23 +25084,23 @@
},
"_children": [
{
- "__id__": 1196
+ "__id__": 1204
}
],
"_active": true,
"_components": [
{
- "__id__": 1234
+ "__id__": 1242
},
{
- "__id__": 1236
+ "__id__": 1244
},
{
- "__id__": 1238
+ "__id__": 1246
}
],
"_prefab": {
- "__id__": 1240
+ "__id__": 1248
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -24956,30 +25137,30 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1195
+ "__id__": 1203
},
"_children": [
{
- "__id__": 1197
+ "__id__": 1205
}
],
"_active": true,
"_components": [
{
- "__id__": 1225
+ "__id__": 1233
},
{
- "__id__": 1227
+ "__id__": 1235
},
{
- "__id__": 1229
+ "__id__": 1237
},
{
- "__id__": 1231
+ "__id__": 1239
}
],
"_prefab": {
- "__id__": 1233
+ "__id__": 1241
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -25016,27 +25197,27 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1196
+ "__id__": 1204
},
"_children": [
- {
- "__id__": 1198
- },
{
"__id__": 1206
},
{
- "__id__": 1212
+ "__id__": 1214
+ },
+ {
+ "__id__": 1220
}
],
"_active": true,
"_components": [
{
- "__id__": 1222
+ "__id__": 1230
}
],
"_prefab": {
- "__id__": 1224
+ "__id__": 1232
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -25073,23 +25254,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1197
+ "__id__": 1205
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 1199
+ "__id__": 1207
},
{
- "__id__": 1201
+ "__id__": 1209
},
{
- "__id__": 1203
+ "__id__": 1211
}
],
"_prefab": {
- "__id__": 1205
+ "__id__": 1213
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -25126,11 +25307,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1198
+ "__id__": 1206
},
"_enabled": true,
"__prefab": {
- "__id__": 1200
+ "__id__": 1208
},
"_contentSize": {
"__type__": "cc.Size",
@@ -25154,11 +25335,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1198
+ "__id__": 1206
},
"_enabled": true,
"__prefab": {
- "__id__": 1202
+ "__id__": 1210
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -25202,11 +25383,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1198
+ "__id__": 1206
},
"_enabled": true,
"__prefab": {
- "__id__": 1204
+ "__id__": 1212
},
"_alignFlags": 40,
"_target": null,
@@ -25251,20 +25432,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1197
+ "__id__": 1205
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 1207
+ "__id__": 1215
},
{
- "__id__": 1209
+ "__id__": 1217
}
],
"_prefab": {
- "__id__": 1211
+ "__id__": 1219
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -25301,11 +25482,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1206
+ "__id__": 1214
},
"_enabled": true,
"__prefab": {
- "__id__": 1208
+ "__id__": 1216
},
"_contentSize": {
"__type__": "cc.Size",
@@ -25329,11 +25510,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1206
+ "__id__": 1214
},
"_enabled": true,
"__prefab": {
- "__id__": 1210
+ "__id__": 1218
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -25390,26 +25571,26 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1197
+ "__id__": 1205
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 1213
+ "__id__": 1221
},
{
- "__id__": 1215
+ "__id__": 1223
},
{
- "__id__": 1217
+ "__id__": 1225
},
{
- "__id__": 1219
+ "__id__": 1227
}
],
"_prefab": {
- "__id__": 1221
+ "__id__": 1229
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -25446,11 +25627,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1212
+ "__id__": 1220
},
"_enabled": true,
"__prefab": {
- "__id__": 1214
+ "__id__": 1222
},
"_contentSize": {
"__type__": "cc.Size",
@@ -25474,11 +25655,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1212
+ "__id__": 1220
},
"_enabled": true,
"__prefab": {
- "__id__": 1216
+ "__id__": 1224
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -25542,11 +25723,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1212
+ "__id__": 1220
},
"_enabled": true,
"__prefab": {
- "__id__": 1218
+ "__id__": 1226
},
"_alignFlags": 10,
"_target": null,
@@ -25578,11 +25759,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1212
+ "__id__": 1220
},
"_enabled": true,
"__prefab": {
- "__id__": 1220
+ "__id__": 1228
},
"templateMode": true,
"watchPath": "data.data.gold",
@@ -25615,11 +25796,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1197
+ "__id__": 1205
},
"_enabled": true,
"__prefab": {
- "__id__": 1223
+ "__id__": 1231
},
"_contentSize": {
"__type__": "cc.Size",
@@ -25656,11 +25837,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1196
+ "__id__": 1204
},
"_enabled": true,
"__prefab": {
- "__id__": 1226
+ "__id__": 1234
},
"_contentSize": {
"__type__": "cc.Size",
@@ -25684,11 +25865,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1196
+ "__id__": 1204
},
"_enabled": true,
"__prefab": {
- "__id__": 1228
+ "__id__": 1236
},
"_alignFlags": 8,
"_target": null,
@@ -25720,11 +25901,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1196
+ "__id__": 1204
},
"_enabled": true,
"__prefab": {
- "__id__": 1230
+ "__id__": 1238
},
"_resizeMode": 0,
"_layoutType": 1,
@@ -25758,11 +25939,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1196
+ "__id__": 1204
},
"_enabled": true,
"__prefab": {
- "__id__": 1232
+ "__id__": 1240
},
"_alignFlags": 40,
"_target": null,
@@ -25807,11 +25988,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1195
+ "__id__": 1203
},
"_enabled": true,
"__prefab": {
- "__id__": 1235
+ "__id__": 1243
},
"_contentSize": {
"__type__": "cc.Size",
@@ -25835,11 +26016,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1195
+ "__id__": 1203
},
"_enabled": true,
"__prefab": {
- "__id__": 1237
+ "__id__": 1245
},
"_alignFlags": 17,
"_target": null,
@@ -25871,11 +26052,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1195
+ "__id__": 1203
},
"_enabled": true,
"__prefab": {
- "__id__": 1239
+ "__id__": 1247
},
"_id": ""
},
@@ -25906,7 +26087,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 1242
+ "__id__": 1250
},
"_contentSize": {
"__type__": "cc.Size",
@@ -25934,7 +26115,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 1244
+ "__id__": 1252
},
"_alignFlags": 45,
"_target": null,
@@ -25970,7 +26151,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 1246
+ "__id__": 1254
},
"_id": ""
},
@@ -25990,51 +26171,51 @@
"instance": null,
"targetOverrides": [
{
- "__id__": 1248
+ "__id__": 1256
},
{
- "__id__": 1251
+ "__id__": 1259
},
{
- "__id__": 1254
+ "__id__": 1262
},
{
- "__id__": 1257
+ "__id__": 1265
},
{
- "__id__": 1260
+ "__id__": 1268
},
{
- "__id__": 1263
+ "__id__": 1271
}
],
"nestedPrefabInstanceRoots": [
{
- "__id__": 1186
+ "__id__": 1194
},
{
- "__id__": 1073
+ "__id__": 1081
},
{
- "__id__": 937
+ "__id__": 945
},
{
- "__id__": 897
+ "__id__": 905
},
{
- "__id__": 859
+ "__id__": 867
},
{
- "__id__": 827
+ "__id__": 835
},
{
- "__id__": 789
+ "__id__": 797
},
{
- "__id__": 751
+ "__id__": 759
},
{
- "__id__": 730
+ "__id__": 738
},
{
"__id__": 371
@@ -26071,109 +26252,19 @@
{
"__type__": "cc.TargetOverrideInfo",
"source": {
- "__id__": 751
+ "__id__": 759
},
"sourceInfo": {
- "__id__": 1249
+ "__id__": 1257
},
"propertyPath": [
"_barSprite"
],
"target": {
- "__id__": 751
+ "__id__": 759
},
"targetInfo": {
- "__id__": 1250
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "e2/huQDfhNt6fiJiNRbwSN"
- ]
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "334GMK/IFMX7WWZHRi/+UF"
- ]
- },
- {
- "__type__": "cc.TargetOverrideInfo",
- "source": {
- "__id__": 789
- },
- "sourceInfo": {
- "__id__": 1252
- },
- "propertyPath": [
- "_barSprite"
- ],
- "target": {
- "__id__": 789
- },
- "targetInfo": {
- "__id__": 1253
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "e2/huQDfhNt6fiJiNRbwSN"
- ]
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "334GMK/IFMX7WWZHRi/+UF"
- ]
- },
- {
- "__type__": "cc.TargetOverrideInfo",
- "source": {
- "__id__": 859
- },
- "sourceInfo": {
- "__id__": 1255
- },
- "propertyPath": [
- "_barSprite"
- ],
- "target": {
- "__id__": 859
- },
- "targetInfo": {
- "__id__": 1256
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "e2/huQDfhNt6fiJiNRbwSN"
- ]
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "334GMK/IFMX7WWZHRi/+UF"
- ]
- },
- {
- "__type__": "cc.TargetOverrideInfo",
- "source": {
- "__id__": 897
- },
- "sourceInfo": {
"__id__": 1258
- },
- "propertyPath": [
- "_barSprite"
- ],
- "target": {
- "__id__": 897
- },
- "targetInfo": {
- "__id__": 1259
}
},
{
@@ -26191,19 +26282,19 @@
{
"__type__": "cc.TargetOverrideInfo",
"source": {
- "__id__": 827
+ "__id__": 797
},
"sourceInfo": {
+ "__id__": 1260
+ },
+ "propertyPath": [
+ "_barSprite"
+ ],
+ "target": {
+ "__id__": 797
+ },
+ "targetInfo": {
"__id__": 1261
- },
- "propertyPath": [
- "_barSprite"
- ],
- "target": {
- "__id__": 827
- },
- "targetInfo": {
- "__id__": 1262
}
},
{
@@ -26221,19 +26312,109 @@
{
"__type__": "cc.TargetOverrideInfo",
"source": {
- "__id__": 937
+ "__id__": 867
},
"sourceInfo": {
- "__id__": 1264
+ "__id__": 1263
},
"propertyPath": [
"_barSprite"
],
"target": {
- "__id__": 937
+ "__id__": 867
},
"targetInfo": {
- "__id__": 1265
+ "__id__": 1264
+ }
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "e2/huQDfhNt6fiJiNRbwSN"
+ ]
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "334GMK/IFMX7WWZHRi/+UF"
+ ]
+ },
+ {
+ "__type__": "cc.TargetOverrideInfo",
+ "source": {
+ "__id__": 905
+ },
+ "sourceInfo": {
+ "__id__": 1266
+ },
+ "propertyPath": [
+ "_barSprite"
+ ],
+ "target": {
+ "__id__": 905
+ },
+ "targetInfo": {
+ "__id__": 1267
+ }
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "e2/huQDfhNt6fiJiNRbwSN"
+ ]
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "334GMK/IFMX7WWZHRi/+UF"
+ ]
+ },
+ {
+ "__type__": "cc.TargetOverrideInfo",
+ "source": {
+ "__id__": 835
+ },
+ "sourceInfo": {
+ "__id__": 1269
+ },
+ "propertyPath": [
+ "_barSprite"
+ ],
+ "target": {
+ "__id__": 835
+ },
+ "targetInfo": {
+ "__id__": 1270
+ }
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "e2/huQDfhNt6fiJiNRbwSN"
+ ]
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "334GMK/IFMX7WWZHRi/+UF"
+ ]
+ },
+ {
+ "__type__": "cc.TargetOverrideInfo",
+ "source": {
+ "__id__": 945
+ },
+ "sourceInfo": {
+ "__id__": 1272
+ },
+ "propertyPath": [
+ "_barSprite"
+ ],
+ "target": {
+ "__id__": 945
+ },
+ "targetInfo": {
+ "__id__": 1273
}
},
{
diff --git a/assets/resources/gui/umps.plist b/assets/resources/gui/umps.plist
index 183f3e2c..7e0dc6cf 100644
--- a/assets/resources/gui/umps.plist
+++ b/assets/resources/gui/umps.plist
@@ -13,14 +13,439 @@
spriteOffset
{0,0}
spriteSize
- {324,666}
+ {486,999}
spriteSourceSize
- {324,666}
+ {486,999}
textureRect
- {{651,1},{324,666}}
+ {{1,496},{486,999}}
textureRotated
+ Background_Lobby_Bg_center.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {330,347}
+ spriteSourceSize
+ {330,347}
+ textureRect
+ {{977,1157},{330,347}}
+ textureRotated
+
+
+ Background_Lobby_bg_bottom.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,-3}
+ spriteSize
+ {486,136}
+ spriteSourceSize
+ {486,142}
+ textureRect
+ {{1159,1489},{486,136}}
+ textureRotated
+
+
+ Background_Pass_Curtain_Left.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {245,212}
+ spriteSourceSize
+ {245,212}
+ textureRect
+ {{1592,68},{245,212}}
+ textureRotated
+
+
+ Background_Pass_Curtain_Right.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {245,212}
+ spriteSourceSize
+ {245,212}
+ textureRect
+ {{1592,282},{245,212}}
+ textureRotated
+
+
+ Background_Sample02.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {486,996}
+ spriteSourceSize
+ {486,996}
+ textureRect
+ {{489,496},{486,996}}
+ textureRotated
+
+
+ Background_Sample03.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {486,1053}
+ spriteSourceSize
+ {486,1053}
+ textureRect
+ {{1,1},{486,1053}}
+ textureRotated
+
+
+ Background_Stage01_Bg.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,-7}
+ spriteSize
+ {300,518}
+ spriteSourceSize
+ {300,532}
+ textureRect
+ {{1,1497},{300,518}}
+ textureRotated
+
+
+ Background_Stage01_Bg_Bottom.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {486,91}
+ spriteSourceSize
+ {486,91}
+ textureRect
+ {{1297,1489},{486,91}}
+ textureRotated
+
+
+ Background_Stage01_Icon.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {378,293}
+ spriteSourceSize
+ {378,293}
+ textureRect
+ {{1159,862},{378,293}}
+ textureRotated
+
+
+ Background_Stage02_Bg.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {486,534}
+ spriteSourceSize
+ {486,534}
+ textureRect
+ {{1056,1},{486,534}}
+ textureRotated
+
+
+ Background_Stage02_Bg_bottom_1.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {201,71}
+ spriteSourceSize
+ {201,71}
+ textureRect
+ {{1326,1157},{201,71}}
+ textureRotated
+
+
+ Background_Stage02_Bg_bottom_2.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {120,69}
+ spriteSourceSize
+ {120,69}
+ textureRect
+ {{1326,1361},{120,69}}
+ textureRotated
+
+
+ Background_Stage02_icon.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {437,343}
+ spriteSourceSize
+ {437,343}
+ textureRect
+ {{1397,1361},{437,343}}
+ textureRotated
+
+
+ Background_Stage03_Bg.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {486,339}
+ spriteSourceSize
+ {486,339}
+ textureRect
+ {{1539,873},{486,339}}
+ textureRotated
+
+
+ Background_Stage03_Bg_bottom.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {249,65}
+ spriteSourceSize
+ {249,65}
+ textureRect
+ {{1592,1},{249,65}}
+ textureRotated
+
+
+ Background_Stage03_bg_obj_1.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {50,37}
+ spriteSourceSize
+ {50,37}
+ textureRect
+ {{1839,68},{50,37}}
+ textureRotated
+
+
+ Background_Stage03_bg_obj_2.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {20,16}
+ spriteSourceSize
+ {20,16}
+ textureRect
+ {{1843,1},{20,16}}
+ textureRotated
+
+
+ Background_Stage03_icon.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {352,299}
+ spriteSourceSize
+ {352,299}
+ textureRect
+ {{1390,1706},{352,299}}
+ textureRotated
+
+
+ Background_Stage04_icon.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {371,391}
+ spriteSourceSize
+ {371,391}
+ textureRect
+ {{1159,489},{371,391}}
+ textureRotated
+
+
+ Background_Stage05_bg.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,-2}
+ spriteSize
+ {486,366}
+ spriteSourceSize
+ {486,370}
+ textureRect
+ {{791,1494},{486,366}}
+ textureRotated
+
+
+ Background_Stage05_bg_obj_1.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {42,94}
+ spriteSourceSize
+ {42,94}
+ textureRect
+ {{1400,1230},{42,94}}
+ textureRotated
+
+
+ Background_Stage05_bg_obj_2.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {72,104}
+ spriteSourceSize
+ {72,104}
+ textureRect
+ {{1326,1230},{72,104}}
+ textureRotated
+
+
+ Background_Stage05_bg_obj_3.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {176,122}
+ spriteSourceSize
+ {176,122}
+ textureRect
+ {{977,489},{176,122}}
+ textureRotated
+
+
+ Background_Stage05_bg_obj_4.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {176,121}
+ spriteSourceSize
+ {176,121}
+ textureRect
+ {{977,613},{176,121}}
+ textureRotated
+
+
+ Background_Stage05_icon.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {375,315}
+ spriteSourceSize
+ {375,315}
+ textureRect
+ {{1552,496},{375,315}}
+ textureRotated
+
+
Bg.png
aliases
@@ -30,11 +455,11 @@
spriteOffset
{0,0}
spriteSize
- {648,660}
+ {486,495}
spriteSourceSize
- {648,660}
+ {486,495}
textureRect
- {{1,1},{648,660}}
+ {{303,1497},{486,495}}
textureRotated
@@ -50,9 +475,9 @@
realTextureFileName
umps.png
size
- {976,668}
+ {1879,2016}
smartupdate
- $TexturePacker:SmartUpdate:0262deb64e2f94e198de7eb4d600e44a:2f1bc9081585fe2f0d4e0317b671cd8c:318abc3a8f3ad8d09018e87dff1f2449$
+ $TexturePacker:SmartUpdate:d4d12f82e33954e8e1f69245eb671242:f40ec2486e2b33d54341cbc3e2c4b78e:318abc3a8f3ad8d09018e87dff1f2449$
textureFileName
umps.png
diff --git a/assets/resources/gui/umps.plist.meta b/assets/resources/gui/umps.plist.meta
index 9582cf3d..03bd4b7f 100644
--- a/assets/resources/gui/umps.plist.meta
+++ b/assets/resources/gui/umps.plist.meta
@@ -7,6 +7,52 @@
".json"
],
"subMetas": {
+ "55883": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@55883",
+ "displayName": "",
+ "id": "55883",
+ "name": "Background_Stage01_Icon",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 1159,
+ "trimY": 862,
+ "width": 378,
+ "height": 293,
+ "rawWidth": 378,
+ "rawHeight": 293,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
+ "atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
"8b868": {
"importer": "sprite-frame",
"uuid": "d7d869bc-06aa-4876-806f-487e68b96780@8b868",
@@ -18,12 +64,1116 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 651,
+ "trimX": 1,
+ "trimY": 496,
+ "width": 486,
+ "height": 999,
+ "rawWidth": 486,
+ "rawHeight": 999,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
+ "atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "9d61e": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@9d61e",
+ "displayName": "",
+ "id": "9d61e",
+ "name": "Background_Lobby_Bg_center",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": true,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 977,
+ "trimY": 1157,
+ "width": 330,
+ "height": 347,
+ "rawWidth": 330,
+ "rawHeight": 347,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
+ "atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "e651a": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@e651a",
+ "displayName": "",
+ "id": "e651a",
+ "name": "Background_Lobby_bg_bottom",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": true,
+ "offsetX": 0,
+ "offsetY": -3,
+ "trimX": 1159,
+ "trimY": 1489,
+ "width": 486,
+ "height": 136,
+ "rawWidth": 486,
+ "rawHeight": 142,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
+ "atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "687a4": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@687a4",
+ "displayName": "",
+ "id": "687a4",
+ "name": "Background_Pass_Curtain_Left",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 1592,
+ "trimY": 68,
+ "width": 245,
+ "height": 212,
+ "rawWidth": 245,
+ "rawHeight": 212,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
+ "atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "70a08": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@70a08",
+ "displayName": "",
+ "id": "70a08",
+ "name": "Background_Pass_Curtain_Right",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 1592,
+ "trimY": 282,
+ "width": 245,
+ "height": 212,
+ "rawWidth": 245,
+ "rawHeight": 212,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
+ "atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "a50c6": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@a50c6",
+ "displayName": "",
+ "id": "a50c6",
+ "name": "Background_Sample02",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 489,
+ "trimY": 496,
+ "width": 486,
+ "height": 996,
+ "rawWidth": 486,
+ "rawHeight": 996,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
+ "atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "57c90": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@57c90",
+ "displayName": "",
+ "id": "57c90",
+ "name": "Background_Sample03",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": true,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 1,
"trimY": 1,
- "width": 324,
- "height": 666,
- "rawWidth": 324,
- "rawHeight": 666,
+ "width": 486,
+ "height": 1053,
+ "rawWidth": 486,
+ "rawHeight": 1053,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
+ "atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "eb5f8": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@eb5f8",
+ "displayName": "",
+ "id": "eb5f8",
+ "name": "Background_Stage01_Bg",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": -7,
+ "trimX": 1,
+ "trimY": 1497,
+ "width": 300,
+ "height": 518,
+ "rawWidth": 300,
+ "rawHeight": 532,
+ "borderTop": 440,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
+ "atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "40dd6": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@40dd6",
+ "displayName": "",
+ "id": "40dd6",
+ "name": "Background_Stage01_Bg_Bottom",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": true,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 1297,
+ "trimY": 1489,
+ "width": 486,
+ "height": 91,
+ "rawWidth": 486,
+ "rawHeight": 91,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
+ "atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "a4222": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@a4222",
+ "displayName": "",
+ "id": "a4222",
+ "name": "Background_Stage02_Bg",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": true,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 1056,
+ "trimY": 1,
+ "width": 486,
+ "height": 534,
+ "rawWidth": 486,
+ "rawHeight": 534,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
+ "atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "2e027": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@2e027",
+ "displayName": "",
+ "id": "2e027",
+ "name": "Background_Stage02_Bg_bottom_1",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 1326,
+ "trimY": 1157,
+ "width": 201,
+ "height": 71,
+ "rawWidth": 201,
+ "rawHeight": 71,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
+ "atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "54cad": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@54cad",
+ "displayName": "",
+ "id": "54cad",
+ "name": "Background_Stage02_Bg_bottom_2",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": true,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 1326,
+ "trimY": 1361,
+ "width": 120,
+ "height": 69,
+ "rawWidth": 120,
+ "rawHeight": 69,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
+ "atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "40c7e": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@40c7e",
+ "displayName": "",
+ "id": "40c7e",
+ "name": "Background_Stage02_icon",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 1397,
+ "trimY": 1361,
+ "width": 437,
+ "height": 343,
+ "rawWidth": 437,
+ "rawHeight": 343,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
+ "atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "892a9": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@892a9",
+ "displayName": "",
+ "id": "892a9",
+ "name": "Background_Stage03_Bg",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": true,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 1539,
+ "trimY": 873,
+ "width": 486,
+ "height": 339,
+ "rawWidth": 486,
+ "rawHeight": 339,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
+ "atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "7bf27": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@7bf27",
+ "displayName": "",
+ "id": "7bf27",
+ "name": "Background_Stage03_Bg_bottom",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 1592,
+ "trimY": 1,
+ "width": 249,
+ "height": 65,
+ "rawWidth": 249,
+ "rawHeight": 65,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
+ "atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "9981e": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@9981e",
+ "displayName": "",
+ "id": "9981e",
+ "name": "Background_Stage03_bg_obj_1",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": true,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 1839,
+ "trimY": 68,
+ "width": 50,
+ "height": 37,
+ "rawWidth": 50,
+ "rawHeight": 37,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
+ "atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "9fec0": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@9fec0",
+ "displayName": "",
+ "id": "9fec0",
+ "name": "Background_Stage03_bg_obj_2",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 1843,
+ "trimY": 1,
+ "width": 20,
+ "height": 16,
+ "rawWidth": 20,
+ "rawHeight": 16,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
+ "atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "be9cf": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@be9cf",
+ "displayName": "",
+ "id": "be9cf",
+ "name": "Background_Stage03_icon",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 1390,
+ "trimY": 1706,
+ "width": 352,
+ "height": 299,
+ "rawWidth": 352,
+ "rawHeight": 299,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
+ "atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "5e7b9": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@5e7b9",
+ "displayName": "",
+ "id": "5e7b9",
+ "name": "Background_Stage04_icon",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": true,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 1159,
+ "trimY": 489,
+ "width": 371,
+ "height": 391,
+ "rawWidth": 371,
+ "rawHeight": 391,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
+ "atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "1e19d": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@1e19d",
+ "displayName": "",
+ "id": "1e19d",
+ "name": "Background_Stage05_bg",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": true,
+ "offsetX": 0,
+ "offsetY": -2,
+ "trimX": 791,
+ "trimY": 1494,
+ "width": 486,
+ "height": 366,
+ "rawWidth": 486,
+ "rawHeight": 370,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
+ "atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "48bf3": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@48bf3",
+ "displayName": "",
+ "id": "48bf3",
+ "name": "Background_Stage05_bg_obj_1",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": true,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 1400,
+ "trimY": 1230,
+ "width": 42,
+ "height": 94,
+ "rawWidth": 42,
+ "rawHeight": 94,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
+ "atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "ac22d": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@ac22d",
+ "displayName": "",
+ "id": "ac22d",
+ "name": "Background_Stage05_bg_obj_2",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 1326,
+ "trimY": 1230,
+ "width": 72,
+ "height": 104,
+ "rawWidth": 72,
+ "rawHeight": 104,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
+ "atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "ead8b": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@ead8b",
+ "displayName": "",
+ "id": "ead8b",
+ "name": "Background_Stage05_bg_obj_3",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 977,
+ "trimY": 489,
+ "width": 176,
+ "height": 122,
+ "rawWidth": 176,
+ "rawHeight": 122,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
+ "atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "25ad6": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@25ad6",
+ "displayName": "",
+ "id": "25ad6",
+ "name": "Background_Stage05_bg_obj_4",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 977,
+ "trimY": 613,
+ "width": 176,
+ "height": 121,
+ "rawWidth": 176,
+ "rawHeight": 121,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
+ "atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "c041f": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@c041f",
+ "displayName": "",
+ "id": "c041f",
+ "name": "Background_Stage05_icon",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": true,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 1552,
+ "trimY": 496,
+ "width": 375,
+ "height": 315,
+ "rawWidth": 375,
+ "rawHeight": 315,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
@@ -64,14 +1214,14 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1,
- "trimY": 1,
- "width": 648,
- "height": 660,
- "rawWidth": 648,
- "rawHeight": 660,
- "borderTop": 630,
- "borderBottom": 20,
+ "trimX": 303,
+ "trimY": 1497,
+ "width": 486,
+ "height": 495,
+ "rawWidth": 486,
+ "rawHeight": 495,
+ "borderTop": 474,
+ "borderBottom": 21,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
diff --git a/assets/resources/gui/umps.png b/assets/resources/gui/umps.png
index 63105938..a51f066c 100644
Binary files a/assets/resources/gui/umps.png and b/assets/resources/gui/umps.png differ
diff --git a/assets/resources/loading/prefab/loading.prefab b/assets/resources/loading/prefab/loading.prefab
index de69171a..116745b1 100644
--- a/assets/resources/loading/prefab/loading.prefab
+++ b/assets/resources/loading/prefab/loading.prefab
@@ -181,7 +181,7 @@
},
"_type": 0,
"_fillType": 0,
- "_sizeMode": 1,
+ "_sizeMode": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
diff --git a/assets/script/game/common/SingletonModuleComp.ts b/assets/script/game/common/SingletonModuleComp.ts
index 0731e298..1dff8923 100644
--- a/assets/script/game/common/SingletonModuleComp.ts
+++ b/assets/script/game/common/SingletonModuleComp.ts
@@ -52,6 +52,7 @@ export class SingletonModuleComp extends ecs.Comp {
exp:0,
task:0,
noStop:false,
+ showInfo:false,
}
guides:any=[0,0,0,0,0]
current_guide:number=0
diff --git a/assets/script/game/map/HInfoComp.ts b/assets/script/game/map/HInfoComp.ts
index 4b93b695..288a1026 100644
--- a/assets/script/game/map/HInfoComp.ts
+++ b/assets/script/game/map/HInfoComp.ts
@@ -170,6 +170,16 @@ export class HInfoComp extends CCComp {
show_lock(){
this.node.getChildByName("buy").active=!this.is_own()
}
+ showInfo(){
+ this.node.getChildByName("info").active=smc.data.showInfo
+ if(smc.data.showInfo){
+ this.node.getChildByName("info").setPosition(this.node.getChildByName("info").position.x,0)
+ }
+ }
+ btnShowInfo(){
+ smc.data.showInfo=!smc.data.showInfo
+ this.showInfo()
+ }
claear_hero(){
for (let i = 0; i < this.heroNodes.length; i++) {
if (this.heroNodes[i]) {