From fb0345c8f9815f1b9f655d6363da3a9cedd3944f Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期一, 10 九月 2018 11:25:07 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Dungeon/DungeonModel.cs | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/System/Dungeon/DungeonModel.cs b/System/Dungeon/DungeonModel.cs
index 9d73065..1bd75e7 100644
--- a/System/Dungeon/DungeonModel.cs
+++ b/System/Dungeon/DungeonModel.cs
@@ -41,54 +41,65 @@
List<Item> sweepResultItems = new List<Item>();
int m_SweepDungeonTypeBuf = 0;
- public int sweepDungeonTypeBuf {
+ public int sweepDungeonTypeBuf
+ {
get { return m_SweepDungeonTypeBuf; }
}
Dungeon m_SelectedTrialDungeon;
- public Dungeon selectedTrialDungeon {
+ public Dungeon selectedTrialDungeon
+ {
get { return m_SelectedTrialDungeon; }
set { m_SelectedTrialDungeon = value; }
}
Dungeon m_CurrentDungeon;
- public Dungeon currentDungeon {
+ public Dungeon currentDungeon
+ {
get { return m_CurrentDungeon; }
set { m_CurrentDungeon = value; }
}
int m_DungeonGrade = 0;
- public int dungeonGrade {
+ public int dungeonGrade
+ {
get { return m_DungeonGrade; }
}
DungeonMissionData m_Mission;
- public DungeonMissionData mission {
+ public DungeonMissionData mission
+ {
get { return m_Mission; }
}
DungeonResult m_DungeonResult;
- public DungeonResult dungeonResult {
+ public DungeonResult dungeonResult
+ {
get { return m_DungeonResult; }
set { m_DungeonResult = value; }
}
- public int dungeonCoinInspireCount {
+ public int dungeonCoinInspireCount
+ {
get; private set;
}
- public int dungeonJadeInspireCount {
+ public int dungeonJadeInspireCount
+ {
get; private set;
}
- public int dungeonInspireUper {
+ public int dungeonInspireUper
+ {
get; private set;
}
Dungeon m_SelectedKylinDungeon;
- public Dungeon selectedKylinDungeon {
+ public Dungeon selectedKylinDungeon
+ {
get { return m_SelectedKylinDungeon; }
- set {
+ set
+ {
if (m_SelectedKylinDungeon != value)
{
m_SelectedKylinDungeon = value;
@@ -109,9 +120,11 @@
public bool gradeTween = true;
DungeonFightStage m_DungeonFightStage = DungeonFightStage.None;
- public DungeonFightStage dungeonFightStage {
+ public DungeonFightStage dungeonFightStage
+ {
get { return m_DungeonFightStage; }
- set {
+ set
+ {
if (m_DungeonFightStage != value)
{
m_DungeonFightStage = value;
@@ -1334,7 +1347,9 @@
if (!dungeonOpenTimes.ContainsKey(config.DataMapID))
{
- dungeonOpenTimes[config.DataMapID] = new DailyQuestOpenTime(config.DataMapID, DungeonStateTimeConfig.DungeonStateCanEnterFB(config.DataMapID));
+ var openTime = dungeonOpenTimes[config.DataMapID] = new DailyQuestOpenTime(config.DataMapID);
+ openTime.ParseDungeonNormalOpenTimes(DungeonStateTimeConfig.DungeonStateCanEnterFB(config.DataMapID));
+ openTime.ParseDungeonSpecificOpenTimes(DungeonSpecialStateTimeConfig.GetDungeonTimes(config.DataMapID));
}
}
--
Gitblit v1.8.0