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

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

@@ -83,6 +83,7 @@ export default class FDialogNoneNPC extends BaseEvent {
         if (this.icon) {
             this.icon.active = false;
         }
+        this.pause()
         this.dialog1();
     }
 

assets/Script/game/gamePlot/plot_1_2.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "ca8d31ea-fea4-440d-b7eb-26f4078e57e4",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/Script/game/gamePlot/plot_1_2/DialogEnd1_1_5.ts

@@ -0,0 +1,87 @@
+import FqLogin from "../../../login/FqLogin";
+import { AudioMgr } from "../../../main/ViewManage";
+import { HttpStateType, ReveData } from "../../../util/CHttp";
+import BaseEvent from "../../fight/evnet/base/BaseEvent";
+import WOneByone from "../../fight/evnet/map1/WOneByone";
+
+/**
+ * 闲聊脚本
+ */
+const { ccclass, property } = cc._decorator;
+
+@ccclass
+export default class DialogEnd1_1_5 extends BaseEvent {
+
+    @property({
+        displayName: '靠近的提示',
+        type: cc.Node
+    })
+    icon: cc.Node = null;
+
+    @property({
+        displayName: '提示图标',
+        type: cc.SpriteFrame
+    })
+    mTipsIcon: cc.SpriteFrame = null;
+
+    onLoad() {
+        super.onLoad()
+        // if (this.icon) {
+        //     this.icon.active = false;
+        // }
+    }
+
+    onBegin(tag: number) {
+        if (tag == 1) {
+            this.showOpt(this.mTipsIcon, () => {
+                this.dialog()
+            })
+        } else if (tag == 2) {
+            if (this.icon) {
+                this.icon.active = true;
+            }
+        }
+
+    }
+    onEnd(tag: number) {
+        if (tag == 1) {
+            this.closeOpt()
+        } else if (tag == 2) {
+            if (this.icon) {
+                this.icon.active = false;
+            }
+        }
+    }
+
+    private dialog(){
+        this.pause()
+        let text = [
+            '我们又见面了。',
+        ]
+        this.showDialog(this.node,text,()=>{
+            this.dialog1()
+        })
+    }
+
+    private dialog1(){
+        let text = [
+            '你看起来获得了一些消息。',
+        ]
+        this.showDialog(this.ff.mainSprite.node,text,()=>{
+            this.dialog2()
+        })
+    }
+
+    private dialog2(){
+        let text = [
+            '你看起来获得了一些消息。',
+            '到古阿拉图国遗迹的中心来，我在那里等你'
+        ]
+        this.showDialog(this.node,text,()=>{
+            this.resume()
+            this.node.destroy()
+        })
+    }
+
+
+}

assets/Script/game/gamePlot/plot_1_2/DialogEnd1_1_5.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "2c0e03e5-ed69-4ba0-b0fd-f9dd16fb1db5",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/Script/game/fight/evnet/cage/FCagePet1.ts

