From 1d24fbd1655e724eebb2e717c9f0ed80e881b582 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 24 八月 2018 11:49:20 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Market/MarketWin.cs | 261 ++++++------
System/Pet/PetWin.cs | 5
System/Realm/RealmWin.cs | 5
System/FairyAu/UnionPanel.cs | 393 +++++++++---------
System/Vip/VipRechargeWin.cs | 5
System/Role/RolePanel.cs | 5
System/Rune/RunePanel.cs | 5
System/RuneTower/RuneTowerWin.cs | 5
System/Treasure/TreasureSelectWin.cs | 5
System/Treasure/TreasureSoulWin.cs | 5
System/SystemSetting/SettingUpWin.cs | 10
System/OpenServerActivity/OpenServerGiftWin.cs | 4
System/Vip/VipExperienceWin.cs | 5
System/FindPrecious/FindPreciousFrameWin.cs | 359 +++++++++--------
System/WorldMap/MapFrameWin.cs | 5
System/Dogz/DogzWin.cs | 6
System/Rank/RankPanel.cs | 5
System/DailyQuest/DailyQuestRealmPracticeBehaviour.cs | 3
System/WorldMap/LocalMapWin.cs | 10
System/WorldMap/WorldMapWin.cs | 9
System/OpenServerActivity/OpenServerActivityWin.cs | 6
System/Skill/SkillPanel.cs | 5
System/RolePromote/RolePromoteWin.cs | 5
System/FairyAu/PlayerRedPacketDatas.cs | 16
System/FairyAu/FairyAuTaskWin.cs | 5
System/DailyQuest/DailyQuestWin.cs | 5
26 files changed, 605 insertions(+), 547 deletions(-)
diff --git a/System/DailyQuest/DailyQuestRealmPracticeBehaviour.cs b/System/DailyQuest/DailyQuestRealmPracticeBehaviour.cs
index 720439c..b17f3ad 100644
--- a/System/DailyQuest/DailyQuestRealmPracticeBehaviour.cs
+++ b/System/DailyQuest/DailyQuestRealmPracticeBehaviour.cs
@@ -145,8 +145,7 @@
{
WindowJumpMgr.Instance.ClearJumpData();
- WindowCenter.Instance.Close<DailyQuestWin>();
- WindowCenter.Instance.Open<RealmWin>();
+ WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.RealmFunc1);
}
private void GetPracticePoint()
diff --git a/System/DailyQuest/DailyQuestWin.cs b/System/DailyQuest/DailyQuestWin.cs
index 7e35413..b122700 100644
--- a/System/DailyQuest/DailyQuestWin.cs
+++ b/System/DailyQuest/DailyQuestWin.cs
@@ -71,7 +71,10 @@
protected override void OnAfterClose()
{
- WindowCenter.Instance.Open<MainInterfaceWin>();
+ if (!WindowJumpMgr.Instance.IsJumpState)
+ {
+ WindowCenter.Instance.Open<MainInterfaceWin>();
+ }
}
protected override void OnActived()
diff --git a/System/Dogz/DogzWin.cs b/System/Dogz/DogzWin.cs
index 7a6c76f..8da53be 100644
--- a/System/Dogz/DogzWin.cs
+++ b/System/Dogz/DogzWin.cs
@@ -75,14 +75,16 @@
protected override void OnAfterClose()
{
-
+ if (!WindowJumpMgr.Instance.IsJumpState)
+ {
+ WindowCenter.Instance.Open<MainInterfaceWin>();
+ }
}
void OnClose()
{
CloseChild();
CloseImmediately();
- WindowCenter.Instance.Open<MainInterfaceWin>();
}
void CloseChild()
diff --git a/System/FairyAu/FairyAuTaskWin.cs b/System/FairyAu/FairyAuTaskWin.cs
index e84e097..af87039 100644
--- a/System/FairyAu/FairyAuTaskWin.cs
+++ b/System/FairyAu/FairyAuTaskWin.cs
@@ -124,6 +124,10 @@
PlayerTaskDatas.Event_FairyAuTask -= FairyAuRefresh;
PlayerTaskDatas.Event_FairyAuReward -= FairyAuGrades;
taskmodel.FairyAuBool = false;
+ if (!WindowJumpMgr.Instance.IsJumpState)
+ {
+ WindowCenter.Instance.Open<MainInterfaceWin>();
+ }
}
private void OnPlayerDie()
@@ -226,7 +230,6 @@
void CloseButton()//鍏抽棴鎸夐挳
{
WindowCenter.Instance.CloseImmediately<FairyAuTaskWin>();
- WindowCenter.Instance.Open<MainInterfaceWin>();
}
void CompleteTaskDeletion()//鍒犻櫎瀹屾垚鐨勪换鍔�
{
diff --git a/System/FairyAu/PlayerRedPacketDatas.cs b/System/FairyAu/PlayerRedPacketDatas.cs
index 418fa3c..0c27bbb 100644
--- a/System/FairyAu/PlayerRedPacketDatas.cs
+++ b/System/FairyAu/PlayerRedPacketDatas.cs
@@ -152,6 +152,8 @@
}
else
{
+
+
_DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].RedPacketID = (int)info.RedPacketInfo[i].RedPacketID;
_DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].PlayerID = (int)info.RedPacketInfo[i].PlayerID;
_DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].Name = info.RedPacketInfo[i].Name;
@@ -162,6 +164,17 @@
_DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].GetWay = (int)info.RedPacketInfo[i].GetWay;
_DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].PacketCnt = (int)info.RedPacketInfo[i].PacketCnt;
_DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].State = (int)info.RedPacketInfo[i].State;
+ if ((int)info.RedPacketInfo[i].RedPacketID == RedBagId)
+ {
+ var Values = _DicRedGrabinfo.Values;
+ foreach (var value in Values)
+ {
+ if (value.Name == PlayerDatas.Instance.baseData.PlayerName)
+ {
+ _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].State = 2;
+ }
+ }
+ }
_DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].Wish = (string)info.RedPacketInfo[i].Wish;
if (Event_RedEnvelopeToRefresh != null)
{
@@ -170,10 +183,7 @@
}
}
-
}
-
-
}
IsRedBagGet();
diff --git a/System/FairyAu/UnionPanel.cs b/System/FairyAu/UnionPanel.cs
index 1edc775..f7a07b2 100644
--- a/System/FairyAu/UnionPanel.cs
+++ b/System/FairyAu/UnionPanel.cs
@@ -1,195 +1,198 @@
-锘縰sing System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-namespace Snxxz.UI
-{
-
- //浠欑洘绯荤粺闈㈡澘鎺у埗鍣�
- public class UnionPanel : Window
- {
- #region 鐣岄潰
- [SerializeField] GameObject funcPanel;
- #endregion
-
- [SerializeField] Button _CloseBtn;//鍏抽棴鎸夐挳
- [SerializeField] Button _LeftBtn;//鍚戝乏鎸夐挳
- [SerializeField] Button _RightBtn;//鍚戝彸鎸夐挳
-
-
- [SerializeField] FunctionButton _FunctionsBtn;//鍩烘湰鍔熻兘
- [SerializeField] FunctionButton _MemberListBtn;//鎴愬憳鍒楄〃
- [SerializeField] FunctionButton _UnionLisBtn;//浠欑洘鍒楄〃
- [SerializeField] FunctionButton _UnionLeagueBtn;//浠欑洘鑱旇禌
- [SerializeField] FunctionButton _KingTemperBtn;//鐜嬭�呭湥娈�
- [SerializeField] FunctionButtonGroup buttonGroup;
-
- private void OnRefreshFairyMine()
- {
- if (!PlayerDatas.Instance.fairyData.HasFairy)
- {
- InitFairyFunc();
- buttonGroup.TriggerByOrder(3);
- }
- }
-
- private void OnRefreshFariyInfo()
- {
- if (!_MemberListBtn.gameObject.activeInHierarchy)
- {
- InitFairyFunc();
- buttonGroup.TriggerByOrder(2);
- }
- }
-
- protected override void BindController()
- {
-
- }
-
- protected override void AddListeners()
- {
- _FunctionsBtn.AddListener(OnBaseFunc);
- _MemberListBtn.AddListener(OnMemberList);
- _UnionLisBtn.AddListener(OnUnionList);
- _UnionLeagueBtn.AddListener(OnUnionLeague);
- _KingTemperBtn.AddListener(OnKingTemper);
- _CloseBtn.onClick.AddListener(CloseClick);
- _RightBtn.onClick.AddListener(buttonGroup.TriggerNext);
- _LeftBtn.onClick.AddListener(buttonGroup.TriggerLast);
-
- }
-
- private void OnKingTemper()
- {
- CloseChildWin();
- if (windowState == WindowState.Opened)
- {
- WindowCenter.Instance.OpenWithoutAnimation<KingTempleWin>();
- }
- else
- {
- WindowCenter.Instance.Open<KingTempleWin>();
- }
- functionOrder = 5;
- }
-
- private void OnUnionLeague()
- {
- CloseChildWin();
- if (windowState == WindowState.Opened)
- {
- WindowCenter.Instance.OpenWithoutAnimation<FairyLeagueWin>();
- }
- else
- {
- WindowCenter.Instance.Open<FairyLeagueWin>();
- }
- functionOrder = 4;
- }
-
- private void OnUnionList()
- {
- CloseChildWin();
- if (windowState == WindowState.Opened)
- {
- WindowCenter.Instance.OpenWithoutAnimation<FairyApplyWin>();
- }
- else
- {
- WindowCenter.Instance.Open<FairyApplyWin>();
- }
- functionOrder = 3;
- }
-
- private void OnMemberList()
- {
- CloseChildWin();
- if (windowState == WindowState.Opened)
- {
- WindowCenter.Instance.OpenWithoutAnimation<FairyMemberWin>();
- }
- else
- {
- WindowCenter.Instance.Open<FairyMemberWin>();
- }
- functionOrder = 2;
- }
-
- private void OnBaseFunc()
- {
- CloseChildWin();
- funcPanel.SetActive(true);
- functionOrder = 1;
- }
-
- protected override void OnPreOpen()
- {
- PlayerDatas.Instance.fairyData.OnRefreshFairyInfo += OnRefreshFariyInfo;
- PlayerDatas.Instance.fairyData.OnRefreshFairyMine += OnRefreshFairyMine;
-
- InitFairyFunc();
- }
-
- protected override void OnActived()
- {
- base.OnActived();
- buttonGroup.TriggerByOrder(functionOrder);
- }
-
- protected override void OnAfterOpen()
- {
-
- }
-
- protected override void OnPreClose()
- {
- CloseChildWin();
- }
-
- protected override void OnAfterClose()
- {
- PlayerDatas.Instance.fairyData.OnRefreshFairyInfo -= OnRefreshFariyInfo;
- PlayerDatas.Instance.fairyData.OnRefreshFairyMine -= OnRefreshFairyMine;
- WindowCenter.Instance.Open<MainInterfaceWin>();
- }
-
-
- void CloseChildWin()
- {
- funcPanel.SetActive(false);
- if (WindowCenter.Instance.CheckOpen<FairyApplyWin>())
- {
- WindowCenter.Instance.CloseImmediately<FairyApplyWin>();
- }
- if (WindowCenter.Instance.CheckOpen<FairyMemberWin>())
- {
- WindowCenter.Instance.CloseImmediately<FairyMemberWin>();
- }
- if (WindowCenter.Instance.CheckOpen<FairyLeagueWin>())
- {
- WindowCenter.Instance.CloseImmediately<FairyLeagueWin>();
- }
- if (WindowCenter.Instance.CheckOpen<KingTempleWin>())
- {
- WindowCenter.Instance.CloseImmediately<KingTempleWin>();
- }
- }
-
- void InitFairyFunc()
- {
- if (!PlayerDatas.Instance.fairyData.HasFairy)
- {
- _FunctionsBtn.gameObject.SetActive(false);
- _MemberListBtn.gameObject.SetActive(false);
- }
- else
- {
- _FunctionsBtn.gameObject.SetActive(true);
- _MemberListBtn.gameObject.SetActive(true);
- }
- }
- }
-}
-
+锘縰sing System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+namespace Snxxz.UI
+{
+
+ //浠欑洘绯荤粺闈㈡澘鎺у埗鍣�
+ public class UnionPanel : Window
+ {
+ #region 鐣岄潰
+ [SerializeField] GameObject funcPanel;
+ #endregion
+
+ [SerializeField] Button _CloseBtn;//鍏抽棴鎸夐挳
+ [SerializeField] Button _LeftBtn;//鍚戝乏鎸夐挳
+ [SerializeField] Button _RightBtn;//鍚戝彸鎸夐挳
+
+
+ [SerializeField] FunctionButton _FunctionsBtn;//鍩烘湰鍔熻兘
+ [SerializeField] FunctionButton _MemberListBtn;//鎴愬憳鍒楄〃
+ [SerializeField] FunctionButton _UnionLisBtn;//浠欑洘鍒楄〃
+ [SerializeField] FunctionButton _UnionLeagueBtn;//浠欑洘鑱旇禌
+ [SerializeField] FunctionButton _KingTemperBtn;//鐜嬭�呭湥娈�
+ [SerializeField] FunctionButtonGroup buttonGroup;
+
+ private void OnRefreshFairyMine()
+ {
+ if (!PlayerDatas.Instance.fairyData.HasFairy)
+ {
+ InitFairyFunc();
+ buttonGroup.TriggerByOrder(3);
+ }
+ }
+
+ private void OnRefreshFariyInfo()
+ {
+ if (!_MemberListBtn.gameObject.activeInHierarchy)
+ {
+ InitFairyFunc();
+ buttonGroup.TriggerByOrder(2);
+ }
+ }
+
+ protected override void BindController()
+ {
+
+ }
+
+ protected override void AddListeners()
+ {
+ _FunctionsBtn.AddListener(OnBaseFunc);
+ _MemberListBtn.AddListener(OnMemberList);
+ _UnionLisBtn.AddListener(OnUnionList);
+ _UnionLeagueBtn.AddListener(OnUnionLeague);
+ _KingTemperBtn.AddListener(OnKingTemper);
+ _CloseBtn.onClick.AddListener(CloseClick);
+ _RightBtn.onClick.AddListener(buttonGroup.TriggerNext);
+ _LeftBtn.onClick.AddListener(buttonGroup.TriggerLast);
+
+ }
+
+ private void OnKingTemper()
+ {
+ CloseChildWin();
+ if (windowState == WindowState.Opened)
+ {
+ WindowCenter.Instance.OpenWithoutAnimation<KingTempleWin>();
+ }
+ else
+ {
+ WindowCenter.Instance.Open<KingTempleWin>();
+ }
+ functionOrder = 5;
+ }
+
+ private void OnUnionLeague()
+ {
+ CloseChildWin();
+ if (windowState == WindowState.Opened)
+ {
+ WindowCenter.Instance.OpenWithoutAnimation<FairyLeagueWin>();
+ }
+ else
+ {
+ WindowCenter.Instance.Open<FairyLeagueWin>();
+ }
+ functionOrder = 4;
+ }
+
+ private void OnUnionList()
+ {
+ CloseChildWin();
+ if (windowState == WindowState.Opened)
+ {
+ WindowCenter.Instance.OpenWithoutAnimation<FairyApplyWin>();
+ }
+ else
+ {
+ WindowCenter.Instance.Open<FairyApplyWin>();
+ }
+ functionOrder = 3;
+ }
+
+ private void OnMemberList()
+ {
+ CloseChildWin();
+ if (windowState == WindowState.Opened)
+ {
+ WindowCenter.Instance.OpenWithoutAnimation<FairyMemberWin>();
+ }
+ else
+ {
+ WindowCenter.Instance.Open<FairyMemberWin>();
+ }
+ functionOrder = 2;
+ }
+
+ private void OnBaseFunc()
+ {
+ CloseChildWin();
+ funcPanel.SetActive(true);
+ functionOrder = 1;
+ }
+
+ protected override void OnPreOpen()
+ {
+ PlayerDatas.Instance.fairyData.OnRefreshFairyInfo += OnRefreshFariyInfo;
+ PlayerDatas.Instance.fairyData.OnRefreshFairyMine += OnRefreshFairyMine;
+
+ InitFairyFunc();
+ }
+
+ protected override void OnActived()
+ {
+ base.OnActived();
+ buttonGroup.TriggerByOrder(functionOrder);
+ }
+
+ protected override void OnAfterOpen()
+ {
+
+ }
+
+ protected override void OnPreClose()
+ {
+ CloseChildWin();
+ }
+
+ protected override void OnAfterClose()
+ {
+ PlayerDatas.Instance.fairyData.OnRefreshFairyInfo -= OnRefreshFariyInfo;
+ PlayerDatas.Instance.fairyData.OnRefreshFairyMine -= OnRefreshFairyMine;
+ if (!WindowJumpMgr.Instance.IsJumpState)
+ {
+ WindowCenter.Instance.Open<MainInterfaceWin>();
+ }
+ }
+
+
+ void CloseChildWin()
+ {
+ funcPanel.SetActive(false);
+ if (WindowCenter.Instance.CheckOpen<FairyApplyWin>())
+ {
+ WindowCenter.Instance.CloseImmediately<FairyApplyWin>();
+ }
+ if (WindowCenter.Instance.CheckOpen<FairyMemberWin>())
+ {
+ WindowCenter.Instance.CloseImmediately<FairyMemberWin>();
+ }
+ if (WindowCenter.Instance.CheckOpen<FairyLeagueWin>())
+ {
+ WindowCenter.Instance.CloseImmediately<FairyLeagueWin>();
+ }
+ if (WindowCenter.Instance.CheckOpen<KingTempleWin>())
+ {
+ WindowCenter.Instance.CloseImmediately<KingTempleWin>();
+ }
+ }
+
+ void InitFairyFunc()
+ {
+ if (!PlayerDatas.Instance.fairyData.HasFairy)
+ {
+ _FunctionsBtn.gameObject.SetActive(false);
+ _MemberListBtn.gameObject.SetActive(false);
+ }
+ else
+ {
+ _FunctionsBtn.gameObject.SetActive(true);
+ _MemberListBtn.gameObject.SetActive(true);
+ }
+ }
+ }
+}
+
diff --git a/System/FindPrecious/FindPreciousFrameWin.cs b/System/FindPrecious/FindPreciousFrameWin.cs
index e18e5cd..2f57f3f 100644
--- a/System/FindPrecious/FindPreciousFrameWin.cs
+++ b/System/FindPrecious/FindPreciousFrameWin.cs
@@ -1,178 +1,181 @@
-锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
-// [ Date ]: Tuesday, October 31, 2017
-//--------------------------------------------------------
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-
-namespace Snxxz.UI
-{
-
- public class FindPreciousFrameWin : Window
- {
- [SerializeField] FunctionButtonGroup m_FunctionGroup;
- [SerializeField] FunctionButton m_WorldBoss;
- [SerializeField] FunctionButton m_BossHome;
- [SerializeField] FunctionButton m_PersonalBoss;
- [SerializeField] FunctionButton m_ElderGodArea;
- [SerializeField] FunctionButton m_DropRecord;
-
- [SerializeField] Button m_Left;
- [SerializeField] Button m_Right;
- [SerializeField] Button m_Close;
-
- #region Built-in
- protected override void BindController()
- {
- }
-
- protected override void AddListeners()
- {
- m_WorldBoss.AddListener(ShowWorldBoss);
- m_BossHome.AddListener(ShowBossHome);
- m_PersonalBoss.AddListener(ShowPersonalBoss);
- m_ElderGodArea.AddListener(ShowElderGodArea);
- m_DropRecord.AddListener(ShowDropRecord);
-
- m_Left.AddListener(ShowLastFunction);
- m_Right.AddListener(ShowNextFunction);
- m_Close.AddListener(CloseClick);
- }
-
- protected override void OnPreOpen()
- {
-
- }
-
- protected override void OnAfterOpen()
- {
- }
-
- protected override void OnPreClose()
- {
- CloseSubWindows();
- }
-
- protected override void OnAfterClose()
- {
- WindowCenter.Instance.Open<MainInterfaceWin>();
- }
-
- protected override void OnActived()
- {
- base.OnActived();
- m_Left.gameObject.SetActive(m_FunctionGroup.unLockedCount > 1);
- m_Right.gameObject.SetActive(m_FunctionGroup.unLockedCount > 1);
-
- m_FunctionGroup.TriggerByOrder(functionOrder);
- }
- #endregion
-
-
- private void ShowWorldBoss()
- {
- CloseSubWindows();
- if (windowState == WindowState.Opened)
- {
- WindowCenter.Instance.OpenWithoutAnimation<WorldBossWin>();
- }
- else
- {
- WindowCenter.Instance.Open<WorldBossWin>();
- }
-
- functionOrder = m_WorldBoss.order;
- }
-
- private void ShowBossHome()
- {
- CloseSubWindows();
- if (windowState == WindowState.Opened)
- {
- WindowCenter.Instance.OpenWithoutAnimation<BossHomeWin>();
- }
- else
- {
- WindowCenter.Instance.Open<BossHomeWin>();
- }
-
- functionOrder = m_BossHome.order;
- }
-
- private void ShowPersonalBoss()
- {
- CloseSubWindows();
-
- if (windowState == WindowState.Opened)
- {
- WindowCenter.Instance.OpenWithoutAnimation<PersonalBossWin>();
- }
- else
- {
- WindowCenter.Instance.Open<PersonalBossWin>();
- }
-
- functionOrder = m_PersonalBoss.order;
- }
-
- private void ShowElderGodArea()
- {
- CloseSubWindows();
-
- if (windowState == WindowState.Opened)
- {
- WindowCenter.Instance.OpenWithoutAnimation<ElderGodAreaWin>();
- }
- else
- {
- WindowCenter.Instance.Open<ElderGodAreaWin>();
- }
-
- functionOrder = m_ElderGodArea.order;
- }
-
- private void ShowDropRecord()
- {
- CloseSubWindows();
- if (windowState == WindowState.Opened)
- {
- WindowCenter.Instance.OpenWithoutAnimation<PreciousDropRecordWin>();
- }
- else
- {
- WindowCenter.Instance.Open<PreciousDropRecordWin>();
- }
-
- functionOrder = m_DropRecord.order;
- }
-
- private void CloseSubWindows()
- {
- WindowCenter.Instance.CloseImmediately<WorldBossWin>();
- WindowCenter.Instance.CloseImmediately<BossHomeWin>();
- WindowCenter.Instance.CloseImmediately<PersonalBossWin>();
- WindowCenter.Instance.CloseImmediately<ElderGodAreaWin>();
- WindowCenter.Instance.CloseImmediately<PreciousDropRecordWin>();
- }
-
- private void ShowLastFunction()
- {
- m_FunctionGroup.TriggerLast();
- }
-
- private void ShowNextFunction()
- {
- m_FunctionGroup.TriggerNext();
- }
-
- }
-
-}
-
-
-
-
+锘�//--------------------------------------------------------
+// [Author]: 绗簩涓栫晫
+// [ Date ]: Tuesday, October 31, 2017
+//--------------------------------------------------------
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace Snxxz.UI
+{
+
+ public class FindPreciousFrameWin : Window
+ {
+ [SerializeField] FunctionButtonGroup m_FunctionGroup;
+ [SerializeField] FunctionButton m_WorldBoss;
+ [SerializeField] FunctionButton m_BossHome;
+ [SerializeField] FunctionButton m_PersonalBoss;
+ [SerializeField] FunctionButton m_ElderGodArea;
+ [SerializeField] FunctionButton m_DropRecord;
+
+ [SerializeField] Button m_Left;
+ [SerializeField] Button m_Right;
+ [SerializeField] Button m_Close;
+
+ #region Built-in
+ protected override void BindController()
+ {
+ }
+
+ protected override void AddListeners()
+ {
+ m_WorldBoss.AddListener(ShowWorldBoss);
+ m_BossHome.AddListener(ShowBossHome);
+ m_PersonalBoss.AddListener(ShowPersonalBoss);
+ m_ElderGodArea.AddListener(ShowElderGodArea);
+ m_DropRecord.AddListener(ShowDropRecord);
+
+ m_Left.AddListener(ShowLastFunction);
+ m_Right.AddListener(ShowNextFunction);
+ m_Close.AddListener(CloseClick);
+ }
+
+ protected override void OnPreOpen()
+ {
+
+ }
+
+ protected override void OnAfterOpen()
+ {
+ }
+
+ protected override void OnPreClose()
+ {
+ CloseSubWindows();
+ }
+
+ protected override void OnAfterClose()
+ {
+ if (!WindowJumpMgr.Instance.IsJumpState)
+ {
+ WindowCenter.Instance.Open<MainInterfaceWin>();
+ }
+ }
+
+ protected override void OnActived()
+ {
+ base.OnActived();
+ m_Left.gameObject.SetActive(m_FunctionGroup.unLockedCount > 1);
+ m_Right.gameObject.SetActive(m_FunctionGroup.unLockedCount > 1);
+
+ m_FunctionGroup.TriggerByOrder(functionOrder);
+ }
+ #endregion
+
+
+ private void ShowWorldBoss()
+ {
+ CloseSubWindows();
+ if (windowState == WindowState.Opened)
+ {
+ WindowCenter.Instance.OpenWithoutAnimation<WorldBossWin>();
+ }
+ else
+ {
+ WindowCenter.Instance.Open<WorldBossWin>();
+ }
+
+ functionOrder = m_WorldBoss.order;
+ }
+
+ private void ShowBossHome()
+ {
+ CloseSubWindows();
+ if (windowState == WindowState.Opened)
+ {
+ WindowCenter.Instance.OpenWithoutAnimation<BossHomeWin>();
+ }
+ else
+ {
+ WindowCenter.Instance.Open<BossHomeWin>();
+ }
+
+ functionOrder = m_BossHome.order;
+ }
+
+ private void ShowPersonalBoss()
+ {
+ CloseSubWindows();
+
+ if (windowState == WindowState.Opened)
+ {
+ WindowCenter.Instance.OpenWithoutAnimation<PersonalBossWin>();
+ }
+ else
+ {
+ WindowCenter.Instance.Open<PersonalBossWin>();
+ }
+
+ functionOrder = m_PersonalBoss.order;
+ }
+
+ private void ShowElderGodArea()
+ {
+ CloseSubWindows();
+
+ if (windowState == WindowState.Opened)
+ {
+ WindowCenter.Instance.OpenWithoutAnimation<ElderGodAreaWin>();
+ }
+ else
+ {
+ WindowCenter.Instance.Open<ElderGodAreaWin>();
+ }
+
+ functionOrder = m_ElderGodArea.order;
+ }
+
+ private void ShowDropRecord()
+ {
+ CloseSubWindows();
+ if (windowState == WindowState.Opened)
+ {
+ WindowCenter.Instance.OpenWithoutAnimation<PreciousDropRecordWin>();
+ }
+ else
+ {
+ WindowCenter.Instance.Open<PreciousDropRecordWin>();
+ }
+
+ functionOrder = m_DropRecord.order;
+ }
+
+ private void CloseSubWindows()
+ {
+ WindowCenter.Instance.CloseImmediately<WorldBossWin>();
+ WindowCenter.Instance.CloseImmediately<BossHomeWin>();
+ WindowCenter.Instance.CloseImmediately<PersonalBossWin>();
+ WindowCenter.Instance.CloseImmediately<ElderGodAreaWin>();
+ WindowCenter.Instance.CloseImmediately<PreciousDropRecordWin>();
+ }
+
+ private void ShowLastFunction()
+ {
+ m_FunctionGroup.TriggerLast();
+ }
+
+ private void ShowNextFunction()
+ {
+ m_FunctionGroup.TriggerNext();
+ }
+
+ }
+
+}
+
+
+
+
diff --git a/System/Market/MarketWin.cs b/System/Market/MarketWin.cs
index 34b847a..556568c 100644
--- a/System/Market/MarketWin.cs
+++ b/System/Market/MarketWin.cs
@@ -1,129 +1,132 @@
-锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
-// [ Date ]: Thursday, September 21, 2017
-//--------------------------------------------------------
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-
-namespace Snxxz.UI {
-
- public class MarketWin : Window
- {
- [SerializeField] Button leftBtn;
- [SerializeField] Button rightBtn;
- [SerializeField] Button closeBtn;
- [SerializeField] FunctionButton dealTitleBtn;
- [SerializeField] FunctionButton putawayTitleBtn;
- [SerializeField] FunctionButton dealRecordTitleBtn;
- [SerializeField] FunctionButtonGroup buttonGroup;
- #region Built-in
- protected override void BindController()
- {
- }
-
- protected override void AddListeners()
- {
- leftBtn.onClick.AddListener(buttonGroup.TriggerLast);
- rightBtn.onClick.AddListener(buttonGroup.TriggerNext);
- closeBtn.onClick.AddListener(OnClose);
- dealTitleBtn.onClick.AddListener(OnDeal);
- putawayTitleBtn.onClick.AddListener(OnPutaway);
- dealRecordTitleBtn.onClick.AddListener(OnDealRecord);
- }
-
- private void OnDealRecord()
- {
- CloseChildWin();
- if (windowState == WindowState.Opened)
- {
- WindowCenter.Instance.OpenWithoutAnimation<MarketDealRecordWin>();
- }
- else
- {
- WindowCenter.Instance.Open<MarketDealRecordWin>();
- }
- functionOrder = 2;
- }
-
- private void OnPutaway()
- {
- CloseChildWin();
- if (windowState == WindowState.Opened)
- {
- WindowCenter.Instance.OpenWithoutAnimation<MarketPutawayWin>();
- }
- else
- {
- WindowCenter.Instance.Open<MarketPutawayWin>();
- }
- functionOrder = 1;
- }
-
- private void OnDeal()
- {
- CloseChildWin();
- if (windowState == WindowState.Opened)
- {
- WindowCenter.Instance.OpenWithoutAnimation<MarketDealWin>();
- }
- else
- {
- WindowCenter.Instance.Open<MarketDealWin>();
- }
- functionOrder = 0;
- }
-
- protected override void OnPreOpen()
- {
- CloseChildWin();
- }
-
- protected override void OnActived()
- {
- base.OnActived();
- buttonGroup.TriggerByOrder(functionOrder);
- }
-
- protected override void OnAfterOpen()
- {
- }
-
- protected override void OnPreClose()
- {
- CloseChildWin();
- }
-
- protected override void OnAfterClose()
- {
- WindowCenter.Instance.Open<MainInterfaceWin>();
- }
- #endregion
- private void OnClose()
- {
- CloseChildWin();
- CloseImmediately();
-
- }
- private void CloseChildWin()
- {
- if (WindowCenter.Instance.CheckOpen<MarketDealWin>()) {
- WindowCenter.Instance.CloseImmediately<MarketDealWin>();
- }
- if (WindowCenter.Instance.CheckOpen<MarketPutawayWin>()) {
- WindowCenter.Instance.CloseImmediately<MarketPutawayWin>();
- }
- if (WindowCenter.Instance.CheckOpen<MarketDealRecordWin>()) {
- WindowCenter.Instance.CloseImmediately<MarketDealRecordWin>();
- }
- }
- }
-
-}
-
-
-
-
+锘�//--------------------------------------------------------
+// [Author]: 绗簩涓栫晫
+// [ Date ]: Thursday, September 21, 2017
+//--------------------------------------------------------
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace Snxxz.UI {
+
+ public class MarketWin : Window
+ {
+ [SerializeField] Button leftBtn;
+ [SerializeField] Button rightBtn;
+ [SerializeField] Button closeBtn;
+ [SerializeField] FunctionButton dealTitleBtn;
+ [SerializeField] FunctionButton putawayTitleBtn;
+ [SerializeField] FunctionButton dealRecordTitleBtn;
+ [SerializeField] FunctionButtonGroup buttonGroup;
+ #region Built-in
+ protected override void BindController()
+ {
+ }
+
+ protected override void AddListeners()
+ {
+ leftBtn.onClick.AddListener(buttonGroup.TriggerLast);
+ rightBtn.onClick.AddListener(buttonGroup.TriggerNext);
+ closeBtn.onClick.AddListener(OnClose);
+ dealTitleBtn.onClick.AddListener(OnDeal);
+ putawayTitleBtn.onClick.AddListener(OnPutaway);
+ dealRecordTitleBtn.onClick.AddListener(OnDealRecord);
+ }
+
+ private void OnDealRecord()
+ {
+ CloseChildWin();
+ if (windowState == WindowState.Opened)
+ {
+ WindowCenter.Instance.OpenWithoutAnimation<MarketDealRecordWin>();
+ }
+ else
+ {
+ WindowCenter.Instance.Open<MarketDealRecordWin>();
+ }
+ functionOrder = 2;
+ }
+
+ private void OnPutaway()
+ {
+ CloseChildWin();
+ if (windowState == WindowState.Opened)
+ {
+ WindowCenter.Instance.OpenWithoutAnimation<MarketPutawayWin>();
+ }
+ else
+ {
+ WindowCenter.Instance.Open<MarketPutawayWin>();
+ }
+ functionOrder = 1;
+ }
+
+ private void OnDeal()
+ {
+ CloseChildWin();
+ if (windowState == WindowState.Opened)
+ {
+ WindowCenter.Instance.OpenWithoutAnimation<MarketDealWin>();
+ }
+ else
+ {
+ WindowCenter.Instance.Open<MarketDealWin>();
+ }
+ functionOrder = 0;
+ }
+
+ protected override void OnPreOpen()
+ {
+ CloseChildWin();
+ }
+
+ protected override void OnActived()
+ {
+ base.OnActived();
+ buttonGroup.TriggerByOrder(functionOrder);
+ }
+
+ protected override void OnAfterOpen()
+ {
+ }
+
+ protected override void OnPreClose()
+ {
+ CloseChildWin();
+ }
+
+ protected override void OnAfterClose()
+ {
+ if (!WindowJumpMgr.Instance.IsJumpState)
+ {
+ WindowCenter.Instance.Open<MainInterfaceWin>();
+ }
+ }
+ #endregion
+ private void OnClose()
+ {
+ CloseChildWin();
+ CloseImmediately();
+
+ }
+ private void CloseChildWin()
+ {
+ if (WindowCenter.Instance.CheckOpen<MarketDealWin>()) {
+ WindowCenter.Instance.CloseImmediately<MarketDealWin>();
+ }
+ if (WindowCenter.Instance.CheckOpen<MarketPutawayWin>()) {
+ WindowCenter.Instance.CloseImmediately<MarketPutawayWin>();
+ }
+ if (WindowCenter.Instance.CheckOpen<MarketDealRecordWin>()) {
+ WindowCenter.Instance.CloseImmediately<MarketDealRecordWin>();
+ }
+ }
+ }
+
+}
+
+
+
+
diff --git a/System/OpenServerActivity/OpenServerActivityWin.cs b/System/OpenServerActivity/OpenServerActivityWin.cs
index 96f062c..767fda8 100644
--- a/System/OpenServerActivity/OpenServerActivityWin.cs
+++ b/System/OpenServerActivity/OpenServerActivityWin.cs
@@ -121,13 +121,15 @@
OperationTimeHepler.Instance.operationTimeUpdateEvent -= OperationTimeUpdateEvent;
OpenServerActivityCenter.Instance.openServerActivityStateChange -= OpenServerActivityStateChange;
CloseOtherWin();
- WindowCenter.Instance.Open<MainInterfaceWin>();
impactRankModel.gotoImpactRankType = 0;
}
protected override void OnAfterClose()
{
-
+ if (!WindowJumpMgr.Instance.IsJumpState)
+ {
+ WindowCenter.Instance.Open<MainInterfaceWin>();
+ }
}
int GetDefaultSelect()
diff --git a/System/OpenServerActivity/OpenServerGiftWin.cs b/System/OpenServerActivity/OpenServerGiftWin.cs
index 269121a..1e140b2 100644
--- a/System/OpenServerActivity/OpenServerGiftWin.cs
+++ b/System/OpenServerActivity/OpenServerGiftWin.cs
@@ -115,10 +115,6 @@
private void OnCloseClick()
{
CloseImmediately();
- if (!WindowCenter.Instance.CheckOpen<MainInterfaceWin>())
- {
- WindowCenter.Instance.Open<MainInterfaceWin>();
- }
}
}
diff --git a/System/Pet/PetWin.cs b/System/Pet/PetWin.cs
index c9bc0e1..763791c 100644
--- a/System/Pet/PetWin.cs
+++ b/System/Pet/PetWin.cs
@@ -27,7 +27,6 @@
{
CloseChild();
WindowCenter.Instance.CloseImmediately<PetWin>();
- WindowCenter.Instance.Open<MainInterfaceWin>();
}
protected override void BindController()
@@ -52,6 +51,10 @@
protected override void OnAfterClose()
{
+ if (!WindowJumpMgr.Instance.IsJumpState)
+ {
+ WindowCenter.Instance.Open<MainInterfaceWin>();
+ }
}
protected override void OnActived()
diff --git a/System/Rank/RankPanel.cs b/System/Rank/RankPanel.cs
index c52faab..a062ae9 100644
--- a/System/Rank/RankPanel.cs
+++ b/System/Rank/RankPanel.cs
@@ -335,7 +335,10 @@
protected override void OnAfterClose()
{
PlayerDatas.Instance.rank.OnRefreshRank -= OnRefreshRankList;
- WindowCenter.Instance.Open<MainInterfaceWin>();
+ if (!WindowJumpMgr.Instance.IsJumpState)
+ {
+ WindowCenter.Instance.Open<MainInterfaceWin>();
+ }
}
}
}
diff --git a/System/Realm/RealmWin.cs b/System/Realm/RealmWin.cs
index 88701cf..80eba17 100644
--- a/System/Realm/RealmWin.cs
+++ b/System/Realm/RealmWin.cs
@@ -73,7 +73,10 @@
protected override void OnAfterClose()
{
- WindowCenter.Instance.Open<MainInterfaceWin>();
+ if (!WindowJumpMgr.Instance.IsJumpState)
+ {
+ WindowCenter.Instance.Open<MainInterfaceWin>();
+ }
}
#endregion
diff --git a/System/Role/RolePanel.cs b/System/Role/RolePanel.cs
index f36af8f..0a9dd4c 100644
--- a/System/Role/RolePanel.cs
+++ b/System/Role/RolePanel.cs
@@ -357,7 +357,10 @@
PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= OnRefreshPlayerInfo;
titleModel.OnRefreshGainTitle -= OnRefreshTitle;
PlayerDatas.Instance.OnRoleAttrRefresh -= OnRefreshWorldLv;
- WindowCenter.Instance.Open<MainInterfaceWin>();
+ if (!WindowJumpMgr.Instance.IsJumpState)
+ {
+ WindowCenter.Instance.Open<MainInterfaceWin>();
+ }
PlayerDatas.Instance.RefreshPlayerInfoEvent -= RefreshPlayerInfoEvent;
CloseChild();
}
diff --git a/System/RolePromote/RolePromoteWin.cs b/System/RolePromote/RolePromoteWin.cs
index dfb26f4..dd8e43e 100644
--- a/System/RolePromote/RolePromoteWin.cs
+++ b/System/RolePromote/RolePromoteWin.cs
@@ -88,7 +88,10 @@
protected override void OnAfterClose()
{
CloseChild();
- WindowCenter.Instance.Open<MainInterfaceWin>();
+ if (!WindowJumpMgr.Instance.IsJumpState)
+ {
+ WindowCenter.Instance.Open<MainInterfaceWin>();
+ }
}
#endregion
private void OnResource()
diff --git a/System/Rune/RunePanel.cs b/System/Rune/RunePanel.cs
index a530698..7831dd3 100644
--- a/System/Rune/RunePanel.cs
+++ b/System/Rune/RunePanel.cs
@@ -103,7 +103,10 @@
}
protected override void OnAfterClose()
{
- WindowCenter.Instance.Open<MainInterfaceWin>();
+ if (!WindowJumpMgr.Instance.IsJumpState)
+ {
+ WindowCenter.Instance.Open<MainInterfaceWin>();
+ }
}
private void CloseChild()
diff --git a/System/RuneTower/RuneTowerWin.cs b/System/RuneTower/RuneTowerWin.cs
index 47b858d..cf10290 100644
--- a/System/RuneTower/RuneTowerWin.cs
+++ b/System/RuneTower/RuneTowerWin.cs
@@ -109,6 +109,10 @@
protected override void OnAfterClose()
{
+ if (!WindowJumpMgr.Instance.IsJumpState)
+ {
+ WindowCenter.Instance.Open<MainInterfaceWin>();
+ }
}
protected override void OnActived()
@@ -136,7 +140,6 @@
public override void CloseClick()
{
base.CloseClick();
- WindowCenter.Instance.Open<MainInterfaceWin>();
}
#endregion
diff --git a/System/Skill/SkillPanel.cs b/System/Skill/SkillPanel.cs
index 5c7bede..8cdbbb3 100644
--- a/System/Skill/SkillPanel.cs
+++ b/System/Skill/SkillPanel.cs
@@ -105,7 +105,10 @@
protected override void OnAfterClose()
{
- WindowCenter.Instance.Open<MainInterfaceWin>();
+ if (!WindowJumpMgr.Instance.IsJumpState)
+ {
+ WindowCenter.Instance.Open<MainInterfaceWin>();
+ }
}
void OnClose()
diff --git a/System/SystemSetting/SettingUpWin.cs b/System/SystemSetting/SettingUpWin.cs
index 1f9a743..7717b94 100644
--- a/System/SystemSetting/SettingUpWin.cs
+++ b/System/SystemSetting/SettingUpWin.cs
@@ -79,7 +79,10 @@
protected override void OnAfterClose()
{
-
+ if (!WindowJumpMgr.Instance.IsJumpState)
+ {
+ WindowCenter.Instance.Open<MainInterfaceWin>();
+ }
}
#endregion
@@ -182,11 +185,6 @@
private void CloseWin()
{
CloseImmediately();
-
- if (!WindowJumpMgr.Instance.IsJumpState)
- {
- WindowCenter.Instance.Open<MainInterfaceWin>();
- }
}
diff --git a/System/Treasure/TreasureSelectWin.cs b/System/Treasure/TreasureSelectWin.cs
index 697eff4..bdb225f 100644
--- a/System/Treasure/TreasureSelectWin.cs
+++ b/System/Treasure/TreasureSelectWin.cs
@@ -77,7 +77,6 @@
}
CloseImmediately();
UI3DTreasureSelectStage.Instance.Close();
- WindowCenter.Instance.Open<MainInterfaceWin>();
});
}
@@ -128,6 +127,10 @@
protected override void OnAfterClose()
{
+ if (!WindowJumpMgr.Instance.IsJumpState && !m_CorrectClose)
+ {
+ WindowCenter.Instance.Open<MainInterfaceWin>();
+ }
}
#endregion
diff --git a/System/Treasure/TreasureSoulWin.cs b/System/Treasure/TreasureSoulWin.cs
index 2e695a8..80e0ad0 100644
--- a/System/Treasure/TreasureSoulWin.cs
+++ b/System/Treasure/TreasureSoulWin.cs
@@ -119,7 +119,10 @@
protected override void OnAfterClose()
{
- WindowCenter.Instance.Open<MainInterfaceWin>();
+ if (!WindowJumpMgr.Instance.IsJumpState)
+ {
+ WindowCenter.Instance.Open<MainInterfaceWin>();
+ }
}
#endregion
diff --git a/System/Vip/VipExperienceWin.cs b/System/Vip/VipExperienceWin.cs
index fc33f37..1dced81 100644
--- a/System/Vip/VipExperienceWin.cs
+++ b/System/Vip/VipExperienceWin.cs
@@ -55,11 +55,14 @@
protected override void OnPreClose()
{
- WindowCenter.Instance.Open<MainInterfaceWin>();
}
protected override void OnAfterClose()
{
+ if (!WindowJumpMgr.Instance.IsJumpState)
+ {
+ WindowCenter.Instance.Open<MainInterfaceWin>();
+ }
}
#endregion
private void OnExperienceBtn()
diff --git a/System/Vip/VipRechargeWin.cs b/System/Vip/VipRechargeWin.cs
index 36ecd58..54d6ae0 100644
--- a/System/Vip/VipRechargeWin.cs
+++ b/System/Vip/VipRechargeWin.cs
@@ -130,7 +130,10 @@
protected override void OnAfterClose()
{
- WindowCenter.Instance.Open<MainInterfaceWin>();
+ if (!WindowJumpMgr.Instance.IsJumpState)
+ {
+ WindowCenter.Instance.Open<MainInterfaceWin>();
+ }
}
#endregion
diff --git a/System/WorldMap/LocalMapWin.cs b/System/WorldMap/LocalMapWin.cs
index f669371..0dfddfc 100644
--- a/System/WorldMap/LocalMapWin.cs
+++ b/System/WorldMap/LocalMapWin.cs
@@ -63,7 +63,10 @@
protected override void OnAfterClose()
{
-
+ if (!WindowJumpMgr.Instance.IsJumpState)
+ {
+ WindowCenter.Instance.Open<MainInterfaceWin>();
+ }
}
protected override void OnActived()
@@ -78,11 +81,6 @@
public override void CloseClick()
{
base.CloseClick();
-
- if (!WindowJumpMgr.Instance.IsJumpState)
- {
- WindowCenter.Instance.Open<MainInterfaceWin>();
- }
}
void Init()
diff --git a/System/WorldMap/MapFrameWin.cs b/System/WorldMap/MapFrameWin.cs
index e07e4f1..cea7eb3 100644
--- a/System/WorldMap/MapFrameWin.cs
+++ b/System/WorldMap/MapFrameWin.cs
@@ -58,7 +58,10 @@
protected override void OnAfterClose()
{
- WindowCenter.Instance.Open<MainInterfaceWin>();
+ if (!WindowJumpMgr.Instance.IsJumpState)
+ {
+ WindowCenter.Instance.Open<MainInterfaceWin>();
+ }
}
protected override void OnActived()
diff --git a/System/WorldMap/WorldMapWin.cs b/System/WorldMap/WorldMapWin.cs
index 415fabe..9fb904e 100644
--- a/System/WorldMap/WorldMapWin.cs
+++ b/System/WorldMap/WorldMapWin.cs
@@ -56,6 +56,10 @@
protected override void OnAfterClose()
{
+ if (!WindowJumpMgr.Instance.IsJumpState)
+ {
+ WindowCenter.Instance.Open<MainInterfaceWin>();
+ }
}
protected override void OnActived()
@@ -67,11 +71,6 @@
public override void CloseClick()
{
base.CloseClick();
-
- if (!WindowJumpMgr.Instance.IsJumpState)
- {
- WindowCenter.Instance.Open<MainInterfaceWin>();
- }
}
void Init()
--
Gitblit v1.8.0