snxxz_scripts.git

parent: 232ee44c | 补丁 | 提交 | ignore whitespace

client_linchunjie

2019-03-11 5ac5c60d0e3e94836a7aa01b80e579179e38eec8

3335 代码优化

1个文件已删除

1 文件已重命名

1个文件已添加

4个文件已修改

	Core/GameEngine/Model/Player/Realm/PlayerRealmData.cs	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Fight/PrepareHandler.cs	35 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Chat/ChatCenter.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/GatheringSoul/GatherSoulBuildBehaviour.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Realm/NormalCollectWin.cs	98 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Realm/NormalCollectWin.cs.meta	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Realm/RealmCollectWin.cs	115 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Core/GameEngine/Model/Player/Realm/PlayerRealmData.cs

@@ -120,28 +120,6 @@
        High = 2,

    }

    #endregion



    #region 采集

    public float CollectTime { get; private set; }

    public static event Action<H0812_tagBeginPrepare> OnPlayerCollect;

    public static event Action<int, byte> OnPlayerCollectEnd;

    public void OnRefreshData(H0812_tagBeginPrepare vNetData)

    {

        CollectTime = vNetData.MaxTime;

        if (OnPlayerCollect != null)

            OnPlayerCollect(vNetData);

        if (vNetData.PlayerID == PlayerDatas.Instance.baseData.PlayerID)

        {

            WindowCenter.Instance.Open<RealmCollectWin>();

        }

    }



    public void OnRefreshData(H0813_tagPrepareEnd vNetData)

    {

        if (OnPlayerCollectEnd != null)

            OnPlayerCollectEnd((int)vNetData.PlayerID, vNetData.Type);

    }

    #endregion

}



public class RealmHoldData


 Fight/PrepareHandler.cs

@@ -85,7 +85,17 @@
                break;
            case E_PrepareType.pstCollecting:

                PlayerDatas.Instance.realm.OnRefreshData(H0812);
                if (H0812.PlayerID == PlayerDatas.Instance.PlayerId)

                {

                    NormalCollectWin.s_CollectInfo = new ClientH0812()

                    {

                        PlayerID = PlayerDatas.Instance.PlayerId,

                        PrepareState = (byte)E_PrepareType.pstMissionCollecting,

                        MaxTime = H0812.MaxTime,

                        PrepareID = (int)H0812.PrepareID,

                    };

                    WindowCenter.Instance.Open<NormalCollectWin>();

                }

                _player = GAMgr.Instance.GetBySID(H0812.PlayerID) as GActorPlayerBase;
                if (_player != null)
@@ -108,7 +118,17 @@
                break;
            case E_PrepareType.pstMissionCollecting:

                PlayerDatas.Instance.realm.OnRefreshData(H0812);
                if (H0812.PlayerID == PlayerDatas.Instance.PlayerId)

                {

                    NormalCollectWin.s_CollectInfo = new ClientH0812()

                    {

                        PlayerID = PlayerDatas.Instance.PlayerId,

                        PrepareState = (byte)E_PrepareType.pstMissionCollecting,

                        MaxTime = H0812.MaxTime,

                        PrepareID = (int)H0812.PrepareID,

                    };

                    WindowCenter.Instance.Open<NormalCollectWin>();

                }

                _player = GAMgr.Instance.GetBySID(H0812.PlayerID) as GActorPlayerBase;
                if (_player != null)
@@ -135,6 +155,7 @@
    }

    public UnityEngine.Events.UnityAction OnPrepareEndSuccess;
    public UnityEngine.Events.UnityAction<int, int> OnPrepareEnd;

    public void ServerPrepareEnd(H0813_tagPrepareEnd h0813)
    {
@@ -147,7 +168,11 @@
        }

        WindowCenter.Instance.Close<PrepareWin>();
        PlayerDatas.Instance.realm.OnRefreshData(h0813);

        if (h0813.PlayerID == PlayerDatas.Instance.baseData.PlayerID)

        {

            WindowCenter.Instance.Close<NormalCollectWin>();

        }

        GActorPlayerBase _player = null;

