Core/GameEngine/Model/Config/JadeDynastySuitAttrConfig.cs
File was deleted Core/GameEngine/Model/Config/JadeDynastySuitAttrConfig.cs.meta
File was deleted Lua/Gen/BuyItemPopModelWrap.cs
File was deleted Lua/Gen/BuyItemPopModelWrap.cs.meta
File was deleted Lua/Gen/JadeDynastySuitAttrConfigWrap.cs
File was deleted Lua/Gen/JadeDynastySuitAttrConfigWrap.cs.meta
File was deleted Lua/Gen/SnxxzUIBatchUseModelWrap.cs
File was deleted Lua/Gen/SnxxzUIBatchUseModelWrap.cs.meta
File was deleted Lua/Gen/SnxxzUIItemTipsModelWrap.cs
File was deleted Lua/Gen/SnxxzUIItemTipsModelWrap.cs.meta
File was deleted Lua/Gen/XLuaGenAutoRegister.cs
@@ -352,8 +352,6 @@ translator.DelayWrapLoader(typeof(JadeDynastyStoneAttrConfig), JadeDynastyStoneAttrConfigWrap.__Register); translator.DelayWrapLoader(typeof(JadeDynastySuitAttrConfig), JadeDynastySuitAttrConfigWrap.__Register); translator.DelayWrapLoader(typeof(JadeDynastyTowerConfig), JadeDynastyTowerConfigWrap.__Register); @@ -1109,16 +1107,12 @@ translator.DelayWrapLoader(typeof(Snxxz.UI.ItemOverdueModel), SnxxzUIItemOverdueModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.ItemTipsModel), SnxxzUIItemTipsModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.PackModel), SnxxzUIPackModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.TreasureEffectModel), SnxxzUITreasureEffectModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.BatchUseModel), SnxxzUIBatchUseModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.KingTreasureShowModel), SnxxzUIKingTreasureShowModelWrap.__Register); @@ -1306,9 +1300,6 @@ translator.DelayWrapLoader(typeof(CoroutineMgr), CoroutineMgrWrap.__Register); translator.DelayWrapLoader(typeof(BuyItemController), BuyItemPopModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.BuySuccessModel), SnxxzUIBuySuccessModelWrap.__Register); System/Achievement/AchievementModel.cs
@@ -248,11 +248,11 @@ } else { EquipTipUtility.Show(2103); ItemTipUtility.Show(2103); } break; case 13: EquipTipUtility.Show(2100); ItemTipUtility.Show(2100); break; case 4: case 86: @@ -278,7 +278,7 @@ var guid = GetHighestSorceEquipByPlace(new List<int>() { config.Condition[0] }); if (string.IsNullOrEmpty(guid)) { EquipTipUtility.Show(2108); ItemTipUtility.Show(2108); } else { @@ -301,11 +301,11 @@ var itemQuality = config.Condition[1]; if (equipQualityItemIdTables.ContainsKey(itemQuality)) { EquipTipUtility.Show(equipQualityItemIdTables[itemQuality]); ItemTipUtility.Show(equipQualityItemIdTables[itemQuality]); } else { EquipTipUtility.Show(2108); ItemTipUtility.Show(2108); } } } @@ -323,11 +323,11 @@ var itemQuality = config.Condition[0]; if (equipQualityItemIdTables.ContainsKey(itemQuality)) { EquipTipUtility.Show(equipQualityItemIdTables[itemQuality]); ItemTipUtility.Show(equipQualityItemIdTables[itemQuality]); } else { EquipTipUtility.Show(2108); ItemTipUtility.Show(2108); } } else @@ -347,11 +347,11 @@ var itemQuality = config.Condition[0]; if (equipQualityItemIdTables.ContainsKey(itemQuality)) { EquipTipUtility.Show(equipQualityItemIdTables[itemQuality]); ItemTipUtility.Show(equipQualityItemIdTables[itemQuality]); } else { EquipTipUtility.Show(2108); ItemTipUtility.Show(2108); } } else @@ -370,11 +370,11 @@ var itemQuality = config.Condition[0]; if (equipQualityItemIdTables.ContainsKey(itemQuality)) { EquipTipUtility.Show(equipQualityItemIdTables[itemQuality]); ItemTipUtility.Show(equipQualityItemIdTables[itemQuality]); } else { EquipTipUtility.Show(2108); ItemTipUtility.Show(2108); } } else @@ -393,11 +393,11 @@ var itemQuality = config.Condition[0]; if (equipQualityItemIdTables.ContainsKey(itemQuality)) { EquipTipUtility.Show(equipQualityItemIdTables[itemQuality]); ItemTipUtility.Show(equipQualityItemIdTables[itemQuality]); } else { EquipTipUtility.Show(2108); ItemTipUtility.Show(2108); } } else @@ -413,7 +413,7 @@ var guid90 = GetBetterEquipByPlace(new List<int>() { 11 }); if (string.IsNullOrEmpty(guid90)) { EquipTipUtility.Show(2108); ItemTipUtility.Show(2108); } else { @@ -446,7 +446,7 @@ } break; case 116: EquipTipUtility.Show(config.Condition[0]); ItemTipUtility.Show(config.Condition[0]); break; default: WindowCenter.Instance.Close<TreasureBaseWin>(); System/Activity/ActivitySettleWin.cs
@@ -133,12 +133,9 @@ } } private void ShowItemDetails(ServerItem serverItem) { ItemAttrData attrData = new ItemAttrData(serverItem.ItemID, false, (ulong)serverItem.Count, -1 , false, PackType.Deleted, "", ConfigParse.Analysis(serverItem.UserData)); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(serverItem.ItemID); } } System/Alchemy/AlchemyDrugLimitWin.cs
@@ -119,7 +119,7 @@ var count = ModelCenter.Instance.GetModel<PackModel>().GetItemCountByID(PackType.Item, drugUseLimit.addItem.id); if (count < drugUseLimit.addItem.count) { EquipTipUtility.Show(drugUseLimit.addItem.id); ItemTipUtility.Show(drugUseLimit.addItem.id); return; } } System/Alchemy/AlchemyStoveBehaviour.cs
@@ -209,7 +209,7 @@ Item item; if (!model.IsAlchemyEnoughMaterial(model.selectAlchemy, out item)) { EquipTipUtility.Show(item.id); ItemTipUtility.Show(item.id); return; } var succRate = model.GetAlchemySuccRate(model.selectAlchemy); @@ -304,7 +304,7 @@ m_Func.SetListener(() => { EquipTipUtility.Show(id); ItemTipUtility.Show(id); }); } System/Alchemy/AlchemyUseDrugCell.cs
@@ -28,8 +28,7 @@ m_Item.Init(itemModel); m_Item.button.SetListener(() => { var itemData = new ItemAttrData(itemId, true, (ulong)count); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(itemData); ItemTipUtility.Show(itemId); }); var eatTimes = 0; System/Auction/AttentionWin.cs
@@ -122,9 +122,9 @@ itemCell.Init(cellModel); itemCell.button.SetListener(() => { ItemAttrData attrData = new ItemAttrData(itemConfig.ID, true, (ulong)1); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(itemConfig.ID); }); textName.text = itemConfig.ItemName; if (model.IsMyFocusItem(auctionItem.ItemID)) { System/Auction/AuctionShelfWin.cs
@@ -98,9 +98,7 @@ m_ItemName.text = auctionHelpModel.ItemModel.config.ItemName; m_ItemCell.button.SetListener(() => { var itemData = new ItemAttrData(item.itemId, false, (ulong)item.count, item.itemInfo.index, false, item.packType, item.guid, item.useDataDict); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(itemData); ItemTipUtility.Show(item.itemId); }); var isOverdue = ItemLogicUtility.Instance.IsOverdue(auctionHelpModel.ItemModel.guid); System/Auction/FamilyAuctioncell.cs
@@ -85,8 +85,7 @@ m_ItemCell.Init(cellModel); m_ItemCell.button.SetListener(() => { ItemAttrData attrData = new ItemAttrData(auctionItem.itemId, true, (ulong)1); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(auctionItem.itemId); }); var itemConfig = ItemConfig.Get(auctionItem.itemId); System/Auction/FullServiceAuctioncell.cs
@@ -106,8 +106,7 @@ m_ItemCell.Init(cellModel); m_ItemCell.button.SetListener(() => { ItemAttrData attrData = new ItemAttrData(auctionItem.itemId, true, (ulong)1); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(auctionItem.itemId); }); var itemConfig = ItemConfig.Get(auctionItem.itemId); System/Auction/MyAuctionCell.cs
@@ -92,8 +92,7 @@ m_ItemCell.Init(cellModel); m_ItemCell.button.SetListener(() => { ItemAttrData attrData = new ItemAttrData(auctionItem.itemId, true, (ulong)1); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(auctionItem.itemId); }); m_ItemName.text = itemConfig.ItemName; System/Auction/MyFocusAuctionBehaviour.cs
@@ -76,8 +76,7 @@ m_ItemCell.Init(cellModel); m_ItemCell.button.SetListener(() => { var itemData = new ItemAttrData(focusAuctionItem.itemId, true, 1); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(itemData); ItemTipUtility.Show(focusAuctionItem.itemId); }); var itemConfig = ItemConfig.Get(focusAuctionItem.itemId); System/Auction/MyFocusCell.cs
@@ -87,8 +87,7 @@ m_ItemCell.Init(cellModel); m_ItemCell.button.SetListener(() => { ItemAttrData attrData = new ItemAttrData(auctionItem.itemId, true, (ulong)1); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(auctionItem.itemId); }); m_ItemName.text = itemConfig.ItemName; System/Auction/TransactionRecordWin.cs
@@ -181,8 +181,7 @@ itemCell.Init(cellModel); itemCell.button.SetListener(() => { ItemAttrData attrData = new ItemAttrData(itemConfig.ID, true, (ulong)item.itemCount); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(itemConfig.ID); }); textName.text = itemConfig.ItemName; timeText.text = item.putAwayTime.ToString("yyyy-MM-dd HH:mm:ss"); System/Compose/New/ComposeMatCell.cs
@@ -163,7 +163,7 @@ case NeedMatType.fixedItem: if (itemConfig.GetWay != null && itemConfig.GetWay.Length > 0) { EquipTipUtility.Show(itemId); ItemTipUtility.Show(itemId); return; } break; @@ -172,12 +172,11 @@ if (itemModel == null) { attrData = new ItemAttrData(itemId, true); tipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(itemId); } else { tipsModel.SetItemTipsModel(PackType.Item, itemModel.guid); ItemTipUtility.Show(itemModel.guid); } } System/Compose/New/ComposeWinModel.cs
@@ -528,32 +528,14 @@ int haveCount = playerPack.GetItemCountByID(packType, fixedIds[i]); if (haveCount < fixedCounts[i]) { ItemConfig fixedConfig = ItemConfig.Get(fixedIds[i]); if (fixedConfig.GetWay.Length < 1) { ItemAttrData attrData = new ItemAttrData(fixedConfig.ID); itemTipsModel.SetItemTipsModel(attrData); } else { EquipTipUtility.Show(fixedConfig.ID); } ItemTipUtility.Show(fixedIds[i]); return; } } if (!IsEnoughMoney(compoundModel)) { ItemConfig fixedConfig = ItemConfig.Get(2100); if (fixedConfig.GetWay.Length < 1) { ItemAttrData attrData = new ItemAttrData(fixedConfig.ID); itemTipsModel.SetItemTipsModel(attrData); } else { EquipTipUtility.Show(fixedConfig.ID); } ItemTipUtility.Show(2100); return; } @@ -927,7 +909,7 @@ //} //else //{ //} } } System/CrossServerOneVsOne/CrossSeverOneVsOneDayAwardCell.cs
@@ -72,8 +72,7 @@ itemBasic.button.RemoveAllListeners(); itemBasic.button.AddListener(() => { ItemAttrData attrData = new ItemAttrData(awardItem.itemId, true, (ulong)awardItem.itemCount); tipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(awardItem.itemId); }); } } System/CrossServerOneVsOne/SeasonRewardCell.cs
@@ -169,8 +169,7 @@ int type = i; _ItemCell.button.SetListener(() => { ItemAttrData attrData = new ItemAttrData(List[type].id, false, (ulong)List[type].count); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(List[type].id); }); } else @@ -285,8 +284,7 @@ int type = i; _ItemCell.button.SetListener(() => { ItemAttrData attrData = new ItemAttrData(List[type].ItemId, false, (ulong)List[type].ItemNumber); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(List[type].ItemId); }); } else System/CrossServerOneVsOne/SegmentRewardCell.cs
@@ -96,8 +96,7 @@ _ItemCell.Init(cellModel); _ItemCell.button.SetListener(() => { ItemAttrData attrData = new ItemAttrData(itemClass.ItemId, false, (ulong)itemClass.ItemNumber); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(itemClass.ItemId); }); } else System/DailyQuest/DailyQuestHangTimeBehaviour.cs
@@ -64,15 +64,11 @@ if (own > 0) { var guid = playerPackModel.GetItemGUIDByID(952); var itemModel = playerPackModel.GetItemByGuid(guid); itemTipsModel.SetItemTipsModel(PackType.Item, itemModel.guid, false, true); itemTipsModel.SetBagTipsBtn(itemTipsModel.curAttrData); itemTipsModel.ShowTip(); ItemTipUtility.Show(guid); } else { var config = StoreConfig.Get(152); var config = StoreConfig.Get(55); storeModel.OnClickShopCell(config); } } System/DailyQuest/ResourcesBackBoxBack.cs
@@ -167,9 +167,7 @@ Number.text = ItemLogicUtility.Instance.OnChangeCoinsUnit((ulong)number); var Item_1 = ItemConfig.Get(2103); Image_1.SetItemBackGround(Item_1.ItemColor); Btn.RemoveAllListeners(); ItemAttrData attrData = new ItemAttrData(2103); Btn.AddListener(()=> { itemTipsModel.SetItemTipsModel(attrData); }); Btn.SetListener(()=> { ItemTipUtility.Show(2103); }); } else if (resourcesBackClass.RewardList[i] == "money") { @@ -180,8 +178,7 @@ Image_1.SetItemBackGround(Item_1.ItemColor); Number.text = ItemLogicUtility.Instance.OnChangeCoinsUnit((ulong)number); Btn.RemoveAllListeners(); ItemAttrData attrData = new ItemAttrData(2100); Btn.AddListener(() => { itemTipsModel.SetItemTipsModel(attrData); }); Btn.SetListener(() => { ItemTipUtility.Show(2100); }); } else if (resourcesBackClass.RewardList[i] == "item") { @@ -205,9 +202,7 @@ Number1.text = ItemLogicUtility.Instance.OnChangeCoinsUnit((ulong)ItemCount); var Item_2 = ItemConfig.Get(ItemId); Image_2.SetItemBackGround(Item_2.ItemColor); ItemAttrData attrData1 = new ItemAttrData(ItemId); Btn1.RemoveAllListeners(); Btn1.AddListener(() => { itemTipsModel.SetItemTipsModel(attrData1); }); Btn1.SetListener(() => { ItemTipUtility.Show(ItemId); }); type += 1; } @@ -307,11 +302,8 @@ Icon.SetSprite(itemIcon); var Item_1 = ItemConfig.Get(2103); Image_1.SetItemBackGround(Item_1.ItemColor); Btn.RemoveAllListeners(); ItemAttrData attrData = new ItemAttrData(2103); Btn.AddListener(() => { itemTipsModel.SetItemTipsModel(attrData); }); Btn.SetListener(() => { ItemTipUtility.Show(2103); }); Number.text = ItemLogicUtility.Instance.OnChangeCoinsUnit((ulong)number); } else if (resourcesBackClass.RewardList[i] == "money") { @@ -320,9 +312,7 @@ Icon.SetSprite(itemIcon); var Item_1 = ItemConfig.Get(2100); Image_1.SetItemBackGround(Item_1.ItemColor); Btn.RemoveAllListeners(); ItemAttrData attrData = new ItemAttrData(2100); Btn.AddListener(() => { itemTipsModel.SetItemTipsModel(attrData); }); Btn.SetListener(() => { ItemTipUtility.Show(2100); }); Number.text = ItemLogicUtility.Instance.OnChangeCoinsUnit((ulong)number); } else if (resourcesBackClass.RewardList[i] == "item") @@ -345,9 +335,7 @@ string itemIcon = ItemConfig.Get(ItemId).IconKey; var Item_2 = ItemConfig.Get(ItemId); Image_2.SetItemBackGround(Item_2.ItemColor); ItemAttrData attrData1 = new ItemAttrData(ItemId); Btn1.RemoveAllListeners(); Btn1.AddListener(()=> { itemTipsModel.SetItemTipsModel(attrData1); }); Btn1.SetListener(()=> { ItemTipUtility.Show(ItemId); }); Icon1.SetSprite(itemIcon); Number1.text = ItemLogicUtility.Instance.OnChangeCoinsUnit((ulong)ItemCount); type += 1; System/Dogz/DogzEquip.cs
@@ -11,7 +11,7 @@ { [SerializeField] CommonItemBaisc itemBaisc; [SerializeField] Text strengLvTxt; ItemTipsModel tipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } } public void Display(ItemModel model) { itemBaisc.Init(model); @@ -32,9 +32,7 @@ itemBaisc.button.RemoveAllListeners(); itemBaisc.button.AddListener(()=> { tipsModel.SetItemTipsModel(model.packType,model.guid,false,false); tipsModel.SetDogzEquipBtn(tipsModel.curAttrData); tipsModel.ShowTip(); ItemTipUtility.Show( model.guid); }); } } System/Dogz/DogzItemCell.cs
@@ -53,9 +53,7 @@ itemBaisc.button.RemoveAllListeners(); itemBaisc.button.AddListener(()=> { tipsModel.SetItemTipsModel(model.packType, model.guid, false, true); tipsModel.SetDogzItemBtn(tipsModel.curAttrData); tipsModel.ShowTip(); ItemTipUtility.Show(model.guid); }); } } System/Dungeon/AchieveTargetBehaviour.cs
@@ -13,19 +13,15 @@ private int currentDungeonId; AchievementModel m_AchievementModel; AchievementModel achievementModel { get { AchievementModel achievementModel { get { return m_AchievementModel ?? (m_AchievementModel = ModelCenter.Instance.GetModel<AchievementModel>()); } } DungeonModel m_DungeonModel; DungeonModel dungeonModel { get { DungeonModel dungeonModel { get { return m_DungeonModel ?? (m_DungeonModel = ModelCenter.Instance.GetModel<DungeonModel>()); } } @@ -96,7 +92,7 @@ if (presentAchieve.rewardItem != null && presentAchieve.rewardItem.Length > 0) { _achievement.m_ItemCell.gameObject.SetActive(true); ItemCellModel _itemCellModel = new ItemCellModel(presentAchieve.rewardItem[0].id, false, (ulong)presentAchieve.rewardItem[0].count); ItemCellModel _itemCellModel = new ItemCellModel(presentAchieve.rewardItem[0].id, false, (ulong)presentAchieve.rewardItem[0].count); _achievement.m_ItemCell.Init(_itemCellModel); _achievement.m_ItemCell.button.RemoveAllListeners(); _achievement.m_ItemCell.button.onClick.AddListener(() => @@ -104,8 +100,7 @@ if (presentAchieve.rewardItem != null && presentAchieve.rewardItem.Length > 0) { var _item = presentAchieve.rewardItem[0]; ItemAttrData _itemAttr = new ItemAttrData(_item.id, false, (ulong)_item.count); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(_itemAttr); ItemTipUtility.Show(_item.id); } }); } System/Dungeon/DungeonAncientKingWin.cs
@@ -65,8 +65,7 @@ m_Items[i].Init(itemCellModel); m_Items[i].button.AddListener(() => { ItemAttrData itemAttrData = new ItemAttrData(award.id, true, (ulong)award.count); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(itemAttrData); ItemTipUtility.Show(award.id); }); } else System/Dungeon/DungeonLiquidCell.cs
@@ -206,12 +206,11 @@ private void OnItemClick(ItemConfig _itemCfg) { ItemAttrData itemAttrData = new ItemAttrData(_itemCfg.ID, true); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(itemAttrData); ItemTipUtility.Show(_itemCfg.ID); } private void OnItemClick(ItemModel _itemModel) { ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(_itemModel.packType, _itemModel.guid); ItemTipUtility.Show(_itemModel.guid); } } System/Dungeon/DungeonRewardItem.cs
@@ -31,8 +31,7 @@ private void ShowItemTip() { var attrData = new ItemAttrData(serverItem.ItemID, false, (ulong)serverItem.Count, -1, false, PackType.Deleted, "", ConfigParse.Analysis(serverItem.UserData)); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(serverItem.ItemID); } private void RequestSfx() System/Dungeon/DungeonSweepResultWin.cs
@@ -187,7 +187,7 @@ break; case 3: var tickets = model.GetTicketCost(model.currentDungeon.mapId, model.currentDungeon.lineId); EquipTipUtility.Show(tickets.id); ItemTipUtility.Show(tickets.id); break; case 4: var cost = model.GetSweepCost(model.currentDungeon); System/Dungeon/DungeonSweepWin.cs
@@ -91,7 +91,7 @@ break; case 2: var tickets = model.GetTicketCost(model.currentDungeon.mapId, model.currentDungeon.lineId); EquipTipUtility.Show(tickets.id); ItemTipUtility.Show(tickets.id); break; case 3: var cost = model.GetSweepCost(model.currentDungeon); System/Dungeon/IceCrystalVeinWin.cs
@@ -270,8 +270,7 @@ _ItemCell.Init(cellModel); _ItemCell.button.SetListener(() => { ItemAttrData attrData = new ItemAttrData(key, false, (ulong)IceCrystalVeinMiddleDic[key]); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(key); }); } } @@ -321,8 +320,8 @@ iceCrystalVeinModel.SendGetAward(IceLode.Index); return; } ItemAttrData attrData = new ItemAttrData(IceLode.ItemID, false, (ulong)IceLode.ItemCount); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(IceLode.ItemID); return; }); } System/Dungeon/NormalDungeonEntranceWin.cs
@@ -387,7 +387,7 @@ SysNotifyMgr.Instance.ShowTip("GeRen_chenxin_268121", dungeonConfig.MapID); break; case 5: EquipTipUtility.Show(dungeonConfig.TicketID); ItemTipUtility.Show(dungeonConfig.TicketID); break; case 6: SysNotifyMgr.Instance.ShowTip("CrossMap10"); System/Dungeon/NuwaRuleRewardCell.cs
@@ -36,9 +36,7 @@ m_Items[i].SetItemRare(itemModel, model.IsNewComparePreFloor(floor, item.id)); m_Items[i].button.SetListener(() => { var itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>(); var itemData = new ItemAttrData(item.id, true, (ulong)item.count); itemTipsModel.SetItemTipsModel(itemData); ItemTipUtility.Show(item.id); }); } else System/Dungeon/TrialDungeonEntranceWin.cs
@@ -336,7 +336,7 @@ { return; } EquipTipUtility.Show(dungeonConfig.TicketID); ItemTipUtility.Show(dungeonConfig.TicketID); break; case 6: SysNotifyMgr.Instance.ShowTip("CrossMap10"); System/Dungeon/TrialSweepResultWin.cs
@@ -198,7 +198,7 @@ break; case 3: var tickets = model.GetTicketCost(model.currentDungeon.mapId, model.currentDungeon.lineId); EquipTipUtility.Show(tickets.id); ItemTipUtility.Show(tickets.id); break; case 4: var cost = model.GetSweepCost(model.currentDungeon); System/Equip/CandidateEquipBehaviour.cs
@@ -75,11 +75,7 @@ private void OpenItemTipWin() { var equip = packModel.GetItemByGuid(this.candidateEquip.guid); tipModel.SetItemTipsModel(PackType.Item, equip.guid, false, true); tipModel.SetBagTipsBtn(tipModel.curAttrData); tipModel.ShowTip(); ItemTipUtility.Show(this.candidateEquip.guid); if (this.candidateEquip.selected.value) { model.ClearRecommendCandidateEquip(); System/Equip/EquipSlotBehaviour.cs
@@ -125,9 +125,7 @@ { if (!string.IsNullOrEmpty(slot.equip.value)) { tipModel.SetItemTipsModel(PackType.Equip, slot.equip.value, false); tipModel.SetPutOnTipsBtn(tipModel.curAttrData); tipModel.ShowTip(); ItemTipUtility.Show(slot.equip.value); } else if (model.HasSamePlaceCandidateEquip(slot.equipPosition)) { System/EquipGem/EquipEvolutionWin.cs
@@ -94,7 +94,7 @@ m_ItemCell.Init(cellModel); m_ItemCell.button.SetListener(()=> { EquipTipUtility.Show(evolve.CostItemID); ItemTipUtility.Show(evolve.CostItemID); }); string strItemCount = string.Empty; string strEquipLevel = string.Empty; System/EquipGem/EquipGemWin.cs
@@ -250,9 +250,7 @@ m_EquipItem.Init(equip); m_EquipItem.button.SetListener(() => { var itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>(); itemTipsModel.SetItemTipsModel(PackType.Item, equipGuid, false, true); itemTipsModel.ShowTip(); ItemTipUtility.Show(equipGuid); }); var maxStar = EquipStarModel.GetMaxStarLevel(equip.config.ItemColor, equip.config.LV); System/EquipGem/EquipStrengthFull.cs
@@ -57,8 +57,7 @@ m_ItemEquip.Init(item); m_ItemEquip.button.SetListener(() => { itemTipsModel.SetItemTipsModel(PackType.Item, equipGuid, false, true); itemTipsModel.ShowTip(); ItemTipUtility.Show(equipGuid); }); } System/EquipGem/EquipStrengthRein.cs
@@ -56,8 +56,7 @@ m_ItemEquip.Init(item); m_ItemEquip.button.SetListener(() => { itemTipsModel.SetItemTipsModel(PackType.Item, equipGuid, false, true); itemTipsModel.ShowTip(); ItemTipUtility.Show(equipGuid); }); } @@ -81,8 +80,7 @@ m_ItemMoney.Init(cellModel); m_ItemMoney.button.SetListener(() => { ItemAttrData attrData = new ItemAttrData(2100, true, (ulong)1); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(2100); }); var equipLvNowList = strengthModel.GetEquipValueList(level, equipPlace); var equipAddLvList = strengthModel.GetEquipValueList(level, equipPlace, 1); System/EquipGem/EquipStrengthUpper.cs
@@ -53,8 +53,7 @@ m_ItemEquip.Init(item); m_ItemEquip.button.SetListener(() => { itemTipsModel.SetItemTipsModel(PackType.Item, equipGuid, false, true); itemTipsModel.ShowTip(); ItemTipUtility.Show(equipGuid); }); } @@ -79,8 +78,7 @@ m_ItemMoney.Init(cellModel); m_ItemMoney.button.SetListener(() => { ItemAttrData attrData = new ItemAttrData(2100, true, (ulong)1); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(2100); }); var equipLvNowList = strengthModel.GetEquipValueList(level, equipPlace); System/EquipGem/EquipStrengthWin.cs
@@ -432,7 +432,7 @@ ulong needMoney = (ulong)itemPlus.costCount; if (money < needMoney) { EquipTipUtility.Show(2100); ItemTipUtility.Show(2100); return false; } System/EquipStar/EquipStarUpgradeSpecialMaterialBehaviour.cs
@@ -69,7 +69,7 @@ private void AddMaterials() { EquipTipUtility.Show(itemId); ItemTipUtility.Show(itemId); } } System/EquipStar/EquipStarWin.cs
@@ -463,9 +463,7 @@ var equipPosition = new Int2(level, place); var equipGuid = equipModel.GetEquip(equipPosition); var itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>(); itemTipsModel.SetItemTipsModel(PackType.Item, equipGuid, false, true); itemTipsModel.ShowTip(); ItemTipUtility.Show(equipGuid); } [System.Serializable] System/EquipTrain/EquipTrainWin.cs
@@ -330,9 +330,7 @@ var equipPosition = new Int2(level, place); var equipGuid = equipModel.GetEquip(equipPosition); var itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>(); itemTipsModel.SetItemTipsModel(PackType.Item, equipGuid, false, true); itemTipsModel.ShowTip(); ItemTipUtility.Show(equipGuid); } private void CreateLevelBehaviours() System/FairyAu/AllianceBossBehaviour.cs
@@ -77,8 +77,7 @@ m_Items[i].Init(itemModel); m_Items[i].button.SetListener(() => { var itemData = new ItemAttrData(item.id, true, (ulong)item.count); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(itemData); ItemTipUtility.Show(item.id); }); } else System/FairyAu/FairyAuTaskWin.cs
@@ -383,8 +383,7 @@ int tab = i; itemcell.button.AddListener(() => { ItemAttrData attrData = new ItemAttrData(rewardList[tab].itemCfg.ID, false, (ulong)rewardList[tab].num); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(rewardList[tab].itemCfg.ID); }); } } @@ -424,8 +423,7 @@ int tab = i; itemCell.button.SetListener(()=> { ItemAttrData attrData = new ItemAttrData(AwardItemList[tab].id, false, Number); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(AwardItemList[tab].id); }); } } System/FairyAu/FairyBoss.cs
@@ -164,7 +164,7 @@ private void OnFoodGetWay() { EquipTipUtility.Show(fairyBossModel.fairyBossFood); ItemTipUtility.Show(fairyBossModel.fairyBossFood); } void UpdateTimeTip() System/FairyAu/FairyGrabBossWin.cs
@@ -144,8 +144,7 @@ m_DropItems[i].Init(itemCellModel); m_DropItems[i].button.AddListener(() => { ItemAttrData itemAttrData = new ItemAttrData(item.id, true, (ulong)item.count); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(itemAttrData); ItemTipUtility.Show(item.id); }); } else System/FairyAu/FairyLeagueRankCell.cs
@@ -95,8 +95,7 @@ m_ChampionAward.Init(_Award.id, Mathf.Min(1, _Award.count)); m_ChampionAwardBtn.onClick.AddListener(() => { ItemAttrData _itemData = new ItemAttrData(_Award.id, true, (ulong)_Award.count); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(_itemData); ItemTipUtility.Show(_Award.id); }); } } System/FairyAu/HallTipsWin.cs
@@ -76,7 +76,7 @@ } private void ObtainBtn() { EquipTipUtility.Show(mainModel.GetCurrencyItemID[6]); ItemTipUtility.Show(mainModel.GetCurrencyItemID[6]); } public void Initialize()//信息初始化 System/FairyAu/KingTempleWin.cs
@@ -227,15 +227,13 @@ private void OnPrivilegeItem() { ItemAttrData attrData = new ItemAttrData(model.privilegeItemId, true); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(attrData); ItemTipUtility.Show(model.privilegeItemId); } private void OnSalaryItem(int index) { var _itemArray = model.salaryAwardItems[index]; ItemAttrData attrData = new ItemAttrData(_itemArray[0], true, (ulong)_itemArray[1]); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(attrData); ItemTipUtility.Show(_itemArray[0]); } } System/FairyAu/MethodToWin.cs
@@ -234,7 +234,7 @@ private void ApproachButton() { EquipTipUtility.Show(mainModel.GetCurrencyItemID[6]); ItemTipUtility.Show(mainModel.GetCurrencyItemID[6]); } @@ -332,7 +332,7 @@ } else { EquipTipUtility.Show(mainModel.GetCurrencyItemID[6]); ItemTipUtility.Show(mainModel.GetCurrencyItemID[6]); } } else System/FairylandCeremony/CeremonyFirepartyWin.cs
@@ -62,8 +62,7 @@ fireItem.Init(fireModel); fireItem.button.AddListener(() => { ItemAttrData attrData = new ItemAttrData(storeConfig.ItemID,true, (ulong)storeConfig.ItemCnt); tipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(storeConfig.ItemID); }); if (itemlist == null) return; @@ -79,8 +78,7 @@ itemBaiscs[i].button.RemoveAllListeners(); itemBaiscs[i].button.AddListener(() => { ItemAttrData attrData = new ItemAttrData(itemData.itemId, true, (ulong)itemData.itemCount); tipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(itemData.itemId); }); } else System/FairylandCeremony/CeremonyOutOfPrintWin.cs
@@ -158,8 +158,7 @@ kingFairyModel.ViewKingFairyChest(itemData.itemId,itemData.itemCount); break; default: ItemAttrData attrData = new ItemAttrData(itemData.itemId, true, (ulong)itemData.itemCount); tipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(itemData.itemId); break; } System/FairylandCeremony/CeremonyRechargeGiftWin.cs
@@ -70,8 +70,7 @@ itemBaiscs[i].button.RemoveAllListeners(); itemBaiscs[i].button.AddListener(()=> { ItemAttrData attrData = new ItemAttrData(itemData.itemId, true, (ulong)itemData.itemCount); tipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(itemData.itemId); }); } else System/FairylandCeremony/ToHiAwardCell.cs
@@ -47,8 +47,7 @@ itemBaiscs[i].button.RemoveAllListeners(); itemBaiscs[i].button.AddListener(() => { ItemAttrData attrData = new ItemAttrData(itemData.itemId, true, (ulong)itemData.itemCount); tipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(itemData.itemId); }); } else System/FriendSystem/MailPanel.cs
@@ -333,8 +333,7 @@ itemCell.button.onClick.RemoveAllListeners(); itemCell.button.onClick.AddListener(() => { ItemAttrData attrData = new ItemAttrData((int)itemModel.ItemID, false, (ulong)itemModel.Count, -1, true, PackType.Deleted, "", ConfigParse.Analysis(itemModel.UserData)); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show((int)itemModel.ItemID); } ); } System/GatheringSoul/GatherSoulHoleBehaviour.cs
@@ -118,6 +118,7 @@ data.SetTipsFuncBtn(ItemOperateType.Replace, OnTipFunc); list = null; } itemTipsModel.SetItemTipsModel(data); } else System/GatheringSoul/GatherSoulMatItem.cs
@@ -90,7 +90,7 @@ var displayId = GeneralDefine.moneyDisplayIds.ContainsKey(moneyType) ? GeneralDefine.moneyDisplayIds[moneyType] : 0; if (displayId != 0) { EquipTipUtility.Show(displayId); ItemTipUtility.Show(displayId); } } } System/HappyXB/HappyXBGetItemWin.cs
@@ -246,9 +246,7 @@ itemBasic.button.RemoveAllListeners(); itemBasic.button.AddListener(() => { ItemAttrData attrData = new ItemAttrData(xbItem.itemId, false, (ulong)xbItem.count); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(xbItem.itemId); }); itemBasic.transform.localScale = Vector3.zero; itemBasic.transform.localPosition = Vector3.zero; System/HappyXB/XBItemCell.cs
@@ -30,8 +30,7 @@ itemCell.button.RemoveAllListeners(); itemCell.button.AddListener(()=> { ItemAttrData attrData = new ItemAttrData(itemId,true,(ulong)count); itemTips.SetItemTipsModel(attrData); ItemTipUtility.Show(itemId); }); selectIcon.SetActive(false); } System/HappyXB/XBShopCell.cs
@@ -62,8 +62,7 @@ shopCellBtn.RemoveAllListeners(); shopCellBtn.AddListener(()=> { ItemAttrData attrData = new ItemAttrData(itemConfig.ID, true, 0); tipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(itemConfig.ID); }); buyBtn.RemoveAllListeners(); buyBtn.AddListener(()=> { ClickBuyBtn(storeConfig);}); System/HazyRegion/HazyRegionBuyTimesWin.cs
@@ -169,7 +169,7 @@ var itemCount = packModel.GetItemCountByID(PackType.Item, dailyQuestOpenTime.DayItemID); if (itemCount <= 0) { EquipTipUtility.Show(dailyQuestOpenTime.DayItemID); ItemTipUtility.Show(dailyQuestOpenTime.DayItemID); return; } System/HazyRegion/HazyRegionIncidentPanel.cs
@@ -191,7 +191,7 @@ } else { EquipTipUtility.Show(item.id); ItemTipUtility.Show(item.id); } }); return; System/HeavenBattle/HeavenBattleWin.cs
@@ -303,8 +303,7 @@ } else { ItemAttrData attrData = new ItemAttrData(info.itemId,false,(ulong)info.itemCnt); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(info.itemId); } } System/HeavenBattle/XMZZAchieveCell.cs
@@ -50,9 +50,7 @@ itemIcon.SetSprite(itemConfig.IconKey); numText.text = UIHelper.ReplaceLargeNum(achieve.rewardItem[0].count); itemIconBtn.AddListener(()=> { ItemAttrData attrData = new ItemAttrData(itemConfig.ID,true,(ulong)achieve.rewardItem[0].count); tipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(itemConfig.ID); }); } else if(achieve.rewardCurrency != null) System/HeavenBattle/XMZZCampVicRewardWin.cs
@@ -111,8 +111,7 @@ } private void ClickRewardCell(int itemId) { ItemAttrData attrData = new ItemAttrData(itemId); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(itemId); } private void CloseWin() System/ItemTip/EquipTipWin.cs
@@ -55,18 +55,18 @@ private void DisplayTipInfo() { if (EquipTipUtility.secondaryData != null) if (ItemTipUtility.secondaryData != null) { m_MainWidgetGroup.SetActive(true); m_MainWidgetGroup.SetPosition(m_RightPoint.position); m_MainWidgetGroup.SetDynamicHeightActive(false); m_MainWidgetGroup.Display(EquipTipUtility.mainTipData); m_MainWidgetGroup.Display(ItemTipUtility.mainTipData); m_SecondaryWidgetGroup.SetActive(true); m_SecondaryWidgetGroup.SetPosition(m_LeftPoint.position); m_SecondaryWidgetGroup.SetDynamicHeightActive(false); m_SecondaryWidgetGroup.Display(EquipTipUtility.secondaryData); m_SecondaryWidgetGroup.Display(ItemTipUtility.secondaryData); } else @@ -74,7 +74,7 @@ m_MainWidgetGroup.SetActive(true); m_MainWidgetGroup.SetPosition(m_MiddlePoint.position); m_MainWidgetGroup.SetDynamicHeightActive(true); m_MainWidgetGroup.Display(EquipTipUtility.mainTipData); m_MainWidgetGroup.Display(ItemTipUtility.mainTipData); m_SecondaryWidgetGroup.SetActive(false); } @@ -82,8 +82,8 @@ private void InitOperateButton() { var operates = EquipTipUtility.mainTipData.operates; var guid = EquipTipUtility.mainTipData.guid; var operates = ItemTipUtility.mainTipData.operates; var guid = ItemTipUtility.mainTipData.guid; if (operates.IsNullOrEmpty()) { for (int i = 0; i < m_OpreateButtons.Length; i++) @@ -156,7 +156,7 @@ } } public void Display(EquipTipUtility.TipData data) public void Display(ItemTipUtility.TipData data) { scrollRect.verticalNormalizedPosition = 1f; @@ -250,7 +250,7 @@ if (getWayEntranceWidget != null && getWaysWidget != null) { var getWay = EquipTipUtility.mainTipData.getWay; var getWay = ItemTipUtility.mainTipData.getWay; var hasGetWay = !getWay.ways.IsNullOrEmpty(); getWayEntranceWidget.gameObject.SetActive(hasGetWay); getWaysWidget.gameObject.SetActive(false); System/ItemTip/GetWayModel.cs
New file @@ -0,0 +1,29 @@ //-------------------------------------------------------- // [Author]: 第二世界 // [ Date ]: Tuesday, April 23, 2019 //-------------------------------------------------------- using UnityEngine; using System.Collections; using UnityEngine.UI; namespace Snxxz.UI { public class GetWayModel : Model { public int itemId { get; set; } public override void Init() { } public override void UnInit() { } } } System/ItemTip/GetWayModel.cs.metacopy from System/Store/Logic/BuyWingsTip.cs.meta copy to System/ItemTip/GetWayModel.cs.meta
File was copied from System/Store/Logic/BuyWingsTip.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: e97fb8a0504c8e14196867facc54d7ce timeCreated: 1515728141 guid: 43f6e102066c2d143bec4b6e6f3a8f8f timeCreated: 1556022160 licenseType: Pro MonoImporter: serializedVersion: 2 System/ItemTip/GetWayTrigger.cs
New file @@ -0,0 +1,47 @@ //-------------------------------------------------------- // [Author]: 第二世界 // [ Date ]: Tuesday, April 23, 2019 //-------------------------------------------------------- using UnityEngine; using System.Collections; using UnityEngine.UI; namespace Snxxz.UI { public class GetWayTrigger : MonoBehaviour { [SerializeField] int m_ItemId; [SerializeField] Button m_Button; private void Start() { if (m_Button != null) { m_Button.SetListener(View); } } private void View() { if (m_ItemId != 0) { switch (m_ItemId) { case 2105: WindowCenter.Instance.Open<RechargeTipWin>(); break; default: ModelCenter.Instance.GetModel<GetWayModel>().itemId = m_ItemId; WindowCenter.Instance.Open<GetWayWin>(); break; } } } } } System/ItemTip/GetWayTrigger.cs.meta
File was renamed from System/Store/Logic/BuyWingsTip.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: e97fb8a0504c8e14196867facc54d7ce timeCreated: 1515728141 guid: 8087a268dd86cb644a30a1eabbf2033a timeCreated: 1556022614 licenseType: Pro MonoImporter: serializedVersion: 2 System/ItemTip/GetWayWin.cs
New file @@ -0,0 +1,81 @@ //-------------------------------------------------------- // [Author]: 第二世界 // [ Date ]: Tuesday, April 23, 2019 //-------------------------------------------------------- using System; using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; namespace Snxxz.UI { public class GetWayWin : Window { [SerializeField] WayCell[] m_WayCells; [SerializeField] Button m_Close; GetWayModel model { get { return ModelCenter.Instance.GetModel<GetWayModel>(); } } #region Built-in protected override void BindController() { } protected override void AddListeners() { m_Close.SetListener(() => { WindowCenter.Instance.Close<GetWayWin>(); }); } protected override void OnPreOpen() { DisplayWays(); } protected override void OnAfterOpen() { } protected override void OnPreClose() { } protected override void OnAfterClose() { } #endregion private void DisplayWays() { var config = ItemConfig.Get(model.itemId); var ways = config.GetWay; for (var i = 0; i < m_WayCells.Length; i++) { var behaviour = m_WayCells[i]; if (i < ways.Length) { var way = ways[i]; behaviour.gameObject.SetActive(true); behaviour.Display(way); } else { behaviour.gameObject.SetActive(false); } } } } } System/ItemTip/GetWayWin.cs.metacopy from System/Store/Logic/BuyWingsTip.cs.meta copy to System/ItemTip/GetWayWin.cs.meta
File was copied from System/Store/Logic/BuyWingsTip.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: e97fb8a0504c8e14196867facc54d7ce timeCreated: 1515728141 guid: 1c6bab8b5a34d074db2b348d591b3e4d timeCreated: 1556021808 licenseType: Pro MonoImporter: serializedVersion: 2 System/ItemTip/GuardTipWin.cs
@@ -67,34 +67,34 @@ private void DisplayBaseInfo() { var baseInfo = EquipTipUtility.mainTipData.baseInfo; var baseInfo = ItemTipUtility.mainTipData.baseInfo; m_BaseInfoWidget.Display(baseInfo); } private void DisplayBaseProperty() { var baseProperty = EquipTipUtility.mainTipData.baseProperty; var baseProperty = ItemTipUtility.mainTipData.baseProperty; m_BasePropertyWidget.Display(baseProperty); } private void DisplayItemDescription() { var itemId = EquipTipUtility.mainTipData.baseInfo.itemId; var itemId = ItemTipUtility.mainTipData.baseInfo.itemId; m_DescriptionWidget.Display(itemId); } private void DisplayBuyItem() { m_BuyItemWidget.gameObject.SetActive(EquipTipUtility.mainTipData.goodId > 0); if (EquipTipUtility.mainTipData.goodId > 0) m_BuyItemWidget.gameObject.SetActive(ItemTipUtility.mainTipData.goodId > 0); if (ItemTipUtility.mainTipData.goodId > 0) { m_BuyItemWidget.Display(EquipTipUtility.mainTipData.goodId); m_BuyItemWidget.Display(ItemTipUtility.mainTipData.goodId); } } private void DisplayGetWays() { var getWay = EquipTipUtility.mainTipData.getWay; var getWay = ItemTipUtility.mainTipData.getWay; var hasGetWay = !getWay.ways.IsNullOrEmpty(); m_GetWayEntranceWidget.gameObject.SetActive(hasGetWay); m_GetWaysWidget.gameObject.SetActive(false); @@ -116,14 +116,14 @@ private void DisplayJobAndPlace() { var itemId = EquipTipUtility.mainTipData.baseInfo.itemId; var itemId = ItemTipUtility.mainTipData.baseInfo.itemId; m_JobAndPlaceWidget.Display(itemId); } private void DisplayOperateButton() { var operates = EquipTipUtility.mainTipData.operates; var guid = EquipTipUtility.mainTipData.guid; var operates = ItemTipUtility.mainTipData.operates; var guid = ItemTipUtility.mainTipData.guid; if (operates.IsNullOrEmpty()) { for (int i = 0; i < m_OperateButtons.Length; i++) System/ItemTip/ItemTipUtility.cs
File was renamed from System/ItemTip/EquipTipUtility.cs @@ -10,19 +10,13 @@ namespace Snxxz.UI { public enum TipType { Normal = 1, Good = 2, } public class EquipTipUtility public class ItemTipUtility { public class TipData { public int itemId; public string guid; public int itemId; public int goodId; public BaseInfo baseInfo; @@ -140,13 +134,18 @@ static ComposeWinModel composeModel { get { return ModelCenter.Instance.GetModel<ComposeWinModel>(); } } static StoreModel storeModel { get { return ModelCenter.Instance.GetModel<StoreModel>(); } } public static TipType tipType { get; private set; } public static TipData mainTipData { get; private set; } public static TipData secondaryData { get; private set; } public static void Show(int itemId) { secondaryData = null; var config = ItemConfig.Get(itemId); #if UNITY_EDITOR Debug.LogFormat("你查看的物品是:itemId->{0}", itemId); Debug.LogFormat("你查看的物品是:name->{0}", config.ItemName); #endif var isEquip = ItemLogicUtility.Instance.IsEquip(itemId); if (isEquip) @@ -158,7 +157,6 @@ mainTipData = CreateItemData(itemId); } var config = ItemConfig.Get(itemId); if (isEquip) { WindowCenter.Instance.Open<EquipTipWin>(); @@ -167,6 +165,14 @@ { switch (config.Type) { case 61: case 62: case 63: break; case 53: var kingTreasureShow = ModelCenter.Instance.GetModel<KingTreasureShowModel>(); kingTreasureShow.SetInitData(itemId); break; case 26: case 41: case 42: @@ -193,18 +199,21 @@ return; } #if UNITY_EDITOR Debug.LogFormat("你查看的物品是:guid->{0}", string.IsNullOrEmpty(guid) ? "" : guid); Debug.LogFormat("你查看的物品是:itemId->{0}", item.itemId); Debug.LogFormat("你查看的物品是:name->{0}", item.config.ItemName); #endif secondaryData = null; var packType = item.packType; var isEquip = ItemLogicUtility.Instance.IsEquip(item.itemId); switch (packType) { case PackType.Equip: tipType = TipType.Normal; mainTipData = CreateNormalEquipData(guid); break; default: tipType = TipType.Normal; if (isEquip) { if (item.isAuction) @@ -236,6 +245,10 @@ { switch (item.config.Type) { case 61: case 62: case 63: break; case 26: case 41: case 42: System/ItemTip/ItemTipUtility.cs.meta
System/ItemTip/ItemTipWin.cs
@@ -85,19 +85,19 @@ private void DisplayBaseInfo() { var data = EquipTipUtility.mainTipData; var data = ItemTipUtility.mainTipData; m_BaseInfoWidget.Display(data.baseInfo); } private void DisplayItemDescription() { var data = EquipTipUtility.mainTipData; var data = ItemTipUtility.mainTipData; m_DescriptionWidget.Display(data.baseInfo.itemId); } private void OnUseItem(int itemId) { if (itemId == EquipTipUtility.mainTipData.itemId) if (itemId == ItemTipUtility.mainTipData.itemId) { DisplayItemUseState(); } @@ -105,7 +105,7 @@ private void DisplayItemUseState() { var data = EquipTipUtility.mainTipData; var data = ItemTipUtility.mainTipData; var count = packModel.GetItemUsedTimesToday(data.itemId); var config = ItemConfig.Get(data.itemId); m_DescriptionWidget.DisplayUseState(count, config.MaxSkillCnt); @@ -113,7 +113,7 @@ private void DisplayAuctionInfo() { var data = EquipTipUtility.mainTipData; var data = ItemTipUtility.mainTipData; m_AuctionWidget.gameObject.SetActive(data.baseInfo.isAuction); if (data.baseInfo.isAuction) { @@ -124,7 +124,7 @@ private void DisplayModel() { var baseInfo = EquipTipUtility.mainTipData.baseInfo; var baseInfo = ItemTipUtility.mainTipData.baseInfo; var config = ItemConfig.Get(baseInfo.itemId); m_ModelWidget.gameObject.SetActive(config.Type == 124 || config.Type == 125); @@ -146,16 +146,16 @@ private void DisplayBuyItem() { m_BuyItemWidget.gameObject.SetActive(EquipTipUtility.mainTipData.goodId > 0); if (EquipTipUtility.mainTipData.goodId > 0) m_BuyItemWidget.gameObject.SetActive(ItemTipUtility.mainTipData.goodId > 0); if (ItemTipUtility.mainTipData.goodId > 0) { m_BuyItemWidget.Display(EquipTipUtility.mainTipData.goodId); m_BuyItemWidget.Display(ItemTipUtility.mainTipData.goodId); } } private void DisplayGetWays() { var getWay = EquipTipUtility.mainTipData.getWay; var getWay = ItemTipUtility.mainTipData.getWay; var hasGetWay = !getWay.ways.IsNullOrEmpty(); m_GetWayEntranceWidget.gameObject.SetActive(hasGetWay); m_GetWaysWidget.gameObject.SetActive(false); @@ -177,8 +177,8 @@ private void DisplayOperateButton() { var operates = EquipTipUtility.mainTipData.operates; var guid = EquipTipUtility.mainTipData.guid; var operates = ItemTipUtility.mainTipData.operates; var guid = ItemTipUtility.mainTipData.guid; if (operates.IsNullOrEmpty()) { for (int i = 0; i < m_OperateButtons.Length; i++) System/ItemTip/PetMountTipWin.cs
@@ -67,7 +67,7 @@ private void DisplayBaseInfo() { var baseInfo = EquipTipUtility.mainTipData.baseInfo; var baseInfo = ItemTipUtility.mainTipData.baseInfo; var config = ItemConfig.Get(baseInfo.itemId); m_ItemName.text = config.ItemName; @@ -87,12 +87,12 @@ private void DisplayBaseProperty() { m_BaseProperty.Display(EquipTipUtility.mainTipData.petMountBaseProperty); m_BaseProperty.Display(ItemTipUtility.mainTipData.petMountBaseProperty); } private void DisplaySkills() { var baseInfo = EquipTipUtility.mainTipData.baseInfo; var baseInfo = ItemTipUtility.mainTipData.baseInfo; var config = ItemConfig.Get(baseInfo.itemId); switch (config.Type) { @@ -108,7 +108,7 @@ private void DisplayAuctionInfo() { var baseInfo = EquipTipUtility.mainTipData.baseInfo; var baseInfo = ItemTipUtility.mainTipData.baseInfo; m_AuctionWidget.gameObject.SetActive(baseInfo.isAuction); if (baseInfo.isAuction) { @@ -119,7 +119,7 @@ private void DisplayDescription() { var baseInfo = EquipTipUtility.mainTipData.baseInfo; var baseInfo = ItemTipUtility.mainTipData.baseInfo; m_DescriptionWidget.gameObject.SetActive(!baseInfo.isAuction); if (!baseInfo.isAuction) { @@ -129,16 +129,16 @@ private void DisplayBuyItem() { m_BuyItemWidget.gameObject.SetActive(EquipTipUtility.mainTipData.goodId > 0); if (EquipTipUtility.mainTipData.goodId > 0) m_BuyItemWidget.gameObject.SetActive(ItemTipUtility.mainTipData.goodId > 0); if (ItemTipUtility.mainTipData.goodId > 0) { m_BuyItemWidget.Display(EquipTipUtility.mainTipData.goodId); m_BuyItemWidget.Display(ItemTipUtility.mainTipData.goodId); } } private void DisplayModel() { var baseInfo = EquipTipUtility.mainTipData.baseInfo; var baseInfo = ItemTipUtility.mainTipData.baseInfo; var config = ItemConfig.Get(baseInfo.itemId); switch (config.Type) { @@ -158,8 +158,8 @@ private void DisplayOperateButton() { var operates = EquipTipUtility.mainTipData.operates; var guid = EquipTipUtility.mainTipData.guid; var operates = ItemTipUtility.mainTipData.operates; var guid = ItemTipUtility.mainTipData.guid; if (operates.IsNullOrEmpty()) { for (int i = 0; i < m_OperateButtons.Length; i++) @@ -189,7 +189,7 @@ private void DisplayGetWays() { var getWay = EquipTipUtility.mainTipData.getWay; var getWay = ItemTipUtility.mainTipData.getWay; var hasGetWay = !getWay.ways.IsNullOrEmpty(); m_GetWayEntranceWidget.gameObject.SetActive(hasGetWay); m_GetWaysWidget.gameObject.SetActive(false); System/ItemTip/TipBasePropertyWidget.cs
@@ -14,7 +14,7 @@ { [SerializeField] Text m_PropertyBehaviour; public void Display(EquipTipUtility.BaseProperty data) public void Display(ItemTipUtility.BaseProperty data) { var attack = Int3.zero; var normalProperties = new List<Int3>(); System/ItemTip/TipEquipBaseInfoWidget.cs
@@ -21,7 +21,7 @@ [SerializeField] Text m_SurplusTime; [SerializeField] Text m_Star; public void Display(EquipTipUtility.BaseInfo baseInfo) public void Display(ItemTipUtility.BaseInfo baseInfo) { if (baseInfo.isEquiped) { System/ItemTip/TipGemInfoWidget.cs
@@ -14,7 +14,7 @@ { [SerializeField] GemBehaviour[] m_GemBehaviours; public void Display(EquipTipUtility.GemInfo gemInfo) public void Display(ItemTipUtility.GemInfo gemInfo) { for (int i = 0; i < m_GemBehaviours.Length; i++) { System/ItemTip/TipGetWaysWidget.cs
@@ -15,7 +15,7 @@ [SerializeField] WayCell[] m_GetWays; [SerializeField] CanvasGroup m_AlphaTween; public void Display(EquipTipUtility.GetWay getWay) public void Display(ItemTipUtility.GetWay getWay) { for (var i = 0; i < m_GetWays.Length; i++) { System/ItemTip/TipItemBaseInfoWidget.cs
@@ -21,7 +21,7 @@ [SerializeField] RectTransform m_SurplusTimeContainer; [SerializeField] Text m_SurplusTime; public void Display(EquipTipUtility.BaseInfo baseInfo) public void Display(ItemTipUtility.BaseInfo baseInfo) { if (baseInfo.isAuction) { System/ItemTip/TipLegendPropertyWidget.cs
@@ -14,7 +14,7 @@ { [SerializeField] Text m_PropertyBehaviours; public void Display(EquipTipUtility.LegendProperty data) public void Display(ItemTipUtility.LegendProperty data) { var count = data.properties.Count; var lines = new List<string>(); System/ItemTip/TipOperateButton.cs
@@ -72,6 +72,9 @@ case ItemOperateType.train: this.m_Title.text = "洗炼"; break; case ItemOperateType.exchange: this.m_Title.text = "兑换"; break; default: this.m_Title.text = ""; break; @@ -82,11 +85,11 @@ WindowCenter.Instance.Close(windowName); if (this.operateType==ItemOperateType.buy) { EquipTipUtility.GoodOperate(operateType, BuyItemController.Instance.goodId, BuyItemController.Instance.wannaBuyCount.value); ItemTipUtility.GoodOperate(operateType, BuyItemController.Instance.goodId, BuyItemController.Instance.wannaBuyCount.value); } else { EquipTipUtility.Operate(operateType, this.guid); ItemTipUtility.Operate(operateType, this.guid); } }); } System/ItemTip/TipSkillInfoWidget.cs
@@ -14,7 +14,7 @@ [SerializeField] Text m_SkillInfo; public void Display(EquipTipUtility.SkillInfo skillInfo) public void Display(ItemTipUtility.SkillInfo skillInfo) { var skills = skillInfo.skills; var lines = new string[skills.Count]; System/ItemTip/TipStarPropertyWidget.cs
@@ -15,7 +15,7 @@ [SerializeField] Image[] m_Stars; [SerializeField] Text m_Property; public void Display(EquipTipUtility.StarInfo starInfo) public void Display(ItemTipUtility.StarInfo starInfo) { for (int i = 0; i < m_Stars.Length; i++) { System/ItemTip/TipStrengthenPropertyWidget.cs
@@ -13,7 +13,7 @@ { [SerializeField] Text m_PropertyBehaviour; public void Display(EquipTipUtility.StrengthenProperty data) public void Display(ItemTipUtility.StrengthenProperty data) { var count = data.properties.Count; var lines = new string[count]; System/ItemTip/TipSuitBriefWidget.cs
@@ -13,7 +13,7 @@ [SerializeField] Text m_SuitName; [SerializeField] Text[] m_SuitEquipNames; public void Display(EquipTipUtility.SuitInfo suitInfo) public void Display(ItemTipUtility.SuitInfo suitInfo) { m_SuitName.text = suitInfo.name; var setName = EquipModel.GetSuitName(suitInfo.level); System/ItemTip/TipSuitPropertyWidget.cs
@@ -22,8 +22,8 @@ [SerializeField] Text m_EightSuitTitle; [SerializeField] Text m_EightSuitDescription; EquipTipUtility.SuitInfo suitInfo; public void Display(EquipTipUtility.SuitInfo suitInfo) ItemTipUtility.SuitInfo suitInfo; public void Display(ItemTipUtility.SuitInfo suitInfo) { this.suitInfo = suitInfo; System/ItemTip/TipTrainPropertyWidget.cs
@@ -13,7 +13,7 @@ { [SerializeField] Text m_PropertyBehaviour; public void Display(EquipTipUtility.TrainProperty data) public void Display(ItemTipUtility.TrainProperty data) { var count = data.properties.Count; var lines = new string[count]; System/ItemTip/TipWingRefineMaterialsWidget.cs
@@ -13,7 +13,7 @@ { [SerializeField] Text m_Description; public void Display(EquipTipUtility.WingRefineMaterials info) public void Display(ItemTipUtility.WingRefineMaterials info) { var materials = info.materials; var lines = new string[materials.Count]; System/ItemTip/WingTipWin.cs
@@ -75,19 +75,19 @@ private void DisplayBaseInfo() { var baseInfo = EquipTipUtility.mainTipData.baseInfo; var baseInfo = ItemTipUtility.mainTipData.baseInfo; m_BaseInfoWidget.Display(baseInfo); } private void DisplayBaseProperty() { var baseProperty = EquipTipUtility.mainTipData.baseProperty; var baseProperty = ItemTipUtility.mainTipData.baseProperty; m_BasePropertyWidget.Display(baseProperty); } private void DisplayLegendProperty() { var legendProperty = EquipTipUtility.mainTipData.legendProperty; var legendProperty = ItemTipUtility.mainTipData.legendProperty; m_LegendPropertyWidget.gameObject.SetActive(!legendProperty.properties.IsNullOrEmpty()); if (!legendProperty.properties.IsNullOrEmpty()) { @@ -97,7 +97,7 @@ private void DisplayRefineMaterials() { var refineMaterials = EquipTipUtility.mainTipData.refineMaterials; var refineMaterials = ItemTipUtility.mainTipData.refineMaterials; m_RefineMaterialsWidget.gameObject.SetActive(!refineMaterials.materials.IsNullOrEmpty()); if (!refineMaterials.materials.IsNullOrEmpty()) { @@ -107,22 +107,22 @@ private void DisplayItemDescription() { var itemId = EquipTipUtility.mainTipData.baseInfo.itemId; var itemId = ItemTipUtility.mainTipData.baseInfo.itemId; m_DescriptionWidget.Display(itemId); } private void DisplayBuyItem() { m_BuyItemWidget.gameObject.SetActive(EquipTipUtility.mainTipData.goodId > 0); if (EquipTipUtility.mainTipData.goodId > 0) m_BuyItemWidget.gameObject.SetActive(ItemTipUtility.mainTipData.goodId > 0); if (ItemTipUtility.mainTipData.goodId > 0) { m_BuyItemWidget.Display(EquipTipUtility.mainTipData.goodId); m_BuyItemWidget.Display(ItemTipUtility.mainTipData.goodId); } } private void DisplayGetWays() { var getWay = EquipTipUtility.mainTipData.getWay; var getWay = ItemTipUtility.mainTipData.getWay; var hasGetWay = !getWay.ways.IsNullOrEmpty(); m_GetWayEntranceWidget.gameObject.SetActive(hasGetWay); m_GetWaysWidget.gameObject.SetActive(false); @@ -144,14 +144,14 @@ private void DisplayJobAndPlace() { var itemId = EquipTipUtility.mainTipData.baseInfo.itemId; var itemId = ItemTipUtility.mainTipData.baseInfo.itemId; m_JobAndPlaceWidget.Display(itemId); } private void DisplayOperateButton() { var operates = EquipTipUtility.mainTipData.operates; var guid = EquipTipUtility.mainTipData.guid; var operates = ItemTipUtility.mainTipData.operates; var guid = ItemTipUtility.mainTipData.guid; if (operates.IsNullOrEmpty()) { for (int i = 0; i < m_OperateButtons.Length; i++) System/JadeDynastyBoss/JadeDynastyBossWin.cs
@@ -193,8 +193,7 @@ m_Items[i].Init(itemCellModel); m_Items[i].button.AddListener(() => { ItemAttrData itemAttrData = new ItemAttrData(item.id, true, (ulong)item.count); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(itemAttrData); ItemTipUtility.Show(item.id); }); } else System/KnapSack/BetterItemGetBehaviour.cs
@@ -136,9 +136,7 @@ ItemModel betterEquip; if (model.TryGetBetterEquip(model.currentEquipGuid, out betterEquip)) { var itemConfig = ItemConfig.Get(betterEquip.itemId); var packType = GeneralDefine.GetPackTypeByItemType(itemConfig.Type); itemTipsModel.SetItemTipsModel(packType, betterEquip.guid); ItemTipUtility.Show(betterEquip.guid); } } @@ -163,10 +161,7 @@ yield return null; yield return WaitingForSecondConst.WaitMS300; itemTipsModel.SetItemTipsModel(PackType.Item, _guid, false, true); itemTipsModel.SetBagTipsBtn(itemTipsModel.curAttrData); itemTipsModel.ShowTip(); ItemTipUtility.Show(_guid); model.ReportConfirmBetterEquip(model.currentEquipGuid); } } System/KnapSack/ItemOverdueBehaviour.cs
@@ -74,12 +74,11 @@ ItemModel itemModel = playerPack.GetItemByGuid(model.currentShowItem.guid); if (itemModel != null) { itemTipsModel.SetItemTipsModel(itemModel.packType, itemModel.guid); ItemTipUtility.Show(model.currentShowItem.guid); } else { ItemAttrData attrData = new ItemAttrData(model.currentShowItem.itemId); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(model.currentShowItem.itemId); } } } System/KnapSack/ItemUseBehaviour.cs
@@ -72,8 +72,7 @@ { if (model.currentShowItem != default(ItemUseModel.UseItem)) { itemTipsModel.SetItemTipsModel(model.currentShowItem.packType, model.currentShowItem.guid); //model.ReportConfirmPreciousItem(model.currentShowItem); ItemTipUtility.Show(model.currentShowItem.guid); } } System/KnapSack/Logic/BoxGetItemWin.cs
@@ -218,10 +218,7 @@ itemBasic.button.RemoveAllListeners(); itemBasic.button.AddListener(() => { ItemAttrData attrData = new ItemAttrData(itemInfo.ItemID, false, (ulong)itemInfo.Count, -1, false, type, "", ConfigParse.Analysis(itemInfo.UserData)); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(itemInfo.ItemID); }); itemBasic.transform.localScale = Vector3.zero; itemBasic.transform.localPosition = Vector3.zero; System/KnapSack/Logic/DecomposeGetItemWin.cs
@@ -64,10 +64,7 @@ itemBasic.button.RemoveAllListeners(); itemBasic.button.AddListener(() => { ItemAttrData attrData = new ItemAttrData(matInfo.ItemID, false, (ulong)matInfo.Count, -1, false, PackType.Deleted, "", ConfigParse.Analysis(matInfo.UserData)); tipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(matInfo.ItemID); }); itemBasic.gameObject.SetActive(true); GetItemlist.Add(item); System/KnapSack/Logic/EquipDecomMailWin.cs
@@ -67,10 +67,7 @@ getMatlist[i].button.RemoveAllListeners(); getMatlist[i].button.AddListener(() => { ItemAttrData attrData = new ItemAttrData(matInfo.ItemID, false, (ulong)matInfo.Count,-1, false, PackType.Deleted, "", ConfigParse.Analysis(matInfo.UserData)); tipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(matInfo.ItemID); }); } else System/KnapSack/Logic/EquipDevourWin.cs
@@ -130,8 +130,7 @@ getMatBtn.RemoveAllListeners(); getMatBtn.AddListener(()=> { ItemAttrData attrData = new ItemAttrData(getMatConfig.ID,true); tipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(getMatConfig.ID); }); } RefreshGeMatProgress(); System/KnapSack/Logic/GuardTip.cs
File was deleted System/KnapSack/Logic/GuardTip.cs.meta
File was deleted System/KnapSack/Logic/ItemTipsModel.cs
@@ -12,113 +12,46 @@ [XLua.LuaCallCSharp] public class ItemTipsModel : Model, IBeforePlayerDataInitialize { FuncConfigConfig exhaustedFunc; public Dictionary<int, List<string>> guardDesDict { get; private set; } public Dictionary<int, PetInfoConfig> unlockPetDict { get; private set; } public Dictionary<int, HorseConfig> unlockMountDict { get; private set; } private Dictionary<int, Dictionary<int, int>> petSkillDict = new Dictionary<int, Dictionary<int, int>>(); // 编号 解锁阶级 技能 private Dictionary<int, Dictionary<int, List<int>>> mountSkillDict = new Dictionary<int, Dictionary<int, List<int>>>(); // 编号 解锁阶级 技能 Dictionary<int, string> petAndMountQualityDict = new Dictionary<int, string>(); string expValueFormula = ""; Dictionary<int, string> exhaustedAttrFormula { get; set; } Dictionary<int, int> exhaustedMaxLvDict { get; set; } public int[] gemOpenLvs { get; private set; } public int[] jadeDynastyGemOpenLvs { get; private set; } public int gemOpenVipLv { get; private set; } public int[] gemType1s { get; private set; } public int[] gemType2s { get; private set; } public int[] equipMidHeights { get; private set; } public int[] wingsMidHeights { get; private set; } public int[] jumpAndUseTypes { get; private set; } public int equipSuitStar { get; private set; } public int[] ItemRenewalIds { get; private set; } public int[] tryPutOnEquipIds { get; private set; } public int[] randomRuneIds { get; private set; } public int[] PeerlessEquipIds { get; private set; } //绝世装备列表 PackModel playerPack { get { return ModelCenter.Instance.GetModel<PackModel>(); } } StoreModel m_storeModel { get { return ModelCenter.Instance.GetModel<StoreModel>(); } } FashionDressModel fashionDress { get { return ModelCenter.Instance.GetModel<FashionDressModel>(); } } DogzModel dogzModel { get { return ModelCenter.Instance.GetModel<DogzModel>(); } } public override void Init() { m_storeModel.RefreshTCBPlayerDataEvent += RefreshOfflinePluginTime; exhaustedFunc = FuncConfigConfig.Get("OutOfPrintValue"); exhaustedAttrFormula = new Dictionary<int, string>(); JsonData exhaustedJsonData = JsonMapper.ToObject(exhaustedFunc.Numerical2); foreach (var key in exhaustedJsonData.Keys) { int attrId = int.Parse(key); exhaustedAttrFormula.Add(attrId, exhaustedJsonData[key].ToString()); } FuncConfigConfig OutOfPrintValueDes = FuncConfigConfig.Get("OutOfPrintValueDes"); exhaustedMaxLvDict = ConfigParse.GetDic<int, int>(OutOfPrintValueDes.Numerical1); FuncConfigConfig suitlimitModel = FuncConfigConfig.Get("EquipSuitLimit"); equipSuitStar = int.Parse(suitlimitModel.Numerical2); FuncConfigConfig bagUseItem = FuncConfigConfig.Get("BagUseItem"); var bagUseItem = FuncConfigConfig.Get("BagUseItem"); jumpAndUseTypes = ConfigParse.GetMultipleStr<int>(bagUseItem.Numerical1); FuncConfigConfig renewalFunc = FuncConfigConfig.Get("ItemRepayButton"); var renewalFunc = FuncConfigConfig.Get("ItemRepayButton"); ItemRenewalIds = ConfigParse.GetMultipleStr<int>(renewalFunc.Numerical1); tryPutOnEquipIds = ConfigParse.GetMultipleStr<int>(renewalFunc.Numerical2); FuncConfigConfig EquipOutWordID = FuncConfigConfig.Get("EquipOutWordID"); PeerlessEquipIds = ConfigParse.GetMultipleStr<int>(EquipOutWordID.Numerical1); guardDesDict = new Dictionary<int, List<string>>(); FuncConfigConfig guardDesFunc = FuncConfigConfig.Get("GuardianTips"); JsonData guardDesData = JsonMapper.ToObject(guardDesFunc.Numerical1); foreach (var key in guardDesData.Keys) { List<string> list = new List<string>(); for (int i = 0; i < guardDesData[key].Count; i++) { list.Add(guardDesData[key][i].ToString()); } guardDesDict.Add(int.Parse(key), list); } gemOpenLvs = null; gemOpenVipLv = 0; jadeDynastyGemOpenLvs = null; FuncConfigConfig gemOpenModel = FuncConfigConfig.Get("GemOpen"); FuncConfigConfig gemOpenVipModel = FuncConfigConfig.Get("GemOpenVip"); gemOpenLvs = ConfigParse.GetMultipleStr<int>(gemOpenModel.Numerical1); gemOpenVipLv = int.Parse(gemOpenVipModel.Numerical1); jadeDynastyGemOpenLvs = ConfigParse.GetMultipleStr<int>(gemOpenModel.Numerical2); FuncConfigConfig gemtype1 = FuncConfigConfig.Get("GemType1"); var gemtype1 = FuncConfigConfig.Get("GemType1"); gemType1s = ConfigParse.GetMultipleStr<int>(gemtype1.Numerical1); FuncConfigConfig gemtype2 = FuncConfigConfig.Get("GemType2"); var gemtype2 = FuncConfigConfig.Get("GemType2"); gemType2s = ConfigParse.GetMultipleStr<int>(gemtype2.Numerical1); FuncConfigConfig equipMidFunc = FuncConfigConfig.Get("EquipPartLength"); equipMidHeights = ConfigParse.GetMultipleStr<int>(equipMidFunc.Numerical1); FuncConfigConfig wingsMidFunc = FuncConfigConfig.Get("WingsPartLength"); wingsMidHeights = ConfigParse.GetMultipleStr<int>(wingsMidFunc.Numerical1); FuncConfigConfig expFormula = FuncConfigConfig.Get("ExpValueDes"); var expFormula = FuncConfigConfig.Get("ExpValueDes"); expValueFormula = expFormula.Numerical1; #region 灵宠坐骑解锁 unlockPetDict = new Dictionary<int, PetInfoConfig>(); petSkillDict.Clear(); List<PetInfoConfig> petInfolist = PetInfoConfig.GetValues(); var petInfolist = PetInfoConfig.GetValues(); for (int i = 0; i < petInfolist.Count; i++) { if (!unlockPetDict.ContainsKey(petInfolist[i].UnLockNeedItemID)) @@ -126,7 +59,6 @@ unlockPetDict.Add(petInfolist[i].UnLockNeedItemID, petInfolist[i]); } Dictionary<int, int> skillDict = new Dictionary<int, int>(); petSkillDict.Add(petInfolist[i].ID, skillDict); int[] skillIds = petInfolist[i].SkillID; int[] skillUnlocks = petInfolist[i].SkillUnLock; if (skillIds != null) @@ -137,9 +69,9 @@ } } } unlockMountDict = new Dictionary<int, HorseConfig>(); mountSkillDict.Clear(); List<HorseConfig> horselist = HorseConfig.GetValues(); var horselist = HorseConfig.GetValues(); for (int i = 0; i < horselist.Count; i++) { if (!unlockMountDict.ContainsKey(horselist[i].UnlockItemID)) @@ -147,7 +79,6 @@ unlockMountDict.Add(horselist[i].UnlockItemID, horselist[i]); } Dictionary<int, List<int>> skillDict = new Dictionary<int, List<int>>(); mountSkillDict.Add(horselist[i].HorseID, skillDict); List<HorseUpConfig> mountlist = HorseUpConfig.GetMountlistById(horselist[i].HorseID); if (mountlist != null) { @@ -171,9 +102,6 @@ } #endregion FuncConfigConfig randomRuneConfig = FuncConfigConfig.Get("RandomRuneIDList"); randomRuneIds = ConfigParse.GetMultipleStr<int>(randomRuneConfig.Numerical1); FuncConfigConfig petQuality = FuncConfigConfig.Get("PetQuality"); int[] qualitys = ConfigParse.GetMultipleStr<int>(petQuality.Numerical1); string[] qualityNames = ConfigParse.GetMultipleStr(petQuality.Numerical2); @@ -186,7 +114,6 @@ } } ParseFuncConfig(); } public void OnBeforePlayerDataInitialize() @@ -198,31 +125,6 @@ { } #region 解析本地数据 public Dictionary<string, List<int>> atkSpeedColorDict { get; private set; } private void ParseFuncConfig() { atkSpeedColorDict = new Dictionary<string, List<int>>(); var equipYPAtkSpeedColor = FuncConfigConfig.Get("EquipYPAtkSpeedColor"); JsonData atkSpeedData = JsonMapper.ToObject(equipYPAtkSpeedColor.Numerical1); foreach (var color in atkSpeedData.Keys) { List<int> list = new List<int>(); atkSpeedColorDict.Add(color, list); if (atkSpeedData[color].IsArray) { for (int i = 0; i < atkSpeedData[color].Count; i++) { int range = 0; int.TryParse(atkSpeedData[color][i].ToString(), out range); list.Add(range); } } } } #endregion /// <summary> /// 刷新脱机外挂时间 @@ -236,405 +138,28 @@ } public ItemAttrData curAttrData { get; private set; } public ItemAttrData compareAttrData { get; private set; } /// <summary> ///从背包类型中得到物品展示 /// </summary> public void SetItemTipsModel(PackType type, string guid, bool isShowUINow = true, bool isCompare = false, ItemTipChildType childType = ItemTipChildType.Normal) { curAttrData = null; compareAttrData = null; curTips = null; compareTips = null; ItemModel itemModel = playerPack.GetItemByGuid(guid); if (itemModel != null) { curAttrData = new ItemAttrData(itemModel.itemId, false, (ulong)itemModel.count , itemModel.gridIndex, isCompare , type, guid, ConfigParse.Analysis(itemModel.itemInfo.userData), childType); if (isCompare) { switch (type) { case PackType.DogzItem: SetCompareAttrData(PackType.DogzEquip, itemModel.config.EquipPlace); break; default: SetCompareAttrData(PackType.Equip, itemModel.config.EquipPlace); break; } } } if (isShowUINow) { ShowTip(); } } public GatherSoulData gatherSoulData; /// <summary> /// 预览物品信息 /// </summary> /// <param name="itemAttrData"></param> public void SetItemTipsModel(ItemAttrData itemAttrData, bool isShowUINow = true) public void SetItemTipsModel(ItemAttrData itemAttrData) { compareAttrData = null; curTips = null; compareTips = null; curAttrData = itemAttrData; if (itemAttrData == null) return; if (itemAttrData.isCompare) { switch (itemAttrData.packType) { case PackType.DogzItem: SetCompareAttrData(PackType.DogzEquip, itemAttrData.itemConfig.EquipPlace); break; default: SetCompareAttrData(PackType.Equip, itemAttrData.itemConfig.EquipPlace); break; } } if (isShowUINow) { ShowTip(); } } private void SetCompareAttrData(PackType type, int equipPlace) { compareAttrData = null; ItemModel itemModel = null; switch (type) { case PackType.Equip: itemModel = playerPack.GetItemByIndex(type, equipPlace); break; case PackType.DogzEquip: var dogzModel = ModelCenter.Instance.GetModel<DogzModel>(); dogzModel.TryGetDogzEquip(dogzModel.presentSelectDogz, equipPlace, out itemModel); break; } if (itemModel == null) return; compareAttrData = new ItemAttrData(itemModel.itemId, false, (ulong)itemModel.count , itemModel.gridIndex, true , type, itemModel.guid, ConfigParse.Analysis(itemModel.itemInfo.userData)); ShowTip(); } public void ShowTip() { if (curAttrData == null) return; #if UNITY_EDITOR Debug.LogFormat("你查看的物品是:guid->{0}", string.IsNullOrEmpty(curAttrData.guid) ? "" : curAttrData.guid); Debug.LogFormat("你查看的物品是:itemId->{0}", curAttrData.itemId); Debug.LogFormat("你查看的物品是:name->{0}", curAttrData.itemConfig.ItemName); #endif switch (curAttrData.winType) { case ItemWinType.wingsWin: case ItemWinType.guardWin: case ItemWinType.itemWin: case ItemWinType.boxWin: if (curAttrData.isPreview) { EquipTipUtility.Show(curAttrData.itemId); } else { EquipTipUtility.Show(curAttrData.guid); } break; case ItemWinType.equipWin: if (ItemLogicUtility.Instance.IsEquip(curAttrData.itemId)) { if (curAttrData.isPreview) { EquipTipUtility.Show(curAttrData.itemId); } else { EquipTipUtility.Show(curAttrData.guid); } } break; case ItemWinType.buyItemWin: WindowCenter.Instance.Open<BuyItemInfoWin>(); break; case ItemWinType.buyBoxWin: WindowCenter.Instance.Open<BuyBoxInfoWin>(); break; case ItemWinType.petMatWin: if (curAttrData.isPreview) { EquipTipUtility.Show(curAttrData.itemId); } else { EquipTipUtility.Show(curAttrData.guid); } break; case ItemWinType.buyPetMatWin: WindowCenter.Instance.Open<BuyPetMatInfoWin>(); break; case ItemWinType.gatherSoul: WindowCenter.Instance.Open<GatherSoulTipWin>(); break; case ItemWinType.kingTreasure: var kingTreasureShow = ModelCenter.Instance.GetModel<KingTreasureShowModel>(); kingTreasureShow.SetInitData(curAttrData.itemId); break; } WindowCenter.Instance.Open<GatherSoulTipWin>(); } private StringBuilder attrSB = new StringBuilder(); private PlayerPropertyConfig playerProModel; #region 设置装备基础信息 /// <summary> /// 得到弹框标题 /// </summary> /// <returns></returns> public string GetItemTipsTitle(ItemAttrData attrData) { string equipName = ""; if (attrData == null) return equipName; if (attrData.StrengthLV > 0) { equipName = StringUtility.Contact(equipName, attrData.itemConfig.ItemName, "+", attrData.StrengthLV); } else { equipName = StringUtility.Contact(equipName, attrData.itemConfig.ItemName); } return equipName; } /// <summary> /// 得到装备的职业 /// </summary> /// <param name="attrData"></param> /// <returns></returns string jobName = ""; public string GetEquipJobName(ItemAttrData attrData) { jobName = ""; if (attrData == null) return jobName; string playerJob = StringUtility.Contact(PlayerDatas.Instance.baseData.Job, "0", 1); if (!attrData.isHavePutLimit) { SetJobName(attrData, int.Parse(playerJob), attrData.itemConfig.JobLimit); } else { SetJobName(attrData, int.Parse(playerJob), attrData.itemConfig.JobLimit); } return jobName; } private void SetJobName(ItemAttrData attrData, int playerJob, int equipJob) { if (attrData.itemConfig.JobLimit != 0) { var config = JobNameConfig.Get(attrData.itemConfig.JobLimit); jobName = UIHelper.AppendColor(playerJob >= equipJob ? TextColType.White : TextColType.Red, config.name); } else { jobName = UIHelper.AppendColor(TextColType.White, Language.Get("StoreWin110")); } } #endregion #region 设置弹框按钮 /// <summary> /// 设置背包的弹框按钮 /// </summary> /// <param name="attrData"></param> public void SetBagTipsBtn(ItemAttrData attrData) { var horseModel = ModelCenter.Instance.GetModel<MountModel>(); var petmodel = ModelCenter.Instance.GetModel<PetModel>(); bool isOverdue = ItemLogicUtility.Instance.IsOverdue(attrData.guid); HorseConfig horseConfig = null; PetInfoConfig petInfo = null; switch (attrData.itemConfig.Type) { case 26: petInfo = unlockPetDict[attrData.itemId]; if (petmodel._DicPetBack.ContainsKey(petInfo.ID)) { if (attrData.itemConfig.CanSell == 1) { attrData.SetTipsFuncBtn(ItemOperateType.sell, (ItemWinBtnType, ItemAttrData) => { ItemOperateUtility.Instance.SellItem(attrData); }); } } break; case 41: horseConfig = unlockMountDict[attrData.itemId]; if (horseModel._DicHorse.ContainsKey(horseConfig.HorseID)) { if (attrData.itemConfig.CanSell == 1) { attrData.SetTipsFuncBtn(ItemOperateType.sell, (ItemWinBtnType, ItemAttrData) => { ItemOperateUtility.Instance.SellItem(attrData); }); } } break; case 124: horseConfig = unlockMountDict[attrData.itemConfig.EffectValueA1]; if (horseModel._DicHorse.ContainsKey(horseConfig.HorseID)) { if (attrData.itemConfig.CanSell == 1) { attrData.SetTipsFuncBtn(ItemOperateType.sell, (ItemWinBtnType, ItemAttrData) => { ItemOperateUtility.Instance.SellItem(attrData); }); } } break; case 125: petInfo = unlockPetDict[attrData.itemConfig.EffectValueA1]; if (petmodel._DicPetBack.ContainsKey(petInfo.ID)) { if (attrData.itemConfig.CanSell == 1) { attrData.SetTipsFuncBtn(ItemOperateType.sell, (ItemWinBtnType, ItemAttrData) => { ItemOperateUtility.Instance.SellItem(attrData); }); } } break; default: if (attrData.itemConfig.CanSell == 1) { attrData.SetTipsFuncBtn(ItemOperateType.sell, (ItemWinBtnType, ItemAttrData) => { ItemOperateUtility.Instance.SellItem(attrData); }); } break; } List<int> dismantleReturnlist = attrData.GetUseDataModel((int)ItemUseDataKey.itemDecompound); if (dismantleReturnlist != null && dismantleReturnlist.Count > 0) { attrData.SetTipsFuncBtn(ItemOperateType.dismantle, (ItemWinBtnType, ItemAttrData) => { ItemOperateUtility.Instance.DismantleItem(attrData); }); } if (!isOverdue) { if (attrData.itemConfig.JumpComposeCondi != null && attrData.itemConfig.JumpComposeCondi.Length > 0) { attrData.SetTipsFuncBtn(ItemOperateType.compose, (ItemWinBtnType, ItemAttrData) => { int jumpId = 0; bool isUnlock = ModelCenter.Instance.GetModel<ComposeWinModel>().CheckComposeItemById(attrData.itemId, out jumpId); if (isUnlock) { ItemOperateUtility.Instance.GotoComposeItem(jumpId); } }); } if (attrData.itemConfig.Type == 25 && attrData.itemConfig.Effect1 == 225) { attrData.SetTipsFuncBtn(ItemOperateType.inlay, (ItemWinBtnType, ItemAttrData) => { ItemOperateUtility.Instance.GotoInlayItem(attrData.guid); }); } if ((ItemType)attrData.itemConfig.Type == ItemType.WingsMat) { attrData.SetTipsFuncBtn(ItemOperateType.refine, (ItemWinBtnType, ItemAttrData) => { // BoxGetItemModel.Instance.SetModel(attrData.guid); WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.StrengthFunc3); }); } } if (attrData.count > 1) { attrData.SetTipsFuncBtn(ItemOperateType.split, (ItemWinBtnType, ItemAttrData) => { ItemOperateUtility.Instance.OnClickSplitBtn(attrData.guid); }); } if (!isOverdue) { switch (attrData.winType) { case ItemWinType.equipWin: case ItemWinType.wingsWin: case ItemWinType.guardWin: attrData.SetTipsFuncBtn(ItemOperateType.putOn, (ItemWinBtnType, ItemAttrData) => { ItemOperateUtility.Instance.PutOnItem(attrData.guid); }); break; } if (attrData.itemConfig.UseTag == 1) { attrData.SetTipsFuncBtn(ItemOperateType.makeUse, (ItemWinBtnType, ItemAttrData) => { ItemOperateUtility.Instance.GotoUseItem(attrData.guid); }); } } for (int i = 0; i < ItemRenewalIds.Length; i++) { if (ItemRenewalIds[i] == attrData.itemId) { if (isOverdue) { attrData.SetTipsFuncBtn(ItemOperateType.renewal, (ItemWinBtnType, ItemAttrData) => { ItemOperateUtility.Instance.RenewalItem(attrData.guid); }); } } } for (int i = 0; i < tryPutOnEquipIds.Length; i++) { if (tryPutOnEquipIds[i] == attrData.itemId) { if (PlayerDatas.Instance.baseData.coinPointTotal <= 0) { attrData.SetTipsFuncBtn(ItemOperateType.renewal, (ItemWinBtnType, ItemAttrData) => { WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.FirstRecharge); }); } } } if (!string.IsNullOrEmpty(attrData.guid)) { var item = playerPack.GetItemByGuid(attrData.guid); if (item.isAuction) { attrData.SetTipsFuncBtn(ItemOperateType.putAway, (ItemWinBtnType, ItemAttrData) => { ItemOperateUtility.Instance.PutAway(attrData.guid); }); } } } public void SetDogzItemBtn(ItemAttrData attrData) { if (attrData == null) return; if (attrData.itemConfig.CanSell == 1) { attrData.SetTipsFuncBtn(ItemOperateType.sell, (ItemWinBtnType, ItemAttrData) => { ItemOperateUtility.Instance.SellItem(attrData); }); } switch (attrData.winType) { case ItemWinType.equipWin: attrData.SetTipsFuncBtn(ItemOperateType.putOn, (ItemWinBtnType, ItemAttrData) => { if (dogzModel.CheckIsPutOn(attrData.itemId)) { List<int> indexlist = new List<int>(); indexlist.Add(attrData.index); dogzModel.SendPutOnEquip(indexlist); } }); break; } } public void SetDogzEquipBtn(ItemAttrData attrData) { @@ -701,344 +226,6 @@ #endregion #region 设置获取途径列表 private List<GetItemWaysConfig> getWayslist = new List<GetItemWaysConfig>(); public List<GetItemWaysConfig> GetWaysList(ItemAttrData attrData) { getWayslist.Clear(); if (attrData != null) { int[] waysArray = attrData.itemConfig.GetWay; if (waysArray != null) { int i = 0; for (i = 0; i < waysArray.Length; i++) { var config = GetItemWaysConfig.Get(waysArray[i]); if (config != null) { getWayslist.Add(config); } } } } return getWayslist; } #endregion #region 设置基础属性 public string GetBasicAttr(ItemAttrData attrData) { switch ((RoleEquipType)attrData.itemConfig.EquipPlace) { case RoleEquipType.Wing: return SetWingsBasicAttr(attrData); case RoleEquipType.Guard1: return SetGuardBasicAttr(attrData); default: return string.Empty; } } private string SetWingsBasicAttr(ItemAttrData attrData) { if (attrData == null) return ""; WingRefineAttrConfig wingRefine = WingRefineAttrConfig.GetWingRefineModel(attrData.itemConfig.LV); if (wingRefine == null) return ""; attrSB.Length = 0; int maxHp = 0; int maxHurt = 0; int curHp = 0; int curHurt = 0; Dictionary<int, int> itemEffectDict = GetItemEffectDict(attrData.itemConfig); Dictionary<int, int> wingAttrModelDict = ConfigParse.GetDic<int, int>(wingRefine.attrupper); foreach (var key in itemEffectDict.Keys) { playerProModel = PlayerPropertyConfig.Get(key); string rangeStr = ""; if (key == 23) { rangeStr = playerProModel.Name + "+" + PlayerPropertyConfig.GetValueDescription(key, itemEffectDict[key]); } else if (key == 6) { if (wingAttrModelDict.ContainsKey(key)) { maxHp = itemEffectDict[key] + wingAttrModelDict[key]; } if (attrData.GetUseDataModel(42) != null) { curHp = itemEffectDict[key] + (int)strengthengmodel.BackpackWings(attrData.itemId, attrData.GetUseDataModel(42)[0])[1]; } else { curHp = itemEffectDict[key]; } rangeStr = playerProModel.Name + "+" + PlayerPropertyConfig.GetValueDescription(key, curHp) + "[" + PlayerPropertyConfig.GetValueDescription(key, itemEffectDict[key]) + "-" + PlayerPropertyConfig.GetValueDescription(key, maxHp) + "]"; } else if (key == 19) { if (wingAttrModelDict.ContainsKey(key)) { maxHurt = itemEffectDict[key] + wingAttrModelDict[key]; } if (attrData.GetUseDataModel(42) != null) { curHurt = itemEffectDict[key] + (int)strengthengmodel.BackpackWings(attrData.itemId, attrData.GetUseDataModel(42)[0])[0]; } else { curHurt = itemEffectDict[key]; } rangeStr = playerProModel.Name + "+" + PlayerPropertyConfig.GetValueDescription(key, curHurt) + "[" + PlayerPropertyConfig.GetValueDescription(key, itemEffectDict[key]) + "-" + PlayerPropertyConfig.GetValueDescription(key, maxHurt) + "]"; } if (rangeStr != "") { if (attrSB.Length <= 0) { attrSB.Append(rangeStr); } else { attrSB.Append("\n" + rangeStr); } } } return attrSB.ToString(); } private string SetGuardBasicAttr(ItemAttrData attrData) { string s = ""; return s; } #endregion #region 设置传奇属性 private Dictionary<int, int> attrDict = new Dictionary<int, int>(); public string GetLegendAttr(ItemAttrData attrData) { if (!attrData.isPreview) { return SetLegendAttr(attrData.legendDataDict.Keys.ToList(), attrData.legendDataDict.Values.ToList(), attrData.itemConfig); } else { return SetLegendAttr(attrData.legendDataDict.Keys.ToList(), attrData.legendDataDict.Values.ToList(), attrData.itemConfig, true, attrData.isCustom); } } public string GetDogzLegendAttrCntPreview(ItemAttrData attrData) { string s = ""; if (attrData.isCustom) { s = Language.Get("LegendAttPreview_MustTitle", attrData.legendDataDict.Count); } else { var quality = attrData.itemConfig.ItemColor; var starLevel = attrData.itemConfig.StarLevel; var count = LegendPropertyUtility.GetDogzPropertyCount(quality, starLevel, LegendAttrType.Normal); count += LegendPropertyUtility.GetDogzPropertyCount(quality, starLevel, LegendAttrType.Pursuit); count += LegendPropertyUtility.GetDogzPropertyCount(quality, starLevel, LegendAttrType.Fixed); if (attrData.itemConfig.StarLevel > 2) { s = Language.Get("LegendAttPreview_MustTitle", count); } else { s = Language.Get("LegendAttPreview_MightTitle", count); } } return s; } public string GetWingsLegendAttrCntPreview(ItemAttrData attrData) { var description = ""; if (attrData.isCustom) { description = Language.Get("LegendAttPreview_MustTitle", attrData.legendDataDict.Count); } else { int attrCnt = LegendPropertyUtility.GetWingPropertyCount(attrData.itemConfig.LV); if (attrCnt > 0) { if (attrCnt > 1) { description = Language.Get("LegendAttPreview_MustTitle", attrCnt); } else { description = Language.Get("LegendAttPreview_MightTitle", attrCnt); } } } return description; } private string SetLegendAttr(List<int> idlist, List<int> valuelist, ItemConfig itemConfig, bool isPreview = false, bool isCustom = false) { if (idlist == null) return ""; attrDict.Clear(); int i = 0; attrSB.Length = 0; for (i = 0; i < idlist.Count; i++) { int attrId = idlist[i]; int attrValue = valuelist[i]; attrDict.Add(attrId, attrValue); } switch (itemConfig.EquipPlace) { case 101: case 102: case 103: case 104: case 105: idlist.Sort(CompareDogzLegendAttrType); break; } return attrSB.ToString(); } private int CompareDogzLegendAttrType(int start, int end) { int type1 = GetDogzLegendType(start); int type2 = GetDogzLegendType(end); if (type1.CompareTo(type2) != 0) return -type1.CompareTo(type2); return 0; } private int GetDogzLegendType(int id) { return (int)LegendPropertyUtility.GetDogzPropertyType(id); } #endregion #region 设置翅膀精炼材料 public string GetWingsRefineMatStr(ItemAttrData attrData) { if (attrData.wingsRefineMatDict == null) return ""; attrSB.Length = 0; foreach (var id in attrData.wingsRefineMatDict.Keys) { ItemConfig itemConfig = ItemConfig.Get(id); if (itemConfig != null) { string des = StringUtility.Contact(itemConfig.ItemName, "X", attrData.wingsRefineMatDict[id]); if (attrSB.Length <= 0) { attrSB.Append(des); } else { attrSB.Append("\n" + des); } } } return attrSB.ToString(); } #endregion #region 设置绝版属性 public string GetExhaustedAtrr(ItemAttrData attrData) { return SetExhaustedAttr(attrData, attrData.exhaustedMaxDataDict.Keys.ToList(), attrData.exhaustedMaxDataDict.Values.ToList()); } private string SetExhaustedAttr(ItemAttrData attrData, List<int> idlist, List<int> valuelist) { if (idlist == null) return ""; int i = 0; attrSB.Length = 0; for (i = 0; i < idlist.Count; i++) { playerProModel = PlayerPropertyConfig.Get(idlist[i]); if (playerProModel != null) { string s = ""; switch ((PropertyType)idlist[i]) { case PropertyType.OnlyFinalHurt: s = Language.Get("EquipTip_ExtraDamage", GetExhaustedAttrValue(idlist[i], valuelist[i]), GetExhaustedMaxLv(attrData.itemConfig.LV), valuelist[i]); break; case PropertyType.PVPAtkBackHP: s = Language.Get("EquipTip_ExtraHpBack", GetExhaustedAttrValue(idlist[i], valuelist[i]), GetExhaustedMaxLv(attrData.itemConfig.LV), valuelist[i]); break; } if (attrSB.Length <= 0) { attrSB.Append(s); } else { attrSB.Append("\n" + s); } } } return attrSB.ToString(); } private int GetExhaustedAttrValue(int attrId, int value) { Equation.Instance.Clear(); Equation.Instance.AddKeyValue("maxOOPValue", value); Equation.Instance.AddKeyValue("lv", PlayerDatas.Instance.baseData.LV); string formula = string.Empty; if (exhaustedAttrFormula.ContainsKey(attrId)) { formula = exhaustedAttrFormula[attrId]; } return Equation.Instance.Eval<int>(formula); } public int GetExhaustedMaxLv(int equipLV) { int maxLv = 0; exhaustedMaxLvDict.TryGetValue(equipLV, out maxLv); return maxLv; } #endregion Dictionary<int, int> GetItemEffectDict(ItemConfig config) { Dictionary<int, int> itemEffectDict = new Dictionary<int, int>(); @@ -1067,53 +254,7 @@ } #region 设置弹框位置 private RectTransform curTips = null; private RectTransform compareTips = null; public void SetCurTips(RectTransform rect) { curTips = rect; SetTipsPos(); } public void SetCompareTips(RectTransform rect) { compareTips = rect; SetTipsPos(); } public void SetTipsPos() { if (compareAttrData == null) { if (curTips != null) { curTips.anchoredPosition3D = new Vector3(curTips.rect.width / 2, curTips.rect.height / 2, 0); } } else { if (curTips != null && compareTips != null) { if (curTips.rect.height >= compareTips.rect.height) { curTips.anchoredPosition3D = new Vector3(curTips.rect.width, curTips.rect.height / 2, 0); compareTips.anchoredPosition3D = new Vector3(0, curTips.rect.height / 2, 0); } else { curTips.anchoredPosition3D = new Vector3(curTips.rect.width, compareTips.rect.height / 2, 0); compareTips.anchoredPosition3D = new Vector3(0, compareTips.rect.height / 2, 0); } } } } public void SetCommonTipPos(RectTransform rect) { float y = -750 / 2 + rect.sizeDelta.y / 2; rect.anchoredPosition3D = new Vector3(rect.anchoredPosition3D.x, y, 0); } #endregion #region 解锁背包格子数据 @@ -1165,19 +306,6 @@ } #endregion #region 设置宠物和坐骑数据 public Dictionary<int, int> GetPetSkillDict(int unlockId) { if (unlockPetDict.ContainsKey(unlockId)) { if (petSkillDict.ContainsKey(unlockPetDict[unlockId].ID)) { return petSkillDict[unlockPetDict[unlockId].ID]; } } return null; } public string GetQualityName(int quality) { string nameStr = string.Empty; @@ -1185,54 +313,8 @@ return nameStr; } public Dictionary<int, List<int>> GetMountSkillDict(int unlockId) { if (unlockMountDict.ContainsKey(unlockId)) { if (mountSkillDict.ContainsKey(unlockMountDict[unlockId].HorseID)) { return mountSkillDict[unlockMountDict[unlockId].HorseID]; } } return null; } public void SetPetAttrStr(int attrId, int attrValue, out string attrName, out string attrValueStr, string contanctStr = "") { attrName = ""; attrValueStr = ""; PlayerPropertyConfig playerProModel = null; if (attrId == (int)PropertyType.MaxAtk || attrId == (int)PropertyType.PetMaxAtk) { playerProModel = PlayerPropertyConfig.Get((int)PropertyType.ATK); } else { playerProModel = PlayerPropertyConfig.Get(attrId); } if (playerProModel != null) { attrName = playerProModel.Name; if (contanctStr == "") { attrValueStr = PlayerPropertyConfig.GetValueDescription(attrId, attrValue); } else { attrValueStr = StringUtility.Contact(contanctStr, "-", PlayerPropertyConfig.GetValueDescription(attrId, attrValue)); } } } #endregion #region 设置物品使用的限制条件 #endregion #region 物品增加战斗力 MountModel mountDatas { get { return ModelCenter.Instance.GetModel<MountModel>(); } } public StrengthenModel strengthengmodel { get { return ModelCenter.Instance.GetModel<StrengthenModel>(); } } public bool TryGetFightPowerByItemId(int itemId, out int fightPower) { @@ -1267,23 +349,6 @@ atk += Mathf.RoundToInt(mountAtk * ((float)attrValue / 10000)); break; case PropertyType.StoneBasePer: var stoneDict = GetStoneAttrDict(); foreach (var key in stoneDict.Keys) { var stoneValue = stoneDict[key]; switch ((PropertyType)key) { case PropertyType.ATK: atk += Mathf.RoundToInt(stoneValue * ((float)attrValue / 10000)); break; case PropertyType.HP: hp += Mathf.RoundToInt(stoneValue * ((float)attrValue / 10000)); break; case PropertyType.DEF: def += Mathf.RoundToInt(stoneValue * ((float)attrValue / 10000)); break; } } break; case PropertyType.RealmBasePer: var realmDict = GetRealmAttrDict(); @@ -1347,42 +412,6 @@ return fightPower > 0; } private Dictionary<int, int> GetStoneAttrDict() { Dictionary<int, int> attrDict = new Dictionary<int, int>(); //var stoneDict = PlayerStoneData.Instance.GetAllStone(); //foreach (var key in stoneDict.Keys) //{ // var stoneIds = stoneDict[key]; // var itemModel = playerPack.GetItemByIndex(PackType.Equip, key); // if (itemModel != null && stoneIds != null) // { // for (int i = 0; i < stoneIds.Length; i++) // { // int stoneId = (int)stoneIds[i]; // ItemConfig itemConfig = ItemConfig.Get(stoneId); // if (itemConfig != null) // { // var itemEffectDict = SetItemEffectDict(itemConfig); // foreach (var attrId in itemEffectDict.Keys) // { // var attrValue = itemEffectDict[attrId]; // if (!attrDict.ContainsKey(attrId)) // { // attrDict.Add(attrId, attrValue); // } // else // { // attrDict[attrId] += attrValue; // } // } // } // } // } //} return attrDict; } private Dictionary<int, int> GetRealmAttrDict() { Dictionary<int, int> attrDict = new Dictionary<int, int>(); @@ -1415,7 +444,6 @@ } return attrDict; } private Dictionary<int, int> GetStrengthAttrDict() { Dictionary<int, int> attrDict = new Dictionary<int, int>(); @@ -1455,29 +483,6 @@ } #endregion #region 绝版武器战力 public bool IsPeerlessEquip(int itemId) { if (PeerlessEquipIds == null) return false; return PeerlessEquipIds.Contains(itemId); } public int GetEquipFightPower(int equipScore) { var funcConfig = FuncConfigConfig.Get("FightpowerFormula"); Equation.Instance.Clear(); if (funcConfig != null) { Equation.Instance.AddKeyValue("equipScoreTotal", equipScore); return Equation.Instance.Eval<int>(funcConfig.Numerical2); } return 0; } #endregion #region 共享开启次数 public string GetShareNumItemDes(int itemId) { string shareNumDes = string.Empty; @@ -1501,103 +506,6 @@ } } return shareNumDes; } #endregion #region 判断是否展示模型 public Dictionary<int, int> showModelAttrDict = new Dictionary<int, int>(); public bool IsShowModel(int itemId, ModelShowPerfab showPerfab) { var config = ItemConfig.Get(itemId); if (config == null) return false; int fightPower = 0; switch (config.Type) { case 125: PetInfoConfig petInfo = unlockPetDict[config.EffectValueA1]; fightPower = petInfo.ShowFightPower; showPerfab.SetModelShow(petInfo.ID, ModelShowType.Pet, Language.Get("TreasureEffect103"), fightPower); return true; case 124: HorseConfig horseConfig = unlockMountDict[config.EffectValueA1]; fightPower = horseConfig.ShowFightPower; showPerfab.SetModelShow(horseConfig.Model, ModelShowType.Mount, Language.Get("TreasureEffect103"), fightPower); return true; } bool isFashion = TryGetFashionFightPower(config, out fightPower); if (isFashion) { showPerfab.SetModelShow(itemId, ModelShowType.FashionDress, Language.Get("TreasureEffect103"), fightPower); return true; } return false; } private bool TryGetFashionFightPower(ItemConfig itemConfig, out int fightPower) { showModelAttrDict.Clear(); fightPower = 0; if (itemConfig == null) return false; int fashionType = 0; int fashionId = 0; bool isFashion = TryGetItemFashionData(itemConfig.ID, out fashionType, out fashionId); if (isFashion) { List<int> fashionIds = null; fashionDress.TryGetFashionIds(fashionType, out fashionIds); if (fashionId == 0) { if (fashionIds != null) { foreach (var id in fashionIds) { Dictionary<int, int> dict = null; fashionDress.TryGetFashionDressProperty(id, 1, out dict); if (dict != null) { foreach (var attrId in dict.Keys) { var attrValue = dict[attrId]; if (!showModelAttrDict.ContainsKey(attrId)) { showModelAttrDict.Add(attrId, attrValue); } else { showModelAttrDict[attrId] += attrValue; } } } } } } else { Dictionary<int, int> dict = null; fashionDress.TryGetFashionDressProperty(fashionId, 1, out dict); if (dict != null) { foreach (var attrId in dict.Keys) { var attrValue = dict[attrId]; if (!showModelAttrDict.ContainsKey(attrId)) { showModelAttrDict.Add(attrId, attrValue); } else { showModelAttrDict[attrId] += attrValue; } } } } fightPower = UIHelper.GetFightPower(showModelAttrDict); return true; } return false; } public bool TryGetItemFashionData(int itemId, out int fashionType, out int fashionId) @@ -1671,7 +579,15 @@ } } #endregion } public struct GatherSoulData { public int itemId; public PackType packgeType; public int level; public int equipHole; public int index; } public class ItemAttrData @@ -1683,8 +599,6 @@ public ulong count { get; private set; } public int[] stones { get; private set; } //可镶嵌宝石数组 长度为0 未镶嵌 数值为0 未镶嵌 public int score { get; private set; } public bool isCompare { get; private set; } //是否进行装备比较 public bool isPreview { get; private set; }//是否预览 public ItemConfig itemConfig { get; private set; } public bool isCustom { get; private set; } //是否是定制物品 public int level { get; private set; }//等级 @@ -1710,13 +624,9 @@ this.itemId = id; this.count = count; this.index = index; this.isPreview = isPreview; this.isCompare = isCompare; this.useDataDict = useDataDict; this.StrengthLV = 0; this.ChildType = childType; this.isCustom = false; this.extraInfos = null; isHavePutLimit = true; this.level = 1; this.equipHole = -1; @@ -1805,14 +715,6 @@ strengthDataDict.Add(key, getStregthDict[key]); } } SetWinType(); } public string[] extraInfos { get; private set; } public void SetExtraInfos(params string[] extraInfos) { this.extraInfos = extraInfos; } private void SetWingsLegendAttrPreview(out List<int> ids, out List<int> values) @@ -1862,32 +764,6 @@ } private StringBuilder _extraInfoBuider = new StringBuilder(); private StringBuilder _allInfoDesBuider = new StringBuilder(); public string GetExtraInfos() { _extraInfoBuider.Length = 0; if (extraInfos == null) return ""; int i = 0; for (i = 0; i < extraInfos.Length; i++) { _extraInfoBuider.Append(extraInfos[i] + "\n"); } return _extraInfoBuider.ToString(); } public string GetAllInfoDes() { if (itemConfig == null) return ""; _allInfoDesBuider.Length = 0; _allInfoDesBuider.Append(itemConfig.Description + "\n"); _allInfoDesBuider.Append(GetExtraInfos()); return _allInfoDesBuider.ToString(); } /// <summary> /// 设置强化数据 @@ -2032,9 +908,9 @@ } } } SetLegendData(legendIdlist, legendValuelist); SetExhaustedData(exhaustedIdlist, exhaustedValuelist); } #endregion @@ -2065,70 +941,7 @@ this.packType = packType; this.index = index; } /// <summary> /// 设置该物品的弹框类型 /// </summary> public ItemWinType winType { get; private set; } public void SetWinType() { if (this.itemConfig == null) return; switch (this.itemConfig.Template.Trim()) { case "ItemInfoPanel": switch (ChildType) { case ItemTipChildType.Normal: winType = ItemWinType.itemWin; break; case ItemTipChildType.Buy: winType = ItemWinType.buyItemWin; break; } break; case "BoxInfoWin": switch (ChildType) { case ItemTipChildType.Normal: winType = ItemWinType.boxWin; break; case ItemTipChildType.Buy: winType = ItemWinType.buyBoxWin; break; } break; case "PetMatInfoWin": switch (ChildType) { case ItemTipChildType.Normal: winType = ItemWinType.petMatWin; break; case ItemTipChildType.Buy: winType = ItemWinType.buyPetMatWin; break; } break; case "EquipPanel": winType = ItemWinType.equipWin; break; case "WingsPanel": winType = ItemWinType.wingsWin; break; case "GuardPanel": winType = ItemWinType.guardWin; break; case "GatherSoul": winType = ItemWinType.gatherSoul; break; case "KingTreasureShow": winType = ItemWinType.kingTreasure; break; default: DebugEx.Log("没有此物品的弹框类型" + this.itemConfig.Template.Trim()); break; } } } } System/KnapSack/Logic/WingsTip.cs
File was deleted System/KnapSack/Logic/WingsTip.cs.meta
File was deleted System/KnapSack/New/BagWin.cs
@@ -252,8 +252,7 @@ { gridCell.itemCellBtn.onceClick = (int info) => { itemTipsModel.SetItemTipsModel(PackType.Item, itemModel.guid, false, true); itemTipsModel.ShowTip(); ItemTipUtility.Show(itemModel.guid); }; gridCell.itemCellBtn.doubleClick = () => { @@ -265,9 +264,7 @@ { gridCell.itemCellBtn.onceClick = (int info) => { itemTipsModel.SetItemTipsModel(PackType.Item, itemModel.guid, false, true); itemTipsModel.SetBagTipsBtn(itemTipsModel.curAttrData); itemTipsModel.ShowTip(); ItemTipUtility.Show(itemModel.guid); }; } System/KnapSack/New/BatchBuyWin.cs
File was deleted System/KnapSack/New/BatchBuyWin.cs.meta
File was deleted System/KnapSack/New/BatchUseModel.cs
@@ -3,12 +3,10 @@ using System.Linq; using System.Text; namespace Snxxz.UI { [XLua.LuaCallCSharp] public class BatchUseModel : Singleton<BatchUseModel> public class BatchUseModel : Singleton<BatchUseModel> { #region 批量使用数据 public string guid { get; private set; } @@ -25,32 +23,6 @@ { this.extraPrams = extraUseInfo; this.maxValue = maxValue; } #endregion #region 批量购买数据 public StoreConfig storeConfig { get; private set; } public void SetBatchBuyModel(StoreConfig _storeConfig) { if (_storeConfig == null) return; storeConfig = _storeConfig; WindowCenter.Instance.Open<BatchBuyWin>(); } public bool CheckIsBuy(StoreConfig storeConfig, int buyNum = 1) { ulong price = (ulong)(storeConfig.MoneyNumber * buyNum); if (UIHelper.GetMoneyCnt(storeConfig.MoneyType) >= price) { return true; } return false; } public void ClearBatchBuyModel() { storeConfig = null; } #endregion System/KnapSack/New/ChooseItemWin.cs
@@ -187,8 +187,7 @@ { if (chooseId == itemId) { ItemAttrData attrData = new ItemAttrData(itemId,true); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(itemId); } chooseId = itemId; System/KnapSack/New/DepotWin.cs
@@ -183,8 +183,7 @@ gridCell.itemCellBtn.doubleClick = null; gridCell.itemCellBtn.onceClick = (int info) => { itemTipsModel.SetItemTipsModel(PackType.Warehouse, itemModel.guid, false, true); itemTipsModel.ShowTip(); ItemTipUtility.Show(itemModel.guid); }; gridCell.itemCellBtn.doubleClick = () => { System/KnapSack/New/EquipPlaceCell.cs
@@ -55,7 +55,7 @@ int pathId = packModel.GetRoleEquipPathId((int)equipType); if (pathId != 0) { EquipTipUtility.Show(pathId); ItemTipUtility.Show(pathId); } } else @@ -74,9 +74,7 @@ return; } tipModel.SetItemTipsModel(PackType.Equip, item.guid, false); tipModel.SetPutOnTipsBtn(tipModel.curAttrData); tipModel.ShowTip(); ItemTipUtility.Show(item.guid); } } System/KnapSack/New/ExtendWin.cs
@@ -100,8 +100,7 @@ _itemCell.button.RemoveAllListeners(); _itemCell.button.onClick.AddListener(()=> { ItemAttrData attrData = new ItemAttrData(_chinItemModel.ID); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(_chinItemModel.ID); }); Text countText = _itemCell.transform.Find("CountText").GetComponent<Text>(); countText.gameObject.SetActive(true); System/KnapSack/New/GuardianWin.cs
File was deleted System/KnapSack/New/GuardianWin.cs.meta
File was deleted System/KnapSack/New/KingTreasureShowWin.cs
@@ -20,6 +20,7 @@ { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } } KingTreasureShowModel kingShowModel { get { return ModelCenter.Instance.GetModel<KingTreasureShowModel>(); } } KingTreasureModel kingModel { get { return ModelCenter.Instance.GetModel<KingTreasureModel>(); } } #region Built-in System/KnapSack/New/KnapSackEventMgr.cs
@@ -60,7 +60,7 @@ public void HideItemPopWin() { if (WindowCenter.Instance.IsOpen<WingsWin>()) if (WindowCenter.Instance.IsOpen<WingTipWin>()) { HideWingsWin(); } System/KnapSack/New/WingsWin.cs
File was deleted System/KnapSack/New/WingsWin.cs.meta
File was deleted System/KnapSack/PreciousItemGetBehaviour.cs
@@ -109,8 +109,7 @@ { if (model.currentShowItem != default(PreciousItemGetModel.PreciousItem)) { itemTipsModel.SetItemTipsModel(model.currentShowItem.packType, model.currentShowItem.guid); //model.ReportConfirmPreciousItem(model.currentShowItem); ItemTipUtility.Show(model.currentShowItem.guid); } } System/KnapSack/RealmBetterEquipBehaviour.cs
@@ -66,8 +66,7 @@ ItemModel betterEquip; if (model.TryGetBetterEquip(model.currentEquipGuid, out betterEquip)) { var itemConfig = ItemConfig.Get(betterEquip.itemId); itemTipsModel.SetItemTipsModel(PackType.Item, betterEquip.guid); ItemTipUtility.Show(betterEquip.guid); } } System/MainInterfacePanel/CoinTaskWin.cs
@@ -456,8 +456,7 @@ int tab = i; itemcell.button.AddListener(() => { ItemAttrData attrData = new ItemAttrData(rewardList[tab].itemCfg.ID, false, (ulong)number); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(rewardList[tab].itemCfg.ID); }); } } System/MainInterfacePanel/DungeonGuardCheckBehaviour.cs
@@ -39,7 +39,7 @@ { if (_itemModel != null) { ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(_itemModel.packType, _itemModel.guid); ItemTipUtility.Show(_itemModel.guid); } }); System/MainInterfacePanel/FeaturesType3.cs
@@ -151,8 +151,7 @@ } else { ItemAttrData attrData = new ItemAttrData(List[0].id, false, (ulong)List[0].count); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(List[0].id); // DebugEx.LogError("弹框"); } @@ -211,8 +210,7 @@ } else { ItemAttrData attrData = new ItemAttrData(List[1].id, false, (ulong)List[1].count); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(List[1].id); //DebugEx.LogError("弹框"); } }); System/MainInterfacePanel/FlyShoseConfirmwin.cs
@@ -54,7 +54,7 @@ m_Cancel.AddListener(CloseClick); m_OKButton.AddListener(OnclickOKButton); m_Toggle.onValueChanged.AddListener(OnClickToggle); m_button.AddListener(() => { EquipTipUtility.Show(FlyShoseID); }); m_button.AddListener(() => { ItemTipUtility.Show(FlyShoseID); }); } protected override void OnPreOpen() System/MainInterfacePanel/SideMission.cs
@@ -215,8 +215,7 @@ int tab = i; itemcell.button.AddListener(() => { ItemAttrData attrData = new ItemAttrData(rewardList[tab].itemCfg.ID, true, (ulong)rewardList[tab].num); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(rewardList[tab].itemCfg.ID); }); } } System/MainInterfacePanel/StoryTask.cs
@@ -295,8 +295,7 @@ int tab = i; itemcell.button.AddListener(() => { ItemAttrData attrData = new ItemAttrData(rewardList[tab].itemCfg.ID, true, (ulong)rewardList[tab].num); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(rewardList[tab].itemCfg.ID); }); } } System/MainInterfacePanel/TaskBoxBGMWin.cs
@@ -319,8 +319,7 @@ int tab = i; itemcell.button.AddListener(() => { ItemAttrData attrData = new ItemAttrData(rewardList[tab].itemCfg.ID, false, (ulong)number); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(rewardList[tab].itemCfg.ID); }); } } System/Message/RichNormalEvent.cs
@@ -101,7 +101,7 @@ { int _id = 0; int.TryParse(href.mSplits["getway"], out _id); EquipTipUtility.Show(_id); ItemTipUtility.Show(_id); } break; case RichTextEventEnum.AuctionBidding: System/Message/RichTableEvent.cs
@@ -7,10 +7,8 @@ public class RichTableEvent : TRichTextEvent { ItemTipsModel _itemTipsModel; ItemTipsModel itemTipsModel { get { ItemTipsModel itemTipsModel { get { return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } } @@ -441,7 +439,7 @@ index = int.Parse(hrefInfo.mSplits["place"]); } if (hrefInfo.mSplits.ContainsKey("equippartsuite") if (hrefInfo.mSplits.ContainsKey("equippartsuite") && hrefInfo.mSplits["equippartsuite"] != string.Empty) { LitJson.JsonData _json = null; @@ -518,11 +516,13 @@ } } ItemAttrData attrData = new ItemAttrData(itemId, true, (ulong)itemCount, -1, false, PackType.Deleted, "", userdatadic); attrData.SetGemModel(stone); attrData.SetStrengthData(strengthenLv, GetStrengthenType(itemId)); itemTipsModel.SetItemTipsModel(attrData); // ItemAttrData attrData = new ItemAttrData(itemId, true, (ulong)itemCount, -1, false, PackType.Deleted, // "", userdatadic); // attrData.SetGemModel(stone); // attrData.SetStrengthData(strengthenLv, GetStrengthenType(itemId)); // itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(itemId); } List<RoleParticularModel.EquipSuit> equipSuitList = new List<RoleParticularModel.EquipSuit>(); @@ -566,7 +566,7 @@ public static int GetStrengthenType(int _id) { var _type =1; var _type = 1; return _type; } System/Mount/MountPanelAssignment.cs
@@ -146,7 +146,7 @@ { FuncConfigConfig _tagfun = FuncConfigConfig.Get("HorseUpItem"); ItemConfig _tagchine = ItemConfig.Get(int.Parse(_tagfun.Numerical1)); EquipTipUtility.Show(_tagchine.ID); ItemTipUtility.Show(_tagchine.ID); } private void OnClickNotUnlockButton() @@ -154,7 +154,7 @@ var _Horse = HorseConfig.Get(pitchOnHorseID); var _item = ItemConfig.Get(_Horse.UnlockItemID); EquipTipUtility.Show(_item.ID); ItemTipUtility.Show(_item.ID); } public void PanelAssignment(int mountID) System/Mount/MountStoneTipsWin.cs
@@ -119,9 +119,7 @@ _MountStoneItem.ItemButton.GetComponent<Button>().RemoveAllListeners(); _MountStoneItem.ItemButton.GetComponent<Button>().AddListener(() => { ItemAttrData attrData = new ItemAttrData(_item.ID); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(_item.ID); }); int hs_number = playerPack.GetItemCountByID(PackType.Item, _id);//魂石数量 List<int> bagIndex = null; System/Mount/MountWin.cs
@@ -378,7 +378,7 @@ ItemConfig _tagchine = ItemConfig.Get(int.Parse(_tagfun.Numerical1)); if (!WindowCenter.Instance.IsOpen<RidingAndPetActivationWin>()) { EquipTipUtility.Show(_tagchine.ID); ItemTipUtility.Show(_tagchine.ID); } return; } System/NewYearFairylandCeremony/NewYearCeremonyFirepartyWin.cs
@@ -62,8 +62,7 @@ fireItem.Init(fireModel); fireItem.button.AddListener(() => { ItemAttrData attrData = new ItemAttrData(storeConfig.ItemID,true, (ulong)storeConfig.ItemCnt); tipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(storeConfig.ItemID); }); if (itemlist == null) return; @@ -79,8 +78,7 @@ itemBaiscs[i].button.RemoveAllListeners(); itemBaiscs[i].button.AddListener(() => { ItemAttrData attrData = new ItemAttrData(itemData.itemId, true, (ulong)itemData.itemCount); tipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(itemData.itemId); }); } else System/NewYearFairylandCeremony/NewYearCeremonyOutOfPrintWin.cs
@@ -158,8 +158,7 @@ kingFairyModel.ViewKingFairyChest(itemData.itemId,itemData.itemCount); break; default: ItemAttrData attrData = new ItemAttrData(itemData.itemId, true, (ulong)itemData.itemCount); tipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(itemData.itemId); break; } System/NewYearFairylandCeremony/NewYearCeremonyRechargeGiftWin.cs
@@ -70,8 +70,7 @@ itemBaiscs[i].button.RemoveAllListeners(); itemBaiscs[i].button.AddListener(()=> { ItemAttrData attrData = new ItemAttrData(itemData.itemId, true, (ulong)itemData.itemCount); tipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(itemData.itemId); }); } else System/NewYearFairylandCeremony/NewYearToHiAwardCell.cs
@@ -47,8 +47,7 @@ itemBaiscs[i].button.RemoveAllListeners(); itemBaiscs[i].button.AddListener(() => { ItemAttrData attrData = new ItemAttrData(itemData.itemId, true, (ulong)itemData.itemCount); tipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(itemData.itemId); }); } else System/OffLineTime/OffLineTimeLackBehaviour.cs
@@ -41,11 +41,7 @@ if (own > 0) { var guid = playerPackModel.GetItemGUIDByID(952); var itemModel = playerPackModel.GetItemByGuid(guid); itemTipsModel.SetItemTipsModel(PackType.Item, itemModel.guid, false, true); itemTipsModel.SetBagTipsBtn(itemTipsModel.curAttrData); itemTipsModel.ShowTip(); ItemTipUtility.Show(guid); } else { System/OpenServerActivity/AccumulateRechargeWin.cs
@@ -192,8 +192,7 @@ m_Items[i].Init(itemCellModel); m_Items[i].button.AddListener(() => { ItemAttrData itemAttrData = new ItemAttrData(item.id, true, (ulong)item.count); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(itemAttrData); ItemTipUtility.Show( item.id); }); } else System/OpenServerActivity/AutoTreasureAwardsRow.cs
@@ -29,8 +29,7 @@ awardItem.itemBaisc.button.RemoveAllListeners(); awardItem.itemBaisc.button.AddListener(() => { ItemAttrData attrData = new ItemAttrData(luckyItem.itemId, false, (ulong)luckyItem.itemCount); tipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(luckyItem.itemId); }); } System/OpenServerActivity/BestLuckyTreasureItemWin.cs
@@ -73,8 +73,7 @@ itemBaisc.button.RemoveAllListeners(); itemBaisc.button.AddListener(()=> { ItemAttrData attrData = new ItemAttrData(luckyItem.itemId, false, (ulong)luckyItem.itemCount); tipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(luckyItem.itemId); }); } } System/OpenServerActivity/EntryInformationCell.cs
@@ -62,8 +62,7 @@ m_ItemCell.Init(cellModel); m_ItemCell.button.SetListener(() => { ItemAttrData attrData = new ItemAttrData(Item.ItemID, false, (ulong)Item.ItemCnt); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(Item.ItemID); }); } bool IsOpenPreviewTime = OperationTimeHepler.Instance.SatisfyAdvanceCondition(Operation.LoginReward); System/OpenServerActivity/FlashSaleBehaviour.cs
@@ -46,8 +46,7 @@ m_FlashSaleItems[i].button.RemoveAllListeners(); m_FlashSaleItems[i].button.AddListener(() => { ItemAttrData itemAttrData = new ItemAttrData(item.itemId, true, (ulong)item.itemCount); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(itemAttrData); ItemTipUtility.Show(item.itemId); }); } else System/OpenServerActivity/FlashSaleItemCell.cs
@@ -58,8 +58,7 @@ itemBaisc.button.RemoveAllListeners(); itemBaisc.button.AddListener(()=> { ItemAttrData attrData = new ItemAttrData(saleItem.itemId,true, (ulong)saleItem.itemCount); tipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(saleItem.itemId); }); originalMoneyIcon.SetIconWithMoneyType(saleItem.moneyType); presentMoneyIcon.SetIconWithMoneyType(saleItem.moneyType); System/OpenServerActivity/ImpactRankWin.cs
@@ -305,8 +305,7 @@ _cell.items[i].button.RemoveAllListeners(); _cell.items[i].button.AddListener(() => { ItemAttrData _itemPropertyData = new ItemAttrData(_item.id, true, (ulong)_item.count); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(_itemPropertyData); ItemTipUtility.Show(_item.id); }); } } System/OpenServerActivity/InSevenDayBehavior.cs
@@ -66,8 +66,7 @@ m_ItemCell.button.RemoveAllListeners(); m_ItemCell.button.AddListener(() => { ItemAttrData attrData = new ItemAttrData(item.id, false, (ulong)item.count); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(item.id); }); } var config = InSevenDaysConfig.Get(inDay); System/OpenServerActivity/LuckyAwardsGroup.cs
@@ -30,8 +30,7 @@ awardCell.itemBaisc.button.RemoveAllListeners(); awardCell.itemBaisc.button.AddListener(() => { ItemAttrData attrData = new ItemAttrData(treasureItem.itemId, false, (ulong)treasureItem.itemCount); tipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(treasureItem.itemId); }); } else System/OpenServerActivity/LuckyTreasureWin.cs
@@ -108,8 +108,7 @@ luckAward_Item.button.RemoveAllListeners(); luckAward_Item.button.AddListener(() => { ItemAttrData attrData = new ItemAttrData(luckyItem.itemId); tipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(luckyItem.itemId); }); } } System/OpenServerActivity/MysticalPurchaseSaleItem.cs
@@ -60,8 +60,7 @@ itemBaisc.button.RemoveAllListeners(); itemBaisc.button.AddListener(()=> { ItemAttrData attrData = new ItemAttrData(itemInfo.itemId, false, (ulong)itemInfo.count ); tipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(itemInfo.itemId); }); } else System/OpenServerActivity/OSGiftBehaviour.cs
@@ -198,8 +198,7 @@ if (_index < _shopItems.Count) { var item = _shopItems[_index]; ItemAttrData attrData = new ItemAttrData(item.itemId, false, (ulong)item.count); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(attrData); ItemTipUtility.Show(item.itemId); } } } System/OpenServerActivity/OpenServiceAchievementCell.cs
@@ -75,8 +75,7 @@ itemCell.Init(cellModel); itemCell.button.SetListener(() => { var attrData = new ItemAttrData(Item.ItemID, false, (ulong)Item.ItemCnt); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(Item.ItemID); }); } else System/OpenServerActivity/PoolItemCell.cs
@@ -40,8 +40,7 @@ itemBaisc.button.RemoveAllListeners(); itemBaisc.button.AddListener(()=> { ItemAttrData attrData = new ItemAttrData(wellItem.itemId, true, (ulong)wellItem.itemCount); tipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(wellItem.itemId); }); } System/OpenServerActivity/RewardInformation.cs
@@ -53,8 +53,7 @@ itemCell.button.RemoveAllListeners(); itemCell.button.AddListener(() => { ItemAttrData attrData = new ItemAttrData(item.id, true, (ulong)item.count); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(item.id); }); } System/OpenServerActivity/SpringFestivalCell.cs
@@ -75,8 +75,7 @@ itemCell.Init(cellModel); itemCell.button.SetListener(() => { ItemAttrData attrData = new ItemAttrData(Item.ItemID, false, (ulong)Item.ItemCnt); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(Item.ItemID); }); } else System/OpenServerActivity/SuperValueGiftBehaviour.cs
@@ -68,8 +68,7 @@ if (index < items.Count) { var item = items[index]; ItemAttrData attrData = new ItemAttrData(item.id, false, (ulong)item.count); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(attrData); ItemTipUtility.Show(item.id); } } } System/OpenServerActivity/WishGroupCell.cs
@@ -42,8 +42,7 @@ poolItem.itemBaisc.button.RemoveAllListeners(); poolItem.itemBaisc.button.AddListener(()=> { var attrData = new ItemAttrData(info.itemId,true, (ulong)info.itemCount); tipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(info.itemId); }); } else System/OpenServerActivity/WishItemCell.cs
@@ -39,8 +39,7 @@ itemBaisc.button.RemoveAllListeners(); itemBaisc.button.AddListener(() => { ItemAttrData attrData = new ItemAttrData(wellItem.itemId, true, (ulong)wellItem.itemCount); tipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(wellItem.itemId); }); } else System/OpenServerActivity/WishingGetItemWin.cs
@@ -63,8 +63,7 @@ awardItem.itemBaisc.button.RemoveAllListeners(); awardItem.itemBaisc.button.AddListener(() => { ItemAttrData attrData = new ItemAttrData((int)wellItem.itemId, true , (ulong)wellItem.itemCount); tipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show((int)wellItem.itemId); }); } else System/Pet/PetAttributeMethods.cs
@@ -444,7 +444,7 @@ } else { EquipTipUtility.Show(petmodel.petUpgradeToolId); ItemTipUtility.Show(petmodel.petUpgradeToolId); } @@ -456,7 +456,7 @@ int haveCnt = playerPack.GetItemCountByID(PackType.Item, petmodel.petUpgradeToolId); if (haveCnt < costNum) { EquipTipUtility.Show(petmodel.petUpgradeToolId); ItemTipUtility.Show(petmodel.petUpgradeToolId); return; } isAutoTrain = !isAutoTrain; @@ -633,7 +633,7 @@ FragmentBtn.RemoveAllListeners(); FragmentBtn.AddListener(() => { EquipTipUtility.Show(_item.ID); ItemTipUtility.Show(_item.ID); }); } System/Pet/PetStoneTipsWin.cs
@@ -24,8 +24,6 @@ Dictionary<string, ItemConfig> tagCIM = new Dictionary<string, ItemConfig>(); private List<int> ListID = new List<int>(); ItemTipsModel _itemTipsModel; ItemTipsModel itemTipsModel { get { return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } } PackModel _playerPack; PackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); } } @@ -59,7 +57,7 @@ protected override void OnAfterOpen() { PetModel.Event_Ha339 += HA339; roleParticularModel.PowerUpdate += PowerUpdate; } @@ -72,11 +70,11 @@ roleParticularModel.PowerUpdate -= PowerUpdate; } protected override void OnAfterClose() { } private void PowerUpdate() @@ -148,8 +146,7 @@ _MountStoneItem.ItemButton.GetComponent<Button>().RemoveAllListeners(); _MountStoneItem.ItemButton.GetComponent<Button>().AddListener(() => { ItemAttrData attrData = new ItemAttrData(_item.ID); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(_item.ID); }); _MountStoneItem.UserBtn.RemoveAllListeners(); _MountStoneItem.UserBtn.AddListener(() => @@ -340,7 +337,7 @@ if (index_x.CompareTo(index_y) != 0) { return -index_x.CompareTo(index_y); } } if (x.CompareTo(y) != 0) { return x.CompareTo(y); System/Realm/RealmLevelUpBehaviour.cs
@@ -92,7 +92,7 @@ break; case 3: var config = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel); EquipTipUtility.Show(config.NeedGood); ItemTipUtility.Show(config.NeedGood); break; } } System/RidingPet/ContainerRidingPet.cs
@@ -94,8 +94,7 @@ { m_RewardArray[i].button.SetListener(()=> { ItemAttrData attrData = new ItemAttrData(itemConfig.ID, true, (ulong)1); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(itemConfig.ID); }); } } System/Role/MagicianModel.cs
@@ -339,7 +339,7 @@ var count = packModel.GetItemCountByID(PackType.Item, itemId); if (count < 1) { EquipTipUtility.Show(itemId); ItemTipUtility.Show(itemId); return; } CA555_tagCMGodWeaponPlus pak = new CA555_tagCMGodWeaponPlus(); System/Role/MagicianWin.cs
@@ -476,7 +476,7 @@ if (model.selectItemIndex == index && tip) { var items = model.GetLevelUpItemByType(model.selectType); EquipTipUtility.Show(items[model.selectItemIndex]); ItemTipUtility.Show(items[model.selectItemIndex]); } else { @@ -827,7 +827,7 @@ if (selectItemCount <= 0) { var items = model.GetLevelUpItemByType(model.selectType); EquipTipUtility.Show(items[model.selectItemIndex]); ItemTipUtility.Show(items[model.selectItemIndex]); return; } } @@ -916,7 +916,7 @@ else { var items = model.GetLevelUpItemByType(model.selectType); EquipTipUtility.Show(items[0]); ItemTipUtility.Show(items[0]); } } } System/Role/RoleRenameWin.cs
@@ -63,8 +63,7 @@ itemCell.button.RemoveAllListeners(); itemCell.button.AddListener(()=> { ItemAttrData attrData = new ItemAttrData(renameToolId); tipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(renameToolId); }); } @@ -95,7 +94,7 @@ } if(GetRenameToolNum() < 1) { EquipTipUtility.Show(renameToolId); ItemTipUtility.Show(renameToolId); return; } System/RoleParticulars/RoleParticularsWin.cs
@@ -59,12 +59,14 @@ RoleParticularModel.ItemData itemData = model.GetItemData(type); if (itemData != null) { RoleParticularModel.ViewPlayerData viewPlayerData = model.GetViewPlayerData(model.viewPlayer); ItemAttrData attrData = new ItemAttrData(itemData.ItemID, false, 1, -1, false, PackType.Deleted, "", itemData.useDataDict); attrData.SetStrengthData(viewPlayerData.rolePlusData.GetEquipStarLv((int)type),1); attrData.SetGemModel(viewPlayerData.rolePlusData.GetEquipStone((int)type)); itemTipsModel.SetItemTipsModel(attrData); // RoleParticularModel.ViewPlayerData viewPlayerData = model.GetViewPlayerData(model.viewPlayer); // ItemAttrData attrData = new ItemAttrData(itemData.ItemID, false, 1, -1, false, PackType.Deleted, // "", itemData.useDataDict); // attrData.SetStrengthData(viewPlayerData.rolePlusData.GetEquipStarLv((int)type),1); // attrData.SetGemModel(viewPlayerData.rolePlusData.GetEquipStone((int)type)); // itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(itemData.ItemID); } } System/RoleParticulars/ViewPetHorseStoneCell.cs
@@ -31,8 +31,7 @@ m_Item.button.RemoveAllListeners(); m_Item.button.AddListener(() => { ItemAttrData itemAttrData = new ItemAttrData(itemId, true); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(itemAttrData); ItemTipUtility.Show(itemId); }); var stoneConfig = AttrFruitConfig.Get(itemId); System/RolePromote/RoleResourceCell.cs
@@ -50,7 +50,7 @@ } resourceBtn.onClick.AddListener(() => { EquipTipUtility.Show(_tagChinItemModel.ID); ItemTipUtility.Show(_tagChinItemModel.ID); }); } gainWayTxt.text = textBuilder.ToString(); System/Rune/RuneComposeWin.cs
@@ -261,7 +261,7 @@ var _cfg = model.GetRuneCompose(model.presentSelectRuneQuality, model.presentSelectComposeRune); if (_cfg != null) { EquipTipUtility.Show(_cfg.NeedItem[_index]); ItemTipUtility.Show(_cfg.NeedItem[_index]); } } @@ -296,7 +296,7 @@ var _displayId = GeneralDefine.moneyDisplayIds.ContainsKey(14) ? GeneralDefine.moneyDisplayIds[14] : 0; if (_displayId != 0) { EquipTipUtility.Show(_displayId); ItemTipUtility.Show(_displayId); } } } System/Rune/RunePreviewCell.cs
@@ -52,7 +52,7 @@ private void ShowRunePath(ItemConfig itemCfg) { EquipTipUtility.Show(itemCfg.ID); ItemTipUtility.Show(itemCfg.ID); } } } System/RuneTower/RunePreviewBehaviour.cs
@@ -51,7 +51,7 @@ var runeModel = ModelCenter.Instance.GetModel<RuneModel>(); var propertyValue = runeModel.GetRunePropertyDescription(runeId, 1); EquipTipUtility.Show(runeId); ItemTipUtility.Show(runeId); } } System/Skill/TreasurePotentialLevelUpWin.cs
@@ -167,7 +167,7 @@ if (model.TryGetPotential(selectPotentialId, out potential)) { var upConfig = potential.GetSkillConfig(potential.level + 1); EquipTipUtility.Show(upConfig.ExAttr4); ItemTipUtility.Show(upConfig.ExAttr4); } } System/Store/BuyItemController.cs
File was renamed from System/Store/BuyItemPopModel.cs @@ -1,287 +1,220 @@ using Snxxz.UI; using System; using System.Collections.Generic; using System.Linq; using System.Text; using UnityEngine; [XLua.LuaCallCSharp] public class BuyItemController : Singleton<BuyItemController> { public StoreConfig storeConfig { get; private set; } public void SetModel(int shopId) { storeConfig = StoreConfig.Get(shopId); } public Dictionary<int, int> vipBuyCntDict = new Dictionary<int, int>(); public bool CheckIsVipBuy(StoreConfig model, out int curVipIndex, out int nextVipIndex) { vipBuyCntDict.Clear(); curVipIndex = -1; nextVipIndex = -1; bool isVipBuy = false; if (model == null) return isVipBuy; if (model.VIPLV.Length < 2) { if (model.VIPLV[0] != 0) { isVipBuy = true; } else { isVipBuy = false; } } else { isVipBuy = true; } if (isVipBuy) { for (int i = model.VIPLV.Length - 1; i > -1; i--) { vipBuyCntDict.Add(model.VIPLV[i], model.PurchaseNumber[i]); } int playerVip = PlayerDatas.Instance.baseData.VIPLv; for (int i = model.VIPLV.Length - 1; i > -1; i--) { if (model.VIPLV[i] > playerVip) { nextVipIndex = i; } else if (model.VIPLV[i] <= playerVip) { curVipIndex = i; break; } } } return isVipBuy; } public bool CheckIsLimitBuyCnt(StoreConfig model, out int canBuyCnt, out int addBuyCnt) { canBuyCnt = 0; addBuyCnt = 0; if (model == null) return false; int[] canBuyNums = model.PurchaseNumber; int curVipIndex = -1; int nexVipIndex = -1; bool isVipBuy = CheckIsVipBuy(model, out curVipIndex, out nexVipIndex); if (isVipBuy) { if (curVipIndex != -1) { canBuyCnt = canBuyNums[curVipIndex]; } if (nexVipIndex != -1) { addBuyCnt = canBuyNums[nexVipIndex] - canBuyCnt; } return true; } else { if (canBuyNums[0] != 0) { canBuyCnt = canBuyNums[0]; return true; } else { return false; } } } public int GetCurBuyCnt(int buyCnt, int remainBuyCnt, out bool IsReachUpper) { int count = 0; IsReachUpper = false; if (remainBuyCnt == 0) { IsReachUpper = true; count = 0; } else { if (buyCnt <= remainBuyCnt) { count = buyCnt; } else { count = remainBuyCnt; IsReachUpper = true; } } if (count < 0) { count = 0; } return count; } public int GetRemainBuyCnt(int canBuyCnt, BuyShopItemLimit shopItemLimit, bool isVipBuy) { int haveBuyCnt = 0; if (shopItemLimit != null) { haveBuyCnt = shopItemLimit.BuyCnt; } if (canBuyCnt <= 0 && !isVipBuy) { canBuyCnt = 9999; } int remainCnt = canBuyCnt - haveBuyCnt; if (remainCnt >= 0) { return remainCnt; } else { return 0; } } public int GetBuyPrice(StoreConfig model, int buyCnt) { if (model == null) return 0; int buyItemPrice = model.MoneyNumber * buyCnt; return buyItemPrice; } public int goodId { get; private set; } public readonly LogicInt wannaBuyCount = new LogicInt(); StoreModel model { get { return ModelCenter.Instance.GetModel<StoreModel>(); } } BuyShopItemLimit goodLimit; public void SetGood(int goodId) { this.goodId = goodId; wannaBuyCount.value = 1; goodLimit = model.GetBuyShopLimit((uint)goodId); } public void SetBuyCount(int count) { var countLimit = GetBuyCountLimit(count); if (countLimit == -1) { wannaBuyCount.value = Mathf.Clamp(count, 1, 999); } else { wannaBuyCount.value = Mathf.Clamp(count, 1, countLimit); } } public bool IsVipLimitGood() { var config = StoreConfig.Get(goodId); return config != null && config.VIPLV.Length > 1 && config.VIPLV[0] > 0; } /// <summary> /// 返回值为-1,表示没有vip限制,返回值为999表示已经没有下一个vip限制 /// </summary> /// <param name="goodId"></param> /// <param name="vipLevel"></param> /// <returns></returns> public int GetNextCanbuyVipLevel(int vipLevel) { if (!IsVipLimitGood()) { return -1; } var config = StoreConfig.Get(goodId); var nextLevel = 999; for (int i = 0; i < config.VIPLV.Length; i++) { if (config.VIPLV[i] > vipLevel) { nextLevel = config.VIPLV[i]; break; } } return nextLevel; } /// <summary> /// 返回值如果是-1,表示无限制 /// </summary> /// <param name="goodId"></param> /// <returns></returns> public int GetBuyCountLimit(int vipLevel) { return GetBuyCountLimit(this.goodId, vipLevel); } /// <summary> /// 返回值如果是-1,表示无限制 /// </summary> /// <param name="goodId"></param> /// <returns></returns> public int GetBuyCountLimit(int goodId, int vipLevel) { var config = StoreConfig.Get(goodId); if (config.PurchaseNumber.Length == 0 || config.PurchaseNumber[0] == 0) { return -1; } var isVipLimitGood = config != null && config.VIPLV.Length > 1 && config.VIPLV[0] > 0; var canBuy = 0; if (isVipLimitGood) { var index = -1; for (var i = config.VIPLV.Length - 1; i >= 0; i--) { if (config.VIPLV[i] <= vipLevel) { index = i; break; } } if (index != -1) { canBuy = config.PurchaseNumber[index]; } else { canBuy = 0; } } else { canBuy = config.PurchaseNumber[0]; } var haveBuy = goodLimit != null ? goodLimit.BuyCnt : 0; return canBuy - haveBuy; } public int GetTotalPrice(int count) { var config = StoreConfig.Get(goodId); return config.MoneyNumber * count; } } using Snxxz.UI; using System; using System.Collections.Generic; using System.Linq; using System.Text; using UnityEngine; [XLua.LuaCallCSharp] public class BuyItemController : Singleton<BuyItemController> { Dictionary<int, int> vipBuyCntDict = new Dictionary<int, int>(); public bool CheckIsVipBuy(StoreConfig model, out int curVipIndex, out int nextVipIndex) { vipBuyCntDict.Clear(); curVipIndex = -1; nextVipIndex = -1; bool isVipBuy = false; if (model == null) return isVipBuy; if (model.VIPLV.Length < 2) { if (model.VIPLV[0] != 0) { isVipBuy = true; } else { isVipBuy = false; } } else { isVipBuy = true; } if (isVipBuy) { for (int i = model.VIPLV.Length - 1; i > -1; i--) { vipBuyCntDict.Add(model.VIPLV[i], model.PurchaseNumber[i]); } int playerVip = PlayerDatas.Instance.baseData.VIPLv; for (int i = model.VIPLV.Length - 1; i > -1; i--) { if (model.VIPLV[i] > playerVip) { nextVipIndex = i; } else if (model.VIPLV[i] <= playerVip) { curVipIndex = i; break; } } } return isVipBuy; } public bool CheckIsLimitBuyCnt(StoreConfig model, out int canBuyCnt, out int addBuyCnt) { canBuyCnt = 0; addBuyCnt = 0; if (model == null) return false; int[] canBuyNums = model.PurchaseNumber; int curVipIndex = -1; int nexVipIndex = -1; bool isVipBuy = CheckIsVipBuy(model, out curVipIndex, out nexVipIndex); if (isVipBuy) { if (curVipIndex != -1) { canBuyCnt = canBuyNums[curVipIndex]; } if (nexVipIndex != -1) { addBuyCnt = canBuyNums[nexVipIndex] - canBuyCnt; } return true; } else { if (canBuyNums[0] != 0) { canBuyCnt = canBuyNums[0]; return true; } else { return false; } } } public int goodId { get; private set; } public readonly LogicInt wannaBuyCount = new LogicInt(); StoreModel model { get { return ModelCenter.Instance.GetModel<StoreModel>(); } } BuyShopItemLimit goodLimit; public void SetGood(int goodId) { this.goodId = goodId; wannaBuyCount.value = 1; goodLimit = model.GetBuyShopLimit((uint)goodId); } public void SetBuyCount(int count) { var countLimit = GetBuyCountLimit(count); if (countLimit == -1) { wannaBuyCount.value = Mathf.Clamp(count, 1, 999); } else { wannaBuyCount.value = Mathf.Clamp(count, 1, countLimit); } } public bool IsVipLimitGood() { var config = StoreConfig.Get(goodId); return config != null && config.VIPLV.Length > 1 && config.VIPLV[0] > 0; } /// <summary> /// 返回值为-1,表示没有vip限制,返回值为999表示已经没有下一个vip限制 /// </summary> /// <param name="goodId"></param> /// <param name="vipLevel"></param> /// <returns></returns> public int GetNextCanbuyVipLevel(int vipLevel) { if (!IsVipLimitGood()) { return -1; } var config = StoreConfig.Get(goodId); var nextLevel = 999; for (int i = 0; i < config.VIPLV.Length; i++) { if (config.VIPLV[i] > vipLevel) { nextLevel = config.VIPLV[i]; break; } } return nextLevel; } /// <summary> /// 返回值如果是-1,表示无限制 /// </summary> /// <param name="goodId"></param> /// <returns></returns> public int GetBuyCountLimit(int vipLevel) { return GetBuyCountLimit(this.goodId, vipLevel); } /// <summary> /// 返回值如果是-1,表示无限制 /// </summary> /// <param name="goodId"></param> /// <returns></returns> public int GetBuyCountLimit(int goodId, int vipLevel) { var config = StoreConfig.Get(goodId); if (config.PurchaseNumber.Length == 0 || config.PurchaseNumber[0] == 0) { return -1; } var isVipLimitGood = config != null && config.VIPLV.Length > 1 && config.VIPLV[0] > 0; var canBuy = 0; if (isVipLimitGood) { var index = -1; for (var i = config.VIPLV.Length - 1; i >= 0; i--) { if (config.VIPLV[i] <= vipLevel) { index = i; break; } } if (index != -1) { canBuy = config.PurchaseNumber[index]; } else { canBuy = 0; } } else { canBuy = config.PurchaseNumber[0]; } var haveBuy = goodLimit != null ? goodLimit.BuyCnt : 0; return canBuy - haveBuy; } public int GetTotalPrice(int count) { var config = StoreConfig.Get(goodId); return config.MoneyNumber * count; } } System/Store/BuyItemController.cs.metacopy from System/Store/Logic/BuyWingsTip.cs.meta copy to System/Store/BuyItemController.cs.meta
File was copied from System/Store/Logic/BuyWingsTip.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: e97fb8a0504c8e14196867facc54d7ce timeCreated: 1515728141 guid: dc23e302e8daefe418c0a4baeaedb9f1 timeCreated: 1556020061 licenseType: Pro MonoImporter: serializedVersion: 2 System/Store/BuyItemPopModel.cs.meta
File was deleted System/Store/Logic/BuyBoxInfoWin.cs
File was deleted System/Store/Logic/BuyBoxInfoWin.cs.meta
File was deleted System/Store/Logic/BuyGuardTip.cs
File was deleted System/Store/Logic/BuyGuardTip.cs.meta
File was deleted System/Store/Logic/BuyItemInfoWin.cs
File was deleted System/Store/Logic/BuyItemInfoWin.cs.meta
File was deleted System/Store/Logic/BuyPetMatInfoWin.cs
File was deleted System/Store/Logic/BuyPetMatInfoWin.cs.meta
File was deleted System/Store/Logic/BuyWingsTip.cs
File was deleted System/Store/StoreModel.cs
@@ -918,7 +918,7 @@ public void OnClickShopCell(StoreConfig shopInfo) { int itemId = GetReplaceId(shopInfo.ID, shopInfo.ItemID); EquipTipUtility.ShowGood(shopInfo.ID ,itemId); ItemTipUtility.ShowGood(shopInfo.ID ,itemId); } public int BuyCnt { get; private set; } System/Store/UnionStoreWin.cs
@@ -318,7 +318,7 @@ private void ClickGetPathBtn() { int itemId = GeneralDefine.moneyDisplayIds[15]; EquipTipUtility.Show(itemId); ItemTipUtility.Show(itemId); } private void CloseWin() { System/Strengthening/GodBeastAttributes.cs
@@ -260,7 +260,7 @@ int type = i; m_ItemCell.button.AddListener(() => { itemTipsModel.SetItemTipsModel(PackType.DogzEquip, itemModel[type].guid); ItemTipUtility.Show(itemModel[type].guid); }); } } System/Strengthening/MasterCell.cs
@@ -31,7 +31,7 @@ itemBaisc.button.RemoveAllListeners(); itemBaisc.button.AddListener(()=> { tipsModel.SetItemTipsModel(PackType.Equip,itemModel.guid); ItemTipUtility.Show(itemModel.guid); }); } } System/Strengthening/WingsRefined.cs
@@ -571,7 +571,7 @@ IconButton.RemoveAllListeners(); IconButton.AddListener(() => { itemTipsModel.SetItemTipsModel(PackType.Equip, itemModel.guid); ItemTipUtility.Show(itemModel.guid); }); ModelCreationDisplay();//模型展示创建 RefiningDegrees();//精炼度(刷新) System/SystemSetting/HangUpWin.cs
@@ -145,7 +145,7 @@ private void ClickAddOfflinePlugin() { EquipTipUtility.Show(952); ItemTipUtility.Show(952); } } System/TaiChi/TaiChiRewardCell.cs
@@ -57,8 +57,7 @@ button.RemoveAllListeners(); button.AddListener(()=> { ItemAttrData attrData = new ItemAttrData(itemConfig.ID, true); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(attrData); ItemTipUtility.Show(itemConfig.ID); }); } System/TaiChi/WytjGameWin.cs
@@ -186,8 +186,7 @@ awardImagelist[i].SetSprite(itemConfig.IconKey); awardbtnlist[i].AddListener(() => { ItemAttrData attrData = new ItemAttrData(itemConfig.ID, true); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(attrData); ItemTipUtility.Show(itemConfig.ID); }); } } System/TaiChi/WytjRulesWin.cs
@@ -84,7 +84,7 @@ itemIcon.SetSprite(itemConfig.IconKey); iconBtn.AddListener(() => { EquipTipUtility.Show(itemConfig.ID); ItemTipUtility.Show(itemConfig.ID); }); } } System/Tip/ChestDetailBehaviour.cs
File was deleted System/Tip/ChestDetailBehaviour.cs.meta
File was deleted System/Tip/IconConfirmWin.cs
@@ -101,8 +101,7 @@ itemBaisc.button.RemoveAllListeners(); itemBaisc.button.AddListener(() => { ItemAttrData attrData = new ItemAttrData(ConfirmCancel.iconItemId); tipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(ConfirmCancel.iconItemId); }); } System/Tip/ItemConfirmWin.cs
@@ -10,7 +10,8 @@ using UnityEngine; using UnityEngine.UI; namespace Snxxz.UI { namespace Snxxz.UI { public class ItemConfirmWin : Window { @@ -77,21 +78,7 @@ private void ShowItemGetPath() { ItemConfig itemConfig = ItemConfig.Get(ConfirmCancel.generalItemId); if(itemConfig != null) { if(itemConfig.GetWay != null && itemConfig.GetWay.Length > 0) { EquipTipUtility.Show(ConfirmCancel.generalItemId); } else { ItemAttrData attrData = new ItemAttrData(ConfirmCancel.generalItemId); var tipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>(); tipsModel.SetItemTipsModel(attrData); } } ItemTipUtility.Show(ConfirmCancel.generalItemId); } } System/Treasure/ClientTreasureDungeonStage.cs
@@ -17,6 +17,12 @@ static GA_NpcClientFunc m_Npc; Clock fightEndClock = null; static bool IsCompleteDialogue = false; DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } } public override void Initialize() { base.Initialize(); @@ -32,6 +38,14 @@ UnInitializedNpc(); if (fightEndClock != null) { Clock.Stop(fightEndClock); fightEndClock = null; } IsCompleteDialogue = false; NormalDialogueWin.onDialogueComplete -= OnDialogueComplete; NormalDialogueWin.onDialogueComplete += OnDialogueComplete; } @@ -40,10 +54,14 @@ { base.OnStageLoadFinish(); dungeonModel.UpdateCoolDown(DungeonCoolDownType.FightStart, 300 * 1000); fightEndClock = Clock.AlarmAfter(300, OnFightEnd); InitializePlayer(); InitializeNpc(); } } void InitializePlayer() { var hero = PlayerDatas.Instance.hero; @@ -72,9 +90,18 @@ private void OnDialogueComplete() { IsCompleteDialogue = true; var pak = new CA50E_tagCMOpenMagicWeapon(); pak.MWID = (uint)ClientTreasureDungeon.challengeTreasureId; GameNetSystem.Instance.SendInfo(pak); } private void OnFightEnd() { if (!IsCompleteDialogue) { ClientTreasureDungeon.RequestExit(); } } void UnInitializedNpc() @@ -85,6 +112,12 @@ GAMgr.Instance.Release(m_Npc); m_Npc = null; } if (fightEndClock != null) { Clock.Stop(fightEndClock); fightEndClock = null; } } public override void UnInitialize() System/Treasure/FairyTreasureCollectConditionBehaviour1.cs
@@ -45,7 +45,7 @@ private void ShowItemPath() { EquipTipUtility.Show(itemId); ItemTipUtility.Show(itemId); } } System/Treasure/HumanTreasureWin.cs
@@ -241,7 +241,7 @@ IEnumerator Co_DelayShowTask() { yield return new WaitForSeconds(3f); yield return WaitingForSecondConst.WaitMS1000; DisplayTasks(true); } System/Treasure/TreasureCollectBriefInfoBehaviour.cs
@@ -74,8 +74,10 @@ void DisplayBase() { m_ContainerUnknown.gameObject.SetActive(displayId == 0); m_ContainerCollect.gameObject.SetActive(displayId != 0); bool isChapterOpen = WindowCenter.Instance.IsOpen<TreasureChapterWin>(); m_ContainerUnknown.gameObject.SetActive(displayId == 0 || isChapterOpen); m_ContainerCollect.gameObject.SetActive(displayId != 0 && !isChapterOpen); if (displayId != 0) { DisplayTreasureInfo(); System/TreasureFindHost/ReciveConditionCell.cs
@@ -32,7 +32,7 @@ public void SetModel(int findId) { FindTreasureInfo info = null; hostModel.TryGetFindTreasureInfo(findId,out info); hostModel.TryGetFindTreasureInfo(findId, out info); if (info == null) return; condiSB.Length = 0; @@ -42,47 +42,47 @@ switch (info.type) { case 1: conditionText.text = Language.Get("TreasureFindHost_Type1",GetFindProgressStr(info)); conditionText.text = Language.Get("TreasureFindHost_Type1", GetFindProgressStr(info)); break; case 2: int equipPlace = 0; foreach(var value in info.needConditionsDict.Values) foreach (var value in info.needConditionsDict.Values) { string s = s = Language.Get("TreasureFindHost_Type2Split1", value[0], UIHelper.GetColorNameByItemColor(value[1]), value[2]); if(condiSB.Length > 0) if (condiSB.Length > 0) { s = StringUtility.Contact(Language.Get("TreasureFindHost_Type2Split2"), s); } equipPlace = value[3]; condiSB.Append(s); } conditionText.text = Language.Get("TreasureFindHost_Type2",condiSB.ToString(),UIHelper.GetEquipPlaceName(equipPlace),GetFindProgressStr(info)); conditionText.text = Language.Get("TreasureFindHost_Type2", condiSB.ToString(), UIHelper.GetEquipPlaceName(equipPlace), GetFindProgressStr(info)); break; case 3: conditionText.text = Language.Get("TreasureFindHost_Type3", info.targetNum,GetFindProgressStr(info)); conditionText.text = Language.Get("TreasureFindHost_Type3", info.targetNum, GetFindProgressStr(info)); break; case 4: foreach (var value in info.needConditionsDict.Values) { string s = ""; switch(value[1]) switch (value[1]) { case 1: s = Language.Get("TreasureFindHost_Type4Split1",value[0],Language.Get("TreasureFindHost_Type4Split2")); s = Language.Get("TreasureFindHost_Type4Split1", value[0], Language.Get("TreasureFindHost_Type4Split2")); break; case 2: s = Language.Get("TreasureFindHost_Type4Split1", value[0], Language.Get("TreasureFindHost_Type4Split3")); break; } if(condiSB.Length > 0) if (condiSB.Length > 0) { s = StringUtility.Contact(Language.Get("TreasureFindHost_Type2Split2"), s); } condiSB.Append(s); } conditionText.text = Language.Get("TreasureFindHost_Type4",info.targetNum,condiSB.ToString(),GetFindProgressStr(info)); conditionText.text = Language.Get("TreasureFindHost_Type4", info.targetNum, condiSB.ToString(), GetFindProgressStr(info)); break; default: DebugEx.LogError("暂无此类型需要添加:" + info.type); @@ -105,7 +105,7 @@ receiveEffect.gameObject.SetActive(true); receivedImg.SetActive(false); btnText.text = Language.Get("HallowsWin_Btn_ReceiveAward"); receiveBtn.AddListener(()=> receiveBtn.AddListener(() => { hostModel.SendGetRewardQuest(info.id); }); @@ -118,16 +118,7 @@ receiveBtn.AddListener(() => { hostModel.SetAdviceIdlist(adviceIdlist); ItemAttrData attrData = new ItemAttrData(adviceIdlist[0], true, 0, -1, true, PackType.Deleted, "", null, ItemTipChildType.GetEquipPath); tipsModel.SetItemTipsModel(attrData, false); if (tipsModel.compareAttrData != null) { tipsModel.ShowTip(); } else { EquipTipUtility.Show(adviceIdlist[0]); } ItemTipUtility.Show(adviceIdlist[0]); }); } } @@ -143,23 +134,22 @@ rewardCntTex.text = UIHelper.ReplaceLargeNum(rewardMoneyCnt); int itemId = GeneralDefine.moneyDisplayIds[value[0]]; ItemConfig itemConfig = ItemConfig.Get(itemId); if(itemConfig != null) if (itemConfig != null) { rewardIcon.SetSprite(itemConfig.IconKey); rewardBg.SetItemBackGround(itemConfig.ItemColor); } rewardBtn.RemoveAllListeners(); rewardBtn.AddListener(()=> rewardBtn.AddListener(() => { ItemAttrData attrData = new ItemAttrData(itemId,true,(ulong)rewardMoneyCnt); tipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(itemId); }); } foreach(var value in info.awardItemDict.Values) foreach (var value in info.awardItemDict.Values) { ItemConfig itemConfig = ItemConfig.Get(value[0]); if(itemConfig != null) if (itemConfig != null) { rewardIcon.SetSprite(itemConfig.IconKey); rewardBg.SetItemBackGround(itemConfig.ItemColor); @@ -168,8 +158,7 @@ rewardBtn.RemoveAllListeners(); rewardBtn.AddListener(() => { ItemAttrData attrData = new ItemAttrData(itemConfig.ID, true, (ulong)rewardCnt); tipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(itemConfig.ID); }); } } @@ -177,7 +166,7 @@ public string GetFindProgressStr(FindTreasureInfo info) { if(info.IsCompleted) if (info.IsCompleted) { return UIHelper.AppendColor(TextColType.Green, StringUtility.Contact(info.targetNum, "/", info.targetNum)); } System/Vip/FirstChargeTrialWin.cs
@@ -76,8 +76,7 @@ m_ItemCell.button.RemoveAllListeners(); m_ItemCell.button.AddListener(()=> { ItemAttrData attrData = new ItemAttrData(_weaponId,false,1); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(_weaponId); }); } System/Vip/FirstRechargeWin.cs
@@ -178,8 +178,7 @@ if (_index < _list.Count) { var item = _list[_index]; ItemAttrData attrData = new ItemAttrData(item.id, true, (ulong)item.count); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(attrData); ItemTipUtility.Show(item.id); } } } System/Vip/LimitedTimePackageWin.cs
@@ -25,7 +25,7 @@ [SerializeField] Text m_Money2;//现价 [SerializeField] Text m_Text_ActivityTimeTo;//活动时间 public int CDTIME = 5; private float time = 0; private float time = 0; #region Built-in LimitedTimePackageItemClassModel limitedTimePackageItemModel { get { return ModelCenter.Instance.GetModel<LimitedTimePackageItemClassModel>(); } } ItemTipsModel _itemTipsModel; @@ -36,11 +36,12 @@ protected override void AddListeners() { m_Close_Btn.AddListener(() => { m_Close_Btn.AddListener(() => { Close(); if (!WindowCenter.Instance.IsOpen<MainInterfaceWin>()) { WindowCenter.Instance.Open <MainInterfaceWin>(); WindowCenter.Instance.Open<MainInterfaceWin>(); } }); @@ -64,7 +65,7 @@ LocalSave.SetInt("IsOpenLimitedTime", GetDayOfYear); limitedTimePackageItemModel.IsShowTip(); } } private void UpdateLimitedTimePackageItem() @@ -128,7 +129,7 @@ limitedTimePackageItemModel.OpenFreePlat(str, gift.gifts[0].rmb, gift.gifts[0].OrderInfo); return; } } else { @@ -172,8 +173,7 @@ ItemCell.button.RemoveAllListeners(); ItemCell.button.AddListener(() => { ItemAttrData attrData = new ItemAttrData(items[type].itemId, false, (ulong)items[type].itemCount); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(items[type].itemId); }); } } @@ -191,7 +191,7 @@ GlobalTimeEvent.Instance.secondEvent -= secondEvent; } protected override void OnAfterClose() { } System/Vip/NeedForWhiteInvestment.cs
@@ -31,8 +31,6 @@ NeedForWhiteModel m_NeedForWhiteModel; NeedForWhiteModel needForWhiteModel { get { return m_NeedForWhiteModel ?? (m_NeedForWhiteModel = ModelCenter.Instance.GetModel<NeedForWhiteModel>()); } } ItemTipsModel _itemTipsModel; ItemTipsModel itemTipsModel { get { return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } } private int Get_Id = 0; private bool IsWhetherToCount = false; @@ -84,8 +82,7 @@ m_ItemCell_One.button.RemoveAllListeners(); m_ItemCell_One.button.AddListener(() => { ItemAttrData attrData = new ItemAttrData(item.id, false, (ulong)item.count); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(item.id); }); break; case 1: @@ -94,8 +91,7 @@ m_ItemCell_Two.button.RemoveAllListeners(); m_ItemCell_Two.button.AddListener(() => { ItemAttrData attrData = new ItemAttrData(item.id, false, (ulong)item.count); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(item.id); }); break; case 2: @@ -104,8 +100,7 @@ m_ItemCell_Three.button.RemoveAllListeners(); m_ItemCell_Three.button.AddListener(() => { ItemAttrData attrData = new ItemAttrData(item.id, false, (ulong)item.count); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(item.id); }); break; default: System/Vip/RechargeBoxWin.cs
@@ -97,8 +97,7 @@ if (index < _list.Count) { var item = _list[index]; ItemAttrData attrData = new ItemAttrData(item.id, false, (ulong)item.count); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(attrData); ItemTipUtility.Show(item.id); } } } System/Vip/VipInvest/VipInvestWin.cs
@@ -190,8 +190,7 @@ itemBaisc.button.RemoveAllListeners(); itemBaisc.button.AddListener(() => { ItemAttrData attrData = new ItemAttrData(reward.id, true, reward.count); tipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(reward.id); }); } else System/Vip/VipWin.cs
@@ -388,8 +388,7 @@ } else { ItemAttrData attrData = new ItemAttrData(award.id, true, (ulong)award.count); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(award.id); } }); } System/Welfare/ConsumeRebateCell.cs
@@ -46,8 +46,7 @@ m_RebateItems[i].button.RemoveAllListeners(); m_RebateItems[i].button.AddListener(() => { ItemAttrData itemAttrData = new ItemAttrData(itemDate.itemId, true, (ulong)itemDate.count); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(itemAttrData); ItemTipUtility.Show(itemDate.itemId); }); } else System/Welfare/ExchangeGetItemWin.cs
@@ -54,10 +54,7 @@ itemBaiscs[i].button.RemoveAllListeners(); itemBaiscs[i].button.AddListener(()=> { ItemAttrData attrData = new ItemAttrData((int)itemModel.ItemID, false , (ulong)itemModel.Count,-1,false, PackType.Deleted, "", ConfigParse.Analysis(itemModel.UserData)); tipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show((int)itemModel.ItemID); }); } else System/Welfare/LevelGiftWin.cs
@@ -89,8 +89,7 @@ _cell.items[i].button.RemoveAllListeners(); _cell.items[i].button.AddListener(() => { ItemAttrData _itemPropertyData = new ItemAttrData(_item.id, true, (ulong)_item.count); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(_itemPropertyData); ItemTipUtility.Show(_item.id); }); } else @@ -105,8 +104,7 @@ _cell.vipItem.button.RemoveAllListeners(); _cell.vipItem.button.AddListener(() => { ItemAttrData _itemPropertyData = new ItemAttrData(_vipAward.item.id, true, (ulong)_vipAward.item.count); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(_itemPropertyData); ItemTipUtility.Show(_vipAward.item.id); }); _cell.vipGotImage.gameObject.SetActive(_vipGot); _cell.vipText.text = StringUtility.Contact("V", _vipAward.vipLv); System/Welfare/SignInGiftCell.cs
@@ -103,9 +103,8 @@ } } } ItemAttrData attrData = new ItemAttrData(itemId, true, (ulong)itemCount); itemTipsModel.SetItemTipsModel(attrData); ItemTipUtility.Show(itemId); } } } System/Welfare/SignInItemBehaviour.cs
@@ -119,8 +119,8 @@ itemId = config.ItemID[0]; itemCount = config.OrdinaryNum[0]; } ItemAttrData attrData = new ItemAttrData(itemId, true, (ulong)itemCount); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(attrData); ItemTipUtility.Show(itemId); } } } System/WindowJump/WindowJumpMgr.cs
@@ -683,8 +683,17 @@ case JumpUIType.YldTs: case JumpUIType.StfTs: treasureModel.currentCategory = TreasureCategory.Human; treasureModel.selectedTreasure = int.Parse(_tagWinSearchModel.SelectActive); SetJumpLogic<TreasureBaseWin>(_tagWinSearchModel.TABID); var displayId = treasureModel.IsRequireUnlockAnim(TreasureCategory.Human); if (displayId != 0) { treasureModel.treasureGotoId = displayId; SetJumpLogic<TreasureSelectWin>(); } else { treasureModel.selectedTreasure = int.Parse(_tagWinSearchModel.SelectActive); SetJumpLogic<TreasureBaseWin>(_tagWinSearchModel.TABID); } break; case JumpUIType.FirstRecharge: SetJumpLogic<FirstRechargeWin>(_tagWinSearchModel.TABID, true); UI/Common/ItemBehaviour.cs
@@ -69,7 +69,7 @@ SetItem(_item.id, _item.count, _item.quality); } public void SetItem(int _id, int _count, int _quality = 0) public void SetItem(int _id, int _count, int _quality = 0) { itemId = _id; itemCount = _count; @@ -153,16 +153,7 @@ private void ViewDetails() { switch (m_ItemType) { case ItemType.Rewards: var attrData = new ItemAttrData(itemId, true, (ulong)itemCount); itemTipsModel.SetItemTipsModel(attrData); break; case ItemType.Use: EquipTipUtility.Show(itemId); break; } ItemTipUtility.Show(itemId); } public enum ItemType Utility/ConfigInitiator.cs
@@ -111,7 +111,6 @@ normalTasks.Add(new ConfigInitTask("ItemPlusSumAttrConfig", () => { ItemPlusSumAttrConfig.Init(); }, () => { return ItemPlusSumAttrConfig.inited; })); normalTasks.Add(new ConfigInitTask("JadeDynastyBossConfig", () => { JadeDynastyBossConfig.Init(); }, () => { return JadeDynastyBossConfig.inited; })); normalTasks.Add(new ConfigInitTask("JadeDynastyStoneAttrConfig", () => { JadeDynastyStoneAttrConfig.Init(); }, () => { return JadeDynastyStoneAttrConfig.inited; })); normalTasks.Add(new ConfigInitTask("JadeDynastySuitAttrConfig", () => { JadeDynastySuitAttrConfig.Init(); }, () => { return JadeDynastySuitAttrConfig.inited; })); normalTasks.Add(new ConfigInitTask("JadeDynastyTowerConfig", () => { JadeDynastyTowerConfig.Init(); }, () => { return JadeDynastyTowerConfig.inited; })); normalTasks.Add(new ConfigInitTask("JobNameConfig", () => { JobNameConfig.Init(); }, () => { return JobNameConfig.inited; })); normalTasks.Add(new ConfigInitTask("KickOutReasonConfig", () => { KickOutReasonConfig.Init(); }, () => { return KickOutReasonConfig.inited; }));