From 65fb6364670f86e21adfab1ae0b42a7be8dc07f4 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期六, 08 十二月 2018 15:52:37 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Dungeon/NormalDungeonEntranceWin.cs | 63 ++++++++++---------------------
1 files changed, 21 insertions(+), 42 deletions(-)
diff --git a/System/Dungeon/NormalDungeonEntranceWin.cs b/System/Dungeon/NormalDungeonEntranceWin.cs
index 68e4f11..4e9d567 100644
--- a/System/Dungeon/NormalDungeonEntranceWin.cs
+++ b/System/Dungeon/NormalDungeonEntranceWin.cs
@@ -55,15 +55,16 @@
[SerializeField] Text m_FairyLandTip;
[SerializeField] Text m_WhyjEnterRule;//濞茬殗閬楄抗
[SerializeField] Text WhyjEnterFloor;//濞茬殗閬楄抗
+ [SerializeField] Button m_RuletBtn;//瑙勫垯璇存槑鎸夐挳
DungeonModel model { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
TeamModel teamModel { get { return ModelCenter.Instance.GetModel<TeamModel>(); } }
PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }
+ PlayerMainDate mainDate { get { return ModelCenter.Instance.GetModel<PlayerMainDate>(); } }
#region Built-in
- private int ruinsTranscriptMapId;
protected override void BindController()
{
- ruinsTranscriptMapId = int.Parse(Config.Instance.Get<FuncConfigConfig>("SpRewardMapID").Numerical1);
+
}
protected override void AddListeners()
@@ -74,6 +75,7 @@
m_Sweep.AddListener(SweepDungeon);
m_Group.AddListener(OpenGroup);
m_CloseWin.AddListener(CloseClick);
+ m_RuletBtn.AddListener(RuletBtn);
}
protected override void OnPreOpen()
@@ -83,16 +85,15 @@
DrawDungeonTicketInfo();
DisplayFairyLandTip();
m_BreifInfo.SetDungeonInfo(model.currentDungeon);
- if (ruinsTranscriptMapId == model.currentDungeon.mapId)//濞茬殗閬楄抗
+ if (mainDate.ruinsTranscriptMapId == model.currentDungeon.mapId)//濞茬殗閬楄抗
{
- GetWhyjLayerNumber();
m_WhyjEnterRule.gameObject.SetActive(true);
m_WhyjEnterRule.text = Language.Get("WhyjEnterRule");
if (!m_GroupStart.gameObject.activeSelf && !m_AutoGroupStart.gameObject.activeSelf)
{
WhyjEnterFloor.gameObject.SetActive(true);
- var mainModel = ModelCenter.Instance.GetModel<PlayerMainDate>();
- WhyjEnterFloor.text = Language.Get("WhyjEnterFloor", mainModel.LayerNumber + 1);
+ int Number = mainDate.GetWHYJNum();
+ WhyjEnterFloor.text = Language.Get("WhyjEnterFloor", Number);
}
else
{
@@ -103,6 +104,15 @@
{
m_WhyjEnterRule.gameObject.SetActive(false);
WhyjEnterFloor.gameObject.SetActive(false);
+ }
+
+ if (mainDate.ruinsTranscriptMapId == model.currentDungeon.mapId)
+ {
+ m_RuletBtn.gameObject.SetActive(true);
+ }
+ else
+ {
+ m_RuletBtn.gameObject.SetActive(false);
}
}
@@ -510,44 +520,13 @@
}
}
- private void GetWhyjLayerNumber()//鑾峰彇鍗曚汉鐨勫ú鐨囧眰鏁�
+ private void RuletBtn()//瑙勫垯鎸夐挳
{
- DungeonRecord dungeonRecords;
- var mainModel = ModelCenter.Instance.GetModel<PlayerMainDate>();
- if (model.TryGetRecord(ruinsTranscriptMapId, out dungeonRecords))
+ if (mainDate.ruinsTranscriptMapId == model.currentDungeon.mapId)
{
- int Index = -1;
- for (int i = 0; i < dungeonRecords.lineGrades.Count; i++)
- {
- if (dungeonRecords.lineGrades[i]== 5)
- {
- Index = i;
- }
- }
- if (Index > -1)
- {
- if (Index + 1 >= 7)
- {
- if (7 - mainModel.WaHuangHighestFloor >= 0)
- mainModel.LayerNumber = 7 - mainModel.WaHuangHighestFloor;
- }
- else
- {
- if ((Index + 1) - mainModel.WaHuangHighestFloor >= 0)
- {
- mainModel.LayerNumber = (Index + 1) - mainModel.WaHuangHighestFloor;
- }
- else
- {
- mainModel.LayerNumber = 0;
- }
- }
- }
- else
- {
- mainModel.LayerNumber = 0;
- }
- }
+ WindowCenter.Instance.Open<WHYJRuleWin>();
+ }
+
}
}
--
Gitblit v1.8.0