@@ -240,6 +265,10 @@
            //Debug.LogFormat("收到进度条结束异常情况: {0}", (E_PrepareType)h0813.Type);
        }

        if (OnPrepareEnd != null)

        {

            OnPrepareEnd((int)h0813.PlayerID, h0813.Type);

        }

        H0812 = null;
    }

 System/Chat/ChatCenter.cs

@@ -25,8 +25,7 @@
            VoiceHttpRequest.Instance.samplesDecodecComplete += SamplesDecodecComplete;

            WindowCenter.Instance.windowAfterOpenEvent += WindowAfterOpenEvent;

            StageLoad.Instance.onStageLoadFinish += OnStageLoadFinish;

            PlayerRealmData.OnPlayerCollectEnd += OnPlayerCollectEnd;

            //SnxxzGame.Instance.AddApplicationOutAction(OnApplicationQuit);

            PrepareHandler.Instance.OnPrepareEnd += OnPrepareEnd;



            var time = bandTime;

            banTimeArray[0] = time.Year;

@@ -784,7 +783,7 @@


        #region 仙盟宴会采集完后打开聊天界面

        bool openChatAfterCollect = false;

        private void OnPlayerCollectEnd(int playerId, byte type)

        private void OnPrepareEnd(int playerId, int type)

        {

            if (playerId == PlayerDatas.Instance.baseData.PlayerID

                && type == 0 && PlayerDatas.Instance.baseData.MapID == 31230)


 System/GatheringSoul/GatherSoulBuildBehaviour.cs

@@ -39,7 +39,7 @@
        {

            get

            {

                return WindowCenter.Instance.IsOpen<RealmCollectWin>();

                return WindowCenter.Instance.IsOpen<NormalCollectWin>();

            }

        }




 System/Realm/NormalCollectWin.cs

New file
@@ -0,0 +1,98 @@
//--------------------------------------------------------

//    [Author]:           第二世界

//    [  Date ]:           Saturday, October 14, 2017

//--------------------------------------------------------



using System;

using System.Collections;

using System.Collections.Generic;

using UnityEngine;

using UnityEngine.UI;



namespace Snxxz.UI

{



    public class NormalCollectWin : Window

    {

        [SerializeField] SmoothSlider m_SmoothSlider;

        [SerializeField] Text m_Progress;

        [SerializeField] Text m_FairyFeastTip;



        DateTime endTime;

        float currentProgress = 0;



        public static PrepareHandler.ClientH0812 s_CollectInfo;



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

        #region Built-in

        protected override void BindController()

        {

        }



        protected override void AddListeners()

        {



        }



        protected override void OnPreOpen()

        {

            currentProgress = 0f;



            m_SmoothSlider.ResetValue(0);



            m_Progress.text = StringUtility.Contact(currentProgress, "%");



            endTime = TimeUtility.ServerNow.AddMilliseconds(s_CollectInfo.MaxTime);



            var mapId = dungeonModel.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);

            m_FairyFeastTip.gameObject.SetActive(mapId == 31230);

        }



        protected override void OnAfterOpen()

        {



        }



        protected override void OnPreClose()

        {

        }



        protected override void OnAfterClose()

        {

        }



        protected override void OnActived()

        {

            if (!PrepareHandler.Instance.isPreparing)

            {

                CloseClick();

            }

        }



        protected override void LateUpdate()

        {

            var progress = 1 - (float)(endTime - TimeUtility.ServerNow).TotalMilliseconds / s_CollectInfo.MaxTime;

            m_SmoothSlider.value = progress;



            progress = (float)Math.Round(progress * 100, 0);

            if (currentProgress != progress)

            {

                currentProgress = progress;

                m_Progress.text = StringUtility.Contact(currentProgress, "%");

            }



            if (currentProgress >= 1)

            {

                CloseImmediately();

            }

        }

        #endregion





    }



}










 System/Realm/NormalCollectWin.cs.meta

File was renamed from System/Realm/RealmCollectWin.cs.meta
@@ -1,12 +1,12 @@
fileFormatVersion: 2
guid: 750c734c2d7b6fc4c85368c8bbf4d499
timeCreated: 1507974546
licenseType: Free
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
fileFormatVersion: 2

