1

assets/resources/module/newCashUI/walletCashOut.prefab

@@ -1127,7 +1127,7 @@
     "asset": {
       "__uuid__": "e3718e3b-b05d-4d23-9195-924548d5c740"
     },
-    "fileId": "5dZrIAabhKH7LusaNbKGvt",
+    "fileId": "57eRgVAtlLpa1rFIHLkeXe",
     "sync": false
   },
   {
@@ -1336,7 +1336,7 @@
     "asset": {
       "__uuid__": "e3718e3b-b05d-4d23-9195-924548d5c740"
     },
-    "fileId": "1dmnQbt/5FMr+tT+wPmmBX",
+    "fileId": "cbdOL7iRdOapNG7lYMfyVV",
     "sync": false
   },
   {

assets/resources/module/newNotice/newNotice.prefab

@@ -24,20 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 62
+        "__id__": 65
       },
       {
-        "__id__": 63
+        "__id__": 66
       },
       {
-        "__id__": 64
+        "__id__": 67
       },
       {
-        "__id__": 65
+        "__id__": 68
       }
     ],
     "_prefab": {
-      "__id__": 66
+      "__id__": 69
     },
     "_opacity": 255,
     "_color": {
@@ -107,32 +107,29 @@
         "__id__": 20
       },
       {
-        "__id__": 23
+        "__id__": 29
       },
       {
-        "__id__": 26
+        "__id__": 35
       },
       {
-        "__id__": 32
+        "__id__": 41
       },
       {
-        "__id__": 38
+        "__id__": 47
       },
       {
-        "__id__": 44
-      },
-      {
-        "__id__": 50
+        "__id__": 53
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 60
+        "__id__": 63
       }
     ],
     "_prefab": {
-      "__id__": 61
+      "__id__": 64
     },
     "_opacity": 255,
     "_color": {
@@ -759,20 +756,91 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "提现金额",
+    "_name": "New Node",
     "_objFlags": 0,
     "_parent": {
       "__id__": 2
     },
+    "_children": [
+      {
+        "__id__": 21
+      },
+      {
+        "__id__": 24
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 27
+      }
+    ],
+    "_prefab": {
+      "__id__": 28
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 220.7,
+      "height": 50
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "New Label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 20
+    },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 21
+        "__id__": 22
       }
     ],
     "_prefab": {
-      "__id__": 22
+      "__id__": 23
     },
     "_opacity": 255,
     "_color": {
@@ -784,8 +852,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 111.21,
-      "height": 100.8
+      "width": 60,
+      "height": 50.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -796,8 +864,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -32,
-        -8.093000000000004,
+        -110.35,
+        9.907,
         0,
         0,
         0,
@@ -826,7 +894,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 20
+      "__id__": 21
     },
     "_enabled": true,
     "_materials": [
@@ -836,16 +904,16 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "0.3",
-    "_N$string": "0.3",
-    "_fontSize": 80,
-    "_lineHeight": 80,
+    "_string": "￥",
+    "_N$string": "￥",
+    "_fontSize": 60,
+    "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 1,
+    "_styleFlags": 0,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -862,25 +930,25 @@
     "asset": {
       "__uuid__": "72481e4b-bb87-4bc0-9455-9c0f34848370"
     },
-    "fileId": "f0d872Y4BOrrdNwMdq022v",
+    "fileId": "abMsSWrgJEkqKVR1otjQC4",
     "sync": false
   },
   {
     "__type__": "cc.Node",
-    "_name": "New Label",
+    "_name": "提现金额",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 20
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 24
+        "__id__": 25
       }
     ],
     "_prefab": {
-      "__id__": 25
+      "__id__": 26
     },
     "_opacity": 255,
     "_color": {
@@ -892,8 +960,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 60,
-      "height": 50.4
+      "width": 155.7,
+      "height": 100.8
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -904,8 +972,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -92,
-        9.907,
+        -45.349999999999994,
+        -8.093,
         0,
         0,
         0,
@@ -934,7 +1002,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 23
+      "__id__": 24
     },
     "_enabled": true,
     "_materials": [
@@ -944,16 +1012,16 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "￥",
-    "_N$string": "￥",
-    "_fontSize": 60,
-    "_lineHeight": 40,
+    "_string": "0.30",
+    "_N$string": "0.30",
+    "_fontSize": 80,
+    "_lineHeight": 80,
     "_enableWrapText": true,
     "_N$file": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 0,
+    "_styleFlags": 1,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -970,7 +1038,50 @@
     "asset": {
       "__uuid__": "72481e4b-bb87-4bc0-9455-9c0f34848370"
     },
-    "fileId": "98nEdj6M9G+JhSSywkdlGY",
+    "fileId": "1cWdkeEaFMLbHryDIEr3WV",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Layout",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 20
+    },
+    "_enabled": true,
+    "_layoutSize": {
+      "__type__": "cc.Size",
+      "width": 220.7,
+      "height": 50
+    },
+    "_resize": 1,
+    "_N$layoutType": 1,
+    "_N$cellSize": {
+      "__type__": "cc.Size",
+      "width": 40,
+      "height": 40
+    },
+    "_N$startAxis": 0,
+    "_N$paddingLeft": 0,
+    "_N$paddingRight": 0,
+    "_N$paddingTop": 0,
+    "_N$paddingBottom": 0,
+    "_N$spacingX": 5,
+    "_N$spacingY": 0,
+    "_N$verticalDirection": 1,
+    "_N$horizontalDirection": 0,
+    "_N$affectedByScale": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "72481e4b-bb87-4bc0-9455-9c0f34848370"
+    },
+    "fileId": "53ZC1EBg1G+YgiRgFsq8bD",
     "sync": false
   },
   {
@@ -982,17 +1093,17 @@
     },
     "_children": [
       {
-        "__id__": 27
+        "__id__": 30
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 30
+        "__id__": 33
       }
     ],
     "_prefab": {
-      "__id__": 31
+      "__id__": 34
     },
     "_opacity": 255,
     "_color": {
@@ -1046,17 +1157,17 @@
     "_name": "描述",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 26
+      "__id__": 29
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 28
+        "__id__": 31
       }
     ],
     "_prefab": {
-      "__id__": 29
+      "__id__": 32
     },
     "_opacity": 255,
     "_color": {
@@ -1110,7 +1221,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 27
+      "__id__": 30
     },
     "_enabled": true,
     "_materials": [
@@ -1154,7 +1265,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 26
+      "__id__": 29
     },
     "_enabled": true,
     "_materials": [
@@ -1201,17 +1312,17 @@
     },
     "_children": [
       {
-        "__id__": 33
+        "__id__": 36
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 36
+        "__id__": 39
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 40
     },
     "_opacity": 255,
     "_color": {
@@ -1265,17 +1376,17 @@
     "_name": "描述",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 32
+      "__id__": 35
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 34
+        "__id__": 37
       }
     ],
     "_prefab": {
-      "__id__": 35
+      "__id__": 38
     },
     "_opacity": 255,
     "_color": {
@@ -1329,7 +1440,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 33
+      "__id__": 36
     },
     "_enabled": true,
     "_materials": [
@@ -1373,7 +1484,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 32
+      "__id__": 35
     },
     "_enabled": true,
     "_materials": [
@@ -1421,17 +1532,17 @@
     },
     "_children": [
       {
-        "__id__": 39
+        "__id__": 42
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 42
+        "__id__": 45
       }
     ],
     "_prefab": {
-      "__id__": 43
+      "__id__": 46
     },
     "_opacity": 255,
     "_color": {
@@ -1485,17 +1596,17 @@
     "_name": "描述",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 38
+      "__id__": 41
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 40
+        "__id__": 43
       }
     ],
     "_prefab": {
-      "__id__": 41
+      "__id__": 44
     },
     "_opacity": 255,
     "_color": {
@@ -1549,7 +1660,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 39
+      "__id__": 42
     },
     "_enabled": true,
     "_materials": [
@@ -1593,7 +1704,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 38
+      "__id__": 41
     },
     "_enabled": true,
     "_materials": [
@@ -1641,17 +1752,17 @@
     },
     "_children": [
       {
-        "__id__": 45
+        "__id__": 48
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 48
+        "__id__": 51
       }
     ],
     "_prefab": {
-      "__id__": 49
+      "__id__": 52
     },
     "_opacity": 255,
     "_color": {
@@ -1705,17 +1816,17 @@
     "_name": "描述",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 44
+      "__id__": 47
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 46
+        "__id__": 49
       }
     ],
     "_prefab": {
-      "__id__": 47
+      "__id__": 50
     },
     "_opacity": 255,
     "_color": {
@@ -1769,7 +1880,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 45
+      "__id__": 48
     },
     "_enabled": true,
     "_materials": [
@@ -1813,7 +1924,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 44
+      "__id__": 47
     },
     "_enabled": true,
     "_materials": [
@@ -1861,23 +1972,23 @@
     },
     "_children": [
       {
-        "__id__": 51
+        "__id__": 54
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 55
+        "__id__": 58
       },
       {
-        "__id__": 56
+        "__id__": 59
       },
       {
-        "__id__": 57
+        "__id__": 60
       }
     ],
     "_prefab": {
-      "__id__": 59
+      "__id__": 62
     },
     "_opacity": 255,
     "_color": {
@@ -1931,20 +2042,20 @@
     "_name": "描述",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 50
+      "__id__": 53
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 52
+        "__id__": 55
       },
       {
-        "__id__": 53
+        "__id__": 56
       }
     ],
     "_prefab": {
-      "__id__": 54
+      "__id__": 57
     },
     "_opacity": 255,
     "_color": {
@@ -1998,7 +2109,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 51
+      "__id__": 54
     },
     "_enabled": true,
     "_materials": [
@@ -2031,7 +2142,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 51
+      "__id__": 54
     },
     "_enabled": true,
     "_color": {
@@ -2060,7 +2171,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 50
+      "__id__": 53
     },
     "_enabled": true,
     "_materials": [
@@ -2092,7 +2203,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 50
+      "__id__": 53
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -2160,7 +2271,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 50
+      "__id__": 53
     },
     "_enabled": true,
     "node_panel": {
@@ -2169,7 +2280,7 @@
     "transition_type": 3,
     "onComplete": [
       {
-        "__id__": 58
+        "__id__": 61
       }
     ],
     "_id": ""
@@ -2313,10 +2424,10 @@
     },
     "_enabled": true,
     "lbl_reward_value": {
-      "__id__": 21
+      "__id__": 25
     },
     "lbl_time": {
-      "__id__": 46
+      "__id__": 49
     },
     "_id": ""
   },

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

