From 26ca473948aae38fb2287465587da5a4dccec3b6 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 10 九月 2018 20:48:32 +0800
Subject: [PATCH] 3335  代码维护

---
 System/Dungeon/NormalDungeonEntranceWin.cs |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/System/Dungeon/NormalDungeonEntranceWin.cs b/System/Dungeon/NormalDungeonEntranceWin.cs
index 7762319..ebf8705 100644
--- a/System/Dungeon/NormalDungeonEntranceWin.cs
+++ b/System/Dungeon/NormalDungeonEntranceWin.cs
@@ -101,16 +101,16 @@
 
         private void UpdateDungeonEnterCD()
         {
-            var dungeonId = model.DungeonMap(model.currentDungeon);
+            var dungeonId = model.GetDungeonId(model.currentDungeon);
             var dungeonConfig = Config.Instance.Get<DungeonConfig>(dungeonId);
-            bool _cd = model.HasDungeonEnterCD(dungeonConfig.DataMapID) && model.OnDungeonEnterCD(dungeonConfig.DataMapID);
+            bool _cd = model.HasEnterCD(dungeonConfig.DataMapID) && model.IsEnterCountDowning(dungeonConfig.DataMapID);
             m_EnterCdContainer.gameObject.SetActive(_cd);
             m_ContainerBtns.gameObject.SetActive(!_cd);
         }
 
         private void DrawDungeonBaseInfo()
         {
-            var dungeonId = model.DungeonMap(model.currentDungeon);
+            var dungeonId = model.GetDungeonId(model.currentDungeon);
             var dungeonConfig = Config.Instance.Get<DungeonConfig>(dungeonId);
             var dungeonOpenTimeConfig = Config.Instance.Get<DungeonOpenTimeConfig>(model.currentDungeon.mapId);
             var fbType = dungeonOpenTimeConfig.FBType;
@@ -141,7 +141,7 @@
 
         private void DrawSweepInfo()
         {
-            var dungeonId = model.DungeonMap(model.currentDungeon);
+            var dungeonId = model.GetDungeonId(model.currentDungeon);
             var dungeonConfig = Config.Instance.Get<DungeonConfig>(dungeonId);
 
             var playerLevel = PlayerDatas.Instance.baseData.LV;
@@ -172,7 +172,7 @@
 
         private void DrawDungeonTicketInfo()
         {
-            var config = Config.Instance.Get<DungeonConfig>(model.DungeonMap(model.currentDungeon));
+            var config = Config.Instance.Get<DungeonConfig>(model.GetDungeonId(model.currentDungeon));
             if (config == null || config.TicketID == 0)
             {
                 m_TicketContainer.gameObject.SetActive(false);
@@ -183,11 +183,11 @@
                 m_DungeonTicketItem.showCount = true;
                 DungeonRecord record;
                 int _times = 0;
-                if (model.TryGetDungeonRecord(model.currentDungeon.mapId, out record))
+                if (model.TryGetRecord(model.currentDungeon.mapId, out record))
                 {
                     _times = record.enterTimes;
                 }
-                m_DungeonTicketItem.SetItem(model.GetDungeonTicketCost(model.currentDungeon.mapId, model.currentDungeon.lineId));
+                m_DungeonTicketItem.SetItem(model.GetTicketCost(model.currentDungeon.mapId, model.currentDungeon.lineId));
             }
         }
 
@@ -207,7 +207,7 @@
         private void ChallengeDungeon()
         {
             var error = 0;
-            if (model.TestChallangeDungeon(model.currentDungeon, out error))
+            if (model.TestChallange(model.currentDungeon, out error))
             {
                 if (GeneralConfig.Instance.dungeonCanUseMoneyIds.Contains(model.currentDungeon.mapId))
                 {
@@ -215,7 +215,7 @@
                 }
                 else
                 {
-                    model.SingleChallengeDungeon(model.currentDungeon);
+                    model.SingleChallenge(model.currentDungeon);
                 }
             }
             else
@@ -285,7 +285,7 @@
         private void AutoGroupChallenge()
         {
             var error = 0;
-            if (model.TestChallangeDungeon(model.currentDungeon, out error))
+            if (model.TestChallange(model.currentDungeon, out error))
             {
                 teamModel.RequestAutoMatchTeam(new TeamMission(model.currentDungeon.mapId, model.currentDungeon.lineId));
                 WindowCenter.Instance.Open<TeamFrameWin>(false, 1);
@@ -299,9 +299,9 @@
         private void ChallengeDungeonGroup()
         {
             var error = 0;
-            if (model.TestChallangeDungeon(model.currentDungeon, out error))
+            if (model.TestChallange(model.currentDungeon, out error))
             {
-                model.GroupChallengeDungeon(model.currentDungeon);
+                model.GroupChallenge(model.currentDungeon);
             }
             else
             {
@@ -311,7 +311,7 @@
 
         private void ProcessEnterDungeonError(int _error)
         {
-            var dungeonId = model.DungeonMap(model.currentDungeon);
+            var dungeonId = model.GetDungeonId(model.currentDungeon);
             var dungeonConfig = Config.Instance.Get<DungeonConfig>(dungeonId);
 
             switch (_error)
@@ -333,10 +333,10 @@
 
         private bool TestSweepDungeon(out int _error)
         {
-            var dungeonId = model.DungeonMap(model.currentDungeon);
+            var dungeonId = model.GetDungeonId(model.currentDungeon);
             var dungeonConfig = Config.Instance.Get<DungeonConfig>(dungeonId);
             var playerLevel = PlayerDatas.Instance.baseData.LV;
-            var dungeonGrade = model.GetDungeonGrade(model.currentDungeon);
+            var dungeonGrade = model.GetGrade(model.currentDungeon);
 
             if (dungeonGrade <= 0 && playerLevel < dungeonConfig.SweepLVLimit)
             {
@@ -356,7 +356,7 @@
                 return false;
             }
 
-            if (model.OnDungeonEnterCD(model.currentDungeon.mapId))
+            if (model.IsEnterCountDowning(model.currentDungeon.mapId))
             {
                 _error = 4;
                 return false;
@@ -368,7 +368,7 @@
 
         private void ProcessSweepDungeonError(int _error)
         {
-            var dungeonId = model.DungeonMap(model.currentDungeon);
+            var dungeonId = model.GetDungeonId(model.currentDungeon);
             var dungeonConfig = Config.Instance.Get<DungeonConfig>(dungeonId);
 
             switch (_error)
@@ -404,7 +404,7 @@
 
             if (_itemId == m_DungeonTicketItem.itemId)
             {
-                m_DungeonTicketItem.SetItem(model.GetDungeonTicketCost(model.currentDungeon.mapId, model.currentDungeon.lineId));
+                m_DungeonTicketItem.SetItem(model.GetTicketCost(model.currentDungeon.mapId, model.currentDungeon.lineId));
             }
         }
 

--
Gitblit v1.8.0