第二关剧情

assets/Script/game/data/sdata/SManage.ts

@@ -655,7 +655,7 @@ export default class SManage {
             suitCount: 0,
             attrs: [],
             zdl: 1,
-            skin: null,
+            skin: '30000',
             weapon: null,
             bullet: null
         };

assets/Script/game/element/JG0106_1.ts

@@ -0,0 +1,81 @@
+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";
+/**
+ * 带着小鹿走。
+小鹿走到拿钥匙的地方不再走，趴在地上，肚子饿的咕咕声。
+角色：或许它饿了。
+角色：在附近找一找吃的。
+采集浆果。
+直到采集4个给小鹿吃，小鹿才起身，跟着角色走。
+ */
+const { ccclass, property } = cc._decorator;
+
+@ccclass
+export default class JG0106_1 extends BaseEvent {
+    @property({
+        type:cc.Node,
+        displayName: '宠物碰撞位置'
+    })
+    public mPetNode:cc.Node = null;
+    /**
+     * 主角进入碰撞区域
+     *  @param tag 碰撞组件编号
+     */
+    public onBegin(tag: number) {
+        this.pettl()
+
+        this.pause()
+        this.ff.mainSprite.stopMove()
+        this.ff.mainSprite.playAction(SpriteActionType.run,true)
+        cc.tween(this.ff.mainSprite.node).sequence(
+            cc.moveBy(0.5,cc.v2(-20,0)),
+            cc.callFunc(()=>{
+                this.ff.mainSprite.playAction(SpriteActionType.stand,true)
+                this.ff.mainSprite.setLR(1)
+                this.dialog()
+                let sprite:PSprite = this.getPet() as PSprite;
+                this.mPetNode.x = sprite.node.x
+                this.mPetNode.y = sprite.node.y
+            })
+        ).start()
+        
+    }
+    /**
+     * 宠物脱离队伍
+     */
+    private pettl(){
+        let sprite:PSprite = this.getPet() as PSprite;
+        sprite.inFront = null
+        sprite.playAction(SpriteActionType.dead,false)
+        sprite.node.removeComponent(AIPet)
+
+    }
+
+    private getPet(){
+        let sprites = this.ff.getGroupBy('A')
+        for (let i = 0; i < sprites.length; i++) {
+            const element = sprites[i];
+            if(element != this.ff.mainSprite){
+                return element
+            }
+        }
+    }
+
+
+    private dialog(){
+        let text = [
+            '或许它饿了。',
+            '在附近找一找吃的。',
+        ]
+        this.showDialog(this.ff.mainSprite.node,text,()=>{
+            this.resume()
+            this.node.destroy()
+        })
+    }
+
+
+
+}

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

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "07c98ed9-335e-4382-a5a6-fc48c63d149a",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/Script/game/element/JG0106_2.ts

@@ -0,0 +1,66 @@
+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;
+/**
+ * 采集浆果。
+    直到采集4个给小鹿吃，小鹿才起身，跟着角色走。
+ */
+@ccclass
+export default class JG0106_2 extends BaseEvent {
+
+    @property({
+        type: cc.SpriteFrame,
+        displayName: '图标'
+    })
+    public mTipsIcon: cc.SpriteFrame = null;
+
+    /**
+     * 主角进入碰撞区域
+     *  @param tag 碰撞组件编号
+     */
+    public onBegin(tag: number) {
+        this.showOpt(this.mTipsIcon, () => {
+            let head = this.ff.mFFheader;
+            let count = head.getTmpCount(5001);
+            this.closeOpt()
+            if(count >= 4){
+                head.removeTmpGood(5001,4)
+                this.pettl()
+                this.node.destroy()
+            }else{
+                let sprite:PSprite = this.getPet() as PSprite;
+                let text = [
+                    '我好饿。。',
+                ]
+                this.showDialog(sprite.node, text, () => {
+                    
+                })
+            }
+        })
+    }
+    public onEnd(tag: number) {
+        this.closeOpt()
+    }
+  /**
+     * 宠物脱离队伍
+     */
+    private pettl(){
+        let sprite:PSprite = this.getPet() as PSprite;
+        sprite.inFront = this.ff.mainSprite
+        sprite.playAction(SpriteActionType.stand,true)
+        sprite.node.addComponent(AIPet)
+
+    }
+    private getPet(){
+        let sprites = this.ff.getGroupBy('A')
+        for (let i = 0; i < sprites.length; i++) {
+            const element = sprites[i];
+            if(element != this.ff.mainSprite){
+                return element
+            }
+        }
+    }
+}

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

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "aeaf27ce-b219-42c2-8cfb-24577af9d35d",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/Script/game/element/JG0106_3.ts

