[fix]增加容错

assets/app-bundle/app-view/page/main/native/PageMain.ts

@@ -1,4 +1,4 @@
-import { _decorator, Node, tween, Vec3, Sprite, Asset, ImageAsset, SpriteFrame, Texture2D, Label, UIOpacity, Animation, math, VideoPlayer, UITransform, VideoClip } from 'cc';
+import { _decorator, Node, tween, Vec3, Sprite, Asset, ImageAsset, SpriteFrame, Texture2D, Label, UIOpacity, Animation, math, VideoPlayer, UITransform, VideoClip, Color, Button } from 'cc';
 import BaseView from '../../../../../../extensions/app/assets/base/BaseView';
 import { PageTips } from '../../tips/native/PageTips';
 import { app } from 'db://assets/app/app';
@@ -14,6 +14,13 @@ const enum M_DIR {
     COUNTER_CLOCKWISE = 1, /** 逆时针 */
 }
 
+const AUTO_TIMES : any[] = [
+    "∞",
+    "500",
+    "200",
+    "10",
+]
+
 @ccclass('PageMain')
 export class PageMain extends BaseView {
     /** 声音按钮 */
@@ -22,25 +29,24 @@ export class PageMain extends BaseView {
     @property(Label) lab_gold: Label = null!;
     /** 姓名 */
     @property(Label) lab_name: Label = null!;
-    /** 当前剩余抽奖次数 */
+    /** 中奖提示 */
-    @property(Label) remain: Label = null!;
+    @property(Label) lab_earn: Label = null!;
+    /** 倍率显示 */
+    @property(Label) lab_ante: Label = null!;
     /** 方向选择 */
     @property(Node) n_dir: Node[] = [];
     /** 标签 */
     @property(Node) sign: Node = null!;
     /** 方块 */
-    @property(Node) blocks: Node = null!;
+    @property(Node) blocks: Node[] = [];
     /** 骰子 */
     @property(Node) dices: Node[] = [];
     /** 中奖 */
     @property(Node) rw: Node = null!;
     /** 未中奖 */
     @property(Node) norw: Node = null!;
-    /** 购买次数按钮 */
-    @property(Node) btns_buy: Node = null!;
     /** 开始游戏按钮 */
     @property(Node) btn_play: Node = null!;
-    /** 开始游戏按钮 */
     @property(Node) btn_auto: Node = null!;
     /** 胜利数字 */
     @property(Node) lab_add: Node = null!;
@@ -58,11 +64,20 @@ export class PageMain extends BaseView {
     @property(Node) ani_dice: Node = null!;
     /** 骰子总点数 */
     @property(Node) dice_all: Node = null!;
+    /** 倍数减按钮 */
+    @property(Node) btn_ante_sub: Node = null!;
+    @property(Node) btn_ante_add: Node = null!;
     /** 失败视频资源 */
     @property(VideoClip) video_win: VideoClip = null!;
     @property(VideoClip) video_lose: VideoClip = null!;
     @property(VideoClip) video_normal: VideoClip = null!;
 
+    @property(Node) item_times: Node = null!;
+    @property(Node) list_times: Node = null!;
+    @property(Node) pnl_times: Node = null!;
+
+
+
     /** 方块移动方向 */
     private _move_dir: M_DIR = M_DIR.CLOCKWISE;
     /** 是否正在游戏 */
@@ -70,12 +85,16 @@ export class PageMain extends BaseView {
     /** 骰子数据 */
     private _game_data: any = null;
     /** 是否正在连续 */
-    private _is_continuous : boolean = true
+    private _is_continuous : boolean = false
+    /** 棋盘数据 */
+    private _board_data: any[] = []
+    /** 消耗倍数索引 */
+    private _ante_index : number = 0
+    /** 倍数数据 */
+    private _ante_data : any[] = null
+    /** 剩余次数 */
+    private _now_rest_times : number = 0
 
-    /** 方块顺时针顺序，从顶端开始 */
-    private _b_sequence : string[] = [
-        "20","27","24","10","5","15","8","22","30","23","16","12","13","7","17","9","21","26","6","29","19","11","25","14","28","18"
-    ];
 
     /** 标签位置 */
     private _sign_position: Vec3[] =[
@@ -120,11 +139,11 @@ export class PageMain extends BaseView {
     // 界面打开时的相关逻辑写在这(onShow可被多次调用-它与onHide不成对)
     onShow(params: any) {
         this.initUserData()
-        this.swichBuyAndPlay()
         this.initDir()
-        this.getRwData()
         this.onClickTips()
         this.bindVideoEvents()
+        this.getConfig()
+        this.initAutoTimes()
 
         this._canvas = document.createElement('canvas');
         this._canvas.width = this.video_sprite.getComponent(UITransform).width;
@@ -160,15 +179,6 @@ export class PageMain extends BaseView {
     initUserData(){
         this.lab_gold.string = USERDATA.coin.toString()
         this.lab_name.string = USERDATA.name
-        this.remain.string = USERDATA.total_ticket_count.toString()
-        //this.remain.node.active = USERDATA.total_ticket_count > 0
-        Tools.ActChild(this.btn_auto, "auto", this._is_continuous)
-        Tools.ActChild(this.btn_auto, "no_auto", !this._is_continuous)
-    }
-
-    swichBuyAndPlay(){
-        this.btns_buy.active = USERDATA.total_ticket_count <= 0 
-        this.btn_play.active = USERDATA.total_ticket_count > 0 
     }
     
     bindVideoEvents() {
@@ -188,24 +198,98 @@ export class PageMain extends BaseView {
         }
     }
 
-    getRwData(){
+    getConfig(){
-        Tools.httpReq("game/lotteryPool", {}, (res:any) => { 
+        Tools.httpReq("game/anteConfig", {}, (res:any) => { 
+            this._ante_data = res
+            // 默认倍数
             for (let index = 0; index < res.length; index++) {
-                const d = res[index];
+                const element = res[index];
-                Tools.SetChildText(this.blocks, String(d.grid_number) + "/num", d.ui_text)
+                if (element.is_default == 1){
+                    this._ante_index = index
+                    break
                 }
+            }
+            this.initAnteSet()
+
+            Tools.httpReq("game/lotteryPool", {}, (res:any) => { 
+                this._board_data = res
+                this.initBoradData()
+            })
         })
     }
 
-    /** 购买游戏次数 */
+    initAutoTimes(){
-    buyTimes(a : any, d : any){
+        for (let i = 0; i < AUTO_TIMES.length; i++) {
-        Tools.httpReq("game/buyLotteryTickets", { "count" : d }, (res:any) => { 
+            const str = AUTO_TIMES[i]
-            USERDATA.coin = res.coin
+            let item = Tools.AddChild(this.list_times, this.item_times)
-            USERDATA.total_ticket_count = res.total_ticket_count
+            item.active = true
-            this.swichBuyAndPlay()
+            Tools.SetChildText(item, "lab", str)
-            this.initUserData()
+            Tools.SetTouchEndEvt(item, () => {
+                if (str == "∞"){
+                    this._now_rest_times = -1
+                } else{
+                    this._now_rest_times = parseInt(str)
+                }
+                this._is_continuous = true
+                this.hideSelectTimes()
+                Tools.ActChild(this.btn_auto, "lab", false)
+                this.btnGameStart()
             })
         }
+    }
+
+    hideSelectTimes(){
+        this.pnl_times.active = false
+    }
+
+    switchAuto(){
+        if (this._is_continuous){
+            this._is_continuous = false
+            this._now_rest_times = 0
+            Tools.ActChild(this.btn_auto, "lab", true)
+            Tools.SetChildText(this.btn_auto, "times", "")
+        }else {
+            if (this._is_playing) return
+            this.pnl_times.active = true
+        }
+    }
+
+    initAnteSet(){ 
+        let d = this._ante_data[this._ante_index]
+        this.lab_ante.string = d.name
+        this.btn_ante_sub.getComponent(Sprite).grayscale = this._ante_index == 0
+        this.btn_ante_add.getComponent(Sprite).grayscale = this._ante_index == this._ante_data.length - 1
+    }
+
+    btnAnteAdd(){
+        if (this._is_playing) return
+        if (this._ante_index < this._ante_data.length - 1) {
+            this._ante_index++
+            this.initAnteSet()
+            this.initBoradData()
+        }
+    }
+
+    btnAnteSub(){
+        if (this._is_playing) return
+        if (this._ante_index > 0) {
+            this._ante_index--
+            this.initAnteSet()
+            this.initBoradData()
+        }
+    }
+    
+
+    initBoradData(){
+        for (let index = 0; index < this._board_data.length; index++) {
+            const d = this._board_data[index];
+            let num = parseFloat(d.ui_text) ? parseFloat(d.ui_text) * this._ante_data[this._ante_index].mult : d.ui_text
+            Tools.SetChildText(this.blocks[index], "num", num)
+            Tools.SetChildText(this.blocks[index], "light/num", num)
+            Tools.SetChildText(this.blocks[index], "point", d.grid_number)
+            Tools.SetChildText(this.blocks[index], "light/point", d.grid_number)
+        }
+    }
 
     chooseDir(d:any, dir: number){
         this._move_dir = dir
@@ -235,37 +319,29 @@ export class PageMain extends BaseView {
         app.manager.ui.show<PageRewardhistory>({name: 'PageRewardhistory'})
     }
 
-    btnGameAuto(){
-        this._is_continuous = !this._is_continuous
-        this.initUserData()
-    }
-
-    btnPlayGary(){
-        this.btn_play.getComponent(Sprite).grayscale = true
-        Tools.GetChildComp(this.btn_play, "lab", Sprite).grayscale = true
-    }
-
-    btnPlayWhite(){
-        this.btn_play.getComponent(Sprite).grayscale = false
-        Tools.GetChildComp(this.btn_play, "lab", Sprite).grayscale = false
-    }
-
     /** 开始游戏 */
     btnGameStart(){
-        if (this._b_sequence.length != this._sign_position.length) {
-            return app.manager.ui.showToast(Tools.GetLocalized("数据错误"))
-        }
         if (this._is_playing) return
         this._is_playing = true
-        this.btnPlayGary()
+
+        this.lab_earn.string = ""
+        this.btn_ante_sub.getComponent(Sprite).grayscale = true
+        this.btn_ante_add.getComponent(Sprite).grayscale = true
+        this.btn_play.getComponent(Sprite).grayscale = true
+
+        if (this._is_continuous){
+            this._now_rest_times = this._now_rest_times == -1 ? -1 : this._now_rest_times - 1
+            Tools.SetChildText(this.btn_auto, "times", this._now_rest_times == -1 ? "∞" : this._now_rest_times.toString())
+        }
         
         Tools.httpReq("game/playStart", {
-            "direction" : this._move_dir
+            "direction" : this._move_dir,
+            "ante" : this._ante_data[this._ante_index].mult
         }, (res:any) => { 
             this._game_data = res
             this._move_dir = res.direction
 
-            USERDATA.total_ticket_count--
+            USERDATA.coin -= res.use_coin
             this.initUserData()
 
             let steps = 0 
@@ -273,8 +349,8 @@ export class PageMain extends BaseView {
                 const element = res.roll_array[i];
                 steps += element
             }
-            let index:any = this._b_sequence.findIndex(v => v == steps.toString()) 
+            let index:any = this._board_data.findIndex(v => v.grid_number == steps.toString()) 
-            let b = this.blocks.getChildByName(steps.toString())
+            let b = this.blocks[index]
 
             // 计算移动路径
             let path = this.calculatePath(index, steps);
@@ -290,6 +366,7 @@ export class PageMain extends BaseView {
             // 如果是豹子，展示豹子特效后停止继续
             if (baozi){ 
                 this.scheduleOnce(() => { 
+                    this.resetStopGame()
                     app.manager.sound.playEffect({name : "effect/eff_unsheathe"})
                     for (let i = 0; i < this.dices.length; i++) {
                         let eff = this.dices[i].getChildByPath("dice/eff")
@@ -316,8 +393,6 @@ export class PageMain extends BaseView {
                         USERDATA.total_ticket_count = this._game_data.total_ticket_count
                         this._is_playing = false
                         this.initUserData()
-                        this.swichBuyAndPlay()
-                        this.btnPlayWhite()
                     }, 1)
                 }, 1.2)
             }else {
@@ -355,6 +430,7 @@ export class PageMain extends BaseView {
             }
         },()=>{
             this._is_playing = false
+            this.resetStopGame()
         })
     }
 
@@ -395,8 +471,7 @@ export class PageMain extends BaseView {
             /** 跟随闪烁 */
             this.scheduleOnce(() => {
                 let n = this._sign_position.findIndex(v => v == targetPos)
-                let nowPoint = this._b_sequence[n]
+                let light = this.blocks[n].getChildByName("light")
-                let light = this.blocks.getChildByName(nowPoint).getChildByName("light")
                 light.active = true
                 let opc = light.getComponent(UIOpacity)
                 opc.opacity = 0
@@ -416,13 +491,13 @@ export class PageMain extends BaseView {
                     if (index + 1 >= path.length) {
                         this.scheduleOnce(() => {
                             this.sign.active = false;
-                            let b = this._b_sequence[lastIndex]
+                            let b = this.blocks[lastIndex]
                             if (this._game_data.win_coin >= 0){
                                 app.manager.sound.playEffect({name : "effect/eff_start"})
                             }else{
                                 app.manager.sound.playEffect({name : "effect/eff_finish", volume: 0.5})
                             }
-                            this.blinkLightWithTween(this.blocks.getChildByName(b).getChildByName("light"), 1, 2)
+                            this.blinkLightWithTween(this.blocks[lastIndex].getChildByName("light"), 1, 2)
                         }, 0.5);
                         return;
                     }
@@ -453,6 +528,10 @@ export class PageMain extends BaseView {
             this.video_bg.clip = this.video_normal
         }, 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)
+
         let blinkCount = 0;
         const blink = () => {
             tween(opc)
@@ -473,13 +552,11 @@ export class PageMain extends BaseView {
                             let cb = () => { 
                                 lab.destroy()
                                 USERDATA.coin = this._game_data.coin
-                                        USERDATA.total_ticket_count = this._game_data.total_ticket_count
                                 this.initUserData()
-                                        this.swichBuyAndPlay()
+                                if (this._now_rest_times > 0 || this._now_rest_times == -1){
-                                        if (USERDATA.total_ticket_count > 0){
                                     this.btnGameStart()
                                 }else{
-                                            this.btnPlayWhite()
+                                    this.resetStopGame()
                                 }
                             }
                             // T5是再来一次，不需要飘字
@@ -487,7 +564,8 @@ export class PageMain extends BaseView {
                                 let pos = new Vec3(node.parent.position.x, node.parent.position.y + 80, 0 )
                                 lab.setPosition(pos)
                                 lab.active = true
-                                Tools.SetText(lab, this._game_data.win_coin > 0 ? "+" + this._game_data.win_coin : this._game_data.win_coin)
+                                let earn_str = this._game_data.win_coin > 0 ? "+" + this._game_data.win_coin : this._game_data.win_coin
+                                Tools.SetText(lab, earn_str)
                                 app.manager.sound.playEffect({name :  this._game_data.win_coin > 0 ?  "effect/eff_win" : "effect/eff_lose"})
                                 tween(lab)
                                     .by(1, { position: new Vec3(0, 200, 0) })
@@ -511,10 +589,8 @@ export class PageMain extends BaseView {
                                 }
                             }
                             USERDATA.coin = this._game_data.coin
-                            USERDATA.total_ticket_count = this._game_data.total_ticket_count
+                            this.resetStopGame()
-                            this.swichBuyAndPlay()
                             this.initUserData()
-                            this.btnPlayWhite()
                         }
                     }
                 })
@@ -524,6 +600,14 @@ export class PageMain extends BaseView {
         blink();
     }
 
+    resetStopGame(){
+        this._is_continuous = false
+        Tools.ActChild(this.btn_auto, "lab", true)
+        Tools.SetChildText(this.btn_auto, "times", "")
+        this.btn_play.getComponent(Sprite).grayscale = false
+        this.initAnteSet()
+    }
+
     /** 播放骰子动画 */
     playDiceAni(array:any[]){
         app.manager.sound.playEffect({name : "effect/shaizi"})

assets/app-bundle/app-view/page/main/resources/s_sprite/main_bg_bottom.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "fd8dfe8f-f174-41d6-a01d-4d6613b5dfec",
+  "uuid": "cbbb1174-140b-4c80-b812-d76e8592ea04",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "fd8dfe8f-f174-41d6-a01d-4d6613b5dfec@6c48a",
+      "uuid": "cbbb1174-140b-4c80-b812-d76e8592ea04@6c48a",
-      "displayName": "main_mask_video",
+      "displayName": "main_bg_bottom",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "fd8dfe8f-f174-41d6-a01d-4d6613b5dfec",
+        "imageUuidOrDatabaseUri": "cbbb1174-140b-4c80-b812-d76e8592ea04",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "fd8dfe8f-f174-41d6-a01d-4d6613b5dfec@f9941",
+      "uuid": "cbbb1174-140b-4c80-b812-d76e8592ea04@f9941",
-      "displayName": "main_mask_video",
+      "displayName": "main_bg_bottom",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -47,9 +47,9 @@
         "trimX": 0,
         "trimY": 0,
         "width": 1080,
-        "height": 1267,
+        "height": 223,
         "rawWidth": 1080,
-        "rawHeight": 1267,
+        "rawHeight": 223,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -62,16 +62,16 @@
         "vertices": {
           "rawPosition": [
             -540,
-            -633.5,
+            -111.5,
             0,
             540,
-            -633.5,
+            -111.5,
             0,
             -540,
-            633.5,
+            111.5,
             0,
             540,
-            633.5,
+            111.5,
             0
           ],
           "indexes": [
@@ -84,9 +84,9 @@
           ],
           "uv": [
             0,
-            1267,
+            223,
             1080,
-            1267,
+            223,
             0,
             0,
             1080,
@@ -104,17 +104,17 @@
           ],
           "minPos": [
             -540,
-            -633.5,
+            -111.5,
             0
           ],
           "maxPos": [
             540,
-            633.5,
+            111.5,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "fd8dfe8f-f174-41d6-a01d-4d6613b5dfec@6c48a",
+        "imageUuidOrDatabaseUri": "cbbb1174-140b-4c80-b812-d76e8592ea04@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,7 +129,7 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "fd8dfe8f-f174-41d6-a01d-4d6613b5dfec@6c48a",
+    "redirect": "cbbb1174-140b-4c80-b812-d76e8592ea04@6c48a",
     "compressSettings": {
       "useCompressTexture": true,
       "presetId": "e1UHIKee1GRqns7LEix3IH"

assets/app-bundle/app-view/page/main/resources/s_sprite/main_bg_times.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "550f2426-56ed-412d-b801-4a86bd4627b0",
+  "uuid": "8700aabd-1e14-497b-af7d-7030c9f43e98",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "550f2426-56ed-412d-b801-4a86bd4627b0@6c48a",
+      "uuid": "8700aabd-1e14-497b-af7d-7030c9f43e98@6c48a",
-      "displayName": "main_lab_off_zh",
+      "displayName": "main_bg_times",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "550f2426-56ed-412d-b801-4a86bd4627b0",
+        "imageUuidOrDatabaseUri": "8700aabd-1e14-497b-af7d-7030c9f43e98",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "550f2426-56ed-412d-b801-4a86bd4627b0@f9941",
+      "uuid": "8700aabd-1e14-497b-af7d-7030c9f43e98@f9941",
-      "displayName": "main_lab_off_zh",
+      "displayName": "main_bg_times",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -46,12 +46,12 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 42,
+        "width": 256,
-        "height": 44,
+        "height": 280,
-        "rawWidth": 42,
+        "rawWidth": 256,
-        "rawHeight": 44,
+        "rawHeight": 280,
-        "borderTop": 0,
+        "borderTop": 111,
-        "borderBottom": 0,
+        "borderBottom": 115,
         "borderLeft": 0,
         "borderRight": 0,
         "packable": true,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -21,
+            -128,
-            -22,
+            -140,
             0,
-            21,
+            128,
-            -22,
+            -140,
             0,
-            -21,
+            -128,
-            22,
+            140,
             0,
-            21,
+            128,
-            22,
+            140,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            44,
+            280,
-            42,
+            256,
-            44,
+            280,
             0,
             0,
-            42,
+            256,
             0
           ],
           "nuv": [
@@ -103,18 +103,18 @@
             1
           ],
           "minPos": [
-            -21,
+            -128,
-            -22,
+            -140,
             0
           ],
           "maxPos": [
-            21,
+            128,
-            22,
+            140,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "550f2426-56ed-412d-b801-4a86bd4627b0@6c48a",
+        "imageUuidOrDatabaseUri": "8700aabd-1e14-497b-af7d-7030c9f43e98@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,10 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "550f2426-56ed-412d-b801-4a86bd4627b0@6c48a",
+    "redirect": "8700aabd-1e14-497b-af7d-7030c9f43e98@6c48a"
-    "compressSettings": {
-      "useCompressTexture": true,
-      "presetId": "e1UHIKee1GRqns7LEix3IH"
-    }
   }
 }

assets/app-bundle/app-view/page/main/resources/s_sprite/main_btn_auto.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 609,
+        "width": 166,
-        "height": 250,
+        "height": 99,
-        "rawWidth": 609,
+        "rawWidth": 166,
-        "rawHeight": 250,
+        "rawHeight": 99,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -304.5,
+            -83,
-            -125,
+            -49.5,
             0,
-            304.5,
+            83,
-            -125,
+            -49.5,
             0,
-            -304.5,
+            -83,
-            125,
+            49.5,
             0,
-            304.5,
+            83,
-            125,
+            49.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            250,
+            99,
-            609,
+            166,
-            250,
+            99,
             0,
             0,
-            609,
+            166,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -304.5,
+            -83,
-            -125,
+            -49.5,
             0
           ],
           "maxPos": [
-            304.5,
+            83,
-            125,
+            49.5,
             0
           ]
         },

assets/app-bundle/app-view/page/main/resources/s_sprite/main_btn_play.png.meta

@@ -11,7 +11,7 @@
     "6c48a": {
       "importer": "texture",
       "uuid": "fd3c5545-0fae-4f1c-8f7c-8309959a1a87@6c48a",
-      "displayName": "main_btn_play_bg",
+      "displayName": "main_btn_play",
       "id": "6c48a",
       "name": "texture",
       "userData": {
@@ -35,7 +35,7 @@
     "f9941": {
       "importer": "sprite-frame",
       "uuid": "fd3c5545-0fae-4f1c-8f7c-8309959a1a87@f9941",
-      "displayName": "main_btn_play_bg",
+      "displayName": "main_btn_play",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 609,
+        "width": 166,
-        "height": 250,
+        "height": 99,
-        "rawWidth": 609,
+        "rawWidth": 166,
-        "rawHeight": 250,
+        "rawHeight": 99,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -304.5,
+            -83,
-            -125,
+            -49.5,
             0,
-            304.5,
+            83,
-            -125,
+            -49.5,
             0,
-            -304.5,
+            -83,
-            125,
+            49.5,
             0,
-            304.5,
+            83,
-            125,
+            49.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            250,
+            99,
-            609,
+            166,
-            250,
+            99,
             0,
             0,
-            609,
+            166,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -304.5,
+            -83,
-            -125,
+            -49.5,
             0
           ],
           "maxPos": [
-            304.5,
+            83,
-            125,
+            49.5,
             0
           ]
         },

assets/app-bundle/app-view/page/main/resources/s_sprite/main_corner.png.meta

@@ -1,138 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "d4c00816-cde2-444d-a190-ccb95b5f28f5",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "d4c00816-cde2-444d-a190-ccb95b5f28f5@6c48a",
-      "displayName": "main_corner",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "d4c00816-cde2-444d-a190-ccb95b5f28f5",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "d4c00816-cde2-444d-a190-ccb95b5f28f5@f9941",
-      "displayName": "main_corner",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 169,
-        "height": 162,
-        "rawWidth": 169,
-        "rawHeight": 162,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -84.5,
-            -81,
-            0,
-            84.5,
-            -81,
-            0,
-            -84.5,
-            81,
-            0,
-            84.5,
-            81,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            162,
-            169,
-            162,
-            0,
-            0,
-            169,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -84.5,
-            -81,
-            0
-          ],
-          "maxPos": [
-            84.5,
-            81,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "d4c00816-cde2-444d-a190-ccb95b5f28f5@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "d4c00816-cde2-444d-a190-ccb95b5f28f5@6c48a",
-    "compressSettings": {
-      "useCompressTexture": true,
-      "presetId": "e1UHIKee1GRqns7LEix3IH"
-    }
-  }
-}

assets/app-bundle/app-view/page/main/resources/s_sprite/main_eff_flash.png.meta

@@ -129,6 +129,10 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "2b422e8e-3f0a-4660-8c10-5d60d2d3a7a7@6c48a"
+    "redirect": "2b422e8e-3f0a-4660-8c10-5d60d2d3a7a7@6c48a",
+    "compressSettings": {
+      "useCompressTexture": true,
+      "presetId": "e1UHIKee1GRqns7LEix3IH"
+    }
   }
 }

assets/app-bundle/app-view/page/main/resources/s_sprite/main_icon_add.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "664fe045-852c-4908-8ec1-f8883b03fb1e",
+  "uuid": "82bd16a6-ccc9-44b7-8be8-73aef85c9611",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "664fe045-852c-4908-8ec1-f8883b03fb1e@6c48a",
+      "uuid": "82bd16a6-ccc9-44b7-8be8-73aef85c9611@6c48a",
-      "displayName": "main_lab_off_en",
+      "displayName": "main_icon_add",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "664fe045-852c-4908-8ec1-f8883b03fb1e",
+        "imageUuidOrDatabaseUri": "82bd16a6-ccc9-44b7-8be8-73aef85c9611",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "664fe045-852c-4908-8ec1-f8883b03fb1e@f9941",
+      "uuid": "82bd16a6-ccc9-44b7-8be8-73aef85c9611@f9941",
-      "displayName": "main_lab_off_en",
+      "displayName": "main_icon_add",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 57,
+        "width": 78,
-        "height": 39,
+        "height": 85,
-        "rawWidth": 57,
+        "rawWidth": 78,
-        "rawHeight": 39,
+        "rawHeight": 85,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -28.5,
+            -39,
-            -19.5,
+            -42.5,
             0,
-            28.5,
+            39,
-            -19.5,
+            -42.5,
             0,
-            -28.5,
+            -39,
-            19.5,
+            42.5,
             0,
-            28.5,
+            39,
-            19.5,
+            42.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            39,
+            85,
-            57,
+            78,
-            39,
+            85,
             0,
             0,
-            57,
+            78,
             0
           ],
           "nuv": [
@@ -103,18 +103,18 @@
             1
           ],
           "minPos": [
-            -28.5,
+            -39,
-            -19.5,
+            -42.5,
             0
           ],
           "maxPos": [
-            28.5,
+            39,
-            19.5,
+            42.5,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "664fe045-852c-4908-8ec1-f8883b03fb1e@6c48a",
+        "imageUuidOrDatabaseUri": "82bd16a6-ccc9-44b7-8be8-73aef85c9611@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,7 +129,7 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "664fe045-852c-4908-8ec1-f8883b03fb1e@6c48a",
+    "redirect": "82bd16a6-ccc9-44b7-8be8-73aef85c9611@6c48a",
     "compressSettings": {
       "useCompressTexture": true,
       "presetId": "e1UHIKee1GRqns7LEix3IH"

assets/app-bundle/app-view/page/main/resources/s_sprite/main_icon_auto.png.meta

@@ -1,138 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "fa7af89f-7bdc-4b63-8875-6f5c4fb9949d",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "fa7af89f-7bdc-4b63-8875-6f5c4fb9949d@6c48a",
-      "displayName": "main_icon_auto",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "fa7af89f-7bdc-4b63-8875-6f5c4fb9949d",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "fa7af89f-7bdc-4b63-8875-6f5c4fb9949d@f9941",
-      "displayName": "main_icon_auto",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 74,
-        "height": 77,
-        "rawWidth": 74,
-        "rawHeight": 77,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -37,
-            -38.5,
-            0,
-            37,
-            -38.5,
-            0,
-            -37,
-            38.5,
-            0,
-            37,
-            38.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            77,
-            74,
-            77,
-            0,
-            0,
-            74,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -37,
-            -38.5,
-            0
-          ],
-          "maxPos": [
-            37,
-            38.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "fa7af89f-7bdc-4b63-8875-6f5c4fb9949d@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "fa7af89f-7bdc-4b63-8875-6f5c4fb9949d@6c48a",
-    "compressSettings": {
-      "useCompressTexture": true,
-      "presetId": "e1UHIKee1GRqns7LEix3IH"
-    }
-  }
-}

assets/app-bundle/app-view/page/main/resources/s_sprite/main_icon_sub.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "5c8221c4-26b6-48da-9f85-a49f47c52ea9",
+  "uuid": "1734d2ea-812c-48e7-942d-ce0b2f875bbe",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "5c8221c4-26b6-48da-9f85-a49f47c52ea9@6c48a",
+      "uuid": "1734d2ea-812c-48e7-942d-ce0b2f875bbe@6c48a",
-      "displayName": "main_icon_noauto",
+      "displayName": "main_icon_sub",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "5c8221c4-26b6-48da-9f85-a49f47c52ea9",
+        "imageUuidOrDatabaseUri": "1734d2ea-812c-48e7-942d-ce0b2f875bbe",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "5c8221c4-26b6-48da-9f85-a49f47c52ea9@f9941",
+      "uuid": "1734d2ea-812c-48e7-942d-ce0b2f875bbe@f9941",
-      "displayName": "main_icon_noauto",
+      "displayName": "main_icon_sub",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 74,
+        "width": 77,
-        "height": 77,
+        "height": 85,
-        "rawWidth": 74,
+        "rawWidth": 77,
-        "rawHeight": 77,
+        "rawHeight": 85,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -37,
             -38.5,
+            -42.5,
+            0,
+            38.5,
+            -42.5,
             0,
-            37,
             -38.5,
+            42.5,
             0,
-            -37,
-            38.5,
-            0,
-            37,
             38.5,
+            42.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
+            85,
             77,
-            74,
+            85,
-            77,
             0,
             0,
-            74,
+            77,
             0
           ],
           "nuv": [
@@ -103,18 +103,18 @@
             1
           ],
           "minPos": [
-            -37,
             -38.5,
+            -42.5,
             0
           ],
           "maxPos": [
-            37,
             38.5,
+            42.5,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "5c8221c4-26b6-48da-9f85-a49f47c52ea9@6c48a",
+        "imageUuidOrDatabaseUri": "1734d2ea-812c-48e7-942d-ce0b2f875bbe@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,7 +129,7 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "5c8221c4-26b6-48da-9f85-a49f47c52ea9@6c48a",
+    "redirect": "1734d2ea-812c-48e7-942d-ce0b2f875bbe@6c48a",
     "compressSettings": {
       "useCompressTexture": true,
       "presetId": "e1UHIKee1GRqns7LEix3IH"

assets/app-bundle/app-view/page/main/resources/s_sprite/main_lab_auto_en.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "cf565501-3d90-45da-b127-f04a922a5c59",
+  "uuid": "f9a676de-678e-4c75-9bc1-7a1475092c67",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "cf565501-3d90-45da-b127-f04a922a5c59@6c48a",
+      "uuid": "f9a676de-678e-4c75-9bc1-7a1475092c67@6c48a",
-      "displayName": "main_btn_buy",
+      "displayName": "main_lab_auto_en",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "cf565501-3d90-45da-b127-f04a922a5c59",
+        "imageUuidOrDatabaseUri": "f9a676de-678e-4c75-9bc1-7a1475092c67",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "cf565501-3d90-45da-b127-f04a922a5c59@f9941",
+      "uuid": "f9a676de-678e-4c75-9bc1-7a1475092c67@f9941",
-      "displayName": "main_btn_buy",
+      "displayName": "main_lab_auto_en",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 364,
+        "width": 117,
-        "height": 246,
+        "height": 40,
-        "rawWidth": 364,
+        "rawWidth": 117,
-        "rawHeight": 246,
+        "rawHeight": 40,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -182,
+            -58.5,
-            -123,
+            -20,
             0,
-            182,
+            58.5,
-            -123,
+            -20,
             0,
-            -182,
+            -58.5,
-            123,
+            20,
             0,
-            182,
+            58.5,
-            123,
+            20,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            246,
+            40,
-            364,
+            117,
-            246,
+            40,
             0,
             0,
-            364,
+            117,
             0
           ],
           "nuv": [
@@ -103,18 +103,18 @@
             1
           ],
           "minPos": [
-            -182,
+            -58.5,
-            -123,
+            -20,
             0
           ],
           "maxPos": [
-            182,
+            58.5,
-            123,
+            20,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "cf565501-3d90-45da-b127-f04a922a5c59@6c48a",
+        "imageUuidOrDatabaseUri": "f9a676de-678e-4c75-9bc1-7a1475092c67@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,7 +129,7 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "cf565501-3d90-45da-b127-f04a922a5c59@6c48a",
+    "redirect": "f9a676de-678e-4c75-9bc1-7a1475092c67@6c48a",
     "compressSettings": {
       "useCompressTexture": true,
       "presetId": "e1UHIKee1GRqns7LEix3IH"

assets/app-bundle/app-view/page/main/resources/s_sprite/main_lab_auto_zh.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "f98fd16c-c485-4196-a910-002c9bab6268",
+  "uuid": "e7236390-d7dc-421f-97b7-4f2feb20ed4a",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "f98fd16c-c485-4196-a910-002c9bab6268@6c48a",
+      "uuid": "e7236390-d7dc-421f-97b7-4f2feb20ed4a@6c48a",
-      "displayName": "main_lab_give1_en",
+      "displayName": "main_lab_auto_zh",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "f98fd16c-c485-4196-a910-002c9bab6268",
+        "imageUuidOrDatabaseUri": "e7236390-d7dc-421f-97b7-4f2feb20ed4a",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "f98fd16c-c485-4196-a910-002c9bab6268@f9941",
+      "uuid": "e7236390-d7dc-421f-97b7-4f2feb20ed4a@f9941",
-      "displayName": "main_lab_give1_en",
+      "displayName": "main_lab_auto_zh",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 103,
+        "width": 93,
-        "height": 102,
+        "height": 51,
-        "rawWidth": 103,
+        "rawWidth": 93,
-        "rawHeight": 102,
+        "rawHeight": 51,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -51.5,
+            -46.5,
-            -51,
+            -25.5,
             0,
-            51.5,
+            46.5,
-            -51,
+            -25.5,
             0,
-            -51.5,
+            -46.5,
-            51,
+            25.5,
             0,
-            51.5,
+            46.5,
-            51,
+            25.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            102,
+            51,
-            103,
+            93,
-            102,
+            51,
             0,
             0,
-            103,
+            93,
             0
           ],
           "nuv": [
@@ -103,18 +103,18 @@
             1
           ],
           "minPos": [
-            -51.5,
+            -46.5,
-            -51,
+            -25.5,
             0
           ],
           "maxPos": [
-            51.5,
+            46.5,
-            51,
+            25.5,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "f98fd16c-c485-4196-a910-002c9bab6268@6c48a",
+        "imageUuidOrDatabaseUri": "e7236390-d7dc-421f-97b7-4f2feb20ed4a@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,7 +129,7 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "f98fd16c-c485-4196-a910-002c9bab6268@6c48a",
+    "redirect": "e7236390-d7dc-421f-97b7-4f2feb20ed4a@6c48a",
     "compressSettings": {
       "useCompressTexture": true,
       "presetId": "e1UHIKee1GRqns7LEix3IH"

assets/app-bundle/app-view/page/main/resources/s_sprite/main_lab_five_en.png.meta

@@ -1,138 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "f41e5671-aabd-4d1d-80f2-44467d803b01",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "f41e5671-aabd-4d1d-80f2-44467d803b01@6c48a",
-      "displayName": "main_lab_five_en",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "f41e5671-aabd-4d1d-80f2-44467d803b01",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "f41e5671-aabd-4d1d-80f2-44467d803b01@f9941",
-      "displayName": "main_lab_five_en",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 205,
-        "height": 56,
-        "rawWidth": 205,
-        "rawHeight": 56,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -102.5,
-            -28,
-            0,
-            102.5,
-            -28,
-            0,
-            -102.5,
-            28,
-            0,
-            102.5,
-            28,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            56,
-            205,
-            56,
-            0,
-            0,
-            205,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -102.5,
-            -28,
-            0
-          ],
-          "maxPos": [
-            102.5,
-            28,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "f41e5671-aabd-4d1d-80f2-44467d803b01@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "f41e5671-aabd-4d1d-80f2-44467d803b01@6c48a",
-    "compressSettings": {
-      "useCompressTexture": true,
-      "presetId": "e1UHIKee1GRqns7LEix3IH"
-    }
-  }
-}

assets/app-bundle/app-view/page/main/resources/s_sprite/main_lab_five_zh.png.meta

@@ -1,138 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "714303f0-8531-4307-9931-a31cba6e3124",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "714303f0-8531-4307-9931-a31cba6e3124@6c48a",
-      "displayName": "main_lab_five_zh",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "714303f0-8531-4307-9931-a31cba6e3124",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "714303f0-8531-4307-9931-a31cba6e3124@f9941",
-      "displayName": "main_lab_five_zh",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 103,
-        "height": 61,
-        "rawWidth": 103,
-        "rawHeight": 61,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -51.5,
-            -30.5,
-            0,
-            51.5,
-            -30.5,
-            0,
-            -51.5,
-            30.5,
-            0,
-            51.5,
-            30.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            61,
-            103,
-            61,
-            0,
-            0,
-            103,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -51.5,
-            -30.5,
-            0
-          ],
-          "maxPos": [
-            51.5,
-            30.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "714303f0-8531-4307-9931-a31cba6e3124@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "714303f0-8531-4307-9931-a31cba6e3124@6c48a",
-    "compressSettings": {
-      "useCompressTexture": true,
-      "presetId": "e1UHIKee1GRqns7LEix3IH"
-    }
-  }
-}

assets/app-bundle/app-view/page/main/resources/s_sprite/main_lab_give1_zh.png.meta

@@ -1,138 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "ab9f0328-f300-4eee-8bb0-97ebfc0f769b",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "ab9f0328-f300-4eee-8bb0-97ebfc0f769b@6c48a",
-      "displayName": "main_lab_give1_zh",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "ab9f0328-f300-4eee-8bb0-97ebfc0f769b",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "ab9f0328-f300-4eee-8bb0-97ebfc0f769b@f9941",
-      "displayName": "main_lab_give1_zh",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 88,
-        "height": 87,
-        "rawWidth": 88,
-        "rawHeight": 87,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -44,
-            -43.5,
-            0,
-            44,
-            -43.5,
-            0,
-            -44,
-            43.5,
-            0,
-            44,
-            43.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            87,
-            88,
-            87,
-            0,
-            0,
-            88,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -44,
-            -43.5,
-            0
-          ],
-          "maxPos": [
-            44,
-            43.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "ab9f0328-f300-4eee-8bb0-97ebfc0f769b@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "ab9f0328-f300-4eee-8bb0-97ebfc0f769b@6c48a",
-    "compressSettings": {
-      "useCompressTexture": true,
-      "presetId": "e1UHIKee1GRqns7LEix3IH"
-    }
-  }
-}

assets/app-bundle/app-view/page/main/resources/s_sprite/main_lab_give3_en.png.meta

@@ -1,138 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "618c5d76-f870-4b18-b8ac-ce44042e0619",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "618c5d76-f870-4b18-b8ac-ce44042e0619@6c48a",
-      "displayName": "main_lab_give3_en",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "618c5d76-f870-4b18-b8ac-ce44042e0619",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "618c5d76-f870-4b18-b8ac-ce44042e0619@f9941",
-      "displayName": "main_lab_give3_en",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 105,
-        "height": 107,
-        "rawWidth": 105,
-        "rawHeight": 107,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -52.5,
-            -53.5,
-            0,
-            52.5,
-            -53.5,
-            0,
-            -52.5,
-            53.5,
-            0,
-            52.5,
-            53.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            107,
-            105,
-            107,
-            0,
-            0,
-            105,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -52.5,
-            -53.5,
-            0
-          ],
-          "maxPos": [
-            52.5,
-            53.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "618c5d76-f870-4b18-b8ac-ce44042e0619@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "618c5d76-f870-4b18-b8ac-ce44042e0619@6c48a",
-    "compressSettings": {
-      "useCompressTexture": true,
-      "presetId": "e1UHIKee1GRqns7LEix3IH"
-    }
-  }
-}

assets/app-bundle/app-view/page/main/resources/s_sprite/main_lab_give3_zh.png.meta

@@ -1,138 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "26ffb002-b023-42dc-b8ef-5b0812dff765",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "26ffb002-b023-42dc-b8ef-5b0812dff765@6c48a",
-      "displayName": "main_lab_give3_zh",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "26ffb002-b023-42dc-b8ef-5b0812dff765",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "26ffb002-b023-42dc-b8ef-5b0812dff765@f9941",
-      "displayName": "main_lab_give3_zh",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 90,
-        "height": 88,
-        "rawWidth": 90,
-        "rawHeight": 88,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -45,
-            -44,
-            0,
-            45,
-            -44,
-            0,
-            -45,
-            44,
-            0,
-            45,
-            44,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            88,
-            90,
-            88,
-            0,
-            0,
-            90,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -45,
-            -44,
-            0
-          ],
-          "maxPos": [
-            45,
-            44,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "26ffb002-b023-42dc-b8ef-5b0812dff765@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "26ffb002-b023-42dc-b8ef-5b0812dff765@6c48a",
-    "compressSettings": {
-      "useCompressTexture": true,
-      "presetId": "e1UHIKee1GRqns7LEix3IH"
-    }
-  }
-}

assets/app-bundle/app-view/page/main/resources/s_sprite/main_lab_one_en.png.meta

@@ -1,138 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "ca921c67-1f44-4073-bf60-80e59fe79785",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "ca921c67-1f44-4073-bf60-80e59fe79785@6c48a",
-      "displayName": "main_lab_one_en",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "ca921c67-1f44-4073-bf60-80e59fe79785",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "ca921c67-1f44-4073-bf60-80e59fe79785@f9941",
-      "displayName": "main_lab_one_en",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 172,
-        "height": 57,
-        "rawWidth": 172,
-        "rawHeight": 57,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -86,
-            -28.5,
-            0,
-            86,
-            -28.5,
-            0,
-            -86,
-            28.5,
-            0,
-            86,
-            28.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            57,
-            172,
-            57,
-            0,
-            0,
-            172,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -86,
-            -28.5,
-            0
-          ],
-          "maxPos": [
-            86,
-            28.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "ca921c67-1f44-4073-bf60-80e59fe79785@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "ca921c67-1f44-4073-bf60-80e59fe79785@6c48a",
-    "compressSettings": {
-      "useCompressTexture": true,
-      "presetId": "e1UHIKee1GRqns7LEix3IH"
-    }
-  }
-}

assets/app-bundle/app-view/page/main/resources/s_sprite/main_lab_one_zh.png.meta

@@ -1,138 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "8cbdf3a4-a921-42da-97b5-cdf9a2eb4a2c",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "8cbdf3a4-a921-42da-97b5-cdf9a2eb4a2c@6c48a",
-      "displayName": "main_lab_one_zh",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "8cbdf3a4-a921-42da-97b5-cdf9a2eb4a2c",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "8cbdf3a4-a921-42da-97b5-cdf9a2eb4a2c@f9941",
-      "displayName": "main_lab_one_zh",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 126,
-        "height": 61,
-        "rawWidth": 126,
-        "rawHeight": 61,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -63,
-            -30.5,
-            0,
-            63,
-            -30.5,
-            0,
-            -63,
-            30.5,
-            0,
-            63,
-            30.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            61,
-            126,
-            61,
-            0,
-            0,
-            126,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -63,
-            -30.5,
-            0
-          ],
-          "maxPos": [
-            63,
-            30.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "8cbdf3a4-a921-42da-97b5-cdf9a2eb4a2c@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "8cbdf3a4-a921-42da-97b5-cdf9a2eb4a2c@6c48a",
-    "compressSettings": {
-      "useCompressTexture": true,
-      "presetId": "e1UHIKee1GRqns7LEix3IH"
-    }
-  }
-}

assets/app-bundle/app-view/page/main/resources/s_sprite/main_lab_open_en.png.meta

@@ -1,138 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "a098300b-3636-4ca5-ba6f-6f184298d18c",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "a098300b-3636-4ca5-ba6f-6f184298d18c@6c48a",
-      "displayName": "main_lab_open_en",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "a098300b-3636-4ca5-ba6f-6f184298d18c",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "a098300b-3636-4ca5-ba6f-6f184298d18c@f9941",
-      "displayName": "main_lab_open_en",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 50,
-        "height": 29,
-        "rawWidth": 50,
-        "rawHeight": 29,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -25,
-            -14.5,
-            0,
-            25,
-            -14.5,
-            0,
-            -25,
-            14.5,
-            0,
-            25,
-            14.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            29,
-            50,
-            29,
-            0,
-            0,
-            50,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -25,
-            -14.5,
-            0
-          ],
-          "maxPos": [
-            25,
-            14.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "a098300b-3636-4ca5-ba6f-6f184298d18c@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "a098300b-3636-4ca5-ba6f-6f184298d18c@6c48a",
-    "compressSettings": {
-      "useCompressTexture": true,
-      "presetId": "e1UHIKee1GRqns7LEix3IH"
-    }
-  }
-}

assets/app-bundle/app-view/page/main/resources/s_sprite/main_lab_open_zh.png.meta

@@ -1,138 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "a826be4f-45a5-4c6f-a46b-26917a8821fb",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "a826be4f-45a5-4c6f-a46b-26917a8821fb@6c48a",
-      "displayName": "main_lab_open_zh",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "a826be4f-45a5-4c6f-a46b-26917a8821fb",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "a826be4f-45a5-4c6f-a46b-26917a8821fb@f9941",
-      "displayName": "main_lab_open_zh",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 41,
-        "height": 41,
-        "rawWidth": 41,
-        "rawHeight": 41,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -20.5,
-            -20.5,
-            0,
-            20.5,
-            -20.5,
-            0,
-            -20.5,
-            20.5,
-            0,
-            20.5,
-            20.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            41,
-            41,
-            41,
-            0,
-            0,
-            41,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -20.5,
-            -20.5,
-            0
-          ],
-          "maxPos": [
-            20.5,
-            20.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "a826be4f-45a5-4c6f-a46b-26917a8821fb@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "a826be4f-45a5-4c6f-a46b-26917a8821fb@6c48a",
-    "compressSettings": {
-      "useCompressTexture": true,
-      "presetId": "e1UHIKee1GRqns7LEix3IH"
-    }
-  }
-}

