snxxz_scripts.git

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

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

client_Zxw

2019-01-04 a2c5b957715dd684e48108e16784b2080cdb4952

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

7个文件已修改

	Fight/Stage/StageManager.cs	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs	46 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/GatheringSoul/GatherSoulEquipCell.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/GatheringSoul/GatherSoulEquipListWin.cs	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/GatheringSoul/GatherSoulResolveWin.cs	61 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/GatheringSoul/GatheringSoulModel.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Login/CrossServerLogin.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Fight/Stage/StageManager.cs

@@ -351,13 +351,14 @@
                var mapOk = new C0107_tagCInitMapOK();

                mapOk.MapID = PlayerDatas.Instance.baseData.MapID;

                mapOk.Type = 0;

                if (!GameNetSystem.Instance.crossServerSocketConnected)

                switch (this.socketType)

                {

                    GameNetSystem.Instance.SendInfo(mapOk);

                }

                else

                {

                    GameNetSystem.Instance.SendToCrossServer(mapOk);

                    case GameNetSystem.SocketType.Main:

                        GameNetSystem.Instance.SendInfo(mapOk);

                        break;

                    case GameNetSystem.SocketType.CrossSever:

                        GameNetSystem.Instance.SendToCrossServer(mapOk);

                        break;

                }

            }

            var _mapData = H2Engine.MapData.LoadFormFile("map_" + _stageId);


 System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs

