| System/JadeDynastyKnapSack/JadeDynastyDecomposeLineBeh.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/JadeDynastyKnapSack/JadeDynastyDecomposeModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/JadeDynastyKnapSack/JadeDynastyDecomposeWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/JadeDynastyKnapSack/JadeDynastyEquipModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/KnapSack/Logic/EquipTip.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/KnapSack/Logic/ItemTipsModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/KnapSack/Logic/PackModelInterface.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/KnapSack/New/CommonItemBaisc.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
System/JadeDynastyKnapSack/JadeDynastyDecomposeLineBeh.cs
@@ -46,6 +46,7 @@ public void SetDisplay(ItemModel itemModel,List<string> selectGuids) { itemBaisc.cellBtn.RemoveAllListeners(); if (itemModel == null || selectGuids == null) { itemBaisc.gameObject.SetActive(false); @@ -55,11 +56,10 @@ { itemBaisc.gameObject.SetActive(true); selectObj.SetActive(selectGuids.Contains(itemModel.itemInfo.ItemGUID)); itemBaisc.Init(itemModel); itemBaisc.cellBtn.RemoveAllListeners(); itemBaisc.Init(itemModel,true); itemBaisc.cellBtn.AddListener(()=> { if(selectObj.activeInHierarchy) if (selectObj.activeInHierarchy) { this.decomposeModel.RemoveSelectModel(itemModel.itemInfo.ItemGUID); } System/JadeDynastyKnapSack/JadeDynastyDecomposeModel.cs
@@ -16,6 +16,8 @@ public event Action UpdateSelectItemEvent; PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } } PackModelInterface modelInterface { get { return ModelCenter.Instance.GetModel<PackModelInterface>(); } } public override void Init() { selectGuids = new List<string>(); @@ -98,7 +100,8 @@ if(model != null) { if (selectEquipLv != 0 && model.chinItemModel.LV <= selectEquipLv) && model.chinItemModel.LV <= selectEquipLv && modelInterface.IsFightUp(model.itemId,model.equipScore) != 1) { selectGuids.Add(model.itemInfo.ItemGUID); } @@ -117,10 +120,6 @@ if(!selectGuids.Contains(guid)) { selectGuids.Add(guid); if(UpdateSelectItemEvent != null) { UpdateSelectItemEvent(); } } } @@ -131,10 +130,6 @@ if(selectGuids.Contains(guid)) { selectGuids.Remove(guid); if (UpdateSelectItemEvent != null) { UpdateSelectItemEvent(); } } }
@@ -14,7 +14,8 @@ [SerializeField] Button selectBtn; [SerializeField] Image autoDecomposeImg; [SerializeField] Transform sortArrow; [SerializeField] int initCount = 100; JadeDynastyDecomposeModel decomposeModel { get { return ModelCenter.Instance.GetModel<JadeDynastyDecomposeModel>(); } } #region Built-in protected override void BindController() @@ -67,8 +68,9 @@ { decomposeModel.UpdateDecomposeModels(); decomposeModel.UpdateSelectModels(); int line = initCount / 5; decomposeCtrl.Refresh(); for(int i = 0; i < decomposeModel.allGuids.Count; i++) for(int i = 0; i < line; i++) { decomposeCtrl.AddCell(ScrollerDataType.Header,i); } System/JadeDynastyKnapSack/JadeDynastyEquipModel.cs
@@ -334,7 +334,7 @@ { if (minEquipLv != 0) { for (int i = suitLvs.Count - 1; i > -1; i++) for (int i = suitLvs.Count - 1; i > -1; i--) { int suitLv = suitLvs[i]; if (minEquipLv >= suitLv) System/KnapSack/Logic/EquipTip.cs
@@ -190,7 +190,8 @@ if(itemAttrData.isCompare) { if (itemAttrData.packType != PackType.rptEquip && itemAttrData.packType != PackType.rptDogzEquip) && itemAttrData.packType != PackType.rptDogzEquip && itemAttrData.packType != PackType.rptJadeDynastyEquip) { itemTipsModel.SetCurTips(this.GetComponent<RectTransform>()); } @@ -546,6 +547,18 @@ case 9: case 10: case 12: case 121: case 122: case 123: case 124: case 125: case 126: case 127: case 128: case 129: case 130: case 131: case 132: legendCntPreview.text = itemTipsModel.GetEquipLegendAttrCntPreview(itemAttrData); break; case 101: @@ -903,6 +916,18 @@ case 9: case 10: case 12: case 121: case 122: case 123: case 124: case 125: case 126: case 127: case 128: case 129: case 130: case 131: case 132: if (dogzEquipDesText != null) { dogzEquipDesText.gameObject.SetActive(false); System/KnapSack/Logic/ItemTipsModel.cs
@@ -532,15 +532,18 @@ if (isCompare) { if(type != PackType.rptDogzItem) switch(type) { SetCompareAttrData(PackType.rptEquip, itemModel.chinItemModel.EquipPlace); case PackType.rptDogzItem: SetCompareAttrData(PackType.rptDogzEquip, itemModel.chinItemModel.EquipPlace); break; case PackType.rptJadeDynastyItem: SetCompareAttrData(PackType.rptJadeDynastyEquip, itemModel.chinItemModel.EquipPlace); break; default: SetCompareAttrData(PackType.rptEquip, itemModel.chinItemModel.EquipPlace); break; } else { SetCompareAttrData(PackType.rptDogzEquip, itemModel.chinItemModel.EquipPlace); } } } @@ -564,13 +567,17 @@ if (itemAttrData.isCompare) { if (itemAttrData.packType != PackType.rptDogzItem) switch (itemAttrData.packType) { SetCompareAttrData(PackType.rptEquip, itemAttrData.itemConfig.EquipPlace); } else { SetCompareAttrData(PackType.rptDogzEquip, itemAttrData.itemConfig.EquipPlace); case PackType.rptDogzItem: SetCompareAttrData(PackType.rptDogzEquip, itemAttrData.itemConfig.EquipPlace); break; case PackType.rptJadeDynastyItem: SetCompareAttrData(PackType.rptJadeDynastyEquip, itemAttrData.itemConfig.EquipPlace); break; default: SetCompareAttrData(PackType.rptEquip, itemAttrData.itemConfig.EquipPlace); break; } } @@ -608,28 +615,69 @@ var dogzModel = ModelCenter.Instance.GetModel<DogzModel>(); dogzModel.TryGetDogzEquip(dogzModel.presentSelectDogz,equipPlace,out itemModel); break; case PackType.rptJadeDynastyEquip: itemModel = playerPack.GetItemModelByIndex(type, equipPlace); break; } if (itemModel == null) return; if (equipPlace == (int)RoleEquipType.retFairyCan) ItemModel fairyModel2 = null; switch ((RoleEquipType)equipPlace) { ItemModel fairyModel2 = playerPack.GetItemModelByIndex(type,(int)RoleEquipType.retFairyCan2); if (fairyModel2 != null) { if (itemModel != null) case RoleEquipType.retFairyCan: fairyModel2 = playerPack.GetItemModelByIndex(type, (int)RoleEquipType.retFairyCan2); if (fairyModel2 != null) { if (fairyModel2.equipScore < itemModel.equipScore) if (itemModel != null) { itemModel = fairyModel2; if (fairyModel2.equipScore < itemModel.equipScore) { itemModel = fairyModel2; } } } } else { itemModel = fairyModel2; } else { itemModel = fairyModel2; } break; case RoleEquipType.JadeDynasty_Glove1: fairyModel2 = playerPack.GetItemModelByIndex(type, (int)RoleEquipType.JadeDynasty_Glove2); if (fairyModel2 != null) { if (itemModel != null) { if (fairyModel2.equipScore < itemModel.equipScore) { itemModel = fairyModel2; } } } else { itemModel = fairyModel2; } break; case RoleEquipType.JadeDynasty_Ring1: fairyModel2 = playerPack.GetItemModelByIndex(type, (int)RoleEquipType.JadeDynasty_Ring2); if (fairyModel2 != null) { if (itemModel != null) { if (fairyModel2.equipScore < itemModel.equipScore) { itemModel = fairyModel2; } } } else { itemModel = fairyModel2; } break; } if (itemModel != null) { compareAttrData = new ItemAttrData(itemModel.itemInfo.ItemID, false, (ulong)itemModel.itemInfo.ItemCount System/KnapSack/Logic/PackModelInterface.cs
@@ -1618,30 +1618,70 @@ ItemConfig chinItemModel = Config.Instance.Get<ItemConfig>(_itemID); if (chinItemModel != null) { if (chinItemModel.EquipPlace < 1 || chinItemModel.EquipPlace > 12) return 0; ItemModel model = playerPack.GetItemModelByIndex(PackType.rptEquip, chinItemModel.EquipPlace); if (chinItemModel.EquipPlace == (int)RoleEquipType.retFairyCan) ItemModel putOnModel = null; switch((RoleEquipType)chinItemModel.EquipPlace) { ItemModel fairyModel2 = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retFairyCan2); if (fairyModel2 != null) case RoleEquipType.retClothes: case RoleEquipType.retFairyCan: case RoleEquipType.retBelt: case RoleEquipType.retHat: case RoleEquipType.retNeck: case RoleEquipType.retShoes: case RoleEquipType.retSpiritAnimal: case RoleEquipType.retTrousers: case RoleEquipType.retWeapon: case RoleEquipType.retWeapon2: case RoleEquipType.retWing: putOnModel = playerPack.GetItemModelByIndex(PackType.rptEquip, chinItemModel.EquipPlace); break; case RoleEquipType.JadeDynasty_Cloak: case RoleEquipType.JadeDynasty_FaceMask: case RoleEquipType.JadeDynasty_Glove1: case RoleEquipType.JadeDynasty_Pendant: case RoleEquipType.JadeDynasty_Ring1: case RoleEquipType.JadeDynasty_Ruyi: case RoleEquipType.JadeDynasty_Sword1: case RoleEquipType.JadeDynasty_Sword2: case RoleEquipType.JadeDynasty_Sword3: case RoleEquipType.JadeDynasty_Sword4: putOnModel = playerPack.GetItemModelByIndex(PackType.rptJadeDynastyEquip, chinItemModel.EquipPlace); break; default: return 0; } ItemModel putOnModel2 = null; switch((RoleEquipType)chinItemModel.EquipPlace) { case RoleEquipType.retFairyCan: putOnModel2 = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retFairyCan2); break; case RoleEquipType.JadeDynasty_Glove1: putOnModel2 = playerPack.GetItemModelByIndex(PackType.rptJadeDynastyEquip, (int)RoleEquipType.JadeDynasty_Glove2); break; case RoleEquipType.JadeDynasty_Ring1: putOnModel2 = playerPack.GetItemModelByIndex(PackType.rptJadeDynastyEquip, (int)RoleEquipType.JadeDynasty_Ring2); break; } if (putOnModel2 != null) { if (putOnModel != null) { if (model != null) if (putOnModel2.equipScore < putOnModel.equipScore) { if (fairyModel2.equipScore < model.equipScore) { model = fairyModel2; } putOnModel = putOnModel2; } } else { model = fairyModel2; } } int equipScore1 = 0; if (model != null) else { equipScore1 = (int)model.equipScore; putOnModel = putOnModel2; } int equipScore1 = 0; if (putOnModel != null) { equipScore1 = (int)putOnModel.equipScore; } int playerJob = PlayerDatas.Instance.baseData.Job; System/KnapSack/New/CommonItemBaisc.cs
@@ -227,13 +227,17 @@ if (isCompare) { if(type != PackType.rptDogzItem) switch(type) { compareSocre = GetCompareSocre(PackType.rptEquip,config.EquipPlace); } else { compareSocre = GetCompareSocre(PackType.rptDogzEquip, config.EquipPlace); case PackType.rptDogzItem: compareSocre = GetCompareSocre(PackType.rptDogzEquip, config.EquipPlace); break; case PackType.rptJadeDynastyItem: compareSocre = GetCompareSocre(PackType.rptJadeDynastyEquip, config.EquipPlace); break; default: compareSocre = GetCompareSocre(PackType.rptEquip, config.EquipPlace); break; } } @@ -250,14 +254,16 @@ public int GetCompareSocre(PackType type,int equipPlace) { ItemModel fairy01 = null; ItemModel fairy02 = null; switch (type) { case PackType.rptEquip: switch ((RoleEquipType)equipPlace) { case RoleEquipType.retFairyCan: ItemModel fairy01 = playerPack.GetItemModelByIndex(type,(int)RoleEquipType.retFairyCan); ItemModel fairy02 = playerPack.GetItemModelByIndex(type, (int)RoleEquipType.retFairyCan2); fairy01 = playerPack.GetItemModelByIndex(type,(int)RoleEquipType.retFairyCan); fairy02 = playerPack.GetItemModelByIndex(type, (int)RoleEquipType.retFairyCan2); if(fairy01 == null || fairy02 == null) { return 0; @@ -275,6 +281,36 @@ ItemModel putOnModel = null; dogzModel.TryGetDogzEquip(dogzModel.presentSelectDogz, equipPlace, out putOnModel); return putOnModel == null ? 0 : putOnModel.equipScore; case PackType.rptJadeDynastyEquip: switch ((RoleEquipType)equipPlace) { case RoleEquipType.JadeDynasty_Glove1: fairy01 = playerPack.GetItemModelByIndex(type, (int)RoleEquipType.JadeDynasty_Glove1); fairy02 = playerPack.GetItemModelByIndex(type, (int)RoleEquipType.JadeDynasty_Glove2); if (fairy01 == null || fairy02 == null) { return 0; } else { return fairy01.equipScore >= fairy02.equipScore ? fairy02.equipScore : fairy01.equipScore; } case RoleEquipType.JadeDynasty_Ring1: fairy01 = playerPack.GetItemModelByIndex(type, (int)RoleEquipType.JadeDynasty_Ring1); fairy02 = playerPack.GetItemModelByIndex(type, (int)RoleEquipType.JadeDynasty_Ring2); if (fairy01 == null || fairy02 == null) { return 0; } else { return fairy01.equipScore >= fairy02.equipScore ? fairy02.equipScore : fairy01.equipScore; } default: ItemModel model = playerPack.GetItemModelByIndex(type, equipPlace); return model == null ? 0 : model.equipScore; } } return 0; }
