update logo

assets/Game/PublicMJ_2/Script/OperateWeaveCtrl.js

@@ -62,7 +62,7 @@ cc.Class({
         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);
+        // cc.error("SetWeaveInfo ", WeaveInfo, index, this.wOperateCode, this.cbWeaveCardData);
         this.wOperateCode = WeaveInfo.wWeaveKind;
         if (this.bLoad == false) this.onLoad();
         this.m_bgChi.active = false;
@@ -170,7 +170,7 @@ cc.Class({
         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] = (WeaveInfo.cbCardCount > i) ? WeaveInfo.cbCardData[i] : 0;
                 this.cbWeaveCardData[i] = WeaveInfo.cbCardData[i];
                 if (isPengGang) {
                     WeaveInfo.cbCardData[i] = WeaveInfo.cbCardData[0];

assets/Scene/Launch.fire

@@ -487,13 +487,13 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Logo",
+    "_name": "Logo_a",
     "_objFlags": 0,
     "_parent": {
       "__id__": 2
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 11
@@ -581,13 +581,13 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Logo_old",
+    "_name": "Logo",
     "_objFlags": 0,
     "_parent": {
       "__id__": 2
     },
     "_children": [],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
         "__id__": 13
@@ -1026,8 +1026,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 433,
-      "height": 161
+      "width": 899,
+      "height": 337
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1079,7 +1079,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "a4c0be49-5591-4f2d-8a1f-ca33bca5a653"
+      "__uuid__": "2cf0b51d-3dcd-4487-a0a9-18a484808aa7"
     },
     "_type": 0,
     "_sizeMode": 1,

assets/Scene/Lobby.fire

@@ -10289,8 +10289,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 433,
-      "height": 161
+      "width": 899,
+      "height": 337
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -10342,7 +10342,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "a4c0be49-5591-4f2d-8a1f-ca33bca5a653"
+      "__uuid__": "2cf0b51d-3dcd-4487-a0a9-18a484808aa7"
     },
     "_type": 0,
     "_sizeMode": 1,