@@ -0,0 +1,76 @@
+import BaseEvent from "../fight/evnet/base/BaseEvent";
+
+/**
+ * 摘果子
+ */
+const { ccclass, property } = cc._decorator;
+
+@ccclass
+export default class JG0106_3 extends BaseEvent {
+
+    @property({
+        displayName: '摘取的道具id'
+    })
+    public id = 5001;
+
+    @property({
+        type: cc.ProgressBar,
+        displayName: '进度条'
+    })
+    public mProgressBar: cc.ProgressBar = null;
+
+    @property({
+        type: cc.SpriteFrame,
+        displayName: '图标'
+    })
+    public mTipsIcon: cc.SpriteFrame = null;
+
+    onLoad() {
+        super.onLoad()
+        this.mProgressBar.node.active = false;
+    }
+
+    /**
+     * 主角进入碰撞区域
+     *  @param tag 碰撞组件编号
+     */
+    public onBegin(tag: number) {
+        this.showOpt(this.mTipsIcon, () => {
+            this.pick();
+        })
+    }
+
+    public onEnd(tag: number) {
+        this.closeOpt()
+    }
+    /**
+     * 摘取果子
+     */
+    public pick() {
+        this.closeOpt()
+        this.pause()
+        this.mProgressBar.node.active = true;
+        this.mProgressBar.progress = 0;
+        this.ff.mBlockInputEvents.active = true;
+        this.schedule(this.pupdate, 0.1);
+
+    }
+    public pupdate() {
+        let progress = this.mProgressBar.progress;
+        progress += 0.1;
+        this.mProgressBar.progress = progress;
+        if (progress >= 1) {
+            this.ff.mBlockInputEvents.active = false;
+            this.unschedule(this.pupdate);
+            this.ff.mFFheader.addTmpGood(this.id, 1);
+            this.node.removeComponent(cc.PhysicsBoxCollider);
+            this.resume()
+            cc.tween(this.node).sequence(
+                cc.fadeOut(0.5),
+                cc.destroySelf()
+            ).start()
+        }
+    }
+
+
+}

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

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "735e870a-ea0b-4c65-9551-4bbf8bdb2ace",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/Script/game/element/JG0111_1.ts

@@ -1,6 +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";
 
 
 /**
@@ -28,21 +29,11 @@ export default class JG0111_1 extends BaseEvent {
         type: cc.SpriteFrame,
     })
     mIcon1: cc.SpriteFrame = null;
-
-    /**
-    * 控制的栅栏机关
-    */
-    @property({
-        displayName: '其它开关',
-        type: [cc.Node],
-    })
-    mButtons: Array<cc.Node> = [];
-
     /**
-     * 控制的栅栏机关
+     * 控制的地刺
      */
     @property({
-        displayName: '控制的机关',
+        displayName: '控制的地刺',
         type: [cc.Node],
     })
     mFenceTrigger: Array<cc.Node> = [];
@@ -53,7 +44,20 @@ export default class JG0111_1 extends BaseEvent {
     })
     mPet: cc.Node = null;
 
+    @property({
+        displayName: '对话用NPC',
+        type: cc.Node,
+    })
+    mNpc: cc.Node = null;
 