assets/app-bundle/app-view/page/main/resources/s_sprite/main_lab_play_en.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 264,
+        "width": 100,
-        "height": 81,
+        "height": 54,
-        "rawWidth": 264,
+        "rawWidth": 100,
-        "rawHeight": 81,
+        "rawHeight": 54,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -132,
+            -50,
-            -40.5,
+            -27,
             0,
-            132,
+            50,
-            -40.5,
+            -27,
             0,
-            -132,
+            -50,
-            40.5,
+            27,
             0,
-            132,
+            50,
-            40.5,
+            27,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            81,
+            54,
-            264,
+            100,
-            81,
+            54,
             0,
             0,
-            264,
+            100,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -132,
+            -50,
-            -40.5,
+            -27,
             0
           ],
           "maxPos": [
-            132,
+            50,
-            40.5,
+            27,
             0
           ]
         },

assets/app-bundle/app-view/page/main/resources/s_sprite/main_lab_play_zh.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 348,
+        "width": 99,
-        "height": 87,
+        "height": 52,
-        "rawWidth": 348,
+        "rawWidth": 99,
-        "rawHeight": 87,
+        "rawHeight": 52,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -174,
+            -49.5,
-            -43.5,
+            -26,
             0,
-            174,
+            49.5,
-            -43.5,
+            -26,
             0,
