From e34c9c9234d11340f81c6a174e59714d29b8cc79 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 20 十二月 2019 18:13:05 +0800
Subject: [PATCH] 8347 协助系统
---
System/MainInterfacePanel/ChatFrame.cs | 129 ++++++++++++++++++++++--------------------
1 files changed, 67 insertions(+), 62 deletions(-)
diff --git a/System/MainInterfacePanel/ChatFrame.cs b/System/MainInterfacePanel/ChatFrame.cs
index 35b0122..6ce4280 100644
--- a/System/MainInterfacePanel/ChatFrame.cs
+++ b/System/MainInterfacePanel/ChatFrame.cs
@@ -16,7 +16,7 @@
public class ChatFrame : MonoBehaviour
{
[SerializeField] Button _MailBtn;//閭欢鎸夐挳
- [SerializeField] Button _OneKeyBtn;//鍦板浘鎸傛満
+ [SerializeField] Button _OneKeyBtn;//鍗忓姪鐣岄潰
[SerializeField] Button _AutoBtn;//鑷姩鎸傛満
[SerializeField] Button _SetupBtn;
@@ -76,9 +76,9 @@
public void OnAfterOpen()
{
var mapId = PlayerDatas.Instance.baseData.MapID;
- var inDungeon = true;//MapUtility.IsDungeon(mapId);
+ var inDungeon = MapUtility.IsDungeon(mapId);
- m_TaskBtn.gameObject.SetActive(!inDungeon);
+ m_TaskBtn.gameObject.SetActive(false);
_OneKeyBtn.gameObject.SetActive(!inDungeon || OneKeyList.Contains(mapId));
}
@@ -234,68 +234,73 @@
WindowCenter.Instance.Close<MainInterfaceWin>();
}
- void OneKeyButton()//鍦板浘鎸傛満鎸夐挳
+ void OneKeyButton()//鎵撳紑鍗忓姪鎸夐挳
{
- if (CrossServerUtility.IsCrossServerBoss())
- {
- SysNotifyMgr.Instance.ShowTip("CrossMap10");
- return;
- }
-
- if (OneKeyList.Contains(PlayerDatas.Instance.baseData.MapID))
- {
- var dataMapId = MapUtility.GetDataMapId();
- var config = DungeonOpenTimeConfig.Get(dataMapId);
- string language = string.Empty;
- if (dataMapId == GeneralDefine.ruinsTranscriptMapId)
- {
- language = Language.Get(dungeonModel.mission.lineID > main.LayerNumberNow ? "WHMJ_Quit2" : "WHMJ_Quit1");
- }
- else if (dataMapId == BossHomeModel.BOSSHOME_MAPID)
- {
- var vipLevel = PlayerDatas.Instance.baseData.VIPLv;
- var vipNeed = bossHomeModel.GetFloorVipRequirement(PlayerDatas.Instance.baseData.dungeonLineId + 1);
- var dungeonId = dungeonModel.GetDungeonId(dataMapId, PlayerDatas.Instance.baseData.dungeonLineId);
- var dungeonConfig = DungeonConfig.Get(dungeonId);
-
- if (vipLevel < vipNeed)
- {
- var moneyNeed = bossHomeModel.GetVipLackCost(PlayerDatas.Instance.baseData.dungeonLineId + 1);
- language = Language.Get("QuitRemindBossHome", dungeonConfig.FBName, vipNeed, moneyNeed);
- }
- else
- {
- //language = Language.Get(config.ExitDescription);
- }
- }
- else
- {
- language = Language.Get(config.ExitDescription);
- }
-
- if (language == string.Empty)
- {
- GoToOneKeyButton();
- }
- else {
- ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),
- language, (bool isOk) =>
- {
- if (isOk)
- {
- GoToOneKeyButton();
- }
- }
- );
- }
-
- }
- else
- {
- GoToOneKeyButton();
- }
+ WindowCenter.Instance.Open<DungeonAssistWin>();
}
+ //涓�閿寕鏈�
+ //{
+ // if (CrossServerUtility.IsCrossServerBoss())
+ // {
+ // SysNotifyMgr.Instance.ShowTip("CrossMap10");
+ // return;
+ // }
+
+ // if (OneKeyList.Contains(PlayerDatas.Instance.baseData.MapID))
+ // {
+ // var dataMapId = MapUtility.GetDataMapId();
+ // var config = DungeonOpenTimeConfig.Get(dataMapId);
+ // string language = string.Empty;
+ // if (dataMapId == GeneralDefine.ruinsTranscriptMapId)
+ // {
+ // language = Language.Get(dungeonModel.mission.lineID > main.LayerNumberNow ? "WHMJ_Quit2" : "WHMJ_Quit1");
+ // }
+ // else if (dataMapId == BossHomeModel.BOSSHOME_MAPID)
+ // {
+ // var vipLevel = PlayerDatas.Instance.baseData.VIPLv;
+ // var vipNeed = bossHomeModel.GetFloorVipRequirement(PlayerDatas.Instance.baseData.dungeonLineId + 1);
+ // var dungeonId = dungeonModel.GetDungeonId(dataMapId, PlayerDatas.Instance.baseData.dungeonLineId);
+ // var dungeonConfig = DungeonConfig.Get(dungeonId);
+
+ // if (vipLevel < vipNeed)
+ // {
+ // var moneyNeed = bossHomeModel.GetVipLackCost(PlayerDatas.Instance.baseData.dungeonLineId + 1);
+ // language = Language.Get("QuitRemindBossHome", dungeonConfig.FBName, vipNeed, moneyNeed);
+ // }
+ // else
+ // {
+ // //language = Language.Get(config.ExitDescription);
+ // }
+ // }
+ // else
+ // {
+ // language = Language.Get(config.ExitDescription);
+ // }
+
+ // if (language == string.Empty)
+ // {
+ // GoToOneKeyButton();
+ // }
+ // else {
+ // ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),
+ // language, (bool isOk) =>
+ // {
+ // if (isOk)
+ // {
+ // GoToOneKeyButton();
+ // }
+ // }
+ // );
+ // }
+
+ // }
+ // else
+ // {
+ // GoToOneKeyButton();
+ // }
+ //}
+
void GoToOneKeyButton()
{
if (PlayerDatas.Instance.extersion.bossState == 1)
--
Gitblit v1.8.0