| Core/GameEngine/Model/TelPartialConfig/tagItemCompoundConfig.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/BlastFurnace/BlastFurnaceModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/BlastFurnace/BlastFurnaceWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Chat/ChatCenter.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Chat/ChatCtrl.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Chat/ChatTip.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Chat/ChatWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Compose/New/ComposeWinModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Core/GameEngine/Model/TelPartialConfig/tagItemCompoundConfig.cs
@@ -140,6 +140,21 @@ return null; } public static ItemCompoundConfig GetItemCompoundByType(int firstType,int secondType, int thirdType) { if(allComposeModelDict.ContainsKey(firstType)) { if(allComposeModelDict[firstType].ContainsKey(secondType)) { if(allComposeModelDict[firstType][secondType].ContainsKey(thirdType)) { return allComposeModelDict[firstType][secondType][thirdType][0]; } } } return null; } public static bool TryGetTicketCompose(int _ticketId, out List<ItemCompoundConfig> list) { return ticketComposeDict.TryGetValue(_ticketId, out list); System/BlastFurnace/BlastFurnaceModel.cs
@@ -10,7 +10,7 @@ public class BlastFurnaceModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize, IPlayerLoginOk { public BlastFurnaceFuncTitle funcTitle = BlastFurnaceFuncTitle.MakeDan; private int makeDrugRedLv; public Action<AlchemySpecConfig> RefreshAddSpecMatEvent; private TreasureModel _model; @@ -64,6 +64,8 @@ } alchemyModellist = Config.Instance.GetAllValues<AlchemyConfig>(); FuncConfigConfig alchemyRedPoint = Config.Instance.Get<FuncConfigConfig>("AlchemyRedPoint"); int.TryParse(alchemyRedPoint.Numerical1,out makeDrugRedLv); SetDandrugRedPointlist(); GlobalTimeEvent.Instance.secondEvent += SecondUpdate; } @@ -757,11 +759,11 @@ bool isCheckRed = false; if(!isClick) { if(PlayerDatas.Instance.baseData.LV <= 151) if(PlayerDatas.Instance.baseData.LV <= makeDrugRedLv) { isCheckRed = true; } else if(PlayerDatas.Instance.baseData.LV > 151 && !isLogin && !IsMakeDrugWin) else if(PlayerDatas.Instance.baseData.LV > makeDrugRedLv && !isLogin && !IsMakeDrugWin) { isCheckRed = true; } @@ -790,7 +792,7 @@ } else { if(PlayerDatas.Instance.baseData.LV > 151) if(PlayerDatas.Instance.baseData.LV > makeDrugRedLv) { MakeDrugRedpoint.state = RedPointState.None; } @@ -1361,6 +1363,7 @@ { MakeDan, //炼丹 AttrDan, //丹药属性 DrugStore, //回收商店 }
@@ -94,6 +94,9 @@ case BlastFurnaceFuncTitle.AttrDan: _treasureRefineTitle.state = TitleBtnState.Click; break; case BlastFurnaceFuncTitle.DrugStore: _storeTitle.state = TitleBtnState.Click; break; } } @@ -137,6 +140,7 @@ private void OnClickStoreTitle() { FurnaceModel.funcTitle = BlastFurnaceFuncTitle.DrugStore; _lingDanTips.SetActive(false); attrDanTips.SetActive(false); storeTips.SetActive(true); System/Chat/ChatCenter.cs
@@ -49,8 +49,10 @@ chatChannels.Add(ChatInfoType.System); chatChannels.Add(ChatInfoType.World); chatChannels.Add(ChatInfoType.Area); chatChannels.Add(ChatInfoType.Team); chatChannels.Add(ChatInfoType.Invite); chatChannels.Add(ChatInfoType.Trumpet); chatChannels.Add(ChatInfoType.Fairy); chatChannels.Add(ChatInfoType.Friend); } @@ -768,11 +770,10 @@ return; } openChatAfterCollect = false; if (!WindowCenter.Instance.CheckOpen<SocialWin>()) if (!WindowCenter.Instance.CheckOpen<ChatWin>()) { ChatCtrl.Inst.presentChatType = ChatInfoType.Fairy; WindowCenter.Instance.CloseImmediately<MainInterfaceWin>(); WindowCenter.Instance.Open<SocialWin>(); WindowCenter.Instance.Open<ChatWin>(); } } #endregion System/Chat/ChatCtrl.cs
@@ -1029,13 +1029,15 @@ switch (type) { case ChatInfoType.Team: if (!WindowCenter.Instance.CheckOpen<TeamChatWin>()) if (!WindowCenter.Instance.CheckOpen<TeamChatWin>() && (!WindowCenter.Instance.CheckOpen<ChatWin>() || presentChatType != ChatInfoType.Team)) { unReadChatCounts[ChatInfoType.Team] = Mathf.Min(unReadChatCounts[ChatInfoType.Team] + 1, 99); } break; case ChatInfoType.Fairy: if (!WindowCenter.Instance.CheckOpen<FairyChatWin>()) if (!WindowCenter.Instance.CheckOpen<FairyChatWin>() && (!WindowCenter.Instance.CheckOpen<ChatWin>() || presentChatType != ChatInfoType.Fairy)) { unReadChatCounts[ChatInfoType.Fairy] = Mathf.Min(unReadChatCounts[ChatInfoType.Fairy] + 1, 99); } System/Chat/ChatTip.cs
@@ -145,7 +145,7 @@ private void OnChatClick() { if (WindowCenter.Instance.CheckOpen<ChatWin>() || WindowCenter.Instance.CheckOpen<SocialWin>()) if (WindowCenter.Instance.CheckOpen<ChatWin>()) { return; } @@ -154,9 +154,6 @@ if (mapId == 31230) { ChatCtrl.Inst.presentChatType = ChatInfoType.Fairy; WindowCenter.Instance.CloseImmediately<MainInterfaceWin>(); WindowCenter.Instance.Open<SocialWin>(); return; } WindowCenter.Instance.Open<ChatWin>(); } @@ -214,7 +211,7 @@ void OnChatDataClick(ChatData data) { if (WindowCenter.Instance.CheckOpen<ChatWin>() || WindowCenter.Instance.CheckOpen<SocialWin>()) if (WindowCenter.Instance.CheckOpen<ChatWin>()) { return; } @@ -224,20 +221,7 @@ { ChatCtrl.Inst.presentChatType = ChatInfoType.Fairy; } switch (ChatCtrl.Inst.presentChatType) { case ChatInfoType.Team: WindowCenter.Instance.CloseImmediately<MainInterfaceWin>(); WindowCenter.Instance.Open<SocialWin>(false, 2); break; case ChatInfoType.Fairy: WindowCenter.Instance.CloseImmediately<MainInterfaceWin>(); WindowCenter.Instance.Open<SocialWin>(); break; default: WindowCenter.Instance.Open<ChatWin>(); break; } WindowCenter.Instance.Open<ChatWin>(); } void OnRefreshChatTip(ChatInfoType type) System/Chat/ChatWin.cs
@@ -170,6 +170,7 @@ break; } m_ChatContent.chatType = ChatCtrl.Inst.presentChatType; ChatCtrl.Inst.ViewChat(ChatCtrl.Inst.presentChatType); } private void OnChannelSelect(CellView _cell) System/Compose/New/ComposeWinModel.cs
@@ -814,44 +814,49 @@ int[] composeCondi = itemConfig.JumpComposeCondi; if (composeCondi.Length < 3) return false; ItemCompoundConfig itemCompound = GetThirdTypeModellist(composeCondi[0],composeCondi[1],composeCondi[2])[0]; if(itemCompound.levelNeed <= PlayerDatas.Instance.baseData.LV) ItemCompoundConfig itemCompound = ItemCompoundConfig.GetItemCompoundByType(composeCondi[0], composeCondi[1], composeCondi[2]); if(itemCompound != null) { switch (itemCompound.firstType) if (itemCompound.levelNeed <= PlayerDatas.Instance.baseData.LV) { case 1: jumpId = (int)JumpUIType.ComposeFunc1; break; case 2: jumpId = (int)JumpUIType.ComposeFunc2; break; case 3: jumpId = (int)JumpUIType.ComposeFunc3; break; case 4: jumpId = (int)JumpUIType.ComposeFunc4; break; case 5: jumpId = (int)JumpUIType.ComposeFunc5; break; } this.secondType = itemCompound.secondType; switch (itemCompound.firstType) { case 1: jumpId = (int)JumpUIType.ComposeFunc1; break; case 2: jumpId = (int)JumpUIType.ComposeFunc2; break; case 3: jumpId = (int)JumpUIType.ComposeFunc3; break; case 4: jumpId = (int)JumpUIType.ComposeFunc4; break; case 5: jumpId = (int)JumpUIType.ComposeFunc5; break; } this.secondType = itemCompound.secondType; if(itemCompound.firstType == 5 && itemCompound.secondType == 3) { this.thirdType = PlayerDatas.Instance.baseData.Job; if (itemCompound.firstType == 5 && itemCompound.secondType == 3) { this.thirdType = PlayerDatas.Instance.baseData.Job; } else { this.thirdType = itemCompound.thirdType; } return true; } else { this.thirdType = itemCompound.thirdType; SysNotifyMgr.Instance.ShowTip("TicketComposeUnlock", itemCompound.levelNeed, itemCompound.secondTypeName); return false; } return true; } else { SysNotifyMgr.Instance.ShowTip("TicketComposeUnlock", itemCompound.levelNeed, itemCompound.secondTypeName); return false; } return false; } public bool CheckIsComposeByType(int firstType,int secondType,int thirdType)