-            -174,
+            -49.5,
-            43.5,
+            26,
             0,
-            174,
+            49.5,
-            43.5,
+            26,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            87,
+            52,
-            348,
+            99,
-            87,
+            52,
             0,
             0,
-            348,
+            99,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -174,
+            -49.5,
-            -43.5,
+            -26,
             0
           ],
           "maxPos": [
-            174,
+            49.5,
-            43.5,
+            26,
             0
           ]
         },

assets/app-bundle/app-view/page/main/resources/s_sprite/main_lab_ten_en.png.meta

@@ -1,138 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "28e33aab-2abf-404f-8c17-0f842b7e4f66",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "28e33aab-2abf-404f-8c17-0f842b7e4f66@6c48a",
-      "displayName": "main_lab_ten_en",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "28e33aab-2abf-404f-8c17-0f842b7e4f66",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "28e33aab-2abf-404f-8c17-0f842b7e4f66@f9941",
-      "displayName": "main_lab_ten_en",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 227,
-        "height": 57,
-        "rawWidth": 227,
-        "rawHeight": 57,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -113.5,
-            -28.5,
-            0,
-            113.5,
-            -28.5,
-            0,
-            -113.5,
-            28.5,
-            0,
-            113.5,
-            28.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            57,
-            227,
-            57,
-            0,
-            0,
-            227,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -113.5,
-            -28.5,
-            0
-          ],
-          "maxPos": [
-            113.5,
-            28.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "28e33aab-2abf-404f-8c17-0f842b7e4f66@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "28e33aab-2abf-404f-8c17-0f842b7e4f66@6c48a",
-    "compressSettings": {
-      "useCompressTexture": true,
-      "presetId": "e1UHIKee1GRqns7LEix3IH"
-    }
-  }
-}

