| System/Mount/MountWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Mount/PlayerMountDatas.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/NewBieGuidance/FunctionalGuideBehaviour.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/NewBieGuidance/NewBieCenter.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/OpenServerActivity/FlashRushToBuyNotify.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/OpenServerActivity/FlashSaleTimeCell.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/OpenServerActivity/OpenServerActivityNotifyModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/OpenServerActivity/OpenServerActivityNotifyWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/OpenServerActivity/OperationFlashRushToBuy.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Pet/PetAttributeWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Pet/PlayerPetDatas.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
System/Mount/MountWin.cs
@@ -129,6 +129,10 @@ { RedPointMountDan(); } if (PackSendQuestMgr.Instance.useItemModel != null)//跳轉選中 { PackSendQuestMgr.Instance.useItemModel = null; } } public void SetHorseID() @@ -138,7 +142,7 @@ int ItemId = PackSendQuestMgr.Instance.useItemModel.itemInfo.ItemID; if (ItemId == 181) { int MountID= mountModel.GetMinLvMount(); int MountID= mountModel.GetMinExpMount(); if (MountID != 0) { signHorseID = MountID; @@ -358,10 +362,7 @@ CA501_tagPlayerActivateHorse _tagA501 = new CA501_tagPlayerActivateHorse(); _tagA501.HorseID = (uint)signHorseID; GameNetSystem.Instance.SendInfo(_tagA501); if (PackSendQuestMgr.Instance.useItemModel != null)//跳轉選中 { PackSendQuestMgr.Instance.useItemModel = null; } } else { @@ -424,7 +425,7 @@ { m_AutoTrainBtn.gameObject.SetActive(true); m_StopDomesticateBtn.gameObject.SetActive(false); ScrollTip.ShowTip(Language.Get("HorseDan5_text")); //ScrollTip.ShowTip(Language.Get("HorseDan5_text")); yield break; } else if (WindowCenter.Instance.IsOpen<RidingAndPetActivationWin>())//打开骑宠激活界面结束方法 System/Mount/PlayerMountDatas.cs
@@ -318,25 +318,20 @@ } } public int GetMinLvMount() public int GetMinExpMount() { int GetMountID = 0; int GetMountLv = 0; int NeedExp = 99999999; for (int i = 0; i < SortMount.Count; i++) { int horseID = SortMount[i].HorseID; if (_DicHorse.ContainsKey(horseID)) if (_DicHorse.ContainsKey(horseID) && _DicHorse[horseID].Lv < Config.Instance.Get<HorseConfig>(horseID).MaxLV) { var key = horseID; if (GetMountID == 0 && _DicHorse[key].Lv < GetMountSkillMaxLV(key)) int _NeedExp = HorseUpConfig.GetHorseIDAndLV(horseID, (_DicHorse[horseID].Lv)).NeedExp; if (_NeedExp - _DicHorse[horseID].Exp < NeedExp) { GetMountID = key; GetMountLv = _DicHorse[key].Lv; } if (_DicHorse[key].Lv < GetMountLv && _DicHorse[key].Lv < GetMountSkillMaxLV(key)) { GetMountID = key; GetMountLv = _DicHorse[key].Lv; NeedExp = _NeedExp - _DicHorse[horseID].Exp; GetMountID = horseID; } } } System/NewBieGuidance/FunctionalGuideBehaviour.cs
@@ -35,6 +35,7 @@ } float protectTimer = 0f; string clickTargetName; Transform m_ClickTarget; RectTransform rectTransform { get { return this.transform as RectTransform; } } @@ -131,6 +132,7 @@ selectBoxPatternBuf = (int)stepConfig.selectBox; } clickTargetName = string.Empty; m_ClickTarget = null; m_ClickHintRoot.gameObject.SetActive(false); FindClickTarget(); @@ -140,14 +142,18 @@ private void ReportGuideComplete() { UnAttachTrigger(); clickTargetName = string.Empty; m_ClickTarget = null; FunctionalGuideCenter.Instance.FinishGuide(guide); guide = 0; FunctionalGuideBehaviourPool.Recycle(this.gameObject); } private void ClickToCompleteGuide() { UnAttachTrigger(); clickTargetName = string.Empty; m_ClickTarget = null; var config = Config.Instance.Get<GuideConfig>(guide); @@ -159,12 +165,32 @@ } } guide = 0; FunctionalGuideBehaviourPool.Recycle(this.gameObject); } private void LateUpdate() { if (m_ClickTarget != null) { if (clickTargetName != m_ClickTarget.name) { UnAttachTrigger(); m_ClickTarget = null; protectTimer = 0f; } } FindClickTarget(); if (guide == 0 || NewBieCenter.Instance.IsGuideCompleted(guide)) { UnAttachTrigger(); clickTargetName = string.Empty; m_ClickTarget = null; guide = 0; FunctionalGuideBehaviourPool.Recycle(this.gameObject); } } private void FindClickTarget() @@ -222,9 +248,9 @@ private void FindAndAttachTrigger(string _path) { m_ClickTarget = WindowCenter.Instance.uiRoot.transform.Find(_path); if (m_ClickTarget != null) { clickTargetName = m_ClickTarget.name; var trigger = NewBieEventTrigger.SetPointClick(m_ClickTarget.gameObject); if (trigger != null) { System/NewBieGuidance/NewBieCenter.cs
@@ -71,6 +71,11 @@ playerDeadModel.playerDieEvent -= OnPlayerDead; } public bool IsGuideCompleted(int guideId) { return completeGuidesBuf.Contains(guideId); } public void ResetGuideRecords(uint[] _guideRecords) { completeGuidesBuf.Clear(); System/OpenServerActivity/FlashRushToBuyNotify.cs
@@ -3,6 +3,7 @@ public class FlashRushToBuyNotify : OpenServerActivityNotifyBase { public FlashRushToBuyModel rushToBuyModel { get { return ModelCenter.Instance.GetModel<FlashRushToBuyModel>(); } } OpenServerActivityNotifyModel activityNotifyModel { get { return ModelCenter.Instance.GetModel<OpenServerActivityNotifyModel>(); } } private void OnEnable() { Display(); @@ -23,11 +24,13 @@ { base.ClickGotoBtn(); this.gameObject.SetActive(false); activityNotifyModel.SetCloseFlashRushToBuyList(); WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.FlashRushToBuy); } protected override void ClickCloseBtn() { base.ClickCloseBtn(); activityNotifyModel.SetCloseFlashRushToBuyList(); } } } System/OpenServerActivity/FlashSaleTimeCell.cs
@@ -65,12 +65,19 @@ switch (buyState) { case -1: this.gameObject.SetActive(true); string timeStr = operation.ToDisplayBuyTime(date.month, dayIndex + date.day, operationTime.startHour, operationTime.startMinute); remainText.text = Language.Get("FlashRushToBuy106", timeStr); string timeStr = ""; if(seconds > 7200) { timeStr = operation.ToDisplayBuyTime(date.month, dayIndex + date.day, operationTime.startHour, operationTime.startMinute); remainText.text = Language.Get("FlashRushToBuy106", timeStr); } else { timeStr = TimeUtility.SecondsToHMS(seconds); remainText.text = Language.Get("FlashRushToBuy108", timeStr); } break; case 0: this.gameObject.SetActive(true); remainText.text = Language.Get("FlashRushToBuy105", TimeUtility.SecondsToHMS(seconds)); break; case 1: System/OpenServerActivity/OpenServerActivityNotifyModel.cs
@@ -182,11 +182,22 @@ public void FlashRushToBuyActivityClose() { flashSaleShops.Clear(); closeflashSaleShops.Clear(); if (UpdateFlashRushToBuyEvent != null) { UpdateFlashRushToBuyEvent(); } } public List<OperationFlashRushToBuy.FlashSaleShop> closeflashSaleShops = new List<OperationFlashRushToBuy.FlashSaleShop>(); public void SetCloseFlashRushToBuyList() { if(flashSaleShops.Count > 0) { closeflashSaleShops.Add(flashSaleShops[flashSaleShops.Count - 1]); } } #endregion } System/OpenServerActivity/OpenServerActivityNotifyWin.cs
@@ -41,8 +41,13 @@ private void CheckFlashRushToBuy() { OperationFlashRushToBuy.FlashSaleShop saleShop = null; if(activityNotifyModel.flashSaleShops.Count > 0) { saleShop = activityNotifyModel.flashSaleShops[activityNotifyModel.flashSaleShops.Count - 1]; } if (saleShop != null && !activityNotifyModel.closeflashSaleShops.Contains(saleShop)) { flashRushToBuyNotify.gameObject.SetActive(true); } else System/OpenServerActivity/OperationFlashRushToBuy.cs
@@ -91,9 +91,22 @@ { if(PlayerDatas.Instance.baseData.LV >= limitLv) { if(InAdvanceTime(TimeUtility.ServerNow) || InTime(TimeUtility.ServerNow)) if(flashShops.Count > 0) { return true; int openSeconds = 0; int endSeconds = 0; var fristShop = flashShops[0]; var lastShop = flashShops[flashShops.Count - 1]; int OpenState = GetBuyTimeState(TimeUtility.ServerNow,fristShop.dayIndex,fristShop.timeIndex, out openSeconds); int endState = GetBuyTimeState(TimeUtility.ServerNow,lastShop.dayIndex, lastShop.timeIndex,out endSeconds); if(OpenState == -1 && openSeconds <= inAdvanceMinute*60) { return true; } else if(endState != 1 && OpenState != -1) { return true; } } } return false; @@ -132,7 +145,7 @@ var item = new FlashSaleItem(); var saleItem = shop.GiftbagInfo[k]; item.shopId = (int)saleItem.GiftID; item.shopGuid = shop.DayIndex*1000 + shop.TimeIndex*100 + k; item.shopGuid = shop.DayIndex*10000 + shop.TimeIndex*100 + k; item.limitNum = saleItem.BuyCountLimit; item.fullServerLimitNum = saleItem.ServerBuyCountLimit; item.moneyType = saleItem.MoneyType; System/Pet/PetAttributeWin.cs
@@ -93,7 +93,10 @@ { IsRedPointCultivate(); } if (PackSendQuestMgr.Instance.useItemModel != null) { PackSendQuestMgr.Instance.useItemModel = null; } } private void AddPet()//灵宠添加 @@ -309,7 +312,7 @@ int ItemId = PackSendQuestMgr.Instance.useItemModel.itemInfo.ItemID; if (ItemId == 4151) { int Pet = petmodel.GetMinPetLv(); int Pet = petmodel.GetMinPetExp(); if (Pet != 0) { TypePetID = Pet; System/Pet/PlayerPetDatas.cs
@@ -353,26 +353,20 @@ } } public int GetMinPetLv() public int GetMinPetExp() { int GetPetId = 0; int petLv = 0; int NeedExp = 99999999; for (int i = 0; i < Sortpet.Count; i++) { int petID = Sortpet[i].ID; if (_DicPetBack.ContainsKey(petID)) if (_DicPetBack.ContainsKey(petID) && _DicPetBack[petID].PetClass < Config.Instance.Get<PetInfoConfig>(petID).MaxRank) { var key = petID; if (petLv == 0 && _DicPetBack[key].PetClass < GetPetSkillMaxLv(key)) int _NeedExp = PetClassCostConfig.GetPetIdAndRank(petID, _DicPetBack[petID].PetClass).UpNeedExp; if (_NeedExp - _DicPetBack[petID].petExp < NeedExp) { petLv = _DicPetBack[key].PetClass; GetPetId = key; } if (_DicPetBack[key].PetClass < petLv && _DicPetBack[key].PetClass < GetPetSkillMaxLv(key)) { petLv = _DicPetBack[key].PetClass; GetPetId = key; NeedExp = _NeedExp - _DicPetBack[petID].petExp; GetPetId = petID; } } }
