diff --git a/assets/resources/game/map/map_rpg.prefab b/assets/resources/game/map/map_rpg.prefab
index ddb80035..cc3ca2ab 100644
--- a/assets/resources/game/map/map_rpg.prefab
+++ b/assets/resources/game/map/map_rpg.prefab
@@ -1688,13 +1688,10 @@
"b": 255,
"a": 255
},
- "_spriteFrame": {
- "__uuid__": "d7d869bc-06aa-4876-806f-487e68b96780@fe1eb",
- "__expectedType__": "cc.SpriteFrame"
- },
+ "_spriteFrame": null,
"_type": 0,
"_fillType": 0,
- "_sizeMode": 1,
+ "_sizeMode": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
diff --git a/assets/resources/gui/umps.plist b/assets/resources/gui/umps.plist
index e8245107..f2c0e9d6 100644
--- a/assets/resources/gui/umps.plist
+++ b/assets/resources/gui/umps.plist
@@ -17,26 +17,9 @@
spriteSourceSize
{432,936}
textureRect
- {{1,963},{432,936}}
+ {{1,543},{432,936}}
textureRotated
-
-
- 1_Lobby.png
-
- aliases
-
- anchor
- {0.5,0.5}
- spriteOffset
- {0,0}
- spriteSize
- {432,936}
- spriteSourceSize
- {432,936}
- textureRect
- {{1,1397},{432,936}}
- textureRotated
-
+
6_Collection_Detail_2_Uncommon.png
@@ -51,9 +34,9 @@
spriteSourceSize
{432,936}
textureRect
- {{543,1},{432,936}}
+ {{957,963},{432,936}}
textureRotated
-
+
9_PopupFullScreen_RewardItems.png
@@ -68,7 +51,143 @@
spriteSourceSize
{432,936}
textureRect
- {{977,1},{432,936}}
+ {{957,1397},{432,936}}
+ textureRotated
+
+
+ Bush_A_03.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {246,146}
+ spriteSourceSize
+ {246,146}
+ textureRect
+ {{781,1505},{246,146}}
+ textureRotated
+
+
+ Bush_B_01.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {89,68}
+ spriteSourceSize
+ {89,68}
+ textureRect
+ {{884,1753},{89,68}}
+ textureRotated
+
+
+ Stone_A_01.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {135,101}
+ spriteSourceSize
+ {135,101}
+ textureRect
+ {{433,1911},{135,101}}
+ textureRotated
+
+
+ Stone_A_04.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {119,102}
+ spriteSourceSize
+ {119,102}
+ textureRect
+ {{570,1911},{119,102}}
+ textureRotated
+
+
+ Stone_A_07.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {214,101}
+ spriteSourceSize
+ {214,101}
+ textureRect
+ {{781,1753},{214,101}}
+ textureRotated
+
+
+ Tree_Bare_01.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {346,404}
+ spriteSourceSize
+ {346,404}
+ textureRect
+ {{433,1505},{346,404}}
+ textureRotated
+
+
+ Tree_Green_08.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {282,416}
+ spriteSourceSize
+ {282,416}
+ textureRect
+ {{1545,1},{282,416}}
+ textureRotated
+
+
+ Tree_Green_15.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {430,503}
+ spriteSourceSize
+ {430,503}
+ textureRect
+ {{1,1481},{430,503}}
textureRotated
@@ -87,7 +206,7 @@
textureRect
{{1,1},{960,540}}
textureRotated
-
+
l2_mountains.png
@@ -102,7 +221,7 @@
spriteSourceSize
{960,540}
textureRect
- {{1505,1},{960,354}}
+ {{963,1},{960,354}}
textureRotated
@@ -119,7 +238,7 @@
spriteSourceSize
{960,540}
textureRect
- {{939,1687},{832,142}}
+ {{954,1831},{832,142}}
textureRotated
@@ -136,9 +255,9 @@
spriteSourceSize
{960,540}
textureRect
- {{939,1235},{960,224}}
+ {{707,543},{960,224}}
textureRotated
-
+
l5_bg-ground02.png
@@ -153,9 +272,9 @@
spriteSourceSize
{960,540}
textureRect
- {{939,1461},{960,224}}
+ {{1319,1},{960,224}}
textureRotated
-
+
l6_ground.png
@@ -170,9 +289,9 @@
spriteSourceSize
{960,540}
textureRect
- {{939,963},{960,270}}
+ {{435,543},{960,270}}
textureRotated
-
+
l7_ground.png
@@ -187,9 +306,9 @@
spriteSourceSize
{960,22}
textureRect
- {{543,939},{960,22}}
+ {{933,543},{960,22}}
textureRotated
-
+
metadata
@@ -203,9 +322,9 @@
realTextureFileName
umps.png
size
- {1900,1830}
+ {1894,2014}
smartupdate
- $TexturePacker:SmartUpdate:b2c639796bb2a641f20b56f2a45f2983:23da3d48a8b840e8918bf061db3ffbe6:318abc3a8f3ad8d09018e87dff1f2449$
+ $TexturePacker:SmartUpdate:a2d1681969b0e844fca73f76a5319d6f:651559281173a64d5924ac8021663ce1:318abc3a8f3ad8d09018e87dff1f2449$
textureFileName
umps.png
diff --git a/assets/resources/gui/umps.plist.meta b/assets/resources/gui/umps.plist.meta
index 08f0a071..b2a85f58 100644
--- a/assets/resources/gui/umps.plist.meta
+++ b/assets/resources/gui/umps.plist.meta
@@ -15,11 +15,11 @@
"name": "6_Collection_Detail_2_Uncommon",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 543,
- "trimY": 1,
+ "trimX": 957,
+ "trimY": 963,
"width": 432,
"height": 936,
"rawWidth": 432,
@@ -53,6 +53,144 @@
],
"subMetas": {}
},
+ "62580": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@62580",
+ "displayName": "",
+ "id": "62580",
+ "name": "Tree_Green_15",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 1,
+ "trimY": 1481,
+ "width": 430,
+ "height": 503,
+ "rawWidth": 430,
+ "rawHeight": 503,
+ "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": {}
+ },
+ "97368": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@97368",
+ "displayName": "",
+ "id": "97368",
+ "name": "Bush_A_03",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": true,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 781,
+ "trimY": 1505,
+ "width": 246,
+ "height": 146,
+ "rawWidth": 246,
+ "rawHeight": 146,
+ "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": {}
+ },
+ "99244": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@99244",
+ "displayName": "",
+ "id": "99244",
+ "name": "Tree_Green_08",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 1545,
+ "trimY": 1,
+ "width": 282,
+ "height": 416,
+ "rawWidth": 282,
+ "rawHeight": 416,
+ "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": {}
+ },
"1e2d6": {
"importer": "sprite-frame",
"uuid": "d7d869bc-06aa-4876-806f-487e68b96780@1e2d6",
@@ -61,57 +199,11 @@
"name": "0_User_Name",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 1,
- "trimY": 963,
- "width": 432,
- "height": 936,
- "rawWidth": 432,
- "rawHeight": 936,
- "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": {}
- },
- "fe1eb": {
- "importer": "sprite-frame",
- "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@fe1eb",
- "displayName": "",
- "id": "fe1eb",
- "name": "1_Lobby",
- "userData": {
- "trimThreshold": 1,
- "rotated": true,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 1,
- "trimY": 1397,
+ "trimY": 543,
"width": 432,
"height": 936,
"rawWidth": 432,
@@ -153,11 +245,11 @@
"name": "9_PopupFullScreen_RewardItems",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 977,
- "trimY": 1,
+ "trimX": 957,
+ "trimY": 1397,
"width": 432,
"height": 936,
"rawWidth": 432,
@@ -191,6 +283,236 @@
],
"subMetas": {}
},
+ "14b49": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@14b49",
+ "displayName": "",
+ "id": "14b49",
+ "name": "Bush_B_01",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": true,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 884,
+ "trimY": 1753,
+ "width": 89,
+ "height": 68,
+ "rawWidth": 89,
+ "rawHeight": 68,
+ "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": {}
+ },
+ "f7c2b": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@f7c2b",
+ "displayName": "",
+ "id": "f7c2b",
+ "name": "Stone_A_01",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 433,
+ "trimY": 1911,
+ "width": 135,
+ "height": 101,
+ "rawWidth": 135,
+ "rawHeight": 101,
+ "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": {}
+ },
+ "590dc": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@590dc",
+ "displayName": "",
+ "id": "590dc",
+ "name": "Stone_A_04",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 570,
+ "trimY": 1911,
+ "width": 119,
+ "height": 102,
+ "rawWidth": 119,
+ "rawHeight": 102,
+ "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": {}
+ },
+ "b16b5": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@b16b5",
+ "displayName": "",
+ "id": "b16b5",
+ "name": "Stone_A_07",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": true,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 781,
+ "trimY": 1753,
+ "width": 214,
+ "height": 101,
+ "rawWidth": 214,
+ "rawHeight": 101,
+ "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": {}
+ },
+ "e9fb8": {
+ "importer": "sprite-frame",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@e9fb8",
+ "displayName": "",
+ "id": "e9fb8",
+ "name": "Tree_Bare_01",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 433,
+ "trimY": 1505,
+ "width": 346,
+ "height": 404,
+ "rawWidth": 346,
+ "rawHeight": 404,
+ "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": {}
+ },
"d21e2": {
"importer": "sprite-frame",
"uuid": "d7d869bc-06aa-4876-806f-487e68b96780@d21e2",
@@ -199,7 +521,7 @@
"name": "l1_sky",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 1,
@@ -248,7 +570,7 @@
"rotated": true,
"offsetX": 0,
"offsetY": -93,
- "trimX": 1505,
+ "trimX": 963,
"trimY": 1,
"width": 960,
"height": 354,
@@ -294,8 +616,8 @@
"rotated": false,
"offsetX": -9,
"offsetY": 127,
- "trimX": 939,
- "trimY": 1687,
+ "trimX": 954,
+ "trimY": 1831,
"width": 832,
"height": 142,
"rawWidth": 960,
@@ -337,11 +659,11 @@
"name": "l4_bg-ground01",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": -158,
- "trimX": 939,
- "trimY": 1235,
+ "trimX": 707,
+ "trimY": 543,
"width": 960,
"height": 224,
"rawWidth": 960,
@@ -383,11 +705,11 @@
"name": "l5_bg-ground02",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": -158,
- "trimX": 939,
- "trimY": 1461,
+ "trimX": 1319,
+ "trimY": 1,
"width": 960,
"height": 224,
"rawWidth": 960,
@@ -429,11 +751,11 @@
"name": "l6_ground",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": -135,
- "trimX": 939,
- "trimY": 963,
+ "trimX": 435,
+ "trimY": 543,
"width": 960,
"height": 270,
"rawWidth": 960,
@@ -475,11 +797,11 @@
"name": "l7_ground",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 543,
- "trimY": 939,
+ "trimX": 933,
+ "trimY": 543,
"width": 960,
"height": 22,
"rawWidth": 960,
diff --git a/assets/resources/gui/umps.png b/assets/resources/gui/umps.png
index 8293bbfe..6f787c38 100644
Binary files a/assets/resources/gui/umps.png and b/assets/resources/gui/umps.png differ