2 コミット 0086b991bc ... c87537f344

作者 SHA1 メッセージ 日付
  smallqiang c87537f344 Merge branch 'dev' of http://svn.ouj.com:3000/DWG/taptapstar into dev 5 年 前
  smallqiang c94cf52991 修改界面 5 年 前
2 ファイル変更10 行追加10 行削除
  1. 7 7
      assets/scene/game.fire
  2. 3 3
      assets/scripts/game/Game.js

+ 7 - 7
assets/scene/game.fire

@@ -736,7 +736,7 @@
     "_skewY": 0,
     "_zIndex": 0,
     "groupIndex": 0,
-    "_id": "9aYn30/W9BhLvWS80n/QvT"
+    "_id": "6d89an32tBibBu9wIXub9d"
   },
   {
     "__type__": "cc.Label",
@@ -761,7 +761,7 @@
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
-    "_id": "3bimRK99lIcaztothfxFXW"
+    "_id": "a0WYnxP5NLfJgg1mDyYc+7"
   },
   {
     "__type__": "cc.LabelOutline",
@@ -779,7 +779,7 @@
       "a": 255
     },
     "_width": 3,
-    "_id": "61ybVljk9G6p+fCr4Zcovs"
+    "_id": "b2GEVwf0ZExb9yW2v7UntI"
   },
   {
     "__type__": "cc.RichText",
@@ -1834,7 +1834,7 @@
     "_skewY": 0,
     "_zIndex": 0,
     "groupIndex": 0,
-    "_id": "ffckjkwUVMCrh0tnS2v87b"
+    "_id": "71BFS0vUVIHZoVDhfz837Z"
   },
   {
     "__type__": "cc.Label",
@@ -1859,7 +1859,7 @@
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
-    "_id": "8aklNvd0BDB49kig5RWWC9"
+    "_id": "6eNxdObiFNKYmNZPXzDVa0"
   },
   {
     "__type__": "cc.RichText",
@@ -2279,7 +2279,7 @@
     "_skewY": 0,
     "_zIndex": 0,
     "groupIndex": 0,
-    "_id": "806mxoHv5P7IO3hMfB79AP"
+    "_id": "4anisLTupA0p/Ct+qOBs4E"
   },
   {
     "__type__": "cc.Label",
@@ -2304,7 +2304,7 @@
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
-    "_id": "d0JqYruL1BE79dxvyfwE/v"
+    "_id": "98dFFVf8xBh7XopClEZoNZ"
   },
   {
     "__type__": "cc.RichText",

+ 3 - 3
assets/scripts/game/Game.js

@@ -113,10 +113,10 @@ cc.Class({
             this.myInfoTop.height = 200;
             this.sidebar.getComponent(cc.Widget).top = 180;
             this.messageListNode.getComponent(cc.Widget).top = 250 + 30;
-        }
 
-        if (window.tt != undefined) {
-            this.grossNode.getComponent(cc.Widget).top = tt.getMenuButtonLayout().top;
+            if (window.tt != undefined) {
+                this.grossNode.getComponent(cc.Widget).top = 60;
+            }
         }
 
         this.additionTipsNode = this.additionTipsNode.getComponent('AdditionTips');