update bugfix and version

assets/Game/21201/Prefab/GameClientEngine_21201.prefab

@@ -82,7 +82,7 @@
       "y": 0,
       "z": 0
     },
-    "_skewX": 0.1,
+    "_skewX": 0,
     "_skewY": 0,
     "_is3DNode": false,
     "_groupIndex": 0,

assets/Game/21201/Script/GameClientEngine_21201.js

@@ -1186,6 +1186,10 @@ cc.Class({
                 }, 0.3);
                 
             }
+            
+            // if (pOperateNotify.wActionMask & GameDef.WIK_GANG) {
+            //     console.log("操作提示-杠")
+            // }
 
             // if (pOperateNotify.wActionMask & GameDef.WIK_PENG) {
             //     console.log("操作提示-碰")
@@ -1206,6 +1210,7 @@ cc.Class({
             this.m_wActionMask = pOperateNotify.wActionMask;
 
             //设置界面
+            cc.error("OnSubOperateNotify ", pObj.pItem);
             this.m_GameClientView.m_CardView.SetControlInfo(true, pObj.pItem, pObj.pItem.length);
 
             //设置时间

assets/Game/PublicMJ_2/Script/OperateCtrl.js

@@ -40,11 +40,16 @@ cc.Class({
             this.m_OptPrefab = cc.instantiate(this.m_WeaveCtrlPrefab);
             var ctrl = this.m_OptPrefab.getComponent('OperateWeaveCtrl');
             this.m_OperateLayout.node.addChild(this.m_OptPrefab);
-            var SelectInfo = new Array();
-            SelectInfo.cbCardCount = 0;
-            SelectInfo.wWeaveKind = GameDef.WIK_NULL;
-            SelectInfo.cbCardData = new Array();
-            ctrl.SetWeaveInfo(this,SelectInfo);
+            // var SelectInfo = new Array();
+            // SelectInfo.cbCardCount = 0;
+            // SelectInfo.wWeaveKind = GameDef.WIK_NULL;
+            // SelectInfo.cbCardData = new Array();
+            // ctrl.SetWeaveInfo(this,SelectInfo);
+            ctrl.SetWeaveInfo(this, {
+                cbCardCount: 0,
+                wWeaveKind: GameDef.WIK_NULL,
+                cbCardData: []
+            });
             // OptPrefab.setPosition(cc.v2(200,0));
             this.bFirst = true;
             // if(bHu == true)
@@ -66,7 +71,7 @@ cc.Class({
                 this.OptCount++;
             }
             this.WeaveCtrl[i].node.active = true;
-            this.WeaveCtrl[i].SetWeaveInfo(this,WeaveInfo[i]);
+            this.WeaveCtrl[i].SetWeaveInfo(this,WeaveInfo[i], i);
         }
         if(cbWeaveCount<this.OptCount){
             for(var i =cbWeaveCount;i<this.OptCount;++i){
@@ -79,6 +84,7 @@ cc.Class({
         for(var i =0;i<this.WeaveCtrl.length;++i){
             this.WeaveCtrl[i].node.active=false;
         }
+        cc.error("operate card, ", wOperateCode, cbOperateCard, cbCardCount);
         GameDef.g_GameEngine.OnCardOperate(wOperateCode,cbOperateCard,cbCardCount);
     },
 

assets/Game/PublicMJ_2/Script/OperateWeaveCtrl.js

@@ -45,17 +45,24 @@ cc.Class({
     ctor: function () {
         //this.WeaveCard = null;
         this.bLoad = false;
-        this.wOperateCode = 0;
-        this.cbWeaveCardData = new Array();
+        this._resetOperateData();
         this.cbExtraCount = new Array();
         this.isChi = false;
        //this.m_bgChi.active =false;
     },
-    SetWeaveInfo: function (pCtrl, WeaveInfo) {
+
+    _resetOperateData() {
+        this.wOperateCode = 0;
+        this.cbWeaveCardData = [];
+    },
+
+    SetWeaveInfo: function (pCtrl, WeaveInfo, index) {
+        this._resetOperateData();
         this.pCtrl = pCtrl;
         this.isChi = false;
         GameDef.g_GameEngine.m_GameClientView.m_CardView.ChangeCardBack(this.node, GameDef.g_GameEngine.m_CardBack);
         this.cbCardCont = WeaveInfo.cbCardCount;
+        cc.error("SetWeaveInfo ", WeaveInfo, index, this.wOperateCode, this.cbWeaveCardData);
         this.wOperateCode = WeaveInfo.wWeaveKind;
         if (this.bLoad == false) this.onLoad();
         this.m_bgChi.active = false;
@@ -88,11 +95,12 @@ cc.Class({
             case GameDef.WIK_RIGHT:
             case GameDef.WIK_CAI_ZFB:
                 {
-                    if (this.pCtrl.chiCount < 1) {
-                        this.m_tipChi.active = true;
-                    } else {
-                        this.node.active = false;
-                    }
+                    // if (this.pCtrl.chiCount < 1) {
+                    //     this.m_tipChi.active = true;
+                    // } else {
+                    //     this.node.active = false;
+                    // }
+                    this.m_tipChi.active = true;
                     this.pCtrl.WeaveChies[this.pCtrl.chiCount] = this;
                     this.pCtrl.chiCount++;
                     this.isChi = true;
@@ -159,10 +167,10 @@ cc.Class({
                 aniNode.playAnimation(aniName[0], false, false, aniName[1], true);
             }
         }
-
+        let isPengGang = this.wOperateCode == GameDef.WIK_GANG && 1 == WeaveInfo.cbCardCount;
         if (typeof (WeaveInfo) != 'number') {
             for (var i = 0; i < 4; i++) {
-                WeaveInfo.cbCardData[i] = (WeaveInfo.cbCardCount > i) ? WeaveInfo.cbCardData[i] : 0;
+                WeaveInfo.cbCardData[i] = (isPengGang || WeaveInfo.cbCardCount > i) ? WeaveInfo.cbCardData[i] : 0;
                 this.cbWeaveCardData[i] = WeaveInfo.cbCardData[i];
                 if (WeaveInfo.cbExtraCount != null)
                     this.cbExtraCount[i] = WeaveInfo.cbExtraCount[i];
@@ -172,7 +180,7 @@ cc.Class({
             this.WeaveCard.SetWeaveState(WeaveInfo);
             this.WeaveCard.SetWeaveNumber(WeaveInfo.cbExtraCount);
 
-            WeaveCardStatus = false;
+            // WeaveCardStatus = false;
         }
         else {
             WeaveCardStatus = false;
@@ -212,7 +220,7 @@ cc.Class({
                 }
             }
         }
-
+        this._resetOperateData();
     },
     // called every frame, uncomment this function to activate update callback
     // update: function (dt) {

assets/Scene/Script/Launch.js

@@ -51,7 +51,7 @@ cc.Class({
          }else{
             this.$('Version@Label').string = window.APP_BOTTOM_VER_IOS;
          }
-        this.$('VersionUI@Label').string = window.APP_VERSION_UI;
+        this.$('VersionUI@Label').string = ""//window.APP_VERSION_UI;
         // 初始化加载界面节点
         if (!this.m_Loading)
             this.m_Loading = this.$('loading'); // 获取loading子节点

assets/Scene/Script/Lobby.js

@@ -55,7 +55,7 @@ cc.Class({
         //临时处理
         this.m_StoreBtnNode = this.$('plazabg/NdButton/BottomButton/BtMoreStrong');
         if (this.m_StoreBtnNode) {
-            this.m_StoreBtnNode.active = cc.sys.OS_IOS == cc.sys.os || CC_DEBUG;
+            this.m_StoreBtnNode.active = false;// cc.sys.OS_IOS == cc.sys.os || CC_DEBUG;
         }
 
         var pGlobalUserData = g_GlobalUserInfo.GetGlobalUserData();

assets/Scene/Script/Platform.js

@@ -1,11 +1,11 @@
 
 window.g_bInit = false;
 
-window.APP_BOTTOM_VER_ANDROID = `1.0.0.1`;
-window.APP_BOTTOM_VER_IOS = `1.0.0.2`;
+window.APP_BOTTOM_VER_ANDROID = `1.0.0.3`;
+window.APP_BOTTOM_VER_IOS = `1.0.0.3`;
 window.APP_VERSION_ON_LINE = `1.0.0.0`;
 window.APP_VERSION = `1.0.0.0`;
-window.APP_VERSION_UI = `1.0.0.2`;
+window.APP_VERSION_UI = `1.0.0.0`;
 window.APK_NAME = 'QQJNH'
 window.LOCAL_DEBUG = 10;
 window.VCODE_GET = 0;

assets/resources/Image/Head/head_default0.png.meta

@@ -8,8 +8,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 78,
-  "height": 78,
+  "width": 80,
+  "height": 80,
   "platformSettings": {},
   "subMetas": {
     "head_default0": {

assets/resources/Image/Head/head_default1.png.meta

@@ -8,8 +8,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 78,
-  "height": 78,
+  "width": 80,
+  "height": 80,
   "platformSettings": {},
   "subMetas": {
     "head_default1": {

assets/resources/Image/Head/head_default2.png.meta

@@ -8,8 +8,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 78,
-  "height": 78,
+  "width": 80,
+  "height": 80,
   "platformSettings": {},
   "subMetas": {
     "head_default2": {

assets/resources/Image/Head/head_default4.png.meta

@@ -8,8 +8,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 78,
-  "height": 78,
+  "width": 80,
+  "height": 80,
   "platformSettings": {},
   "subMetas": {
     "head_default4": {