Citrus 9 mēneši atpakaļ
vecāks
revīzija
5892f8551f

+ 86 - 1
assets/config/Define.json

@@ -1 +1,86 @@
-{"customer_move_speed":118,"crew_move_speed":118,"crew_order_time":1,"tip_rate":0,"tip_value":30,"booster_ad_value":200,"booster_ad_time":300,"booster_ad_max_time":3600,"customer_type_count":30,"car_type_count":3,"offline_reward_min_time":180,"offline_reward_max_time":10800,"supply_ad_appear_stage":3,"supply_ad_appear_cooltime":60,"supply_ad_appear_holdtime":15,"supply_ad_money_value":300,"supply_ad_gem_value":10,"costume_ability403_value":500,"costume_ability204_value":200,"hit_menu_rate":70,"hit_menu_cooltime":600,"hit_menu_activetime":300,"shop_ad_suitcase_cooltime":14400,"shop_ad_suitcase_idx1":101,"shop_ad_suitcase_idx2":101,"shop_ad_suitcase_idx3":102,"shop_gem_promotion":1,"machine_work_time":2,"piggybank_get_count":10,"piggybank_full_count":700,"piggybank_purchase_min_count":400,"tier1_min_count":2,"tier1_max_count":2,"tier2_min_count":2,"tier2_max_count":3,"tier3_min_count":0,"tier3_max_count":1,"helped_min_count":4,"helped_max_count":6,"invite_appear_timer":300,"invite_appear_cooltime":1800,"helped_reward_gem":2,"event_clear_cost_increment":200,"event_machine_slot_add_lv1":10,"event_machine_slot_add_lv2":75,"event_machine_slot_add_lv3":200,"event_machine1_cost_increment_lv1":1200,"event_machine1_cost_increment_lv10":1200,"event_machine1_cost_increment_lv25":1140,"event_rapidcat_apeeartime":300,"event_rapidcat_holdtime":90,"event_rapidcat_cooltime":300,"event_rapidcat_max_count":5,"event_rapidcat_ability_type":303,"event_rapidcat_ability_value":100,"event_rapidcat_ad_activetime":300,"appopen_ad_first_stage":3,"appopen_ad_number":5,"event_tutorial_end_booster_reward":203,"machine_value_doubleup_lv":[10,25,50,75,100,150,200,250,300,350,400,450,500,600,700,800,900,1000],"machine_slot_add_lv":[10,50,100]}
+{
+    "customer_move_speed": 118,
+    "crew_move_speed": 118,
+    "crew_order_time": 1,
+    "tip_rate": 0,
+    "tip_value": 30,
+    "booster_ad_value": 200,
+    "booster_ad_time": 300,
+    "booster_ad_max_time": 3600,
+    "customer_type_count": 30,
+    "car_type_count": 3,
+    "offline_reward_min_time": 180,
+    "offline_reward_max_time": 10800,
+    "supply_ad_appear_stage": 3,
+    "supply_ad_appear_cooltime": 60,
+    "supply_ad_appear_holdtime": 15,
+    "supply_ad_money_value": 300,
+    "supply_ad_gem_value": 10,
+    "costume_ability403_value": 500,
+    "costume_ability204_value": 200,
+    "hit_menu_rate": 70,
+    "hit_menu_cooltime": 600,
+    "hit_menu_activetime": 300,
+    "shop_ad_suitcase_cooltime": 14400,
+    "shop_ad_suitcase_idx1": 101,
+    "shop_ad_suitcase_idx2": 101,
+    "shop_ad_suitcase_idx3": 102,
+    "shop_gem_promotion": 1,
+    "machine_work_time": 2,
+    "piggybank_get_count": 10,
+    "piggybank_full_count": 700,
+    "piggybank_purchase_min_count": 400,
+    "tier1_min_count": 2,
+    "tier1_max_count": 2,
+    "tier2_min_count": 2,
+    "tier2_max_count": 3,
+    "tier3_min_count": 0,
+    "tier3_max_count": 1,
+    "helped_min_count": 4,
+    "helped_max_count": 6,
+    "invite_appear_timer": 300,
+    "invite_appear_cooltime": 1800,
+    "helped_reward_gem": 2,
+    "event_clear_cost_increment": 200,
+    "event_machine_slot_add_lv1": 10,
+    "event_machine_slot_add_lv2": 75,
+    "event_machine_slot_add_lv3": 200,
+    "event_machine1_cost_increment_lv1": 1200,
+    "event_machine1_cost_increment_lv10": 1200,
+    "event_machine1_cost_increment_lv25": 1140,
+    "event_rapidcat_apeeartime": 300,
+    "event_rapidcat_holdtime": 90,
+    "event_rapidcat_cooltime": 300,
+    "event_rapidcat_max_count": 5,
+    "event_rapidcat_ability_type": 303,
+    "event_rapidcat_ability_value": 100,
+    "event_rapidcat_ad_activetime": 300,
+    "appopen_ad_first_stage": 3,
+    "appopen_ad_number": 5,
+    "event_tutorial_end_booster_reward": 203,
+    "machine_value_doubleup_lv": [
+        10,
+        25,
+        50,
+        75,
+        100,
+        150,
+        200,
+        250,
+        300,
+        350,
+        400,
+        450,
+        500,
+        600,
+        700,
+        800,
+        900,
+        1000
+    ],
+    "machine_slot_add_lv": [
+        10,
+        50,
+        100
+    ]
+}

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 180 - 1229
assets/config/files/StageSet.json