@@ -31,7 +31,7 @@ export class GradeRewardData extends Data {
         this.changeExp = true;
         gData.gameData.gameData.farmGradeData = response.data.userFarmGrageRewardInfo
         //const rewardNum = Math.round(response.data.userFarmGrageRewardInfo.money * 100);
-        gData.receiptNotice.receip_rmb = response.data.userFarmGrageRewardInfo[this.cashId-1].money;
+        gData.receiptNotice.receip_rmb = response.data.userFarmGrageRewardInfo.farmGradeRewardList[this.cashId-1].money;
  
         gData.gameData.init_red_point = true;
         //console.log(`农场等级提现数据=======>${response.data.userFarmGrageRewardInfo}`);

assets/script/game/module/newCashUI/WalletCashOut.ts

@@ -136,13 +136,13 @@ export default class WalletCashOut extends cc.Component {
                 }
 
                 let needV = data.money / 100;
-                let haveV = (gData.gameData.gameData.redMoney / 10000).toFixed(2) + '元';
+                let haveV = (gData.gameData.gameData.redMoney / 10000).toString() + '元';
                 this.lbl_tip.string = `需要${needV}元，当前有` + haveV;
             } else {
                 this.isCanCash = false;
                 this.btn_cashOut.setGray(true);
                 let needV = data.money / 100;
-                let haveV = (gData.gameData.gameData.redMoney / 10000).toFixed(2) + '元';
+                let haveV = (gData.gameData.gameData.redMoney / 10000).toString() + '元';
                 this.lbl_tip.string = `需要${needV}元，当前只有` + haveV;
             }
         } else {

assets/script/game/module/newOpenRedBag/NewOpenRedBag.ts

@@ -34,6 +34,8 @@ export default class NewOpenRedBag extends cc.Component {
             this.showElectUI();
         }
         this.showChangePart();
+
+        this.initCashOutStyle(gData.gameData.gameData.redMoney);
     }
 
     showElectUI() {

build/jsb-link/js backups (useful for debugging)/main.index.js

@@ -13247,7 +13247,7 @@ mk.console.logSingle("农场等级提现数据=>", o);
 if (0 != o.errcode) return [ 2, null ];
 this.changeExp = !0;
 gData.gameData.gameData.farmGradeData = o.data.userFarmGrageRewardInfo;
-gData.receiptNotice.receip_rmb = o.data.userFarmGrageRewardInfo[this.cashId - 1].money;
+gData.receiptNotice.receip_rmb = o.data.userFarmGrageRewardInfo.farmGradeRewardList[this.cashId - 1].money;
 gData.gameData.init_red_point = !0;
 mk.ui.openPanel("module/newNotice/newNotice");
 return [ 2, o ];

packages-hot-update/cfg.json

@@ -1,7 +1,7 @@
 {
     "version": "1.0.1",
     "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/",
-    "resourceRootDir": "D:\\mokaszProjects\\team1_nc\\build\\jsb-link",
+    "resourceRootDir": "D:\\projects\\team1_nc\\build\\jsb-link",
     "genManifestDir": "",
     "hotAddressArray": [
         "http://",
@@ -9,7 +9,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/"
     ],
-    "buildTime": 1631089679791,
-    "genTime": 1631089679791,
+    "buildTime": 1631091604142,
+    "genTime": 1631091604142,
     "genVersion": null
 }