bug修复

assets/resources/module/redBagCash/redBagCashItem.prefab

@@ -27,29 +27,29 @@
         "__id__": 12
       },
       {
-        "__id__": 20
+        "__id__": 21
       },
       {
-        "__id__": 23
+        "__id__": 24
       },
       {
-        "__id__": 32
+        "__id__": 33
       },
       {
-        "__id__": 47
+        "__id__": 48
       },
       {
-        "__id__": 50
+        "__id__": 51
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 53
+        "__id__": 54
       }
     ],
     "_prefab": {
-      "__id__": 54
+      "__id__": 55
     },
     "_opacity": 255,
     "_color": {
@@ -469,7 +469,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 19
+      "__id__": 20
     },
     "_opacity": 255,
     "_color": {
@@ -693,7 +693,11 @@
     "_grayMaterial": null,
     "duration": 0.1,
     "zoomScale": 1.2,
-    "clickEvents": [],
+    "clickEvents": [
+      {
+        "__id__": 19
+      }
+    ],
     "_N$interactable": true,
     "_N$enableAutoGrayEffect": false,
     "_N$transition": 3,
@@ -752,6 +756,16 @@
     "_id": ""
   },
   {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "822d4j21VlIxbq9rYxSGSQQ",
+    "handler": "clickCashOP",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -773,11 +787,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 21
+        "__id__": 22
       }
     ],
     "_prefab": {
-      "__id__": 22
+      "__id__": 23
     },
     "_opacity": 255,
     "_color": {
@@ -831,7 +845,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 20
+      "__id__": 21
     },
     "_enabled": true,
     "_materials": [
@@ -878,20 +892,20 @@
     },
     "_children": [
       {
-        "__id__": 24
+        "__id__": 25
       },
       {
-        "__id__": 27
+        "__id__": 28
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 30
+        "__id__": 31
       }
     ],
     "_prefab": {
-      "__id__": 31
+      "__id__": 32
     },
     "_opacity": 255,
     "_color": {
@@ -945,17 +959,17 @@
     "_name": "毛币框",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 23
+      "__id__": 24
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 25
+        "__id__": 26
       }
     ],
     "_prefab": {
-      "__id__": 26
+      "__id__": 27
     },
     "_opacity": 255,
     "_color": {
@@ -1009,7 +1023,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 24
+      "__id__": 25
     },
     "_enabled": true,
     "_materials": [
@@ -1052,17 +1066,17 @@
     "_name": "毛币数量",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 23
+      "__id__": 24
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 28
+        "__id__": 29
       }
     ],
     "_prefab": {
-      "__id__": 29
+      "__id__": 30
     },
     "_opacity": 255,
     "_color": {
@@ -1116,7 +1130,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 27
+      "__id__": 28
     },
     "_enabled": true,
     "_materials": [
@@ -1162,7 +1176,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 23
+      "__id__": 24
     },
     "_enabled": true,
     "_materials": [
@@ -1209,23 +1223,23 @@
     },
     "_children": [
       {
-        "__id__": 33
+        "__id__": 34
       },
       {
-        "__id__": 37
+        "__id__": 38
       },
       {
-        "__id__": 41
+        "__id__": 42
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 45
+        "__id__": 46
       }
     ],
     "_prefab": {
-      "__id__": 46
+      "__id__": 47
     },
     "_opacity": 255,
     "_color": {
@@ -1279,20 +1293,20 @@
     "_name": "消耗",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 32
+      "__id__": 33
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 34
+        "__id__": 35
       },
       {
-        "__id__": 35
+        "__id__": 36
       }
     ],
     "_prefab": {
-      "__id__": 36
+      "__id__": 37
     },
     "_opacity": 255,
     "_color": {
@@ -1346,7 +1360,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 33
+      "__id__": 34
     },
     "_enabled": true,
     "_materials": [
@@ -1381,7 +1395,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 33
+      "__id__": 34
     },
     "_enabled": true,
     "_color": {
@@ -1410,20 +1424,20 @@
     "_name": "红包数量",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 32
+      "__id__": 33
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 38
+        "__id__": 39
       },
       {
-        "__id__": 39
+        "__id__": 40
       }
     ],
     "_prefab": {
-      "__id__": 40
+      "__id__": 41
     },
     "_opacity": 255,
     "_color": {
@@ -1477,7 +1491,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 37
+      "__id__": 38
     },
     "_enabled": true,
     "_materials": [
@@ -1512,7 +1526,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 37
+      "__id__": 38
     },
     "_enabled": true,
     "_color": {
@@ -1541,20 +1555,20 @@
     "_name": "红包券",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 32
+      "__id__": 33
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 42
+        "__id__": 43
       },
       {
-        "__id__": 43
+        "__id__": 44
       }
     ],
     "_prefab": {
-      "__id__": 44
+      "__id__": 45
     },
     "_opacity": 255,
     "_color": {
@@ -1608,7 +1622,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 41
+      "__id__": 42
     },
     "_enabled": true,
     "_materials": [
@@ -1643,7 +1657,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 41
+      "__id__": 42
     },
     "_enabled": true,
     "_color": {
@@ -1672,7 +1686,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 32
+      "__id__": 33
     },
     "_enabled": true,
     "_layoutSize": {
@@ -1721,11 +1735,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 48
+        "__id__": 49
       }
     ],
     "_prefab": {
-      "__id__": 49
+      "__id__": 50
     },
     "_opacity": 255,
     "_color": {
@@ -1779,7 +1793,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 47
+      "__id__": 48
     },
     "_enabled": true,
     "_materials": [
@@ -1828,11 +1842,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 51
+        "__id__": 52
       }
     ],
     "_prefab": {
-      "__id__": 52
+      "__id__": 53
     },
     "_opacity": 255,
     "_color": {
@@ -1886,7 +1900,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 50
+      "__id__": 51
     },
     "_enabled": true,
     "_materials": [
@@ -1936,7 +1950,7 @@
     },
     "_enabled": true,
     "node_none": {
-      "__id__": 20
+      "__id__": 21
     },
     "node_lock": {
       "__id__": 5
@@ -1945,10 +1959,10 @@
       "__id__": 12
     },
     "lbl_red_value": {
-      "__id__": 38
+      "__id__": 39
     },
     "lbl_rmb_value": {
-      "__id__": 28
+      "__id__": 29
     },
     "_id": ""
   },

