diff --git a/assets/resources/game/map/map_rpg.prefab b/assets/resources/game/map/map_rpg.prefab
index 9501c3b7..8c33aa6f 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__": 128
},
{
- "__id__": 76
+ "__id__": 130
},
{
- "__id__": 78
+ "__id__": 132
}
],
"_prefab": {
- "__id__": 80
+ "__id__": 134
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -197,17 +197,17 @@
"_active": true,
"_components": [
{
- "__id__": 67
+ "__id__": 121
},
{
- "__id__": 69
+ "__id__": 123
},
{
- "__id__": 71
+ "__id__": 125
}
],
"_prefab": {
- "__id__": 73
+ "__id__": 127
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -251,23 +251,23 @@
"__id__": 8
},
{
- "__id__": 24
+ "__id__": 78
},
{
- "__id__": 28
+ "__id__": 82
},
{
- "__id__": 58
+ "__id__": 112
}
],
"_active": true,
"_components": [
{
- "__id__": 64
+ "__id__": 118
}
],
"_prefab": {
- "__id__": 66
+ "__id__": 120
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -309,19 +309,22 @@
"_children": [
{
"__id__": 9
+ },
+ {
+ "__id__": 55
}
],
"_active": true,
"_components": [
{
- "__id__": 19
+ "__id__": 73
},
{
- "__id__": 21
+ "__id__": 75
}
],
"_prefab": {
- "__id__": 23
+ "__id__": 77
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -363,16 +366,34 @@
"_children": [
{
"__id__": 10
+ },
+ {
+ "__id__": 16
+ },
+ {
+ "__id__": 22
+ },
+ {
+ "__id__": 28
+ },
+ {
+ "__id__": 34
+ },
+ {
+ "__id__": 40
+ },
+ {
+ "__id__": 46
}
],
"_active": true,
"_components": [
{
- "__id__": 16
+ "__id__": 52
}
],
"_prefab": {
- "__id__": 18
+ "__id__": 54
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -405,7 +426,7 @@
},
{
"__type__": "cc.Node",
- "_name": "Bg",
+ "_name": "l1_sky",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
@@ -427,7 +448,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
- "y": 73.129,
+ "y": -320,
"z": 0
},
"_lrot": {
@@ -439,8 +460,8 @@
},
"_lscale": {
"__type__": "cc.Vec3",
- "x": -1.8,
- "y": 1.8,
+ "x": 1,
+ "y": 2.3,
"z": 1
},
"_mobility": 0,
@@ -467,19 +488,19 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 648,
- "height": 1000
+ "width": 960,
+ "height": 540
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
- "y": 0.5
+ "y": 0
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "2d9G1A65dOp4H1PsPpLfpF"
+ "fileId": "b04r6WrQhEyreWZBYyZRU0"
},
{
"__type__": "cc.Sprite",
@@ -504,7 +525,687 @@
"a": 255
},
"_spriteFrame": {
- "__uuid__": "d7d869bc-06aa-4876-806f-487e68b96780@54dda",
+ "__uuid__": "d7d869bc-06aa-4876-806f-487e68b96780@d21e2",
+ "__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": "b2pZ0Ssm9EB7zSZoHd/mpi"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "58Smp4YNtCo62zX1Pi89pH",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "l2_mountains",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 9
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 17
+ },
+ {
+ "__id__": 19
+ }
+ ],
+ "_prefab": {
+ "__id__": 21
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": -295.746,
+ "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__": 16
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 18
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 960,
+ "height": 354
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "e89Sd6gsZDWa7gu6e7ibAg"
+ },
+ {
+ "__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@ab879",
+ "__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": "d79IlGJc9KIqiIqpRkoPk9"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "baICvKB+BGaK56QQvXPJJX",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "l3_clouds",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 9
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 23
+ },
+ {
+ "__id__": 25
+ }
+ ],
+ "_prefab": {
+ "__id__": 27
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 52.571,
+ "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__": 22
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 24
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 832,
+ "height": 142
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "e7GmzuDIdGE5OY26upF1zh"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 22
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 26
+ },
+ "_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@2a9f8",
+ "__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": "fadjmTzK5HOY+cQNPLbMCv"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "36KHan6kVNsoiHKBzFcBdE",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "l4_bg-ground01",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 9
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 29
+ },
+ {
+ "__id__": 31
+ }
+ ],
+ "_prefab": {
+ "__id__": 33
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": -278.047,
+ "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__": 28
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 30
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 960,
+ "height": 224
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "fcaXM6MRNMXbAyQSj3lTs+"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 28
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 32
+ },
+ "_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@8852c",
+ "__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": "63378etB1G14EO22DMBic8"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "d8eDUTr4JH5aku8P/OzCc5",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "l5_bg-ground02",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 9
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 35
+ },
+ {
+ "__id__": 37
+ }
+ ],
+ "_prefab": {
+ "__id__": 39
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": -282.963,
+ "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__": 34
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 36
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 960,
+ "height": 224
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "1btdewKqJAxIQTjTDFeejp"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 34
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 38
+ },
+ "_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@d4812",
+ "__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": "37dXIIHjxHRKkd47vhPHbH"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "afC1QRFbdIJrdpKczcbi3p",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "l7_ground",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 9
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 41
+ },
+ {
+ "__id__": 43
+ }
+ ],
+ "_prefab": {
+ "__id__": 45
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": -580.208,
+ "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__": 40
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 42
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 960,
+ "height": 600
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "3crhDaDQxMcp+Yitv9ijSa"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 40
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 44
+ },
+ "_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@db61c",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 1,
@@ -519,15 +1220,12 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
- "_atlas": {
- "__uuid__": "d7d869bc-06aa-4876-806f-487e68b96780",
- "__expectedType__": "cc.SpriteAtlas"
- },
+ "_atlas": null,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "3bQhqOgLhFnar0Pi5g920q"
+ "fileId": "f4V9QwKitOhJ/CnN6/KkVQ"
},
{
"__type__": "cc.PrefabInfo",
@@ -537,7 +1235,143 @@
"asset": {
"__id__": 0
},
- "fileId": "d3IMrwDl9PqrvRoofh6Kp4",
+ "fileId": "e7P5mh6mhLga+0q7X7vlTP",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "l6_ground",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 9
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 47
+ },
+ {
+ "__id__": 49
+ }
+ ],
+ "_prefab": {
+ "__id__": 51
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": -320,
+ "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__": 46
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 48
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 960,
+ "height": 300
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "dajTPuZ9ZAYZ8qSfHmFvzo"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 46
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 50
+ },
+ "_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@9b492",
+ "__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": "85ahwey7ZDkrFRvDxTGiJ7"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "6bE0ieRMBGyYHdxvuJ03FA",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@@ -552,7 +1386,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 17
+ "__id__": 53
},
"_contentSize": {
"__type__": "cc.Size",
@@ -583,6 +1417,411 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
+ {
+ "__type__": "cc.Node",
+ "_name": "loading",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 8
+ },
+ "_children": [
+ {
+ "__id__": 56
+ },
+ {
+ "__id__": 62
+ }
+ ],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 70
+ }
+ ],
+ "_prefab": {
+ "__id__": 72
+ },
+ "_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": "Background_01",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 55
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 57
+ },
+ {
+ "__id__": 59
+ }
+ ],
+ "_prefab": {
+ "__id__": 61
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 2.4,
+ "y": 2.4,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 33554432,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 56
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 58
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 324,
+ "height": 666
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "7bVYuCaxRJs4b/H2zt8e8R"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 56
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 60
+ },
+ "_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@8b868",
+ "__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": "30LC7woTRCv5n9Og8yHH8X"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "b5zuDl+m5DoqEGo+A6Tf+k",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "hero",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 55
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 63
+ },
+ {
+ "__id__": 65
+ },
+ {
+ "__id__": 67
+ }
+ ],
+ "_prefab": {
+ "__id__": 69
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": -73.986,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": -0.8,
+ "y": 0.8,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 33554432,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 62
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 64
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 256,
+ "height": 256
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "8988yuWqJLSJJNE3V36q6n"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 62
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 66
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_spriteFrame": {
+ "__uuid__": "91033056-eac3-4ad0-b174-e072da964784@e2787",
+ "__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__": "91033056-eac3-4ad0-b174-e072da964784",
+ "__expectedType__": "cc.SpriteAtlas"
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "02fDHjuy1FKaLif5EL2LAf"
+ },
+ {
+ "__type__": "cc.Animation",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 62
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 68
+ },
+ "playOnLoad": true,
+ "_clips": [
+ {
+ "__uuid__": "aa5b9fe9-25de-4ea2-bab3-0364834cba6d",
+ "__expectedType__": "cc.AnimationClip"
+ }
+ ],
+ "_defaultClip": {
+ "__uuid__": "aa5b9fe9-25de-4ea2-bab3-0364834cba6d",
+ "__expectedType__": "cc.AnimationClip"
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "b7RjGVdwBOi7rP/cfZ9eFV"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "2boht7EuBPd7DnaYIoq9yO",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 55
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 71
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 100,
+ "height": 100
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "59+nkk+EpE1IWxP18lR4XS"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "b3HxRBVHROjLtY9a/gSTWo",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
{
"__type__": "cc.UITransform",
"_name": "",
@@ -593,7 +1832,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 20
+ "__id__": 74
},
"_contentSize": {
"__type__": "cc.Size",
@@ -621,7 +1860,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 22
+ "__id__": 76
},
"bgImg": null,
"_id": ""
@@ -655,11 +1894,11 @@
"_active": true,
"_components": [
{
- "__id__": 25
+ "__id__": 79
}
],
"_prefab": {
- "__id__": 27
+ "__id__": 81
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -696,11 +1935,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 24
+ "__id__": 78
},
"_enabled": true,
"__prefab": {
- "__id__": 26
+ "__id__": 80
},
"_contentSize": {
"__type__": "cc.Size",
@@ -741,35 +1980,35 @@
},
"_children": [
{
- "__id__": 29
+ "__id__": 83
},
{
- "__id__": 33
+ "__id__": 87
},
{
- "__id__": 37
+ "__id__": 91
},
{
- "__id__": 41
+ "__id__": 95
},
{
- "__id__": 45
+ "__id__": 99
},
{
- "__id__": 49
+ "__id__": 103
}
],
"_active": true,
"_components": [
{
- "__id__": 53
+ "__id__": 107
},
{
- "__id__": 55
+ "__id__": 109
}
],
"_prefab": {
- "__id__": 57
+ "__id__": 111
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -806,17 +2045,17 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 28
+ "__id__": 82
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 30
+ "__id__": 84
}
],
"_prefab": {
- "__id__": 32
+ "__id__": 86
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -853,11 +2092,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 29
+ "__id__": 83
},
"_enabled": true,
"__prefab": {
- "__id__": 31
+ "__id__": 85
},
"_contentSize": {
"__type__": "cc.Size",
@@ -894,17 +2133,17 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 28
+ "__id__": 82
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 34
+ "__id__": 88
}
],
"_prefab": {
- "__id__": 36
+ "__id__": 90
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -941,11 +2180,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 33
+ "__id__": 87
},
"_enabled": true,
"__prefab": {
- "__id__": 35
+ "__id__": 89
},
"_contentSize": {
"__type__": "cc.Size",
@@ -982,17 +2221,17 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 28
+ "__id__": 82
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 38
+ "__id__": 92
}
],
"_prefab": {
- "__id__": 40
+ "__id__": 94
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -1029,11 +2268,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 37
+ "__id__": 91
},
"_enabled": true,
"__prefab": {
- "__id__": 39
+ "__id__": 93
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1070,17 +2309,17 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 28
+ "__id__": 82
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 42
+ "__id__": 96
}
],
"_prefab": {
- "__id__": 44
+ "__id__": 98
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -1117,11 +2356,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 41
+ "__id__": 95
},
"_enabled": true,
"__prefab": {
- "__id__": 43
+ "__id__": 97
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1158,17 +2397,17 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 28
+ "__id__": 82
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 46
+ "__id__": 100
}
],
"_prefab": {
- "__id__": 48
+ "__id__": 102
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -1205,11 +2444,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 45
+ "__id__": 99
},
"_enabled": true,
"__prefab": {
- "__id__": 47
+ "__id__": 101
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1246,17 +2485,17 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 28
+ "__id__": 82
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 50
+ "__id__": 104
}
],
"_prefab": {
- "__id__": 52
+ "__id__": 106
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -1293,11 +2532,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 49
+ "__id__": 103
},
"_enabled": true,
"__prefab": {
- "__id__": 51
+ "__id__": 105
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1334,11 +2573,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 28
+ "__id__": 82
},
"_enabled": true,
"__prefab": {
- "__id__": 54
+ "__id__": 108
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1362,11 +2601,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 28
+ "__id__": 82
},
"_enabled": true,
"__prefab": {
- "__id__": 56
+ "__id__": 110
},
"_id": ""
},
@@ -1399,14 +2638,14 @@
"_active": true,
"_components": [
{
- "__id__": 59
+ "__id__": 113
},
{
- "__id__": 61
+ "__id__": 115
}
],
"_prefab": {
- "__id__": 63
+ "__id__": 117
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -1443,11 +2682,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 58
+ "__id__": 112
},
"_enabled": true,
"__prefab": {
- "__id__": 60
+ "__id__": 114
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1471,11 +2710,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 58
+ "__id__": 112
},
"_enabled": true,
"__prefab": {
- "__id__": 62
+ "__id__": 116
},
"light": null,
"_id": ""
@@ -1507,7 +2746,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 65
+ "__id__": 119
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1548,7 +2787,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 68
+ "__id__": 122
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1576,7 +2815,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 70
+ "__id__": 124
},
"camera": {
"__id__": 3
@@ -1585,16 +2824,16 @@
"__id__": 7
},
"mapLayer": {
- "__id__": 21
+ "__id__": 75
},
"floorLayer": {
- "__id__": 24
+ "__id__": 78
},
"entityLayer": {
- "__id__": 55
+ "__id__": 109
},
"SkillLayer": {
- "__id__": 61
+ "__id__": 115
},
"isFollowPlayer": true,
"_id": ""
@@ -1613,7 +2852,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 72
+ "__id__": 126
},
"_id": ""
},
@@ -1644,7 +2883,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 75
+ "__id__": 129
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1672,7 +2911,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 77
+ "__id__": 131
},
"_cameraComponent": {
"__id__": 3
@@ -1694,7 +2933,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 79
+ "__id__": 133
},
"_alignFlags": 45,
"_target": null,
diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab
index 682e1e9c..9ccd6191 100644
--- a/assets/resources/gui/role_controller.prefab
+++ b/assets/resources/gui/role_controller.prefab
@@ -717,7 +717,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
- "y": -517.5,
+ "y": -562.5,
"z": 0
},
"_lrot": {
@@ -758,7 +758,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 710,
- "height": 230
+ "height": 140
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -3394,7 +3394,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
- "y": -436.42,
+ "y": -577.5,
"z": 0
},
"_lrot": {
@@ -3436,7 +3436,7 @@
"__id__": 144
}
],
- "_active": true,
+ "_active": false,
"_components": [
{
"__id__": 152
@@ -3451,7 +3451,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": -315,
- "y": 0,
+ "y": 30,
"z": 0
},
"_lrot": {
@@ -3938,8 +3938,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": -115,
- "y": 0,
+ "x": -315,
+ "y": 30,
"z": 0
},
"_lrot": {
@@ -4429,8 +4429,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": 85,
- "y": 0,
+ "x": -115,
+ "y": 30,
"z": 0
},
"_lrot": {
@@ -4917,8 +4917,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": -315,
- "y": -40,
+ "x": 85,
+ "y": 30,
"z": 0
},
"_lrot": {
@@ -5409,8 +5409,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": -115,
- "y": -40,
+ "x": -315,
+ "y": -10,
"z": 0
},
"_lrot": {
@@ -5897,8 +5897,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": 85,
- "y": -40,
+ "x": -115,
+ "y": -10,
"z": 0
},
"_lrot": {
@@ -6370,7 +6370,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 690,
- "height": 40
+ "height": 100
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -6400,7 +6400,7 @@
"_left": 15,
"_right": 15.000000000000028,
"_top": 85,
- "_bottom": 181.07999999999998,
+ "_bottom": 10,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
@@ -6500,7 +6500,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
- "y": -342.5,
+ "y": -432.5,
"z": 0
},
"_lrot": {
@@ -6571,7 +6571,7 @@
"_left": 10,
"_right": 10,
"_top": 140,
- "_bottom": 245,
+ "_bottom": 155,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
@@ -6678,7 +6678,7 @@
"__id__": 303
}
],
- "_active": false,
+ "_active": true,
"_components": [
{
"__id__": 317
@@ -6693,7 +6693,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
- "y": -477.5,
+ "y": -508.821,
"z": 0
},
"_lrot": {
@@ -6844,7 +6844,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 136.4,
- "height": 40
+ "height": 20
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -6933,7 +6933,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 682,
- "height": 40
+ "height": 20
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -7178,8 +7178,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 100,
- "height": 50.4
+ "width": 200,
+ "height": 20
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -7214,13 +7214,13 @@
"b": 255,
"a": 255
},
- "_string": "{{0}}%",
+ "_string": "Lv .{{1}} {{0}}%",
"_horizontalAlign": 1,
"_verticalAlign": 1,
- "_actualFontSize": 26,
- "_fontSize": 25,
+ "_actualFontSize": 20,
+ "_fontSize": 20,
"_fontFamily": "Arial",
- "_lineHeight": 40,
+ "_lineHeight": 20,
"_overflow": 2,
"_enableWrapText": true,
"_font": null,
@@ -7276,7 +7276,8 @@
"watchPath": "",
"labelType": "cc.Label",
"watchPathArr": [
- "data.hero.exp_pre"
+ "data.hero.exp_pre",
+ "data.hero.lv"
],
"_id": ""
},
@@ -7351,7 +7352,7 @@
"__id__": 304
}
],
- "_active": true,
+ "_active": false,
"_components": [
{
"__id__": 312
@@ -7418,7 +7419,7 @@
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": 0,
+ "x": 236.897,
"y": 0,
"z": 0
},
@@ -7459,8 +7460,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 110.73828125,
- "height": 54.4
+ "width": 84.78125,
+ "height": 35.5
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -7495,13 +7496,13 @@
"b": 255,
"a": 255
},
- "_string": " {{0}} ",
+ "_string": " Lv.{{0}} ",
"_horizontalAlign": 1,
"_verticalAlign": 1,
- "_actualFontSize": 40,
- "_fontSize": 40,
+ "_actualFontSize": 20,
+ "_fontSize": 20,
"_fontFamily": "Arial",
- "_lineHeight": 40,
+ "_lineHeight": 25,
"_overflow": 0,
"_enableWrapText": true,
"_font": null,
@@ -7592,8 +7593,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 54.5,
- "height": 52
+ "width": 40,
+ "height": 40
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -7614,7 +7615,7 @@
"node": {
"__id__": 303
},
- "_enabled": true,
+ "_enabled": false,
"__prefab": {
"__id__": 315
},
@@ -7679,7 +7680,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 680,
- "height": 30
+ "height": 15
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -7709,7 +7710,7 @@
"_left": 20,
"_right": 20,
"_top": 0,
- "_bottom": 145,
+ "_bottom": 121.17899999999997,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
@@ -14011,7 +14012,7 @@
"__id__": 677
}
],
- "_active": true,
+ "_active": false,
"_components": [
{
"__id__": 706
@@ -17370,7 +17371,7 @@
"__id__": 1421
}
],
- "_active": true,
+ "_active": false,
"_components": [
{
"__id__": 1690
diff --git a/assets/resources/gui/umps.plist b/assets/resources/gui/umps.plist
index 29686331..1e37d6d4 100644
--- a/assets/resources/gui/umps.plist
+++ b/assets/resources/gui/umps.plist
@@ -17,347 +17,7 @@
spriteSourceSize
{486,999}
textureRect
- {{1,1},{486,999}}
- textureRotated
-
-
- Background_Lobby_Bg_center.png
-
- aliases
-
- anchor
- {0.5,0.5}
- spriteOffset
- {0,0}
- spriteSize
- {330,347}
- spriteSourceSize
- {330,347}
- textureRect
- {{862,1199},{330,347}}
- textureRotated
-
-
- Background_Lobby_bg_bottom.png
-
- aliases
-
- anchor
- {0.5,0.5}
- spriteOffset
- {0,-3}
- spriteSize
- {486,136}
- spriteSourceSize
- {486,142}
- textureRect
- {{626,1531},{486,136}}
- textureRotated
-
-
- Background_Stage01_Bg.png
-
- aliases
-
- anchor
- {0.5,0.5}
- spriteOffset
- {0,-7}
- spriteSize
- {300,518}
- spriteSourceSize
- {300,532}
- textureRect
- {{977,1},{300,518}}
- textureRotated
-
-
- Background_Stage01_Bg_Bottom.png
-
- aliases
-
- anchor
- {0.5,0.5}
- spriteOffset
- {0,0}
- spriteSize
- {486,91}
- spriteSourceSize
- {486,91}
- textureRect
- {{1211,1199},{486,91}}
- textureRotated
-
-
- Background_Stage01_Icon.png
-
- aliases
-
- anchor
- {0.5,0.5}
- spriteOffset
- {0,0}
- spriteSize
- {378,293}
- spriteSourceSize
- {378,293}
- textureRect
- {{1,1499},{378,293}}
- textureRotated
-
-
- Background_Stage02_Bg_bottom_1.png
-
- aliases
-
- anchor
- {0.5,0.5}
- spriteOffset
- {0,0}
- spriteSize
- {201,71}
- spriteSourceSize
- {201,71}
- textureRect
- {{489,1448},{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
- {{692,1448},{120,69}}
- textureRotated
-
-
- Background_Stage02_icon.png
-
- aliases
-
- anchor
- {0.5,0.5}
- spriteOffset
- {0,0}
- spriteSize
- {437,343}
- spriteSourceSize
- {437,343}
- textureRect
- {{489,710},{437,343}}
- textureRotated
-
-
- Background_Stage03_Bg.png
-
- aliases
-
- anchor
- {0.5,0.5}
- spriteOffset
- {0,0}
- spriteSize
- {486,339}
- spriteSourceSize
- {486,339}
- textureRect
- {{489,369},{486,339}}
- textureRotated
-
-
- Background_Stage03_Bg_bottom.png
-
- aliases
-
- anchor
- {0.5,0.5}
- spriteOffset
- {0,0}
- spriteSize
- {249,65}
- spriteSourceSize
- {249,65}
- textureRect
- {{381,1499},{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
- {{862,1055},{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
- {{448,1499},{20,16}}
- textureRotated
-
-
- Background_Stage03_icon.png
-
- aliases
-
- anchor
- {0.5,0.5}
- spriteOffset
- {0,0}
- spriteSize
- {352,299}
- spriteSourceSize
- {352,299}
- textureRect
- {{928,898},{352,299}}
- textureRotated
-
-
- Background_Stage04_icon.png
-
- aliases
-
- anchor
- {0.5,0.5}
- spriteOffset
- {0,0}
- spriteSize
- {371,391}
- spriteSourceSize
- {371,391}
- textureRect
- {{489,1055},{371,391}}
- textureRotated
-
-
- Background_Stage05_bg.png
-
- aliases
-
- anchor
- {0.5,0.5}
- spriteOffset
- {0,-2}
- spriteSize
- {486,366}
- spriteSourceSize
- {486,370}
- textureRect
- {{489,1},{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
- {{928,710},{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
- {{1114,1531},{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
- {{448,1521},{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
- {{962,1669},{176,121}}
- textureRotated
-
-
- Background_Stage05_icon.png
-
- aliases
-
- anchor
- {0.5,0.5}
- spriteOffset
- {0,0}
- spriteSize
- {375,315}
- spriteSourceSize
- {375,315}
- textureRect
- {{977,521},{375,315}}
+ {{963,1},{486,999}}
textureRotated
@@ -374,9 +34,9 @@
spriteSourceSize
{16,512}
textureRect
- {{1279,1},{16,512}}
+ {{1,1125},{16,512}}
textureRotated
-
+
BackgroundsGradient14.png
@@ -391,7 +51,7 @@
spriteSourceSize
{16,512}
textureRect
- {{448,1669},{16,512}}
+ {{1,1143},{16,512}}
textureRotated
@@ -408,9 +68,9 @@
spriteSourceSize
{16,512}
textureRect
- {{448,1687},{16,512}}
+ {{1925,489},{16,512}}
textureRotated
-
+
BackgroundsGradient19.png
@@ -425,9 +85,9 @@
spriteSourceSize
{16,512}
textureRect
- {{448,1705},{16,512}}
+ {{1943,489},{16,512}}
textureRotated
-
+
BackgroundsGradient20.png
@@ -442,7 +102,7 @@
spriteSourceSize
{16,512}
textureRect
- {{448,1723},{16,512}}
+ {{515,1131},{16,512}}
textureRotated
@@ -459,7 +119,7 @@
spriteSourceSize
{16,512}
textureRect
- {{448,1741},{16,512}}
+ {{515,1149},{16,512}}
textureRotated
@@ -476,7 +136,7 @@
spriteSourceSize
{16,512}
textureRect
- {{381,1759},{16,512}}
+ {{1029,1131},{16,512}}
textureRotated
@@ -493,11 +153,11 @@
spriteSourceSize
{16,512}
textureRect
- {{381,1777},{16,512}}
+ {{1029,1149},{16,512}}
textureRotated
- Bg.png
+ l1_sky.png
aliases
@@ -506,14 +166,116 @@
spriteOffset
{0,0}
spriteSize
- {486,495}
+ {960,540}
spriteSourceSize
- {486,495}
+ {960,540}
textureRect
- {{1,1002},{486,495}}
+ {{1,1},{960,540}}
textureRotated
+ l2_mountains.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,-93}
+ spriteSize
+ {960,354}
+ spriteSourceSize
+ {960,540}
+ textureRect
+ {{1,543},{960,354}}
+ textureRotated
+
+
+ l3_clouds.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {-9,127}
+ spriteSize
+ {832,142}
+ spriteSourceSize
+ {960,540}
+ textureRect
+ {{963,987},{832,142}}
+ textureRotated
+
+
+ l4_bg-ground01.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,-158}
+ spriteSize
+ {960,224}
+ spriteSourceSize
+ {960,540}
+ textureRect
+ {{1,899},{960,224}}
+ textureRotated
+
+
+ l5_bg-ground02.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,-158}
+ spriteSize
+ {960,224}
+ spriteSourceSize
+ {960,540}
+ textureRect
+ {{963,761},{960,224}}
+ textureRotated
+
+
+ l6_ground.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,-135}
+ spriteSize
+ {960,270}
+ spriteSourceSize
+ {960,540}
+ textureRect
+ {{963,489},{960,270}}
+ textureRotated
+
+
+ l7_ground.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {960,22}
+ spriteSourceSize
+ {960,22}
+ textureRect
+ {{1964,1},{960,22}}
+ textureRotated
+
+
metadata
@@ -526,9 +288,9 @@
realTextureFileName
umps.png
size
- {1303,1794}
+ {1987,1166}
smartupdate
- $TexturePacker:SmartUpdate:89a3ad42ed0c268a7d8564b013594dcb:f5caf18e77d7152f48faeeed97a7990b:318abc3a8f3ad8d09018e87dff1f2449$
+ $TexturePacker:SmartUpdate:9163736a3f4a468332e628a9e68b5f85:60ccae662d592612b5b381325f26b442:318abc3a8f3ad8d09018e87dff1f2449$
textureFileName
umps.png
diff --git a/assets/resources/gui/umps.plist.meta b/assets/resources/gui/umps.plist.meta
index 4439eae1..11c368dd 100644
--- a/assets/resources/gui/umps.plist.meta
+++ b/assets/resources/gui/umps.plist.meta
@@ -7,52 +7,6 @@
".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": 1,
- "trimY": 1499,
- "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",
@@ -61,10 +15,10 @@
"name": "Background_01",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1,
+ "trimX": 963,
"trimY": 1,
"width": 486,
"height": 999,
@@ -99,880 +53,6 @@
],
"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": 862,
- "trimY": 1199,
- "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": false,
- "offsetX": 0,
- "offsetY": -3,
- "trimX": 626,
- "trimY": 1531,
- "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": {}
- },
- "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": 977,
- "trimY": 1,
- "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": 1211,
- "trimY": 1199,
- "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": {}
- },
- "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": 489,
- "trimY": 1448,
- "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": false,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 692,
- "trimY": 1448,
- "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": 489,
- "trimY": 710,
- "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": false,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 489,
- "trimY": 369,
- "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": true,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 381,
- "trimY": 1499,
- "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": false,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 862,
- "trimY": 1055,
- "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": true,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 448,
- "trimY": 1499,
- "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": 928,
- "trimY": 898,
- "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": false,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 489,
- "trimY": 1055,
- "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": false,
- "offsetX": 0,
- "offsetY": -2,
- "trimX": 489,
- "trimY": 1,
- "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": false,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 928,
- "trimY": 710,
- "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": 1114,
- "trimY": 1531,
- "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": 448,
- "trimY": 1521,
- "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": 962,
- "trimY": 1669,
- "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": 977,
- "trimY": 521,
- "width": 375,
- "height": 315,
- "rawWidth": 375,
- "rawHeight": 315,
- "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": {}
- },
"6a155": {
"importer": "sprite-frame",
"uuid": "d7d869bc-06aa-4876-806f-487e68b96780@6a155",
@@ -981,11 +61,11 @@
"name": "BackgroundsGradient09",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1279,
- "trimY": 1,
+ "trimX": 1,
+ "trimY": 1125,
"width": 16,
"height": 512,
"rawWidth": 16,
@@ -1030,8 +110,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 448,
- "trimY": 1669,
+ "trimX": 1,
+ "trimY": 1143,
"width": 16,
"height": 512,
"rawWidth": 16,
@@ -1073,11 +153,11 @@
"name": "BackgroundsGradient18",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 448,
- "trimY": 1687,
+ "trimX": 1925,
+ "trimY": 489,
"width": 16,
"height": 512,
"rawWidth": 16,
@@ -1119,19 +199,19 @@
"name": "BackgroundsGradient19",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 448,
- "trimY": 1705,
+ "trimX": 1943,
+ "trimY": 489,
"width": 16,
"height": 512,
"rawWidth": 16,
"rawHeight": 512,
"borderTop": 0,
- "borderBottom": 0,
- "borderLeft": 0,
- "borderRight": 0,
+ "borderBottom": 504,
+ "borderLeft": 8,
+ "borderRight": 7,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
@@ -1168,8 +248,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 448,
- "trimY": 1723,
+ "trimX": 515,
+ "trimY": 1131,
"width": 16,
"height": 512,
"rawWidth": 16,
@@ -1214,8 +294,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 448,
- "trimY": 1741,
+ "trimX": 515,
+ "trimY": 1149,
"width": 16,
"height": 512,
"rawWidth": 16,
@@ -1260,8 +340,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 381,
- "trimY": 1759,
+ "trimX": 1029,
+ "trimY": 1131,
"width": 16,
"height": 512,
"rawWidth": 16,
@@ -1306,8 +386,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 381,
- "trimY": 1777,
+ "trimX": 1029,
+ "trimY": 1149,
"width": 16,
"height": 512,
"rawWidth": 16,
@@ -1341,25 +421,301 @@
],
"subMetas": {}
},
- "54dda": {
+ "d21e2": {
"importer": "sprite-frame",
- "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@54dda",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@d21e2",
"displayName": "",
- "id": "54dda",
- "name": "Bg",
+ "id": "d21e2",
+ "name": "l1_sky",
"userData": {
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 1,
- "trimY": 1002,
- "width": 486,
- "height": 495,
- "rawWidth": 486,
- "rawHeight": 495,
- "borderTop": 474,
- "borderBottom": 21,
+ "trimY": 1,
+ "width": 960,
+ "height": 540,
+ "rawWidth": 960,
+ "rawHeight": 540,
+ "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": {}
+ },
+ "ab879": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@ab879",
+ "displayName": "",
+ "id": "ab879",
+ "name": "l2_mountains",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": -93,
+ "trimX": 1,
+ "trimY": 543,
+ "width": 960,
+ "height": 354,
+ "rawWidth": 960,
+ "rawHeight": 540,
+ "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": {}
+ },
+ "2a9f8": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@2a9f8",
+ "displayName": "",
+ "id": "2a9f8",
+ "name": "l3_clouds",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": -9,
+ "offsetY": 127,
+ "trimX": 963,
+ "trimY": 987,
+ "width": 832,
+ "height": 142,
+ "rawWidth": 960,
+ "rawHeight": 540,
+ "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": {}
+ },
+ "8852c": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@8852c",
+ "displayName": "",
+ "id": "8852c",
+ "name": "l4_bg-ground01",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": -158,
+ "trimX": 1,
+ "trimY": 899,
+ "width": 960,
+ "height": 224,
+ "rawWidth": 960,
+ "rawHeight": 540,
+ "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": {}
+ },
+ "d4812": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@d4812",
+ "displayName": "",
+ "id": "d4812",
+ "name": "l5_bg-ground02",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": -158,
+ "trimX": 963,
+ "trimY": 761,
+ "width": 960,
+ "height": 224,
+ "rawWidth": 960,
+ "rawHeight": 540,
+ "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": {}
+ },
+ "9b492": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@9b492",
+ "displayName": "",
+ "id": "9b492",
+ "name": "l6_ground",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": -135,
+ "trimX": 963,
+ "trimY": 489,
+ "width": 960,
+ "height": 270,
+ "rawWidth": 960,
+ "rawHeight": 540,
+ "borderTop": 168,
+ "borderBottom": 100,
+ "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": {}
+ },
+ "db61c": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@db61c",
+ "displayName": "",
+ "id": "db61c",
+ "name": "l7_ground",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": true,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 1964,
+ "trimY": 1,
+ "width": 960,
+ "height": 22,
+ "rawWidth": 960,
+ "rawHeight": 22,
+ "borderTop": 17,
+ "borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
diff --git a/assets/resources/gui/umps.png b/assets/resources/gui/umps.png
index 08c032fe..eed951ec 100644
Binary files a/assets/resources/gui/umps.png and b/assets/resources/gui/umps.png differ
diff --git a/assets/script/Design4.csv.meta b/assets/script/Design5.md.meta
similarity index 72%
rename from assets/script/Design4.csv.meta
rename to assets/script/Design5.md.meta
index a9cd65db..68fae092 100644
--- a/assets/script/Design4.csv.meta
+++ b/assets/script/Design5.md.meta
@@ -2,7 +2,7 @@
"ver": "1.0.1",
"importer": "text",
"imported": true,
- "uuid": "cbe20048-4b53-4d88-a84d-f856214e902d",
+ "uuid": "c7803dc9-7e33-476f-9144-5d0b65702963",
"files": [
".json"
],
diff --git a/assets/script/game/common/config/GameSet.ts b/assets/script/game/common/config/GameSet.ts
index 820f970b..ae498059 100644
--- a/assets/script/game/common/config/GameSet.ts
+++ b/assets/script/game/common/config/GameSet.ts
@@ -18,7 +18,7 @@ export enum BoxSet {
LETF_END = -420,
RIGHT_END = 420,
//游戏地平线
- GAME_LINE = 120,
+ GAME_LINE = -215,
//攻击距离
}
diff --git a/assets/script/game/common/config/TDEnabledAttrs.ts.meta b/assets/script/game/common/config/TDEnabledAttrs.ts.meta
deleted file mode 100644
index b57b617e..00000000
--- a/assets/script/game/common/config/TDEnabledAttrs.ts.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "ver": "4.0.24",
- "importer": "typescript",
- "imported": true,
- "uuid": "ea767c5f-11e7-4a52-8aa0-9c96e3db0b41",
- "files": [],
- "subMetas": {},
- "userData": {}
-}
diff --git a/assets/script/game/common/config/exp.md.meta b/assets/script/game/common/config/exp.md.meta
deleted file mode 100644
index c8dac16e..00000000
--- a/assets/script/game/common/config/exp.md.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "ver": "1.0.1",
- "importer": "text",
- "imported": true,
- "uuid": "23b35d06-3fa7-4b1f-b342-f8216339b53a",
- "files": [
- ".json"
- ],
- "subMetas": {},
- "userData": {}
-}
diff --git a/assets/script/game/map/CardController.ts b/assets/script/game/map/CardController.ts
index df76e564..47185d20 100644
--- a/assets/script/game/map/CardController.ts
+++ b/assets/script/game/map/CardController.ts
@@ -19,7 +19,10 @@ export class CardControllerComp extends CCComp {
console.log("CardControllerComp start",this.node)
this.page_init()
}
-
+ onAdded(args:any){
+ console.log("CardControllerComp onAdded",args)
+ smc.map.MapView.scene.mapLayer.node.getChildByName("loading").active=false;
+ }
protected update(dt: number): void {
if(smc.vmdata.game_over||smc.vmdata.game_pause){
return
diff --git a/assets/script/game/map/MissionCardComp.ts b/assets/script/game/map/MissionCardComp.ts
index d6e7c881..fa417ab3 100644
--- a/assets/script/game/map/MissionCardComp.ts
+++ b/assets/script/game/map/MissionCardComp.ts
@@ -65,7 +65,6 @@ export class MissionCardComp extends CCComp {
oops.message.on(GameEvent.MissionStart, this.onMissionStart, this);
oops.message.on(GameEvent.MissionEnd, this.onMissionEnd, this);
oops.message.on(GameEvent.ToCallFriend, this.onCallFriend, this);
- // oops.message.on(GameEvent.CanUpdateLv, this.onLevelUp, this);
}
@@ -80,7 +79,6 @@ export class MissionCardComp extends CCComp {
oops.message.off(GameEvent.MissionStart, this.onMissionStart, this);
oops.message.off(GameEvent.MissionEnd, this.onMissionEnd, this);
oops.message.off(GameEvent.ToCallFriend, this.onCallFriend, this);
- // oops.message.off(GameEvent.CanUpdateLv, this.onLevelUp, this);
this.ent.destroy();
}
@@ -160,11 +158,7 @@ export class MissionCardComp extends CCComp {
this.checkQueue();
}
- private onLevelUp(event: string, args: any) {
- // args.lv 是当前等级
- this.eventQueue.push({ level: args.lv });
- this.checkQueue();
- }
+
private checkQueue() {
if (this.node.active) return;
@@ -174,8 +168,6 @@ export class MissionCardComp extends CCComp {
if (event) {
if (event.type !== undefined) {
this.showCardType(event.type);
- } else if (event.level !== undefined) {
- this.showLevelCards(event.level);
}
}
}
@@ -191,30 +183,6 @@ export class MissionCardComp extends CCComp {
this.openUI();
}
- /**
- * 显示等级对应的卡牌（正常升级模式）
- */
- private showLevelCards(level: number) {
- if(smc.vmdata.gold < smc.vmdata.chou_gold){
- oops.gui.toast("金币不足")
- return
- }
- smc.vmdata.gold -= smc.vmdata.chou_gold
- this.curCardType = null; // 混合模式，无单一类型
- this.fetchCards(level);
- this.openUI();
- }
- private do_hero_lv_up(){
- if(smc.vmdata.gold < smc.vmdata.lvup_gold){
- oops.gui.toast("金币不足")
- return
- }
- smc.vmdata.hero.lv++
- smc.vmdata.gold -= smc.vmdata.lvup_gold
- smc.vmdata.lvup_gold += FightSet.LVUP_GOLD_UP*smc.vmdata.hero.lv
- oops.gui.toast("升级成功")
- oops.message.dispatchEvent(GameEvent.HeroLvUp,{lv:smc.vmdata.hero.lv})
- }
private openUI() {
this.node.active = true;
this.hasSelected = false;
diff --git a/assets/script/game/map/MissionMonComp.ts b/assets/script/game/map/MissionMonComp.ts
index afb93a84..0913a6e1 100644
--- a/assets/script/game/map/MissionMonComp.ts
+++ b/assets/script/game/map/MissionMonComp.ts
@@ -8,7 +8,7 @@ import { GameEvent } from "../common/config/GameEvent";
// 导入肉鸽配置
import { getStageMonConfigs, MonType, generateMonstersFromBudget, getRogueConfig } from "./RogueConfig";
import { BuffConf } from "../common/config/SkillSet";
-import { IndexSet, FacSet } from "../common/config/GameSet";
+import { IndexSet, FacSet, BoxSet } from "../common/config/GameSet";
import { HeroAttrsComp } from "../hero/HeroAttrsComp";
import { Attrs } from "../common/config/HeroAttrs";
const { ccclass, property } = _decorator;
@@ -234,27 +234,27 @@ export class MissionMonCompComp extends CCComp {
// y 在线路之间交替：0->SLINE_1, 1->SLINE_2, 2->SLINE_3, 3->SLINE_4
const x = MonStart.START_X + Math.floor(i / 4) * MonStart.START_I;
- let y = MonStart.SLINE_1;
+ let y = BoxSet.GAME_LINE;
let lane = 0;
- switch (i % 4) {
- case 0:
- y = MonStart.SLINE_1;
- lane = 0;
- break;
- case 1:
- y = MonStart.SLINE_2;
- lane = 1;
- break;
- case 2:
- y = MonStart.SLINE_3;
- lane = 2;
- break;
- case 3:
- y = MonStart.SLINE_4;
- lane = 3;
- break;
- }
+ // switch (i % 4) {
+ // case 0:
+ // y = MonStart.SLINE_1;
+ // lane = 0;
+ // break;
+ // case 1:
+ // y = MonStart.SLINE_2;
+ // lane = 1;
+ // break;
+ // case 2:
+ // y = MonStart.SLINE_3;
+ // lane = 2;
+ // break;
+ // case 3:
+ // y = MonStart.SLINE_4;
+ // lane = 3;
+ // break;
+ // }
let pos: Vec3 = v3(x, y, 0);
diff --git a/assets/script/heros.md.meta b/assets/script/heros.md.meta
deleted file mode 100644
index 538ca76c..00000000
--- a/assets/script/heros.md.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "ver": "1.0.1",
- "importer": "text",
- "imported": true,
- "uuid": "26a4b42d-75ab-44bc-b368-2fae9d83f9cd",
- "files": [
- ".json"
- ],
- "subMetas": {},
- "userData": {}
-}
diff --git a/assets/script/heros2_table.md.meta b/assets/script/heros2_table.md.meta
deleted file mode 100644
index 1b97d57c..00000000
--- a/assets/script/heros2_table.md.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "ver": "1.0.1",
- "importer": "text",
- "imported": true,
- "uuid": "a4506f9d-ae20-4d46-8946-e009d3ece18b",
- "files": [
- ".json"
- ],
- "subMetas": {},
- "userData": {}
-}