| System/CrossServer/CrossServerUtility.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Login/ServerBehaviour.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/FuncNotifyBehaviour.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/HighSettingTip.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/OpenServerActivity/FullServerRechargeRedpackModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Store/StoreModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Store/StoreWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Utility/EnumHelper.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Utility/UIHelper.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
System/CrossServer/CrossServerUtility.cs
@@ -34,6 +34,7 @@ } } //跨服排位赛用此函数模拟，后续需要整理三者（更多）关系 ArenaManager.isArenaClient public static bool IsCrossServerOneVsOne() { if (ClientCrossServerOneVsOne.isClientCrossServerOneVsOne) @@ -43,6 +44,12 @@ var dungeonModel = ModelCenter.Instance.GetModel<DungeonModel>(); var dataMapId = dungeonModel.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID); if (dataMapId == 32070) { return PlayerDatas.Instance.baseData.CrossServerFlag > 2 && dataMapId == 32070; } return PlayerDatas.Instance.baseData.CrossServerFlag > 2 && dataMapId == CrossServerOneVsOneModel.CrossServerDataMapId; } System/Login/ServerBehaviour.cs
@@ -22,7 +22,6 @@ ServerData m_ServerData; [IFix.Patch] public void Display(ServerData _serverData) { m_ServerData = _serverData; System/MainInterfacePanel/FuncNotifyBehaviour.cs
@@ -50,6 +50,10 @@ { WindowCenter.Instance.Open("FuncPreNoticeWin"); } else { ILRuntimeUtility.Instance.ModelInvoke("HeroControler", "FuncPushGoto", ShowID); } } private void OnClose() System/MainInterfacePanel/HighSettingTip.cs
@@ -333,32 +333,33 @@ private void RefreshStoreEffect() { storeDesBtn.SetActive(false); if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Store) || PlayerDatas.Instance.baseData.LV < storeModel.storeTrailerLv || !storeModel.IsNewDay(storeModel.StoreEffectRecord_Key)) return; m_StoreEffect.StopImediatly(); //if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Store) // || PlayerDatas.Instance.baseData.LV < storeModel.storeTrailerLv // || !storeModel.IsNewDay(storeModel.StoreEffectRecord_Key)) // return; var storeDatas = storeModel.TryGetStoreDatas(StoreFunc.MysteryStore); if (storeDatas != null && storeDatas.Count > 0 && !m_StoreEffect.IsPlaying) { if (isNeedTip) { storeDesBtn.SetActive(true); isNeedTip = false; if (this.gameObject.activeInHierarchy) { StartCoroutine(DelayHideStoreDes()); } //var storeDatas = storeModel.TryGetStoreDatas(StoreFunc.MysteryStore); //if (storeDatas != null // && storeDatas.Count > 0 // && !m_StoreEffect.IsPlaying) //{ // if (isNeedTip) // { // storeDesBtn.SetActive(true); // isNeedTip = false; // if (this.gameObject.activeInHierarchy) // { // StartCoroutine(DelayHideStoreDes()); // } } m_StoreEffect.Play(); } else { m_StoreEffect.StopImediatly(); } // } // m_StoreEffect.Play(); //} //else //{ // m_StoreEffect.StopImediatly(); //} } IEnumerator DelayHideStoreDes() System/OpenServerActivity/FullServerRechargeRedpackModel.cs
@@ -88,7 +88,6 @@ } //hasQFRedbag: 可抢个数，已领完，已领取 [IFix.Patch] public void ServerGrabCntEvent() { hasQFRedbag = false; System/Store/StoreModel.cs
@@ -558,23 +558,24 @@ List<StoreData> datas = null; if (showStoreTypeDict.TryGetValue((int)type, out datas)) { switch (type) { case StoreFunc.MysteryStore: foreach (var item in datas) { if (mysteryCommondities.Contains(item.storeConfig.ID)) { results.Add(item); } } results.AddRange(datas); //switch (type) //{ // case StoreFunc.MysteryStore: // foreach (var item in datas) // { // if (mysteryCommondities.Contains(item.storeConfig.ID)) // { // results.Add(item); // } // } results.Sort((StoreData x, StoreData y) => { return x.storeConfig.MoneyType < y.storeConfig.MoneyType ? -1 : 1; }); break; default: results.AddRange(datas); break; } // results.Sort((StoreData x, StoreData y) => { return x.storeConfig.MoneyType < y.storeConfig.MoneyType ? -1 : 1; }); // break; // default: // results.AddRange(datas); // break; //} } return results; System/Store/StoreWin.cs
@@ -180,13 +180,13 @@ private void UpdateRefreshTime() { if (model.storeFuncType == StoreFunc.MysteryStore) { //if (model.storeFuncType == StoreFunc.MysteryStore) //{ m_RefreshCommodities.SetActive(true); m_RefreshTimeText.text = model.GetMysteryStoreRefreshTime(); } else // m_RefreshCommodities.SetActive(true); // m_RefreshTimeText.text = model.GetMysteryStoreRefreshTime(); //} //else { if (commodities == null || commodities.Count < 1) { @@ -259,6 +259,7 @@ //} m_FollowStoreBottom.SetActive(true); m_IntegralBottom.SetActive(false); ILRuntimeUtility.Instance.ModelInvoke("UIFixModel", "OnStoreRefreshUI"); } void RefreshCoins() @@ -437,11 +438,11 @@ } if (shopInfo.ShopType == (int)StoreFunc.MysteryStore) { shopItemCell.itemCell.countText.text = shopInfo.ItemCnt > 1 ? shopInfo.ItemCnt.ToString() : ""; } else //if (shopInfo.ShopType == (int)StoreFunc.MysteryStore) //{ // shopItemCell.itemCell.countText.text = shopInfo.ItemCnt > 1 ? shopInfo.ItemCnt.ToString() : ""; //} //else { var remainNumDescription = remainNum > 0 ? remainNum.ToString() : UIHelper.AppendColor(TextColType.Red, remainNum.ToString()); shopItemCell.itemCell.countText.text = shopInfo.TheOnlyShop == 1 ? "" : StringUtility.Contact(remainNumDescription, "/", canBuyCnt); @@ -536,6 +537,8 @@ { model.CloseAllRedpoint(StoreFunc.MysteryStore); model.storeFuncType = StoreFunc.MysteryStore; OnCreateSecondType(); model.selectSecondType = model.GetFirstStoreSecondType((int)model.storeFuncType); OnCreate(); UpdateRefreshTime(); functionOrder = m_WeekStoreTitle.order; Utility/EnumHelper.cs
@@ -772,7 +772,7 @@ default11, // 239 代表魅力等级 default12, default13, default14, default14, // 242 功德点 default15, default16, default17, // 245机缘点 Utility/UIHelper.cs
@@ -1020,6 +1020,11 @@ { return PlayerDatas.Instance.extersion.soulCore; } case 35: { //功德点 return PlayerDatas.Instance.GetPlayerDataByType(PlayerDataType.default14); } case 37: { //机缘点
