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

assets/script/game/data/GameData.ts

@@ -266,6 +266,7 @@ class PlayerProp {
     /** 存钱罐存款 */
     set piggyBank(value: number) {
         if (this._piggyBank === value) return;
+        if (gData.gameData.gameData.isWithdrawable && value > 0) return;// 存钱罐可提现状态，不能增加存钱罐金额
         this._piggyBank = value;
         gData.gameData.init_coin = true;
         gData.pigbank.init_data = true;

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

@@ -19,7 +19,9 @@ export class CashNormalData extends Data {
         if (response.data) {
             response.data.forEach(item_data => {
                 for (const key in item_data) {
-                    item_data[key] = parseInt(item_data[key]);
+                    if (key != 'withdrawalCode') {
+                        item_data[key] = parseInt(item_data[key]);
+                    }
                 }
             });
             this.list_data = response.data;