+    /**
+    * 控制的地刺
+    */
+    @property({
+        displayName: '控制的机关',
+        type: [cc.Node],
+    })
+    mFenceTrigger1: Array<cc.Node> = [];
 
     /**
      * 机关是否已经结束
@@ -62,9 +66,10 @@ export default class JG0111_1 extends BaseEvent {
 
     private count = 0;
 
-    onLoad(){
+    onLoad() {
         super.onLoad();
         this.node.zIndex = -9999;
+        this.mNpc.active = false;
     }
 
     onBeginContact(contact: cc.PhysicsContact, self: cc.PhysicsCollider, other: cc.PhysicsCollider) {
@@ -112,14 +117,8 @@ export default class JG0111_1 extends BaseEvent {
                 }),
                 cc.delayTime(1),
                 cc.callFunc(() => {
-                    this.resume()
                     this.mFenceTrigger[0].getComponent(cc.PhysicsBoxCollider).enabled = false;
-                   
-                    // for (let i = 0; i < this.mFenceTrigger.length; i++) {
-                    //     const element = this.mFenceTrigger[i];
-                    //     // element.active = false;
-                    //     element.getComponent(cc.PhysicsBoxCollider).enabled = false;
-                    // }
+                    this.startPlot()
                 })
             ).start();
         })
@@ -129,10 +128,92 @@ export default class JG0111_1 extends BaseEvent {
         let nodes = element.children;
         for (let i = 0; i < nodes.length; i++) {
             const element = nodes[i];
-            let spine:sp.Skeleton = element.getComponent(sp.Skeleton);
+            let spine: sp.Skeleton = element.getComponent(sp.Skeleton);
             if (spine) {
                 spine.setAnimation(0, action, false);
             }
         }
     }
+    /**
+     * 开始剧情
+     * 1.NPC从左边移动出现
+     */
+    private startPlot() {
+        this.mNpc.active = true;
+        cc.tween(this.mNpc).sequence(
+            cc.moveTo(1, cc.v2(3180, 5870)),
+            cc.callFunc(() => {
+                this.dialog1()
+            })
+        ).start()
+
+        let mainSprite = this.ff.mainSprite
+
+        mainSprite.setLR(-1)
+        mainSprite.playAction(SpriteActionType.run, true)
+        cc.tween(mainSprite.node).sequence(
+            cc.moveTo(1, cc.v2(3388, 5813)),
+            cc.callFunc(() => {
+                mainSprite.playAction(SpriteActionType.stand, true)
+            })
+        ).start()
+    }
+    /**
+     *  落单的精灵：太好了太好了！！（落单的精灵鼓掌）
+        落单的精灵：你成功救出了这头小鹿，我之前尝试了很多次都无法成功。
+        落单的精灵：不得不承认，你出乎了我的意料。
+     */
+    private dialog1() {
+        let text = [
+            '太好了太好了！！',
+            '你成功救出了这头小鹿，我之前尝试了很多次都无法成功。',
+            '不得不承认，你出乎了我的意料。'
+        ]
+        this.showDialog(this.mNpc, text, () => {
+            this.escape()
+        })
+    }
+    /**
+     * 小鹿逃跑
+     */
+    private escape() {
+        for (let i = 0; i < this.mFenceTrigger1.length; i++) {
+            const element = this.mFenceTrigger1[i];
+            element.active = false
+        }
+        let spine = this.mPet.getComponent(sp.Skeleton)
+        spine.setAnimation(0, SpriteActionType.run, true);
+        cc.tween(this.mPet).sequence(
+            cc.moveBy(1,cc.v2(0,-500)),
+            cc.callFunc(()=>{
+                this.dialog2()
+            }),
+            cc.destroySelf()
+        ).start()
+
+    }
+    private dialog2() {
+        let text = [
+            '逃跑了……',
+        ]
+        let mainSprite = this.ff.mainSprite
+        this.showDialog(mainSprite.node, text, () => {
+            this.dialog3()
+        })
+    }
+    private dialog3() {
+        let text = [
+            '快追！！',
+        ]
+        this.showDialog(this.mNpc, text, () => {
+            cc.tween(this.mNpc).sequence(
+                cc.moveTo(1, cc.v2(3294, 5085)),
+                cc.callFunc(() => {
+                    this.resume()
+                }),
+                cc.destroySelf()
+            ).start()
+        })
+    }
+
 }

assets/Script/game/element/JG0111_2.ts

@@ -0,0 +1,44 @@
+import BaseEvent from "../fight/evnet/base/BaseEvent";
+
+/**
+ * 1-2  遇宠物，向天射箭的精灵族精灵
+ * 角色前进，遇到被关在地刺中的宠物。
+    小鹿：嗷嗷……嗷嗷……
+ */
+const { ccclass, property } = cc._decorator;
+
+@ccclass
+export default class JG0111_2 extends BaseEvent {
+
+    @property(cc.Node)
+    mPet: cc.Node = null;
+
+    @property(cc.Prefab)
+    mMapDialog: cc.Prefab = null;
+
+    @property({
+        displayName: '对话内容',
+        type: [cc.String]
+    })
+    text: Array<string> = [];
+
+    public isOver = false
+    /**
+     * 主角进入碰撞区域
+     *  @param tag 碰撞组件编号
+     */
+    public onBegin(tag: number) {
+        if(this.isOver){
+            return
+        }
+        this.isOver = true
+        this.pause()
+        this.moveCamera(this.mPet.getPosition(),0.7,()=>{
+            this.showDialog(this.mPet,this.text,()=>{
+                this.node.destroy()
+                this.resume()
+            })
+        })
+    }
+    
+}

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

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "664f84fe-34b2-4255-86de-594785649e13",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/Script/game/element/JG0111_3.ts

