|
|
@@ -101,6 +101,7 @@ namespace GFGGame
|
|
|
itemList.Clear();
|
|
|
_ui.m_rangeDown.RemoveChildren();
|
|
|
Timers.inst.Remove(UpdateBtnTimer);
|
|
|
+ _valueBarController.OnHide();
|
|
|
base.OnHide();
|
|
|
}
|
|
|
protected override void AddEventListener()
|
|
|
@@ -130,6 +131,7 @@ namespace GFGGame
|
|
|
rand = new System.Random();
|
|
|
_ui.m_rewardGet.visible = false;
|
|
|
_ui.m_sellBtn.target.GetChild("sellGetNum").text = "";
|
|
|
+ _ui.m_sellBtn.target.GetChild("sellReward").icon = "";
|
|
|
//_ui.m_newMaterial.target.visible = false;
|
|
|
_ui.m_name.text = "";
|
|
|
_ui.m_desc.text = "";
|
|
|
@@ -304,7 +306,7 @@ namespace GFGGame
|
|
|
_ui.m_name.text = mergeCfg.name;
|
|
|
_ui.m_desc.text = mergeCfg.desc;
|
|
|
ItemCfg itemReward = ItemCfgArray.Instance.GetCfg(MergeCfgArray.Instance.GetCfgByresTypeAndmaterialld(_res, id).bonusSellArr[0][0]);
|
|
|
- _ui.m_sellBtn.target.GetChild("sellReward").icon = ResPathUtil.GetCommonGameResPath(itemReward.res);
|
|
|
+ _ui.m_sellBtn.target.GetChild("sellReward").icon = ResPathUtil.GetIconPath(itemReward.res,"png");
|
|
|
_ui.m_sellBtn.target.GetChild("sellGetNum").text = MergeCfgArray.Instance.GetCfgByresTypeAndmaterialld(_res, id).bonusSellArr[0][1].ToString();
|
|
|
|
|
|
}
|
|
|
@@ -489,7 +491,7 @@ namespace GFGGame
|
|
|
}
|
|
|
_ui.m_rewardNum.text = String.Format("+{0}", MergeGameArray.Instance.GetCfg(taskId).bonusWinArr[0][1]);
|
|
|
ItemCfg itemReward = ItemCfgArray.Instance.GetCfg(MergeGameArray.Instance.GetCfg(taskId).bonusWinArr[0][0]);
|
|
|
- _ui.m_rewardIcon.url = ResPathUtil.GetCommonGameResPath(itemReward.res);
|
|
|
+ _ui.m_rewardIcon.url = ResPathUtil.GetIconPath(itemReward.res,"png");
|
|
|
for (int k = 0; k < MergeGameArray.Instance.GetCfg(taskId).targetIdArr.Length; k++)
|
|
|
{
|
|
|
int targetID = MergeGameArray.Instance.GetCfg(taskId).targetIdArr[k][0];
|
|
|
@@ -520,6 +522,7 @@ namespace GFGGame
|
|
|
_ui.m_rewardGet.visible = false;
|
|
|
}
|
|
|
_ui.m_sellBtn.target.GetChild("sellGetNum").text = "";
|
|
|
+ _ui.m_sellBtn.target.GetChild("sellReward").icon = "";
|
|
|
_ui.m_name.text = "";
|
|
|
_ui.m_desc.text = "";
|
|
|
materialID = 0;
|
zhangyuqian