| System/BlastFurnace/GetItemPathModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/FairyAu/PlayerFairyAuTreasureData.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/FairyAu/WarehouseTipsWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/TreasureFindHost/ReciveConditionCell.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/TreasureFindHost/TreasureFindHostModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/TreasureFindHost/TreasureFindHostWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Vip/LimitedTimePackageWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
System/BlastFurnace/GetItemPathModel.cs
@@ -208,12 +208,19 @@ switch(itemWaysModel.ID) { case 38: ModelCenter.Instance.GetModel<PlayerFairyAuTreasureData>().JumpItemID = itemId; SetUnionWarehouseGetWay(); break; } WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)itemWaysModel.OpenpanelId); } public void SetUnionWarehouseGetWay() { var model1 = ModelCenter.Instance.GetModel<PlayerFairyAuTreasureData>(); var model2 = ModelCenter.Instance.GetModel<TreasureFindHostModel>(); model1.JumpItemID = model2.adviceIdlist; } #region 设置弹框位置 private RectTransform infoTip = null; private RectTransform waysTip = null; System/FairyAu/PlayerFairyAuTreasureData.cs
@@ -48,25 +48,40 @@ public Dictionary<int, FamilyStoreItem> _DicfamilyStoreItem = new Dictionary<int, FamilyStoreItem>();//家族仓库物品信息 public List<FamilyActionInfoClass> _InformationList = new List<FamilyActionInfoClass>(); public List<FamilyActionInfoClass> _InformationList = new List<FamilyActionInfoClass>(); public delegate void OnFairyAuIntegral(); public static event OnFairyAuIntegral Event_FairyAuIntegral;//用于仙盟积分的刷新 public delegate void OnFamilyActionInfo(); public static event OnFamilyActionInfo Event_FamilyActionInfo;//家族行为信息的刷新 public delegate void OnFamilyStoreItemInfo(); public static event OnFamilyStoreItemInfo Event_FamilyStoreItemInfo;//仓库信息的刷新 public static event Action<List<int>> Del_FamilyStoreItemInfo;//仓库信息物品的删除 public static event Action<List<int>> Del_FamilyStoreItemInfo;//仓库信息物品的删除 PlayerPackModel _playerPack; PlayerPackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); } } PackModelInterface _modelInterface; PackModelInterface modelInterface { get { return _modelInterface ?? (_modelInterface = ModelCenter.Instance.GetModel<PackModelInterface>()); } } public int _FairyAuIntegral = 0;//获取仙盟积分 public int JumpItemID = 0;// public List<int> JumpItemID = new List<int>();//从跳转到仙盟仓库需要选中高亮 List<int> EquipmentList = new List<int>();//关于装备位置 public bool IsShowPoint = false;//是否显示红点 private const int Redpoint_key1 = 1070103; public Redpoint redPointStre1 = new Redpoint(10701, Redpoint_key1);//仙盟仓库红点 public override void Init() { var funConfig = Config.Instance.Get<FuncConfigConfig>("StrengthenDisplay"); int[] List = ConfigParse.GetMultipleStr<int>(funConfig.Numerical1); EquipmentList.Clear(); for (int i = 0; i < List.Length; i++) { EquipmentList.Add(List[i]); } } public override void UnInit() { { } public void OnBeforePlayerDataInitialize() @@ -76,8 +91,14 @@ } public void OnPlayerLoginOk() { PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= Updatefighting;//数据的刷新(h0418) PlayerDatas.Instance.PlayerDataRefreshInfoEvent += Updatefighting; WarehouseTipsWin.RedPointUpdate -= RedPointUpdate; WarehouseTipsWin.RedPointUpdate += RedPointUpdate; } } public void FairyAuIntegral(int value)//获取仙盟积分 { _FairyAuIntegral = value; @@ -94,46 +115,45 @@ FuncConfigConfig _PetFoodExchange = Config.Instance.Get<FuncConfigConfig>("PetFoodExchange"); _FamilyStoreItemP.ItemID = int.Parse(_PetFoodExchange.Numerical1); _DicfamilyStoreItem.Add(0, _FamilyStoreItemP); } } for (int i = 0; i < info.Count; i++) { if (_DicfamilyStoreItem.ContainsKey(info.StoreItemList[i].Index + 1)) continue; FamilyStoreItem _FamilyStoreItem = new FamilyStoreItem(); _FamilyStoreItem.ItemData = JsonUtility.FromJson<FamilyStoreItem.ItemJsonData>(info.StoreItemList[i].ItemData); _FamilyStoreItem.Index = info.StoreItemList[i].Index+1; _FamilyStoreItem.Index = info.StoreItemList[i].Index + 1; _FamilyStoreItem.ItemID = (int)info.StoreItemList[i].ItemID; _FamilyStoreItem._UserData = ConfigParse.Analysis(_FamilyStoreItem.ItemData.UserData); _DicfamilyStoreItem.Add((int)info.StoreItemList[i].Index+1, _FamilyStoreItem); } if (Event_FamilyStoreItemInfo != null) Event_FamilyStoreItemInfo(); _DicfamilyStoreItem.Add((int)info.StoreItemList[i].Index + 1, _FamilyStoreItem); } if (Event_FamilyStoreItemInfo != null) { Event_FamilyStoreItemInfo(); } IsShowRedPoint(); } List<int> List = new List<int>(); public void WarehouseToRefresh(byte [] _list)//仓库刷新 public void WarehouseToRefresh(byte[] _list)//仓库刷新 { List.Clear(); for (int i = 0; i < _list.Length; i++) { List.Add(_list[i]+1); List.Add(_list[i] + 1); } if (Del_FamilyStoreItemInfo != null) { Del_FamilyStoreItemInfo(List); } IsShowRedPoint(); } public void FamilyStoreDel(int _index ,int ClearType)//家族仓库物品删除(清除的格子索引, 仅单格子清除时有效,从0开始代表第一格,0-单格子清除; 1-所有物品清除) public void FamilyStoreDel(int _index, int ClearType)//家族仓库物品删除(清除的格子索引, 仅单格子清除时有效,从0开始代表第一格,0-单格子清除; 1-所有物品清除) { if (_DicfamilyStoreItem.ContainsKey(_index + 1) && ClearType==0) if (_DicfamilyStoreItem.ContainsKey(_index + 1) && ClearType == 0) { _DicfamilyStoreItem.Remove(_index + 1); } @@ -148,7 +168,7 @@ _FamilyStoreItemP.ItemID = int.Parse(_PetFoodExchange.Numerical1); _DicfamilyStoreItem.Add(0, _FamilyStoreItemP); } } } } public void FamilyActionInfo(HA403_tagGCFamilyActionInfo info)//接收家族行为信息 @@ -159,20 +179,96 @@ FamilyActionInfoClass _FamilyActionInfoClass = new FamilyActionInfoClass(); _FamilyActionInfoClass.FamilyID = (int)info.FamilyID; _FamilyActionInfoClass.ActionType = (int)info.ActionType; _FamilyActionInfoClass.Time =(int)info.FamilyActionList[i].Time; _FamilyActionInfoClass.Time = (int)info.FamilyActionList[i].Time; _FamilyActionInfoClass.Name = info.FamilyActionList[i].Name; _FamilyActionInfoClass.OperationType = (int)info.FamilyActionList[i].Value1; _FamilyActionInfoClass.PlayerID = (int)info.FamilyActionList[i].Value2; _FamilyActionInfoClass.ItemID = (int)info.FamilyActionList[i].Value3; _FamilyActionInfoClass.ItemData = JsonUtility.FromJson<FamilyActionInfoClass.ItemJsonData>(info.FamilyActionList[i].UseData); _FamilyActionInfoClass._UserData = ConfigParse.Analysis(_FamilyActionInfoClass.ItemData.UserData); _InformationList.Add(_FamilyActionInfoClass); _InformationList.Add(_FamilyActionInfoClass); } if (Event_FamilyActionInfo != null) Event_FamilyActionInfo();//家族行为信息的刷新 } private bool IsEquipmentComparison() { bool IsBool = false; SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptEquip); for (int i = 0; i < EquipmentList.Count; i++) { ItemModel ItemModel = singlePack.GetItemModelByIndex(i); int Type = i; if (ItemModel != null) { foreach (var key in _DicfamilyStoreItem.Keys) { if (key == 0) { continue; } int ItemId = _DicfamilyStoreItem[key].ItemID; var itemConfig = Config.Instance.Get<ItemConfig>(ItemId); int RealmLevel = PlayerDatas.Instance.baseData.realmLevel; int equipScore = modelInterface.SetEquipScore(PackType.rptEquip, ItemId, _DicfamilyStoreItem[key]._UserData); if (ItemModel.chinItemModel.EquipPlace == Type && RealmLevel >= itemConfig.RealmLimit && equipScore >= ItemModel.equipScore) { IsBool = true; } } } else { foreach (var key in _DicfamilyStoreItem.Keys) { if (key == 0) { continue; } int ItemId = _DicfamilyStoreItem[key].ItemID; var itemConfig = Config.Instance.Get<ItemConfig>(ItemId); int RealmLevel = PlayerDatas.Instance.baseData.realmLevel; if (itemConfig.EquipPlace == Type && RealmLevel >= itemConfig.RealmLimit) { IsBool = true; } } } } return IsBool; } private void IsShowRedPoint() { int GetDayOfYear = DateTime.Now.DayOfYear; string strKey= "Treasure"+ PlayerDatas.Instance.baseData.LV; int day = LocalSave.GetInt(strKey); if (day != GetDayOfYear && IsEquipmentComparison()) { LocalSave.SetInt(strKey, GetDayOfYear); IsShowPoint = true; } if (IsShowPoint) { redPointStre1.state = RedPointState.Simple; } else { redPointStre1.state = RedPointState.None; } } private void Updatefighting(PlayerDataRefresh obj)//刷新境界 { if (obj == PlayerDataRefresh.OfficialRank) { IsShowRedPoint(); } } private void RedPointUpdate() { IsShowRedPoint(); } } System/FairyAu/WarehouseTipsWin.cs
@@ -84,6 +84,7 @@ int _indexList = 0;//标记需要兑换的数组下标 int _WPID = 0;//用来标记需要兑换的物品ID private int SpiritPetDan = 0; public static event Action RedPointUpdate; #endregion @@ -132,15 +133,20 @@ protected override void OnAfterOpen() { if (RedPointUpdate!=null && playerFairyAuTreasureData.IsShowPoint) { playerFairyAuTreasureData.IsShowPoint = false; RedPointUpdate(); } _GridlineCtrl.mScrollRect.verticalNormalizedPosition = 1; HandleAchievement(); } protected override void OnPreClose() { if (playerFairyAuTreasureData.JumpItemID != 0) if (playerFairyAuTreasureData.JumpItemID!=null && playerFairyAuTreasureData.JumpItemID.Count>0) { playerFairyAuTreasureData.JumpItemID = 0; playerFairyAuTreasureData.JumpItemID.Clear(); } } @@ -1021,36 +1027,41 @@ int Color = 0;//颜色 int Star = 0;//颜色 int EquipPlace = 0;//装备位置 if (playerFairyAuTreasureData.JumpItemID == 0) if (playerFairyAuTreasureData.JumpItemID==null || playerFairyAuTreasureData.JumpItemID.Count <= 0) { return; } int ItemId = playerFairyAuTreasureData.JumpItemID; var itemconfig = Config.Instance.Get<ItemConfig>(ItemId); if (itemconfig.EquipPlace == 0 && itemconfig.EquipPlace > 10) for (int i = 0; i < playerFairyAuTreasureData.JumpItemID.Count; i++) { return; } Order = itemconfig.LV; Color = itemconfig.ItemColor; Star = itemconfig.StarLevel; EquipPlace = itemconfig.EquipPlace; foreach (var key in playerFairyAuTreasureData._DicfamilyStoreItem.Keys) { var Item_ID = playerFairyAuTreasureData._DicfamilyStoreItem[key].ItemID; var item_config = Config.Instance.Get<ItemConfig>(Item_ID); if (item_config==null && item_config.EquipPlace == 0 && item_config.EquipPlace > 10) int ItemId = playerFairyAuTreasureData.JumpItemID[i]; var itemconfig = Config.Instance.Get<ItemConfig>(ItemId); if (itemconfig.EquipPlace == 0 && itemconfig.EquipPlace > 10) { continue; return; } if (item_config.LV >= Order && item_config.ItemColor >= Color && item_config.StarLevel >= Star && EquipPlace == item_config.EquipPlace && PlayerDatas.Instance.baseData.Job == item_config.JobLimit / 100) Order = itemconfig.LV; Color = itemconfig.ItemColor; Star = itemconfig.StarLevel; EquipPlace = itemconfig.EquipPlace; foreach (var key in playerFairyAuTreasureData._DicfamilyStoreItem.Keys) { DicHighlight.Add(key,1); var Item_ID = playerFairyAuTreasureData._DicfamilyStoreItem[key].ItemID; var item_config = Config.Instance.Get<ItemConfig>(Item_ID); if (item_config == null && item_config.EquipPlace == 0 && item_config.EquipPlace > 10) { continue; } if (item_config.LV >= Order && item_config.ItemColor >= Color && item_config.StarLevel >= Star && EquipPlace == item_config.EquipPlace && PlayerDatas.Instance.baseData.Job == item_config.JobLimit / 100) { if (!DicHighlight.ContainsKey(key)) { DicHighlight.Add(key, 1); } } } } } } private void ClearItemID(int Index) System/TreasureFindHost/ReciveConditionCell.cs
@@ -118,6 +118,7 @@ receivedImg.SetActive(false); receiveBtn.AddListener(() => { hostModel.SetAdviceIdlist(adviceIdlist); ItemAttrData attrData = new ItemAttrData(adviceIdlist[0], true, 0, -1, 0, true, PackType.rptDeleted, "", null, ItemTipChildType.GetEquipPath); tipsModel.SetItemTipsModel(attrData, false); if (tipsModel.compareAttrData != null) System/TreasureFindHost/TreasureFindHostModel.cs
@@ -340,6 +340,21 @@ return false; } public int SelectTreasureId { get; private set; } public void SetSelectTreasureId(int treasureId) { SelectTreasureId = treasureId; } public List<int> adviceIdlist = new List<int>(); public void SetAdviceIdlist(List<int> idlist) { if (idlist == null || idlist.Count < 1) return; adviceIdlist.Clear(); adviceIdlist.AddRange(idlist); } #region 处理服务端数据 public event Action OnCompletedAct; public void GetServerAwardRecord(HA348_tagMCXBXZAwardRecordList awardRecord) System/TreasureFindHost/TreasureFindHostWin.cs
@@ -202,6 +202,7 @@ } selectTreasureId = treasureId; hostModel.SetSelectTreasureId(treasureId); UI3DTreasureExhibition.Instance.BeginShowTreasure(selectTreasureId, treasureIcon); CreateConditionCell(); functionOrder = index; System/Vip/LimitedTimePackageWin.cs
@@ -50,6 +50,7 @@ { OperationTimeHepler.Instance.operationTimeUpdateEvent += OperationTimeUpdateEvent; limitedTimePackageItemModel.UpdateLimitedTimePackageItem += UpdateLimitedTimePackageItem; GlobalTimeEvent.Instance.secondEvent += secondEvent; time = 0; m_Buy_Btn.interactable = true; DisPlay(); @@ -88,7 +89,7 @@ if (OperationTimeHepler.Instance.TryGetOperationTime(Operation.GiftPackage, out operationBase)) { GiftPackageClass operation = operationBase as GiftPackageClass; m_Text_ActivityTimeTo.text = StringUtility.Contact(Language.Get("ExpActivity_Text1"), operation.ToDisplayTime()); // m_Text_ActivityTimeTo.text = StringUtility.Contact(Language.Get("ExpActivity_Text1"), operation.ToDisplayTime()); var index = operation.IndexOfFlashShop(); if (index != -1 && index < operation.giftpackage1.Count) { @@ -169,8 +170,10 @@ { OperationTimeHepler.Instance.operationTimeUpdateEvent -= OperationTimeUpdateEvent; limitedTimePackageItemModel.UpdateLimitedTimePackageItem -= UpdateLimitedTimePackageItem; GlobalTimeEvent.Instance.secondEvent -= secondEvent; } protected override void OnAfterClose() { } @@ -186,7 +189,37 @@ } } } private void secondEvent() { int time = OperationTimeHepler.Instance.GetOperationSurplusTime(Operation.GiftPackage); if (time <= 0) { m_Text_ActivityTimeTo.text = Language.Get("LimitGift2"); } if (time > 86400) { m_Text_ActivityTimeTo.gameObject.SetActive(false); } else { if (!m_Text_ActivityTimeTo.gameObject.activeSelf) { m_Text_ActivityTimeTo.gameObject.SetActive(true); } if (time < 3600) { m_Text_ActivityTimeTo.text =Language.Get("LimitGift1")+":"+ TimeUtility.SecondsToHMS(time); m_Text_ActivityTimeTo.color = UIHelper.GetUIColor(TextColType.Green); } else { m_Text_ActivityTimeTo.text = Language.Get("LimitGift1") + ":" + TimeUtility.SecondsToHMS(time); m_Text_ActivityTimeTo.color = UIHelper.GetUIColor(TextColType.Green); } } } #endregion }