assets/script/game/data/GameData.ts

@@ -203,6 +203,8 @@ type PlayerInfoType = {
     piggyBankCashTimes: number,
     /** 累计存钱罐每日提现次数 */
     totalPiggyBankCashTimes: number,
+    /** 提现进度 */
+    cashIndex: number,
     /** 上次登录时间 */
     lastTime: number,
     /** 登录天数 */

assets/script/game/data/module/RedBagCashData.ts

@@ -13,17 +13,17 @@ export class RedBagCashData extends Data {
      */
     public init() {
         // 签到配置表
-        this.initCData();
-        if (gData.gameData.configs.cashcfg) {
-            gData.gameData.configs.cashcfg.forEach(item_data => {
+        if (gData.gameData.configs.CashCfg) {
+            gData.gameData.configs.CashCfg.forEach(item_data => {
                 for (const key in item_data) {
                     item_data[key] = parseInt(item_data[key])
                 }
             });
-            this.c_data = gData.gameData.configs.cashcfg;
+            this.c_data = gData.gameData.configs.CashCfg;
             this.init_list = true;
         }
         this.cash_bar = gData.gameData.getProp(GameProp.redBag_cash_bar);
+        // this.cash_bar = gData.gameData.gameData.cashIndex;// 服务端数据
     }
     /** 标志位：初始化列表 */
     public init_list: boolean = false;
@@ -43,28 +43,28 @@ export class RedBagCashData extends Data {
         gData.gameData.setProp(GameProp.redBag_cash_bar, this.cash_bar);
     }
 
-    /** 客户端造的假数据 */
-    private initCData() {
-        for (let i = 0; i < 20; i++) {
-            const id = i + 1;
-            let obj = {
-                index: id,
-                /** 毛币数量？ */
-                money: id,
-                /** 红包数量 */
-                type_value: id * 10000,
-                time: id,
-                directVideoTime: id,
-                delayVideoTimes: id,
-                money_type: id,
-                num: id,
-                moneyshow: id,
-                summoney: id
-            };
-            this.c_data.push(obj)
-        }
-        this.init_list = true;
-    }
+    // /** 客户端造的假数据 */
+    // private initCData() {
+    //     for (let i = 0; i < 20; i++) {
+    //         const id = i + 1;
+    //         let obj = {
+    //             index: id,
+    //             /** 毛币数量？ */
+    //             money: id,
+    //             /** 红包数量 */
+    //             type_value: id * 1000,
+    //             time: id,
+    //             directVideoTime: id,
+    //             delayVideoTimes: id,
+    //             money_type: id,
+    //             num: id,
+    //             moneyshow: id,
+    //             summoney: id
+    //         };
+    //         this.c_data.push(obj)
+    //     }
+    //     this.init_list = true;
+    // }
 }
 /** 配置表数据内容 */
 export type CDataType = {

assets/script/game/data/module/SignData.ts

@@ -18,7 +18,6 @@ export class SignData extends Data {
                 }
             });
             this.c_sign = gData.gameData.configs.SignIn;
-            this.init_list = true;
         }
         // 服务端数据不对
         // this.sign_last_bar = gData.gameData.gameData.signInDay;
@@ -31,8 +30,6 @@ export class SignData extends Data {
 
     /** 标志位：是否需要刷新数据 */
     public init_data: boolean = false;
-    /** 标志位：是否初始化配置列表 */
-    public init_list: boolean = false;
 
     /** 配置数据 签到 */
     private _c_sign: Array<CSignType> = [];

assets/script/game/module/module/redBagCash/RedBagCash.ts

@@ -18,6 +18,7 @@ export default class RedBagCash extends cc.Component {
 
     private tableview: TableView = null;
     onLoad() {
+        gData.gameData.gameData.redMoney = 3200
         this.tableview = this.sroll_view.getComponent('TableView');
     }
 

assets/script/game/module/module/redBagCash/RedBagCashItem.ts

@@ -44,7 +44,9 @@ export default class RedBagCashItem extends cc.Component {
     private initStyle(item_data) {
         this.item_data = item_data;
         this.lbl_red_value.string = `${this.item_data.type_value}`;
-        this.lbl_rmb_value.string = this.item_data.money + '元';
+        let rmb_value = this.item_data.money / 100;
+        rmb_value = rmb_value > 1 ? rmb_value : parseFloat(rmb_value.toFixed(2))
+        this.lbl_rmb_value.string = rmb_value + '元';
 
         if (this.item_data.index <= gData.redBagCash.cash_bar) {
             // 已提现
@@ -75,6 +77,7 @@ export default class RedBagCashItem extends cc.Component {
             mk.tip.pop('请按顺序提现');
             return;
         }
+        cc.log('提现成功')
         gData.redBagCash.cashOP();
     }
 

assets/script/game/module/module/sign/Sign.ts

@@ -31,6 +31,7 @@ export default class Sign extends cc.Component {
         // gData.sign.sign_can = gData.gameData.getProp(GameProp.sign_can);
         gData.sign.initListData();
         gData.sign.init_data = true;
+        this.initScollView();
     }
 
     /**
@@ -52,11 +53,6 @@ export default class Sign extends cc.Component {
             this.initBtnStyle();
             return;
         }
-        if (gData.sign.init_list) {
-            gData.sign.init_list = false;
-            this.initScollView();
-            return;
-        }
         if (gData.sign.adData) {
             // 展示奖励
             this.getReward();