1

assets/scene/MainScene.fire

@@ -81,7 +81,7 @@
         "__id__": 8
       },
       {
-        "__id__": 11
+        "__id__": 10
       },
       {
         "__id__": 13
@@ -90,22 +90,25 @@
         "__id__": 15
       },
       {
-        "__id__": 18
+        "__id__": 17
+      },
+      {
+        "__id__": 20
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 22
+        "__id__": 24
       },
       {
-        "__id__": 23
+        "__id__": 25
       },
       {
-        "__id__": 24
+        "__id__": 26
       },
       {
-        "__id__": 25
+        "__id__": 27
       }
     ],
     "_prefab": null,
@@ -314,7 +317,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "特效层2",
+    "_name": "主界面层",
     "_objFlags": 0,
     "_parent": {
       "__id__": 2
@@ -337,6 +340,95 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
+      "width": 750,
+      "height": 1334
+    },
+    "_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": "c4KZdsLhVDXp/ke35SXvVl"
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 6
+    },
+    "_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": 750,
+    "_originalHeight": 1334,
+    "_id": "94HVTPv7RCCrJFibPebIIp"
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "特效层2",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 9
+      }
+    ],
+    "_prefab": null,
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
       "width": 0,
       "height": 0
     },
@@ -379,7 +471,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 6
+      "__id__": 8
     },
     "_enabled": true,
     "_id": "64ERsg/5pFE4l4FAFog9Ci"
@@ -395,10 +487,10 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 9
+        "__id__": 11
       },
       {
-        "__id__": 10
+        "__id__": 12
       }
     ],
     "_prefab": null,
@@ -454,7 +546,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 8
+      "__id__": 10
     },
     "_enabled": true,
     "_id": "28M/hEEcFHZqi/h+X6U+Jt"
@@ -464,7 +556,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 8
+      "__id__": 10
     },
     "_enabled": true,
     "alignMode": 1,
@@ -497,7 +589,7 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 12
+        "__id__": 14
       }
     ],
     "_prefab": null,
@@ -553,7 +645,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 11
+      "__id__": 13
     },
     "_enabled": true,
     "tween_time": 1,
@@ -590,7 +682,7 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 14
+        "__id__": 16
       }
     ],
     "_prefab": null,
@@ -646,7 +738,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 13
+      "__id__": 15
     },
     "_enabled": true,
     "_id": "d7Krs4ut1FS6lgpB36rsTx"
@@ -662,10 +754,10 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 16
+        "__id__": 18
       },
       {
-        "__id__": 17
+        "__id__": 19
       }
     ],
     "_prefab": null,
@@ -721,7 +813,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 15
+      "__id__": 17
     },
     "_enabled": true,
     "alignMode": 1,
@@ -748,7 +840,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 15
+      "__id__": 17
     },
     "_enabled": true,
     "isRegisterEvent": true,
@@ -763,13 +855,13 @@
     },
     "_children": [
       {
-        "__id__": 19
+        "__id__": 21
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 21
+        "__id__": 23
       }
     ],
     "_prefab": null,
@@ -824,10 +916,10 @@
     "__type__": "cc.Node",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 18
+      "__id__": 20
     },
     "_prefab": {
-      "__id__": 20
+      "__id__": 22
     },
     "_name": "GuideWeak",
     "_active": true,
@@ -858,7 +950,7 @@
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 19
+      "__id__": 21
     },
     "asset": {
       "__uuid__": "ba2e33b2-5a64-424b-8b08-247fed4be0f0"
@@ -871,7 +963,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 20
     },
     "_enabled": true,
     "alignMode": 1,
@@ -946,7 +1038,7 @@
     },
     "_enabled": true,
     "node_guide": {
-      "__id__": 18
+      "__id__": 20
     },
     "_id": "6fbJRZsUhE4p90rFOw/XX3"
   },

assets/script/game/game/Farmer.ts

@@ -41,7 +41,7 @@ export class Farmer extends cc.Component {
                 this.forwardMask.node.active = !(this.backMask.node.active = false);
             }
         }
-//return;
+return;
         if(this.refreshTime >=0)
         {
             this.refreshTime -= dt;

assets/script/game/game/Game.ts

@@ -302,7 +302,7 @@ export default class Game extends cc.Component {
     //测试道具获取效果
     private testFly() {
         mk.fly.PlayCoinAnim(1, 20, null, cc.v2(0, 0));
-        // mk.fly.PlayCoinAnim(2, 20, cc.v2(0, -300), 'Canvas/界面层/game/功能按钮/右侧按钮/btn2');
+        // mk.fly.PlayCoinAnim(2, 20, cc.v2(0, -300), 'Canvas/主界面层/game/功能按钮/右侧按钮/btn2');
     }
 
     /** 点击开始 */

assets/script/game/module/login/Login.ts

@@ -1,5 +1,6 @@
 import Util from "../../../before/util/Util";
 import JsbSystem from "../../../mk/system/JsbSystem";
+import { OpenActionType } from "../../../mk/system/UISystem";
 import { UpdateState } from "../../data/AppData";
 import HotUpdatePanel from "../hotUpdate/HotUpdatePanel";
 
@@ -91,7 +92,8 @@ export default class Login extends cc.Component {
                     mk.storage.setStorage("agreementTip", 1, false);
                 }
                 else {
-                    mk.ui.openPanel("game/prefab/game");
+                    let node = cc.find('Canvas/主界面层');
+                    mk.ui.openPanel("game/prefab/game", OpenActionType.normal, node);
                     console.log("===[Jsbsystem 显示开屏广告================================")
                     if (mk.ad.ifShowAd) {
                         JsbSystem.showSplash();

assets/script/mk/system/FlySystem.ts

@@ -73,10 +73,10 @@ export default class FlySystem extends cc.Component {
             if (end == '') {
                 let url = ''
                 if (type == RewardType.redBag) {
-                    url = 'Canvas/界面层/game/node_ui/顶部个人信息/提现按钮/icon_zb';
+                    url = 'Canvas/主界面层/game/node_ui/顶部个人信息/提现按钮/icon_zb';
                 }
                 else if (type == RewardType.pigRmb) {
-                    url = 'Canvas/界面层/game/node_ui/顶部个人信息/金猪币按钮/icon_zb';
+                    url = 'Canvas/主界面层/game/node_ui/顶部个人信息/金猪币按钮/icon_zb';
                 } else {
                     // 未知类型
                     mk.pool.return('game/prefab/coin', target);

assets/script/mk/system/FlySystem2.ts

@@ -73,10 +73,10 @@ export default class FlySystem2 extends cc.Component {
             if (end == '') {
                 let url = ''
                 if (type == RewardType.redBag) {
-                    url = 'Canvas/界面层/game/node_ui/顶部个人信息/提现按钮/icon_zb';
+                    url = 'Canvas/主界面层/game/node_ui/顶部个人信息/提现按钮/icon_zb';
                 }
                 else if (type == RewardType.pigRmb) {
-                    url = 'Canvas/界面层/game/node_ui/顶部个人信息/金猪币按钮/icon_zb';
+                    url = 'Canvas/主界面层/game/node_ui/顶部个人信息/金猪币按钮/icon_zb';
                 } else {
                     // 未知类型
                     mk.pool.return('game/prefab/coin', target);