diff --git a/assets/res/prefabs/NUI/UIMain.prefab b/assets/res/prefabs/NUI/UIMain.prefab index ff287e4d..5b67e577 100644 --- a/assets/res/prefabs/NUI/UIMain.prefab +++ b/assets/res/prefabs/NUI/UIMain.prefab @@ -25236,7 +25236,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 449, + "width": 435, "height": 151 }, "_anchorPoint": { @@ -25246,7 +25246,7 @@ }, "_position": { "__type__": "cc.Vec3", - "x": -2, + "x": 0, "y": -75.5, "z": 0 }, @@ -25337,7 +25337,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 466, + "width": 434, "height": 191 }, "_anchorPoint": { @@ -25347,7 +25347,7 @@ }, "_position": { "__type__": "cc.Vec3", - "x": 7.4, + "x": 0, "y": -246.5, "z": 0 }, @@ -26116,7 +26116,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 437, + "width": 435, "height": 169 }, "_anchorPoint": { @@ -26217,7 +26217,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 466, + "width": 434, "height": 191 }, "_anchorPoint": { @@ -26227,7 +26227,7 @@ }, "_position": { "__type__": "cc.Vec3", - "x": 16.1, + "x": 0, "y": -264.5, "z": 0 }, @@ -26999,7 +26999,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 480, + "width": 436, "height": 177 }, "_anchorPoint": { @@ -27009,7 +27009,7 @@ }, "_position": { "__type__": "cc.Vec3", - "x": 19, + "x": 0, "y": -88.5, "z": 0 }, @@ -27100,7 +27100,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 462, + "width": 433, "height": 173 }, "_anchorPoint": { @@ -27110,7 +27110,7 @@ }, "_position": { "__type__": "cc.Vec3", - "x": 12, + "x": 0, "y": -263.5, "z": 0 }, @@ -27201,7 +27201,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 466, + "width": 434, "height": 77 }, "_anchorPoint": { @@ -27211,7 +27211,7 @@ }, "_position": { "__type__": "cc.Vec3", - "x": 14, + "x": 0, "y": -388.5, "z": 0 }, @@ -27833,7 +27833,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 449, - "height": 594 + "height": 592 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -27986,7 +27986,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 439, + "width": 435, "height": 169 }, "_anchorPoint": { @@ -28087,7 +28087,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 466, + "width": 434, "height": 77 }, "_anchorPoint": { @@ -28097,7 +28097,7 @@ }, "_position": { "__type__": "cc.Vec3", - "x": 15, + "x": 0, "y": -207.5, "z": 0 }, @@ -28188,8 +28188,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 445, - "height": 174 + "width": 432, + "height": 173 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -28198,8 +28198,8 @@ }, "_position": { "__type__": "cc.Vec3", - "x": 17, - "y": -333, + "x": 0, + "y": -332.5, "z": 0 }, "_scale": { @@ -28289,8 +28289,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 466, - "height": 174 + "width": 434, + "height": 173 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -28299,8 +28299,8 @@ }, "_position": { "__type__": "cc.Vec3", - "x": 27, - "y": -507, + "x": 0, + "y": -505.5, "z": 0 }, "_scale": { @@ -28373,7 +28373,7 @@ "_layoutSize": { "__type__": "cc.Size", "width": 449, - "height": 594 + "height": 592 }, "_resize": 1, "_N$layoutType": 2, diff --git a/assets/res/ui/ui_main2/text_main_phase1_1.png b/assets/res/ui/ui_main2/text_main_phase1_1.png index 00c605a8..3fc975e1 100644 Binary files a/assets/res/ui/ui_main2/text_main_phase1_1.png and b/assets/res/ui/ui_main2/text_main_phase1_1.png differ diff --git a/assets/res/ui/ui_main2/text_main_phase1_1.png.meta b/assets/res/ui/ui_main2/text_main_phase1_1.png.meta index 049ab8ec..c7f24fd8 100644 --- a/assets/res/ui/ui_main2/text_main_phase1_1.png.meta +++ b/assets/res/ui/ui_main2/text_main_phase1_1.png.meta @@ -13,14 +13,14 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": -15.5, - "offsetY": 18.5, - "trimX": 1, - "trimY": 8, - "width": 449, + "offsetX": -0.5, + "offsetY": 19.5, + "trimX": 2, + "trimY": 3, + "width": 435, "height": 151, - "rawWidth": 482, - "rawHeight": 204, + "rawWidth": 440, + "rawHeight": 196, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, diff --git a/assets/res/ui/ui_main2/text_main_phase1_2.png b/assets/res/ui/ui_main2/text_main_phase1_2.png index 4e3ab182..c107726b 100644 Binary files a/assets/res/ui/ui_main2/text_main_phase1_2.png and b/assets/res/ui/ui_main2/text_main_phase1_2.png differ diff --git a/assets/res/ui/ui_main2/text_main_phase1_2.png.meta b/assets/res/ui/ui_main2/text_main_phase1_2.png.meta index 88ffe038..bc6d7446 100644 --- a/assets/res/ui/ui_main2/text_main_phase1_2.png.meta +++ b/assets/res/ui/ui_main2/text_main_phase1_2.png.meta @@ -13,14 +13,14 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": -6, - "offsetY": -1.5, - "trimX": 2, - "trimY": 8, - "width": 466, + "offsetX": 0, + "offsetY": -0.5, + "trimX": 3, + "trimY": 3, + "width": 434, "height": 191, - "rawWidth": 482, - "rawHeight": 204, + "rawWidth": 440, + "rawHeight": 196, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, diff --git a/assets/res/ui/ui_main2/text_main_phase2_1.png b/assets/res/ui/ui_main2/text_main_phase2_1.png index bd19aeba..ec769d52 100644 Binary files a/assets/res/ui/ui_main2/text_main_phase2_1.png and b/assets/res/ui/ui_main2/text_main_phase2_1.png differ diff --git a/assets/res/ui/ui_main2/text_main_phase2_1.png.meta b/assets/res/ui/ui_main2/text_main_phase2_1.png.meta index 920cbd86..6a936688 100644 --- a/assets/res/ui/ui_main2/text_main_phase2_1.png.meta +++ b/assets/res/ui/ui_main2/text_main_phase2_1.png.meta @@ -13,14 +13,14 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": -21.5, - "offsetY": 9.5, - "trimX": 1, - "trimY": 8, - "width": 437, + "offsetX": -0.5, + "offsetY": 10.5, + "trimX": 2, + "trimY": 3, + "width": 435, "height": 169, - "rawWidth": 482, - "rawHeight": 204, + "rawWidth": 440, + "rawHeight": 196, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, diff --git a/assets/res/ui/ui_main2/text_main_phase2_2.png b/assets/res/ui/ui_main2/text_main_phase2_2.png index a8c230d4..bc1533d0 100644 Binary files a/assets/res/ui/ui_main2/text_main_phase2_2.png and b/assets/res/ui/ui_main2/text_main_phase2_2.png differ diff --git a/assets/res/ui/ui_main2/text_main_phase2_2.png.meta b/assets/res/ui/ui_main2/text_main_phase2_2.png.meta index 4ffc3ecc..401260e4 100644 --- a/assets/res/ui/ui_main2/text_main_phase2_2.png.meta +++ b/assets/res/ui/ui_main2/text_main_phase2_2.png.meta @@ -13,14 +13,14 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": -6, - "offsetY": -1.5, - "trimX": 2, - "trimY": 8, - "width": 466, + "offsetX": 0, + "offsetY": -0.5, + "trimX": 3, + "trimY": 3, + "width": 434, "height": 191, - "rawWidth": 482, - "rawHeight": 204, + "rawWidth": 440, + "rawHeight": 196, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, diff --git a/assets/res/ui/ui_main2/text_main_phase3_1.png b/assets/res/ui/ui_main2/text_main_phase3_1.png index 2a80d8f5..9ccb2237 100644 Binary files a/assets/res/ui/ui_main2/text_main_phase3_1.png and b/assets/res/ui/ui_main2/text_main_phase3_1.png differ diff --git a/assets/res/ui/ui_main2/text_main_phase3_1.png.meta b/assets/res/ui/ui_main2/text_main_phase3_1.png.meta index c79b017c..8725d8eb 100644 --- a/assets/res/ui/ui_main2/text_main_phase3_1.png.meta +++ b/assets/res/ui/ui_main2/text_main_phase3_1.png.meta @@ -14,13 +14,13 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 5.5, - "trimX": 1, - "trimY": 8, - "width": 480, + "offsetY": 6.5, + "trimX": 2, + "trimY": 3, + "width": 436, "height": 177, - "rawWidth": 482, - "rawHeight": 204, + "rawWidth": 440, + "rawHeight": 196, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, diff --git a/assets/res/ui/ui_main2/text_main_phase3_2.png b/assets/res/ui/ui_main2/text_main_phase3_2.png index 0fa0cf72..cd9ee766 100644 Binary files a/assets/res/ui/ui_main2/text_main_phase3_2.png and b/assets/res/ui/ui_main2/text_main_phase3_2.png differ diff --git a/assets/res/ui/ui_main2/text_main_phase3_2.png.meta b/assets/res/ui/ui_main2/text_main_phase3_2.png.meta index 7de93a34..961f7b69 100644 --- a/assets/res/ui/ui_main2/text_main_phase3_2.png.meta +++ b/assets/res/ui/ui_main2/text_main_phase3_2.png.meta @@ -13,14 +13,14 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": -8, - "offsetY": 7.5, - "trimX": 2, - "trimY": 8, - "width": 462, + "offsetX": -0.5, + "offsetY": 8.5, + "trimX": 3, + "trimY": 3, + "width": 433, "height": 173, - "rawWidth": 482, - "rawHeight": 204, + "rawWidth": 440, + "rawHeight": 196, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, diff --git a/assets/res/ui/ui_main2/text_main_phase3_3.png b/assets/res/ui/ui_main2/text_main_phase3_3.png index f547a7be..52c08c10 100644 Binary files a/assets/res/ui/ui_main2/text_main_phase3_3.png and b/assets/res/ui/ui_main2/text_main_phase3_3.png differ diff --git a/assets/res/ui/ui_main2/text_main_phase3_3.png.meta b/assets/res/ui/ui_main2/text_main_phase3_3.png.meta index ba1af53a..2b1c37d0 100644 --- a/assets/res/ui/ui_main2/text_main_phase3_3.png.meta +++ b/assets/res/ui/ui_main2/text_main_phase3_3.png.meta @@ -13,14 +13,14 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": -6, - "offsetY": 55.5, - "trimX": 2, - "trimY": 8, - "width": 466, + "offsetX": 0, + "offsetY": 56.5, + "trimX": 3, + "trimY": 3, + "width": 434, "height": 77, - "rawWidth": 482, - "rawHeight": 204, + "rawWidth": 440, + "rawHeight": 196, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, diff --git a/assets/res/ui/ui_main2/text_main_phase4_1.png b/assets/res/ui/ui_main2/text_main_phase4_1.png index 82b1c6fc..d3f309c4 100644 Binary files a/assets/res/ui/ui_main2/text_main_phase4_1.png and b/assets/res/ui/ui_main2/text_main_phase4_1.png differ diff --git a/assets/res/ui/ui_main2/text_main_phase4_1.png.meta b/assets/res/ui/ui_main2/text_main_phase4_1.png.meta index 1955e05e..0300ef24 100644 --- a/assets/res/ui/ui_main2/text_main_phase4_1.png.meta +++ b/assets/res/ui/ui_main2/text_main_phase4_1.png.meta @@ -13,14 +13,14 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": -20.5, - "offsetY": 9.5, - "trimX": 1, - "trimY": 8, - "width": 439, + "offsetX": -0.5, + "offsetY": 10.5, + "trimX": 2, + "trimY": 3, + "width": 435, "height": 169, - "rawWidth": 482, - "rawHeight": 204, + "rawWidth": 440, + "rawHeight": 196, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, diff --git a/assets/res/ui/ui_main2/text_main_phase4_2.png b/assets/res/ui/ui_main2/text_main_phase4_2.png index 069d58f7..ac4103c9 100644 Binary files a/assets/res/ui/ui_main2/text_main_phase4_2.png and b/assets/res/ui/ui_main2/text_main_phase4_2.png differ diff --git a/assets/res/ui/ui_main2/text_main_phase4_2.png.meta b/assets/res/ui/ui_main2/text_main_phase4_2.png.meta index d6f122b8..4d4af850 100644 --- a/assets/res/ui/ui_main2/text_main_phase4_2.png.meta +++ b/assets/res/ui/ui_main2/text_main_phase4_2.png.meta @@ -13,14 +13,14 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": -6, - "offsetY": 60.5, + "offsetX": -1, + "offsetY": 56.5, "trimX": 2, "trimY": 3, - "width": 466, + "width": 434, "height": 77, - "rawWidth": 482, - "rawHeight": 204, + "rawWidth": 440, + "rawHeight": 196, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, diff --git a/assets/res/ui/ui_main2/text_main_phase4_3.png b/assets/res/ui/ui_main2/text_main_phase4_3.png index fc85c7cc..d8c8a665 100644 Binary files a/assets/res/ui/ui_main2/text_main_phase4_3.png and b/assets/res/ui/ui_main2/text_main_phase4_3.png differ diff --git a/assets/res/ui/ui_main2/text_main_phase4_3.png.meta b/assets/res/ui/ui_main2/text_main_phase4_3.png.meta index 9426610f..90fd3f39 100644 --- a/assets/res/ui/ui_main2/text_main_phase4_3.png.meta +++ b/assets/res/ui/ui_main2/text_main_phase4_3.png.meta @@ -13,14 +13,14 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": -16.5, - "offsetY": 13, + "offsetX": -2, + "offsetY": 8.5, "trimX": 2, - "trimY": 2, - "width": 445, - "height": 174, - "rawWidth": 482, - "rawHeight": 204, + "trimY": 3, + "width": 432, + "height": 173, + "rawWidth": 440, + "rawHeight": 196, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, diff --git a/assets/res/ui/ui_main2/text_main_phase4_4.png b/assets/res/ui/ui_main2/text_main_phase4_4.png index 706a772e..4dc70bcb 100644 Binary files a/assets/res/ui/ui_main2/text_main_phase4_4.png and b/assets/res/ui/ui_main2/text_main_phase4_4.png differ diff --git a/assets/res/ui/ui_main2/text_main_phase4_4.png.meta b/assets/res/ui/ui_main2/text_main_phase4_4.png.meta index d6f6381a..f42d1622 100644 --- a/assets/res/ui/ui_main2/text_main_phase4_4.png.meta +++ b/assets/res/ui/ui_main2/text_main_phase4_4.png.meta @@ -13,14 +13,14 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": -6, - "offsetY": 13, + "offsetX": -1, + "offsetY": 8.5, "trimX": 2, - "trimY": 2, - "width": 466, - "height": 174, - "rawWidth": 482, - "rawHeight": 204, + "trimY": 3, + "width": 434, + "height": 173, + "rawWidth": 440, + "rawHeight": 196, "borderTop": 0, "borderBottom": 0, "borderLeft": 0,