From ddba48b78f2e433ea0365235d13f9c20fc9183a4 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 23 八月 2018 23:06:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/SideMission.cs | 55 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 44 insertions(+), 11 deletions(-)
diff --git a/System/MainInterfacePanel/SideMission.cs b/System/MainInterfacePanel/SideMission.cs
index b9ec018..74c0901 100644
--- a/System/MainInterfacePanel/SideMission.cs
+++ b/System/MainInterfacePanel/SideMission.cs
@@ -47,6 +47,7 @@
_TaskRamusList.OnRefreshCell += OnRefreshGridCell;
playerPack.RefreshItemCountAct += RefreshItemCountAct;
playerPack.ItemCntReduceAct += ItemCntReduceAct;
+ PlayerDatas.Instance.PlayerDataRefreshInfoEvent += Updatefighting;//鏁版嵁鐨勫埛鏂�(h0418)
OnCreateGridLineCell(_TaskRamusList);
}
@@ -55,8 +56,31 @@
_TaskRamusList.OnRefreshCell -= OnRefreshGridCell;
playerPack.RefreshItemCountAct -= RefreshItemCountAct;
playerPack.ItemCntReduceAct -= ItemCntReduceAct;
+ PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= Updatefighting;//鏁版嵁鐨勫埛鏂�(h0418)
}
+ private void Updatefighting(PlayerDataRefresh obj)
+ {
+ if (obj == PlayerDataRefresh.LV)
+ {
+ OpenShowButton();
+ }
+ }
+
+ private void OpenShowButton()
+ {
+ if (mainModel.TaskId_Skill1.Contains(TaskIdNow))
+ {
+ if (PlayerDatas.Instance.baseData.LV >= mainModel.TaskLv)
+ {
+ _Btn_Forward.gameObject.SetActive(true);
+ }
+ else
+ {
+ _Btn_Forward.gameObject.SetActive(false);
+ }
+ }
+ }
private void ItemCntReduceAct(PackType arg1, int arg2, int arg3)
{
if (arg1 == PackType.rptItem && arg3 == mainModel.ItemID)
@@ -107,11 +131,11 @@
}
else
{
- strNull = string.Format(Language.Get("PassiveSkillTask4"), needNumber, GoldPaper, needNumber- GoldPaper);
+ strNull = string.Format(Language.Get("PassiveSkillTask4"), needNumber, GoldPaper, needNumber - GoldPaper);
}
ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), strNull, (bool isOk) =>
{
-
+
if (isOk)
{
if (Gold + GoldPaper >= needNumber)
@@ -128,7 +152,7 @@
}
WindowCenter.Instance.Open<RechargeTipWin>();
}
- }
+ }
});
}
@@ -196,6 +220,7 @@
if (TaskId != TaskIdNow)
{
TaskIdNow = TaskId;
+ OpenShowButton();
_TaskRamusList.m_Scorller.RefreshActiveCellViews();//鍒锋柊褰撳墠鍙
}
});
@@ -214,26 +239,34 @@
string str = string.Empty;
if (mainModel.TaskId_Skill1.Contains(taskID))
{
- int itemNumber = playerPack.GetItemCountByID(PackType.rptItem, mainModel.ItemID);//鑾峰彇鐗规畩鐗╁搧
- if (itemNumber >= mainModel.ItemNumber)
+ if (PlayerDatas.Instance.baseData.LV >= mainModel.TaskLv)
{
- string Str_A = string.Format(Language.Get("PassiveSkillTask1"), mainModel.ItemID, mainModel.ItemNumber);
- str = Str_A;
+ int itemNumber = playerPack.GetItemCountByID(PackType.rptItem, mainModel.ItemID);//鑾峰彇鐗规畩鐗╁搧
+ if (itemNumber >= mainModel.ItemNumber)
+ {
+ string Str_A = string.Format(Language.Get("PassiveSkillTask1"), mainModel.ItemID, mainModel.ItemNumber);
+ str = Str_A;
+ }
+ else
+ {
+ string Str_A = string.Format(Language.Get("PassiveSkillTask1"), mainModel.ItemID, itemNumber);
+ str = Str_A;
+ }
}
else
{
- string Str_A = string.Format(Language.Get("PassiveSkillTask1"), mainModel.ItemID, itemNumber);
- str = Str_A;
+ string Str_C = string.Format(Language.Get("PassiveSkillTask5"), mainModel.TaskLv);
+ str = Str_C;
}
}
else
{
str = Config.Instance.Get<TASKINFOConfig>(strINfor).show_writing;
- }
+ }
str = WordAnalysis.Color_Start_Regex.Replace(str, string.Empty);
str = WordAnalysis.Color_End_Regex.Replace(str, string.Empty);
_Text_TaskTarget.text = str;//浠诲姟鐩爣
-
+
if ((int)taskmodel.GetTaskStatus(TaskIdNow) == 3 || mainModel.TaskId_Skill1.Contains(taskID))//鑳藉杩涜绔嬪嵆瀹屾垚鐨勬敮绾夸换鍔�
{
_Text_Forward.text = string.Format(Language.Get("FinishAtOnce_Z"));
--
Gitblit v1.8.0