From 79457ed9f96d8b2b1e097a8e8940d09bb20385aa Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 19 四月 2019 09:44:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/DialogueDuidanceWin.cs | 45 +++++++++++++++++----------------------------
1 files changed, 17 insertions(+), 28 deletions(-)
diff --git a/System/MainInterfacePanel/DialogueDuidanceWin.cs b/System/MainInterfacePanel/DialogueDuidanceWin.cs
index 4f3b978..c30bc2e 100644
--- a/System/MainInterfacePanel/DialogueDuidanceWin.cs
+++ b/System/MainInterfacePanel/DialogueDuidanceWin.cs
@@ -6,7 +6,6 @@
using System;
using System.Collections;
using System.Collections.Generic;
-
using UnityEngine;
using UnityEngine.UI;
//鍓ф儏瀵硅瘽闈㈡澘
@@ -70,7 +69,6 @@
protected override void OnPreOpen()
{
- MainInterfaceWin.IsOpenMaininterface += IsOpenMaininterface;
timeType = 0;
m_NextText.text = string.Format(Language.Get("TaskContinueCount"), AwaitSecond);
IsCloseWindow();
@@ -109,7 +107,6 @@
}
protected override void OnPreClose()
{
- MainInterfaceWin.IsOpenMaininterface -= IsOpenMaininterface;
UI3DModelExhibition.Instance.StopShow();
}
@@ -132,6 +129,11 @@
}
protected override void LateUpdate()
{
+ if (WindowCenter.Instance.IsOpen("MainInterfaceWin"))
+ {
+ WindowCenter.Instance.Close<DialogueDuidanceWin>();
+ }
+
timeType += Time.deltaTime;
if (timeType >= AwaitSecond)
{
@@ -141,7 +143,7 @@
}
else
{
- m_NextText.text= string.Format(Language.Get("TaskContinueCount"), AwaitSecond - (int)timeType);
+ m_NextText.text = string.Format(Language.Get("TaskContinueCount"), AwaitSecond - (int)timeType);
}
if (this is BossShowDialogueWin)
@@ -149,31 +151,18 @@
return;
}
- if (!WindowCenter.Instance.IsOpen<DialogueDuidanceWin>())
+ var hero = PlayerDatas.Instance.hero;
+ if (hero != null && hero.LockTarget != null)
{
- return;
+ var checkDistSqrt = MathUtility.DistanceSqrtXZ(hero.Pos, hero.LockTarget.Pos);
+ if (checkDistSqrt > Mathf.Pow(GeneralDefine.FarawayNpcDist, 2))
+ {
+ WindowCenter.Instance.Close<DialogueDuidanceWin>();
+ WindowCenter.Instance.Open<MainInterfaceWin>();
+ hero.LockTarget = null;
+ }
}
- GA_Hero _hero = PlayerDatas.Instance.hero;
- if (_hero == null)
- {
- return;
- }
-
- if (_hero.LockTarget == null)
- {
- return;
- }
-
- float _chkDistSqrt = MathUtility.DistanceSqrtXZ(_hero.Pos, _hero.LockTarget.Pos);
- if (_chkDistSqrt > Mathf.Pow(GeneralDefine.FarawayNpcDist, 2))
- {
-
- WindowCenter.Instance.Close<DialogueDuidanceWin>();
- WindowCenter.Instance.Open<MainInterfaceWin>();
-
- _hero.LockTarget = null;
- }
}
private void OnClickMarkRay()
{
@@ -272,13 +261,13 @@
{
m_ContentText_Npc.text = taskInfo.show_writing;
}
-
+
var data = new UI3DNPCExhibitionData()
{
npcId = npcId,
isDialogue = true,
};
- UI3DModelExhibition.Instance.ShowNPC(m_NPCIcon,data);
+ UI3DModelExhibition.Instance.ShowNPC(m_NPCIcon, data);
}
typesPeaker = type;
}
--
Gitblit v1.8.0