@@ -0,0 +1,78 @@
+import BaseEvent from "../fight/evnet/base/BaseEvent";
+import { SpriteActionType } from "../fight/object/FSprite";
+
+const {ccclass, property} = cc._decorator;
+/**
+ * 剧情
+ * 落单的精灵：可怜的小鹿……居然被这么古老的机关捉住了。
+    角色触碰笼子，提示需要钥匙。
+    落单的精灵：这是我见过的排名第一的倒霉动物。
+    落单的精灵：我暂且留在这里守护它。
+ */
+@ccclass
+export default class JG0111_3 extends BaseEvent {
+
+    @property({
+        displayName: '困住的宠物',
+        type: cc.Node,
+    })
+    mPet: cc.Node = null;
+
+    @property({
+        displayName: '对话用NPC',
+        type: cc.Node,
+    })
+    mNpc: cc.Node = null;
+
+    @property({
+        displayName: '显示的钥匙',
+        type: cc.Node,
+    })
+    mKeyNode: cc.Node = null;
+
+    public onBegin(tag: number) {
+        this.pause()
+        this.dialog1()
+    }
+
+    private dialog1() {
+        let text = [
+            '可怜的小鹿……居然被这么古老的机关捉住了。',
+        ]
+        this.showDialog(this.mNpc, text, () => {
+            this.moveMainSprite()
+        })
+    }
+    /**
+     * 角色触碰笼子，提示需要钥匙。
+     */
+    private moveMainSprite(){
+        let mainSprite = this.ff.mainSprite
+        mainSprite.setLR(1)
+        mainSprite.playAction(SpriteActionType.run, true)
+        cc.tween(mainSprite.node).sequence(
+            cc.moveTo(0.5,cc.v2(3336,4322)),
+            cc.callFunc(()=>{
+                mainSprite.setLR(-1)
+                mainSprite.playAction(SpriteActionType.stand, true)
+                this.mKeyNode.active = true
+            }),
+            cc.delayTime(1),
+            cc.callFunc(()=>{
+                mainSprite.playAction(SpriteActionType.stand, true)
+                this.dialog2()
+                this.mKeyNode.active = false
+            }),
+        ).start()
+    }
+    private dialog2() {
+        let text = [
+            '这是我见过的排名第一的倒霉动物。',
+            '我暂且留在这里守护它。',
+        ]
+        this.showDialog(this.mNpc, text, () => {
+            this.node.destroy()
+            this.resume()
+        })
+    }
+}

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

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "3bef04fd-f366-4803-a4f6-eec83ff12c3e",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/Script/game/fight/FF.ts

@@ -402,10 +402,10 @@ export default class FF extends ViewObject {
                 this.mainSprite.setShooting(false);
             }
             this.uiOutAction();
-            cc.director.getPhysicsManager().enabled = false
+            // cc.director.getPhysicsManager().enabled = false
         } else {
             this.uiInAction();
-            cc.director.getPhysicsManager().enabled = true;
+            // cc.director.getPhysicsManager().enabled = true;
         }
     }
     /**

assets/Script/game/fight/evnet/base/BaseEvent.ts

@@ -22,12 +22,6 @@ export default class BaseEvent extends cc.Component {
     }
 
     onBeginContact(contact: cc.PhysicsContact, self: cc.PhysicsCollider, other: cc.PhysicsCollider) {
-        // if (other.node.group == 'A' && self.tag == 1) {
-        //     let obj = other.node.getComponent(FSprite);
-        //     if (this.spriteList.indexOf(obj) == -1) {
-        //         this.spriteList.push(obj);
-        //     }
-        // }
         if (other.node.group == 'A' && other.tag == 1) {
             let obj = other.node.getComponent(FSprite);
             if (obj == this.ff.mainSprite) {
@@ -37,10 +31,7 @@ export default class BaseEvent extends cc.Component {
     }
 
     onEndContact(contact: cc.PhysicsContact, self: cc.PhysicsCollider, other: cc.PhysicsCollider) {
-        // if (other.node.group == 'A' && self.tag == 1) {
-        //     let obj = other.node.getComponent(FSprite);
-        //     this.removeSprite(obj);
-        // } 
+       
         if (other.node.group == 'A' && other.tag == 1) {
             let obj = other.node.getComponent(FSprite);
             if (obj == this.ff.mainSprite) {
@@ -84,7 +75,7 @@ export default class BaseEvent extends cc.Component {
         let winsize = cc.winSize;
         pos.x -= winsize.width / 2;
         pos.y -= winsize.height / 2;
-
+        
         cc.tween(camera.node).sequence(
             cc.moveTo(time, pos).easing(cc.easeOut(time)),
             cc.callFunc(() => {

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

@@ -55,11 +55,6 @@ export default class FCagePet1 extends BaseEvent {
         type: cc.Node
     })
     mPet: cc.Node = null;//伙伴
-    @property({
-        displayName: '解救出来的对话',
-        type: [cc.String]
-    })
-    dialog2: Array<string> = [];
 
     @property({
         displayName: '宠物预制体',
@@ -74,13 +69,25 @@ export default class FCagePet1 extends BaseEvent {
     mFenceTrigger: Array<cc.Node> = [];
 
     @property({
-        displayName: 'npc',
+        displayName: '落单的精灵',
         type: cc.Node
     })
     mNPC2: cc.Node = null;
 
+    @property({
+        displayName: '路过的矮人',
+        type: cc.Node
+    })
+    mNPC3: cc.Node = null;
+
     private isOver = false;
 
+    onLoad(){
+        super.onLoad()
+
+        this.mNPC3.active = false
+    }
+
     onBegin(tag: number) {
         if (this.isOver) {
             return;
@@ -129,12 +136,10 @@ export default class FCagePet1 extends BaseEvent {
         if (count > 0) {
             head.removeTmpGood(2001, 1);
             this.isOver = true;
-
+            this.pause()
             this.spine.setCompleteListener(() => {
                 this.spine.setCompleteListener(null);
-                this.showDialog(this.node,this.dialog2,()=>{
-                    this.movePet()
-                })
+                this.movePet()
             });
             if (this.spine.findAnimation("open3")) {
                 this.spine.setAnimation(0, 'open3', false);
@@ -157,17 +162,175 @@ export default class FCagePet1 extends BaseEvent {
         spine.setAnimation(0, SpriteActionType.run, true);
         anim.on('finished', this.onFinished, this);
         anim.play('cage_pet_move');
+
+        cc.tween(this.mNPC2).sequence(
+            cc.moveTo(1,cc.v2(3202,3990)),
+            cc.callFunc(()=>{
+                this.npcDialog()
+            })
+        ).start()
     }
     private onFinished(num, string) {
         let anim = this.mPet.getComponent(cc.Animation);
         let spine = this.mPet.getComponent(sp.Skeleton);
         anim.off('finished', this.onFinished, this);
         spine.setAnimation(0, SpriteActionType.stand, true);
-        this.mPet.destroy()
-        this.openDoor()
     }
-    
-    public openDoor(){
+    /**
+     * 落单的精灵：多么快活的小家伙！
+        落单的精灵：你做了一件好事。做好事的人心地善良，人也会变得漂亮。
+        落单的精灵：我的妈妈告诉我，人类就是这么变漂亮的。
+        角色：……
+        落单的精灵：快看，这只小鹿非常喜欢你。它没有红鼻子，但也非常可爱。
+        落单的精灵：但是它一直待在你身边，这让我有点沮丧。
+     */
+    private npcDialog(){
+        let text = [
+            '多么快活的小家伙！',
+            '你做了一件好事。做好事的人心地善良，人也会变得漂亮。',
+            '我的妈妈告诉我，人类就是这么变漂亮的。',
+            '……',
+            '快看，这只小鹿非常喜欢你。它没有红鼻子，但也非常可爱。',
+            '但是它一直待在你身边，这让我有点沮丧。'
+        ]
+        this.showDialog(this.mNPC2,text,()=>{
+            this.meDialog()
+        })
+    }
+    private meDialog(){
+        let text = [
+            '你也帮助了它。',
+        ]
+        this.showDialog(this.ff.mainSprite.node,text,()=>{
+            this.npcDialog1()
+        })
+    }
+    private npcDialog1(){
+        let text = [
+            '等等……它似乎不是普通的小鹿。',
+        ]
+        this.showDialog(this.mNPC2,text,()=>{
+            this.npcDialog2()
+        })
+    }
+    private npcDialog2(){
+        let text = [
+            '这是一只战斗宠物，难怪会出现在这里……',
+            '落单的精灵：恭喜你，它是你的伙伴了！',
+        ]
+        this.showDialog(this.mNPC2,text,()=>{
+            this.getPet()
+            this.npcDialog3()
+        })
+    }
+
+    private getPet(){
+
+        let node = cc.instantiate(this.mPetPrefab);
+        node.group = GroupType.A;
+        node.x = this.node.x + this.mPet.x
+        node.y = this.node.y + this.mPet.y
+        let sp = node.addComponent(PSprite);
+        let attrData = this.ff.main.sManage.getMonsterData(1003);
+        sp.setAttrData(attrData)
+        this.ff.addRole(sp);
+        sp.hp = sp.attrData.hp
+        sp.addComponent(AIPet);
+        this.mPet.removeFromParent();
+    }
+
+
+    private npcDialog3(){
+        let text = [
+            '小法师，我要走了。我得去寻找我的弟弟。',
+        ]
+        this.showDialog(this.mNPC2,text,()=>{
+            this.npc3()
+        })
+    }
+
+    private npc3(){
+        this.mNPC3.active = true
+        cc.tween(this.mNPC3).sequence(
+            cc.moveTo(1,cc.v2(3340,3943)),
+            cc.callFunc(()=>{
+                this.npc3Dialog()
+            })
+        ).start()
+    }
+
+    private npc3Dialog(){
+        let text = [
+            '强大的法师，请……啊！！！',
+        ]
+        this.showDialog(this.mNPC3,text,()=>{
+            this.npc2T()
+        })
+    }
+    /**
+     * NPC2踢飞NPC3
+     */
+    private npc2T(){
+        cc.tween(this.mNPC2).sequence(
+            cc.moveTo(0.5,cc.v2(3340,3943)),
+            cc.callFunc(()=>{
+                this.npc3Fly()
+            })
+        ).start()
+    }
+    private npc3Fly(){
+        cc.tween(this.mNPC3).sequence(
+            cc.moveBy(0.7,cc.v2(800,800)),
+            cc.callFunc(()=>{
+                this.npcDialog4()
+            }),
+            cc.destroySelf()
+        ).start()
+        cc.tween(this.mNPC3).repeatForever(
+            cc.rotateBy(0.1,60)
+        ).start()
+    }
+
+    private npcDialog4(){
+        let text = [
+            '不用为别的事物分心。小法师，你似乎刚刚成为法师？',
+        ]
+        this.showDialog(this.mNPC2,text,()=>{
+            this.meDialog2()
+        })
+    }
+
+    private meDialog2(){
+        let text = [
+            '是的。',
+            '告知失落之地的事情。',
+        ]
+        this.showDialog(this.ff.mainSprite.node,text,()=>{
+            this.npcDialog5()
+        })
+    }
+    private npcDialog5(){
+        let text = [
+            '等等！！',
+            '发生了这么可怕的事情，怎么现在才告诉我。',
+            '我改变了主意，小法师，在森林中等我。'
+        ]
+        this.showDialog(this.mNPC2,text,()=>{
+            this.npc2Move()
+        })
+    }
+    private npc2Move(){
+        cc.tween(this.mNPC2).sequence(
+            cc.moveBy(1,cc.v2(0,-500)),
+            cc.callFunc(()=>{
+                this.openDoor()
+            }),
+            cc.destroySelf()
+        ).start()
+    }
+
+
+    private openDoor(){
         this.pause()
         this.moveCamera(this.mFenceTrigger[0].getPosition(), 1, () => {
             cc.tween(this.node).sequence(

assets/Script/game/fight/object/AI/AIPet.ts

@@ -52,11 +52,11 @@ export default class AIPet extends AIBase {
     }
 
     public AI() {
-        if (!this.canSkill) {
-            return;
-        }
         let target = this.checkTarget();
         if (target) {
+            if (!this.canSkill) {
+                return;
+            }
             (this.sprite as PSprite).stopFollow();
             if (this.sprite.isActive) {
                 let skill: SkillBase = this.checkSkill(target);

assets/Script/game/fight/object/PSprite.ts

@@ -17,13 +17,15 @@ export default class PSprite extends FSprite {
      */
     public inFront: FSprite;
     
+    public zt:boolean = false//暂停
+
     /**
      * 行走路径记录
      */
     private PosList: Array<cc.Vec2> = [];
     private RecordGap = 3; //目标移动多远记录一次距离
     private StopCount = 7; //记录还剩多少时停止移动
-    private isFloowStart = false;
+    private isFloowStart = false;//是否开始跟随
     /**
      * 设置领队
      * @param sprite 
@@ -31,7 +33,7 @@ export default class PSprite extends FSprite {
     public setLeader(sprite: FSprite) {
         this.inFront = sprite;
 
-        this.node.x = this.inFront.node.x;
+        this.node.x = this.inFront.node.x
         this.node.y = this.inFront.node.y
         this.isFollow = true;
     }
@@ -72,7 +74,11 @@ export default class PSprite extends FSprite {
         this.playAction(SpriteActionType.stand, true);
         this.isFollow = false;
     }
+   
     public update(dt) {
+        if(this.zt){
+            return
+        }
         if (this.gamePause) {
             return;
         }
@@ -82,52 +88,27 @@ export default class PSprite extends FSprite {
         if (this.PosList.length > 0) {
             //跟随
             if (this.isFollow) {
-                // let fp = this.inFront.node.getPosition();
-                // if(this.inFront.isWalk){
-                //     this.PosList.push(fp);
-                // }
-                // let tagDis = cc.Vec2.distance(fp, this.node.getPosition());
-                // if(tagDis < 100){
-                //     this.isWalk = false
-                //     this.playAction(SpriteActionType.stand, true);
-                // }else{
-                //     this.isWalk = true
-                //     this.playAction(SpriteActionType.run, true);
-                //     let p0 = this.node.getPosition();
-                //     let p1 = this.PosList.shift();
-                //     this.node.x = p1.x;
-                //     this.node.y = p1.y;
-                //     this.updateSpineF(p0, p1)
-                // }
                 //添加当前Target位置
                 let fp = this.inFront.node.getPosition();
                 let lp = this.PosList[this.PosList.length - 1];
                 let distance = cc.Vec2.distance(fp, lp);
-                // if (fp.x != lp.x || fp.y != lp.y) {
-                //     this.PosList.push(fp);
-                // }
+                
                 if(distance > this.RecordGap){
                     this.PosList.push(fp);
                 }
                 if (this.PosList.length > this.StopCount) {
                     let p0 = this.node.getPosition();
                     let p1 = this.PosList[0];
-                    // let p1 = this.inFront.node.getPosition();
                     if (this.updateSpineF(p0, p1)) {
                         // cc.log('切换了动作');
                         this.tmpActionType = null;
                     }
-                    // this.mRigidBody.allowSleep = false;
                     this.moveTo(p1, dt);
                     this.isWalk = true;
-                    // this.isRuning = this.inFront.isRuning;
 
                     this.playAction(SpriteActionType.run, true);
-                    
                 } 
                 else {
-                    // this.mRigidBody.allowSleep = true;
-                    // this.isRuning = this.inFront.isRuning;
                     this.isWalk = this.inFront.isWalk;
                     if (this.isWalk) {
                         this.playAction(SpriteActionType.run, true);
@@ -138,14 +119,7 @@ export default class PSprite extends FSprite {
                 //清除已经到达的点
                 while (this.PosList.length > 0) {
                     let distance = cc.Vec2.distance(this.node.getPosition(), this.PosList[0]);
-                    // let p0 = this.node.getPosition();
-                    // let p1 = this.PosList[0];
-                    // let x0 = Math.floor(p0.x);
-                    // let x1 = Math.floor(p1.x);
-
-                    // let y0 = Math.floor(p0.y);
-                    // let y1 = Math.floor(p1.y);
-                    // if (x0 == x1 && y0 == y1) {
+                    
                     if (distance <= this.RecordGap) {
                         this.PosList.shift();
                     } else {

assets/resources/prefab/map/animation/cage_pet_move.anim

@@ -5,7 +5,7 @@
   "_native": "",
   "_duration": 0.3333333333333333,
   "sample": 60,
-  "speed": 0.5,
+  "speed": 1,
   "wrapMode": 1,
   "curveData": {
     "props": {
@@ -16,7 +16,7 @@
         },
         {
           "frame": 0.3333333333333333,
-          "value": -565.806
+          "value": -59.53
         }
       ]
     }