+ 6 - 6
assets/config/files/productConfig.json

@@ -9,42 +9,42 @@
     {
         "id": 1,
         "payId": "shop_diamond_1",
-        "cost": 6,
+        "cost": 1,
         "goods_name": "少量钻石",
         "desc": "少量钻石"
     },
     {
         "id": 2,
         "payId": "shop_diamond_2",
-        "cost": 30,
+        "cost": 5,
         "goods_name": "几颗钻石",
         "desc": "几颗钻石"
     },
     {
         "id": 3,
         "payId": "shop_diamond_3",
-        "cost": 98,
+        "cost": 10,
         "goods_name": "一把宝石",
         "desc": "一把宝石"
     },
     {
         "id": 4,
         "payId": "shop_diamond_4",
-        "cost": 198,
+        "cost": 50,
         "goods_name": "一堆宝石",
         "desc": "一堆宝石"
     },
     {
         "id": 5,
         "payId": "shop_diamond_5",
-        "cost": 328,
+        "cost": 100,
         "goods_name": "一袋宝石",
         "desc": "一袋宝石"
     },
     {
         "id": 6,
         "payId": "shop_diamond_6",
-        "cost": 648,
+        "cost": 500,
         "goods_name": "宝石保险箱",
         "desc": "宝石保险箱"
     },

+ 6 - 6
assets/config/files/shopItem.json

