4564 【前端】【1.2.0】优化功能开启表现结束的操作

client_Wu Xijin

2018-11-02 40a4dd42eca9b11c25d03613eb899fe89a66bb4a

4564 【前端】【1.2.0】优化功能开启表现结束的操作

 System/Hero/Equipment.cs

File was deleted

 System/Hero/HeroAIRecorder.cs

New file
@@ -0,0 +1,29 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;

public class HeroAIRecorder
{

    public static bool autoHandupRecord {
        get; private set;
    }

    public static int moveToNPCRecord {
        get; private set;
    }

    public static void Record()
    {
        autoHandupRecord = PlayerDatas.Instance.hero.aiHandler.IsAuto();
        moveToNPCRecord = MapTransferUtility.Instance.NpcID;
    }

    public static void ClearRecord()
    {
        autoHandupRecord = false;
        moveToNPCRecord = 0;
    }


}

 System/Hero/HeroAIRecorder.cs.meta

File was renamed from System/Hero/Equipment.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: f88ee90289d2a9441b1729c63f6ad209
timeCreated: 1502241484
guid: 06b217e97ec00664ea3cc63c13fc534c
timeCreated: 1541148769
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 System/NewBieGuidance/NewBieCenter.cs

@@ -16,21 +16,18 @@
    {



        int m_CurrentGuide = 0;

        public int currentGuide

        {

        public int currentGuide {

            get { return m_CurrentGuide; }

            set { m_CurrentGuide = value; }

        }



        int m_GuideStep = 0;

        public int guideStep

        {

        public int guideStep {

            get { return m_GuideStep; }

            private set { m_GuideStep = value; }

        }



        public bool inGuiding

        {

        public bool inGuiding {

            get { return currentGuide != 0; }

        }



@@ -160,6 +157,7 @@
            MapTransferUtility.Instance.Clear();

            if (PlayerDatas.Instance.hero != null)

            {

                HeroAIRecorder.Record();

                PlayerDatas.Instance.hero.Behaviour.StopHandupAI();

                PlayerDatas.Instance.hero.StopPathFind();

            }

@@ -208,17 +206,12 @@
            send.IsOK = 1;

            GameNetSystem.Instance.SendInfo(send);



            var guideConfig = Config.Instance.Get<GuideConfig>(guideRecord);

            var functionOpenConfig = Config.Instance.Get<FuncOpenLVConfig>(guideConfig.Condition);

            if (functionOpenConfig != null && functionOpenConfig.ContinueTask == 1)

            {

                taskmodel.AutomaticTripToTask(taskmodel.currentMission);

            }



            if (guideCompletedEvent != null)

            {

                guideCompletedEvent(guideRecord);

            }



            Postprocessing(guideRecord);

        }



        public void RemoveNewBieGuide(int _id)

@@ -463,6 +456,33 @@
            }

        }



        private void Postprocessing(int guideId)

        {

            var guideConfig = Config.Instance.Get<GuideConfig>(guideId);

            var functionOpenConfig = Config.Instance.Get<FuncOpenLVConfig>(guideConfig.Condition);

            if (functionOpenConfig != null && functionOpenConfig.ContinueTask == 1)

            {

                taskmodel.AutomaticTripToTask(taskmodel.currentMission);

            }

            else

            {

                if (HeroAIRecorder.autoHandupRecord)

                {

                    if (PlayerDatas.Instance.hero != null)

                    {

                        PlayerDatas.Instance.hero.Behaviour.StartHandupAI();

                    }

                }



                if (HeroAIRecorder.moveToNPCRecord != 0)

                {

                    MapTransferUtility.Instance.MoveToNPC(HeroAIRecorder.moveToNPCRecord);

                }



                HeroAIRecorder.ClearRecord();

            }

        }



    }



}


 System/NewBieGuidance/NewBieWin.cs

@@ -69,6 +69,7 @@


        protected override void OnPreClose()

        {

            NewBieCenter.Instance.guideStepChangeEvent -= OnStepChange;

            if (NewBieCenter.Instance.currentGuide != 0)

            {

                m_newBieGuideUsher.Stop();

@@ -76,8 +77,6 @@
                m_ClickTarget = null;

                NewBieCenter.Instance.FinishCurrentGuideWithoutCloseWin();

            }



            NewBieCenter.Instance.guideStepChangeEvent -= OnStepChange;

        }



        protected override void OnAfterClose()


 System/Team/MyTeamWin.cs

@@ -160,7 +160,7 @@
            {

                if (model.myTeam.iamCaptainer)

                {

                    model.RecordHeroAI();

                    HeroAIRecorder.Record();

                }

                GroupDungeonChallengeProcessor.Instance.GroupChallengeDungeon(model.myTeam.mission.mapId, model.myTeam.mission.mapEx, false);

            }


 System/Team/TeamModel.cs

@@ -1204,20 +1204,6 @@
            return index;

        }



        public bool autoHandupRecord = false;

        public int moveToNPCRecord = 0;

        public void RecordHeroAI()

        {

            autoHandupRecord = PlayerDatas.Instance.hero.aiHandler.IsAuto();

            moveToNPCRecord = MapTransferUtility.Instance.NpcID;

        }



        public void ClearHeroAIRecord()

        {

            autoHandupRecord = false;

            moveToNPCRecord = 0;

        }



        public void OnMapInitOk()

        {

            var mapConfig = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID);


 System/Team/TeamPrepareWin.cs

@@ -58,7 +58,7 @@
            rejectManual = false;

            if (!model.myTeam.iamCaptainer)

            {

                model.RecordHeroAI();

                HeroAIRecorder.Record();

            }



            PlayerDatas.Instance.hero.Behaviour.StopHandupAI();

@@ -102,7 +102,7 @@
        {

            if (rejectManual || model.teamPrepare.isError || model.teamPrepare.IsReject())

            {

                if (model.autoHandupRecord)

                if (HeroAIRecorder.autoHandupRecord)

                {

                    if (PlayerDatas.Instance.hero != null)

                    {

@@ -110,13 +110,13 @@
                    }

                }



                if (model.moveToNPCRecord != 0)

                if (HeroAIRecorder.moveToNPCRecord != 0)

                {

                    MapTransferUtility.Instance.MoveToNPC(model.moveToNPCRecord);

                    MapTransferUtility.Instance.MoveToNPC(HeroAIRecorder.moveToNPCRecord);

                }

            }



            model.ClearHeroAIRecord();

            HeroAIRecorder.ClearRecord();

            model.memberPrepareStateChangeEvent -= ShowPrepareStates;

        }