From 3d9e92dafe8e8ab19fdc7249a92c6d8114cadc05 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期日, 28 四月 2019 17:10:39 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/TaskModel.cs | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/System/MainInterfacePanel/TaskModel.cs b/System/MainInterfacePanel/TaskModel.cs
index a6faf4e..9a9ed39 100644
--- a/System/MainInterfacePanel/TaskModel.cs
+++ b/System/MainInterfacePanel/TaskModel.cs
@@ -69,6 +69,9 @@
public Dictionary<int, Dictionary<string, int>> ReplaceDic = new Dictionary<int, Dictionary<string, int>>();//key鍊兼浛鎹㈠瓧鍏�
public Dictionary<int, RunTaskAwardRecord> AwardRecordDic = new Dictionary<int, RunTaskAwardRecord>();//璺戠幆濂栧姳璁板綍
public Dictionary<int, int> NPCShowDic = new Dictionary<int, int>();//鍏充簬NPC鐨勬樉闅愰棶棰�
+
+ Dictionary<int, int> m_ShowNpcCache = new Dictionary<int, int>();
+
public delegate void OnTaskToAdd(int MissionID, int MissionState, int DiscriptionIndex);
public static event OnTaskToAdd Event_TaskToAdd;//浠诲姟娣诲姞
public delegate void OnTaskRefreshes(int _taskId);
@@ -186,6 +189,7 @@
ReplaceDic.Clear();
AwardRecordDic.Clear();
NPCShowDic.Clear();
+ m_ShowNpcCache.Clear();
_conversation = null;
_DefaultDialogContent = null;
_TaskNow = 0;
@@ -1388,6 +1392,10 @@
{
foreach (string key in _Dic.Keys)
{
+ if (key.Equals("Show_{visit_npc_id}"))
+ {
+ continue;
+ }
string[] str = key.Split('_');
if (str[0] == "Show")
{
@@ -1399,6 +1407,27 @@
private void StorageNPCDic(uint taskId, string key, int Value)//鍏充簬NPC鐨勬樉闅�
{
+ if (key.Equals("Show_{visit_npc_id}"))
+ {
+ m_ShowNpcCache[(int)taskId] = Value;
+ return;
+ }
+
+ if (key.Equals("visit_npc_id"))
+ {
+ if (m_ShowNpcCache.ContainsKey((int)taskId))
+ {
+ Task0820(new H0820_tagMissionDict()
+ {
+ MissionID = taskId,
+ DictKey = "Show_" + Value,
+ DictValue = (uint)m_ShowNpcCache[(int)taskId],
+ });
+ m_ShowNpcCache.Remove((int)taskId);
+ }
+ return;
+ }
+
string[] str = key.Split('_');
if (str[0] == "Show")
{
--
Gitblit v1.8.0