添加单独开关

qieshuiguo/assets/Scene/Game.fire

@@ -10262,7 +10262,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 93,
+      "width": 89,
       "height": 40
     },
     "_rotationX": 0,
@@ -34405,7 +34405,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 72,
+      "width": 71,
       "height": 27
     },
     "_rotationX": 0,
@@ -35994,7 +35994,7 @@
       }
     ],
     "_tag": -1,
-    "_active": true,
+    "_active": false,
     "_components": [],
     "_prefab": null,
     "_id": "41axZ41jhCy6eO973OcmUa",
@@ -36116,7 +36116,7 @@
     },
     "_children": [],
     "_tag": -1,
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 912

qieshuiguo/assets/Script/Sdk/sdk_conf.js

@@ -4,7 +4,7 @@ var sdk_conf = {
     //.游戏唯一标识:由游戏技术修改
     game: 'yiqiqieshuiguo-weixin',   
     //.当前游戏版本：由游戏技术修改       
-    version: '2.2.2',
+    version: '2.2.3',
     //以下广告ID获取已经废弃，改成从服务端配置config4中获取
        
     //.banner广告单元id

qieshuiguo/assets/Script/ViewControl/fruit.js

@@ -212,9 +212,11 @@ cc.Class({
                 if(!sdk.getConfig4().ipLimit){  //ip限制
                     if(sdk.getConfig1().sns){
                         //一刀切奖励推送
-                        if(cc.HQ.GameMgr.isACut){
-                            this._parentJS.yidaqieTipsUI.getComponent("yidaqieTipsUI").init(200);
-                            this._parentJS.yidaqieTipsUI.active =true;
+                        if(sdk.getConfig2().yidaqieSW){
+                            if(cc.HQ.GameMgr.isACut){
+                                this._parentJS.yidaqieTipsUI.getComponent("yidaqieTipsUI").init(200);
+                                this._parentJS.yidaqieTipsUI.active =true;
+                            }
                         }
                     }
                 }

qieshuiguo/assets/Script/ViewControl/homePageUI.js

@@ -470,7 +470,11 @@ cc.Class({
                 self.qiandaoUI.getChildByName("day_7").children[signDay].getChildByName("today").active = true;
                 self.qiandaoUI.getChildByName("day_7").children[signDay].getChildByName("yiqiandao").active = false;
                 self.qiandaoUI.getChildByName("lingqu").active = true;
-                self.qiandaoUI.getChildByName("xuanyao").active = true;
+                //签到炫耀开关
+                if(sdk.getConfig2().qiandaoSW){
+                    self.qiandaoUI.getChildByName("xuanyao").active = true;
+                    self.qiandaoUI.getChildByName("xuanyao").getChildByName("gouxuan_on").active = true;
+                }
                 self.qiandaoUI.getChildByName("sure").active = false;
                 //显示领取对应的奖励
                 self.qiandaoUI.getComponent("qinadaoUI").init(reward[signDay]);

qieshuiguo/assets/Script/ViewControl/qinadaoUI.js

@@ -15,15 +15,15 @@ cc.Class({
     },
 
     onEnable: function(){
-        if(this.node.getChildByName("xuanyao").getChildByName("gouxuan_on").active == false){
-            this.node.getChildByName("xuanyao").getChildByName("gouxuan_on").active = true;
-            this.node.getChildByName("xuanyao").getChildByName("gouxuan_off").active = false;    
-        }    
+        // if(this.node.getChildByName("xuanyao").getChildByName("gouxuan_on").active == false){
+        //     this.node.getChildByName("xuanyao").getChildByName("gouxuan_on").active = true;
+        //     this.node.getChildByName("xuanyao").getChildByName("gouxuan_off").active = false;    
+        // }    
     },
 
     init: function(data){
         this._data =data;
-        console.log("签到签到签到签到签到签到签到",this._data);
+        // console.log("签到签到签到签到签到签到签到",this._data);
     },
 
     //领取奖励

qieshuiguo/assets/Script/ViewControl/settlementUI.js

@@ -48,16 +48,21 @@ cc.Class({
                     guessYouLike.setPosition(0,-320);
                 }
             }
-            //再来一次按钮/炫耀有奖按钮开关
+            //再来一次按钮/
             if(sdk.getConfig1().fs){
                 this.moreBtn.active =true;
-                this.showRewardBtn.active =true;
                 this.lingjinbiBtn.active =true;
             }else{
                 this.moreBtn.active =false;    
-                this.showRewardBtn.active =false;
                 this.lingjinbiBtn.active =false;
             } 
+
+            //炫耀有奖按钮开关
+            if(sdk.getConfig2().jiesuanSW){
+                this.showRewardBtn.active =true;
+            }else{
+                this.showRewardBtn.active =false; 
+            }
         }
 
         if (cc.sys.platform == cc.sys.WECHAT_GAME) {

qieshuiguo/assets/Script/ViewControl/victoryUI.js

@@ -84,7 +84,7 @@ cc.Class({
         }else{
             this.bounsBtn.active =false;
             if(cc.sys.platform == cc.sys.WECHAT_GAME) {
-                if(sdk.getConfig1().hz){
+                if(sdk.getConfig2().jiangliSW){
                     this.jiangliBtn.active =true;
                 }else{
                     this.jiangliBtn.active =false;