diff --git a/assets/app-bundle/app-view/page/main/native/PageMain.prefab b/assets/app-bundle/app-view/page/main/native/PageMain.prefab index ade0a7c..e042bc9 100644 --- a/assets/app-bundle/app-view/page/main/native/PageMain.prefab +++ b/assets/app-bundle/app-view/page/main/native/PageMain.prefab @@ -122,7 +122,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, + "x": -1557.975, "y": 0, "z": 0 }, @@ -33045,7 +33045,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 0, + "width": 260, "height": 63 }, "_anchorPoint": { @@ -33084,11 +33084,11 @@ "_string": "", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 50, + "_actualFontSize": 51, "_fontSize": 50, "_fontFamily": "Arial", "_lineHeight": 50, - "_overflow": 0, + "_overflow": 2, "_enableWrapText": true, "_font": null, "_isSystemFontUsed": true, @@ -36048,7 +36048,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -50, + "x": 20, "y": -48, "z": 0 }, @@ -36252,7 +36252,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 931, - "height": 140 + "height": 139 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -36441,7 +36441,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 160, + "x": 64, "y": 0, "z": 0 }, @@ -36644,8 +36644,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 713, - "height": 64 + "width": 637, + "height": 60 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/app-bundle/app-view/page/main/native/PageMain.ts b/assets/app-bundle/app-view/page/main/native/PageMain.ts index 41d7d3d..071f5fc 100644 --- a/assets/app-bundle/app-view/page/main/native/PageMain.ts +++ b/assets/app-bundle/app-view/page/main/native/PageMain.ts @@ -529,8 +529,8 @@ export class PageMain extends BaseView { }, 3.2); let earn_str = this._game_data.win_coin > 0 ? "+" + this._game_data.win_coin : this._game_data.win_coin - this.lab_earn.string = earn_str - this.lab_earn.color = this._game_data.win_coin > 0 ? new Color(255, 91, 69) : new Color(96, 255, 38) + this.lab_earn.string = this._game_data.tier == "T5" ? Tools.GetLocalized("再来一次") : earn_str + this.lab_earn.color = this._game_data.win_coin >= 0 ? new Color(255, 91, 69) : new Color(96, 255, 38) let blinkCount = 0; const blink = () => { diff --git a/assets/app-bundle/app-view/page/main/resources/s_sprite/main_lab_rw_en.png b/assets/app-bundle/app-view/page/main/resources/s_sprite/main_lab_rw_en.png index acbdd5c..41242a5 100644 Binary files a/assets/app-bundle/app-view/page/main/resources/s_sprite/main_lab_rw_en.png and b/assets/app-bundle/app-view/page/main/resources/s_sprite/main_lab_rw_en.png differ diff --git a/assets/app-bundle/app-view/page/main/resources/s_sprite/main_lab_rw_en.png.meta b/assets/app-bundle/app-view/page/main/resources/s_sprite/main_lab_rw_en.png.meta index fea5f8b..a05b392 100644 --- a/assets/app-bundle/app-view/page/main/resources/s_sprite/main_lab_rw_en.png.meta +++ b/assets/app-bundle/app-view/page/main/resources/s_sprite/main_lab_rw_en.png.meta @@ -47,9 +47,9 @@ "trimX": 0, "trimY": 0, "width": 931, - "height": 140, + "height": 139, "rawWidth": 931, - "rawHeight": 140, + "rawHeight": 139, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -62,16 +62,16 @@ "vertices": { "rawPosition": [ -465.5, - -70, + -69.5, 0, 465.5, - -70, + -69.5, 0, -465.5, - 70, + 69.5, 0, 465.5, - 70, + 69.5, 0 ], "indexes": [ @@ -84,9 +84,9 @@ ], "uv": [ 0, - 140, + 139, 931, - 140, + 139, 0, 0, 931, @@ -104,12 +104,12 @@ ], "minPos": [ -465.5, - -70, + -69.5, 0 ], "maxPos": [ 465.5, - 70, + 69.5, 0 ] }, diff --git a/assets/app-bundle/app-view/page/main/resources/s_sprite/main_lab_rw_zh.png b/assets/app-bundle/app-view/page/main/resources/s_sprite/main_lab_rw_zh.png index db5177e..da75bf9 100644 Binary files a/assets/app-bundle/app-view/page/main/resources/s_sprite/main_lab_rw_zh.png and b/assets/app-bundle/app-view/page/main/resources/s_sprite/main_lab_rw_zh.png differ diff --git a/assets/app-bundle/app-view/page/main/resources/s_sprite/main_lab_rw_zh.png.meta b/assets/app-bundle/app-view/page/main/resources/s_sprite/main_lab_rw_zh.png.meta index bbcdc2a..f7122cb 100644 --- a/assets/app-bundle/app-view/page/main/resources/s_sprite/main_lab_rw_zh.png.meta +++ b/assets/app-bundle/app-view/page/main/resources/s_sprite/main_lab_rw_zh.png.meta @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 713, - "height": 64, - "rawWidth": 713, - "rawHeight": 64, + "width": 637, + "height": 60, + "rawWidth": 637, + "rawHeight": 60, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -356.5, - -32, + -318.5, + -30, 0, - 356.5, - -32, + 318.5, + -30, 0, - -356.5, - 32, + -318.5, + 30, 0, - 356.5, - 32, + 318.5, + 30, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 64, - 713, - 64, + 60, + 637, + 60, 0, 0, - 713, + 637, 0 ], "nuv": [ @@ -103,13 +103,13 @@ 1 ], "minPos": [ - -356.5, - -32, + -318.5, + -30, 0 ], "maxPos": [ - 356.5, - 32, + 318.5, + 30, 0 ] }, diff --git a/assets/app-bundle/app-view/page/rewardhistory/native/PageRewardhistory.prefab b/assets/app-bundle/app-view/page/rewardhistory/native/PageRewardhistory.prefab index 4b6124e..451c5fb 100644 --- a/assets/app-bundle/app-view/page/rewardhistory/native/PageRewardhistory.prefab +++ b/assets/app-bundle/app-view/page/rewardhistory/native/PageRewardhistory.prefab @@ -1682,7 +1682,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 170, + "x": 190, "y": 30, "z": 0 }, @@ -1732,7 +1732,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 10, + "x": 48, "y": 0, "z": 0 }, @@ -1773,7 +1773,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 100, + "width": 120, "height": 50 }, "_anchorPoint": { @@ -1885,7 +1885,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 485, + "width": 451, "height": 44 }, "_anchorPoint": { @@ -2034,7 +2034,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 68, + "x": 30, "y": 0, "z": 0 }, @@ -2187,8 +2187,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 399, - "height": 50 + "width": 438, + "height": 45 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2337,7 +2337,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -40, + "y": -34, "z": 0 }, "_lrot": { @@ -2489,8 +2489,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 422, - "height": 116 + "width": 426, + "height": 120 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2638,7 +2638,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 61, + "x": 31, "y": 0, "z": 0 }, @@ -2791,8 +2791,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 424, - "height": 49 + "width": 450, + "height": 48 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/app-bundle/app-view/page/rewardhistory/resources/rehis_lab_lose_en.png b/assets/app-bundle/app-view/page/rewardhistory/resources/rehis_lab_lose_en.png index b9d1fbc..b24692c 100644 Binary files a/assets/app-bundle/app-view/page/rewardhistory/resources/rehis_lab_lose_en.png and b/assets/app-bundle/app-view/page/rewardhistory/resources/rehis_lab_lose_en.png differ diff --git a/assets/app-bundle/app-view/page/rewardhistory/resources/rehis_lab_lose_en.png.meta b/assets/app-bundle/app-view/page/rewardhistory/resources/rehis_lab_lose_en.png.meta index 046478a..2b1139a 100644 --- a/assets/app-bundle/app-view/page/rewardhistory/resources/rehis_lab_lose_en.png.meta +++ b/assets/app-bundle/app-view/page/rewardhistory/resources/rehis_lab_lose_en.png.meta @@ -43,13 +43,13 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 2, + "offsetY": 0, "trimX": 0, - "trimY": 5, - "width": 485, + "trimY": 0, + "width": 451, "height": 44, - "rawWidth": 485, - "rawHeight": 58, + "rawWidth": 451, + "rawHeight": 44, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,16 +61,16 @@ "meshType": 0, "vertices": { "rawPosition": [ - -242.5, + -225.5, -22, 0, - 242.5, + 225.5, -22, 0, - -242.5, + -225.5, 22, 0, - 242.5, + 225.5, 22, 0 ], @@ -84,31 +84,31 @@ ], "uv": [ 0, - 53, - 485, - 53, + 44, + 451, + 44, 0, - 9, - 485, - 9 + 0, + 451, + 0 ], "nuv": [ 0, - 0.15517241379310345, - 1, - 0.15517241379310345, 0, - 0.9137931034482759, 1, - 0.9137931034482759 + 0, + 0, + 1, + 1, + 1 ], "minPos": [ - -242.5, + -225.5, -22, 0 ], "maxPos": [ - 242.5, + 225.5, 22, 0 ] diff --git a/assets/app-bundle/app-view/page/rewardhistory/resources/rehis_lab_lose_zh.png b/assets/app-bundle/app-view/page/rewardhistory/resources/rehis_lab_lose_zh.png index fb2af99..092e6be 100644 Binary files a/assets/app-bundle/app-view/page/rewardhistory/resources/rehis_lab_lose_zh.png and b/assets/app-bundle/app-view/page/rewardhistory/resources/rehis_lab_lose_zh.png differ diff --git a/assets/app-bundle/app-view/page/rewardhistory/resources/rehis_lab_lose_zh.png.meta b/assets/app-bundle/app-view/page/rewardhistory/resources/rehis_lab_lose_zh.png.meta index 71562c3..58a35c8 100644 --- a/assets/app-bundle/app-view/page/rewardhistory/resources/rehis_lab_lose_zh.png.meta +++ b/assets/app-bundle/app-view/page/rewardhistory/resources/rehis_lab_lose_zh.png.meta @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 399, - "height": 50, - "rawWidth": 399, - "rawHeight": 50, + "width": 438, + "height": 45, + "rawWidth": 438, + "rawHeight": 45, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -199.5, - -25, + -219, + -22.5, 0, - 199.5, - -25, + 219, + -22.5, 0, - -199.5, - 25, + -219, + 22.5, 0, - 199.5, - 25, + 219, + 22.5, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 50, - 399, - 50, + 45, + 438, + 45, 0, 0, - 399, + 438, 0 ], "nuv": [ @@ -103,13 +103,13 @@ 1 ], "minPos": [ - -199.5, - -25, + -219, + -22.5, 0 ], "maxPos": [ - 199.5, - 25, + 219, + 22.5, 0 ] }, diff --git a/assets/app-bundle/app-view/page/rewardhistory/resources/rehis_lab_win_en.png b/assets/app-bundle/app-view/page/rewardhistory/resources/rehis_lab_win_en.png index c823437..cef8cd4 100644 Binary files a/assets/app-bundle/app-view/page/rewardhistory/resources/rehis_lab_win_en.png and b/assets/app-bundle/app-view/page/rewardhistory/resources/rehis_lab_win_en.png differ diff --git a/assets/app-bundle/app-view/page/rewardhistory/resources/rehis_lab_win_en.png.meta b/assets/app-bundle/app-view/page/rewardhistory/resources/rehis_lab_win_en.png.meta index baba067..998c3db 100644 --- a/assets/app-bundle/app-view/page/rewardhistory/resources/rehis_lab_win_en.png.meta +++ b/assets/app-bundle/app-view/page/rewardhistory/resources/rehis_lab_win_en.png.meta @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 422, - "height": 116, - "rawWidth": 422, - "rawHeight": 116, + "width": 426, + "height": 120, + "rawWidth": 426, + "rawHeight": 120, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -211, - -58, + -213, + -60, 0, - 211, - -58, + 213, + -60, 0, - -211, - 58, + -213, + 60, 0, - 211, - 58, + 213, + 60, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 116, - 422, - 116, + 120, + 426, + 120, 0, 0, - 422, + 426, 0 ], "nuv": [ @@ -103,13 +103,13 @@ 1 ], "minPos": [ - -211, - -58, + -213, + -60, 0 ], "maxPos": [ - 211, - 58, + 213, + 60, 0 ] }, diff --git a/assets/app-bundle/app-view/page/rewardhistory/resources/rehis_lab_win_zh.png b/assets/app-bundle/app-view/page/rewardhistory/resources/rehis_lab_win_zh.png index ce6e01f..7c786f6 100644 Binary files a/assets/app-bundle/app-view/page/rewardhistory/resources/rehis_lab_win_zh.png and b/assets/app-bundle/app-view/page/rewardhistory/resources/rehis_lab_win_zh.png differ diff --git a/assets/app-bundle/app-view/page/rewardhistory/resources/rehis_lab_win_zh.png.meta b/assets/app-bundle/app-view/page/rewardhistory/resources/rehis_lab_win_zh.png.meta index f8a2bc4..85f9873 100644 --- a/assets/app-bundle/app-view/page/rewardhistory/resources/rehis_lab_win_zh.png.meta +++ b/assets/app-bundle/app-view/page/rewardhistory/resources/rehis_lab_win_zh.png.meta @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 424, - "height": 49, - "rawWidth": 424, - "rawHeight": 49, + "width": 450, + "height": 48, + "rawWidth": 450, + "rawHeight": 48, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -212, - -24.5, + -225, + -24, 0, - 212, - -24.5, + 225, + -24, 0, - -212, - 24.5, + -225, + 24, 0, - 212, - 24.5, + 225, + 24, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 49, - 424, - 49, + 48, + 450, + 48, 0, 0, - 424, + 450, 0 ], "nuv": [ @@ -103,13 +103,13 @@ 1 ], "minPos": [ - -212, - -24.5, + -225, + -24, 0 ], "maxPos": [ - 212, - 24.5, + 225, + 24, 0 ] }, diff --git a/assets/res-native/setting/LabLanguage.ts b/assets/res-native/setting/LabLanguage.ts index c516b60..d91346f 100644 --- a/assets/res-native/setting/LabLanguage.ts +++ b/assets/res-native/setting/LabLanguage.ts @@ -6,4 +6,5 @@ export const LabelConfig : LabelConfigType = { "自动游戏B": ["自动游戏", "AUTO PLAY"], "剩余次数B:": ["剩余次数:", "REMAINING TIMES:"], "数据错误": ["数据错误", "Data error"], + "再来一次": ["再来一次", "Once Again"], } \ No newline at end of file