Merge branch 'master' of http://git.mokasz.com/zouyong/team1_nc

# Conflicts:
#	assets/resources/game/prefab/game.prefab

assets/resources/animation/Main.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.1.2",
-  "uuid": "8c65ee95-8d1e-4deb-8864-df1c7a01c9ee",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}

assets/resources/game/prefab/game.prefab

@@ -3815,7 +3815,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -31.719,
+        -36.719,
         0,
         0,
         0,
@@ -4821,7 +4821,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "34F78e0NtHtb8MjLcrzxyj",
+    "fileId": "63rziXcyxHFokjCZ0Fr710",
     "sync": false
   },
   {
@@ -5033,7 +5033,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "b93Tw+lQROu6/nXQ53LRWS",
+    "fileId": "c4aI5eiWRAGLBexP5VS26j",
     "sync": false
   },
   {
@@ -5142,7 +5142,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "e8+PJR6EtOo57fi15uLq5p",
+    "fileId": "5236VAzQlCxZdTA6AGSdX7",
     "sync": false
   },
   {
@@ -9919,25 +9919,29 @@
     },
     "_enabled": true,
     "btn1": {
-      "__id__": 66
+      "__id__": 194
     },
     "btn2": {
-      "__id__": 104
+      "__id__": 37
     },
     "btn3": {
-      "__id__": 21
+      "__id__": 53
     },
     "btn4": {
-      "__id__": 37
+      "__id__": 218
     },
     "btn5": {
-      "__id__": 129
+      "__id__": 228
     },
     "btn6": {
-      "__id__": 251
+      "__id__": 238
     },
     "btn7": {
-      "__id__": 256
+      "__id__": 66
+    },
+    "btn8": null,
+    "btn_redeem": {
+      "__id__": 21
     },
     "_id": ""
   },

assets/resources/music/congratulations.mp3.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "2.0.1",
+  "uuid": "c8c2d471-bdec-442b-be6c-fdc5aa07297c",
+  "downloadMode": 0,
+  "duration": 1.28,
+  "subMetas": {}
+}

assets/resources/music/redmoney.mp3.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "2.0.1",
+  "uuid": "f61a8a27-64a7-438c-931f-63943247efde",
+  "downloadMode": 0,
+  "duration": 2.638367,
+  "subMetas": {}
+}

assets/script/game/game/Game.ts

