Merge branch 'dev' of http://47.96.66.225:10080/chelios/xsdmx-CocosCreator into dev

assets/Script/game/element/DJ0102.ts

@@ -0,0 +1,113 @@
+import { AudioMgr } from "../../main/ViewManage";
+import EventListener from "../../util/EventListener";
+import BaseEvent from "../fight/evnet/base/BaseEvent";
+
+/**
+ * 要是开启宝箱
+ */
+const { ccclass, property } = cc._decorator;
+
+@ccclass
+export default class DJ0102 extends BaseEvent {
+
+    @property({
+        displayName: '宝箱ID'
+    })
+    boxId: string = '28';
+
+    @property({
+        displayName: "钥匙ID"
+    })
+    keyID: number = 2001;
+
+    @property(sp.Skeleton)
+    spine: sp.Skeleton = null;
+
+    @property({
+        displayName: '靠近提示',
+        type: cc.Node
+    })
+    closeTips: cc.Node = null;
+
+    @property({
+        displayName: '开启提示',
+        type: cc.SpriteFrame
+    })
+    mTipsIcon: cc.SpriteFrame = null;
+
+    /**
+     * 控制的栅栏机关
+     */
+    @property({
+        displayName: '控制的机关',
+        type: [cc.Node],
+    })
+    mFenceTrigger: Array<cc.Node> = [];
+
+    private isOpen = false;
+
+    onLoad() {
+        super.onLoad()
+        // this.closeTips.active = false;
+
+        // let stage = this.ff.main.player.stage;
+        // if (stage.element.indexOf(this.boxId) >= 0) {
+        //     this.node.destroy();
+        //     for (let i = 0; i < this.mFenceTrigger.length; i++) {
+        //         const element = this.mFenceTrigger[i];
+        //         element.destroy()
+        //     }
+        // }
+    }
+
+    /**
+     * 主角进入碰撞区域
+     */
+    public onBegin(tag: number) {
+        if (this.isOpen) {
+            return
+        }
+        if (tag == 1) {
+            // this.closeTips.active = true;
+            this.showOpt(this.mTipsIcon, () => {
+                let head = this.ff.mFFheader;
+                let count = head.getTmpCount(this.keyID);
+                if (count > 0) {
+                    // this.closeTips.active = false;
+                    this.pause();
+                    this.openBox();
+                } else {
+                    EventListener.dispatchEvent("step_2_1");
+                    console.log("===没有钥匙==")
+                }
+            })
+        }
+    }
+    /**
+     * 主角离开碰撞区域
+     */
+    public onEnd(tag: number) {
+        if (tag == 1) {
+            this.closeOpt()
+            // this.closeTips.active = false;
+        }
+    }
+
+    private openBox() {
+        this.isOpen = true;
+        this.closeOpt();
+        this.spine.setAnimation(0, 'open', false);
+        this.ff.main.playerEffectByPath(AudioMgr.box);
+        this.spine.setCompleteListener(() => {
+            this.resume();
+            EventListener.dispatchEvent("step_2_2");
+            // FqLogin.commitEvent(this.node.name, '', '');
+            // this.spine.setCompleteListener(null);
+            // //与服务器通讯
+            // this.getMapObject(this.boxId, () => {
+
+            // })
+        });
+    }
+
+}

assets/Script/game/element/DJ0102.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "71c07e39-d020-4295-b626-fb6ec3ce135a",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/Script/game/fight/evnet/FDialogNoneNPC.ts

@@ -1,5 +1,6 @@
 import FqLogin from "../../../login/FqLogin";
 import { AudioMgr } from "../../../main/ViewManage";