assets/app-bundle/app-view/page/main/resources/s_sprite/main_lab_ten_zh.png.meta

@@ -1,138 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "5ac27136-c63c-4b9b-800f-d4486be63275",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "5ac27136-c63c-4b9b-800f-d4486be63275@6c48a",
-      "displayName": "main_lab_ten_zh",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "5ac27136-c63c-4b9b-800f-d4486be63275",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "5ac27136-c63c-4b9b-800f-d4486be63275@f9941",
-      "displayName": "main_lab_ten_zh",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 136,
-        "height": 61,
-        "rawWidth": 136,
-        "rawHeight": 61,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -68,
-            -30.5,
-            0,
-            68,
-            -30.5,
-            0,
-            -68,
-            30.5,
-            0,
-            68,
-            30.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            61,
-            136,
-            61,
-            0,
-            0,
-            136,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -68,
-            -30.5,
-            0
-          ],
-          "maxPos": [
-            68,
-            30.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "5ac27136-c63c-4b9b-800f-d4486be63275@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "5ac27136-c63c-4b9b-800f-d4486be63275@6c48a",
-    "compressSettings": {
-      "useCompressTexture": true,
-      "presetId": "e1UHIKee1GRqns7LEix3IH"
-    }
-  }
-}

assets/app-bundle/app-view/page/main/resources/s_sprite/main_times_line.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "4bac3685-d90c-4eac-8ec2-7d2751061223",
+  "uuid": "918af30f-b239-4a3f-a61c-8d24543acdf0",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "4bac3685-d90c-4eac-8ec2-7d2751061223@6c48a",
+      "uuid": "918af30f-b239-4a3f-a61c-8d24543acdf0@6c48a",
-      "displayName": "main_bg_auto",
+      "displayName": "main_times_line",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "4bac3685-d90c-4eac-8ec2-7d2751061223",
+        "imageUuidOrDatabaseUri": "918af30f-b239-4a3f-a61c-8d24543acdf0",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "4bac3685-d90c-4eac-8ec2-7d2751061223@f9941",
+      "uuid": "918af30f-b239-4a3f-a61c-8d24543acdf0@f9941",
-      "displayName": "main_bg_auto",
+      "displayName": "main_times_line",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 152,
+        "width": 253,
-        "height": 82,
+        "height": 2,
-        "rawWidth": 152,
+        "rawWidth": 253,
-        "rawHeight": 82,
+        "rawHeight": 2,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -76,
+            -126.5,
-            -41,
+            -1,
             0,
