From 901402b1f05a8c3ced3b3d808bb12ebd85a53032 Mon Sep 17 00:00:00 2001
From: client_wuxijin <364452445@qq.com>
Date: 星期五, 10 八月 2018 17:48:39 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/SideMission.cs | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/System/MainInterfacePanel/SideMission.cs b/System/MainInterfacePanel/SideMission.cs
index 313c384..3319c96 100644
--- a/System/MainInterfacePanel/SideMission.cs
+++ b/System/MainInterfacePanel/SideMission.cs
@@ -89,7 +89,17 @@
{
sideMissionTitleBtton.PitchOnImage.SetActive(false);
}
- sideMissionTitleBtton.TitleName.text= ConfigManager.Instance.GetTemplate<TASKINFOConfig>(taskmodel.SideQuestsDic[TaskId].Name).show_writing;//浠诲姟鍚�
+ var taskname = taskmodel.SideQuestsDic[TaskId].Name;
+ if (ConfigManager.Instance.GetTemplate<TASKINFOConfig>(taskname) == null)
+ {
+ DesignDebug.LogError("TASKINFO浠诲姟琛ㄦ牸娌℃湁鑾峰彇鍒拌浠诲姟鍚嶇О"+ taskname);
+ return;
+ }
+ sideMissionTitleBtton.TitleName.text= ConfigManager.Instance.GetTemplate<TASKINFOConfig>(taskname).show_writing;//浠诲姟鍚�
+ if (!taskmodel.SideQuestsDic.ContainsKey(TaskId))
+ {
+ return;
+ }
sideMissionTitleBtton.Text_RamusState.text = GegionalTaskStatus(taskmodel.SideQuestsDic[TaskId].MissionState);
sideMissionTitleBtton.SideMissionTitleBtton1.RemoveAllListeners();
sideMissionTitleBtton.SideMissionTitleBtton1.AddListener(()=>
@@ -105,6 +115,10 @@
void Information(int taskID)
{
+ if (!taskmodel.SideQuestsDic.ContainsKey(taskID))
+ {
+ return;
+ }
_Text_TaskName.text = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(taskmodel.SideQuestsDic[taskID].Name).show_writing;//浠诲姟鍚�
_Text_TaskDescribe.text = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(taskmodel.SideQuestsDic[taskID].Desclist).show_writing;//浠诲姟鎻忚堪
string strINfor = taskmodel.SideQuestsDic[taskID].InforList;
--
Gitblit v1.8.0