From 5cba98371d5a14cb82390a9052b9efec013d277d Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 26 三月 2019 11:52:36 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/DialogueDuidanceWin.cs | 83 +++++++++++++----------------------------
1 files changed, 26 insertions(+), 57 deletions(-)
diff --git a/System/MainInterfacePanel/DialogueDuidanceWin.cs b/System/MainInterfacePanel/DialogueDuidanceWin.cs
index 21e2d8c..4f3b978 100644
--- a/System/MainInterfacePanel/DialogueDuidanceWin.cs
+++ b/System/MainInterfacePanel/DialogueDuidanceWin.cs
@@ -29,13 +29,12 @@
[SerializeField] Text m_ContentText;
[SerializeField] Text m_NextText;
- [SerializeField] List<int> MysteriousTaskID = new List<int>();//鏂版坊绁炵浠诲姟
- Dictionary<int, string> PlayerIcon = new Dictionary<int, string>();
- private int storyMissionsID = 0;//鍓ф儏浠诲姟ID
- private int taskCount = 0;//鑾峰彇瀵硅瘽鎬绘潯鏁�
- private int[] sPeaker;//瀵硅瘽瀵瑰簲鍗婅韩鍍忥紙0涓轰富瑙�/1涓篘PC锛�
- private int nowTaskNum = 0;//鑾峰彇褰撳墠鐨勪换鍔�
- private int typesPeaker = -1;
+
+ int[] sPeaker;//瀵硅瘽瀵瑰簲鍗婅韩鍍忥紙0涓轰富瑙�/1涓篘PC锛�
+ int taskIndex = 0;//鑾峰彇褰撳墠鐨勪换鍔�
+ int typesPeaker = -1;
+
+ public static int storyMissionId = 0;
private float timeType = 0f;
TaskModel m_TaskModel;
@@ -61,7 +60,6 @@
var config = FuncConfigConfig.Get("TaskContinue");
FabaoId = int.Parse(config.Numerical1);
AwaitSecond = int.Parse(config.Numerical2);
- PlayerHead();
}
protected override void AddListeners()
@@ -77,8 +75,7 @@
m_NextText.text = string.Format(Language.Get("TaskContinueCount"), AwaitSecond);
IsCloseWindow();
typesPeaker = -1;
- storyMissionsID = taskmodel._TaskNow;
- var config = StoryMissionsConfig.Get(storyMissionsID);
+ var config = StoryMissionsConfig.Get(storyMissionId);
if (config.TaskMusic != 0)
{
SoundPlayer.Instance.PlayNpcAudio(config.TaskMusic);
@@ -87,22 +84,11 @@
{
return;
}
- if (config.NpcID[0] == taskmodel.NPCid)
- {
- taskCount = config.TalkNum[0];
- sPeaker = config.Speaker1;
- IsMultistage = 0;
- }
- else
- {
- taskCount = config.TalkNum[0];
- sPeaker = config.Speaker2;
- IsMultistage = 1;
- }
- //taskCount = config.TalkNum;
- //sPeaker = config.Speaker;
- nowTaskNum = 0;
- ShowDialogSelect(sPeaker[0], nowTaskNum);
+
+ sPeaker = config.Speaker1;
+
+ taskIndex = config.TalkNum[0];
+ ShowDialogSelect(sPeaker[0], taskIndex);
}
private void IsCloseWindow()
@@ -134,11 +120,6 @@
protected override void OnAfterClose()
{
- if (MysteriousTaskID.Contains(storyMissionsID))
- {
- mainModel.MysteriousTaskID = storyMissionsID;
- CoroutineMgr.Instance.OnMysteriousTask();
- }
bool _bool = IsDungeon();
if (_bool)
{
@@ -197,17 +178,20 @@
private void OnClickMarkRay()
{
timeType = 0;
- var config = StoryMissionsConfig.Get(storyMissionsID);
+ var config = StoryMissionsConfig.Get(storyMissionId);
if (config == null)
{
return;
}
- nowTaskNum += 1;
- if (taskCount - 1 >= nowTaskNum)//涓嬩竴鏉�
+
+ taskIndex += 1;
+ var end = config.TalkNum.Length > 1 ? config.TalkNum[1] : config.TalkNum[0];
+
+ if (taskIndex <= end)//涓嬩竴鏉�
{
- ShowDialogSelect(sPeaker[nowTaskNum], nowTaskNum);
+ ShowDialogSelect(sPeaker[taskIndex], taskIndex);
}
- if (taskCount - 1 < nowTaskNum)//鏈�鍚庝竴鏉�
+ else//鏈�鍚庝竴鏉�
{
SessionEnd(TaskType.OK);
Close();
@@ -223,7 +207,7 @@
}
private void OnClickSKIPButton()
{
- var config = StoryMissionsConfig.Get(storyMissionsID);
+ var config = StoryMissionsConfig.Get(storyMissionId);
if (config != null)
{
SessionEnd(TaskType.OK);
@@ -251,7 +235,7 @@
m_PlayerNameText.text = PlayerDatas.Instance.baseData.PlayerName;
- string platercContentKey = StoryMissionsConfig.Get(storyMissionsID).content[IsMultistage];
+ string platercContentKey = StoryMissionsConfig.Get(storyMissionId).content;
var config = TASKINFOConfig.Get(string.Format(platercContentKey, stepNum));
if (config != null)
{
@@ -270,15 +254,15 @@
m_BaseboardImageNPC.SetActive(true);
m_BaseboardImagePlayer.SetActive(false);
}
- var configStoryMissions = StoryMissionsConfig.Get(storyMissionsID);
+ var configStoryMissions = StoryMissionsConfig.Get(storyMissionId);
if (configStoryMissions == null)
{
return;
}
- int npcId = configStoryMissions.NpcID[IsMultistage];
+ int npcId = configStoryMissions.NpcID;
var npcConfig = NPCConfig.Get(npcId);
m_NPCNameText.text = npcConfig.charName;
- string npcContentKey = configStoryMissions.content[IsMultistage];
+ string npcContentKey = configStoryMissions.content;
var taskInfo = TASKINFOConfig.Get(string.Format(npcContentKey, stepNum));
if (taskInfo == null)
{
@@ -288,9 +272,7 @@
{
m_ContentText_Npc.text = taskInfo.show_writing;
}
-
- string npcIcon = configStoryMissions.NpcIcon[IsMultistage];
-
+
var data = new UI3DNPCExhibitionData()
{
npcId = npcId,
@@ -314,19 +296,6 @@
break;
default:
break;
- }
- }
- private void PlayerHead()
- {
- string[] headStr1 = FuncConfigConfig.Get("StoryTaskIcon").Numerical1.Split('|');
- string[] headStr2 = FuncConfigConfig.Get("StoryTaskIcon").Numerical2.Split('|');
- for (int i = 0; i < headStr1.Length; i++)
- {
- if (!PlayerIcon.ContainsKey(int.Parse(headStr1[i])))
- {
- PlayerIcon.Add(int.Parse(headStr1[i]), headStr2[i]);
-
- }
}
}
--
Gitblit v1.8.0