-            76,
+            126.5,
-            -41,
+            -1,
             0,
-            -76,
+            -126.5,
-            41,
+            1,
             0,
-            76,
+            126.5,
-            41,
+            1,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            82,
+            2,
-            152,
+            253,
-            82,
+            2,
             0,
             0,
-            152,
+            253,
             0
           ],
           "nuv": [
@@ -103,18 +103,18 @@
             1
           ],
           "minPos": [
-            -76,
+            -126.5,
-            -41,
+            -1,
             0
           ],
           "maxPos": [
-            76,
+            126.5,
-            41,
+            1,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "4bac3685-d90c-4eac-8ec2-7d2751061223@6c48a",
+        "imageUuidOrDatabaseUri": "918af30f-b239-4a3f-a61c-8d24543acdf0@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,10 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "4bac3685-d90c-4eac-8ec2-7d2751061223@6c48a",
+    "redirect": "918af30f-b239-4a3f-a61c-8d24543acdf0@6c48a"
-    "compressSettings": {
-      "useCompressTexture": true,
-      "presetId": "e1UHIKee1GRqns7LEix3IH"
-    }
   }
 }

assets/app-bundle/app-view/page/rewardhistory/native/PageRewardhistory.ts

@@ -73,9 +73,9 @@ export class PageRewardhistory extends BaseView {
                 this.loadSprite(d.win_coin >= 0 ? "rehis_bg_get" : "rehis_bg_lost", item)
                 let lang_str = LANG_ENUM[LANG_SET.langIndex]
                 Tools.ActChild(item, "win_" + lang_str, d.win_coin > 0)
-                if (d.win_coin > 0) Tools.SetChildText(item, "win_" + lang_str + "/lab", Math.trunc(d.win_coin).toString()) 
+                if (d.win_coin > 0) Tools.SetChildText(item, "win_" + lang_str + "/lab", Math.abs(d.win_coin).toString()) 
                 Tools.ActChild(item, "lose_" + lang_str, d.win_coin < 0)
-                if (d.win_coin < 0) Tools.SetChildText(item, "lose_" + lang_str + "/lab", Math.abs(Math.trunc(d.win_coin)).toString())
+                if (d.win_coin < 0) Tools.SetChildText(item, "lose_" + lang_str + "/lab", Math.abs(d.win_coin).toString())
                 Tools.ActChild(item, "more", d.win_coin == 0)
                 Tools.SetChildText(item, "time", d.create_time) 
             }

