From 9c27aa4caaa28ffaf30ce22596ded528e1ea9cf9 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期六, 13 十月 2018 17:37:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Fight/PreFightMission.cs | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Fight/PreFightMission.cs b/Fight/PreFightMission.cs
index cf89836..26eb575 100644
--- a/Fight/PreFightMission.cs
+++ b/Fight/PreFightMission.cs
@@ -951,11 +951,17 @@
yield return WaitingForSecondConst.WaitMS500;
+ string _path = "BaseCanvas/MainInterfaceWin/TaskAndTeamTip/TaskListTip/Parent/TaskScroll View/Content/Main_1000";
+ if(!WindowCenter.Instance.uiRoot.transform.Find(_path))
+ {
+ _path = "BaseCanvas/MainInterfaceWin/TaskAndTeamTip/TaskListTip/Parent/TaskScroll View/Content/Main_1001";
+ }
+
// 鎵撳紑寮曞鐣岄潰
NewGuideModel _model2 = ModelCenter.Instance.GetModel<NewGuideModel>();
_model2.showMask = true;
_model2.content = "鐐瑰嚮寮�濮�<color=#00ff00>璇曠偧</color>";
- _model2.componentPath = "BaseCanvas/MainInterfaceWin/TaskAndTeamTip/TaskListTip/Parent/TaskScroll View/Content/Main_1001";
+ _model2.componentPath = _path;
_model2.size = new Vector2(276, 72);
_model2.direction = 3;
_model2.clickClosed = true;
@@ -964,7 +970,7 @@
{
GA_Hero.s_MapSwitching = false;
- _temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/TaskAndTeamTip/TaskListTip/Parent/TaskScroll View/Content/Main_1001");
+ _temp = WindowCenter.Instance.uiRoot.transform.Find(_path);
var _btn = _temp.GetComponent<UnityEngine.UI.Button>();
if (_btn)
{
--
Gitblit v1.8.0