snxxz_scripts.git

parent: 79668324 | 补丁 | 提交 | ignore whitespace

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-11-05 84198eaf5a3fa897f645110fa148a489d76ca2ff

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

1 文件已复制

1个文件已删除

6个文件已修改

1 文件已重命名

2个文件已添加

	System/Hero/Equipment.cs	68 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Hero/HeroAIRecorder.cs	29 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Hero/HeroAIRecorder.cs.meta	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/MainInterfacePanel/MapSwitchingBehaviour.cs	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/NewBieGuidance/NewBieCenter.cs	50 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/NewBieGuidance/NewBieWin.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Team/MyTeamWin.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Team/TeamAssistTipWin.cs	92 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Team/TeamAssistTipWin.cs.meta	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Team/TeamModel.cs	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Team/TeamPrepareWin.cs	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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

copy from System/Hero/Equipment.cs.meta
copy to System/Hero/HeroAIRecorder.cs.meta
File was copied 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/MainInterfacePanel/MapSwitchingBehaviour.cs

@@ -57,13 +57,13 @@

        private void OnClickMapSwitch()

        {

            if (PlayerDatas.Instance.extersion.bossState == 1)

            {

                SysNotifyMgr.Instance.ShowTip("Task_Transfer1");

                return;

            }

            //if (PlayerDatas.Instance.extersion.bossState == 1)

            //{

            //    SysNotifyMgr.Instance.ShowTip("Task_Transfer1");

            //    return;

            //}

            ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),

               "What？系不系要退出去", (bool isOk) =>

              Language.Get("ZLMapQuit"), (bool isOk) =>

               {

                   if (isOk)

                   {


 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; }

        }



@@ -157,12 +154,15 @@
            FunctionalGuideCenter.Instance.RemoveAllUnderWayGuide();



            currentGuide = _id;

            MapTransferUtility.Instance.Clear();

            if (PlayerDatas.Instance.hero != null)

            {

                HeroAIRecorder.Record();

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

                PlayerDatas.Instance.hero.StopPathFind();

            }



            MapTransferUtility.Instance.Clear();



            var config = Config.Instance.Get<GuideConfig>(currentGuide);

            guideStep = config.Steps.Length > 0 ? config.Steps[0] : 0;



@@ -208,17 +208,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 +458,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/TeamAssistTipWin.cs

New file
@@ -0,0 +1,92 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [  Date ]:           Friday, November 02, 2018
//--------------------------------------------------------

using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using TableConfig;

namespace Snxxz.UI
{
    public class TeamAssistTipWin : Window
    {
        [SerializeField] Text m_Target;
        [SerializeField] Text m_AssistPointOnce;
        [SerializeField] Text m_AssistPointAccumulative;
        [SerializeField] Button m_AssistShop;

        TeamModel model { get { return ModelCenter.Instance.GetModel<TeamModel>(); } }
        DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }

        #region Built-in
        protected override void BindController()
        {
        }

        protected override void AddListeners()
        {
            m_AssistShop.AddListener(GotoShop);
        }

        protected override void OnPreOpen()
        {
            DisplayTarget();
            DisplayAssistPoint();
        }

        protected override void OnAfterOpen()
        {
        }

        protected override void OnPreClose()
        {
        }

        protected override void OnAfterClose()
        {
        }
        #endregion

        private void DisplayTarget()
        {
            var mapId = model.myTeam.mission.mapId;
            var lineId = model.myTeam.mission.mapEx;

            var dungeonId = dungeonModel.GetDungeonId(mapId, lineId);
            var config = Config.Instance.Get<DungeonConfig>(dungeonId);
            if (config != null)
            {
                m_Target.text = Language.Get("", config.FBName);
            }
            else
            {
                m_Target.text = "";
            }
        }

        private void DisplayAssistPoint()
        {
            var onceAssist = 100;
            m_AssistPointOnce.text = Language.Get("", onceAssist);

            var totalAssist = 1000;
            var accumulativeAssist = 800;
            m_AssistPointAccumulative.text = Language.Get("", accumulativeAssist, totalAssist);
        }