@@ -1,11 +1,11 @@
-import FqLogin from "../../../../login/FqLogin";
-import { AudioMgr } from "../../../../main/ViewManage";
-import FFCalAttr from "../../../data/FFCalAttr";
-import AIPet from "../../object/AI/AIPet";
-import { GroupType } from "../../object/FObject";
-import { SpriteActionType } from "../../object/FSprite";
-import PSprite from "../../object/PSprite";
-import BaseEvent from "../base/BaseEvent";
+import FqLogin from "../../../login/FqLogin";
+import { AudioMgr } from "../../../main/ViewManage";
+import FFCalAttr from "../../data/FFCalAttr";
+import BaseEvent from "../../fight/evnet/base/BaseEvent";
+import AIPet from "../../fight/object/AI/AIPet";
+import { GroupType } from "../../fight/object/FObject";
+import { SpriteActionType } from "../../fight/object/FSprite";
+import PSprite from "../../fight/object/PSprite";
 
 const { ccclass, property } = cc._decorator;
 /**
@@ -189,7 +189,21 @@ export default class FCagePet1 extends BaseEvent {
             '多么快活的小家伙！',
             '你做了一件好事。做好事的人心地善良，人也会变得漂亮。',
             '我的妈妈告诉我，人类就是这么变漂亮的。',
+        ]
+        this.showDialog(this.mNPC2,text,()=>{
+            this.meDialog1_1()
+        })
+    }
+    private meDialog1_1(){
+        let text = [
             '……',
+        ]
+        this.showDialog(this.ff.mainSprite.node,text,()=>{
+            this.npcDialog1_1()
+        })
+    }
+    private npcDialog1_1(){
+        let text = [
             '快看，这只小鹿非常喜欢你。它没有红鼻子，但也非常可爱。',
             '但是它一直待在你身边，这让我有点沮丧。'
         ]
@@ -197,6 +211,7 @@ export default class FCagePet1 extends BaseEvent {
             this.meDialog()
         })
     }
+
     private meDialog(){
         let text = [
             '你也帮助了它。',
@@ -279,6 +294,8 @@ export default class FCagePet1 extends BaseEvent {
         ).start()
     }
     private npc3Fly(){
+        let node = this.mNPC3.children[1]
+        node.active = true
         cc.tween(this.mNPC3).sequence(
             cc.moveBy(0.7,cc.v2(800,800)),
             cc.callFunc(()=>{

assets/Script/game/element/JG0106_1.ts

@@ -1,8 +1,7 @@
-import BaseEvent from "../fight/evnet/base/BaseEvent";
-import AIPet from "../fight/object/AI/AIPet";
-import { SpriteActionType } from "../fight/object/FSprite";
-import PSprite from "../fight/object/PSprite";
-import JG0106_2 from "./JG0106_2";
+import BaseEvent from "../../fight/evnet/base/BaseEvent";
+import AIPet from "../../fight/object/AI/AIPet";
+import { SpriteActionType } from "../../fight/object/FSprite";
+import PSprite from "../../fight/object/PSprite";
 /**
  * 带着小鹿走。
 小鹿走到拿钥匙的地方不再走，趴在地上，肚子饿的咕咕声。

assets/Script/game/element/JG0106_2.ts

@@ -1,7 +1,7 @@
-import BaseEvent from "../fight/evnet/base/BaseEvent";
-import AIPet from "../fight/object/AI/AIPet";
-import { SpriteActionType } from "../fight/object/FSprite";
-import PSprite from "../fight/object/PSprite";
+import BaseEvent from "../../fight/evnet/base/BaseEvent";
+import AIPet from "../../fight/object/AI/AIPet";
+import { SpriteActionType } from "../../fight/object/FSprite";
+import PSprite from "../../fight/object/PSprite";
 
 const { ccclass, property } = cc._decorator;
 /**
@@ -28,15 +28,13 @@ export default class JG0106_2 extends BaseEvent {
             this.closeOpt()
             if(count >= 4){
                 head.removeTmpGood(5001,4)
-                this.pettl()
-                this.node.destroy()
+                this.dialog()
             }else{
                 let sprite:PSprite = this.getPet() as PSprite;
                 let text = [
-                    '我好饿。。',
+                    '饿饿..饿饿..',
                 ]
                 this.showDialog(sprite.node, text, () => {
-                    
                 })
             }
         })
@@ -44,10 +42,24 @@ export default class JG0106_2 extends BaseEvent {
     public onEnd(tag: number) {
         this.closeOpt()
     }
-  /**
+
+    private dialog(){
+        this.pause()
+        let sprite:PSprite = this.getPet() as PSprite;
+        let text = [
+            '嗷嗷..嗷嗷..',
+        ]
+        this.showDialog(sprite.node, text, () => {
+            this.resume()
+            this.petBack()
+            this.node.destroy()
+        })
+    }
+
+    /**
      * 宠物脱离队伍
      */
-    private pettl(){
+    private petBack(){
         let sprite:PSprite = this.getPet() as PSprite;
         sprite.inFront = this.ff.mainSprite
         sprite.playAction(SpriteActionType.stand,true)

assets/Script/game/element/JG0106_3.ts

@@ -1,4 +1,4 @@
-import BaseEvent from "../fight/evnet/base/BaseEvent";
+import BaseEvent from "../../fight/evnet/base/BaseEvent";
 
 /**
  * 摘果子

assets/Script/game/element/JG0108_1.ts

@@ -1,4 +1,4 @@
-import BaseEvent from "../fight/evnet/base/BaseEvent";
+import BaseEvent from "../../fight/evnet/base/BaseEvent";
 
 /**
  * 地刺

assets/Script/game/element/JG0111_1.ts

@@ -1,7 +1,7 @@
-import FqLogin from "../../login/FqLogin";
-import { AudioMgr } from "../../main/ViewManage";
-import BaseEvent from "../fight/evnet/base/BaseEvent";
-import { SpriteActionType } from "../fight/object/FSprite";
+import FqLogin from "../../../login/FqLogin";
+import { AudioMgr } from "../../../main/ViewManage";
+import BaseEvent from "../../fight/evnet/base/BaseEvent";
+import { SpriteActionType } from "../../fight/object/FSprite";
 
 
 /**

assets/Script/game/element/JG0111_2.ts

@@ -1,4 +1,4 @@
-import BaseEvent from "../fight/evnet/base/BaseEvent";
+import BaseEvent from "../../fight/evnet/base/BaseEvent";
 
 /**
  * 1-2  遇宠物，向天射箭的精灵族精灵

assets/Script/game/element/JG0111_3.ts

@@ -1,5 +1,5 @@
-import BaseEvent from "../fight/evnet/base/BaseEvent";
-import { SpriteActionType } from "../fight/object/FSprite";
+import BaseEvent from "../../fight/evnet/base/BaseEvent";
+import { SpriteActionType } from "../../fight/object/FSprite";
 
 const {ccclass, property} = cc._decorator;
 /**
@@ -65,7 +65,17 @@ export default class JG0111_3 extends BaseEvent {
             }),
         ).start()
     }
+
     private dialog2() {
+        let text = [
+            '需要一把钥匙......',
+        ]
+        this.showDialog(this.ff.mainSprite.node, text, () => {
+            this.dialog3()
+        })
+    }
+
+    private dialog3() {
         let text = [
             '这是我见过的排名第一的倒霉动物。',
             '我暂且留在这里守护它。',

assets/resources/icon/testmap.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "bc5e9600-4aea-49f0-98a2-285bcc034fc4",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}