2 Commitit 1268448500 ... 512346d802

Tekijä SHA1 Viesti Päivämäärä
  zenghaowei 512346d802 Merge branch 'dev' of http://47.96.66.225:10080/chelios/xsdmx-CocosCreator into dev 3 vuotta sitten
  zenghaowei b7c9b7f9e5 修改 3 vuotta sitten

+ 14 - 0
assets/Script/game/element/ZA0111.ts

@@ -0,0 +1,14 @@
+import BaseEvent from "../fight/evnet/base/BaseEvent";
+/**
+ * 楼梯
+ */
+
+const { ccclass, property } = cc._decorator;
+
+@ccclass
+export default class ZA0111 extends BaseEvent {
+
+    onLoad() {
+        super.onLoad();
+    }
+}

+ 9 - 0
assets/Script/game/element/ZA0111.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "9552d6a6-22d9-42ca-8e7f-1d606b68af37",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 15 - 8
assets/Script/game/gamePlot/plot_1_1/Step1.ts

@@ -18,17 +18,24 @@ export default class Step1 extends BaseEvent {
     onLoad() {
         super.onLoad()
         EventListener.on("Step1", this.npcJump, this);
-        this.npc_1.active = false;
+    }
+
+    start() {
+        if (this.npc_1) {
+            this.npc_1.active = false;
+        }
     }
 
     npcJump() {
-        this.npc_1.active = true;
-        cc.tween(this.npc_1).sequence(
-            cc.moveTo(0.5, cc.v2(this.npc_1.x + 300, this.npc_1.y)),
-            cc.callFunc(() => {
-                console.log("======小矮人跳出来======")
-            })
-        ).start();
+        if (this.npc_1) {
+            this.npc_1.active = true;
+            cc.tween(this.npc_1).sequence(
+                cc.moveTo(0.5, cc.v2(this.npc_1.x + 300, this.npc_1.y)),
+                cc.callFunc(() => {
+                    console.log("======小矮人跳出来======")
+                })
+            ).start();
+        }
     }
 
 

+ 3 - 3
assets/resources/prefab/map/map3.prefab

@@ -35774,7 +35774,7 @@
       "__id__": 22
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 1056
@@ -36435,8 +36435,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        1570.078,
-        654.803,
+        1535.503,
+        3080.841,
         0,
         0,
         0,