zouyong 5 лет назад
Родитель
Сommit
e1c9ae6e09

+ 10 - 10
assets/resources/game/prefab/game.prefab

@@ -179,7 +179,7 @@
       }
       }
     ],
     ],
     "paused": false,
     "paused": false,
-    "defaultSkin": "",
+    "defaultSkin": "default",
     "defaultAnimation": "",
     "defaultAnimation": "",
     "_preCacheMode": 0,
     "_preCacheMode": 0,
     "_cacheMode": 0,
     "_cacheMode": 0,
@@ -3787,8 +3787,8 @@
     },
     },
     "_contentSize": {
     "_contentSize": {
       "__type__": "cc.Size",
       "__type__": "cc.Size",
-      "width": 220,
-      "height": 60
+      "width": 266,
+      "height": 78
     },
     },
     "_anchorPoint": {
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "__type__": "cc.Vec2",
@@ -3799,8 +3799,8 @@
       "__type__": "TypedArray",
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "ctor": "Float64Array",
       "array": [
       "array": [
-        -90.441,
-        101,
+        -84.86,
+        100,
         0,
         0,
         0,
         0,
         0,
         0,
@@ -5142,7 +5142,7 @@
       "__type__": "TypedArray",
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "ctor": "Float64Array",
       "array": [
       "array": [
-        0,
+        -4.931,
         -1,
         -1,
         0,
         0,
         0,
         0,
@@ -5255,7 +5255,7 @@
       "__type__": "TypedArray",
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "ctor": "Float64Array",
       "array": [
       "array": [
-        -6,
+        -10.931,
         0,
         0,
         0,
         0,
         0,
         0,
@@ -5393,7 +5393,7 @@
       "__type__": "TypedArray",
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "ctor": "Float64Array",
       "array": [
       "array": [
-        -94,
+        -98.931,
         0,
         0,
         0,
         0,
         0,
         0,
@@ -5500,7 +5500,7 @@
       "__type__": "TypedArray",
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "ctor": "Float64Array",
       "array": [
       "array": [
-        90,
+        85.069,
         0,
         0,
         0,
         0,
         0,
         0,
@@ -5583,7 +5583,7 @@
       "__type__": "TypedArray",
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "ctor": "Float64Array",
       "array": [
       "array": [
-        120,
+        115.069,
         25,
         25,
         0,
         0,
         0,
         0,

+ 1 - 9
assets/script/before/GamePlay.ts

@@ -177,17 +177,9 @@ export default class GamePlay extends cc.Component {
     private clickGuide(data: string) {
     private clickGuide(data: string) {
         if (data == "1_3") {//点击即可消除哦!
         if (data == "1_3") {//点击即可消除哦!
             this.cellItemDic[0][0] && this.cellItemDic[0][0].onClick();
             this.cellItemDic[0][0] && this.cellItemDic[0][0].onClick();
-            this.cellItemDic[0][1] && this.cellItemDic[0][1].onClick();
         }
         }
-        else if (data == "1_4") {//再点击一次增加大量进度哦
-            this.cellItemDic[0][1] && this.cellItemDic[0][1].onClick();
-            this.cellItemDic[0][2] && this.cellItemDic[0][2].onClick();
-            this.cellItemDic[0][3] && this.cellItemDic[0][3].onClick();
-            this.cellItemDic[0][4] && this.cellItemDic[0][4].onClick();
-        }
-        else if (data == "1_6") {//再点击一次增加大量进度哦
+        else if (data == "1_5") {//再点击一次增加大量进度哦
             this.cellItemDic[1][1] && this.cellItemDic[1][1].onClick();
             this.cellItemDic[1][1] && this.cellItemDic[1][1].onClick();
-            this.cellItemDic[1][2] && this.cellItemDic[1][2].onClick();
         }
         }
     }
     }
 
 

+ 1 - 1
assets/script/mk/system/UISystem.ts

@@ -109,7 +109,7 @@ export default class UISystem extends cc.Component {
 
 
     /**
     /**
      * 关闭panel界面
      * 关闭panel界面
-     * @param panelName 界面名称
+     * @param panelName 通常使用this.node.name代替,界面名称,不是全路径
      * @param callBack  关闭之后回调
      * @param callBack  关闭之后回调
      */
      */
     closePanel(panelName: string, callBack: Function = null) {
     closePanel(panelName: string, callBack: Function = null) {