@@ -35,7 +35,7 @@
        public DateTime matchStartTime { get; set; }

        public DateTime roundEndTime { get; private set; }

        StoreModel storeModel { get { return ModelCenter.Instance.GetModel<StoreModel>(); } }



        public string LocalSaveThirdTypeKey = string.Empty;

        public override void Init()

        {

            IsMatching = false;

@@ -45,6 +45,8 @@


        public void OnBeforePlayerDataInitialize()

        {

            storeModel.RefreshBuyShopLimitEvent -= UpdateBuyShop;

            TimeUtility.OnServerOpenDayRefresh -= UpdateServerOpenDay;

            PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= UpdatePlayerData;

            CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent -= UpdatePlayerInfo;

            CrossServerOneVsOnePKSeason.Instance.updateSelfSeasonEvent -= UpdateSeason;

@@ -59,6 +61,7 @@
        {

            int playerId = (int)PlayerDatas.Instance.baseData.PlayerID;

            PkResultLocalSaveKey = StringUtility.Contact("PkResultLocalSaveKey", playerId);

            LocalSaveThirdTypeKey = StringUtility.Contact("HonorStoreThirdType",playerId);

            GetLocalSaveData();

        }



@@ -69,6 +72,8 @@


        public void OnPlayerLoginOk()

        {

            storeModel.RefreshBuyShopLimitEvent += UpdateBuyShop;

            TimeUtility.OnServerOpenDayRefresh += UpdateServerOpenDay;

            PlayerDatas.Instance.PlayerDataRefreshInfoEvent += UpdatePlayerData;

            CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent += UpdatePlayerInfo;

            CrossServerOneVsOnePKSeason.Instance.updateSelfSeasonEvent += UpdateSeason;

@@ -76,6 +81,7 @@
            rewardModel.CrossRealmPKAwardStateUpdate += UpdateDayAwardState;

            CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent += UpdateDayAwardState;

            dungeonModel.updateMissionEvent += UpdateFBHelp;

            UpdateServerOpenDay();

            UpdateDayAwardState();

            if(IsMatching && CrossServerOneVsOnePKSeason.Instance.InOpenTime())

            {

@@ -146,6 +152,14 @@
            UpdateCanBuyRedpoint();

        }



        private void UpdateBuyShop()

        {

            var pkSeason = CrossServerOneVsOnePKSeason.Instance;

            if (!pkSeason.IsEnterCrossServer()) return;



            UpdateCanBuyRedpoint();

        }



        private void UpdatePlayerInfo()

        {

            UpdateCrossDayAwardsRedpoint();

@@ -211,6 +225,32 @@
            if (x.CompareTo(y) != 0) return x.CompareTo(y);



            return 0;

        }



        public bool IsNewDay { get; private set;}

        private void UpdateServerOpenDay()

        {

            var pkSeason = CrossServerOneVsOnePKSeason.Instance;

            if (!pkSeason.IsEnterCrossServer()) return;



            IsNewDay = false;

            int openDay = TimeUtility.OpenDay;

            if(!PlayerPrefs.HasKey(LocalSaveThirdTypeKey))

            {

                IsNewDay = true;

                LocalSave.SetInt(LocalSaveThirdTypeKey,openDay);

            }

            else

            {

                int localOpenDay = LocalSave.GetInt(LocalSaveThirdTypeKey);

                if(openDay != localOpenDay)

                {

                    IsNewDay = true;

                    LocalSave.SetInt(LocalSaveThirdTypeKey, openDay);

                }

            }



            UpdateCanBuyRedpoint();

        }



        #region 表数据

@@ -577,6 +617,7 @@
        }



        #region 荣誉商店红点

     
        public const int CrossHonorStoreRedKey = 2130104;

        public Redpoint crossHonorStoreRedpoint = new Redpoint(CrossOneVsOneRedKey, CrossHonorStoreRedKey);

        private Dictionary<int, Redpoint> honorRedpointDict = new Dictionary<int, Redpoint>();

@@ -637,7 +678,7 @@
                        honorRedpointDict[storeConfig.ID].state = RedPointState.None;

                        if (!storeModel.TryGetIsSellOut(storeConfig, out remainNum))

                        {

                            if(!PlayerPrefs.HasKey(key))

                            if(!PlayerPrefs.HasKey(key)|| IsNewDay)

                            {

                                if (UIHelper.GetMoneyCnt(storeConfig.MoneyType) >= (ulong)storeConfig.MoneyNumber)

                                {

@@ -679,6 +720,7 @@


        public void ClearRedpoint(int shopId)

        {

            IsNewDay = false;

            string record = StringUtility.Contact(PlayerDatas.Instance.baseData.PlayerID, "ShopId", shopId);

            if(honorRedpointDict[shopId].state != RedPointState.None)

            {


 System/GatheringSoul/GatherSoulEquipCell.cs

@@ -12,6 +12,7 @@
        [SerializeField] Image m_Icon;

        [SerializeField] Text m_Level;

        [SerializeField] PropertyBehaviour[] m_Propertys;

        [SerializeField] RectTransform m_Redpoint;



        GatheringSoulModel model

        {

@@ -23,7 +24,7 @@
            get { return ModelCenter.Instance.GetModel<VirtualPackModel>(); }

        }



        public void Display(GatherSoulItem item)

        public void Display(GatherSoulItem item, bool requireRedpoint)

        {

            var itemConfig = Config.Instance.Get<ItemConfig>(item.id);

            m_Icon.SetSprite(itemConfig.IconKey);

@@ -39,6 +40,7 @@
                    m_Propertys[i].DisplayUpper(list[i], propertyValue);

                }

            }

            m_Redpoint.gameObject.SetActive(requireRedpoint);

        }

    }

}

 System/GatheringSoul/GatherSoulEquipListWin.cs

@@ -20,6 +20,8 @@


        public static int selectHole = 0;



        bool existHoleItem = false;



        GatheringSoulModel model

        {

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

@@ -39,6 +41,16 @@


        protected override void OnPreOpen()

        {

            GatherSoulItem item;

            if (model.TryGetItem(selectHole, out item))

            {

                existHoleItem = true;

            }

            else

            {

                existHoleItem = false;

            }



            Display();

            model.gatherSoulPackRefresh += GatherSoulPackRefresh;

        }

@@ -63,7 +75,7 @@
            var equipCell = cell as GatherSoulEquipCell;

            if (cell.index < equipList.Count)

            {

                equipCell.Display(equipList[cell.index]);

                equipCell.Display(equipList[cell.index], existHoleItem && cell.index == 0);

            }

        }




 System/GatheringSoul/GatherSoulResolveWin.cs

@@ -238,6 +238,67 @@
                return;

            }



            bool existUnEquipBetterProperty = false;



            var count = model.holeCount;

            var error = 0;

            for (int i = 0; i < model.resolveItems.Count; i++)

            {

                var item = model.resolveItems[i];

                if (item != null && model.CheckExist(item))

                {

                    if (model.IsSamePropertyCompareHoles(-1, item) == -1)

                    {

                        existUnEquipBetterProperty = true;

                        break;

                    }

                    for (int k = 0; k < count; k++)

                    {

                        GatherSoulItem holeItem;

                        if (model.TryGetItem(k, out holeItem))

                        {

                            if (model.SatisfyReplace(k, item) && item.Compare(holeItem) == 1)

                            {

                                existUnEquipBetterProperty = true;

                                break;

                            }

                        }

                        else if (model.SatisfyEquipSoul(item, k, out error))

                        {

                            existUnEquipBetterProperty = true;

                            break;

                        }

                    }

                }

                if (existUnEquipBetterProperty)

                {

                    break;

                }

            }



            if (existUnEquipBetterProperty)

            {

                ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("GatherSoulResolveConfirm"), (bool isOk) =>

                  {

                      if (isOk)

                      {

                          TryResolve();

                      }

                  });

            }

            else

            {

                TryResolve();

            }

        }



        void TryResolve()

        {

            if (model.resolveItems.Count == 0)

            {

                return;

            }



            List<ushort> list = new List<ushort>();

            for (int i = 0; i < model.resolveItems.Count; i++)

            {


 System/GatheringSoul/GatheringSoulModel.cs

@@ -1147,7 +1147,7 @@
                var rhsPropertySort = GetPropertyHighestSort(rhsPropertys);

                if (lhsPropertySort != rhsPropertySort)

                {

                    return -lhsPropertySort.CompareTo(rhsPropertySort);

                    return lhsPropertySort.CompareTo(rhsPropertySort);

                }

            }

            if (lhs.level.CompareTo(rhs.level) != 0)


 System/Login/CrossServerLogin.cs

@@ -125,7 +125,7 @@
                gamePortBuf = gamePort;



                StopLoginOverTimeProcess();

                loginOverTimeClock = Clock.Create(DateTime.Now + new TimeSpan(15 * TimeSpan.TicksPerSecond), () =>

                loginOverTimeClock = Clock.Create(DateTime.Now + new TimeSpan(10 * TimeSpan.TicksPerSecond), () =>

                {

                    busy = false;

                    ReAccountLogin();

@@ -167,7 +167,7 @@
            try

            {

                StopLoginOverTimeProcess();

                loginOverTimeClock = Clock.Create(DateTime.Now + new TimeSpan(15 * TimeSpan.TicksPerSecond), () =>

                loginOverTimeClock = Clock.Create(DateTime.Now + new TimeSpan(10* TimeSpan.TicksPerSecond), () =>

                {

                    busy = false;

                    ReAccountLogin();

			@@ -351,13 +351,14 @@
			var mapOk = new C0107_tagCInitMapOK();
			mapOk.MapID = PlayerDatas.Instance.baseData.MapID;
			mapOk.Type = 0;
			if (!GameNetSystem.Instance.crossServerSocketConnected)
			switch (this.socketType)
			{
			GameNetSystem.Instance.SendInfo(mapOk);
			}
			else
			{
			GameNetSystem.Instance.SendToCrossServer(mapOk);
			case GameNetSystem.SocketType.Main:
			GameNetSystem.Instance.SendInfo(mapOk);
			break;
			case GameNetSystem.SocketType.CrossSever:
			GameNetSystem.Instance.SendToCrossServer(mapOk);
			break;
			}
			}
			var _mapData = H2Engine.MapData.LoadFormFile("map_" + _stageId);

			@@ -35,7 +35,7 @@
			public DateTime matchStartTime { get; set; }
			public DateTime roundEndTime { get; private set; }
			StoreModel storeModel { get { return ModelCenter.Instance.GetModel<StoreModel>(); } }

			public string LocalSaveThirdTypeKey = string.Empty;
			public override void Init()
			{
			IsMatching = false;
			@@ -45,6 +45,8 @@

			public void OnBeforePlayerDataInitialize()
			{
			storeModel.RefreshBuyShopLimitEvent -= UpdateBuyShop;
			TimeUtility.OnServerOpenDayRefresh -= UpdateServerOpenDay;
			PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= UpdatePlayerData;
			CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent -= UpdatePlayerInfo;
			CrossServerOneVsOnePKSeason.Instance.updateSelfSeasonEvent -= UpdateSeason;
			@@ -59,6 +61,7 @@
			{
			int playerId = (int)PlayerDatas.Instance.baseData.PlayerID;
			PkResultLocalSaveKey = StringUtility.Contact("PkResultLocalSaveKey", playerId);
			LocalSaveThirdTypeKey = StringUtility.Contact("HonorStoreThirdType",playerId);
			GetLocalSaveData();
			}

			@@ -69,6 +72,8 @@

			public void OnPlayerLoginOk()
			{
			storeModel.RefreshBuyShopLimitEvent += UpdateBuyShop;
			TimeUtility.OnServerOpenDayRefresh += UpdateServerOpenDay;
			PlayerDatas.Instance.PlayerDataRefreshInfoEvent += UpdatePlayerData;
			CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent += UpdatePlayerInfo;
			CrossServerOneVsOnePKSeason.Instance.updateSelfSeasonEvent += UpdateSeason;
			@@ -76,6 +81,7 @@
			rewardModel.CrossRealmPKAwardStateUpdate += UpdateDayAwardState;
			CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent += UpdateDayAwardState;
			dungeonModel.updateMissionEvent += UpdateFBHelp;
			UpdateServerOpenDay();
			UpdateDayAwardState();
			if(IsMatching && CrossServerOneVsOnePKSeason.Instance.InOpenTime())
			{
			@@ -146,6 +152,14 @@
			UpdateCanBuyRedpoint();
			}

			private void UpdateBuyShop()
			{
			var pkSeason = CrossServerOneVsOnePKSeason.Instance;
			if (!pkSeason.IsEnterCrossServer()) return;

			UpdateCanBuyRedpoint();
			}

			private void UpdatePlayerInfo()
			{
			UpdateCrossDayAwardsRedpoint();
			@@ -211,6 +225,32 @@
			if (x.CompareTo(y) != 0) return x.CompareTo(y);

			return 0;
			}

			public bool IsNewDay { get; private set;}
			private void UpdateServerOpenDay()
			{
			var pkSeason = CrossServerOneVsOnePKSeason.Instance;
			if (!pkSeason.IsEnterCrossServer()) return;

			IsNewDay = false;
			int openDay = TimeUtility.OpenDay;
			if(!PlayerPrefs.HasKey(LocalSaveThirdTypeKey))
			{
			IsNewDay = true;
			LocalSave.SetInt(LocalSaveThirdTypeKey,openDay);
			}
			else
			{
			int localOpenDay = LocalSave.GetInt(LocalSaveThirdTypeKey);
			if(openDay != localOpenDay)
			{
			IsNewDay = true;
			LocalSave.SetInt(LocalSaveThirdTypeKey, openDay);
			}
			}

			UpdateCanBuyRedpoint();
			}

			#region 表数据
			@@ -577,6 +617,7 @@
			}

			#region 荣誉商店红点

			public const int CrossHonorStoreRedKey = 2130104;
			public Redpoint crossHonorStoreRedpoint = new Redpoint(CrossOneVsOneRedKey, CrossHonorStoreRedKey);
			private Dictionary<int, Redpoint> honorRedpointDict = new Dictionary<int, Redpoint>();
			@@ -637,7 +678,7 @@
			honorRedpointDict[storeConfig.ID].state = RedPointState.None;
			if (!storeModel.TryGetIsSellOut(storeConfig, out remainNum))
			{
			if(!PlayerPrefs.HasKey(key))
			if(!PlayerPrefs.HasKey(key)\|\| IsNewDay)
			{
			if (UIHelper.GetMoneyCnt(storeConfig.MoneyType) >= (ulong)storeConfig.MoneyNumber)
			{
			@@ -679,6 +720,7 @@

			public void ClearRedpoint(int shopId)
			{
			IsNewDay = false;
			string record = StringUtility.Contact(PlayerDatas.Instance.baseData.PlayerID, "ShopId", shopId);
			if(honorRedpointDict[shopId].state != RedPointState.None)
			{

			@@ -12,6 +12,7 @@
			[SerializeField] Image m_Icon;
			[SerializeField] Text m_Level;
			[SerializeField] PropertyBehaviour[] m_Propertys;
			[SerializeField] RectTransform m_Redpoint;

			GatheringSoulModel model
			{
			@@ -23,7 +24,7 @@
			get { return ModelCenter.Instance.GetModel<VirtualPackModel>(); }
			}

			public void Display(GatherSoulItem item)
			public void Display(GatherSoulItem item, bool requireRedpoint)
			{
			var itemConfig = Config.Instance.Get<ItemConfig>(item.id);
			m_Icon.SetSprite(itemConfig.IconKey);
			@@ -39,6 +40,7 @@
			m_Propertys[i].DisplayUpper(list[i], propertyValue);
			}
			}
			m_Redpoint.gameObject.SetActive(requireRedpoint);
			}
			}
			}

			@@ -20,6 +20,8 @@

			public static int selectHole = 0;

			bool existHoleItem = false;

			GatheringSoulModel model
			{
			get { return ModelCenter.Instance.GetModel<GatheringSoulModel>(); }
			@@ -39,6 +41,16 @@

			protected override void OnPreOpen()
			{
			GatherSoulItem item;
			if (model.TryGetItem(selectHole, out item))
			{
			existHoleItem = true;
			}
			else
			{
			existHoleItem = false;
			}

			Display();
			model.gatherSoulPackRefresh += GatherSoulPackRefresh;
			}
			@@ -63,7 +75,7 @@
			var equipCell = cell as GatherSoulEquipCell;
			if (cell.index < equipList.Count)
			{
			equipCell.Display(equipList[cell.index]);
			equipCell.Display(equipList[cell.index], existHoleItem && cell.index == 0);
			}
			}

			@@ -238,6 +238,67 @@
			return;
			}

			bool existUnEquipBetterProperty = false;

			var count = model.holeCount;
			var error = 0;
			for (int i = 0; i < model.resolveItems.Count; i++)
			{
			var item = model.resolveItems[i];
			if (item != null && model.CheckExist(item))
			{
			if (model.IsSamePropertyCompareHoles(-1, item) == -1)
			{
			existUnEquipBetterProperty = true;
			break;
			}
			for (int k = 0; k < count; k++)
			{
			GatherSoulItem holeItem;
			if (model.TryGetItem(k, out holeItem))
			{
			if (model.SatisfyReplace(k, item) && item.Compare(holeItem) == 1)
			{
			existUnEquipBetterProperty = true;
			break;
			}
			}
			else if (model.SatisfyEquipSoul(item, k, out error))
			{
			existUnEquipBetterProperty = true;
			break;
			}
			}
			}
			if (existUnEquipBetterProperty)
			{
			break;
			}
			}

			if (existUnEquipBetterProperty)
			{
			ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("GatherSoulResolveConfirm"), (bool isOk) =>
			{
			if (isOk)
			{
			TryResolve();
			}
			});
			}
			else
			{
			TryResolve();
			}
			}

			void TryResolve()
			{
			if (model.resolveItems.Count == 0)
			{
			return;
			}

			List<ushort> list = new List<ushort>();
			for (int i = 0; i < model.resolveItems.Count; i++)
			{

			@@ -1147,7 +1147,7 @@
			var rhsPropertySort = GetPropertyHighestSort(rhsPropertys);
			if (lhsPropertySort != rhsPropertySort)
			{
			return -lhsPropertySort.CompareTo(rhsPropertySort);
			return lhsPropertySort.CompareTo(rhsPropertySort);
			}
			}
			if (lhs.level.CompareTo(rhs.level) != 0)

			@@ -125,7 +125,7 @@
			gamePortBuf = gamePort;

			StopLoginOverTimeProcess();
			loginOverTimeClock = Clock.Create(DateTime.Now + new TimeSpan(15 * TimeSpan.TicksPerSecond), () =>
			loginOverTimeClock = Clock.Create(DateTime.Now + new TimeSpan(10 * TimeSpan.TicksPerSecond), () =>
			{
			busy = false;
			ReAccountLogin();
			@@ -167,7 +167,7 @@
			try
			{
			StopLoginOverTimeProcess();
			loginOverTimeClock = Clock.Create(DateTime.Now + new TimeSpan(15 * TimeSpan.TicksPerSecond), () =>
			loginOverTimeClock = Clock.Create(DateTime.Now + new TimeSpan(10* TimeSpan.TicksPerSecond), () =>
			{
			busy = false;
			ReAccountLogin();