From c7c25a14daeb7ea339e1b3ce2785e3bf726e0a97 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 08 四月 2019 19:30:03 +0800
Subject: [PATCH] 3335 代码整理
---
System/Dogz/DogzEquip.cs | 2
System/Dogz/DogzItemCell.cs | 2
System/EquipGem/EquipStrengthRein.cs | 2
System/EquipGem/EquipGemWin.cs | 2
System/DailyQuest/DailyQuestHangTimeBehaviour.cs | 2
System/Equip/EquipSlotBehaviour.cs | 2
System/KnapSack/BetterItemGetBehaviour.cs | 2
System/KnapSack/Logic/ItemTipsModel.cs | 24 ++---------
System/Equip/CandidateEquipBehaviour.cs | 2
System/EquipGem/EquipStrengthUpper.cs | 2
System/Dungeon/TrialExchangeBehaviour.cs | 2
System/KnapSack/New/BagWin.cs | 4 +-
System/Store/StoreModel.cs | 2
Lua/Gen/SnxxzUIItemTipsModelWrap.cs | 5 --
System/KnapSack/New/EquipPlaceCell.cs | 2
System/KnapSack/New/DepotWin.cs | 2
System/OffLineTime/OffLineTimeLackBehaviour.cs | 2
System/EquipGem/EquipStrengthFull.cs | 2
System/EquipStar/EquipStarWin.cs | 2
System/TreasureFindHost/ReciveConditionCell.cs | 2
20 files changed, 25 insertions(+), 42 deletions(-)
diff --git a/Lua/Gen/SnxxzUIItemTipsModelWrap.cs b/Lua/Gen/SnxxzUIItemTipsModelWrap.cs
index 3e08624..8a8d1b8 100644
--- a/Lua/Gen/SnxxzUIItemTipsModelWrap.cs
+++ b/Lua/Gen/SnxxzUIItemTipsModelWrap.cs
@@ -414,7 +414,7 @@
{
- gen_to_be_invoked.ShowUICtrl( );
+ gen_to_be_invoked.ShowTip( );
@@ -599,10 +599,7 @@
try {
ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
Snxxz.UI.ItemTipsModel gen_to_be_invoked = (Snxxz.UI.ItemTipsModel)translator.FastGetCSObj(L, 1);
-
{
return 0;
diff --git a/System/DailyQuest/DailyQuestHangTimeBehaviour.cs b/System/DailyQuest/DailyQuestHangTimeBehaviour.cs
index ef5aeda..eb3cfb1 100644
--- a/System/DailyQuest/DailyQuestHangTimeBehaviour.cs
+++ b/System/DailyQuest/DailyQuestHangTimeBehaviour.cs
@@ -68,7 +68,7 @@
itemTipsModel.SetItemTipsModel(PackType.Item, itemModel.guid, false, true);
itemTipsModel.SetBagTipsBtn(itemTipsModel.curAttrData);
- itemTipsModel.ShowUICtrl();
+ itemTipsModel.ShowTip();
}
else
{
diff --git a/System/Dogz/DogzEquip.cs b/System/Dogz/DogzEquip.cs
index e1e8ba2..c8df919 100644
--- a/System/Dogz/DogzEquip.cs
+++ b/System/Dogz/DogzEquip.cs
@@ -34,7 +34,7 @@
{
tipsModel.SetItemTipsModel(model.packType,model.guid,false,false);
tipsModel.SetDogzEquipBtn(tipsModel.curAttrData);
- tipsModel.ShowUICtrl();
+ tipsModel.ShowTip();
});
}
}
diff --git a/System/Dogz/DogzItemCell.cs b/System/Dogz/DogzItemCell.cs
index 0bcc1c7..67bbddb 100644
--- a/System/Dogz/DogzItemCell.cs
+++ b/System/Dogz/DogzItemCell.cs
@@ -55,7 +55,7 @@
{
tipsModel.SetItemTipsModel(model.packType, model.guid, false, true);
tipsModel.SetDogzItemBtn(tipsModel.curAttrData);
- tipsModel.ShowUICtrl();
+ tipsModel.ShowTip();
});
}
}
diff --git a/System/Dungeon/TrialExchangeBehaviour.cs b/System/Dungeon/TrialExchangeBehaviour.cs
index 4128154..4d518d5 100644
--- a/System/Dungeon/TrialExchangeBehaviour.cs
+++ b/System/Dungeon/TrialExchangeBehaviour.cs
@@ -58,7 +58,7 @@
}
}
});
- ModelCenter.Instance.GetModel<ItemTipsModel>().ShowUICtrl();
+ ModelCenter.Instance.GetModel<ItemTipsModel>().ShowTip();
}
}
}
diff --git a/System/Equip/CandidateEquipBehaviour.cs b/System/Equip/CandidateEquipBehaviour.cs
index 36faa1f..e11b815 100644
--- a/System/Equip/CandidateEquipBehaviour.cs
+++ b/System/Equip/CandidateEquipBehaviour.cs
@@ -78,7 +78,7 @@
var equip = packModel.GetItemByGuid(this.candidateEquip.guid);
tipModel.SetItemTipsModel(PackType.Item, equip.guid, false, true);
tipModel.SetBagTipsBtn(tipModel.curAttrData);
- tipModel.ShowUICtrl();
+ tipModel.ShowTip();
if (this.candidateEquip.selected.value)
{
diff --git a/System/Equip/EquipSlotBehaviour.cs b/System/Equip/EquipSlotBehaviour.cs
index bf2daf5..83944fc 100644
--- a/System/Equip/EquipSlotBehaviour.cs
+++ b/System/Equip/EquipSlotBehaviour.cs
@@ -127,7 +127,7 @@
{
tipModel.SetItemTipsModel(PackType.Equip, slot.equip.value, false);
tipModel.SetPutOnTipsBtn(tipModel.curAttrData);
- tipModel.ShowUICtrl();
+ tipModel.ShowTip();
}
else if (model.HasSamePlaceCandidateEquip(slot.equipPosition))
{
diff --git a/System/EquipGem/EquipGemWin.cs b/System/EquipGem/EquipGemWin.cs
index 91a2dc8..cfb136e 100644
--- a/System/EquipGem/EquipGemWin.cs
+++ b/System/EquipGem/EquipGemWin.cs
@@ -240,7 +240,7 @@
{
var itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>();
itemTipsModel.SetItemTipsModel(PackType.Item, equipGuid, false, true);
- itemTipsModel.ShowUICtrl();
+ itemTipsModel.ShowTip();
});
var maxStar = EquipStarModel.GetMaxStarLevel(equip.config.ItemColor, equip.config.LV);
diff --git a/System/EquipGem/EquipStrengthFull.cs b/System/EquipGem/EquipStrengthFull.cs
index 6f3c961..276be8e 100644
--- a/System/EquipGem/EquipStrengthFull.cs
+++ b/System/EquipGem/EquipStrengthFull.cs
@@ -57,7 +57,7 @@
m_ItemEquip.button.SetListener(() =>
{
itemTipsModel.SetItemTipsModel(PackType.Item, equipGuid, false, true);
- itemTipsModel.ShowUICtrl();
+ itemTipsModel.ShowTip();
});
}
var equipLvNowList = strengthModel.GetEquipValueList(level, equipPlace);
diff --git a/System/EquipGem/EquipStrengthRein.cs b/System/EquipGem/EquipStrengthRein.cs
index 115c200..7fe4c67 100644
--- a/System/EquipGem/EquipStrengthRein.cs
+++ b/System/EquipGem/EquipStrengthRein.cs
@@ -56,7 +56,7 @@
m_ItemEquip.button.SetListener(() =>
{
itemTipsModel.SetItemTipsModel(PackType.Item, equipGuid, false, true);
- itemTipsModel.ShowUICtrl();
+ itemTipsModel.ShowTip();
});
}
m_TextNumber.text = "+" + (equipLv + 1);
diff --git a/System/EquipGem/EquipStrengthUpper.cs b/System/EquipGem/EquipStrengthUpper.cs
index accb2f3..a5f0c54 100644
--- a/System/EquipGem/EquipStrengthUpper.cs
+++ b/System/EquipGem/EquipStrengthUpper.cs
@@ -57,7 +57,7 @@
m_ItemEquip.button.SetListener(() =>
{
itemTipsModel.SetItemTipsModel(PackType.Item, equipGuid, false, true);
- itemTipsModel.ShowUICtrl();
+ itemTipsModel.ShowTip();
});
}
diff --git a/System/EquipStar/EquipStarWin.cs b/System/EquipStar/EquipStarWin.cs
index 7abb81e..385b79a 100644
--- a/System/EquipStar/EquipStarWin.cs
+++ b/System/EquipStar/EquipStarWin.cs
@@ -436,7 +436,7 @@
var itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>();
itemTipsModel.SetItemTipsModel(PackType.Item, equipGuid, false, true);
- itemTipsModel.ShowUICtrl();
+ itemTipsModel.ShowTip();
}
[System.Serializable]
diff --git a/System/KnapSack/BetterItemGetBehaviour.cs b/System/KnapSack/BetterItemGetBehaviour.cs
index 1c7b119..6bbb666 100644
--- a/System/KnapSack/BetterItemGetBehaviour.cs
+++ b/System/KnapSack/BetterItemGetBehaviour.cs
@@ -165,7 +165,7 @@
itemTipsModel.SetItemTipsModel(PackType.Item, _guid, false, true);
itemTipsModel.SetBagTipsBtn(itemTipsModel.curAttrData);
- itemTipsModel.ShowUICtrl();
+ itemTipsModel.ShowTip();
model.ReportConfirmBetterEquip(model.currentEquipGuid);
}
diff --git a/System/KnapSack/Logic/ItemTipsModel.cs b/System/KnapSack/Logic/ItemTipsModel.cs
index 9b338fe..e4f0264 100644
--- a/System/KnapSack/Logic/ItemTipsModel.cs
+++ b/System/KnapSack/Logic/ItemTipsModel.cs
@@ -24,7 +24,6 @@
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; }
@@ -81,8 +80,6 @@
guardDesDict = new Dictionary<int, List<string>>();
FuncConfigConfig guardDesFunc = FuncConfigConfig.Get("GuardianTips");
- FuncConfigConfig guardAutoDropFunc = FuncConfigConfig.Get("GuardianPickUpID");
- guardAutoDrops = ConfigParse.GetMultipleStr<int>(guardAutoDropFunc.Numerical1);
JsonData guardDesData = JsonMapper.ToObject(guardDesFunc.Numerical1);
foreach (var key in guardDesData.Keys)
{
@@ -289,7 +286,7 @@
if (isShowUINow)
{
- ShowUICtrl();
+ ShowTip();
}
}
@@ -320,7 +317,7 @@
if (isShowUINow)
{
- ShowUICtrl();
+ ShowTip();
}
}
@@ -361,7 +358,7 @@
, type, itemModel.guid, ConfigParse.Analysis(itemModel.itemInfo.userData));
}
- public void ShowUICtrl()
+ public void ShowTip()
{
if (curAttrData == null) return;
@@ -462,7 +459,6 @@
string jobName = "";
public string GetEquipJobName(ItemAttrData attrData)
{
-
jobName = "";
if (attrData == null) return jobName;
@@ -483,15 +479,8 @@
{
if (attrData.itemConfig.JobLimit != 0)
{
- JobNameConfig jobNameConfig = JobNameConfig.Get(attrData.itemConfig.JobLimit);
- if (playerJob >= equipJob)
- {
- jobName = UIHelper.AppendColor(TextColType.White, jobNameConfig.name);
- }
- else
- {
- jobName = UIHelper.AppendColor(TextColType.Red, jobNameConfig.name);
- }
+ var config = JobNameConfig.Get(attrData.itemConfig.JobLimit);
+ jobName = UIHelper.AppendColor(playerJob >= equipJob ? TextColType.White : TextColType.Red, config.name);
}
else
{
@@ -1767,8 +1756,6 @@
public bool isHavePutLimit { get; private set; }
- ItemTipsModel itemTipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }
- RuneModel runeModel { get { return ModelCenter.Instance.GetModel<RuneModel>(); } }
GodBeastModel beastModel { get { return ModelCenter.Instance.GetModel<GodBeastModel>(); } }
public ItemAttrData(int id, bool isPreview = false, ulong count = 0, int index = -1, bool isCompare = false, PackType type = PackType.Deleted, string guid = "", Dictionary<int, List<int>> useDataDict = null, ItemTipChildType childType = ItemTipChildType.Normal)
@@ -2019,7 +2006,6 @@
{
exhaustedMaxDataDict.Add(ids[i], values[i]);
}
-
}
//璁剧疆寮规鐨勫疂鐭虫暟鎹�
diff --git a/System/KnapSack/New/BagWin.cs b/System/KnapSack/New/BagWin.cs
index f6f2218..9658792 100644
--- a/System/KnapSack/New/BagWin.cs
+++ b/System/KnapSack/New/BagWin.cs
@@ -253,7 +253,7 @@
gridCell.itemCellBtn.onceClick = (int info) =>
{
itemTipsModel.SetItemTipsModel(PackType.Item, itemModel.guid, false, true);
- itemTipsModel.ShowUICtrl();
+ itemTipsModel.ShowTip();
};
gridCell.itemCellBtn.doubleClick = () =>
{
@@ -267,7 +267,7 @@
{
itemTipsModel.SetItemTipsModel(PackType.Item, itemModel.guid, false, true);
itemTipsModel.SetBagTipsBtn(itemTipsModel.curAttrData);
- itemTipsModel.ShowUICtrl();
+ itemTipsModel.ShowTip();
};
}
diff --git a/System/KnapSack/New/DepotWin.cs b/System/KnapSack/New/DepotWin.cs
index e555549..b081de5 100644
--- a/System/KnapSack/New/DepotWin.cs
+++ b/System/KnapSack/New/DepotWin.cs
@@ -184,7 +184,7 @@
gridCell.itemCellBtn.onceClick = (int info) =>
{
itemTipsModel.SetItemTipsModel(PackType.Warehouse, itemModel.guid, false, true);
- itemTipsModel.ShowUICtrl();
+ itemTipsModel.ShowTip();
};
gridCell.itemCellBtn.doubleClick = () =>
{
diff --git a/System/KnapSack/New/EquipPlaceCell.cs b/System/KnapSack/New/EquipPlaceCell.cs
index d4f175c..ea5fe17 100644
--- a/System/KnapSack/New/EquipPlaceCell.cs
+++ b/System/KnapSack/New/EquipPlaceCell.cs
@@ -74,7 +74,7 @@
tipModel.SetItemTipsModel(PackType.Equip, item.guid, false);
tipModel.SetPutOnTipsBtn(tipModel.curAttrData);
- tipModel.ShowUICtrl();
+ tipModel.ShowTip();
}
}
diff --git a/System/OffLineTime/OffLineTimeLackBehaviour.cs b/System/OffLineTime/OffLineTimeLackBehaviour.cs
index 5b0b085..46227bc 100644
--- a/System/OffLineTime/OffLineTimeLackBehaviour.cs
+++ b/System/OffLineTime/OffLineTimeLackBehaviour.cs
@@ -45,7 +45,7 @@
itemTipsModel.SetItemTipsModel(PackType.Item, itemModel.guid, false, true);
itemTipsModel.SetBagTipsBtn(itemTipsModel.curAttrData);
- itemTipsModel.ShowUICtrl();
+ itemTipsModel.ShowTip();
}
else
{
diff --git a/System/Store/StoreModel.cs b/System/Store/StoreModel.cs
index 549360f..14b6692 100644
--- a/System/Store/StoreModel.cs
+++ b/System/Store/StoreModel.cs
@@ -926,7 +926,7 @@
, "", null, ItemTipChildType.Buy);
itemTipsModel.SetItemTipsModel(attrData, false);
attrData.SetTipsFuncBtn(ItemOperateType.buy, (ItemOperateType type, string id) => { OnClickBuyBtn(ItemOperateType.buy, shopInfo.ID); });
- itemTipsModel.ShowUICtrl();
+ itemTipsModel.ShowTip();
}
public int BuyCnt { get; private set; }
diff --git a/System/TreasureFindHost/ReciveConditionCell.cs b/System/TreasureFindHost/ReciveConditionCell.cs
index 12d3f3e..3321b51 100644
--- a/System/TreasureFindHost/ReciveConditionCell.cs
+++ b/System/TreasureFindHost/ReciveConditionCell.cs
@@ -123,7 +123,7 @@
tipsModel.SetItemTipsModel(attrData, false);
if (tipsModel.compareAttrData != null)
{
- tipsModel.ShowUICtrl();
+ tipsModel.ShowTip();
}
else
{
--
Gitblit v1.8.0