+import EventListener from "../../../util/EventListener";
 import BaseEvent from "./base/BaseEvent";
 
 /**
@@ -14,10 +15,16 @@ export default class FDialogNoneNPC extends BaseEvent {
     mMapDialog: cc.Prefab = null;
 
     @property({
-        displayName: '对话内容',
+        displayName: '对话内容1',
         type: [cc.String]
     })
-    text: Array<string> = [];
+    text1: Array<string> = [];
+
+    @property({
+        displayName: '对话内容2',
+        type: [cc.String]
+    })
+    text2: Array<string> = [];
 
     @property({
         displayName: '靠近的提示',
@@ -86,10 +93,10 @@ export default class FDialogNoneNPC extends BaseEvent {
         this.closeOpt()
     }
 
-    private dialog1(index: number = 0) {
-        if (index >= this.text.length) {
+    public dialog1(index: number = 0) {
+        if (index >= this.text1.length) {
             this.npcFly(() => {
-                this.openmFenceTrigger();  
+                this.openmFenceTrigger();
                 this.spine.node.parent.active = false;
                 this.closeOpt();
             });
@@ -97,7 +104,7 @@ export default class FDialogNoneNPC extends BaseEvent {
             this.resume();
             return;
         }
-        let texts = this.text[index].split('|')
+        let texts = this.text1[index].split('|')
         let mid = parseInt(texts.shift());
         if (mid == -1) {//主角
             let my = this.ff.mainSprite.node;
@@ -113,6 +120,33 @@ export default class FDialogNoneNPC extends BaseEvent {
         }
     }
 
+    public dialog2(index: number = 0) {
+        if (index >= this.text2.length) {
+            this.npcFly(() => {
+                this.openmFenceTrigger();
+                this.spine.node.parent.active = false;
+                this.closeOpt();
+            });
+            this.closeButton();
+            this.resume();
+            return;
+        }
+        let texts = this.text2[index].split('|')
+        let mid = parseInt(texts.shift());
+        if (mid == -1) {//主角
+            let my = this.ff.mainSprite.node;
+            this.showDialog(my, texts, () => {
+                index++;
+                this.dialog2(index);
+            });
+        } else {
+            this.showDialog(this.node, texts, () => {
+                index++;
+                this.dialog2(index);
+            });
+        }
+    }
+
     npcFly(callBack: Function) {
         return
         //1.幽灵变身

assets/Script/game/fight/evnet/FFenceTrigger.ts

@@ -1,5 +1,6 @@
 import FqLogin from "../../../login/FqLogin";
 import CMath from "../../../util/CMath";
+import EventListener from "../../../util/EventListener";
 import { GroupType } from "../object/FObject";
 import FSprite, { SpriteActionType } from "../object/FSprite";
 import BaseEvent from "./base/BaseEvent";
@@ -95,6 +96,11 @@ export default class FFenceTrigger extends BaseEvent {
     })
     isBoss = false;
 
+    @property({
+        displayName: '是否出发剧情'
+    })
+    isPlot = false;
+
     @property({
         displayName: '倒计时时间'
     })
@@ -222,7 +228,6 @@ export default class FFenceTrigger extends BaseEvent {
                 this.ff.pauseSprite(false);
                 this.ff.mBlockInputEvents.active = false;
 
-               
                 for (let i = 0; i < this.mMonster.length; i++) {
                     const element = this.mMonster[i];
                     element.isActive = true;
@@ -439,6 +444,10 @@ export default class FFenceTrigger extends BaseEvent {
                         element.getComponent(cc.PhysicsBoxCollider).enabled = false;
                     }
                     this.ff.pauseSprite(false);
+
+                    if (this.isPlot) {
+                        EventListener.dispatchEvent("Step1");
+                    }
                 })
             ).start();
         })

assets/Script/game/fight/evnet/altar/FAltarGear.ts

@@ -28,6 +28,15 @@ export default class FAltarGear extends cc.Component {
     })
     public altarLight: Array<cc.Node> = [];
 
+    /**
+     * 控制的栅栏机关
+     */
+    @property({
+        displayName: '控制的机关',
+        type: [cc.Node],
+    })
+    mFenceTrigger: Array<cc.Node> = [];
+
     private map: FMap = null;
 
     onLoad() {
@@ -53,12 +62,11 @@ export default class FAltarGear extends cc.Component {
         let ff = this.map.ff;
         ff.pauseSprite(true);
         this.moveCamera(() => {
-            this.node.zIndex = -9999;
-            let nodes = this.node.children;
-            nodes.forEach(element => {
+            this.mFenceTrigger.forEach(element => {
                 let spine = element.children[0].getComponent(sp.Skeleton);
                 if (spine) {
                     spine.setCompleteListener(() => {
+                        element.zIndex = -9999;
                         element.getComponent(cc.PhysicsBoxCollider).enabled = false;
                     });
                     spine.setAnimation(0, SpineName.OPEN, false);

assets/Script/game/fight/evnet/altar/FAltarLight.ts

@@ -72,14 +72,6 @@ export default class FAltarLight extends BaseEvent {
     })
     text: Array<string> = [];
 
-    // /**
-    //  * 控制的栅栏机关
-    //  */
-    //  @property({
-    //     displayName: '控制的机关',
-    //     type: [cc.Node],
-    // })
-    // mFenceTrigger: Array<cc.Node> = [];
 
     onLoad() {
         super.onLoad()

assets/Script/game/gamePlot.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "ff3cf0a6-30c9-4342-a51f-e34dc3135b59",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/Script/game/gamePlot/plot_1_1.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "313acaf1-2bc1-4c74-9a87-8515d018aede",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/Script/game/gamePlot/plot_1_1/Step1.ts

@@ -0,0 +1,35 @@
+import EventListener from "../../../util/EventListener";
+import BaseEvent from "../../fight/evnet/base/BaseEvent";
+
+/**
+ * 地图1  剧情1
+ */
+const { ccclass, property } = cc._decorator;
+
+@ccclass
+export default class Step1 extends BaseEvent {
+
+    @property({
+        displayName: "小矮人",
+        type: cc.Node,
+    })
+    npc_1: cc.Node = null;
+
+    onLoad() {
+        super.onLoad()
+        EventListener.on("Step1", this.npcJump, this);
+        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();
+    }
+
+
+}

assets/Script/game/gamePlot/plot_1_1/Step1.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "16031f29-6a0b-4aac-a8e2-0f6f5ee43dfc",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/Script/game/gamePlot/plot_1_1/Step2.ts

@@ -0,0 +1,35 @@
+import EventListener from "../../../util/EventListener";
+import BaseEvent from "../../fight/evnet/base/BaseEvent";
+import FDialogNoneNPC from "../../fight/evnet/FDialogNoneNPC";
+
+/**
+ * 地图1  剧情1
+ */
+const { ccclass, property } = cc._decorator;
+
+@ccclass
+export default class Step2 extends BaseEvent {
+
+    @property({
+        displayName: "稻草人",
+        type: cc.Node,
+    })
+    ncp_1: cc.Node = null;
+
+    onLoad() {
+        super.onLoad()
+        EventListener.on("step_2_1", this.dialog1, this);
+        EventListener.on("step_2_2", this.dialog2, this);
+    }
+
+    dialog1() {
+        let npc = this.ncp_1.getComponent(FDialogNoneNPC);
+        npc.dialog1();
+    }
+
+    dialog2() {
+        let npc = this.ncp_1.getComponent(FDialogNoneNPC);
+        npc.dialog2();
+    }
+
+}

assets/Script/game/gamePlot/plot_1_1/Step2.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "cb541432-dd6e-480f-9d7b-c0f4d4501871",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/resources/icon/fightUI.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "cd066fdd-c2cc-4cd7-8cab-6213dde9df1c",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/resources/icon/fightUI/tips.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "c46d8f39-c1aa-484d-ab3b-b661ac102e02",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/resources/icon/fightUI/tips/Zd_tishi_gantang_01.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "42dfa149-e260-40c0-902a-58d19b261079",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 32,
+  "height": 32,
+  "platformSettings": {},
+  "subMetas": {
+    "Zd_tishi_gantang_01": {
+      "ver": "1.0.4",
+      "uuid": "c0b225b5-7558-4c7e-a7fd-f78823025dc9",
+      "rawTextureUuid": "42dfa149-e260-40c0-902a-58d19b261079",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -0.5,
+      "offsetY": -0.5,
+      "trimX": 9,
+      "trimY": 2,
+      "width": 13,
+      "height": 29,
+      "rawWidth": 32,
+      "rawHeight": 32,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/icon/fightUI/tips/Zd_tishi_gantang_02.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "3a50abe8-a9dc-415e-be78-0790d5a51c5f",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 32,
+  "height": 32,
+  "platformSettings": {},
+  "subMetas": {
+    "Zd_tishi_gantang_02": {
+      "ver": "1.0.4",
+      "uuid": "a2507970-e520-4515-940b-b2a8e27d20a5",
+      "rawTextureUuid": "3a50abe8-a9dc-415e-be78-0790d5a51c5f",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -0.5,
+      "offsetY": -0.5,
+      "trimX": 9,
+      "trimY": 2,
+      "width": 13,
+      "height": 29,
+      "rawWidth": 32,
+      "rawHeight": 32,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/icon/fightUI/tips/Zd_tishi_huixue_01.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "562b535a-578a-4137-8c81-c82c166828eb",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 32,
+  "height": 32,
+  "platformSettings": {},
+  "subMetas": {
+    "Zd_tishi_huixue_01": {
+      "ver": "1.0.4",
+      "uuid": "7b513763-d448-44ec-8b15-4354b7223a85",
+      "rawTextureUuid": "562b535a-578a-4137-8c81-c82c166828eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -0.5,
+      "offsetY": -1.5,
+      "trimX": 2,
+      "trimY": 5,
+      "width": 27,
+      "height": 25,
+      "rawWidth": 32,
+      "rawHeight": 32,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/icon/fightUI/tips/Zd_tishi_tishi_01.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "d4e533fd-5365-433d-acea-f2aef9ee646b",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 32,
+  "height": 32,
+  "platformSettings": {},
+  "subMetas": {
+    "Zd_tishi_tishi_01": {
+      "ver": "1.0.4",
+      "uuid": "7b55a881-9733-452d-a0d0-0f7bd8a4d14d",
+      "rawTextureUuid": "d4e533fd-5365-433d-acea-f2aef9ee646b",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -0.5,
+      "offsetY": 0,
+      "trimX": 4,
+      "trimY": 2,
+      "width": 23,
+      "height": 28,
+      "rawWidth": 32,
+      "rawHeight": 32,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/icon/fightUI/tips/Zd_tishi_wenhao_01.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "1b9e51d2-8f73-4ca4-ae76-6479ceb84f76",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 32,
+  "height": 32,
+  "platformSettings": {},
+  "subMetas": {
+    "Zd_tishi_wenhao_01": {
+      "ver": "1.0.4",
+      "uuid": "1b4e10ab-019c-4a9f-b9e4-4cedf51bab7d",
+      "rawTextureUuid": "1b9e51d2-8f73-4ca4-ae76-6479ceb84f76",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -1,
+      "offsetY": -0.5,
+      "trimX": 5,
+      "trimY": 3,
+      "width": 20,
+      "height": 27,
+      "rawWidth": 32,
+      "rawHeight": 32,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/icon/fightUI/tips/Zd_tishi_wenhao_02.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "cbad0ed8-eb7c-48c8-b979-cc77f922a640",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 32,
+  "height": 32,
+  "platformSettings": {},
+  "subMetas": {
+    "Zd_tishi_wenhao_02": {
+      "ver": "1.0.4",
+      "uuid": "f58f5a17-1fdb-41c0-9da5-764ad5257cae",
+      "rawTextureUuid": "cbad0ed8-eb7c-48c8-b979-cc77f922a640",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -1,
+      "offsetY": -0.5,
+      "trimX": 5,
+      "trimY": 3,
+      "width": 20,
+      "height": 27,
+      "rawWidth": 32,
+      "rawHeight": 32,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/icon/fightUI/tips/Zd_tishi_yaoshi_01.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "3dab0afe-1c2d-408c-b1ee-b76d97dc2bd7",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 32,
+  "height": 32,
+  "platformSettings": {},
+  "subMetas": {
+    "Zd_tishi_yaoshi_01": {
+      "ver": "1.0.4",
+      "uuid": "1a36a562-e71e-4b5c-8429-f0c1b60f471c",
+      "rawTextureUuid": "3dab0afe-1c2d-408c-b1ee-b76d97dc2bd7",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 1,
+      "trimY": 8,
+      "width": 30,
+      "height": 16,
+      "rawWidth": 32,
+      "rawHeight": 32,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/prefab/element/DJ0102.prefab

@@ -19,28 +19,28 @@
     "_children": [
       {
         "__id__": 2
+      },
+      {
+        "__id__": 5
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 5
-      },
-      {
-        "__id__": 6
+        "__id__": 8
       },
       {
-        "__id__": 7
+        "__id__": 9
       },
       {
-        "__id__": 8
+        "__id__": 10
       },
       {
-        "__id__": 9
+        "__id__": 11
       }
     ],
     "_prefab": {
-      "__id__": 10
+      "__id__": 12
     },
     "_opacity": 255,
     "_color": {
@@ -64,8 +64,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        739.424,
+        2248.519,
         0,
         0,
         0,
@@ -91,7 +91,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "glow_jiaodi",
+    "_name": "spine",
     "_objFlags": 0,
     "_parent": {
       "__id__": 1
@@ -116,8 +116,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 164,
-      "height": 164
+      "width": 130,
+      "height": 136
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -129,7 +129,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        57.415,
+        0,
         0,
         0,
         0,
@@ -168,7 +168,7 @@
     ],
     "paused": false,
     "defaultSkin": "default",
-    "defaultAnimation": "glow_jiaodi",
+    "defaultAnimation": "",
     "_preCacheMode": 0,
     "_cacheMode": 0,
     "loop": true,
@@ -185,7 +185,7 @@
     "_playTimes": 0,
     "_isAniComplete": true,
     "_N$skeletonData": {
-      "__uuid__": "f8abc38f-6d84-4532-ba1b-56e0e5353983"
+      "__uuid__": "755dd236-20ed-4f4c-96db-2c10740ca75a"
     },
     "_N$_defaultCacheMode": 0,
     "_N$debugSlots": false,
@@ -207,47 +207,112 @@
     "sync": false
   },
   {
-    "__type__": "sp.Skeleton",
+    "__type__": "cc.Node",
+    "_name": "closeTips",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 6
+      }
+    ],
+    "_prefab": {
+      "__id__": 7
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 30,
+      "height": 16
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        142.927,
+        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": ""
+  },
+  {
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 1
+      "__id__": 5
     },
     "_enabled": true,
     "_materials": [
       {
-        "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3"
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
       }
     ],
-    "paused": false,
-    "defaultSkin": "default",
-    "defaultAnimation": "",
-    "_preCacheMode": 0,
-    "_cacheMode": 0,
-    "loop": false,
-    "premultipliedAlpha": true,
-    "timeScale": 1,
-    "_accTime": 0,
-    "_playCount": 0,
-    "_frameCache": null,
-    "_curFrame": null,
-    "_skeletonCache": null,
-    "_animationName": "open",
-    "_animationQueue": [],
-    "_headAniInfo": null,
-    "_playTimes": 1,
-    "_isAniComplete": true,
-    "_N$skeletonData": {
-      "__uuid__": "755dd236-20ed-4f4c-96db-2c10740ca75a"
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "1a36a562-e71e-4b5c-8429-f0c1b60f471c"
     },
-    "_N$_defaultCacheMode": 0,
-    "_N$debugSlots": false,
-    "_N$debugBones": false,
-    "_N$debugMesh": false,
-    "_N$useTint": false,
-    "_N$enableBatch": false,
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
     "_id": ""
   },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "c1fa2217-e454-46ca-ad7b-31c2afa8adc4"
+    },
+    "fileId": "4349/kt9JJn6aJsWahIOhp",
+    "sync": false
+  },
   {
     "__type__": "cc.RigidBody",
     "_name": "",
@@ -326,26 +391,25 @@
     "_id": ""
   },
   {
-    "__type__": "1113b7zL+NLVLsgpkD0uOUY",
+    "__type__": "71c07450CBClbYm+27DzhNa",
     "_name": "",
     "_objFlags": 0,
     "node": {
       "__id__": 1
     },
     "_enabled": true,
-    "boxId": "117",
-    "text": [],
+    "boxId": "28",
+    "keyID": 2001,
     "spine": {
+      "__id__": 3
+    },
+    "closeTips": {
       "__id__": 5
     },
     "mTipsIcon": {
-      "__uuid__": "a14d21c5-7536-43cf-83de-61a63435b6dc"
+      "__uuid__": "b1957a0d-b3d0-4e6b-ac36-00efde2b10a1"
     },
-    "guides": [],
-    "isGuide": false,
-    "guideStep": 0,
     "mFenceTrigger": [],
-    "mCancelNode": null,
     "_id": ""
   },
   {