From 0012445c0109fa67987800a1bac8f32e989b2d19 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 15 八月 2018 15:16:01 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
System/Dungeon/DungeonModel.cs | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/System/Dungeon/DungeonModel.cs b/System/Dungeon/DungeonModel.cs
index a87ab17..46a379a 100644
--- a/System/Dungeon/DungeonModel.cs
+++ b/System/Dungeon/DungeonModel.cs
@@ -73,13 +73,11 @@
set { m_DungeonResult = value; }
}
- public int dungeonCoinInspireCount
- {
+ public int dungeonCoinInspireCount {
get; private set;
}
- public int dungeonJadeInspireCount
- {
+ public int dungeonJadeInspireCount {
get; private set;
}
@@ -680,7 +678,7 @@
updateDungeonEnterCD();
}
- public void UpdateDugeonInspireLv(int coinInspireLv,int jadeInpsireLv)
+ public void UpdateDugeonInspireLv(int coinInspireLv, int jadeInpsireLv)
{
dungeonCoinInspireCount = coinInspireLv;
dungeonJadeInspireCount = jadeInpsireLv;
@@ -1175,7 +1173,7 @@
if (!assetVersion.IsPriorAsset())
{
- InGameDownLoad.Instance.TryDownLoad(true);
+ InGameDownLoad.Instance.TryDownLoad(InGameDownLoad.Dominant.Whole);
return;
}
}
--
Gitblit v1.8.0