Core/NetworkPackage/DTCFile/ClientPack.meta
New file @@ -0,0 +1,9 @@ fileFormatVersion: 2 guid: 722e5e3d30096674e811f5bd191246a0 folderAsset: yes timeCreated: 1539228128 licenseType: Pro DefaultImporter: userData: assetBundleName: assetBundleVariant: Core/NetworkPackage/DTCFile/ServerPack/HAD_SaleActivity.meta
New file @@ -0,0 +1,9 @@ fileFormatVersion: 2 guid: 3e05761d690b75440a6be79207d0fb01 folderAsset: yes timeCreated: 1547643019 licenseType: Pro DefaultImporter: userData: assetBundleName: assetBundleVariant: Core/NetworkPackage/DTCFile/ServerPack/HAE_Truck.meta
New file @@ -0,0 +1,9 @@ fileFormatVersion: 2 guid: 1d70ccd06161e0443b7a802ad94292f8 folderAsset: yes timeCreated: 1547643019 licenseType: Pro DefaultImporter: userData: assetBundleName: assetBundleVariant: Core/NetworkPackage/DTCFile/ServerPack/HAF_Merge.meta
New file @@ -0,0 +1,9 @@ fileFormatVersion: 2 guid: 71e878ac60c49ad4f964dd2dbc725739 folderAsset: yes timeCreated: 1547643019 licenseType: Pro DefaultImporter: userData: assetBundleName: assetBundleVariant: Core/NetworkPackage/DTCFile/ServerPack/HB0_Event.meta
New file @@ -0,0 +1,9 @@ fileFormatVersion: 2 guid: eed34091b0568664b9fb42f0634496c1 folderAsset: yes timeCreated: 1547643019 licenseType: Pro DefaultImporter: userData: assetBundleName: assetBundleVariant: Core/NetworkPackage/ServerPack/HAD_SaleActivity.meta
New file @@ -0,0 +1,9 @@ fileFormatVersion: 2 guid: 32ceb8b7faf99f84a8b73ce53c5e3e4d folderAsset: yes timeCreated: 1547643019 licenseType: Pro DefaultImporter: userData: assetBundleName: assetBundleVariant: Core/NetworkPackage/ServerPack/HAE_Truck.meta
New file @@ -0,0 +1,9 @@ fileFormatVersion: 2 guid: 77f69c2b862d1704299a32d0d8eeb71e folderAsset: yes timeCreated: 1547643019 licenseType: Pro DefaultImporter: userData: assetBundleName: assetBundleVariant: Core/NetworkPackage/ServerPack/HAF_Merge.meta
New file @@ -0,0 +1,9 @@ fileFormatVersion: 2 guid: fa14960fa44b0d1439bab471a764e34f folderAsset: yes timeCreated: 1547643019 licenseType: Pro DefaultImporter: userData: assetBundleName: assetBundleVariant: Core/NetworkPackage/ServerPack/HB0_Event.meta
New file @@ -0,0 +1,9 @@ fileFormatVersion: 2 guid: d914565b65f8e8145988734c4d915834 folderAsset: yes timeCreated: 1547643019 licenseType: Pro DefaultImporter: userData: assetBundleName: assetBundleVariant: Fight/Actor/AI/HeroAI_Base.cs
@@ -227,7 +227,7 @@ if (_singleModel != null) { // 如果有守护 var _itemModel = _singleModel.GetItemModelByIndex((int)RoleEquipType.SpiritAnimal); var _itemModel = _singleModel.GetItemByIndex((int)RoleEquipType.SpiritAnimal); if (_itemModel != null // 有守护 && GeneralDefine.GuardianPickUpID.Contains(_itemModel.itemId))// 守护有拾取功能 { @@ -242,7 +242,7 @@ if (_singleModel != null) { // 如果有守护 var _itemModel = _singleModel.GetItemModelByIndex((int)RoleEquipType.SpiritAnimal); var _itemModel = _singleModel.GetItemByIndex((int)RoleEquipType.SpiritAnimal); if (_itemModel != null // 有守护 && GeneralDefine.GuardianPickUpID.Contains(_itemModel.itemId))// 守护有拾取功能 { Fight/GameActor/GA_Hero.cs
@@ -198,7 +198,7 @@ ItemModel _itemModel = null; // 先取得衣服的阶数 _itemModel = _equipModel.GetItemModelByIndex((int)RoleEquipType.Clothes); _itemModel = _equipModel.GetItemByIndex((int)RoleEquipType.Clothes); if (_itemModel == null) { return; @@ -208,7 +208,7 @@ for (int i = _start; i <= _end; ++i) { _itemModel = _equipModel.GetItemModelByIndex(i); _itemModel = _equipModel.GetItemByIndex(i); if (_itemModel == null) { @@ -621,7 +621,7 @@ SinglePackModel _horsePackModel = _packModel.GetSinglePackModel(PackType.Equip); if (_horsePackModel != null) { ItemModel _horseItem = _horsePackModel.GetItemModelByIndex((int)RoleEquipType.mount); ItemModel _horseItem = _horsePackModel.GetItemByIndex((int)RoleEquipType.mount); SwitchHorse((uint)_horseItem.itemId); } } Fight/Stage/StageLoad.cs
@@ -320,8 +320,8 @@ var packModel = ModelCenter.Instance.GetModel<PlayerPackModel>(); var equipModel = packModel.GetSinglePackModel(PackType.Equip); var itemModel = equipModel.GetItemModelByIndex((int)RoleEquipType.Clothes); var fashion = equipModel.GetItemModelByIndex((int)RoleEquipType.FashionClothes); var itemModel = equipModel.GetItemByIndex((int)RoleEquipType.Clothes); var fashion = equipModel.GetItemByIndex((int)RoleEquipType.FashionClothes); m_InitHeroStep = 4; if (fashion != null) { @@ -338,8 +338,8 @@ m_InitHeroStep = 5; itemModel = equipModel.GetItemModelByIndex((int)RoleEquipType.Weapon); fashion = equipModel.GetItemModelByIndex((int)RoleEquipType.FashionWeapon); itemModel = equipModel.GetItemByIndex((int)RoleEquipType.Weapon); fashion = equipModel.GetItemByIndex((int)RoleEquipType.FashionWeapon); if (fashion != null) { @@ -355,8 +355,8 @@ } m_InitHeroStep = 6; itemModel = equipModel.GetItemModelByIndex((int)RoleEquipType.Weapon2); fashion = equipModel.GetItemModelByIndex((int)RoleEquipType.FashionWeapon2); itemModel = equipModel.GetItemByIndex((int)RoleEquipType.Weapon2); fashion = equipModel.GetItemByIndex((int)RoleEquipType.FashionWeapon2); if (fashion != null) { @@ -373,7 +373,7 @@ m_InitHeroStep = 7; itemModel = equipModel.GetItemModelByIndex((int)RoleEquipType.Wing); itemModel = equipModel.GetItemByIndex((int)RoleEquipType.Wing); if (itemModel != null) { hero.SwitchWing((uint)itemModel.itemId); @@ -383,7 +383,7 @@ var mapConfig = MapConfig.Get(PlayerDatas.Instance.baseData.MapID); if (mapConfig.CanRide == 1) { itemModel = equipModel.GetItemModelByIndex((int)RoleEquipType.mount); itemModel = equipModel.GetItemByIndex((int)RoleEquipType.mount); if (itemModel != null) { var mountModel = ModelCenter.Instance.GetModel<PlayerMountDatas>(); @@ -396,7 +396,7 @@ m_InitHeroStep = 9; itemModel = equipModel.GetItemModelByIndex((int)RoleEquipType.SpiritAnimal); itemModel = equipModel.GetItemByIndex((int)RoleEquipType.SpiritAnimal); if (itemModel != null) { hero.SwitchGuard((uint)itemModel.itemId); Lua/Gen/SnxxzUIItemTipsModelWrap.cs
File was deleted Lua/Gen/SnxxzUIItemTipsModelWrap.cs.meta
File was deleted System/Achievement/AchievementModel.cs
@@ -518,7 +518,7 @@ private string GetHighestSorceEquipByPlace(List<int> _places) { var itemPackage = playerPack.GetSinglePackModel(PackType.Item); var allItems = itemPackage.GetPackModelIndexDict(); var allItems = itemPackage.GetAllItems(); var guid = string.Empty; var equips = new List<string>(); @@ -542,7 +542,7 @@ private string GetBetterEquipByPlace(List<int> _places) { var itemPackage = playerPack.GetSinglePackModel(PackType.Item); var allItems = itemPackage.GetPackModelIndexDict(); var allItems = itemPackage.GetAllItems(); var guid = string.Empty; var equips = new List<string>(); @@ -555,7 +555,7 @@ if (!overdue && _places.Contains(item.config.EquipPlace) && (item.config.JobLimit == 0 || (item.config.JobLimit / 100) == job)) { var equipedItem = equipPackage.GetItemModelByIndex(item.config.EquipPlace); var equipedItem = equipPackage.GetItemByIndex(item.config.EquipPlace); var equipdItemScore = equipedItem == null ? 0 : equipedItem.equipScore; if (item.equipScore > equipdItemScore && item.equipScore > score) { @@ -570,7 +570,7 @@ public string GetBetterEquipByPlace() { var itemPackage = playerPack.GetSinglePackModel(PackType.Item); var allItems = itemPackage.GetPackModelIndexDict(); var allItems = itemPackage.GetAllItems(); var guid = string.Empty; var equips = new List<string>(); @@ -585,7 +585,7 @@ continue; } var equipedItem = equipPackage.GetItemModelByIndex(item.config.EquipPlace); var equipedItem = equipPackage.GetItemByIndex(item.config.EquipPlace); var equipdItemScore = equipedItem == null ? 0 : equipedItem.equipScore; var overdue = packModelInterface.IsOverdue(item.guid, item.itemId, item.useDataDict);
@@ -72,7 +72,7 @@ if(isCoolEnd) { DebugEx.Log("UpdateCoolTime:" + _equip.itemId); ItemLogicUtility.Instance.PutOnItem(ItemOperateType.putOn,guid); ItemOperateUtility.Instance.PutOnItem(ItemOperateType.putOn,guid); ReportConfirmBetterEquip(guid); } } System/BetterItemGet/PreciousItemGetModel.cs
@@ -99,7 +99,7 @@ { var itemModel = itemModels[0]; var error = 0; var isHaveMakeNum = ItemLogicUtility.Instance.CanUseItem(itemModel.itemPlace ,1,out error); var isHaveMakeNum = ItemOperateUtility.Instance.CanUseItem(itemModel.itemPlace ,1,out error); if(isHaveMakeNum) { OnGetPreciousItem(PackType.Item, itemModel.guid); System/BlastFurnace/BlastFurnaceModel.cs
@@ -1053,7 +1053,7 @@ List<ItemModel> itemModels = new List<ItemModel>(); List<AttrFruitConfig> fruitlist = playerPack.makeDruglist; Dictionary<int, ItemModel> itemDict = singlePack.GetPackModelIndexDict(); Dictionary<int, ItemModel> itemDict = singlePack.GetAllItems(); foreach (var index in itemDict.Keys) { if (playerPack.CheckIsDrugById(itemDict[index].itemId)) System/Chat/ChatExtentWin.cs
@@ -307,7 +307,7 @@ SinglePackModel packTypeModel = _packModel.GetSinglePackModel(PackType.Equip); if (packTypeModel != null) { Dictionary<int, ItemModel> equipBodyDict = packTypeModel.GetPackModelIndexDict(); Dictionary<int, ItemModel> equipBodyDict = packTypeModel.GetAllItems(); if (equipBodyDict != null && equipBodyDict.Count > 0) { foreach (var _equip in equipBodyDict.Values) @@ -322,7 +322,7 @@ packTypeModel = _packModel.GetSinglePackModel(PackType.Item); if (packTypeModel != null) { Dictionary<int, ItemModel> dic = packTypeModel.GetPackModelIndexDict(); Dictionary<int, ItemModel> dic = packTypeModel.GetAllItems(); if (dic != null && dic.Count > 0) { m_DisplayItems.AddRange(dic.Values.ToList()); System/Compose/New/SelectEquipModel.cs
@@ -53,7 +53,7 @@ if (singlePack == null) return null; int[] unfixedIds = composeWinModel.CurComposeModel.unfixedItemID; allBagItemInfo = singlePack.GetPackModelIndexDict(); allBagItemInfo = singlePack.GetAllItems(); _unfixedItemDict.Clear(); foreach (int key in allBagItemInfo.Keys) { @@ -93,7 +93,7 @@ SinglePackModel singlePack = playerPack.GetSinglePackModel(packType); if (singlePack == null) return null; allBagItemInfo = singlePack.GetPackModelIndexDict(); allBagItemInfo = singlePack.GetAllItems(); List<ItemModel> modellist = allBagItemInfo.Values.ToList(); modellist.Sort(CompareByCondition); _addonsItemDict.Clear(); System/Dogz/DogzModel.cs
@@ -402,7 +402,7 @@ SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.DogzEquip); if (singlePack == null) return; Dictionary<int, ItemModel> pairs = singlePack.GetPackModelIndexDict(); Dictionary<int, ItemModel> pairs = singlePack.GetAllItems(); foreach(var index in pairs.Keys) { ItemModel itemModel = pairs[index]; @@ -706,7 +706,7 @@ SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.DogzItem); if (singlePack == null) return dogzItemList; Dictionary<int, ItemModel> pairs = singlePack.GetPackModelIndexDict(); Dictionary<int, ItemModel> pairs = singlePack.GetAllItems(); foreach(var value in pairs.Values) { if(IsReachSelectCondi(value.itemId)) @@ -724,7 +724,7 @@ if (singlePack == null) return 0; int num = 0; Dictionary<int, ItemModel> pairs = singlePack.GetPackModelIndexDict(); Dictionary<int, ItemModel> pairs = singlePack.GetAllItems(); foreach (var value in pairs.Values) { if(value.config.EquipPlace == 0) @@ -777,7 +777,7 @@ var _itemColor = GetDogzEquipLimitByIndex(dogzId, index); var _equipPlace = GetDogzEquipPlaceByIndex(index); Dictionary<int, ItemModel> pairs = singlePack.GetPackModelIndexDict(); Dictionary<int, ItemModel> pairs = singlePack.GetAllItems(); foreach (var value in pairs.Values) { if(value.config.EquipPlace == _equipPlace System/Dogz/DogzPackModel.cs
@@ -49,7 +49,7 @@ { dogzPackItems.Clear(); var _pack = m_PlayerPackModel.GetSinglePackModel(PackType.AnyWhere); var _itemValues = _pack.GetPackModelIndexDict().Values; var _itemValues = _pack.GetAllItems().Values; foreach (var _item in _itemValues) { dogzPackItems.Add(_item); System/Dungeon/DungeonLiquidCell.cs
@@ -193,14 +193,14 @@ if (isOk) { WindowCenter.Instance.Close<DungeonUseLiquidWin>(); ItemLogicUtility.Instance.UseItem(itemModel.itemPlace); ItemOperateUtility.Instance.UseItem(itemModel.itemPlace); } })); } else { WindowCenter.Instance.Close<DungeonUseLiquidWin>(); ItemLogicUtility.Instance.UseItem(itemModel.itemPlace); ItemOperateUtility.Instance.UseItem(itemModel.itemPlace); } }
@@ -311,7 +311,7 @@ var singlepack = packModel.GetSinglePackModel(PackType.Item); if (singlepack != null) { var dict = singlepack.GetPackModelIndexDict(); var dict = singlepack.GetAllItems(); if (dict != null) { var badCompare = 1; @@ -344,7 +344,7 @@ { return 1; } var equipItem = singlepack.GetItemModelByIndex(equipPlace); var equipItem = singlepack.GetItemByIndex(equipPlace); if (equipItem == null) { return 1; System/Dungeon/TrialExchangeWin.cs
@@ -66,16 +66,16 @@ if (WindowJumpMgr.Instance.IsJumpState) { if (ItemLogicUtility.Instance.useItemModel != null && model.trialTokens.Contains(ItemLogicUtility.Instance.useItemModel.itemId)) if (ItemOperateUtility.Instance.useItemModel != null && model.trialTokens.Contains(ItemOperateUtility.Instance.useItemModel.itemId)) { var itemId = ItemLogicUtility.Instance.useItemModel.itemId; var itemId = ItemOperateUtility.Instance.useItemModel.itemId; var config = ItemConfig.Get(itemId); if (config != null) { model.selectEquipClass = config.LV; } ItemLogicUtility.Instance.useItemModel = null; ItemOperateUtility.Instance.useItemModel = null; } }
@@ -77,7 +77,7 @@ void Backpacking()//物品读取 { Dictionary<int, ItemModel> backpack_dic = playerPack.GetSinglePackModel(PackType.Item).GetPackModelIndexDict(); Dictionary<int, ItemModel> backpack_dic = playerPack.GetSinglePackModel(PackType.Item).GetAllItems(); Dictionary<int, ProductOrderJudgment> _ProductOrderJudgment = new Dictionary<int, ProductOrderJudgment>(); phagocytosisID.Clear(); _ProductOrderJudgment = AttributeJudgment();///属性判断 System/FairyAu/FamilyChangeNameWin.cs
@@ -93,11 +93,11 @@ { if (_isOk) { if(ItemLogicUtility.Instance.useItemModel != null) if(ItemOperateUtility.Instance.useItemModel != null) { if(ItemLogicUtility.Instance.useItemModel.itemId == model.changeFairyNameItem) if(ItemOperateUtility.Instance.useItemModel.itemId == model.changeFairyNameItem) { model.SendChangeFairyName(m_FairyNameInput.text, ItemLogicUtility.Instance.useItemModel.itemPlace); model.SendChangeFairyName(m_FairyNameInput.text, ItemOperateUtility.Instance.useItemModel.itemPlace); } } } System/FairyAu/PlayerFairyAuTreasureData.cs
@@ -200,7 +200,7 @@ SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.Equip); for (int i = 0; i < EquipmentList.Count; i++) { ItemModel ItemModel = singlePack.GetItemModelByIndex(i); ItemModel ItemModel = singlePack.GetItemByIndex(i); int Type = i; if (ItemModel != null) { System/FairyAu/WarehouseTipsWin.cs
@@ -1112,7 +1112,7 @@ private bool IsDonateEquipment()//判断是否有可捐献装备 { Dictionary<int, ItemModel> backpack_dic = playerPack.GetSinglePackModel(PackType.Item).GetPackModelIndexDict(); Dictionary<int, ItemModel> backpack_dic = playerPack.GetSinglePackModel(PackType.Item).GetAllItems(); Dictionary<int, ProductOrderJudgment> _ProductOrderJudgment = AttributeJudgment(); foreach (int item_id in backpack_dic.Keys) { System/Guard/GuardModel.cs
@@ -55,7 +55,7 @@ { yield break; } var _itemModel = _equipModel.GetItemModelByIndex((int)RoleEquipType.SpiritAnimal); var _itemModel = _equipModel.GetItemByIndex((int)RoleEquipType.SpiritAnimal); if (_itemModel != null && _itemModel.itemInfo != null) { _hero.SwitchGuard((uint)_itemModel.itemId); System/HappyXB/HappyXBModel.cs
@@ -575,7 +575,7 @@ { case PackType.Treasure: SinglePackModel singlePack = playerPack.GetSinglePackModel(type); if(100 - singlePack.GetPackModelIndexDict().Count < needGrid) if(100 - singlePack.GetAllItems().Count < needGrid) { SysNotifyMgr.Instance.ShowTip("XBWarehouseFull"); return false; @@ -889,7 +889,7 @@ SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.Treasure); if (singlePack == null) return; if (singlePack.GetPackModelIndexDict().Count > 0) if (singlePack.GetAllItems().Count > 0) { xbWarehouseRed.state = RedPointState.Simple; } System/HappyXB/XBWarehouseWin.cs
@@ -188,7 +188,7 @@ { SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.Treasure); if (singlePack == null) return; Dictionary<int, ItemModel> pairs = singlePack.GetPackModelIndexDict(); Dictionary<int, ItemModel> pairs = singlePack.GetAllItems(); bool isHaveItem = false; bool isHaveRune = false; foreach(var value in pairs.Values) System/JadeDynastyBoss/JadeDynastyBossModel.cs
@@ -31,7 +31,7 @@ SinglePackModel singlePackModel = packModel.GetSinglePackModel(PackType.JadeDynastyEquip); if (singlePackModel != null) { Dictionary<int, ItemModel> equipBodyDict = singlePackModel.GetPackModelIndexDict(); Dictionary<int, ItemModel> equipBodyDict = singlePackModel.GetAllItems(); if (equipBodyDict != null && equipBodyDict.Count > 0) { foreach (var _equip in equipBodyDict.Values) System/JadeDynastyKnapSack/JadeDynastyDecomposeModel.cs
@@ -112,7 +112,7 @@ var singlePack = playerPack.GetSinglePackModel(PackType.JadeDynastyItem); if (singlePack == null) return; var itemDict = singlePack.GetPackModelIndexDict(); var itemDict = singlePack.GetAllItems(); foreach(var index in itemDict.Keys) { var model = itemDict[index]; System/JadeDynastyKnapSack/JadeDynastyEquipWin.cs
@@ -137,7 +137,7 @@ var singlePack = playerPack.GetSinglePackModel(PackType.JadeDynastyEquip); if (singlePack != null) { var dict = singlePack.GetPackModelIndexDict(); var dict = singlePack.GetAllItems(); foreach(var model in dict.Values) { fightPower += model.equipScore; System/KnapSack/BetterItemGetBehaviour.cs
@@ -137,7 +137,7 @@ } else { ItemLogicUtility.Instance.PutOnItem(ItemOperateType.putOn, model.currentEquipGuid); ItemOperateUtility.Instance.PutOnItem(ItemOperateType.putOn, model.currentEquipGuid); model.ReportConfirmBetterEquip(model.currentEquipGuid); } } System/KnapSack/ItemUseBehaviour.cs
@@ -63,7 +63,7 @@ model.ReportConfirmUseItem(model.currentShowItem); if (itemModel != null && itemModel.packType == PackType.Item) { ItemLogicUtility.Instance.GotoUseItem(itemModel.itemPlace); ItemOperateUtility.Instance.GotoUseItem(itemModel.itemPlace); } } } System/KnapSack/Logic/BoxGetItemModel.cs
@@ -177,7 +177,7 @@ ItemModel itemModel = playerPack.GetItemModelByGUID(guid); if (itemModel != null) { ItemLogicUtility.Instance.UseItem(itemModel.itemPlace,useCnt); ItemOperateUtility.Instance.UseItem(itemModel.itemPlace,useCnt); } }
@@ -250,7 +250,7 @@ if (itemModel == null) return; int useCnt = BoxModel.GetUseCntByID(itemModel.itemId); ItemLogicUtility.Instance.UseItem(itemModel.itemPlace, 1); ItemOperateUtility.Instance.UseItem(itemModel.itemPlace, 1); } private void ClickBackBtn() System/KnapSack/Logic/ItemOperateUtility.cs
File was renamed from System/KnapSack/Logic/ItemLogicUtility.cs @@ -7,7 +7,7 @@ namespace Snxxz.UI { [XLua.LuaCallCSharp] public class ItemLogicUtility : Singleton<ItemLogicUtility> public class ItemOperateUtility : Singleton<ItemOperateUtility> { PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } } ItemTipsModel itemTipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } } @@ -739,7 +739,7 @@ return; } useItemModel = singlePack.GetItemModelByIndex(itemIndex); useItemModel = singlePack.GetItemByIndex(itemIndex); if (useItemModel == null) { return; System/KnapSack/Logic/ItemOperateUtility.cs.meta
System/KnapSack/Logic/ItemTipsModel.cs
@@ -15,8 +15,8 @@ FuncConfigConfig exhaustedFunc; public Dictionary<int, List<int>> equipLegendAttrTypeDict { get; private set; } public Dictionary<int, Dictionary<int, string>> wingsLegendAttrColorDict { get; private set; } Dictionary<int, List<int>> equipLegendAttrTypeDict { get; set; } Dictionary<int, Dictionary<int, string>> wingsLegendAttrColorDict { get; set; } public Dictionary<string, Dictionary<LegendAttrType, int>> legendAttrCntPreviewDict { get; private set; } // key 品质+星级 value 属性条目数 public Dictionary<int, Dictionary<LegendAttrType, List<int>>> legendAttrIDPreviewDict { get; private set; } // key 装备位 value 属性类型，属性ID public Dictionary<int, Dictionary<int, int>> legendAttrColorValuePreviewDict { get; private set; } // key 属性ID value 装备品质，属性数值 @@ -25,20 +25,19 @@ public Dictionary<int, Dictionary<int, List<int>>> wingsLegendAttrValuePreviewDict { get; private set; } //key 阶数 value 属性ID 属性数值 public Dictionary<int, Dictionary<LegendAttrType, List<int>>> dogzLegendAttrIDPreviewDict { get; private set; } // key 装备位 value 属性类型，属性ID public Dictionary<int, Dictionary<int, int>> dogzLegendAttrColorValuePreviewDict { get; private set; } // key 属性ID value 装备品质，属性数值 public Dictionary<string, Dictionary<LegendAttrType, int>> dogzLegendAttrCntPreviewDict { get; private set; } // key 品质+星级 value 属性条目数 public Dictionary<int, List<int>> dogzLegendAttrTypeDict { get; private set; } Dictionary<string, Dictionary<LegendAttrType, int>> dogzLegendAttrCntPreviewDict { get; set; } // key 品质+星级 value 属性条目数 Dictionary<int, List<int>> dogzLegendAttrTypeDict { get; set; } 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>>>(); // 编号 解锁阶级 技能 public Dictionary<int, string> petAndMountQualityDict = new Dictionary<int, string>(); public Dictionary<int, List<int>> itemParamsDict { get; private set; } public string expValueFormula = ""; public Dictionary<int, string> exhaustedAttrFormula { get; private set; } public Dictionary<int, int> exhaustedMaxLvDict { get; private set; } public int[] guardAutoDrops; Dictionary<int, string> petAndMountQualityDict = new Dictionary<int, string>(); string expValueFormula = ""; Dictionary<int, string> exhaustedAttrFormula { get; set; } Dictionary<int, int> exhaustedMaxLvDict { get; set; } int[] guardAutoDrops; public int[] gemOpenLvs { get; private set; } public int[] jadeDynastyGemOpenLvs { get; private set; } @@ -59,20 +58,9 @@ public int[] randomRuneIds { get; private set; } public int[] PeerlessEquipIds { get; private set; } //绝世装备列表 PlayerPackModel _playerPack; PlayerPackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); } } StoreModel _storeModel; StoreModel m_storeModel { get { return _storeModel ?? (_storeModel = ModelCenter.Instance.GetModel<StoreModel>()); } } PackModelInterface _modelInterface; PackModelInterface modelInterface { get { return _modelInterface ?? (_modelInterface = ModelCenter.Instance.GetModel<PackModelInterface>()); } } PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } } StoreModel m_storeModel { get { return ModelCenter.Instance.GetModel<StoreModel>(); } } PackModelInterface modelInterface { get { return ModelCenter.Instance.GetModel<PackModelInterface>(); } } FashionDressModel fashionDress { get { return ModelCenter.Instance.GetModel<FashionDressModel>(); } } DogzModel dogzModel { get { return ModelCenter.Instance.GetModel<DogzModel>(); } } @@ -460,6 +448,7 @@ { } #region 解析本地数据 public Dictionary<string, List<int>> atkSpeedColorDict { get; private set; } private void ParseFuncConfig() @@ -918,7 +907,7 @@ case ItemWinType.guardWin: WindowCenter.Instance.Open<GuardianWin>(); break; case ItemWinType.BuyItemWin: case ItemWinType.buyItemWin: WindowCenter.Instance.Open<BuyItemInfoWin>(); break; case ItemWinType.buyBoxWin: @@ -930,10 +919,10 @@ case ItemWinType.buyPetMatWin: WindowCenter.Instance.Open<BuyPetMatInfoWin>(); break; case ItemWinType.GatherSoul: case ItemWinType.gatherSoul: WindowCenter.Instance.Open<GatherSoulTipWin>(); break; case ItemWinType.KingTreasure: case ItemWinType.kingTreasure: var kingTreasureShow = ModelCenter.Instance.GetModel<KingTreasureShowModel>(); kingTreasureShow.SetInitData(curAttrData.itemId); break; @@ -1049,7 +1038,7 @@ { if (attrData.itemConfig.CanSell == 1) { attrData.SetTipsFuncBtn(ItemOperateType.sell, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.SellItem( attrData); }); attrData.SetTipsFuncBtn(ItemOperateType.sell, (ItemWinBtnType, ItemAttrData) => { ItemOperateUtility.Instance.SellItem(attrData); }); } } break; @@ -1059,7 +1048,7 @@ { if (attrData.itemConfig.CanSell == 1) { attrData.SetTipsFuncBtn(ItemOperateType.sell, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.SellItem(attrData); }); attrData.SetTipsFuncBtn(ItemOperateType.sell, (ItemWinBtnType, ItemAttrData) => { ItemOperateUtility.Instance.SellItem(attrData); }); } } break; @@ -1069,7 +1058,7 @@ { if (attrData.itemConfig.CanSell == 1) { attrData.SetTipsFuncBtn(ItemOperateType.sell, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.SellItem(attrData); }); attrData.SetTipsFuncBtn(ItemOperateType.sell, (ItemWinBtnType, ItemAttrData) => { ItemOperateUtility.Instance.SellItem(attrData); }); } } break; @@ -1079,14 +1068,14 @@ { if (attrData.itemConfig.CanSell == 1) { attrData.SetTipsFuncBtn(ItemOperateType.sell, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.SellItem(attrData); }); attrData.SetTipsFuncBtn(ItemOperateType.sell, (ItemWinBtnType, ItemAttrData) => { ItemOperateUtility.Instance.SellItem(attrData); }); } } break; default: if (attrData.itemConfig.CanSell == 1) { attrData.SetTipsFuncBtn(ItemOperateType.sell, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.SellItem(attrData); }); attrData.SetTipsFuncBtn(ItemOperateType.sell, (ItemWinBtnType, ItemAttrData) => { ItemOperateUtility.Instance.SellItem(attrData); }); } break; } @@ -1094,7 +1083,7 @@ List<int> dismantleReturnlist = attrData.GetUseDataModel((int)ItemUseDataKey.itemDecompound); if (dismantleReturnlist != null && dismantleReturnlist.Count > 0) { attrData.SetTipsFuncBtn(ItemOperateType.dismantle, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.DismantleItem( attrData); }); attrData.SetTipsFuncBtn(ItemOperateType.dismantle, (ItemWinBtnType, ItemAttrData) => { ItemOperateUtility.Instance.DismantleItem(attrData); }); } if (!isOverdue) @@ -1107,19 +1096,19 @@ bool isUnlock = ModelCenter.Instance.GetModel<ComposeWinModel>().CheckComposeItemById(attrData.itemId, out jumpId); if (isUnlock) { ItemLogicUtility.Instance.GotoComposeItem(jumpId); ItemOperateUtility.Instance.GotoComposeItem(jumpId); } }); } if (attrData.itemConfig.Type == 25 && attrData.itemConfig.Effect1 == 225) { attrData.SetTipsFuncBtn(ItemOperateType.inlay, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.GotoInlayItem(attrData.guid); }); attrData.SetTipsFuncBtn(ItemOperateType.inlay, (ItemWinBtnType, ItemAttrData) => { ItemOperateUtility.Instance.GotoInlayItem(attrData.guid); }); } if (attrData.itemConfig.CanTrade == 1 && attrData.isBind == 0) { attrData.SetTipsFuncBtn(ItemOperateType.putAway, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.PutAwayItem(attrData.guid); }); attrData.SetTipsFuncBtn(ItemOperateType.putAway, (ItemWinBtnType, ItemAttrData) => { ItemOperateUtility.Instance.PutAwayItem(attrData.guid); }); } if ((ItemType)attrData.itemConfig.Type == ItemType.WingsMat) @@ -1135,7 +1124,7 @@ if (attrData.count > 1) { attrData.SetTipsFuncBtn(ItemOperateType.split, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.OnClickSplitBtn(attrData.guid); }); attrData.SetTipsFuncBtn(ItemOperateType.split, (ItemWinBtnType, ItemAttrData) => { ItemOperateUtility.Instance.OnClickSplitBtn(attrData.guid); }); } if (!isOverdue) @@ -1145,13 +1134,13 @@ case ItemWinType.equipWin: case ItemWinType.wingsWin: case ItemWinType.guardWin: attrData.SetTipsFuncBtn(ItemOperateType.putOn, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.PutOnItem(ItemOperateType.putOn, attrData.guid); }); attrData.SetTipsFuncBtn(ItemOperateType.putOn, (ItemWinBtnType, ItemAttrData) => { ItemOperateUtility.Instance.PutOnItem(ItemOperateType.putOn, attrData.guid); }); break; } if (attrData.itemConfig.UseTag == 1) { attrData.SetTipsFuncBtn(ItemOperateType.makeUse, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.GotoUseItem(attrData.index); }); attrData.SetTipsFuncBtn(ItemOperateType.makeUse, (ItemWinBtnType, ItemAttrData) => { ItemOperateUtility.Instance.GotoUseItem(attrData.index); }); } } @@ -1161,7 +1150,7 @@ { if (isOverdue) { attrData.SetTipsFuncBtn(ItemOperateType.renewal, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.RenewalItem(attrData.guid); }); attrData.SetTipsFuncBtn(ItemOperateType.renewal, (ItemWinBtnType, ItemAttrData) => { ItemOperateUtility.Instance.RenewalItem(attrData.guid); }); } } } @@ -1186,7 +1175,7 @@ { if (attrData == null) return; attrData.SetTipsFuncBtn(ItemOperateType.putOut, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.TakeOutFromWarehouse(ItemOperateType.putOut, attrData.guid); }); attrData.SetTipsFuncBtn(ItemOperateType.putOut, (ItemWinBtnType, ItemAttrData) => { ItemOperateUtility.Instance.TakeOutFromWarehouse(ItemOperateType.putOut, attrData.guid); }); } @@ -1196,7 +1185,7 @@ if (attrData.itemConfig.CanSell == 1) { attrData.SetTipsFuncBtn(ItemOperateType.sell, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.SellItem(attrData); }); attrData.SetTipsFuncBtn(ItemOperateType.sell, (ItemWinBtnType, ItemAttrData) => { ItemOperateUtility.Instance.SellItem(attrData); }); } switch (attrData.winType) @@ -1244,7 +1233,7 @@ if (attrData == null) return; attrData.SetTipsFuncBtn(ItemOperateType.putIn, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.PutInWareHouse(attrData.guid); } (ItemWinBtnType, ItemAttrData) => { ItemOperateUtility.Instance.PutInWareHouse(attrData.guid); } ); } @@ -1277,7 +1266,7 @@ attrData.SetTipsFuncBtn(ItemOperateType.putOff, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.PutOffEquip(attrData.guid); ItemOperateUtility.Instance.PutOffEquip(attrData.guid); }); for (int i = 0; i < tryPutOnEquipIds.Length; i++) @@ -1299,7 +1288,7 @@ bool isOverdue = modelInterface.IsOverdue(attrData.guid, attrData.itemId, attrData.useDataDict); if (attrData.itemConfig.CanSell == 1) { attrData.SetTipsFuncBtn(ItemOperateType.sell, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.SellItem(attrData); }); attrData.SetTipsFuncBtn(ItemOperateType.sell, (ItemWinBtnType, ItemAttrData) => { ItemOperateUtility.Instance.SellItem(attrData); }); } if (!isOverdue) @@ -1312,14 +1301,14 @@ bool isUnlock = ModelCenter.Instance.GetModel<ComposeWinModel>().CheckComposeItemById(attrData.itemId, out jumpId); if (isUnlock) { ItemLogicUtility.Instance.GotoComposeItem(jumpId); ItemOperateUtility.Instance.GotoComposeItem(jumpId); } }); } if (attrData.itemConfig.Effect1 == 225) { attrData.SetTipsFuncBtn(ItemOperateType.inlay, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.GotoInlayItem(attrData.guid); }); attrData.SetTipsFuncBtn(ItemOperateType.inlay, (ItemWinBtnType, ItemAttrData) => { ItemOperateUtility.Instance.GotoInlayItem(attrData.guid); }); } if (!isOverdue) @@ -1327,7 +1316,7 @@ switch (attrData.winType) { case ItemWinType.equipWin: attrData.SetTipsFuncBtn(ItemOperateType.putOn, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.PutOnItem(ItemOperateType.putOn, attrData.guid); }); attrData.SetTipsFuncBtn(ItemOperateType.putOn, (ItemWinBtnType, ItemAttrData) => { ItemOperateUtility.Instance.PutOnItem(ItemOperateType.putOn, attrData.guid); }); break; } } @@ -1345,7 +1334,7 @@ var equipType = (RoleEquipType)attrData.itemConfig.EquipPlace; attrData.SetTipsFuncBtn(ItemOperateType.putOff, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.PutOffEquip(attrData.guid); ItemOperateUtility.Instance.PutOffEquip(attrData.guid); }); } #endregion @@ -1497,7 +1486,7 @@ if (attrData.GetUseDataModel(42) != null) { curHp = itemEffectDict[key] + (int)attrData.strengthengmodel.BackpackWings(attrData.itemId, attrData.GetUseDataModel(42)[0])[1]; curHp = itemEffectDict[key] + (int)strengthengmodel.BackpackWings(attrData.itemId, attrData.GetUseDataModel(42)[0])[1]; } else { @@ -1515,7 +1504,7 @@ if (attrData.GetUseDataModel(42) != null) { curHurt = itemEffectDict[key] + (int)attrData.strengthengmodel.BackpackWings(attrData.itemId, attrData.GetUseDataModel(42)[0])[0]; curHurt = itemEffectDict[key] + (int)strengthengmodel.BackpackWings(attrData.itemId, attrData.GetUseDataModel(42)[0])[0]; } else { @@ -2429,11 +2418,7 @@ #region 物品增加战斗力 PlayerMountDatas mountDatas { get { return ModelCenter.Instance.GetModel<PlayerMountDatas>(); } } public PlayerStrengthengDatas strengthengmodel { get { return ModelCenter.Instance.GetModel<PlayerStrengthengDatas>(); } } public PlayerStrengthengDatas strengthengmodel { get { return ModelCenter.Instance.GetModel<PlayerStrengthengDatas>(); } } public bool TryGetFightPowerByItemId(int itemId, out int fightPower) { @@ -2958,37 +2943,12 @@ public Dictionary<SuitType, int> suitTypeCntDict { get; private set; } public bool isHavePutLimit { get; private set; } PlayerStrengthengDatas m_StrengthengModel; public PlayerStrengthengDatas strengthengmodel { get { return m_StrengthengModel ?? (m_StrengthengModel = ModelCenter.Instance.GetModel<PlayerStrengthengDatas>()); } } PackModelInterface _modelInterface; PackModelInterface modelInterface { get { return _modelInterface ?? (_modelInterface = ModelCenter.Instance.GetModel<PackModelInterface>()); } } EquipWashModel _washModel; EquipWashModel washModel { get { return _washModel ?? (_washModel = ModelCenter.Instance.GetModel<EquipWashModel>()); } } ItemTipsModel _itemTipsModel; ItemTipsModel itemTipsModel { get { return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } } PlayerSuitModel _suitModel; PlayerSuitModel SuitModel { get { return _suitModel ?? (_suitModel = ModelCenter.Instance.GetModel<PlayerSuitModel>()); } } PlayerStrengthengDatas strengthengmodel { get { return ModelCenter.Instance.GetModel<PlayerStrengthengDatas>(); } } PackModelInterface modelInterface { get { return ModelCenter.Instance.GetModel<PackModelInterface>(); } } EquipWashModel washModel { get { return ModelCenter.Instance.GetModel<EquipWashModel>(); } } ItemTipsModel itemTipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } } PlayerSuitModel SuitModel { get { return ModelCenter.Instance.GetModel<PlayerSuitModel>(); } } RuneModel runeModel { get { return ModelCenter.Instance.GetModel<RuneModel>(); } } GodBeastModel beastModel { get { return ModelCenter.Instance.GetModel<GodBeastModel>(); } } @@ -3667,7 +3627,7 @@ winType = ItemWinType.itemWin; break; case ItemTipChildType.Buy: winType = ItemWinType.BuyItemWin; winType = ItemWinType.buyItemWin; break; } break; @@ -3703,10 +3663,10 @@ winType = ItemWinType.guardWin; break; case "GatherSoul": winType = ItemWinType.GatherSoul; winType = ItemWinType.gatherSoul; break; case "KingTreasureShow": winType = ItemWinType.KingTreasure; winType = ItemWinType.kingTreasure; break; default: DebugEx.Log("没有此物品的弹框类型" + this.itemConfig.Template.Trim()); System/KnapSack/Logic/MakeDrugCell.cs
@@ -201,9 +201,9 @@ singlePack.GetItemCountByID(itemId,out list); if(list.Count > 0) { if(ItemLogicUtility.Instance.CheckItemUselimit(itemId)) if(ItemOperateUtility.Instance.CheckItemUselimit(itemId)) { ItemLogicUtility.Instance.UseItem(list[0].itemPlace); ItemOperateUtility.Instance.UseItem(list[0].itemPlace); } } } System/KnapSack/Logic/PackModelInterface.cs
@@ -15,6 +15,7 @@ private FuncConfigConfig _itemPush; private FuncConfigConfig _drugIDFunc; private FuncConfigConfig _oneKeySellFunc; public int[] preciousItemType { get; private set; } private int[] drugIDs; public Dictionary<int, List<int>> betterEquipExceptDungeonDict { get; private set; } @@ -725,7 +726,7 @@ break; case 127: var error = 0; bool isHaveMakeNum = ItemLogicUtility.Instance.CanUseItem(itemModel.itemPlace ,1,out error); bool isHaveMakeNum = ItemOperateUtility.Instance.CanUseItem(itemModel.itemPlace ,1,out error); int remainNum = CrossServerOneVsOnePlayerInfo.Instance.GetDayRemainNum(); if (!CrossServerOneVsOnePKSeason.Instance.isSatisfyMatch || remainNum > 0 @@ -983,7 +984,7 @@ if (singlePack == null) return RealmBetterDict; int realmLv = PlayerDatas.Instance.baseData.realmLevel; Dictionary<int, ItemModel> pairs = singlePack.GetPackModelIndexDict(); Dictionary<int, ItemModel> pairs = singlePack.GetAllItems(); foreach (var model in pairs.Values) { if (model.config.EquipPlace > 0 @@ -1016,7 +1017,7 @@ if (singlePack == null) return RealmDruglist; int realmLv = PlayerDatas.Instance.baseData.realmLevel; Dictionary<int, ItemModel> pairs = singlePack.GetPackModelIndexDict(); Dictionary<int, ItemModel> pairs = singlePack.GetAllItems(); foreach (var model in pairs.Values) { if (playerPack.CheckIsDrugById(model.itemId)) @@ -1149,7 +1150,7 @@ _sameIndexEquipDict.Clear(); _sellItemScorelist.Clear(); playerLv = PlayerDatas.Instance.baseData.LV; _packModelDict = singlePack.GetPackModelIndexDict(); _packModelDict = singlePack.GetAllItems(); foreach (var key in _packModelDict.Keys) { GetCanSellEquipList(_packModelDict[key]); @@ -1184,7 +1185,7 @@ ItemModel model = null; if (equipPack != null) { model = equipPack.GetItemModelByIndex(key); model = equipPack.GetItemByIndex(key); } List<ItemModel> modellist = _sameIndexEquipDict[key][_sellItemScorelist[score]]; @@ -1411,7 +1412,7 @@ SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.Equip); if (singlePack != null) { Dictionary<int, ItemModel> putOnDic = singlePack.GetPackModelIndexDict(); Dictionary<int, ItemModel> putOnDic = singlePack.GetAllItems(); foreach (var key in putOnDic.Keys) { if ((RoleEquipType)key == ignoreType) @@ -1456,7 +1457,7 @@ SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.Item); if (singlePack != null) { dic = singlePack.GetPackModelIndexDict(); dic = singlePack.GetAllItems(); foreach (var model in dic.Values) { if (model.config.EquipPlace == equipPlace) @@ -1480,7 +1481,7 @@ public string GetHighestScoreEquipByPlace(int equipPlace) { var itemPackage = playerPack.GetSinglePackModel(PackType.Item); var allItems = itemPackage.GetPackModelIndexDict(); var allItems = itemPackage.GetAllItems(); ItemModel putModel = playerPack.GetItemModelByIndex(PackType.Equip, equipPlace); equipPlace = (equipPlace == 9 || equipPlace == 10) ? 9 : equipPlace; var guid = string.Empty; System/KnapSack/Logic/PlayerPackModels.cs
@@ -136,7 +136,7 @@ public void OnPlayerLoginOk() { ItemLogicUtility.Instance.RequestWarehouseData(); ItemOperateUtility.Instance.RequestWarehouseData(); SetPlayerAttrActiveRedPoint(); EquipDecomRedCtrl(); RoleEquipLocalSave = StringUtility.Contact("RoleEquipLocalSave", PlayerDatas.Instance.baseData.PlayerID); @@ -215,7 +215,7 @@ itemInfo.UserData = packInfo.ItemInfo[i].UserData; itemInfo.IsLocked = packInfo.ItemInfo[i].IsLocked; itemInfo.ItemGUID = packInfo.ItemInfo[i].ItemGUID; playerPackDict[type].SetPackModel(itemInfo); playerPackDict[type].UpdateItem(itemInfo); if (isPlayBetterEquipEffect) { @@ -254,7 +254,7 @@ itemInfo.UserData = item.UserData; itemInfo.IsLocked = item.IsLocked; itemInfo.ItemGUID = item.ItemGUID; playerPackDict[type].SetPackModel(itemInfo); playerPackDict[type].UpdateItem(itemInfo); DebugEx.Log("Add:" + item.ItemGUID); if (RefreshItemCountAct != null) @@ -302,7 +302,7 @@ playerPackDict.TryGetValue(type, out singlePack); if (singlePack != null) { ItemModel itemModel = singlePack.GetItemModelByIndex(refresh.ItemIndex); ItemModel itemModel = singlePack.GetItemByIndex(refresh.ItemIndex); if (itemModel != null) { bool isAddItemCount = false; @@ -372,7 +372,7 @@ string guid = ""; if (singlePack != null) { ItemModel itemModel = singlePack.GetItemModelByIndex(clearItem.ItemIndex); ItemModel itemModel = singlePack.GetItemByIndex(clearItem.ItemIndex); guid = itemModel.guid; int itemId = itemModel.itemId; DeleteItemDictByGUID(type, itemModel.guid); @@ -850,7 +850,7 @@ ItemModel itemModel = null; if (playerPackDict.ContainsKey(type)) { itemModel = playerPackDict[type].GetItemModelByIndex(index); itemModel = playerPackDict[type].GetItemByIndex(index); } return itemModel; } @@ -1166,7 +1166,7 @@ SinglePackModel singlePack = GetSinglePackModel(PackType.Equip); if (singlePack == null || starslist == null || starslist.Count < 1) return false; Dictionary<int, ItemModel> _itemDict = singlePack.GetPackModelIndexDict(); Dictionary<int, ItemModel> _itemDict = singlePack.GetAllItems(); int playerSumStars = 0; foreach (var model in _itemDict.Values) { @@ -1594,7 +1594,7 @@ devourModellist.Clear(); orderDevourModellist.Clear(); foreach (var model in singlePack.GetPackModelIndexDict().Values) foreach (var model in singlePack.GetAllItems().Values) { if (model.config.Type == 29) { @@ -1650,7 +1650,7 @@ return null; } foreach (var model in singlePack.GetPackModelIndexDict().Values) foreach (var model in singlePack.GetAllItems().Values) { if (model.config.Type == 29) { System/KnapSack/Logic/PlayerStarNumWin.cs
@@ -54,7 +54,7 @@ SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.Equip); if (singlePack != null) { _itemDict = singlePack.GetPackModelIndexDict(); _itemDict = singlePack.GetAllItems(); } RefreshUI(); } System/KnapSack/Logic/SinglePackModel.cs
@@ -8,28 +8,16 @@ { public class SinglePackModel { public PackType packType { get; private set; } public readonly PackType type; public int openGridCount { get; private set; } private Dictionary<int, ItemModel> packModelIndexDict = new Dictionary<int, ItemModel>(); //key 物品位置索引 private Dictionary<int, ItemModel> items = new Dictionary<int, ItemModel>(); //key 物品位置索引 PackModelInterface _modelInterface; PackModelInterface modelInterface { get { return _modelInterface ?? (_modelInterface = ModelCenter.Instance.GetModel<PackModelInterface>()); } } PlayerPackModel _playerPack; PlayerPackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); } } PackModelInterface modelInterface { get { return ModelCenter.Instance.GetModel<PackModelInterface>(); } } PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } } public SinglePackModel(PackType type) { ClearPackModel(); openGridCount = 0; packType = type; this.type = type; } /// <summary> @@ -37,19 +25,21 @@ /// </summary> /// <param name="itemInfo"></param> /// <param name="type"></param> public void SetPackModel(ItemInfo itemInfo) public void UpdateItem(ItemInfo itemInfo) { if (!packModelIndexDict.ContainsKey(itemInfo.ItemPlace)) var index = itemInfo.ItemPlace; if (!items.ContainsKey(index)) { ItemModel itemModel = new ItemModel(packType); var itemModel = new ItemModel(type); itemModel.SetItemInfo(itemInfo); packModelIndexDict.Add(itemInfo.ItemPlace, itemModel); items.Add(index, itemModel); } else { packModelIndexDict[itemInfo.ItemPlace].SetItemInfo(itemInfo); items[index].SetItemInfo(itemInfo); } playerPack.SetItemGUIDDict(packModelIndexDict[itemInfo.ItemPlace]); playerPack.SetItemGUIDDict(items[index]); } public void SetOpenGridCount(int count) @@ -57,10 +47,9 @@ openGridCount = count; } public ItemModel GetItemModelByIndex(int index) public ItemModel GetItemByIndex(int index) { switch (packType) switch (type) { case PackType.JadeDynastyEquip: if (index >= 121) @@ -69,14 +58,15 @@ } break; } ItemModel itemModel = null; packModelIndexDict.TryGetValue(index, out itemModel); return itemModel; ItemModel item = null; items.TryGetValue(index, out item); return item; } public Dictionary<int, ItemModel> GetPackModelIndexDict() public Dictionary<int, ItemModel> GetAllItems() { return packModelIndexDict; return items; } /// <summary> @@ -87,7 +77,7 @@ { int count = 0; list = new List<ItemModel>(); foreach (ItemModel model in packModelIndexDict.Values) foreach (var model in items.Values) { if (model.itemId == itemId) { @@ -106,7 +96,7 @@ public int GetItemCountByID(int itemId) { int count = 0; foreach (ItemModel model in packModelIndexDict.Values) foreach (ItemModel model in items.Values) { if (model.itemId == itemId) { @@ -127,7 +117,7 @@ { int count = 0; list = new List<ItemModel>(); foreach (ItemModel model in packModelIndexDict.Values) foreach (ItemModel model in items.Values) { if (model.config.Type == itemType) { @@ -146,7 +136,7 @@ public List<int> GetItemsByQuality(int _quality) { var itemList = new List<int>(); foreach (var value in packModelIndexDict.Values) foreach (var value in items.Values) { if (value.config.ItemColor == _quality) { @@ -168,7 +158,7 @@ { List<int> itemIndexlist = new List<int>(); List<ItemModel> itemModellist = new List<ItemModel>(); foreach (ItemModel model in packModelIndexDict.Values) foreach (ItemModel model in items.Values) { if (model.itemId == itemId) { @@ -207,7 +197,7 @@ { List<int> itemIndexlist = new List<int>(); List<ItemModel> itemModellist = new List<ItemModel>(); foreach (ItemModel model in packModelIndexDict.Values) foreach (ItemModel model in items.Values) { if (model.itemId == itemId) { @@ -270,7 +260,7 @@ int i = -1; for(i = 0; i < openGridCount; i++) { if(!packModelIndexDict.ContainsKey(i)) if (!items.ContainsKey(i)) { return i; } @@ -285,19 +275,19 @@ /// <returns></returns> public int GetRemainGridCount() { return openGridCount - packModelIndexDict.Count; return openGridCount - items.Count; } public void ClearItemModelByIndex(int index) { if (packModelIndexDict.ContainsKey(index)) if (items.ContainsKey(index)) { packModelIndexDict.Remove(index); items.Remove(index); } } public void ClearPackModel() { packModelIndexDict.Clear(); items.Clear(); } } } System/KnapSack/Logic/WashAttrPointWin.cs
@@ -169,7 +169,7 @@ } else { ItemLogicUtility.Instance.UseItem(itemModel.itemPlace,1,(int)selectAttr); ItemOperateUtility.Instance.UseItem(itemModel.itemPlace,1,(int)selectAttr); } } System/KnapSack/Logic/WashPointBatchUseWin.cs
@@ -155,7 +155,7 @@ if (itemModel == null) return; ItemLogicUtility.Instance.UseItem(itemModel.itemPlace, (ushort)Mathf.Ceil(_splitSlider.value), BatchUseModel.Instance.extraPrams); ItemOperateUtility.Instance.UseItem(itemModel.itemPlace, (ushort)Mathf.Ceil(_splitSlider.value), BatchUseModel.Instance.extraPrams); OnClickCloseBtn(); }
@@ -257,7 +257,7 @@ gridCell.cdImag.fillAmount = 0; gridCell.cdImag.gameObject.SetActive(false); ItemModel itemModel = packModel.GetItemModelByIndex(cellCount - 1); ItemModel itemModel = packModel.GetItemByIndex(cellCount - 1); if (itemModel != null) { gridCell.itemCell.gameObject.SetActive(true); @@ -276,7 +276,7 @@ }; gridCell.itemCellBtn.m_OnDbClick = () => { ItemLogicUtility.Instance.PutInWareHouse(itemModel.guid); ItemOperateUtility.Instance.PutInWareHouse(itemModel.guid); }; } System/KnapSack/New/BatchWin.cs
@@ -178,7 +178,7 @@ { if (isOk) { ItemLogicUtility.Instance.UseItem(itemModel.itemPlace, (ushort)Mathf.Ceil(_splitSlider.value), BatchUseModel.Instance.extraPrams); ItemOperateUtility.Instance.UseItem(itemModel.itemPlace, (ushort)Mathf.Ceil(_splitSlider.value), BatchUseModel.Instance.extraPrams); } } ); @@ -190,7 +190,7 @@ } else { ItemLogicUtility.Instance.UseItem(itemModel.itemPlace, (ushort)Mathf.Ceil(_splitSlider.value), BatchUseModel.Instance.extraPrams); ItemOperateUtility.Instance.UseItem(itemModel.itemPlace, (ushort)Mathf.Ceil(_splitSlider.value), BatchUseModel.Instance.extraPrams); } OnClickCloseBtn(); System/KnapSack/New/ChooseItemWin.cs
@@ -208,7 +208,7 @@ ItemModel itemModel = playerPack.GetItemModelByGUID(BoxModel.guid); if(itemModel != null) { ItemLogicUtility.Instance.UseItem(itemModel.itemPlace,useNum,chooseId); ItemOperateUtility.Instance.UseItem(itemModel.itemPlace,useNum,chooseId); } CloseImmediately(); } System/KnapSack/New/DepotWin.cs
@@ -181,7 +181,7 @@ else gridCell.gridLock.SetActive(false); ItemModel itemModel = packModel.GetItemModelByIndex(cellCount - 1); ItemModel itemModel = packModel.GetItemByIndex(cellCount - 1); if (itemModel != null) { gridCell.itemCell.gameObject.SetActive(true); @@ -197,7 +197,7 @@ }; gridCell.itemCellBtn.m_OnDbClick = () => { ItemLogicUtility.Instance.TakeOutFromWarehouse(ItemOperateType.putOut, itemModel.guid); ItemOperateUtility.Instance.TakeOutFromWarehouse(ItemOperateType.putOut, itemModel.guid); }; } System/KnapSack/New/FairyWearWin.cs
@@ -54,7 +54,7 @@ protected override void OnPreOpen() { curItemModel = ItemLogicUtility.Instance.selectedItem; curItemModel = ItemOperateUtility.Instance.selectedItem; if (curItemModel != null) { wear01Img.SetSprite(StringUtility.Contact("EquipPlace_", curItemModel.config.EquipPlace)); @@ -145,7 +145,7 @@ var equipType = curItemModel.config.EquipPlace; var item = curItemModel; ItemLogicUtility.Instance.CheckSuitReplaceInfo(equipType, item); ItemOperateUtility.Instance.CheckSuitReplaceInfo(equipType, item); Close(); } @@ -159,13 +159,13 @@ switch ((RoleEquipType)curItemModel.config.EquipPlace) { case RoleEquipType.FairyCan: ItemLogicUtility.Instance.CheckSuitReplaceInfo((int)RoleEquipType.FairyCan2, curItemModel); ItemOperateUtility.Instance.CheckSuitReplaceInfo((int)RoleEquipType.FairyCan2, curItemModel); break; case RoleEquipType.JadeDynasty_Glove1: ItemLogicUtility.Instance.CheckSuitReplaceInfo((int)RoleEquipType.JadeDynasty_Glove2, curItemModel); ItemOperateUtility.Instance.CheckSuitReplaceInfo((int)RoleEquipType.JadeDynasty_Glove2, curItemModel); break; case RoleEquipType.JadeDynasty_Ring1: ItemLogicUtility.Instance.CheckSuitReplaceInfo((int)RoleEquipType.JadeDynasty_Ring2, curItemModel); ItemOperateUtility.Instance.CheckSuitReplaceInfo((int)RoleEquipType.JadeDynasty_Ring2, curItemModel); break; }
@@ -62,7 +62,7 @@ itemModel = playerPack.GetItemModelByGUID(BatchUseModel.Instance.offlineGuid); if (itemModel == null) return; int maxOfflineNum = ItemLogicUtility.Instance.GetOfflineMaxNum(itemModel); int maxOfflineNum = ItemOperateUtility.Instance.GetOfflineMaxNum(itemModel); _batchUseSlider.maxValue = maxOfflineNum; _batchUseSlider.minValue = 1; _batchUseSlider.value = _batchUseSlider.minValue; @@ -101,10 +101,10 @@ { if (itemModel == null) return; bool isMax = ItemLogicUtility.Instance.CheckIsMaxOfflineTime((int)Mathf.Ceil(_batchUseSlider.value), itemModel); bool isMax = ItemOperateUtility.Instance.CheckIsMaxOfflineTime((int)Mathf.Ceil(_batchUseSlider.value), itemModel); if(!isMax) { ItemLogicUtility.Instance.UseItem(itemModel.itemPlace, (int)Mathf.Ceil(_batchUseSlider.value)); ItemOperateUtility.Instance.UseItem(itemModel.itemPlace, (int)Mathf.Ceil(_batchUseSlider.value)); } CloseClick(); } System/KnapSack/New/RoleEquipStarTips.cs
@@ -59,7 +59,7 @@ SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.Equip); if (singlePack != null) { _itemDict = singlePack.GetPackModelIndexDict(); _itemDict = singlePack.GetAllItems(); } _tagEquipStarsModellist = RoleEquipStarsConfig.GetEquipStarslist(); tipAlpha.alpha = 0; System/KnapSack/New/SplitWin.cs
@@ -135,7 +135,7 @@ public void OnClickSplitBtn() { ItemLogicUtility.Instance.SplitItem(itemTipsModel.curAttrData.guid, (int)Mathf.Ceil(_splitSlider.value)); ItemOperateUtility.Instance.SplitItem(itemTipsModel.curAttrData.guid, (int)Mathf.Ceil(_splitSlider.value)); OnClickCloseBtn(); }
@@ -100,7 +100,7 @@ protected virtual void OnClickLockBtn(int selectGridIndex,SinglePackModel packModel) { modelInterface.OpenGrid(selectGridIndex,packModel.packType); modelInterface.OpenGrid(selectGridIndex,packModel.type); } } System/KnapSack/PreciousItemGetBehaviour.cs
@@ -94,11 +94,11 @@ bool isUnlock = ModelCenter.Instance.GetModel<ComposeWinModel>().CheckComposeItemById(itemModel.itemId, out jumpId); if (isUnlock) { ItemLogicUtility.Instance.GotoComposeItem(jumpId); ItemOperateUtility.Instance.GotoComposeItem(jumpId); } break; default: ItemLogicUtility.Instance.GotoUseItem(itemModel.itemPlace); ItemOperateUtility.Instance.GotoUseItem(itemModel.itemPlace); break; } } System/KnapSack/RealmBetterEquipBehaviour.cs
@@ -57,7 +57,7 @@ private void PutOnBetterEquip() { ItemLogicUtility.Instance.PutOnItem(ItemOperateType.putOn, model.currentEquipGuid); ItemOperateUtility.Instance.PutOnItem(ItemOperateType.putOn, model.currentEquipGuid); model.ReportConfirmBetterEquip(model.currentEquipGuid); }
@@ -27,7 +27,7 @@ { if (model.fairyLandItemModel != null) { ItemLogicUtility.Instance.PutOnItem(ItemOperateType.putOn, model.fairyLandItemModel.guid); ItemOperateUtility.Instance.PutOnItem(ItemOperateType.putOn, model.fairyLandItemModel.guid); OnClose(); } } System/MainInterfacePanel/FlyingShoesTask.cs
@@ -127,7 +127,7 @@ WindowCenter.Instance.Open<WingTaskJumpWin>(); return; } Dictionary<int, ItemModel> BackpackDic = playerPack.GetSinglePackModel(PackType.Item).GetPackModelIndexDict(); Dictionary<int, ItemModel> BackpackDic = playerPack.GetSinglePackModel(PackType.Item).GetAllItems(); if (BackpackDic == null) { WindowCenter.Instance.Open<WingTaskJumpWin>(); System/MainInterfacePanel/PlayerTaskDatas.cs
@@ -1277,7 +1277,7 @@ var _singleModel = PlayerBackModel.GetSinglePackModel(PackType.Equip); // 如果有守护, 则不拾取 var _itemModel = _singleModel.GetItemModelByIndex((int)RoleEquipType.SpiritAnimal); var _itemModel = _singleModel.GetItemByIndex((int)RoleEquipType.SpiritAnimal); if (_itemModel == null || !GeneralDefine.GuardianPickUpID.Contains(_itemModel.itemId)) { float _chkDistanceSqrt; System/Market/MarketPutawayWin.cs
@@ -114,7 +114,7 @@ SinglePackModel packTypeModel = packModel.GetSinglePackModel(PackType.Item); if (packTypeModel != null) { Dictionary<int, ItemModel> dic = packTypeModel.GetPackModelIndexDict(); Dictionary<int, ItemModel> dic = packTypeModel.GetAllItems(); if (dic != null) { foreach (var item in dic.Values) System/Mount/MountWin.cs
@@ -129,17 +129,17 @@ { RedPointMountDan(); } if (ItemLogicUtility.Instance.useItemModel != null)//跳轉選中 if (ItemOperateUtility.Instance.useItemModel != null)//跳轉選中 { ItemLogicUtility.Instance.useItemModel = null; ItemOperateUtility.Instance.useItemModel = null; } } public void SetHorseID() { if (ItemLogicUtility.Instance.useItemModel != null)//坐骑单 if (ItemOperateUtility.Instance.useItemModel != null)//坐骑单 { int ItemId = ItemLogicUtility.Instance.useItemModel.itemId; int ItemId = ItemOperateUtility.Instance.useItemModel.itemId; if (ItemId == 181) { int MountID= mountModel.GetMinExpMount(); @@ -151,9 +151,9 @@ } } if (ItemLogicUtility.Instance.useItemModel != null)//跳轉選中（碎片） if (ItemOperateUtility.Instance.useItemModel != null)//跳轉選中（碎片） { int ItemId = ItemLogicUtility.Instance.useItemModel.itemId; int ItemId = ItemOperateUtility.Instance.useItemModel.itemId; for (int i = 0; i < sortMountlist.Count; i++) { System/Mount/PlayerMountDatas.cs
@@ -108,9 +108,9 @@ IsOk = true; SinglePackModel singPack = playerPack.GetSinglePackModel(PackType.Equip); if (singPack == null) return; foreach (var index in singPack.GetPackModelIndexDict().Keys) foreach (var index in singPack.GetAllItems().Keys) { OnItemRefreshEvent(singPack.packType, index, singPack.GetPackModelIndexDict()[index].itemId); OnItemRefreshEvent(singPack.type, index, singPack.GetAllItems()[index].itemId); } if (PlayerLoginOKData != null) { System/Pet/PetAttributeWin.cs
@@ -95,9 +95,9 @@ { IsRedPointCultivate(); } if (ItemLogicUtility.Instance.useItemModel != null) if (ItemOperateUtility.Instance.useItemModel != null) { ItemLogicUtility.Instance.useItemModel = null; ItemOperateUtility.Instance.useItemModel = null; } } @@ -319,9 +319,9 @@ private void OptionIsSelected()//跳转选择 { if (ItemLogicUtility.Instance.useItemModel != null)//灵宠单 if (ItemOperateUtility.Instance.useItemModel != null)//灵宠单 { int ItemId = ItemLogicUtility.Instance.useItemModel.itemId; int ItemId = ItemOperateUtility.Instance.useItemModel.itemId; if (ItemId == 4151) { int Pet = petmodel.GetMinPetExp(); @@ -333,9 +333,9 @@ } } if (ItemLogicUtility.Instance.useItemModel != null)//坐骑碎片 if (ItemOperateUtility.Instance.useItemModel != null)//坐骑碎片 { int ItemId = ItemLogicUtility.Instance.useItemModel.itemId; int ItemId = ItemOperateUtility.Instance.useItemModel.itemId; //var petinfo = PetInfoConfig.GetValues(); foreach (var Value in petinfo) System/Pet/PlayerPetDatas.cs
@@ -127,9 +127,9 @@ GlobalTimeEvent.Instance.secondEvent += secondEvent; SinglePackModel singPack = playerPack.GetSinglePackModel(PackType.PetPack); if (singPack == null) return; foreach (var index in singPack.GetPackModelIndexDict().Keys) foreach (var index in singPack.GetAllItems().Keys) { OnItemRefreshEvent(singPack.packType, index, singPack.GetPackModelIndexDict()[index].itemId); OnItemRefreshEvent(singPack.type, index, singPack.GetAllItems()[index].itemId); } IsOk = true; if (PlayerLoginOkData != null) @@ -168,9 +168,9 @@ CA702_tagCMActivatePet CMPet = new CA702_tagCMActivatePet(); CMPet.PetNPCID = (uint)petId; GameNetSystem.Instance.SendInfo(CMPet); if (ItemLogicUtility.Instance.useItemModel != null) if (ItemOperateUtility.Instance.useItemModel != null) { ItemLogicUtility.Instance.useItemModel = null; ItemOperateUtility.Instance.useItemModel = null; } }
@@ -112,9 +112,9 @@ } } var packTypeModel = playerPack.GetSinglePackModel(PackType.Equip); if (packTypeModel == null || packTypeModel.GetPackModelIndexDict() == null) if (packTypeModel == null || packTypeModel.GetAllItems() == null) break; foreach (var itemData in packTypeModel.GetPackModelIndexDict().Values) foreach (var itemData in packTypeModel.GetAllItems().Values) { ItemConfig _tagChinItemModel = ItemConfig.Get((int)itemData.itemId); if (_tagChinItemModel != null && (_tagChinItemModel.ItemColor > viewRoleFuncModel.condition[0] @@ -130,9 +130,9 @@ { targetValue = viewPlayerData.rolePlusData.GetAllEquipStarLV(); var packTypeModel = playerPack.GetSinglePackModel(PackType.Equip); if (packTypeModel == null || packTypeModel.GetPackModelIndexDict() == null) if (packTypeModel == null || packTypeModel.GetAllItems() == null) break; foreach (var itemPlace in packTypeModel.GetPackModelIndexDict().Keys) foreach (var itemPlace in packTypeModel.GetAllItems().Keys) { selfValue += strengthengmodel.StrengthenTheCeiling(itemPlace); } System/RolePromote/RolePromoteModel.cs
@@ -227,11 +227,11 @@ { int _count = 0; SinglePackModel packTypeModel = playerPack.GetSinglePackModel(PackType.Equip); if (packTypeModel == null || packTypeModel.GetPackModelIndexDict() == null || packTypeModel.GetPackModelIndexDict().Count == 0) if (packTypeModel == null || packTypeModel.GetAllItems() == null || packTypeModel.GetAllItems().Count == 0) { return _count; } foreach (var _itemModel in packTypeModel.GetPackModelIndexDict().Values) foreach (var _itemModel in packTypeModel.GetAllItems().Values) { var _itemCfg = ItemConfig.Get(_itemModel.itemId); if (_itemCfg != null) System/Strengthening/EquipSuit/PlayerSuitModel.cs
@@ -156,7 +156,7 @@ return orderlist; } equipDict = singlePack.GetPackModelIndexDict(); equipDict = singlePack.GetAllItems(); for(int i = 0; i < suitPartlist.Count; i++) { if(equipDict.ContainsKey(suitPartlist[i])) @@ -470,7 +470,7 @@ if (PlayerDatas.Instance.baseData.Job != job && job != 0) return sumNumber; Dictionary<int, ItemModel> equipDict = singlePack.GetPackModelIndexDict(); Dictionary<int, ItemModel> equipDict = singlePack.GetAllItems(); foreach (ItemModel model in equipDict.Values) { if (GetGroupType(model.itemPlace) == GetGroupType(equipPlace)) @@ -509,7 +509,7 @@ if (singlePack == null) return sumCnt; Dictionary<int, ItemModel> equipDict = singlePack.GetPackModelIndexDict(); Dictionary<int, ItemModel> equipDict = singlePack.GetAllItems(); foreach (ItemModel model in equipDict.Values) { Dictionary<int, int> suitTypeDic = GetServerSuitModelByPlace(model.itemPlace); @@ -1044,7 +1044,7 @@ SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.Equip); if (singlePack == null) return 0; Dictionary<int, ItemModel> dic = singlePack.GetPackModelIndexDict(); Dictionary<int, ItemModel> dic = singlePack.GetAllItems(); List<int> placelist = new List<int>(); placelist.AddRange(suitPartlist); placelist.Sort(CompareBySuitLv); System/Strengthening/EquipWashModel.cs
@@ -284,7 +284,7 @@ Dictionary<int, ItemModel> itemPlaceDict = null; if (rptEquipPack != null) { itemPlaceDict = rptEquipPack.GetPackModelIndexDict(); itemPlaceDict = rptEquipPack.GetAllItems(); } int i = 0; System/Strengthening/GodBeastModel.cs
@@ -380,7 +380,7 @@ { return; } Dictionary<int, ItemModel> BackpackDic = playerPack.GetSinglePackModel(PackType.DogzItem).GetPackModelIndexDict(); Dictionary<int, ItemModel> BackpackDic = playerPack.GetSinglePackModel(PackType.DogzItem).GetAllItems(); int _ItemColor = 10; foreach (var keyBack in BackpackDic.Keys) { System/Strengthening/GodBeastSlidingList.cs
@@ -190,7 +190,7 @@ { return; } Dictionary<int, ItemModel> BackpackDic = playerPack.GetSinglePackModel(PackType.DogzItem).GetPackModelIndexDict(); Dictionary<int, ItemModel> BackpackDic = playerPack.GetSinglePackModel(PackType.DogzItem).GetAllItems(); foreach (var key in BackpackDic.Keys) { var itemModel = BackpackDic[key]; System/Strengthening/PlayerStrengthengDatas.cs
@@ -192,7 +192,7 @@ foreach (var key in DicEquip.Keys) { ItemModel itemModel = singlePack.GetItemModelByIndex(key); ItemModel itemModel = singlePack.GetItemByIndex(key); if (itemModel != null) { ItemConfig _Item = ItemConfig.Get((int)itemModel.itemId); @@ -399,9 +399,9 @@ if (Index == 9 || Index == 10) { SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.Equip); if (singlePack != null && singlePack.GetPackModelIndexDict().ContainsKey(Index)) if (singlePack != null && singlePack.GetAllItems().ContainsKey(Index)) { ItemModel item = singlePack.GetItemModelByIndex(Index); ItemModel item = singlePack.GetItemByIndex(Index); ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig(); _itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(Index), 0, 0); if (_itemPM.levelMax > strengthengmodel._EqInfo[Index].EquipPartStarLV)//最大可升阶等级和服务端对比 System/Strengthening/StrengtheningSripts.cs
@@ -563,9 +563,9 @@ if (Index == 9 || Index == 10) { SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.Equip); if (singlePack != null && singlePack.GetPackModelIndexDict().ContainsKey(Index)) if (singlePack != null && singlePack.GetAllItems().ContainsKey(Index)) { ItemModel item = singlePack.GetItemModelByIndex(Index); ItemModel item = singlePack.GetItemByIndex(Index); ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig(); _itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(Index), 0, 0); if (_itemPM.levelMax > strengthengmodel._EqInfo[Index].EquipPartStarLV)//最大可升阶等级和服务端对比 @@ -588,9 +588,9 @@ continue; } if (singlePack.GetPackModelIndexDict().ContainsKey(int.Parse(_locationSort[i]))) if (singlePack.GetAllItems().ContainsKey(int.Parse(_locationSort[i]))) { ItemModel item = singlePack.GetItemModelByIndex(int.Parse(_locationSort[i])); ItemModel item = singlePack.GetItemByIndex(int.Parse(_locationSort[i])); ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig(); if (strengthengmodel.EquipMax(int.Parse(_locationSort[i])) != 3) { System/Strengthening/WingsBouncedWin.cs
@@ -117,7 +117,7 @@ _WingButton.WingBG.AddListener(() => { ItemLogicUtility.Instance.PutOnItem(ItemOperateType.putIn, model.guid); ItemOperateUtility.Instance.PutOnItem(ItemOperateType.putIn, model.guid); //string strJob = tagItem.JobLimit.ToString(); //if (_ReincarnationLv >= int.Parse(strJob.Substring(strJob.Length - 1, 1))) @@ -145,7 +145,7 @@ return; } WingDic.Clear(); Dictionary<int, ItemModel> backpack_dic = singlePack.GetPackModelIndexDict(); Dictionary<int, ItemModel> backpack_dic = singlePack.GetAllItems(); if (backpack_dic.Count == 0)//得到背包的所有物品 { return; System/Strengthening/WingsRedDot.cs
@@ -99,7 +99,7 @@ return; } SinglePackModel singlePackModel = playerPack.GetSinglePackModel(PackType.Item); Dictionary<int, ItemModel> backpack_dic = singlePackModel.GetPackModelIndexDict(); Dictionary<int, ItemModel> backpack_dic = singlePackModel.GetAllItems(); List<int> wingsRefinelist = itemModel.GetUseDataModel((int)ItemUseDataKey.wingProgressValue); if (wingsRefinelist != null) System/Strengthening/WingsRefined.cs
@@ -482,12 +482,12 @@ bool markingbbol = false; SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.Item); if (singlePack == null || singlePack.GetPackModelIndexDict().Count == 0) if (singlePack == null || singlePack.GetAllItems().Count == 0) { ServerTipDetails.DisplayNormalTip(Language.Get("WingsRefine_NoWing")); return; } Dictionary<int, ItemModel> backpack_dic = singlePack.GetPackModelIndexDict(); Dictionary<int, ItemModel> backpack_dic = singlePack.GetAllItems(); foreach (int index in backpack_dic.Keys) { int _id = (int)backpack_dic[index].itemId; @@ -522,7 +522,7 @@ SinglePackModel rptItemPack = playerPack.GetSinglePackModel(PackType.Item); ItemModel putOnModel = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Wing); if (rptItemPack == null || rptItemPack.GetPackModelIndexDict().Count == 0 || putOnModel == null) if (rptItemPack == null || rptItemPack.GetAllItems().Count == 0 || putOnModel == null) { return; } @@ -533,7 +533,7 @@ return; } var items = rptItemPack.GetPackModelIndexDict(); var items = rptItemPack.GetAllItems(); foreach (var itemIndex in items.Keys) { var item = items[itemIndex]; System/SystemSetting/SettingEffectMgr.cs
@@ -245,7 +245,7 @@ List<ItemModel> list = null; if (singlePack.GetItemCountByID(_tagItemModel.ID,out list) > 0) { ItemLogicUtility.Instance.GotoUseItem(list[0].itemPlace); ItemOperateUtility.Instance.GotoUseItem(list[0].itemPlace); break; } else System/TreasureFindHost/TreasureFindHostModel.cs
@@ -169,7 +169,7 @@ SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.Equip); if (singlePack == null) return false; Dictionary<int, ItemModel> equipDict = singlePack.GetPackModelIndexDict(); Dictionary<int, ItemModel> equipDict = singlePack.GetAllItems(); foreach(var model in equipDict.Values) { progress += model.config.StarLevel; @@ -187,7 +187,7 @@ SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.Equip); if (singlePack == null) return false; Dictionary<int, ItemModel> equipDict = singlePack.GetPackModelIndexDict(); Dictionary<int, ItemModel> equipDict = singlePack.GetAllItems(); foreach(var condi in treasureInfo.needConditionsDict.Values) { progress = 0; System/WindowJump/WindowJumpMgr.cs
@@ -236,9 +236,9 @@ SetJumpLogic<PetWin>(_tagWinSearchModel.TABID); break; case JumpUIType.PetStone: if (ItemLogicUtility.Instance.useItemModel != null) if (ItemOperateUtility.Instance.useItemModel != null) { petModel.PetStoneItemId = ItemLogicUtility.Instance.useItemModel.itemId; petModel.PetStoneItemId = ItemOperateUtility.Instance.useItemModel.itemId; } SetJumpLogic<PetStoneTipsWin>(_tagWinSearchModel.TABID); break; @@ -283,9 +283,9 @@ SetJumpLogic<WorldMapWin>(_tagWinSearchModel.TABID); break; case JumpUIType.MountStone: if (ItemLogicUtility.Instance.useItemModel != null) if (ItemOperateUtility.Instance.useItemModel != null) { mountModel.MountStoneItemId = ItemLogicUtility.Instance.useItemModel.itemId; mountModel.MountStoneItemId = ItemOperateUtility.Instance.useItemModel.itemId; } SetJumpLogic<MountStoneTipsWin>(_tagWinSearchModel.TABID); break; @@ -522,9 +522,9 @@ } break; case JumpUIType.MakeDrug: if (ItemLogicUtility.Instance.useItemModel != null) if (ItemOperateUtility.Instance.useItemModel != null) { RoleElixirTipWin.makeUseId = ItemLogicUtility.Instance.useItemModel.itemId; RoleElixirTipWin.makeUseId = ItemOperateUtility.Instance.useItemModel.itemId; } SetJumpLogic<BlastFurnaceWin>(_tagWinSearchModel.TABID); break; UI/Common/UI3DShowHero.cs
@@ -679,7 +679,7 @@ ItemModel _itemModel = null; _itemModel = _equipModel.GetItemModelByIndex((int)RoleEquipType.Clothes); _itemModel = _equipModel.GetItemByIndex((int)RoleEquipType.Clothes); if (_itemModel == null) { @@ -691,7 +691,7 @@ for (int i = _start; i <= _end; ++i) { _itemModel = _equipModel.GetItemModelByIndex(i); _itemModel = _equipModel.GetItemByIndex(i); if (_itemModel == null) { Utility/CalculateSkillGetAttrHurtUtility.cs
@@ -32,7 +32,7 @@ SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.JadeDynastyEquip); if (singlePack == null) return; var dict = singlePack.GetPackModelIndexDict(); var dict = singlePack.GetAllItems(); foreach (var model in dict.Values) { var legendIds = model.GetUseDataModel((int)ItemUseDataKey.legendAttrID); Utility/EnumHelper.cs
@@ -1642,12 +1642,12 @@ equipWin, //装备弹框 wingsWin, //翅膀弹框 guardWin,//守护弹框 BuyItemWin, //购买物品弹框 buyItemWin, //购买物品弹框 buyBoxWin, //购买宝箱弹框 petMatWin, //解锁宠物和坐骑道具弹框 buyPetMatWin, //购买解锁宠物和坐骑道具弹框 GatherSoul,//聚魂 KingTreasure, //王者法宝 gatherSoul,//聚魂 kingTreasure, //王者法宝 } public enum ItemTipChildType