        private void GotoShop()
        {

        }

    }

}





 System/Team/TeamAssistTipWin.cs.meta

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

 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;

        }

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;
			}


			}

File was copied 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

			@@ -57,13 +57,13 @@

			private void OnClickMapSwitch()
			{
			if (PlayerDatas.Instance.extersion.bossState == 1)
			{
			SysNotifyMgr.Instance.ShowTip("Task_Transfer1");
			return;
			}
			//if (PlayerDatas.Instance.extersion.bossState == 1)
			//{
			// SysNotifyMgr.Instance.ShowTip("Task_Transfer1");
			// return;
			//}
			ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),
			"What？系不系要退出去", (bool isOk) =>
			Language.Get("ZLMapQuit"), (bool isOk) =>
			{
			if (isOk)
			{

			@@ -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; }
			}

			@@ -157,12 +154,15 @@
			FunctionalGuideCenter.Instance.RemoveAllUnderWayGuide();

			currentGuide = _id;
			MapTransferUtility.Instance.Clear();
			if (PlayerDatas.Instance.hero != null)
			{
			HeroAIRecorder.Record();
			PlayerDatas.Instance.hero.Behaviour.StopHandupAI();
			PlayerDatas.Instance.hero.StopPathFind();
			}

			MapTransferUtility.Instance.Clear();

			var config = Config.Instance.Get<GuideConfig>(currentGuide);
			guideStep = config.Steps.Length > 0 ? config.Steps[0] : 0;

			@@ -208,17 +208,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 +458,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();
			}
			}

			}

			}

			@@ -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()

			@@ -160,7 +160,7 @@
			{
			if (model.myTeam.iamCaptainer)
			{
			model.RecordHeroAI();
			HeroAIRecorder.Record();
			}
			GroupDungeonChallengeProcessor.Instance.GroupChallengeDungeon(model.myTeam.mission.mapId, model.myTeam.mission.mapEx, false);
			}

New file
			@@ -0,0 +1,92 @@
			//--------------------------------------------------------
			// [Author]: 第二世界
			// [ Date ]: Friday, November 02, 2018
			//--------------------------------------------------------

			using System;
			using System.Collections;
			using System.Collections.Generic;
			using UnityEngine;
			using UnityEngine.UI;
			using TableConfig;

			namespace Snxxz.UI
			{
			public class TeamAssistTipWin : Window
			{
			[SerializeField] Text m_Target;
			[SerializeField] Text m_AssistPointOnce;
			[SerializeField] Text m_AssistPointAccumulative;
			[SerializeField] Button m_AssistShop;

			TeamModel model { get { return ModelCenter.Instance.GetModel<TeamModel>(); } }
			DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }

			#region Built-in
			protected override void BindController()
			{
			}

			protected override void AddListeners()
			{
			m_AssistShop.AddListener(GotoShop);
			}

			protected override void OnPreOpen()
			{
			DisplayTarget();
			DisplayAssistPoint();
			}

			protected override void OnAfterOpen()
			{
			}

			protected override void OnPreClose()
			{
			}

			protected override void OnAfterClose()
			{
			}
			#endregion

			private void DisplayTarget()
			{
			var mapId = model.myTeam.mission.mapId;
			var lineId = model.myTeam.mission.mapEx;

			var dungeonId = dungeonModel.GetDungeonId(mapId, lineId);
			var config = Config.Instance.Get<DungeonConfig>(dungeonId);
			if (config != null)
			{
			m_Target.text = Language.Get("", config.FBName);
			}
			else
			{
			m_Target.text = "";
			}
			}

			private void DisplayAssistPoint()
			{
			var onceAssist = 100;
			m_AssistPointOnce.text = Language.Get("", onceAssist);

			var totalAssist = 1000;
			var accumulativeAssist = 800;
			m_AssistPointAccumulative.text = Language.Get("", accumulativeAssist, totalAssist);
			}

			private void GotoShop()
			{

			}

			}

			}

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

			@@ -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);

			@@ -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;
			}