update feature and update jump

assets/Game/21201/Script/CMD_Game_21201.js

@@ -241,7 +241,9 @@ CMD_GAME_21201 = new cc.Class({ //window.
     this.SUB_C_LEAVE = 7;	
     this.SUB_C_USER_DOUBLE=			8;									//用户加倍
     this.SUB_C_REPLACE_CARD	=		9;								//用户补牌
+        
     },
+
     setRule:function(dwServerRules, dwRuleArr ){
         this.m_dwGameRuleArr = dwRuleArr;
         this.m_dwServerRules = dwServerRules;
@@ -776,7 +778,7 @@ CMD_GAME_21201 = new cc.Class({ //window.
     GetProgress:function(wProgress,rules){ 
         var cnt=this.GetGameCount(rules);
 
-        value = '第' + wProgress + '/' + cnt + '局';
+        value = '第' + wProgress + '/' + cnt + '圈';
         return value;
     },
     GameMaxPlayerCount:function(rules){
@@ -786,9 +788,9 @@ CMD_GAME_21201 = new cc.Class({ //window.
     GetGameCount:function(rules){
 
         //if (rules & this.GAME_RULE_JUSHU_1           ) return 4;
-        if (rules & this.GAME_RULE_JUSHU_2           ) return 8;
-        if (rules & this.GAME_RULE_JUSHU_3           ) return 12;	
-        if (rules & this.GAME_RULE_JUSHU_4           ) return 16;
+        if (rules & this.GAME_RULE_JUSHU_2           ) return 1;
+        if (rules & this.GAME_RULE_JUSHU_3           ) return 2;	
+        if (rules & this.GAME_RULE_JUSHU_4           ) return 3;
         return 8;
     },
     //是否是局数
@@ -810,7 +812,7 @@ CMD_GAME_21201 = new cc.Class({ //window.
         if (dwRulesArr[0]  &  this.GAME_RULE_SP_16) cstr += "台灣南部麻將";
         if (dwRulesArr[0]  &  this.GAME_RULE_SP_6) cstr += "  莊家無台";
         if (dwRulesArr[0]  &  this.GAME_RULE_SP_17) cstr += "  嚦咕嚦咕";
-        cstr +="      "+this.GetGameCount(dwServerRules)+"局";
+        cstr +="      "+this.GetGameCount(dwServerRules)+"圈";
        
         if (dwServerRules & this.GAME_RULE_RENSHU_2) cstr += "  2人";
         if (dwServerRules & this.GAME_RULE_RENSHU_0) cstr += "  3人";
@@ -823,9 +825,13 @@ CMD_GAME_21201 = new cc.Class({ //window.
         if (dwRulesArr[0]  &  this.GAME_RULE_TUOGUAN_NONE) cstr += "  無託管";
         
 
-
+        if (dwRulesArr[1]) {
+            cstr += ` 底分${dwRulesArr[1]}`;
+        }
+        if (dwRulesArr[2]) {
+            cstr += ` 台数${dwRulesArr[2]}`;
+        }
         // if (dwRulesArr[0]  &  this.GAME_RULE_RENSHU_LIMIT) cstr += " 不可少人";
-        cstr += " 底分3";
         // if (dwRulesArr[0]  &  this.GAME_RULE_SP_3) cstr += " 飘123";
         // if (dwRulesArr[0]  &  this.GAME_RULE_SP_4) cstr += " 不飘";
         // if (dwRulesArr[0]  &  this.GAME_RULE_SP_5) cstr += " 飘135";

assets/Game/21201/Script/GameClientEngine_21201.js

@@ -387,6 +387,8 @@ cc.Class({
                     if (GameDef.GAME_RULE_SP_16 & GameDef.m_dwGameRuleArr[0]) displayF = false;
                     if (this.m_cbGameStatus & GameDef.GAME_SCENE_PLAY) displayC = false;
 
+                    this.m_wGameProgress = pStatusPlay.cbQuan + 1;
+                    this.m_GameClientView.UpdateRoomProgress();
                     //风局
                     this.m_GameClientView.Fengju(pStatusPlay.cbQuan, pStatusPlay.cbFeng, displayF);
                     //骰子
@@ -710,13 +712,13 @@ cc.Class({
 
         this.m_GameClientView.SetGangOperator(0);
 
-
         this.m_cbGameStatus = GameDef.GAME_SCENE_PLAY;
         var pGameStart = this.m_pGameStart;
         console.log("pGameStart--", pGameStart);
 
         this.m_GameClientView.m_BtFriend.active = false;
-
+        this.m_wGameProgress = this.m_pGameStart.cbQuan + 1;
+        this.m_GameClientView.UpdateRoomProgress();
         //郑骰子
         this.m_GameClientView.OnRollDice(this.m_pGameStart.cbSick);
 
@@ -1317,7 +1319,9 @@ cc.Class({
         this.m_GameClientView.m_CardView.ShowTingTip(0);
         //删除定时器
         this.KillGameClock();
-        GameDef.dwChiHuRightAdd = this.m_GameEnd.dwChiHuRightAdd
+        GameDef.dwChiHuRightAdd = this.m_GameEnd.dwChiHuRightAdd;
+        this.m_wGameProgress = this.m_pGameStart.cbQuan + 1;
+        // this.m_GameClientView.UpdateRoomProgress();
         this.MyChairID = this.GetMeChairID()
 
         let isZimo = false;

assets/Game/21201/Script/LittleResultItem_21201.js

@@ -134,7 +134,7 @@ cc.Class({
         this.m_Rule.string = hrS;
         console.log("規則:",hrS)
         //总分
-        var Score = EndInfo.lGameScore[wChair] + EndInfo.lGangScore[wChair];// + EndInfo.lGangScore[wChair];
+        var Score = /* EndInfo.lGameScore[wChair] + EndInfo.lGangScore[wChair];// +  */EndInfo.lGangScore[wChair];
         console.log("Score:",Score);
         if (Score > 0) {
             this.m_EndScore.string =""+ Score;//"+" + Score2Str(Score);

assets/Game/21201/Script/SubRoom_21201.js

@@ -1,16 +1,9 @@
-var RulesKey = window.QPName + '_Rules_';
-var RulesKey2 = window.QPName + '_S_Rules_';
 cc.Class({
     //extends: cc.BaseClass,
     extends: cc.SubRoomRules,
 
     properties: {
-        // m_LabBaseScore: cc.Label,
-        // m_LabRevenue: cc.Label,
-        // m_ClubNode: cc.Node,
-        // m_EbBaseScore: cc.EditBox,
-        // m_BtNNSet: cc.Button,              //牛牛设置按钮
-        // m_togSpecialType: [cc.Toggle],   //牛牛特殊牌型        
+        m_baseNode: cc.Node, 
     },
     //1000-1031 服务器规则  1050-1099 对应规则
     //1000 =>AA付           1050 =>房主付
@@ -19,132 +12,14 @@ cc.Class({
     ctor: function () {
         this.m_bNeedUpdate = false;
         this.m_bFirstShow = true;
-
-        // //对立规则 非计算索引需 大于 32
-        // this.m_CheckMap = new Object();
-        // this.m_CheckMap[10011] = new Array(
-        //     // [12,33],
-        // );
-        // this.m_CheckMap[60013] = new Array(
-        //     [6, 33],     // 3息1囤	3息1分 / 1息1分
-        //     [7, 34],     // 底牌		留底19张 / 留底39张
-        // );
-        // this.m_CheckMap2 = new Array(
-        //     [1000, 1050],
-        //     [1001, 1051],
-        //     [1002, 1052],
-        //     [1003, 1052],
-        // );
-        // this.m_BaseScore = 1;
-        // this.m_SitScore = 100;
-        // this.m_Revenue = 0;
+        
     },
     //添加对立规则数组索引
     CheckToggle(ArrIndex, JS) {
-        // for (var i in this.m_CheckMap) {
-        //     for (var j in this.m_CheckMap[i]) {
-        //         if (JS.node.name == this.m_CheckMap[i][j][1]) this.m_CheckMap[i][j][2] = ArrIndex;
-        //     }
-        // }
-        // for (var i in this.m_CheckMap2) {
-        //     if (JS.node.name == this.m_CheckMap2[i][1]) this.m_CheckMap2[i][2] = ArrIndex;
-        // }
+
     },
     OnShowView: function () {
-        // //初始化数据
-        // if (this.m_togArr == null) {
-        //     this.m_togArr = this.node.getComponentsInChildren(cc.Toggle);
-        //     for (var i in this.m_togArr) {
-        //         this.CheckToggle(i, this.m_togArr[i]);
-        //     }
-        // }
         this.m_bNeedUpdate = true;
-        // this.m_bFirstShow = false;
-        // var rules = JSON.parse(cc.sys.localStorage.getItem(RulesKey + this.m_KindID));
-
-        // var rules2 = cc.sys.localStorage.getItem(RulesKey2 + this.m_KindID);
-
-
-        // if (rules != null) {
-        //     for (var i in this.m_togArr) {
-        //         var rulesIndex = parseInt(this.m_togArr[i].node.name);
-        //         var rIndex = parseInt(rulesIndex / 100);
-        //         var rValue = parseInt(rulesIndex % 100);
-        //         if (rIndex >= 3) continue;  //3底分  4抽水
-        //         if (rValue < 32) {
-        //             //游戏规则
-        //             if (rules[rIndex] & (1 << rValue)) {
-        //                 this.m_togArr[i].check();
-        //             } else {
-        //                 if (this.m_togArr[i].toggleGroup == null || this.m_togArr[i].toggleGroup.allowSwitchOff) { //复选框
-        //                     this.m_togArr[i].isChecked = false;
-        //                 } else if (this.m_CheckMap[this.m_KindID] != null) { //对立规则勾选
-        //                     for (var j in this.m_CheckMap[this.m_KindID]) {
-        //                         if (this.m_CheckMap[this.m_KindID][j][0] == rValue) {
-        //                             this.m_togArr[this.m_CheckMap[this.m_KindID][j][2]].check();
-        //                         }
-        //                     }
-        //                 }
-        //             }
-        //         }
-        //     }
-        // }
-
-
-        // if (rules == null) rules = [0, 0, 0, 0, 0];
-        // //2底分 3入场分  4抽水
-        // this.m_BaseScore = rules[2];
-        // if (this.m_BaseScore == null || this.m_BaseScore == 0) this.m_BaseScore = 1;
-        // if (this.m_EbBaseScore != null) this.m_EbBaseScore.string = this.m_BaseScore;
-
-        // this.m_SitScore = rules[3];
-        // if (this.m_SitScore == null || this.m_SitScore == 0) this.m_SitScore = 100;
-
-        // this.m_Revenue = rules[4];
-        // if (this.m_Revenue == null) this.m_Revenue = 0;
-        // this.UpdateBaseScore();
-        // this.UpdateRevenue();
-        return;
-        var rules = cc.sys.localStorage.getItem(RulesKey + this.m_KindID);
-        var rules2 = cc.sys.localStorage.getItem(RulesKey2 + this.m_KindID);
-        //还原选项
-        for (var i in this.m_togArr) {
-            if (rules == null || !this.m_bFirstShow) break;
-            var rulesIndex = parseInt(this.m_togArr[i].node.name);
-            if (rulesIndex < 32) {
-                //游戏规则
-                if (rules & (1 << rulesIndex)) {
-                    this.m_togArr[i].check();
-                } else {
-                    if (this.m_togArr[i].toggleGroup == null || this.m_togArr[i].toggleGroup.allowSwitchOff) { //复选框
-                        this.m_togArr[i].isChecked = false;
-                    } else if (this.m_CheckMap[this.m_KindID] != null) { //对立规则勾选
-                        for (var j in this.m_CheckMap[this.m_KindID]) {
-                            if (this.m_CheckMap[this.m_KindID][j][0] == rulesIndex) {
-                                this.m_togArr[this.m_CheckMap[this.m_KindID][j][2]].check();
-                            }
-                        }
-                    }
-                }
-            } else if (rulesIndex >= 100 && rulesIndex < 150) {
-                //服务器规则
-                if (rules2 & (1 << (rulesIndex - 100))) {
-                    this.m_togArr[i].check();
-                } else {
-                    if (this.m_togArr[i].toggleGroup == null || this.m_togArr[i].toggleGroup.allowSwitchOff) { //复选框
-                        this.m_togArr[i].isChecked = false;
-                    } else { //对立规则勾选
-                        for (var j in this.m_CheckMap2) {
-                            if (this.m_CheckMap2[j][0] == rulesIndex) {
-                                this.m_togArr[this.m_CheckMap2[j][2]].check();
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        this.m_bNeedUpdate = true;
-        this.m_bFirstShow = false;
     },
     OnHideView: function () {
         this.getRulesEx();
@@ -156,91 +31,24 @@ cc.Class({
         if (this.m_ClubNode != null) this.m_ClubNode.active = (RoomType != 0);
         this.m_bNeedUpdate = true;
     },
+    SetKeyView: function (key) {
+        if (this.m_baseNode) {
+            this.baseIndexArr = {};
+            this.baseNodeArr = {};
+            for (let cNode of this.m_baseNode.children) {
+                let curName = cNode.name;
+                if (curName[0] == "1") {
+                    this.baseIndexArr[curName[1]] = 0;
+                    this.baseNodeArr[curName[1]] = cNode;
+                    cNode.getComponent(cc.Toggle).isChecked = true;
+                }
+            }
+            this.updateBaseView();
+        }
+    },
     OnToggleClick: function (Tag, Data) {
         this.m_bNeedUpdate = true;
     },
-    // getRulesEx: function (bLog) {
-    //     var rules = [0, 0, 0, 0, 0];
-    //     for (var i in this.m_togArr) {
-    //         if (this.m_togArr[i].node.active && this.m_togArr[i].isChecked) {
-    //             var rulesIndex = parseInt(this.m_togArr[i].node.name);
-    //             if (bLog && window.LOG_NET_DATA) console.log(rulesIndex + ' ==> ' + this.$('Label@Label', this.m_togArr[i].node).string);
-    //             // if (rulesIndex >= 1000) {
-    //             //     if (rulesIndex <= 1031) rules[5] += 1 << (rulesIndex - 1000);
-    //             // } else
-    //             {
-    //                 var rIndex = parseInt(rulesIndex / 100);
-    //                 var rValue = parseInt(rulesIndex % 100);
-    //                 if (rIndex >= 3) continue;  //3底分  4抽水
-    //                 if (rValue <= 31) rules[rIndex] += 1 << rValue;
-    //             }
-    //         }
-    //     }
-    //     if (this.m_EbBaseScore != null) {
-    //         rules[2] = parseInt(this.m_EbBaseScore.string);
-    //     } else {
-    //         rules[2] = 1;
-    //     }
-    //     rules[3] = this.m_SitScore;
-    //     rules[4] = this.m_Revenue;
-    //     // if(this.$('ClubNode').active){
-    //     //     rules[2] = parseInt(this.$('ClubNode/EnterGame/116/Background/BG/EditBox@EditBox').string);
-    //     //     rules[3] = parseInt(this.$('ClubNode/EnterGame/117/Background/BG/EditBox@EditBox').string);
-    //     //     rules[4] = parseInt(this.$('ClubNode/EnterGame/118/Background/BG/EditBox@EditBox').string);
-    //     //     if(rules[2] > 0) {} else {rules[2] = 0};
-    //     //     if(rules[3] > 0) {} else {rules[3] = 0};
-    //     //     if(rules[4] > 0) {} else {rules[4] = 0};
-    //     // }
-
-    //     cc.sys.localStorage.setItem(RulesKey + this.m_KindID, JSON.stringify(rules));
-    //     return rules;
-    // },
-
-    // getRules: function (bLog) {
-    //     var rules = 0;
-    //     for (var i in this.m_togArr) {
-    //         if (this.m_togArr[i].node.active && this.m_togArr[i].isChecked) {
-    //             var rulesIndex = parseInt(this.m_togArr[i].node.name);
-    //             if (bLog && window.LOG_NET_DATA) console.log(rulesIndex + ' ==> ' + this.$('Label@Label', this.m_togArr[i].node).string);
-    //             if (rulesIndex <= 32) rules += 1 << rulesIndex;
-    //         }
-    //     }
-    //     cc.sys.localStorage.setItem(RulesKey + this.m_KindID, rules);
-    //     return rules;
-    // },
-    // getServerRules: function () {
-    //     var rules = 0;
-    //     for (var i in this.m_togArr) {
-    //         if (this.m_togArr[i].node.active && this.m_togArr[i].isChecked) {
-    //             var rulesIndex = parseInt(this.m_togArr[i].node.name);
-    //             if (rulesIndex < 1000 || rulesIndex >= 1050) continue;
-    //             rulesIndex -= 1000;
-    //             rules += 1 << rulesIndex;
-    //         }
-    //     }
-    //     cc.sys.localStorage.setItem(RulesKey2 + this.m_KindID, rules);
-
-    //     return rules;
-    // },
-
-    // update: function () {
-    //     if (this.m_bNeedUpdate) {
-    //         this.m_bNeedUpdate = false;
-    //     } else {
-    //         return;
-    //     }
-
-    //     for (var i in this.m_togArr) {
-    //         if (!this.m_togArr[i].node.active) continue;
-    //         var color = this.m_togArr[i].isChecked ? cc.color(182, 153, 95) : cc.color(143, 195, 203);
-    //         this.m_togArr[i].node.getChildByName('Label').color = color;
-    //     }
-
-
-    //     this.OnCheckHZMJ();
-    
-    // },
-
     
     OnUpdateCustomView:function()
     {
@@ -256,80 +64,13 @@ cc.Class({
 
     },
 
-    // //底分加
-    // OnBtBaseScoreAdd: function () {
-    //     if (this.m_LabBaseScore != null) {
-    //         if (this.m_SitScore < 1000) {
-    //             cc.gSoundRes.PlaySound('Button');
-    //             this.m_SitScore = this.m_SitScore + 100;
-    //             this.UpdateBaseScore();
-    //         }
-    //     }
-    // },
-    // //底分减
-    // OnBtBaseScoreReduce: function () {
-    //     if (this.m_LabBaseScore != null) {
-    //         if (this.m_SitScore > 100) {
-    //             cc.gSoundRes.PlaySound('Button');
-    //             this.m_SitScore = this.m_SitScore - 100;
-    //             this.UpdateBaseScore();
-    //         }
-    //     }
-    // },
     UpdateBaseScore: function () {
         if (this.m_LabBaseScore != null) this.m_LabBaseScore.string = this.m_SitScore;
     },
-    // //抽水加
-    // OnBtRevenueAdd: function () {
-    //     if (this.m_LabRevenue != null) {
-    //         if (this.m_Revenue < 10) {
-    //             cc.gSoundRes.PlaySound('Button');
-    //             this.m_Revenue = this.m_Revenue + 1;
-    //             this.UpdateRevenue();
-    //         }
-    //     }
-    // },
-    // //抽水减
-    // OnBtRevenueReduce: function () {
-    //     if (this.m_LabRevenue != null) {
-    //         if (this.m_Revenue > 0) {
-    //             cc.gSoundRes.PlaySound('Button');
-    //             this.m_Revenue = this.m_Revenue - 1;
-    //             this.UpdateRevenue();
-    //         }
-    //     }
-    // },
-    // UpdateRevenue: function () {
-    //     if (this.m_LabRevenue != null) this.m_LabRevenue.string = this.m_Revenue + '%';
-    // },
-
-
 
     //台湾麻将
     OnChecTWMJ: function () {
-        // var RuleHZ;
-        // var RuleHZ1, RuleHZ2, RuleHZ3;
-        // for (var i in this.m_togArr) {
-        //     if (this.m_togArr[i].node.name == 10) RuleHZ = i;
-        //     if (this.m_togArr[i].node.name == 23) RuleHZ1 = i;
-        //     if (this.m_togArr[i].node.name == 24) RuleHZ2 = i;
-        //     if (this.m_togArr[i].node.name == 25) RuleHZ3 = i;
-        // }
-
-        // if (this.m_togArr[RuleHZ].isChecked)//台湾北部麻将玩法
-        // {
-        //     this.m_togArr[RuleHZ1].interactable = true;
-        //     this.m_togArr[RuleHZ2].interactable = true;
-        //     this.m_togArr[RuleHZ3].interactable = true;
-        // } else {
-        //     this.m_togArr[RuleHZ1].isChecked = false;
-        //     this.m_togArr[RuleHZ2].isChecked = false;
-        //     this.m_togArr[RuleHZ3].isChecked = false;
-
-        //     this.m_togArr[RuleHZ1].interactable = false;
-        //     this.m_togArr[RuleHZ2].interactable = false;
-        //     this.m_togArr[RuleHZ3].interactable = false;
-        // }
+ 
 
         var RuleBB,RuleNB;
         var RuleBB1,RuleNB1;
@@ -339,71 +80,21 @@ cc.Class({
             if (this.m_togArr[i].node.name == 28) RuleBB1 = i; //台湾北部呖咕呖咕  玩法
             // if (this.m_togArr[i].node.name == 9) RuleNB1 = i;   //台湾南部庄家无台  玩法
         }
-        
-        // if (this.m_togArr[RuleNB].isChecked)
-        // {
-        //     this.m_togArr[RuleBB1].node.active = false;
-        //     this.m_togArr[RuleNB1].node.active = true;
-        //     this.m_togArr[RuleBB1].isChecked = false;
-        // } else if(this.m_togArr[RuleBB].isChecked) {
-        //     this.m_togArr[RuleNB1].isChecked = false;
-        //     this.m_togArr[RuleBB1].node.active = true;
-        //     this.m_togArr[RuleNB1].node.active = false;
-        // }
 
         let isShowNorth = this.m_togArr[RuleBB].isChecked;
         this.m_togArr[RuleBB1].node.parent.active = isShowNorth;
         
     },
 
-    // GetPayWay:function(){
-    //     var renshu2,renshu3,renshu4;
-    //     var Path = "ScrollView/view/content/";
-    //     for (var i in this.m_togArr) {
-    //         if (this.m_togArr[i].node.name == 1018) renshu2 =i;  
-    //         if (this.m_togArr[i].node.name == 1017) renshu3 =i;  
-    //         if (this.m_togArr[i].node.name == 1016) renshu4 =i; 
-    //     }
-    //     if(this.m_togArr[renshu2].isChecked&&this.$(Path + "PayWay/1050@Toggle").isChecked){
-            
-    //             this.$(Path + "GameCount/1019/Label@Label").string = '8局X4';
-    //             this.$(Path + "GameCount/1020/Label@Label").string = '12局X6';
-    //             this.$(Path + "GameCount/1021/Label@Label").string = '16局X8';
-    //     }
-        
-    //     if(this.m_togArr[renshu3].isChecked&&this.$(Path + "PayWay/1050@Toggle").isChecked){
-            
-    //             this.$(Path + "GameCount/1019/Label@Label").string = '8局X6';
-    //             this.$(Path + "GameCount/1020/Label@Label").string = '12局X9';
-    //             this.$(Path + "GameCount/1021/Label@Label").string = '16局X12';
-    //     }
-        
-    //     if(this.m_togArr[renshu4].isChecked&&this.$(Path + "PayWay/1050@Toggle").isChecked){
-            
-    //             this.$(Path + "GameCount/1019/Label@Label").string = '8局X8';
-    //             this.$(Path + "GameCount/1020/Label@Label").string = '12局X12';
-    //             this.$(Path + "GameCount/1021/Label@Label").string = '16局X16';
-    //      }
-    //      if(this.$(Path + "PayWay/1000@Toggle").isChecked){
-            
-    //             this.$(Path + "GameCount/1019/Label@Label").string = '8局x2';
-    //             this.$(Path + "GameCount/1020/Label@Label").string = '12局x3';
-    //             this.$(Path + "GameCount/1021/Label@Label").string = '16局x4';
-    //      }   
-        
-        
-        
-    // },
-
     GetPayWay: function () {
         var payWayPath = "PayWay/1050@Toggle";
         var gameCountPath = "GameCount/";
         var labels = [
-            { node: '1019/Label@Label', text: ['8局X4', '8局X6', '8局X8'] },
-            { node: '1020/Label@Label', text: ['12局X6', '12局X9', '12局X12'] },
-            { node: '1021/Label@Label', text: ['16局X8', '16局X12', '16局X16'] }
+            { node: '1019/Label@Label', text: ['1圈X4', '1圈X6', '1圈X8'] },
+            { node: '1020/Label@Label', text: ['2圈X6', '2圈X9', '2圈X12'] },
+            { node: '1021/Label@Label', text: ['4圈X8', '4圈X12', '4圈X16'] }
         ];
-        var alternativeLabels = ['8局x2', '12局x3', '16局x4'];
+        var alternativeLabels = ['1圈x2', '2圈x3', '4圈x4'];
         var renshuIndices = { 1018: null, 1017: null, 1016: null };
         var Path = "ScrollView/view/content/";
     
@@ -437,4 +128,42 @@ cc.Class({
             }
         }
     },
+
+    updateBaseView() {
+        for (let idx in this.baseNodeArr) {
+            let baseNode = this.baseNodeArr[idx];
+            let showIndex = this.baseIndexArr[idx];
+            let config = window.RoomBaseInfo[idx];
+            baseNode.name = `1${idx}00${showIndex}`
+            baseNode.getChildByName("Label").getComponent(cc.Label).string = "" + config[showIndex];
+            baseNode.getChildByName("last").active = showIndex > 0;
+            baseNode.getChildByName("next").active = showIndex < config.length - 1;
+        }
+    },
+
+    //key 0-0/1 typeIndex- -/+
+    onclickNextOrLastBase(event, key) {
+        let keyArr = key.split("-");
+        let idx = Number(keyArr[0]);
+        let config = window.RoomBaseInfo[idx];
+        let showIndex = this.baseIndexArr[idx];
+        if ("0" == keyArr[1]) {
+            showIndex -= 1;
+        } else if ("1" == keyArr[1]) {
+            showIndex += 1;
+        } else {
+            return;
+        }
+        if (showIndex < 0 || showIndex > config.length - 1) {
+            return;
+        }
+        this.baseIndexArr[idx] = showIndex;
+        this.updateBaseView();
+    },
+
+    resetCheck() {
+        for (let idx in this.baseNodeArr) {
+            this.baseNodeArr[idx].getComponent(cc.Toggle).isChecked = true;
+        }
+    },
 });

assets/Module/Club/Effect.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "c765d858-a63f-4b11-acd2-70204f0d6b4f",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/Module/Club/Effect/wpmj_icon3.atlas

@@ -0,0 +1,125 @@
+
+wpmj_icon3.png
+size: 1699,392
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+3b
+  rotate: false
+  xy: 2, 14
+  size: 312, 376
+  orig: 312, 376
+  offset: 0, 0
+  index: -1
+3dt
+  rotate: true
+  xy: 316, 20
+  size: 370, 87
+  orig: 372, 88
+  offset: 1, 1
+  index: -1
+lz/vfx_xx_00
+  rotate: false
+  xy: 889, 192
+  size: 160, 198
+  orig: 160, 240
+  offset: 0, 6
+  index: -1
+lz/vfx_xx_01
+  rotate: false
+  xy: 565, 190
+  size: 160, 200
+  orig: 160, 240
+  offset: 0, 6
+  index: -1
+lz/vfx_xx_02
+  rotate: false
+  xy: 611, 8
+  size: 159, 180
+  orig: 160, 240
+  offset: 1, 26
+  index: -1
+lz/vfx_xx_03
+  rotate: false
+  xy: 405, 183
+  size: 158, 207
+  orig: 160, 240
+  offset: 2, 1
+  index: -1
+lz/vfx_xx_04
+  rotate: false
+  xy: 772, 2
+  size: 159, 187
+  orig: 160, 240
+  offset: 1, 21
+  index: -1
+lz/vfx_xx_05
+  rotate: false
+  xy: 1132, 3
+  size: 160, 189
+  orig: 160, 240
+  offset: 0, 18
+  index: -1
+lz/vfx_xx_06
+  rotate: false
+  xy: 1456, 2
+  size: 160, 192
+  orig: 160, 240
+  offset: 0, 15
+  index: -1
+lz/vfx_xx_07
+  rotate: false
+  xy: 1375, 196
+  size: 160, 194
+  orig: 160, 240
+  offset: 0, 12
+  index: -1
+lz/vfx_xx_08
+  rotate: false
+  xy: 1051, 194
+  size: 160, 196
+  orig: 160, 240
+  offset: 0, 10
+  index: -1
+lz/vfx_xx_09
+  rotate: false
+  xy: 727, 191
+  size: 160, 199
+  orig: 160, 240
+  offset: 0, 7
+  index: -1
+lz/vfx_xx_10
+  rotate: false
+  xy: 1294, 2
+  size: 160, 191
+  orig: 160, 240
+  offset: 0, 10
+  index: -1
+lz/vfx_xx_11
+  rotate: false
+  xy: 1213, 195
+  size: 160, 195
+  orig: 160, 240
+  offset: 0, 9
+  index: -1
+lz/vfx_xx_12
+  rotate: true
+  xy: 405, 21
+  size: 160, 204
+  orig: 160, 240
+  offset: 0, 2
+  index: -1
+lz/vfx_xx_13
+  rotate: true
+  xy: 933, 30
+  size: 160, 197
+  orig: 160, 240
+  offset: 0, 9
+  index: -1
+lz/vfx_xx_14
+  rotate: false
+  xy: 1537, 196
+  size: 160, 194
+  orig: 160, 240
+  offset: 0, 9
+  index: -1

assets/Module/Club/Effect/wpmj_icon3.atlas.meta

@@ -0,0 +1,6 @@
+{
+  "ver": "1.0.3",
+  "uuid": "70ce3a96-b659-4cad-bdd7-ceb22d087450",
+  "importer": "asset",
+  "subMetas": {}
+}

assets/Module/Club/Effect/wpmj_icon3.json.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.2.5",
+  "uuid": "74ce1b5c-52af-4c59-b1a1-96f745458df1",
+  "importer": "spine",
+  "textures": [
+    "53785080-7046-47ba-9592-512b98271aff"
+  ],
+  "scale": 1,
+  "subMetas": {}
+}

assets/Module/Club/Effect/wpmj_icon3.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "53785080-7046-47ba-9592-512b98271aff",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 1699,
+  "height": 392,
+  "platformSettings": {},
+  "subMetas": {
+    "wpmj_icon3": {
+      "ver": "1.0.6",
+      "uuid": "5d3afe2c-a1d5-4794-bc52-55f63cac62bf",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "53785080-7046-47ba-9592-512b98271aff",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 2,
+      "trimY": 2,
+      "width": 1695,
+      "height": 388,
+      "rawWidth": 1699,
+      "rawHeight": 392,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/Module/Club/Script/LeagueList.js

@@ -115,7 +115,7 @@ cc.Class({
             this.$('@ClubList&Pre').OnUpdateListCheck();
         }
 
-        var TempStr = cc.sys.localStorage.getItem(window.QPName + 'RoomHistory');
+        var TempStr = cc.sys.localStorage.getItem(window.clientName + 'RoomHistory');
         var TempArr = new Array();
         if (TempStr) TempArr = JSON.parse(TempStr);
 
@@ -126,7 +126,7 @@ cc.Class({
             }
             if (!bIn) TempArr.splice(i, 1);
         }
-        cc.sys.localStorage.setItem(window.QPName + 'RoomHistory', JSON.stringify(TempArr));
+        cc.sys.localStorage.setItem(window.clientName + 'RoomHistory', JSON.stringify(TempArr));
     },
 
     OnChangeClub:function(ClubInfo){

assets/Module/GameRecord_2/Script/GameRePlay.js

@@ -31,7 +31,7 @@ cc.Class({
         if(kernel != null) gClientKernel.destory();
 
         //播放背景音乐
-        var BGMIndex = cc.sys.localStorage.getItem(window.QPName+window.Key_TableBGM);
+        var BGMIndex = cc.sys.localStorage.getItem(window.clientName+window.Key_TableBGM);
         if(BGMIndex == null) BGMIndex=0
         cc.gSoundRes.PlayMusic("BGM"+BGMIndex, false);
 

assets/Module/Room/Effect.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "b41c3531-fdb9-44c1-ab8b-877557c47d20",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/Module/Room/Effect/wpmj_icon1.atlas

@@ -0,0 +1,27 @@
+
+wpmj_icon1.png
+size: 473,98
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+1diban
+  rotate: false
+  xy: 185, 18
+  size: 168, 78
+  orig: 168, 78
+  offset: 0, 0
+  index: -1
+1jiantou
+  rotate: false
+  xy: 355, 12
+  size: 116, 84
+  orig: 118, 86
+  offset: 1, 1
+  index: -1
+touying
+  rotate: false
+  xy: 2, 2
+  size: 181, 94
+  orig: 183, 96
+  offset: 1, 1
+  index: -1

assets/Module/Room/Effect/wpmj_icon1.atlas.meta

@@ -0,0 +1,6 @@
+{
+  "ver": "1.0.3",
+  "uuid": "bb322b84-fce4-4975-8c27-b02f9f43840a",
+  "importer": "asset",
+  "subMetas": {}
+}

assets/Module/Room/Effect/wpmj_icon1.json.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.2.5",
+  "uuid": "af6d1317-fdf7-4055-83fb-87bb037adc29",
+  "importer": "spine",
+  "textures": [
+    "fe941bda-71dd-4963-a07f-d02f8fb7fab2"
+  ],
+  "scale": 1,
+  "subMetas": {}
+}

assets/Module/Room/Effect/wpmj_icon1.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "fe941bda-71dd-4963-a07f-d02f8fb7fab2",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 473,
+  "height": 98,
+  "platformSettings": {},
+  "subMetas": {
+    "wpmj_icon1": {
+      "ver": "1.0.6",
+      "uuid": "cea0ecb0-7415-4c37-bef4-99379e49ca69",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "fe941bda-71dd-4963-a07f-d02f8fb7fab2",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 2,
+      "trimY": 2,
+      "width": 469,
+      "height": 94,
+      "rawWidth": 473,
+      "rawHeight": 98,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/Module/Room/Effect/wpmj_icon2.atlas

@@ -0,0 +1,188 @@
+
+wpmj_icon2.png
+size: 450,552
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+2dbb
+  rotate: false
+  xy: 2, 283
+  size: 330, 36
+  orig: 330, 36
+  offset: 0, 0
+  index: -1
+2ddbb
+  rotate: false
+  xy: 2, 321
+  size: 394, 229
+  orig: 394, 229
+  offset: 0, 0
+  index: -1
+2fa
+  rotate: true
+  xy: 170, 151
+  size: 130, 158
+  orig: 130, 158
+  offset: 0, 0
+  index: -1
+2guang
+  rotate: false
+  xy: 2, 264
+  size: 96, 17
+  orig: 98, 19
+  offset: 1, 1
+  index: -1
+2k
+  rotate: true
+  xy: 398, 283
+  size: 267, 48
+  orig: 267, 48
+  offset: 0, 0
+  index: -1
+2pai
+  rotate: true
+  xy: 2, 156
+  size: 102, 101
+  orig: 102, 102
+  offset: 0, 0
+  index: -1
+2r
+  rotate: true
+  xy: 145, 260
+  size: 21, 22
+  orig: 21, 22
+  offset: 0, 0
+  index: -1
+2txt
+  rotate: true
+  xy: 394, 90
+  size: 191, 54
+  orig: 191, 54
+  offset: 0, 0
+  index: -1
+x/x_00000
+  rotate: false
+  xy: 105, 228
+  size: 32, 53
+  orig: 191, 54
+  offset: 0, 1
+  index: -1
+x/x_00001
+  rotate: false
+  xy: 231, 95
+  size: 42, 54
+  orig: 191, 54
+  offset: 0, 0
+  index: -1
+x/x_00002
+  rotate: false
+  xy: 334, 265
+  size: 58, 54
+  orig: 191, 54
+  offset: 0, 0
+  index: -1
+x/x_00003
+  rotate: true
+  xy: 105, 156
+  size: 70, 54
+  orig: 191, 54
+  offset: 0, 0
+  index: -1
+x/x_00004
+  rotate: true
+  xy: 282, 8
+  size: 80, 54
+  orig: 191, 54
+  offset: 2, 0
+  index: -1
+x/x_00005
+  rotate: true
+  xy: 58, 3
+  size: 85, 54
+  orig: 191, 54
+  offset: 7, 0
+  index: -1
+x/x_00006
+  rotate: true
+  xy: 330, 180
+  size: 83, 54
+  orig: 191, 54
+  offset: 19, 0
+  index: -1
+x/x_00007
+  rotate: true
+  xy: 2, 2
+  size: 86, 54
+  orig: 191, 54
+  offset: 30, 0
+  index: -1
+x/x_00008
+  rotate: true
+  xy: 170, 6
+  size: 82, 54
+  orig: 191, 54
+  offset: 44, 0
+  index: -1
+x/x_00009
+  rotate: true
+  xy: 330, 95
+  size: 83, 54
+  orig: 191, 54
+  offset: 54, 0
+  index: -1
+x/x_00010
+  rotate: false
+  xy: 145, 95
+  size: 84, 54
+  orig: 191, 54
+  offset: 66, 0
+  index: -1
+x/x_00011
+  rotate: true
+  xy: 114, 3
+  size: 85, 54
+  orig: 191, 54
+  offset: 76, 0
+  index: -1
+x/x_00012
+  rotate: false
+  xy: 58, 95
+  size: 85, 54
+  orig: 191, 54
+  offset: 89, 0
+  index: -1
+x/x_00013
+  rotate: true
+  xy: 226, 6
+  size: 82, 54
+  orig: 191, 54
+  offset: 102, 0
+  index: -1
+x/x_00014
+  rotate: true
+  xy: 338, 14
+  size: 79, 54
+  orig: 191, 54
+  offset: 112, 0
+  index: -1
+x/x_00015
+  rotate: true
+  xy: 394, 20
+  size: 68, 54
+  orig: 191, 54
+  offset: 123, 0
+  index: -1
+x/x_00016
+  rotate: true
+  xy: 2, 94
+  size: 55, 54
+  orig: 191, 54
+  offset: 136, 0
+  index: -1
+x/x_00017
+  rotate: false
+  xy: 282, 95
+  size: 44, 54
+  orig: 191, 54
+  offset: 147, 0
+  index: -1

assets/Module/Room/Effect/wpmj_icon2.atlas.meta

@@ -0,0 +1,6 @@
+{
+  "ver": "1.0.3",
+  "uuid": "65735d63-45da-4cd6-8b68-ca7e2bc1ab67",
+  "importer": "asset",
+  "subMetas": {}
+}

assets/Module/Room/Effect/wpmj_icon2.json.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.2.5",
+  "uuid": "f8117bc0-8f4c-4c89-bc3e-3bb43c5b1dc7",
+  "importer": "spine",
+  "textures": [
+    "d2cbb01c-49cb-4bb9-9e3b-69fde54c7188"
+  ],
+  "scale": 1,
+  "subMetas": {}
+}

assets/Module/Room/Effect/wpmj_icon2.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "d2cbb01c-49cb-4bb9-9e3b-69fde54c7188",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 450,
+  "height": 552,
+  "platformSettings": {},
+  "subMetas": {
+    "wpmj_icon2": {
+      "ver": "1.0.6",
+      "uuid": "9013623d-5d3e-43af-8a4a-c9ec1f4af55f",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "d2cbb01c-49cb-4bb9-9e3b-69fde54c7188",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 2,
+      "trimY": 2,
+      "width": 446,
+      "height": 548,
+      "rawWidth": 450,
+      "rawHeight": 552,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/Module/Room/Image/CreateRoom2/image/creatArrow1.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "288a30e4-5050-4045-9bfb-9db93c0a9b09",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 18,
+  "height": 31,
+  "platformSettings": {},
+  "subMetas": {
+    "creatArrow1": {
+      "ver": "1.0.6",
+      "uuid": "bfcbcf98-8371-46a2-8623-d6324f0cf13f",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "288a30e4-5050-4045-9bfb-9db93c0a9b09",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 1,
+      "trimY": 1,
+      "width": 16,
+      "height": 29,
+      "rawWidth": 18,
+      "rawHeight": 31,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/Module/Room/Image/CreateRoom2/image/creatArrow2.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "d854ec61-13db-46ef-998b-0ad5d13d5ba9",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 18,
+  "height": 31,
+  "platformSettings": {},
+  "subMetas": {
+    "creatArrow2": {
+      "ver": "1.0.6",
+      "uuid": "2c44260c-3394-43f9-b9ef-2bd1b495d2c5",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "d854ec61-13db-46ef-998b-0ad5d13d5ba9",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 18,
+      "height": 31,
+      "rawWidth": 18,
+      "rawHeight": 31,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/Module/Room/Image/CreateRoom2/image/majiangguan_str.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "87d4104f-9900-4ece-9aea-3c8784698ae7",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 125,
+  "height": 46,
+  "platformSettings": {},
+  "subMetas": {
+    "majiangguan_str": {
+      "ver": "1.0.6",
+      "uuid": "77699208-d7ec-4dba-b7eb-be76c1944082",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "87d4104f-9900-4ece-9aea-3c8784698ae7",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -1,
+      "offsetY": -0.5,
+      "trimX": 0,
+      "trimY": 1,
+      "width": 123,
+      "height": 45,
+      "rawWidth": 125,
+      "rawHeight": 46,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/Module/Room/Script/CreateRoom.js

@@ -1,4 +1,4 @@
-var SelGame = window.QPName+'_C_G'
+var SelGame = window.clientName+'_C_G'
 cc.Class({
     extends: cc.BaseClass,
 

assets/Module/Room/Script/CreateRoom2.js

@@ -1,4 +1,4 @@
-var SelGame = window.QPName + '_C_G'
+var SelGame = window.clientName + '_C_G'
 cc.Class({
     extends: cc.BaseClass,
 
@@ -158,7 +158,7 @@ cc.Class({
         //     return;
         // }
         var KindID = this.m_RoomInfo[0];
-        this.m_GameViewArr[KindID]
+        this.m_GameViewArr[KindID].resetCheck();
         var dwRules = this.m_GameViewArr[KindID].getRulesEx(1);
         var dwServerRules = this.m_GameViewArr[KindID].getServerRules();
         if (this.m_RoomType) dwServerRules = dwServerRules | 4; //俱乐部模式金币场

assets/Module/Room/Script/SelectGame.js

@@ -1,4 +1,4 @@
-var SelGame = window.QPName+'_C_G'
+var SelGame = window.clientName+'_C_G'
 cc.Class({
     extends: cc.BaseClass,
 

assets/Scene/Launch.fire

@@ -88,21 +88,24 @@
       },
       {
         "__id__": 21
+      },
+      {
+        "__id__": 23
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 23
+        "__id__": 38
       },
       {
-        "__id__": 24
+        "__id__": 39
       },
       {
-        "__id__": 25
+        "__id__": 40
       },
       {
-        "__id__": 26
+        "__id__": 41
       }
     ],
     "_prefab": null,
@@ -1123,30 +1126,672 @@
     "_id": "95fKEgJSBICIcpvOp5+JL6"
   },
   {
-    "__type__": "cc.Canvas",
-    "_name": "",
+    "__type__": "cc.Node",
+    "_name": "updateJump",
     "_objFlags": 0,
-    "node": {
+    "_parent": {
       "__id__": 2
     },
-    "_enabled": true,
-    "_designResolution": {
+    "_children": [
+      {
+        "__id__": 24
+      },
+      {
+        "__id__": 28
+      },
+      {
+        "__id__": 30
+      },
+      {
+        "__id__": 32
+      }
+    ],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 37
+      }
+    ],
+    "_prefab": null,
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
       "__type__": "cc.Size",
       "width": 1664,
       "height": 750
     },
-    "_fitWidth": false,
-    "_fitHeight": true,
-    "_id": "59Cd0ovbdF4byw5sbjJDx7"
+    "_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": "aeJp/0uvxNuo+jMyGdwS1g"
   },
   {
-    "__type__": "9191fZpCIdJEZXTyLdjyCiV",
+    "__type__": "cc.Node",
+    "_name": "mask",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 23
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 25
+      },
+      {
+        "__id__": 26
+      },
+      {
+        "__id__": 27
+      }
+    ],
+    "_prefab": null,
+    "_opacity": 150,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 1784,
+      "height": 870
+    },
+    "_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": "15Hx1rHitJb68sfzGrwigc"
+  },
+  {
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 2
+      "__id__": 24
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
+    },
+    "_type": 0,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": "22PsEi4PFEn7lgPSegpv/F"
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 24
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 45,
+    "_left": -60,
+    "_right": -60,
+    "_top": -60,
+    "_bottom": -60,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 100,
+    "_originalHeight": 100,
+    "_id": "75oUkWVwBIvam/uvDPiBVF"
+  },
+  {
+    "__type__": "cc.BlockInputEvents",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 24
+    },
+    "_enabled": true,
+    "_id": "29bfAztoBLM4F/g/TiqEQ5"
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "dialog-bg",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 23
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 29
+      }
+    ],
+    "_prefab": null,
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 635,
+      "height": 432
+    },
+    "_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": "fcOhBzQSVI3Z9LPh9KFRHn"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 28
     },
     "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "9b5bf54f-e0e2-4e33-9513-9e0e644f136e"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": "96JOn4pXVK643RQ7n4w5LV"
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "desc",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 23
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 31
+      }
+    ],
+    "_prefab": null,
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 132,
+      "g": 40,
+      "b": 1,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 288,
+      "height": 45.36
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        35,
+        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": "a5/wvtWQdDRrFbHYe4Fz/B"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 30
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "請更新至最新版本",
+    "_N$string": "請更新至最新版本",
+    "_fontSize": 36,
+    "_lineHeight": 36,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": "98vw8LZwlN7ZHqbHRi1Qy8"
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "btn-confirm",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 23
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 33
+      },
+      {
+        "__id__": 34
+      },
+      {
+        "__id__": 35
+      }
+    ],
+    "_prefab": null,
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 192,
+      "height": 64
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -160,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        0
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": "1037zrsIRKFY0TKJXZrAIl"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 32
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "2f80137f-687f-4f5e-9c8e-5724536e1d88"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": "dbYnjGTFdDBpdHixu9ixtJ"
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 32
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 4,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 183,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": "3563x+KCVN2qnUvYU5RC5p"
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 32
+    },
+    "_enabled": true,
+    "_normalMaterial": null,
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 1.2,
+    "clickEvents": [
+      {
+        "__id__": 36
+      }
+    ],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$transition": 3,
+    "transition": 3,
+    "_N$normalColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_N$hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_N$normalSprite": null,
+    "_N$pressedSprite": null,
+    "pressedSprite": null,
+    "_N$hoverSprite": null,
+    "hoverSprite": null,
+    "_N$disabledSprite": null,
+    "_N$target": {
+      "__id__": 32
+    },
+    "_id": "e4viXVZIRDw6KI51zNwjeR"
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 2
+    },
+    "component": "",
+    "_componentId": "9191fZpCIdJEZXTyLdjyCiV",
+    "handler": "onclickUpdateJump",
+    "customEventData": ""
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 23
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 45,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": "33Dv2Kwz9Ln7q7Z1ApZgec"
+  },
+  {
+    "__type__": "cc.Canvas",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "_designResolution": {
+      "__type__": "cc.Size",
+      "width": 1664,
+      "height": 750
+    },
+    "_fitWidth": false,
+    "_fitHeight": true,
+    "_id": "59Cd0ovbdF4byw5sbjJDx7"
+  },
+  {
+    "__type__": "9191fZpCIdJEZXTyLdjyCiV",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "m_updateTipNode": {
+      "__id__": 23
+    },
     "_id": "31EVF15P5PwapS0QSrF8Fy"
   },
   {

assets/Scene/Lobby.fire

@@ -7626,7 +7626,7 @@
       "ctor": "Float64Array",
       "array": [
         -77,
-        1.5,
+        0,
         0,
         0,
         0,
@@ -7717,7 +7717,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 14,
+      "width": 56,
       "height": 37.8
     },
     "_anchorPoint": {
@@ -7730,7 +7730,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -0.1,
+        -5,
         0,
         0,
         0,
@@ -7769,8 +7769,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "0",
-    "_N$string": "0",
+    "_string": "9523",
+    "_N$string": "9523",
     "_fontSize": 28,
     "_lineHeight": 30,
     "_enableWrapText": true,

assets/Scene/Script/Launch.js

@@ -2,11 +2,12 @@ cc.Class({
     extends: cc.BaseClass,
 
     properties: {
-
+        m_updateTipNode: cc.Node,
     },
 
     ctor: function () {
         this.m_nNeedUpdate = 0;
+        this.m_updateURL = null;
     },
 
     // onLoad: function () {
@@ -88,6 +89,11 @@ cc.Class({
             // this.m_StartAni.playAnimation('newAnimation', 1);  // 播放指定动画（1次）
 
         }
+
+        if (this.m_updateTipNode) {
+            this.m_updateTipNode.active = false;
+        }
+        this._getServerIP();
     },
 
     /* 代码逻辑说明：
@@ -200,6 +206,22 @@ cc.Class({
         cc.director.off('LocalVersion', this.OnLocalVersion, this);
     },
 
+    //获取服务器最新IP
+    _getServerIP() {
+        this.updateIP = true;
+        var xhr = cc.loader.getXMLHttpRequest();
+        xhr.onreadystatechange = function () {
+            if (xhr.readyState === 4 && (xhr.status >= 200 && xhr.status < 400)) {
+               console.log("a1.king-mahjong.tw 返回",xhr.responseText);
+               this.updateIP = false;
+               window.UpdateIPRelatedAddresses(xhr.responseText);
+            }
+        }.bind(this);
+        xhr.timeout = 5000;
+        xhr.open("GET", encodeURI('https://a1.king-mahjong.tw'), true);
+        xhr.send();
+    },
+
     /* 代码逻辑说明：
     1. 场景管理：
        - start() 初始化全局场景引用体系
@@ -253,6 +275,11 @@ cc.Class({
     // },
 
     update: function () {
+        //获取最新IP
+        if (this.updateIP) {
+            return;
+        }
+
         // 更新逻辑控制：仅在 m_nNeedUpdate 有效时执行
         if (this.m_nNeedUpdate > 0) {
             this.m_nNeedUpdate--;  // 递减更新计数器
@@ -301,9 +328,15 @@ cc.Class({
         // return;
 
         // 初始化预加载系统
-        cc.gPreLoader.Init(function () {
-
-            this.ShowLogin();
+        cc.gPreLoader.Init(function (url) {
+            if (url) {
+                this.m_updateURL = url;
+                if (this.m_updateTipNode) {
+                    this.m_updateTipNode.active = true;
+                }
+            } else {
+                this.ShowLogin();
+            }
             return;
 
             // 平台判断分支
@@ -520,7 +553,7 @@ cc.Class({
 
     LoadConfig: function () {
         cc.share.LoadConfig();  // 可能包含：音效开关、语言包、UI皮肤等全局配置
-    }
+    },
 
     /* 功能扩展建议：
     1. 添加加载超时机制：
@@ -540,4 +573,10 @@ cc.Class({
        - 验证服务器地址的合法性
        - 添加SSL证书检测（针对HTTPS）
     */
+
+    onclickUpdateJump() {
+        if (this.m_updateURL) {
+            ThirdPartyOpenUrl(this.m_updateURL);
+        }
+    },
 });

assets/Scene/Script/Lobby.js

@@ -125,7 +125,7 @@ cc.Class({
     onGPLoginComplete: function () {
 
         //播放背景音乐
-        //var BGMIndex = cc.sys.localStorage.getItem(window.QPName+window.Key_TableBGM);
+        //var BGMIndex = cc.sys.localStorage.getItem(window.clientName+window.Key_TableBGM);
         var BGMIndex = window.g_Setting[window.SetKey_Lobby_Music]
         if (BGMIndex == null) BGMIndex = 0
         cc.gSoundRes.PlayMusic("BGM" + BGMIndex, false);
@@ -199,14 +199,14 @@ cc.Class({
     },
     GetLobbyShowArr: function () {
         var ClickArr = new Array(0, 0, 0, 0, 0, 0);
-        var value = cc.sys.localStorage.getItem(window.QPName + 'LobbyShow');
+        var value = cc.sys.localStorage.getItem(window.clientName + 'LobbyShow');
         if (value != null) ClickArr = JSON.parse(value);
         return ClickArr;
     },
     UpdateLobbyShowArr: function (Index) {
         var ClickArr = this.GetLobbyShowArr();
         ClickArr[Index] = new Date().getTime();
-        cc.sys.localStorage.setItem(window.QPName + 'LobbyShow', JSON.stringify(ClickArr));
+        cc.sys.localStorage.setItem(window.clientName + 'LobbyShow', JSON.stringify(ClickArr));
         this.OnCheckLobbyShow();
     },
     // OnCheckLobbyShow:function(){
@@ -842,7 +842,7 @@ cc.Class({
                 GRE.dwClubID[i] = 0;
                 if (ClubList[i]) GRE.dwClubID[i] = ClubList[i].ClubID;
             }
-            var TempStr = cc.sys.localStorage.getItem(window.QPName + 'RoomHistory');
+            var TempStr = cc.sys.localStorage.getItem(window.clientName + 'RoomHistory');
             var TempArr = new Array();
             if (TempStr) TempArr = JSON.parse(TempStr);
             for (var i = 0; i < 40; i++) {
@@ -859,7 +859,7 @@ cc.Class({
             GRE.dwClubID[i] = 0;
             if (ClubList[i]) GRE.dwClubID[i] = ClubList[i].ClubID;
         }
-        var TempStr = cc.sys.localStorage.getItem(window.QPName + 'RoomHistory');
+        var TempStr = cc.sys.localStorage.getItem(window.clientName + 'RoomHistory');
         var TempArr = new Array();
         if (TempStr) TempArr = JSON.parse(TempStr);
         for (var i = 0; i < 40; i++) {

assets/Scene/Script/Platform.js

@@ -16,7 +16,7 @@ window.POP_NOTICE = 1;
 window.PHP_PORT = 8080;
 window.WEB_PORT = 8081;
 window.CLUB_PORT = 0;
-window.LOGIN_SERVER_IP = '35.236.162.201';// 正式服127.0.0.1 34.80.6.45 119.23.152.104 8.148.233.231    34.80.6.45
+window.LOGIN_SERVER_IP = '35.236.162.201';// 正式服 8.148.233.231 34.80.6.45 "p2.king-mahjong.tw"
 window.SOCKET_IP = '35.236.162.201';
 window.IS_UPDATE = false;
 window.LineUp = 1;//上线版本 0  正常  1 
@@ -53,26 +53,26 @@ window.SCENE_WIGHT = window.SCENE_WIGHT_BASE;
 window.SCENE_HEIGHT = window.SCENE_HEIGHT_BASE;
 window.PLATFORM_RATIO = 1;
 
-window.QPName = 'HYHYCS';
+window.clientName = 'HYHYCS';
 window.HUversion = true;//Hot Update
-window.Key_HUVerKey = window.QPName + '_VER';
-window.Key_HUKey = window.QPName + '_sub_';
+window.Key_HUVerKey = window.clientName + '_VER';
+window.Key_HUKey = window.clientName + '_sub_';
 
 window.Key_TableColor = 'TColor';//0绿   1蓝   2紫
 window.Key_TableBGM = 'TBGM00';//
 window.Key_CardColor = 'TCardC';//0:BLUE   1:Green
 
-window.Key_ShowGPS = `${window.QPName}_${window.LOGIN_SERVER_IP}_SGPS`;
-window.Key_ShareTime = `${window.QPName}_${window.LOGIN_SERVER_IP}_Share`;
-window.Key_PhoneCode = `${window.QPName}_${window.LOGIN_SERVER_IP}_PhoneCode`;
-window.Key_PhoneCodeTime = `${window.QPName}_${window.LOGIN_SERVER_IP}_PhoneCodeTime`;
-window.Key_AgreeMent = `${window.QPName}_${window.LOGIN_SERVER_IP}_AgreeMent`;
-window.Key_GameRulesText = `${window.QPName}_${window.LOGIN_SERVER_IP}_Rules`;
-window.Key_LoginPlatform = `${window.QPName}_${window.LOGIN_SERVER_IP}_LoginPlatform`;
-window.Key_ABVersion = `${window.QPName}_${window.LOGIN_SERVER_IP}_ABVersion`;
-window.Key_HUVersionA = `${window.QPName}_${window.LOGIN_SERVER_IP}_HUVersionA`;
-window.Key_HUVersionB = `${window.QPName}_${window.LOGIN_SERVER_IP}_HUVersionB`;
-window.Key_ActivityPop = `${window.QPName}_${window.LOGIN_SERVER_IP}_ActivityPop`;
+window.Key_ShowGPS = `${window.clientName}_${window.LOGIN_SERVER_IP}_SGPS`;
+window.Key_ShareTime = `${window.clientName}_${window.LOGIN_SERVER_IP}_Share`;
+window.Key_PhoneCode = `${window.clientName}_${window.LOGIN_SERVER_IP}_PhoneCode`;
+window.Key_PhoneCodeTime = `${window.clientName}_${window.LOGIN_SERVER_IP}_PhoneCodeTime`;
+window.Key_AgreeMent = `${window.clientName}_${window.LOGIN_SERVER_IP}_AgreeMent`;
+window.Key_GameRulesText = `${window.clientName}_${window.LOGIN_SERVER_IP}_Rules`;
+window.Key_LoginPlatform = `${window.clientName}_${window.LOGIN_SERVER_IP}_LoginPlatform`;
+window.Key_ABVersion = `${window.clientName}_${window.LOGIN_SERVER_IP}_ABVersion`;
+window.Key_HUVersionA = `${window.clientName}_${window.LOGIN_SERVER_IP}_HUVersionA`;
+window.Key_HUVersionB = `${window.clientName}_${window.LOGIN_SERVER_IP}_HUVersionB`;
+window.Key_ActivityPop = `${window.clientName}_${window.LOGIN_SERVER_IP}_ActivityPop`;
 
 window.PLATFORM_WX = 1;
 window.PLATFORM_PHONE = 2;
@@ -137,7 +137,7 @@ window.GameMinusMarkList = [21201];
 
 ////////////////////////////////////////////////////////////////////////////
 
-window.Key_Setting_Head = `${window.QPName}_${window.LOGIN_SERVER_IP}_Setting`;
+window.Key_Setting_Head = `${window.clientName}_${window.LOGIN_SERVER_IP}_Setting`;
 window.SetKey_Music = 'Music';
 window.SetKey_Sound = 'Sound';
 window.SetKey_Lobby_Music = 'LobbyMusic';
@@ -193,6 +193,28 @@ window.g_Setting[window.SetKey_CLUB_TABLE_COLOR] = window.g_DefValue[window.SetK
 
 window.g_GameSetting = new Object();
 
+window.UpdateIPRelatedAddresses = function(newIP) {
+    if (false == !!newIP || newIP == "") {
+        return;
+    }
+    window.LOGIN_SERVER_IP = newIP;
+    window.SOCKET_IP = newIP;
+    window.DOMAIN_NAME = window.LOGIN_SERVER_IP;
+    window.PHP_HOME = `${window.WEB_HEAD}${window.LOGIN_SERVER_IP}:${window.PHP_PORT}`;
+    window.Key_ShowGPS = `${window.clientName}_${window.LOGIN_SERVER_IP}_SGPS`;
+    window.Key_ShareTime = `${window.clientName}_${window.LOGIN_SERVER_IP}_Share`;
+    window.Key_PhoneCode = `${window.clientName}_${window.LOGIN_SERVER_IP}_PhoneCode`;
+    window.Key_PhoneCodeTime = `${window.clientName}_${window.LOGIN_SERVER_IP}_PhoneCodeTime`;
+    window.Key_AgreeMent = `${window.clientName}_${window.LOGIN_SERVER_IP}_AgreeMent`;
+    window.Key_GameRulesText = `${window.clientName}_${window.LOGIN_SERVER_IP}_Rules`;
+    window.Key_LoginPlatform = `${window.clientName}_${window.LOGIN_SERVER_IP}_LoginPlatform`;
+    window.Key_ABVersion = `${window.clientName}_${window.LOGIN_SERVER_IP}_ABVersion`;
+    window.Key_HUVersionA = `${window.clientName}_${window.LOGIN_SERVER_IP}_HUVersionA`;
+    window.Key_HUVersionB = `${window.clientName}_${window.LOGIN_SERVER_IP}_HUVersionB`;
+    window.Key_ActivityPop = `${window.clientName}_${window.LOGIN_SERVER_IP}_ActivityPop`;
+    window.Key_Setting_Head = `${window.clientName}_${window.LOGIN_SERVER_IP}_Setting`;
+}
+
 window.LoadSetting = function (wKindID) {
     if (wKindID && !isNaN(Number(wKindID))) {
         wKindID = Number(wKindID);

assets/Script/CustomClass/BaseClass.js

@@ -218,8 +218,12 @@ cc.BaseClass = cc.Class({
     ////////////////////////////////////////////////////////////////
 });
 
-window.RulesKey = window.QPName + '_Rules_';
-window.RulesKey2 = window.QPName + '_S_Rules_';
+window.RulesKey = window.clientName + '_Rules_';
+window.RulesKey2 = window.clientName + '_S_Rules_';
+window.RoomBaseInfo = {
+    1: [30, 100, 300, 600, 1000],   //底分
+    2: [10, 20, 50, 100, 200],      //台数
+}
 
 cc.SubRoomRules = cc.Class({
     extends: cc.BaseClass,
@@ -245,7 +249,7 @@ cc.SubRoomRules = cc.Class({
         console.log('==========================InitView', Kind, Key, RoomType);
         if (this.m_togArr == null) this.m_togArr = this.node.getComponentsInChildren(cc.Toggle);
         this.m_KindID = Kind;
-        this.m_KeyStr = window.QPName + '_Rules_' + this.m_KindID;
+        this.m_KeyStr = window.RulesKey + this.m_KindID;
         var rules = cc.sys.localStorage.getItem(this.m_KeyStr);
         if (rules != null) rules = JSON.parse(rules);
 
@@ -305,6 +309,12 @@ cc.SubRoomRules = cc.Class({
                     var rIndex = parseInt(rulesIndex / 100);
                     var rValue = parseInt(rulesIndex % 100);
                     if (rValue <= 31 && rIndex < 5) rules[rIndex] += 1 << rValue;
+                } else if (rulesIndex > 10000) {
+                    var rIndex = parseInt(rulesIndex / 1000) % 10;
+                    var rValueIndex = parseInt(rulesIndex % 10);
+                    if (RoomBaseInfo[rIndex]) {
+                        rules[rIndex] = RoomBaseInfo[rIndex][rValueIndex] || 0;
+                    }
                 }
             }
         }
@@ -345,6 +355,7 @@ cc.SubRoomRules = cc.Class({
     GetCustomRules: function () { },
     OnUpdateCustomView: function () { },
     UpdateSubitemTitleColor: function () { },
+    resetCheck: function () { },
 });
 
 cc.GameEngine = cc.Class({
@@ -527,7 +538,7 @@ cc.GameEngine = cc.Class({
                 this.OnUserReSit();
 
                 //房间记录
-                var TempStr = cc.sys.localStorage.getItem(window.QPName + 'RoomHistory');
+                var TempStr = cc.sys.localStorage.getItem(window.clientName + 'RoomHistory');
                 var TempArr = new Array();
                 if (TempStr) TempArr = JSON.parse(TempStr);
                 if (this.m_dwRoomID > 0) {
@@ -537,7 +548,7 @@ cc.GameEngine = cc.Class({
                     }
                     //if(bNotIn)TempArr.push(this.m_dwRoomID);
                 }
-                cc.sys.localStorage.setItem(window.QPName + 'RoomHistory', JSON.stringify(TempArr));
+                cc.sys.localStorage.setItem(window.clientName + 'RoomHistory', JSON.stringify(TempArr));
                 //更新GPS
                 if (GameDef.IsNoCheat(this.m_dwRulesArr)) this.GetSelfGPSInfo();
 
@@ -551,12 +562,12 @@ cc.GameEngine = cc.Class({
                 var pRoomStatus = new CMD_GF_RoomStatus();
                 pRoomStatus.bLockArr = new Array(GameDef.GAME_PLAYER);
                 if (datasize != gCByte.Bytes2Str(pRoomStatus, data)) return false;
-                this.m_wGameProgress = pRoomStatus.wProgress;
+                // this.m_wGameProgress = pRoomStatus.wProgress;
                 this.m_LockArr = pRoomStatus.bLockArr;
                 var kernel = gClientKernel.get();
                 this.m_bLockInRoom = pRoomStatus.bLockArr[this.GetMeChairID()] && !kernel.IsLookonMode();
-                //更新界面
-                this.m_GameClientView.UpdateRoomProgress();
+                // //更新界面
+                // this.m_GameClientView.UpdateRoomProgress();
                 //更新GPS
                 if (GameDef.IsNoCheat(this.m_dwRulesArr)) this.GetSelfGPSInfo();
                 return true;

assets/Script/CustomClass/PreLoader.js

@@ -19,9 +19,14 @@ var PreLoader = cc.Class({
 
     Init: function (CallFunc) {
         //  this.LoadBundleVer(CallFunc);
-        this.getAppVersion(() => {
+        if (cc.sys.isBrowser) {
+            this.loadLocalBundle(CallFunc);
+            return;
+        }
+        this.getAppVersion((url) => {
             if (window.IS_UPDATE) {
-                this.LoadBundleVer(CallFunc)
+                // this.LoadBundleVer(CallFunc)
+                CallFunc(url)
             } else {
                 this.loadLocalBundle(CallFunc)
             }
@@ -129,9 +134,11 @@ var PreLoader = cc.Class({
                     console.log("GetMark=2----版本一样")
                 } else {
                     console.log("GetMark=2----版本不一样")
+                    window.IS_UPDATE = true;
                 }
+                cb(decodeURIComponent(pData.url));
             }
-            cb()
+            // cb()
         }.bind(this))
         console.log("window.APP_BOTTOM_VER--", window.APP_BOTTOM_VER_ANDROID, window.APP_BOTTOM_VER_IOS)
     },

assets/resources/Image/Common.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "0aab3f46-6768-4e9a-93cb-a6e6cdff41cf",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/resources/Image/Common/btn-confirm-y.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "a7a61083-30d3-443f-a05a-fd60db2413cc",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 191,
+  "height": 64,
+  "platformSettings": {},
+  "subMetas": {
+    "btn-confirm-y": {
+      "ver": "1.0.6",
+      "uuid": "b94f2628-b91a-4619-b76f-0f2113ccaed3",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "a7a61083-30d3-443f-a05a-fd60db2413cc",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 191,
+      "height": 64,
+      "rawWidth": 191,
+      "rawHeight": 64,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/Image/Common/btn-confirm.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "f91c4479-863f-4d28-985d-4f2052c967df",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 193,
+  "height": 66,
+  "platformSettings": {},
+  "subMetas": {
+    "btn-confirm": {
+      "ver": "1.0.6",
+      "uuid": "2f80137f-687f-4f5e-9c8e-5724536e1d88",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "f91c4479-863f-4d28-985d-4f2052c967df",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -0.5,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 1,
+      "width": 192,
+      "height": 64,
+      "rawWidth": 193,
+      "rawHeight": 66,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/Image/Common/dialog-bg.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "3e20142b-b35c-43dc-aaa9-196fcc6de8fe",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 639,
+  "height": 436,
+  "platformSettings": {},
+  "subMetas": {
+    "dialog-bg": {
+      "ver": "1.0.6",
+      "uuid": "9b5bf54f-e0e2-4e33-9513-9e0e644f136e",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "3e20142b-b35c-43dc-aaa9-196fcc6de8fe",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -2,
+      "offsetY": 2,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 635,
+      "height": 432,
+      "rawWidth": 639,
+      "rawHeight": 436,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}