@@ -2,7 +2,7 @@
     "1": {
         "id": "1",
         "shopType": 0,
-        "diamond": 60,
+        "diamond": 8,
         "payId": "shop_diamond_1",
         "rate": 2,
         "icon": 1
@@ -10,7 +10,7 @@
     "2": {
         "id": "2",
         "shopType": 0,
-        "diamond": 480,
+        "diamond": 45,
         "payId": "shop_diamond_2",
         "rate": 2,
         "icon": 2
@@ -18,7 +18,7 @@
     "3": {
         "id": "3",
         "shopType": 0,
-        "diamond": 1800,
+        "diamond": 95,
         "payId": "shop_diamond_3",
         "rate": 2,
         "icon": 3
@@ -26,7 +26,7 @@
     "4": {
         "id": "4",
         "shopType": 0,
-        "diamond": 3880,
+        "diamond": 490,
         "payId": "shop_diamond_4",
         "rate": 2,
         "icon": 4
@@ -34,7 +34,7 @@
     "5": {
         "id": "5",
         "shopType": 0,
-        "diamond": 6560,
+        "diamond": 990,
         "payId": "shop_diamond_5",
         "rate": 2,
         "icon": 5
@@ -42,7 +42,7 @@
     "6": {
         "id": "6",
         "shopType": 0,
-        "diamond": 14000,
+        "diamond": 5000,
         "payId": "shop_diamond_6",
         "rate": 2,
         "icon": 6

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
assets/main/ShopDiamondItem.prefab


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
assets/resources/prefab/view/AdReward/AdRateBuffView.prefab


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
assets/resources/prefab/view/gameUI/GameUIView.prefab


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
assets/resources/prefab/view/gameUI/StageUpgradeView.prefab


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
assets/resources/prefab/view/shop/ShopBuffView.prefab


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
assets/resources/prefab/view/shop/ShopView.prefab


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
assets/resources/prefab/view/shop/ShopViewIcon.prefab


+ 74 - 37
assets/scripts/AdRewardController.js

@@ -24,16 +24,16 @@ var o =
                 t.done
                     ? i(t.value)
                     : ((e = t.value) instanceof r
-                          ? e
-                          : new r(function (t) {
-                                t(e);
-                            })
-                      ).then(s, o);
+                        ? e
+                        : new r(function (t) {
+                            t(e);
+                        })
+                    ).then(s, o);
             }
             a((l = l.apply(t, n || [])).next());
         });
     };
-Object.defineProperty(i, "__esModule", {value: !0});
+Object.defineProperty(i, "__esModule", { value: !0 });
 const a = t("App"),
     s = t("BaseController"),
     n = t("RedPointMgr"),
@@ -142,25 +142,62 @@ const a = t("App"),
                 : ((this.adBuffEndTime = 0), this.adRateBuffView.updateTime(0));
         }
         watchAdRateBuff() {
-            return o(this, void 0, void 0, function* () {
-                var s = yield a.default.ControllerManager.applyFunc(l.ControllerConst.AD, 0, 2);
-                if (s && 0 === s.code) {
-                    let t = 100 * g.default.ins.ad_booster_effect,
-                        e = 1e3 * g.default.ins.define.booster_ad_time,
-                        i = 1e3 * g.default.ins.define.booster_ad_max_time;
-                    s = u.default.ins.getGlobalBuffByIndex(d.BuffIndex.AD_FOOD_SELL_RATE);
-                    s &&
-                        s.buffEndTime &&
-                        (s = s.buffEndTime - a.default.DateUtils.Now()) + e > i &&
-                        ((e = i - s), r.default.launch("已达到时间上限!")),
-                        u.default.ins.addGlobalBuff({
-                            buffIndex: d.BuffIndex.AD_FOOD_SELL_RATE,
-                            buffValue: t,
-                            buffEndTime: a.default.DateUtils.Now() + e
-                        }),
-                        this.updateAdRateBuff();
-                }
-            });
+
+            let t = 100 * g.default.ins.ad_booster_effect,
+                e = 1e3 * g.default.ins.define.booster_ad_time,
+                i = 1e3 * g.default.ins.define.booster_ad_max_time;
+
+            u.default.ins.addGlobalBuff({
+                buffIndex: d.BuffIndex.AD_FOOD_SELL_RATE,
+                buffValue: t,
+                buffEndTime: a.default.DateUtils.Now() + e
+            })
+
+
+            console.error('服务器应该给反馈');
+            
+
+
+            // return o(this, void 0, void 0, function* () {
+            //     var s = yield a.default.ControllerManager.applyFunc(l.ControllerConst.AD, 0, 2);
+            //     if (s && 0 === s.code) {
+            //         let t = 100 * g.default.ins.ad_booster_effect,
+            //             e = 1e3 * g.default.ins.define.booster_ad_time,
+            //             i = 1e3 * g.default.ins.define.booster_ad_max_time;
+            //         s = u.default.ins.getGlobalBuffByIndex(d.BuffIndex.AD_FOOD_SELL_RATE);
+            //         s &&
+            //             s.buffEndTime &&
+            //             (s = s.buffEndTime - a.default.DateUtils.Now()) + e > i &&
+            //             ((e = i - s), r.default.launch("已达到时间上限!")),
+            //             u.default.ins.addGlobalBuff({
+            //                 buffIndex: d.BuffIndex.AD_FOOD_SELL_RATE,
+            //                 buffValue: t,
+            //                 buffEndTime: a.default.DateUtils.Now() + e
+            //             }),
+            //             this.updateAdRateBuff();
+            //     }
+            // });
+
+
+            // return o(this, void 0, void 0, function* () {
+            //     var s = yield a.default.ControllerManager.applyFunc(l.ControllerConst.AD, 0, 2);
+            //     if (s && 0 === s.code) {
+            //         let t = 100 * g.default.ins.ad_booster_effect,
+            //             e = 1e3 * g.default.ins.define.booster_ad_time,
+            //             i = 1e3 * g.default.ins.define.booster_ad_max_time;
+            //         s = u.default.ins.getGlobalBuffByIndex(d.BuffIndex.AD_FOOD_SELL_RATE);
+            //         s &&
+            //             s.buffEndTime &&
+            //             (s = s.buffEndTime - a.default.DateUtils.Now()) + e > i &&
+            //             ((e = i - s), r.default.launch("已达到时间上限!")),
+            //             u.default.ins.addGlobalBuff({
+            //                 buffIndex: d.BuffIndex.AD_FOOD_SELL_RATE,
+            //                 buffValue: t,
+            //                 buffEndTime: a.default.DateUtils.Now() + e
+            //             }),
+            //             this.updateAdRateBuff();
+            //     }
+            // });
         }
         updateAdRateBuff() {
             var t = g.default.ins.ad_booster_effect,
@@ -169,8 +206,8 @@ const a = t("App"),
             e = u.default.ins.getGlobalBuffByIndex(d.BuffIndex.AD_FOOD_SELL_RATE);
             e && e.buffEndTime
                 ? ((this.adBuffEndTime = e.buffEndTime),
-                  this.startTime(),
-                  a.default.RedPointMgr.next(a.default.RedPointMgr.types.AdRateBuff, !1))
+                    this.startTime(),
+                    a.default.RedPointMgr.next(a.default.RedPointMgr.types.AdRateBuff, !1))
                 : a.default.RedPointMgr.next(a.default.RedPointMgr.types.AdRateBuff, !0);
         }
         checkAdRewardOpen(t = !1) {
@@ -184,9 +221,9 @@ const a = t("App"),
                         y.OpenTypeConst.AD_REWARD
                     )) &&
                     ((this.adRewardCoolTime = g.default.ins.define.supply_ad_appear_cooltime),
-                    (this.adRewardFunc = this.adRewardCountTimeCool),
-                    this.startTime()),
-                t)
+                        (this.adRewardFunc = this.adRewardCountTimeCool),
+                        this.startTime()),
+                    t)
             );
         }
         adRewardCountTimeCool() {
@@ -206,7 +243,7 @@ const a = t("App"),
         adRewardCountTimeShow() {
             this.adRewardShowTime--,
                 this.adRewardShowTime <= 0 &&
-                    ((this.adRewardShowTime = 0),
+                ((this.adRewardShowTime = 0),
                     this.adRewardMoneyView.hide(),
                     (this.adRewardCoolTime = g.default.ins.define.supply_ad_appear_cooltime),
                     (this.adRewardFunc = this.adRewardCountTimeCool));
@@ -222,12 +259,12 @@ const a = t("App"),
                         s == c.CostType.diamond
                             ? ((t = g.default.ins.define.supply_ad_gem_value), m.default.ins.diamondChange(t), t)
                             : ((t = _.default.ins.calculateIdleMoney(g.default.ins.define.supply_ad_money_value)),
-                              m.default.ins.moneyChange(t),
-                              t)),
-                    a.default.ViewManager.close(24),
-                    a.default.NotificationCenter.dispatch(h.NotificationConst.PLAY_MONEY_ANI, s, i),
-                    (this.adRewardCoolTime = g.default.ins.define.supply_ad_appear_cooltime),
-                    (this.adRewardFunc = this.adRewardCountTimeCool));
+                                m.default.ins.moneyChange(t),
+                                t)),
+                        a.default.ViewManager.close(24),
+                        a.default.NotificationCenter.dispatch(h.NotificationConst.PLAY_MONEY_ANI, s, i),
+                        (this.adRewardCoolTime = g.default.ins.define.supply_ad_appear_cooltime),
+                        (this.adRewardFunc = this.adRewardCountTimeCool));
             });
         }
     });

