From 530d0830abd6e82fc6eacc29515be4cf99d50af0 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 19 九月 2018 11:59:28 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/SideMission.cs | 117 +---------------------------------------------------------
1 files changed, 2 insertions(+), 115 deletions(-)
diff --git a/System/MainInterfacePanel/SideMission.cs b/System/MainInterfacePanel/SideMission.cs
index e18eccf..980bb17 100644
--- a/System/MainInterfacePanel/SideMission.cs
+++ b/System/MainInterfacePanel/SideMission.cs
@@ -45,8 +45,6 @@
{
TaskIdNow = 0;
_TaskRamusList.OnRefreshCell += OnRefreshGridCell;
- playerPack.RefreshItemCountAct += RefreshItemCountAct;
- playerPack.ItemCntReduceAct += ItemCntReduceAct;
PlayerDatas.Instance.PlayerDataRefreshInfoEvent += Updatefighting;//鏁版嵁鐨勫埛鏂�(h0418)
OnCreateGridLineCell(_TaskRamusList);
}
@@ -54,101 +52,16 @@
private void OnDisable()
{
_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)
- {
- foreach (var key in taskmodel.SideQuestsDic.Keys)
- {
- if (mainModel.TaskId_Skill1.Contains(key))
- {
- _TaskRamusList.m_Scorller.RefreshActiveCellViews();//鍒锋柊褰撳墠鍙
- }
- }
- }
- }
-
- private void RefreshItemCountAct(PackType arg1, int arg2, int arg3)
- {
- if (arg1 == PackType.rptItem && arg3 == mainModel.ItemID)
- {
- foreach (var key in taskmodel.SideQuestsDic.Keys)
- {
- if (mainModel.TaskId_Skill1.Contains(key))
- {
- _TaskRamusList.m_Scorller.RefreshActiveCellViews();//鍒锋柊褰撳墠鍙
- }
- }
- }
}
private void ForwardButton()
{
- if (mainModel.TaskId_Skill1.Contains(TaskIdNow))
- {
- int itemNumber = playerPack.GetItemCountByID(PackType.rptItem, mainModel.ItemID);//鑾峰彇鐗规畩鐗╁搧
- if (itemNumber >= mainModel.ItemNumber)
- {
- taskmodel.CompletionOfTask(TaskIdNow);
- WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.SkillFunc2);
- }
- else
- {
- int Gold = (int)UIHelper.GetMoneyCnt(1);//浠欑帀
- string strNull = string.Empty;
- int needNumber = (mainModel.ItemNumber - itemNumber) * mainModel.UnitPrice;//鎵�闇�閲戦
- strNull = string.Format(Language.Get("PassiveSkillTask3"), needNumber);
-
- ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), strNull, (bool isOk) =>
- {
- if (isOk)
- {
- if (Gold >= needNumber)
- {
- taskmodel.CompletionOfTask(TaskIdNow);
- WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.SkillFunc2);
- }
- else
- {
- if (VersionConfig.Get().isBanShu)
- {
- SysNotifyMgr.Instance.ShowTip("GoldErr");
- return;
- }
- WindowCenter.Instance.Open<RechargeTipWin>();
- }
- }
- });
- }
- return;
- }
if ((int)taskmodel.GetTaskStatus(TaskIdNow) == 3)
{
taskmodel.CompletionOfTask(TaskIdNow);
@@ -211,7 +124,6 @@
if (TaskId != TaskIdNow)
{
TaskIdNow = TaskId;
- OpenShowButton();
_TaskRamusList.m_Scorller.RefreshActiveCellViews();//鍒锋柊褰撳墠鍙
}
});
@@ -228,37 +140,12 @@
_Text_TaskDescribe.text = Config.Instance.Get<TASKINFOConfig>(taskmodel.SideQuestsDic[taskID].Desclist).show_writing;//浠诲姟鎻忚堪
string strINfor = taskmodel.SideQuestsDic[taskID].InforList;
string str = string.Empty;
- if (mainModel.TaskId_Skill1.Contains(taskID))
- {
- if (PlayerDatas.Instance.baseData.LV >= mainModel.TaskLv)
- {
- 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_C = string.Format(Language.Get("PassiveSkillTask5"), mainModel.TaskLv);
- str = Str_C;
- }
- }
- else
- {
- str = Config.Instance.Get<TASKINFOConfig>(strINfor).show_writing;
- }
+ 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))//鑳藉杩涜绔嬪嵆瀹屾垚鐨勬敮绾夸换鍔�
+ if ((int)taskmodel.GetTaskStatus(TaskIdNow) == 3)//鑳藉杩涜绔嬪嵆瀹屾垚鐨勬敮绾夸换鍔�
{
_Text_Forward.text = string.Format(Language.Get("FinishAtOnce_Z"));
}
--
Gitblit v1.8.0