@@ -179,7 +179,7 @@ export default class Game extends cc.Component {
     }
 
     private initInfo() {
-        this.lbl_redMoney.string = gData.gameData.playerProp.redMoney + "";
+        this.lbl_redMoney.string = gData.gameData.playerProp.redMoney/100 + "";
         gData.gameData.init_coin = false;
 
         if (gData.gameData.playerProp.userFarmTaskInfo) {
@@ -204,7 +204,7 @@ export default class Game extends cc.Component {
     private changeInfo() {
         //this.lbl_redMoney.node.getComponent(mk.component.numberAnim).setValue(gData.gameData.playerProp.redMoney);
         cc.tween(this.lbl_redMoney.node).to(0.1, { scale: 1.2 }).to(0.05, { scale: 1 }).start();
-        this.lbl_redMoney.string = gData.gameData.playerProp.redMoney + "";
+        this.lbl_redMoney.string = gData.gameData.playerProp.redMoney/100 + "";
         gData.gameData.init_coin = false;
     }
 

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

@@ -125,8 +125,8 @@ export default class WalletCashOut extends cc.Component {
 
     private initTip() {
 
-        this.lbl_redMoney.string = gData.gameData.playerProp.redMoney.toString();
-        this.lbl_value.string = (gData.gameData.playerProp.redMoney / 10000) + '元';
+        this.lbl_redMoney.string = (gData.gameData.playerProp.redMoney/100).toString();
+        this.lbl_value.string = (gData.gameData.playerProp.redMoney / 1000000) + '元';
 
         if (this.curChooseIndex != -1) {
             let data = gData.gameData.configs.CashCfg[this.curChooseIndex];
@@ -141,13 +141,13 @@ export default class WalletCashOut extends cc.Component {
                 }
 
                 let needV = data.money / 100;
-                let haveV = (gData.gameData.playerProp.redMoney / 10000).toString() + '元';
+                let haveV = (gData.gameData.playerProp.redMoney / 1000000).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.playerProp.redMoney / 10000).toString() + '元';
+                let haveV = (gData.gameData.playerProp.redMoney / 1000000).toString() + '元';
                 this.lbl_tip.string = `需要${needV}元，当前只有` + haveV;
             }
         } else {

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

@@ -75,6 +75,7 @@ export default class NewOpenRedBag extends cc.Component {
      * 底部提现相关样式
      */
     private initCashOutStyle(redMoney: number = 0) {
+        redMoney = redMoney/100;
         const cash_bar = gData.redBagCash.cash_bar;
         let cash_data = gData.redBagCash.getItemDataByIndex(cash_bar);
         if (!cash_data) return;

assets/script/game/module/redBagTask/RedBagTask.ts

@@ -204,6 +204,7 @@ export default class RedBagTask extends cc.Component {
      * 底部提现相关样式
      */
     private initCashOutStyle(redMoney: number = 0) {
+        redMoney = redMoney/100;
         const cash_bar = gData.redBagCash.cash_bar;
         let cash_data = gData.redBagCash.getItemDataByIndex(cash_bar);
         if (!cash_data) return;

assets/script/game/module/reward/Reward.ts

@@ -82,6 +82,7 @@ export default class Reward extends cc.Component {
      * 底部提现相关样式
      */
     private initCashOutStyle(redMoney: number = 0) {
+        redMoney = redMoney/100;
         const cash_bar = gData.redBagCash.cash_bar;
         let cash_data = gData.redBagCash.getItemDataByIndex(cash_bar);
         if (!cash_data) return;
@@ -132,6 +133,7 @@ export default class Reward extends cc.Component {
         let rewardNum: number = gData.reward.data[0].rewardNum || 0;
         if (gData.reward.data[0].rewardType === RewardType.pigRmb) {
         } else {
+            rewardNum = rewardNum/100;
             this.lbl_reward_num.string = `x${rewardNum}`;
         }
 

assets/script/game/module/setting/Setting.ts

@@ -49,9 +49,9 @@ export default class Setting extends cc.Component {
         this.lbl_nickname.string = gData.wechatData.nickName;
 
         this.lbl_lv.string = 'Lv:' + gData.gameData.playerProp.gradeLevel.toString();
-        this.lbl_redBagCoin.string = gData.gameData.playerProp.redMoney.toString();
+        this.lbl_redBagCoin.string = (gData.gameData.playerProp.redMoney/100).toString();
 
-        this.lbl_value.string = (gData.gameData.playerProp.redMoney / 10000) + '元';
+        this.lbl_value.string = (gData.gameData.playerProp.redMoney / 1000000) + '元';
 
         let music = "module/setting/texture/" + (mk.audio.getSwitchMusic() ? "on" : "off");
         let effect = "module/setting/texture/" + (mk.audio.getSwitchEffect() ? "on" : "off");

assets/script/game/module/speedUpUI/SpeedUpUI.ts

@@ -41,6 +41,7 @@ export default class SpeedUpUI extends cc.Component {
      * 底部提现相关样式
      */
     private initCashOutStyle(redMoney: number = 0) {
+        redMoney = redMoney/100;
         const cash_bar = gData.redBagCash.cash_bar;
         let cash_data = gData.redBagCash.getItemDataByIndex(cash_bar);
         if (!cash_data) return;

assets/script/game/module/turntable/Turnablerule.ts

@@ -38,6 +38,7 @@ export default class Turnablerule extends cc.Component {
      * 底部提现相关样式
      */
     private initCashOutStyle(redMoney: number = 0) {
+        redMoney = redMoney/100;
         const cash_bar = gData.redBagCash.cash_bar;
         let cash_data = gData.redBagCash.getItemDataByIndex(cash_bar);
         if (!cash_data) return;

build/jsb-link/assets/resources/import/14/14d6f54b-9e38-4fc1-978a-21a24f119bc6.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/14/14d6f54b-9e38-4fc1-978a-21a24f119bc6@6c48a.json

@@ -1 +0,0 @@
-[1,["141vVLnjhPwZeKIaJPEZvG"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"hav_btn_byte_3","rect":[7,0,169,17],"offset":[2,0],"originalSize":[179,17],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/5e/5e1170c2-6a73-4902-8ea8-e13a18a7b7e5.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/5e/5e1170c2-6a73-4902-8ea8-e13a18a7b7e5@6c48a.json

@@ -1 +0,0 @@
-[1,["5eEXDCanNJAo6o4ToYp7fl"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"harvest_byte_1","rect":[5,0,256,62],"offset":[1.5,0],"originalSize":[263,62],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/c8/c8c2d471-bdec-442b-be6c-fdc5aa07297c.json

@@ -0,0 +1 @@
+[1,0,0,[["cc.AudioClip",["_name","_native","duration"],0]],[[0,0,1,2,4]],[[0,"congratulations",".mp3",1.28],-1],0,0,[],[],[]]

build/jsb-link/assets/resources/import/c9/c92c0ee2-1bc4-4926-a8d8-18ac0679806b.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/c9/c92c0ee2-1bc4-4926-a8d8-18ac0679806b@6c48a.json

@@ -1 +0,0 @@
-[1,["c9LA7iG8RJJqjYGKwGeYBr"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"hav_btn_byte_2","rect":[6,0,124,17],"offset":[2,0],"originalSize":[132,17],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/f6/f61a8a27-64a7-438c-931f-63943247efde.json

@@ -0,0 +1 @@
+[1,0,0,[["cc.AudioClip",["_name","_native","duration"],0]],[[0,0,1,2,4]],[[0,"redmoney",".mp3",2.638367],-1],0,0,[],[],[]]

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

@@ -15184,12 +15184,19 @@ done: !0
 Object.defineProperty(o, "__esModule", {
 value: !0
 });
-var s = t("../../../game/data/AdData"), l = t("../../../game/data/GameData"), p = cc._decorator, u = p.ccclass, d = (p.property, 
-function(t) {
+var s = t("../../../game/data/AdData"), l = t("../../../game/data/GameData"), p = cc._decorator, u = p.ccclass, d = p.property, h = function(t) {
 a(e, t);
 function e() {
-return null !== t && t.apply(this, arguments) || this;
+var e = null !== t && t.apply(this, arguments) || this;
+e.lbl_des = null;
+e.lbl_max = null;
+return e;
 }
+e.prototype.start = function() {
+var t = .01 * gData.gameData.configs.CashCfg[0].money;
+this.lbl_des.string = "1000红包券=0.1元\n满" + t + "元即可提现";
+this.lbl_max.string = "最高获得</c><color=#ff0000>" + gData.harvestData.config.menuRedBagCoin + "</color>红包券";
+};
 e.prototype.clickNormalBtn = function() {
 return r(this, void 0, void 0, function() {
 var t, e, o;
@@ -15259,9 +15266,15 @@ e.prototype.clickClose = function() {
 mk.audio.playEffect("button");
 mk.ui.closePanel(this.node.name);
 };
+i([ d({
+type: cc.Label
+}) ], e.prototype, "lbl_des", void 0);
+i([ d({
+type: cc.RichText
+}) ], e.prototype, "lbl_max", void 0);
 return i([ u ], e);
-}(cc.Component));
-o.default = d;
+}(cc.Component);
+o.default = h;
 cc._RF.pop();
 }, {
 "../../../game/data/AdData": "AdData",

packages-hot-update/cfg.json

@@ -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": 1631347785728,
-    "genTime": 1631347785728,
+    "buildTime": 1631347921726,
+    "genTime": 1631347921726,
     "genVersion": null
 }