+ 4 - 0
assets/scripts/AdRewardMoneyView.js

@@ -64,6 +64,7 @@ t = class extends n.default {
         super.initUI();
     }
     open(t, e) {
+        return
         super.open(),
             h.default.tempNum.init(t, 0),
             (this.numLab.string = "+" + h.default.tempNum.toString()),
@@ -72,9 +73,12 @@ t = class extends n.default {
             this.show();
     }
     show() {
+        return
         this.btn.stopAllActions(), (this.btn.x = 425), cc.tween(this.btn).delay(0.5).to(1, { x: 260 }).start();
     }
     hide() {
+
+        return
         this.btn.stopAllActions(),
             (this.btn.x = 247),
             cc

+ 7 - 6
assets/scripts/ControllerManager.js

@@ -24,16 +24,16 @@ var s =
                 t.done
                     ? i(t.value)
                     : ((e = t.value) instanceof r
-                          ? e
-                          : new r(function (t) {
-                                t(e);
-                            })
-                      ).then(s, o);
+                        ? e
+                        : new r(function (t) {
+                            t(e);
+                        })
+                    ).then(s, o);
             }
             a((l = l.apply(t, n || [])).next());
         });
     };
-Object.defineProperty(i, "__esModule", {value: !0}),
+Object.defineProperty(i, "__esModule", { value: !0 }),
     (i.default = class {
         constructor() {
             this._modules = {};
@@ -71,6 +71,7 @@ Object.defineProperty(i, "__esModule", {value: !0}),
         applyFunc2(t, e, ...i) {
             var s = this._modules[t],
                 e = s.eventKeyMap[e];
+ 
             return s ? s.applyFunc(e, ...i) : (Log.trace("模块" + t + "不存在"), null);
         }
         getControllerModel(t) {

+ 33 - 29
assets/scripts/DiamondShopItem.js

@@ -2,17 +2,17 @@ var t = require;
 var e = module;
 var i = exports;
 var e =
-        (this && this.__decorate) ||
-        function (t, e, i, s) {
-            var o,
-                a = arguments.length,
-                n = a < 3 ? e : null === s ? (s = Object.getOwnPropertyDescriptor(e, i)) : s;
-            if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) n = Reflect.decorate(t, e, i, s);
-            else
-                for (var r = t.length - 1; 0 <= r; r--)
-                    (o = t[r]) && (n = (a < 3 ? o(n) : 3 < a ? o(e, i, n) : o(e, i)) || n);
-            return 3 < a && n && Object.defineProperty(e, i, n), n;
-        },
+    (this && this.__decorate) ||
+    function (t, e, i, s) {
+        var o,
+            a = arguments.length,
+            n = a < 3 ? e : null === s ? (s = Object.getOwnPropertyDescriptor(e, i)) : s;
+        if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) n = Reflect.decorate(t, e, i, s);
+        else
+            for (var r = t.length - 1; 0 <= r; r--)
+                (o = t[r]) && (n = (a < 3 ? o(n) : 3 < a ? o(e, i, n) : o(e, i)) || n);
+        return 3 < a && n && Object.defineProperty(e, i, n), n;
+    },
     s =
         (this && this.__awaiter) ||
         function (t, n, r, l) {
@@ -36,19 +36,19 @@ var e =
                     t.done
                         ? i(t.value)
                         : ((e = t.value) instanceof r
-                              ? e
-                              : new r(function (t) {
-                                    t(e);
-                                })
-                          ).then(s, o);
+                            ? e
+                            : new r(function (t) {
+                                t(e);
+                            })
+                        ).then(s, o);
                 }
                 a((l = l.apply(t, n || [])).next());
             });
         };
-Object.defineProperty(i, "__esModule", {value: !0}), (i.DiamondShopItem = void 0);
+Object.defineProperty(i, "__esModule", { value: !0 }), (i.DiamondShopItem = void 0);
 const o = t("App"),
     a = t("ShopItem"),
-    {property: n, ccclass: r, menu: l} = cc._decorator;
+    { property: n, ccclass: r, menu: l } = cc._decorator;
 t = class extends a.ShopItem {
     constructor() {
         super(...arguments),
@@ -58,30 +58,34 @@ t = class extends a.ShopItem {
             (this.rateNode = null),
             (this.orginalDiamonLab = null);
     }
+
+
     initItem() {
+ 
         o.default.CommonUtils.setSpriteFrame(this.data.getDiamondIconUrl(), this.icon),
             this.data.cfg.rate && !this.data.buyCnt
                 ? ((this.extraRateLab.node.active = !0),
-                  (this.diamondNumLab.string = "" + 2 * this.data.cfg.diamond),
-                  (this.orginalDiamonLab.string = "" + this.data.cfg.diamond))
+                    (this.diamondNumLab.string = "" + 2 * this.data.cfg.diamond),
+                    (this.orginalDiamonLab.string = "" + this.data.cfg.diamond))
                 : ((this.diamondNumLab.string = this.data.cfg.diamond.toString()),
-                  (this.extraRateLab.node.active = !1),
-                  (this.rateNode.active = !1),
-                  (this.orginalDiamonLab.node.active = !1),
-                  (this.diamondNumLab.node.x = 0)),
+                    (this.extraRateLab.node.active = !1),
+                    (this.rateNode.active = !1),
+                    (this.orginalDiamonLab.node.active = !1),
+                    (this.diamondNumLab.node.x = 0)),
             (this.title.string = this.data.getName()),
             (this.costLab.string = o.default.Platform.getPrice(this.data.cfg.payId));
     }
     updateItem() {
+ 
         this.data.buyCnt &&
             ((this.diamondNumLab.string = this.data.cfg.diamond.toString()),
-            (this.extraRateLab.node.active = !1),
-            (this.rateNode.active = !1),
-            (this.orginalDiamonLab.node.active = !1),
-            (this.diamondNumLab.node.x = 0));
+                (this.extraRateLab.node.active = !1),
+                (this.rateNode.active = !1),
+                (this.orginalDiamonLab.node.active = !1),
+                (this.diamondNumLab.node.x = 0));
     }
     onTouchBuyBtn() {
-        const t = Object.create(null, {onTouchBuyBtn: {get: () => super.onTouchBuyBtn}});
+        const t = Object.create(null, { onTouchBuyBtn: { get: () => super.onTouchBuyBtn } });
         return s(this, void 0, void 0, function* () {
             yield t.onTouchBuyBtn.call(this), this.updateItem();
         });

+ 24 - 2
assets/scripts/GameUIView.js

@@ -3,7 +3,7 @@ var e = module;
 var i = exports;
 e =
     (this && this.__decorate) ||
-    function(t, e, i, s) {
+    function (t, e, i, s) {
         var o,
             a = arguments.length,
             n = a < 3 ? e : null === s ? (s = Object.getOwnPropertyDescriptor(e, i)) : s;
@@ -17,6 +17,9 @@ Object.defineProperty(i, "__esModule", { value: !0 });
 const n = t("App"),
     s = t("BaseView"),
     r = t("EffectUtils"),
+    m = t("CurrencyService"),
+    c = t("NotificationConst"),
+    MapService = t("MapService"),
     { ccclass: o, property: a, menu: l } = (t("ViewConst"), t("LayerManager"), cc._decorator);
 t = class extends s.default {
     constructor() {
@@ -24,6 +27,22 @@ t = class extends s.default {
     }
     open() {
         super.open();
+        this.setProgress();
+
+    }
+
+    setProgress() {
+
+
+
+        if (MapService.default.ins.curId >= 14) {
+            console.error('当前大于14关卡  不显示');
+            console.error('c.default.ins.curId', MapService.default.ins.curId);
+            this.progressBar.node.active = false;
+            this.updateProgress = () => { };
+        }
+
+
     }
     initUI() {
         super.initUI();
@@ -49,6 +68,9 @@ t = class extends s.default {
     }
     onTouchMapBtn() {
         n.default.ViewManager.open(20);
+        // let t = 100000000
+        // m.default.ins.moneyChange(t),
+        // n.default.NotificationCenter.dispatch(c.NotificationConst.UPDATE_MONEY)
     }
     onTouchSettingBtn() {
         n.default.ViewManager.open(8);
@@ -70,7 +92,7 @@ t = class extends s.default {
     }
 };
 (t.VIEW_INFO = { prefabName: "GameUIView", zIndex: 50, key: 4, dir: "gameUI" }),
-e([a([cc.Node])], t.prototype, "moneyBarList", void 0),
+    e([a([cc.Node])], t.prototype, "moneyBarList", void 0),
     e([a(cc.ProgressBar)], t.prototype, "progressBar", void 0),
     e([a(cc.Node)], t.prototype, "progressRedPoint", void 0),
     (t = e([o], t)),

+ 3 - 1
assets/scripts/PlatformBase.js

@@ -241,6 +241,8 @@ const l = t("App"),
         // });
     }
     syncData() {
+        console.log('syncData同步数据');
+        
 
         return s(this, void 0, void 0, function*() {
             let e = l.default.GameDataMsr,
@@ -351,7 +353,7 @@ const l = t("App"),
     }
     getPrice(t) {
         t = this.getProductConfigByPayString(t);
-        return t ? "" + t.cost : null;
+        return t ? "$ " + t.cost : null;
     }
     getPriceNum(t) {
         return this.getProductConfigByPayString(t).cost;

+ 43 - 29
assets/scripts/ShopController.js

@@ -24,16 +24,16 @@ var o =
                 t.done
                     ? i(t.value)
                     : ((e = t.value) instanceof r
-                          ? e
-                          : new r(function (t) {
-                                t(e);
-                            })
-                      ).then(s, o);
+                        ? e
+                        : new r(function (t) {
+                            t(e);
+                        })
+                    ).then(s, o);
             }
             a((l = l.apply(t, n || [])).next());
         });
     };
-Object.defineProperty(i, "__esModule", {value: !0});
+Object.defineProperty(i, "__esModule", { value: !0 });
 const a = t("App"),
     s = t("BaseController"),
     n = t("Toast"),
@@ -59,7 +59,7 @@ i.default = class extends s.default {
             (this.shopViewIcon = null),
             (this._model = null),
             (this.neddOpenCnt = 4),
-            a.default.ViewManager.register(7, {dir: "shop", prefabName: "ShopView", zIndex: 100, controller: this}),
+            a.default.ViewManager.register(7, { dir: "shop", prefabName: "ShopView", zIndex: 100, controller: this }),
             a.default.ViewManager.register(28, {
                 dir: "shop",
                 prefabName: "ShopBuffView",
@@ -84,7 +84,7 @@ i.default = class extends s.default {
                 zIndex: 100,
                 controller: this
             }),
-            a.default.ViewManager.register(39, {dir: "shop", prefabName: "ShopViewIcon", zIndex: 50, controller: this}),
+            a.default.ViewManager.register(39, { dir: "shop", prefabName: "ShopViewIcon", zIndex: 50, controller: this }),
             a.default.ViewManager.register(40, {
                 dir: "shop",
                 prefabName: "ShopFirstView",
@@ -120,6 +120,20 @@ i.default = class extends s.default {
             this.registerFunc(_.ShopConst.IS_BUY_REMOVE_AD, this.isBuyRemoveAd, this),
             this.registerFunc(_.ShopConst.GET_BANK_DIAMOND, this.getBankDiamond, this),
             this.registerFunc(_.ShopConst.BUY_BANK, this.buyBank, this);
+
+        this.Hide()
+
+
+
+    }
+
+    Hide() {
+        console.error('默认隐藏首冲');
+        this.model.shopGiftDatas[_.ShopGiftType.FIRST_GIFT][0].buyCnt = 4
+
+        console.error('默认隐藏免广告');
+        this.model.shopGiftDatas[_.ShopGiftType.REMOVE_AD_GIFT][0].buyCnt = 1
+
     }
     initModleEvent() {
         a.default.NotificationCenter.addListener(l.NotificationConst.INIT_GAME, this.onInitGame, this, 200),
@@ -130,7 +144,7 @@ i.default = class extends s.default {
         var t = f.default.ins.define;
         (this._model.savaData.bankDiamond += t.piggybank_get_count),
             this._model.savaData.bankDiamond > t.piggybank_full_count &&
-                (this._model.savaData.bankDiamond = t.piggybank_full_count);
+            (this._model.savaData.bankDiamond = t.piggybank_full_count);
     }
     onInitGame() {
         a.default.NotificationCenter.addListener(l.NotificationConst.SYS_OPEN, this.onCheckOpen, this);
@@ -140,17 +154,17 @@ i.default = class extends s.default {
             (t == m.OpenTypeConst.BUFF
                 ? (a.default.ViewManager.open(29), this.neddOpenCnt--)
                 : t == m.OpenTypeConst.SHOP
-                ? (a.default.ViewManager.open(39), this.neddOpenCnt--)
-                : t == m.OpenTypeConst.FIRST_GIFT
-                ? (this.model.isFirstShowFirstGift() && a.default.ViewManager.open(40), this.neddOpenCnt--)
-                : t == m.OpenTypeConst.BANK &&
-                  (a.default.NotificationCenter.addListener(
-                      l.NotificationConst.STAGE_UPGRADE_UPDATE,
-                      this.onStageUpgradeUpdate,
-                      this
-                  ),
-                  this.neddOpenCnt--),
-            this.neddOpenCnt ||
+                    ? (a.default.ViewManager.open(39), this.neddOpenCnt--)
+                    : t == m.OpenTypeConst.FIRST_GIFT
+                        ? (this.model.isFirstShowFirstGift() && a.default.ViewManager.open(40), this.neddOpenCnt--)
+                        : t == m.OpenTypeConst.BANK &&
+                        (a.default.NotificationCenter.addListener(
+                            l.NotificationConst.STAGE_UPGRADE_UPDATE,
+                            this.onStageUpgradeUpdate,
+                            this
+                        ),
+                            this.neddOpenCnt--),
+                this.neddOpenCnt ||
                 a.default.NotificationCenter.removeListener(l.NotificationConst.SYS_OPEN, this.onCheckOpen, this));
     }
     onUpdateBuff() {
@@ -195,11 +209,11 @@ i.default = class extends s.default {
                 (i.cfg.payId
                     ? (t = yield a.default.Platform.buy(i.cfg.payId))
                     : i.cfg.ad
-                    ? (e = yield a.default.ControllerManager.applyFunc(r.ControllerConst.AD, 0, s)) &&
-                      0 === e.code &&
-                      (t = !0)
-                    : (t = g.default.ins.diamondChange(-i.cfg.diamond)) || n.default.launch("钻石不足!"),
-                t)
+                        ? (e = yield a.default.ControllerManager.applyFunc(r.ControllerConst.AD, 0, s)) &&
+                        0 === e.code &&
+                        (t = !0)
+                        : (t = g.default.ins.diamondChange(-i.cfg.diamond)) || n.default.launch("钻石不足!"),
+                    t)
             ) {
                 switch ((this.model.updateCnt(i), i.shopType)) {
                     case _.ShopType.Diamond:
@@ -295,9 +309,9 @@ i.default = class extends s.default {
         var e;
         t.shopType == _.ShopType.BOX &&
             ((e = a.default.ControllerManager.applyFunc(r.ControllerConst.Item, h.BagConst.USE_ITEM, t.cfg.itemId)),
-            this.shopOpenBoxView ? this.shopOpenBoxView.openBox(e[0]) : a.default.ViewManager.open(32, e[0], t),
-            this.shopViewIcon && this.shopViewIcon.updateShowIndexs(),
-            this.shopView.updateContentUI(_.ShopType.BOX));
+                this.shopOpenBoxView ? this.shopOpenBoxView.openBox(e[0]) : a.default.ViewManager.open(32, e[0], t),
+                this.shopViewIcon && this.shopViewIcon.updateShowIndexs(),
+                this.shopView.updateContentUI(_.ShopType.BOX));
     }
     startTime() {
         a.default.TimerManager.isExists(this.countDownTime, this) ||
@@ -330,7 +344,7 @@ i.default = class extends s.default {
                         t.items[0].id,
                         t.items[0].cnt
                     ),
-                    a.default.ViewManager.open(31, t.items[0].id, t.items[0].cnt));
+                        a.default.ViewManager.open(31, t.items[0].id, t.items[0].cnt));
             this._model.updateCnt(t);
         }
     }

+ 4 - 0
assets/scripts/ShopRemoveAdIcon.js

@@ -24,6 +24,10 @@ const s = t("App"),
             (this.node.removeFromParent(), this.node.destroy());
     }
     onTouchIcon() {
+
+
+        console.log(s.default.ControllerManager);
+        
         s.default.ViewManager.open(53);
     }
 }),

+ 6 - 0
assets/scripts/ShopRemoveAdView.js

@@ -89,6 +89,12 @@ t = class extends a.default {
             (this.finish.active = this.data.isBuyGift());
     }
     onTouchBuyBtn() {
+
+        console.log(n.ControllerConst.Shop);
+        console.log(l.ShopConst.BUY);
+        console.log(this.data);
+        
+ 
         return s(this, void 0, void 0, function* () {
             (yield o.default.ControllerManager.applyFunc(n.ControllerConst.Shop, l.ShopConst.BUY, this.data)) &&
                 this.closeView();

+ 8 - 5
assets/scripts/ShopView.js

@@ -13,17 +13,17 @@ var s =
                 (o = t[r]) && (n = (a < 3 ? o(n) : 3 < a ? o(e, i, n) : o(e, i)) || n);
         return 3 < a && n && Object.defineProperty(e, i, n), n;
     };
-Object.defineProperty(i, "__esModule", {value: !0});
+Object.defineProperty(i, "__esModule", { value: !0 });
 const n = t("App"),
     o = t("BaseView"),
     a = t("ShopConst"),
     r = t("ShopContent"),
     l = t("EffectUtils"),
     h = t("BagController"),
-    {property: c, ccclass: d, menu: u} = cc._decorator;
+    { property: c, ccclass: d, menu: u } = cc._decorator;
 (e = cc.Class({
     name: "ShopContenteSet",
-    properties: {shopType: {type: cc.Enum(a.ShopType), default: 0}, content: r.ShopContent}
+    properties: { shopType: { type: cc.Enum(a.ShopType), default: 0 }, content: r.ShopContent }
 })),
     (t = class extends o.default {
         constructor() {
@@ -41,7 +41,10 @@ const n = t("App"),
         initUI() {
             super.initUI();
             var t = this.controller.model.shopItemDatas;
-            for (const e of this.shopContentes) e.content.setData(t[e.shopType]);
+
+            for (const e of this.shopContentes) {
+                e.content.setData(t[e.shopType]);
+            }
             n.default.Platform.checkIsNotch() &&
                 this.widgets.forEach(t => {
                     t.top += 50;
@@ -68,7 +71,7 @@ const n = t("App"),
         updateContentUI(t) {
             for (const e of this.shopContentes) t == e.shopType && e.content.updateUI();
         }
-        updateMonthCard(t) {}
+        updateMonthCard(t) { }
         updateTime(t) {
             for (const e of this.shopContentes) e.shopType == a.ShopType.BOX && e.content.updateUI();
         }

+ 7 - 5
assets/scripts/SwitchMapView.js

@@ -3,7 +3,7 @@ var e = module;
 var i = exports;
 e =
     (this && this.__decorate) ||
-    function(t, e, i, s) {
+    function (t, e, i, s) {
         var o,
             a = arguments.length,
             n = a < 3 ? e : null === s ? (s = Object.getOwnPropertyDescriptor(e, i)) : s;
@@ -40,6 +40,8 @@ t = class extends a.default {
             (this.bgType = 1);
     }
     open() {
+
+
         if ((super.open(), this.mapId != c.default.ins.curId)) {
             this.mapId = c.default.ins.curId;
             const e = c.default.ins.curCfg,
@@ -55,10 +57,10 @@ t = class extends a.default {
             } else this.rewardNode.active = !1;
             var t = s.default.ConfigManager.getConfig("StageSet")[i];
             s.default.CommonUtils.setSpriteFrameByBundle(
-                    l.BundleType.MAP_ICON,
-                    "stage/" + e.stage_icon,
-                    this.nowIconSpr
-                ),
+                l.BundleType.MAP_ICON,
+                "stage/" + e.stage_icon,
+                this.nowIconSpr
+            ),
                 s.default.CommonUtils.setSpriteFrameByBundle(
                     l.BundleType.MAP_ICON,
                     "stage/" + t.stage_icon,

+ 10 - 0
assets/scripts/beiwanglu.js

@@ -0,0 +1,10 @@
+function 加金币() {
+    var t = require;
+    m = t("CurrencyService")
+    n = t("App")
+    c = t("NotificationConst")
+
+
+    m.default.ins.moneyChange(t),
+    n.default.NotificationCenter.dispatch(c.NotificationConst.UPDATE_MONEY)
+}

+ 10 - 0
assets/scripts/beiwanglu.js.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "32500da1-8723-49c9-be3a-24e5b73883d4",
+  "importer": "javascript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels