From 5e5551e8e7630f816a68c7bbe554a7e0bfa8705f Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 20 八月 2018 11:50:31 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/CoinTaskTipModel.cs | 298 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 160 insertions(+), 138 deletions(-)
diff --git a/System/MainInterfacePanel/CoinTaskTipModel.cs b/System/MainInterfacePanel/CoinTaskTipModel.cs
index 7e06478..32d98a5 100644
--- a/System/MainInterfacePanel/CoinTaskTipModel.cs
+++ b/System/MainInterfacePanel/CoinTaskTipModel.cs
@@ -1,138 +1,160 @@
-锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
-// [ Date ]: Friday, June 29, 2018
-//--------------------------------------------------------
-using UnityEngine;
-using System.Collections;
-using UnityEngine.UI;
-using System.Collections.Generic;
-using TableConfig;
-using Snxxz.UI;
-using System;
-
-public class CoinTaskTipModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
-{
-
- public bool IsPopup = false;//璧忛噾
- public bool IsinDungeon = false;
-
- public bool IsFairy = false;//浠欑洘
- public bool IsinDungeon1 = false;
-
- public override void Init()
- {
-
- }
- public override void UnInit()
- {
-
- }
- public void OnBeforePlayerDataInitialize()
- {
- IsPopup = false;
- IsFairy = false;
- IsinDungeon = false;
- IsinDungeon1 = false;
-
- }
-
- public void OnPlayerLoginOk()
- {
- PlayerTaskDatas.TaskCoinTaskEvent -= TaskCoinTaskEvent;
- PlayerTaskDatas.TaskCoinTaskEvent += TaskCoinTaskEvent;
-
- PlayerTaskDatas.FairyTaskEvent -= FairyTaskEvent;
- PlayerTaskDatas.FairyTaskEvent += FairyTaskEvent;
- StageManager.Instance.onStageLoadFinish -= onStageLoadFinish;
- StageManager.Instance.onStageLoadFinish += onStageLoadFinish;
- }
-
-
-
- private void onStageLoadFinish()
- {
- if (IsinDungeon)
- {
- SnxxzGame.Instance.StartCoroutine(PopupPanel());
- IsinDungeon = false;
- }
- if (IsinDungeon1)
- {
- SnxxzGame.Instance.StartCoroutine(FairyAuTaskPanel());
- IsinDungeon1 = false;
- }
- }
-
- private bool IsDungeon()//鍒ゆ柇鏄惁鍦ㄥ壇鏈腑
- {
- var mapId = PlayerDatas.Instance.baseData.MapID;
- var mapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(mapId);
- return mapConfig != null && mapConfig.MapFBType != 0;
- }
-
- private void TaskCoinTaskEvent()
- {
- int GetCylinderNumber = TaskAllocation.Instance.ForRingAllNumber();//鑾峰彇璧忛噾鎬荤幆鏁�
- if (GetCylinderNumber == 10)
- {
- var inDungeon = IsDungeon();
- if (inDungeon)
- {
- IsinDungeon = true;
- }
- else
- {
- SnxxzGame.Instance.StartCoroutine(PopupPanel());
- }
- }
- }
- private void FairyTaskEvent()
- {
- int GetFairyAuNumber = TaskAllocation.Instance.FairyAuNumber();//鑾峰彇浠欑洘鍗曡疆瀹屾垚鐜暟
- int AllFairyAuNumber = TaskAllocation.Instance.FairyAuAllNumber();//鑾峰彇浠欑洘鎬荤幆鏁�
- if (GetFairyAuNumber == 10 && AllFairyAuNumber<70)
- {
- var inDungeon = IsDungeon();
- if (inDungeon)
- {
- IsinDungeon1 = true;
- }
- else
- {
- SnxxzGame.Instance.StartCoroutine(FairyAuTaskPanel());
- }
-
- }
- }
- private IEnumerator PopupPanel()
- {
- yield return WaitingForSecondConst.WaitMS1500;
- if (NewBieCenter.Instance.inGuiding || ModelCenter.Instance.GetModel<TreasureModel>().newGotShowing || WindowCenter.Instance.CheckOpen<TreasureLevelUpWin>())
- {
- yield break;
- }
- IsPopup = true;
- if (WindowCenter.Instance.CheckOpen<MainInterfaceWin>())
- {
- WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.BountyInterface);
- }
- }
-
- private IEnumerator FairyAuTaskPanel()
- {
- yield return WaitingForSecondConst.WaitMS1500;
- if (NewBieCenter.Instance.inGuiding || ModelCenter.Instance.GetModel<TreasureModel>().newGotShowing || WindowCenter.Instance.CheckOpen<TreasureLevelUpWin>())
- {
- yield break;
- }
- IsFairy = true;
- if (WindowCenter.Instance.CheckOpen<MainInterfaceWin>())
- {
- WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.UnionTask);
- }
- }
-}
-
-
-
-
+锘�//--------------------------------------------------------
+// [Author]: 绗簩涓栫晫
+// [ Date ]: Friday, June 29, 2018
+//--------------------------------------------------------
+using UnityEngine;
+using System.Collections;
+using UnityEngine.UI;
+using System.Collections.Generic;
+using TableConfig;
+using Snxxz.UI;
+using System;
+
+public class CoinTaskTipModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
+{
+
+ public bool IsPopup = false;//璧忛噾
+ public bool IsinDungeon = false;
+
+ public bool IsFairy = false;//浠欑洘
+ public bool IsinDungeon1 = false;
+
+ public override void Init()
+ {
+
+ }
+ public override void UnInit()
+ {
+
+ }
+ public void OnBeforePlayerDataInitialize()
+ {
+ IsPopup = false;
+ IsFairy = false;
+ IsinDungeon = false;
+ IsinDungeon1 = false;
+
+ }
+
+ public void OnPlayerLoginOk()
+ {
+ PlayerTaskDatas.TaskCoinTaskEvent -= TaskCoinTaskEvent;
+ PlayerTaskDatas.TaskCoinTaskEvent += TaskCoinTaskEvent;
+
+ PlayerTaskDatas.FairyTaskEvent -= FairyTaskEvent;
+ PlayerTaskDatas.FairyTaskEvent += FairyTaskEvent;
+ StageManager.Instance.onStageLoadFinish -= onStageLoadFinish;
+ StageManager.Instance.onStageLoadFinish += onStageLoadFinish;
+ }
+
+
+
+ private void onStageLoadFinish()
+ {
+ if (IsinDungeon)
+ {
+ SnxxzGame.Instance.StartCoroutine(PopupPanel());
+ IsinDungeon = false;
+ }
+ if (IsinDungeon1)
+ {
+ SnxxzGame.Instance.StartCoroutine(FairyAuTaskPanel());
+ IsinDungeon1 = false;
+ }
+ }
+
+ private bool IsDungeon()//鍒ゆ柇鏄惁鍦ㄥ壇鏈腑
+ {
+ var mapId = PlayerDatas.Instance.baseData.MapID;
+ var mapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(mapId);
+ return mapConfig != null && mapConfig.MapFBType != 0;
+ }
+
+ private void TaskCoinTaskEvent()
+ {
+ int GetCylinderNumber = TaskAllocation.Instance.ForRingAllNumber();//鑾峰彇璧忛噾鎬荤幆鏁�
+ var inDungeon = IsDungeon();
+ if (GetCylinderNumber == 10)
+ {
+ if (inDungeon)
+ {
+ IsinDungeon = true;
+ }
+ else
+ {
+ SnxxzGame.Instance.StartCoroutine(PopupPanel());
+ }
+ }
+ if (GetCylinderNumber == 20)
+ {
+ if (!inDungeon)
+ {
+ SnxxzGame.Instance.StartCoroutine(PopupPanel());
+ }
+ }
+ }
+ private void FairyTaskEvent()
+ {
+ int GetFairyAuNumber = TaskAllocation.Instance.FairyAuNumber();//鑾峰彇浠欑洘鍗曡疆瀹屾垚鐜暟
+ if (GetFairyAuNumber == 10)
+ {
+ var inDungeon = IsDungeon();
+ if (inDungeon)
+ {
+ IsinDungeon1 = true;
+ }
+ else
+ {
+ SnxxzGame.Instance.StartCoroutine(FairyAuTaskPanel());
+ }
+
+ }
+ }
+ private IEnumerator PopupPanel()
+ {
+ yield return WaitingForSecondConst.WaitMS1500;
+ if (NewBieCenter.Instance.inGuiding || ModelCenter.Instance.GetModel<TreasureModel>().newGotShowing || WindowCenter.Instance.CheckOpen<TreasureLevelUpWin>())
+ {
+ yield break;
+ }
+ if (WindowCenter.Instance.CheckOpen<TaskWin>())
+ {
+ yield break;
+ }
+ int GetCylinderNumber = TaskAllocation.Instance.ForRingAllNumber();//鑾峰彇璧忛噾鎬荤幆鏁�
+ if (GetCylinderNumber == 10)
+ {
+ IsPopup = true;
+ }
+ if (WindowCenter.Instance.CheckOpen<MainInterfaceWin>())
+ {
+ WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.BountyInterface);
+ }
+ }
+
+ private IEnumerator FairyAuTaskPanel()
+ {
+ yield return WaitingForSecondConst.WaitMS1500;
+ if (NewBieCenter.Instance.inGuiding || ModelCenter.Instance.GetModel<TreasureModel>().newGotShowing || WindowCenter.Instance.CheckOpen<TreasureLevelUpWin>())
+ {
+ yield break;
+ }
+ if (WindowCenter.Instance.CheckOpen<FairyAuTaskWin>())
+ {
+ yield break;
+ }
+ int AllFairyAuNumber = TaskAllocation.Instance.FairyAuAllNumber();//鑾峰彇浠欑洘鎬荤幆鏁�
+ if (AllFairyAuNumber < 70)
+ {
+ IsFairy = true;
+ }
+ if (WindowCenter.Instance.CheckOpen<MainInterfaceWin>())
+ {
+ WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.UnionTask);
+ }
+ }
+}
+
+
+
+
--
Gitblit v1.8.0