assets/res-native/font/font_coin_add.fnt

@@ -4,12 +4,12 @@ page id=0 file="font_coin_add.png"
 chars count=12
 char id=57 x=0 y=0 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15
 char id=53 x=111 y=0 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15
-char id=52 x=222 y=0 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15
+char id=46 x=222 y=0 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15
-char id=45 x=0 y=134 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15
+char id=52 x=0 y=134 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15
-char id=56 x=111 y=134 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15
+char id=45 x=111 y=134 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15
-char id=54 x=222 y=134 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15
+char id=56 x=222 y=134 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15
-char id=55 x=333 y=0 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15
+char id=54 x=333 y=0 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15
-char id=43 x=333 y=134 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15
+char id=55 x=333 y=134 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15
 char id=51 x=0 y=268 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15
 char id=50 x=111 y=268 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15
 char id=49 x=222 y=268 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15

assets/res-native/font/font_coin_add.fnt.meta

@@ -13,9 +13,9 @@
       "fontSize": 133,
       "atlasName": "font_coin_add.png",
       "fontDefDictionary": {
-        "43": {
+        "45": {
           "rect": {
-            "x": 333,
+            "x": 111,
             "y": 134,
             "width": 110,
             "height": 133
@@ -24,10 +24,10 @@
           "yOffset": 0,
           "xAdvance": 110
         },
-        "45": {
+        "46": {
           "rect": {
-            "x": 0,
+            "x": 222,
-            "y": 134,
+            "y": 0,
             "width": 110,
             "height": 133
           },
@@ -81,8 +81,8 @@
         },
         "52": {
           "rect": {
-            "x": 222,
+            "x": 0,
-            "y": 0,
+            "y": 134,
             "width": 110,
             "height": 133
           },
@@ -103,8 +103,8 @@
         },
         "54": {
           "rect": {
-            "x": 222,
+            "x": 333,
-            "y": 134,
+            "y": 0,
             "width": 110,
             "height": 133
           },
@@ -115,7 +115,7 @@
         "55": {
           "rect": {
             "x": 333,
-            "y": 0,
+            "y": 134,
             "width": 110,
             "height": 133
           },
@@ -125,7 +125,7 @@
         },
         "56": {
           "rect": {
-            "x": 111,
+            "x": 222,
             "y": 134,
             "width": 110,
             "height": 133

assets/res-native/font/font_coin_add.png.meta

@@ -42,11 +42,11 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": 0.5,
+        "offsetX": -0.5,
         "offsetY": -0.5,
-        "trimX": 2,
+        "trimX": 0,
         "trimY": 2,
-        "width": 441,
+        "width": 443,
         "height": 399,
         "rawWidth": 444,
         "rawHeight": 402,
@@ -61,16 +61,16 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -220.5,
+            -221.5,
             -199.5,
             0,
-            220.5,
+            221.5,
             -199.5,
             0,
-            -220.5,
+            -221.5,
             199.5,
             0,
-            220.5,
+            221.5,
             199.5,
             0
           ],
@@ -83,32 +83,32 @@
             3
           ],
           "uv": [
-            2,
+            0,
             400,
             443,
             400,
-            2,
+            0,
             1,
             443,
             1
           ],
           "nuv": [
-            0.0045045045045045045,
+            0,
             0.0024875621890547263,
             0.9977477477477478,
             0.0024875621890547263,
-            0.0045045045045045045,
+            0,
             0.9950248756218906,
             0.9977477477477478,
             0.9950248756218906
           ],
           "minPos": [
-            -220.5,
+            -221.5,
             -199.5,
             0
           ],
           "maxPos": [
-            220.5,
+            221.5,
             199.5,
             0
           ]

assets/res-native/font/font_coin_sub.fnt

@@ -7,9 +7,9 @@ char id=53 x=85 y=0 width=84 height=100 xoffset=0 yoffset=0 xadvance=84 page=0 c
 char id=56 x=170 y=0 width=84 height=100 xoffset=0 yoffset=0 xadvance=84 page=0 chnl=15
 char id=51 x=0 y=101 width=84 height=100 xoffset=0 yoffset=0 xadvance=84 page=0 chnl=15
 char id=43 x=85 y=101 width=84 height=100 xoffset=0 yoffset=0 xadvance=84 page=0 chnl=15
-char id=49 x=170 y=101 width=84 height=100 xoffset=0 yoffset=0 xadvance=84 page=0 chnl=15
+char id=46 x=170 y=101 width=84 height=100 xoffset=0 yoffset=0 xadvance=84 page=0 chnl=15
-char id=55 x=255 y=0 width=84 height=100 xoffset=0 yoffset=0 xadvance=84 page=0 chnl=15
+char id=49 x=255 y=0 width=84 height=100 xoffset=0 yoffset=0 xadvance=84 page=0 chnl=15
-char id=45 x=255 y=101 width=84 height=100 xoffset=0 yoffset=0 xadvance=84 page=0 chnl=15
+char id=55 x=255 y=101 width=84 height=100 xoffset=0 yoffset=0 xadvance=84 page=0 chnl=15
 char id=48 x=0 y=202 width=84 height=100 xoffset=0 yoffset=0 xadvance=84 page=0 chnl=15
 char id=57 x=85 y=202 width=84 height=100 xoffset=0 yoffset=0 xadvance=84 page=0 chnl=15
 char id=50 x=170 y=202 width=84 height=100 xoffset=0 yoffset=0 xadvance=84 page=0 chnl=15

assets/res-native/font/font_coin_sub.fnt.meta

@@ -24,9 +24,9 @@
           "yOffset": 0,
           "xAdvance": 84
         },
-        "45": {
+        "46": {
           "rect": {
-            "x": 255,
+            "x": 170,
             "y": 101,
             "width": 84,
             "height": 100
@@ -48,8 +48,8 @@
         },
         "49": {
           "rect": {
-            "x": 170,
+            "x": 255,
-            "y": 101,
+            "y": 0,
             "width": 84,
             "height": 100
           },
@@ -115,7 +115,7 @@
         "55": {
           "rect": {
             "x": 255,
-            "y": 0,
+            "y": 101,
             "width": 84,
             "height": 100
           },

assets/res-native/font/font_coin_sub.png.meta

@@ -42,11 +42,11 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": 0,
+        "offsetX": -0.5,
         "offsetY": 0.5,
         "trimX": 1,
         "trimY": 0,
-        "width": 338,
+        "width": 337,
         "height": 302,
         "rawWidth": 340,
         "rawHeight": 303,
@@ -61,16 +61,16 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -169,
+            -168.5,
             -151,
             0,
-            169,
+            168.5,
             -151,
             0,
-            -169,
+            -168.5,
             151,
             0,
-            169,
+            168.5,
             151,
             0
           ],
@@ -85,30 +85,30 @@
           "uv": [
             1,
             303,
-            339,
+            338,
             303,
             1,
             1,
-            339,
+            338,
             1
           ],
           "nuv": [
             0.0029411764705882353,
             0.0033003300330033004,
-            0.9970588235294118,
+            0.9941176470588236,
             0.0033003300330033004,
             0.0029411764705882353,
             1,
-            0.9970588235294118,
+            0.9941176470588236,
             1
           ],
           "minPos": [
-            -169,
+            -168.5,
             -151,
             0
           ],
           "maxPos": [
-            169,
+            168.5,
             151,
             0
           ]

assets/res-native/font/font_main_rw.fnt

@@ -1,7 +1,7 @@
 info face="face" size=58
 common lineHeight=58 scaleW=188 scaleH=177 pages=1
 page id=0 file="font_main_rw.png"
-chars count=10
+chars count=11
 char id=53 x=0 y=0 width=46 height=58 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15
 char id=48 x=47 y=0 width=46 height=58 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15
 char id=52 x=94 y=0 width=46 height=58 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15
@@ -10,5 +10,6 @@ char id=49 x=47 y=59 width=46 height=58 xoffset=0 yoffset=0 xadvance=46 page=0 c
 char id=57 x=94 y=59 width=46 height=58 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15
 char id=51 x=141 y=0 width=46 height=58 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15
 char id=54 x=141 y=59 width=46 height=58 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15
-char id=50 x=0 y=118 width=46 height=58 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15
+char id=46 x=0 y=118 width=46 height=58 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15
-char id=56 x=47 y=118 width=46 height=58 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15
+char id=50 x=47 y=118 width=46 height=58 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15
+char id=56 x=94 y=118 width=46 height=58 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15

assets/res-native/font/font_main_rw.fnt.meta

@@ -13,6 +13,17 @@
       "fontSize": 58,
       "atlasName": "font_main_rw.png",
       "fontDefDictionary": {
+        "46": {
+          "rect": {
+            "x": 0,
+            "y": 118,
+            "width": 46,
+            "height": 58
+          },
+          "xOffset": 0,
+          "yOffset": 0,
+          "xAdvance": 46
+        },
         "48": {
           "rect": {
             "x": 47,
@@ -37,7 +48,7 @@
         },
         "50": {
           "rect": {
-            "x": 0,
+            "x": 47,
             "y": 118,
             "width": 46,
             "height": 58
@@ -103,7 +114,7 @@
         },
         "56": {
           "rect": {
-            "x": 47,
+            "x": 94,
             "y": 118,
             "width": 46,
             "height": 58

assets/res-native/font/font_rehis_lose.fnt

@@ -1,14 +1,15 @@
 info face="face" size=62
 common lineHeight=62 scaleW=204 scaleH=188 pages=1
 page id=0 file="font_rehis_lose.png"
-chars count=10
+chars count=11
 char id=53 x=53 y=63 width=50 height=61 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
 char id=57 x=104 y=0 width=49 height=62 xoffset=0 yoffset=0 xadvance=49 page=0 chnl=15
-char id=52 x=50 y=125 width=50 height=60 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
+char id=52 x=100 y=125 width=50 height=60 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
 char id=54 x=154 y=0 width=49 height=62 xoffset=0 yoffset=0 xadvance=49 page=0 chnl=15
 char id=55 x=154 y=63 width=47 height=59 xoffset=0 yoffset=0 xadvance=47 page=0 chnl=15
 char id=50 x=0 y=0 width=52 height=61 xoffset=0 yoffset=0 xadvance=52 page=0 chnl=15
 char id=51 x=0 y=62 width=50 height=62 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
 char id=56 x=53 y=0 width=50 height=62 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
-char id=48 x=0 y=125 width=49 height=62 xoffset=0 yoffset=0 xadvance=49 page=0 chnl=15
+char id=46 x=0 y=125 width=49 height=62 xoffset=0 yoffset=0 xadvance=49 page=0 chnl=15
+char id=48 x=50 y=125 width=49 height=62 xoffset=0 yoffset=0 xadvance=49 page=0 chnl=15
 char id=49 x=104 y=63 width=40 height=60 xoffset=0 yoffset=0 xadvance=40 page=0 chnl=15

assets/res-native/font/font_rehis_lose.fnt.meta

@@ -13,7 +13,7 @@
       "fontSize": 62,
       "atlasName": "font_rehis_lose.png",
       "fontDefDictionary": {
-        "48": {
+        "46": {
           "rect": {
             "x": 0,
             "y": 125,
@@ -24,6 +24,17 @@
           "yOffset": 0,
           "xAdvance": 49
         },
+        "48": {
+          "rect": {
+            "x": 50,
+            "y": 125,
+            "width": 49,
+            "height": 62
+          },
+          "xOffset": 0,
+          "yOffset": 0,
+          "xAdvance": 49
+        },
         "49": {
           "rect": {
             "x": 104,
@@ -59,7 +70,7 @@
         },
         "52": {
           "rect": {
-            "x": 50,
+            "x": 100,
             "y": 125,
             "width": 50,
             "height": 60

assets/res-native/font/font_rehis_win.fnt

@@ -1,7 +1,7 @@
 info face="face" size=60
 common lineHeight=60 scaleW=204 scaleH=183 pages=1
 page id=0 file="font_rehis_win.png"
-chars count=10
+chars count=11
 char id=56 x=0 y=0 width=50 height=60 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
 char id=51 x=51 y=0 width=50 height=60 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
 char id=53 x=102 y=0 width=50 height=60 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
@@ -9,6 +9,7 @@ char id=50 x=0 y=61 width=50 height=60 xoffset=0 yoffset=0 xadvance=50 page=0 ch
 char id=55 x=51 y=61 width=50 height=60 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
 char id=52 x=102 y=61 width=50 height=60 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
 char id=48 x=153 y=0 width=50 height=60 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
-char id=57 x=153 y=61 width=50 height=60 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
+char id=46 x=153 y=61 width=50 height=60 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
-char id=49 x=0 y=122 width=50 height=60 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
+char id=57 x=0 y=122 width=50 height=60 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
-char id=54 x=51 y=122 width=50 height=60 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
+char id=49 x=51 y=122 width=50 height=60 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
+char id=54 x=102 y=122 width=50 height=60 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15

assets/res-native/font/font_rehis_win.fnt.meta

@@ -13,6 +13,17 @@
       "fontSize": 60,
       "atlasName": "font_rehis_win.png",
       "fontDefDictionary": {
+        "46": {
+          "rect": {
+            "x": 153,
+            "y": 61,
+            "width": 50,
+            "height": 60
+          },
+          "xOffset": 0,
+          "yOffset": 0,
+          "xAdvance": 50
+        },
         "48": {
           "rect": {
             "x": 153,
@@ -26,7 +37,7 @@
         },
         "49": {
           "rect": {
-            "x": 0,
+            "x": 51,
             "y": 122,
             "width": 50,
             "height": 60
@@ -81,7 +92,7 @@
         },
         "54": {
           "rect": {
-            "x": 51,
+            "x": 102,
             "y": 122,
             "width": 50,
             "height": 60
@@ -114,8 +125,8 @@
         },
         "57": {
           "rect": {
-            "x": 153,
+            "x": 0,
-            "y": 61,
+            "y": 122,
             "width": 50,
             "height": 60
           },

assets/res-native/font/font_rehis_win.png.meta

@@ -42,11 +42,11 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": -1,
+        "offsetX": -1.5,
         "offsetY": 0.5,
         "trimX": 0,
         "trimY": 0,
-        "width": 202,
+        "width": 201,
         "height": 182,
         "rawWidth": 204,
         "rawHeight": 183,
@@ -61,16 +61,16 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -101,
+            -100.5,
             -91,
             0,
-            101,
+            100.5,
             -91,
             0,
-            -101,
+            -100.5,
             91,
             0,
-            101,
+            100.5,
             91,
             0
           ],
@@ -85,30 +85,30 @@
           "uv": [
             0,
             183,
-            202,
+            201,
             183,
             0,
             1,
-            202,
+            201,
             1
           ],
           "nuv": [
             0,
             0.00546448087431694,
-            0.9901960784313726,
+            0.9852941176470589,
             0.00546448087431694,
             0,
             1,
-            0.9901960784313726,
+            0.9852941176470589,
             1
           ],
           "minPos": [
-            -101,
+            -100.5,
             -91,
             0
           ],
           "maxPos": [
-            101,
+            100.5,
             91,
             0
           ]

assets/res-native/setting/ServerConfig.ts

@@ -1,13 +1,13 @@
 /** 服务区域 */
 export const enum SERVER_EREA {
-    // 一级棒横版
+    V1 = 0,
-    ZP = 0,
+    V2 = 1,
 }
 /** 当前服务区域配置(根据打包修改) */
-export const NOW_SERVER_EREA : SERVER_EREA = SERVER_EREA.ZP;
+export const NOW_SERVER_EREA : SERVER_EREA = SERVER_EREA.V2;
 
 // 默认地址
-const DEFAULT_URL = "https://dice-api.yuliao666.top"
+const DEFAULT_URL = "https://dice-v3-api.yuliao666.top"
 /** 通用版本 */
 const DEFAULT_VERSION = "1.0.5"
 /** 测试服版本号 */
@@ -15,9 +15,14 @@ const DEFAULT_TEST_VERSION = "1.0.0"
 
 /** 区域打包配置文件 */
 const SERVER_CONFIG = {
-    // 横版一级棒
     [0] : {
-        "server" : DEFAULT_URL,
+        "server" : "https://dice-game.yuliao666.top",
+        "site_id" : "ba5ea4dc-75bb-438d-8a3a-b8031ef89426",
+        "ver" : DEFAULT_TEST_VERSION,
+        "area" : "86",
+    },
+    [1] : {
+        "server" : "https://dice-v3-api.yuliao666.top",
         "site_id" : "ba5ea4dc-75bb-438d-8a3a-b8031ef89426",
         "ver" : DEFAULT_TEST_VERSION,
         "area" : "86",