guid: 750c734c2d7b6fc4c85368c8bbf4d499

timeCreated: 1507974546

licenseType: Free

MonoImporter:

  serializedVersion: 2

  defaultReferences: []

  executionOrder: 0

  icon: {instanceID: 0}

  userData: 
  assetBundleName: 
  assetBundleVariant: 

 System/Realm/RealmCollectWin.cs

File was deleted

			@@ -120,28 +120,6 @@
			High = 2,
			}
			#endregion

			#region 采集
			public float CollectTime { get; private set; }
			public static event Action<H0812_tagBeginPrepare> OnPlayerCollect;
			public static event Action<int, byte> OnPlayerCollectEnd;
			public void OnRefreshData(H0812_tagBeginPrepare vNetData)
			{
			CollectTime = vNetData.MaxTime;
			if (OnPlayerCollect != null)
			OnPlayerCollect(vNetData);
			if (vNetData.PlayerID == PlayerDatas.Instance.baseData.PlayerID)
			{
			WindowCenter.Instance.Open<RealmCollectWin>();
			}
			}

			public void OnRefreshData(H0813_tagPrepareEnd vNetData)
			{
			if (OnPlayerCollectEnd != null)
			OnPlayerCollectEnd((int)vNetData.PlayerID, vNetData.Type);
			}
			#endregion
			}

			public class RealmHoldData

			@@ -85,7 +85,17 @@
			break;
			case E_PrepareType.pstCollecting:

			PlayerDatas.Instance.realm.OnRefreshData(H0812);
			if (H0812.PlayerID == PlayerDatas.Instance.PlayerId)
			{
			NormalCollectWin.s_CollectInfo = new ClientH0812()
			{
			PlayerID = PlayerDatas.Instance.PlayerId,
			PrepareState = (byte)E_PrepareType.pstMissionCollecting,
			MaxTime = H0812.MaxTime,
			PrepareID = (int)H0812.PrepareID,
			};
			WindowCenter.Instance.Open<NormalCollectWin>();
			}

			_player = GAMgr.Instance.GetBySID(H0812.PlayerID) as GActorPlayerBase;
			if (_player != null)
			@@ -108,7 +118,17 @@
			break;
			case E_PrepareType.pstMissionCollecting:

			PlayerDatas.Instance.realm.OnRefreshData(H0812);
			if (H0812.PlayerID == PlayerDatas.Instance.PlayerId)
			{
			NormalCollectWin.s_CollectInfo = new ClientH0812()
			{
			PlayerID = PlayerDatas.Instance.PlayerId,
			PrepareState = (byte)E_PrepareType.pstMissionCollecting,
			MaxTime = H0812.MaxTime,
			PrepareID = (int)H0812.PrepareID,
			};
			WindowCenter.Instance.Open<NormalCollectWin>();
			}

			_player = GAMgr.Instance.GetBySID(H0812.PlayerID) as GActorPlayerBase;
			if (_player != null)
			@@ -135,6 +155,7 @@
			}

			public UnityEngine.Events.UnityAction OnPrepareEndSuccess;
			public UnityEngine.Events.UnityAction<int, int> OnPrepareEnd;

			public void ServerPrepareEnd(H0813_tagPrepareEnd h0813)
			{
			@@ -147,7 +168,11 @@
			}

			WindowCenter.Instance.Close<PrepareWin>();
			PlayerDatas.Instance.realm.OnRefreshData(h0813);

			if (h0813.PlayerID == PlayerDatas.Instance.baseData.PlayerID)
			{
			WindowCenter.Instance.Close<NormalCollectWin>();
			}

			GActorPlayerBase _player = null;

			@@ -240,6 +265,10 @@
			//Debug.LogFormat("收到进度条结束异常情况: {0}", (E_PrepareType)h0813.Type);
			}

			if (OnPrepareEnd != null)
			{
			OnPrepareEnd((int)h0813.PlayerID, h0813.Type);
			}

			H0812 = null;
			}

			@@ -25,8 +25,7 @@
			VoiceHttpRequest.Instance.samplesDecodecComplete += SamplesDecodecComplete;
			WindowCenter.Instance.windowAfterOpenEvent += WindowAfterOpenEvent;
			StageLoad.Instance.onStageLoadFinish += OnStageLoadFinish;
			PlayerRealmData.OnPlayerCollectEnd += OnPlayerCollectEnd;
			//SnxxzGame.Instance.AddApplicationOutAction(OnApplicationQuit);
			PrepareHandler.Instance.OnPrepareEnd += OnPrepareEnd;

			var time = bandTime;
			banTimeArray[0] = time.Year;
			@@ -784,7 +783,7 @@

			#region 仙盟宴会采集完后打开聊天界面
			bool openChatAfterCollect = false;
			private void OnPlayerCollectEnd(int playerId, byte type)
			private void OnPrepareEnd(int playerId, int type)
			{
			if (playerId == PlayerDatas.Instance.baseData.PlayerID
			&& type == 0 && PlayerDatas.Instance.baseData.MapID == 31230)

			@@ -39,7 +39,7 @@
			{
			get
			{
			return WindowCenter.Instance.IsOpen<RealmCollectWin>();
			return WindowCenter.Instance.IsOpen<NormalCollectWin>();
			}
			}

New file
			@@ -0,0 +1,98 @@
			//--------------------------------------------------------
			// [Author]: 第二世界
			// [ Date ]: Saturday, October 14, 2017
			//--------------------------------------------------------

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

			namespace Snxxz.UI
			{

			public class NormalCollectWin : Window
			{
			[SerializeField] SmoothSlider m_SmoothSlider;
			[SerializeField] Text m_Progress;
			[SerializeField] Text m_FairyFeastTip;

			DateTime endTime;
			float currentProgress = 0;

			public static PrepareHandler.ClientH0812 s_CollectInfo;

			DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
			#region Built-in
			protected override void BindController()
			{
			}

			protected override void AddListeners()
			{

			}

			protected override void OnPreOpen()
			{
			currentProgress = 0f;

			m_SmoothSlider.ResetValue(0);

			m_Progress.text = StringUtility.Contact(currentProgress, "%");

			endTime = TimeUtility.ServerNow.AddMilliseconds(s_CollectInfo.MaxTime);

			var mapId = dungeonModel.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);
			m_FairyFeastTip.gameObject.SetActive(mapId == 31230);
			}

			protected override void OnAfterOpen()
			{

			}

			protected override void OnPreClose()
			{
			}

			protected override void OnAfterClose()
			{
			}

			protected override void OnActived()
			{
			if (!PrepareHandler.Instance.isPreparing)
			{
			CloseClick();
			}
			}

			protected override void LateUpdate()
			{
			var progress = 1 - (float)(endTime - TimeUtility.ServerNow).TotalMilliseconds / s_CollectInfo.MaxTime;
			m_SmoothSlider.value = progress;

			progress = (float)Math.Round(progress * 100, 0);
			if (currentProgress != progress)
			{
			currentProgress = progress;
			m_Progress.text = StringUtility.Contact(currentProgress, "%");
			}

			if (currentProgress >= 1)
			{
			CloseImmediately();
			}
			}
			#endregion


			}

			}

File was renamed from System/Realm/RealmCollectWin.cs.meta
			@@ -1,12 +1,12 @@
			fileFormatVersion: 2
			guid: 750c734c2d7b6fc4c85368c8bbf4d499
			timeCreated: 1507974546
			licenseType: Free
			MonoImporter:
			serializedVersion: 2
			defaultReferences: []
			executionOrder: 0
			icon: {instanceID: 0}
			userData:
			assetBundleName:
			assetBundleVariant:
			fileFormatVersion: 2
			guid: 750c734c2d7b6fc4c85368c8bbf4d499
			timeCreated: 1507974546
			licenseType: Free
			MonoImporter:
			serializedVersion: 2
			defaultReferences: []
			executionOrder: 0
			icon: {instanceID: 0}
			userData:
			assetBundleName:
			assetBundleVariant: