From adeae8c5d6bb0c8b3f3ca0212cd3d4f34c31e15a Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 21 九月 2018 21:18:25 +0800
Subject: [PATCH] 3791 【前端】新增符印塔通关某一层自动退出字段
---
Core/GameEngine/Model/Config/RuneTowerFloorConfig.cs.meta | 2 +-
System/Dungeon/DungeonRuneTowerVictoryWin.cs | 2 +-
Core/GameEngine/Model/Config/RuneTowerFloorConfig.cs | 53 ++++++++++++++++++++++++++++-------------------------
3 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/Core/GameEngine/Model/Config/RuneTowerFloorConfig.cs b/Core/GameEngine/Model/Config/RuneTowerFloorConfig.cs
index 413fa5a..758406e 100644
--- a/Core/GameEngine/Model/Config/RuneTowerFloorConfig.cs
+++ b/Core/GameEngine/Model/Config/RuneTowerFloorConfig.cs
@@ -1,14 +1,14 @@
-锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
-// [ Date ]: Friday, August 10, 2018
-//--------------------------------------------------------
-
-using UnityEngine;
-using System;
-
-namespace TableConfig {
-
-
+锘�//--------------------------------------------------------
+// [Author]: 绗簩涓栫晫
+// [ Date ]: Friday, September 21, 2018
+//--------------------------------------------------------
+
+using UnityEngine;
+using System;
+
+namespace TableConfig {
+
+
public partial class RuneTowerFloorConfig : ConfigBase {
public int ID { get ; private set ; }
@@ -24,13 +24,14 @@
public int UnLockCompose { get ; private set ; }
public int RuneDrop { get ; private set ; }
public int Fixed { get ; private set ; }
-
+ public int AutoExit { get ; private set ; }
+
public override string getKey()
{
return ID.ToString();
- }
-
- public override void Parse() {
+ }
+
+ public override void Parse() {
try
{
ID=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0;
@@ -58,17 +59,19 @@
RuneDrop=IsNumeric(rawContents[11]) ? int.Parse(rawContents[11]):0;
Fixed=IsNumeric(rawContents[12]) ? int.Parse(rawContents[12]):0;
+
+ AutoExit=IsNumeric(rawContents[13]) ? int.Parse(rawContents[13]):0;
}
catch (Exception ex)
{
DebugEx.Log(ex);
- }
- }
-
- }
-
-}
-
-
-
-
+ }
+ }
+
+ }
+
+}
+
+
+
+
diff --git a/Core/GameEngine/Model/Config/RuneTowerFloorConfig.cs.meta b/Core/GameEngine/Model/Config/RuneTowerFloorConfig.cs.meta
index 682b94b..bb67cc4 100644
--- a/Core/GameEngine/Model/Config/RuneTowerFloorConfig.cs.meta
+++ b/Core/GameEngine/Model/Config/RuneTowerFloorConfig.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: eb8552f7e3b6ad843878daecebc9eb01
-timeCreated: 1533871891
+timeCreated: 1537535813
licenseType: Pro
MonoImporter:
serializedVersion: 2
diff --git a/System/Dungeon/DungeonRuneTowerVictoryWin.cs b/System/Dungeon/DungeonRuneTowerVictoryWin.cs
index 041c9a5..3f597b6 100644
--- a/System/Dungeon/DungeonRuneTowerVictoryWin.cs
+++ b/System/Dungeon/DungeonRuneTowerVictoryWin.cs
@@ -46,7 +46,7 @@
var config = Config.Instance.Get<RuneTowerFloorConfig>(runeTowerModel.currentFloor);
var lastFloor = (int)ModelCenter.Instance.GetModel<RuneModel>().RuneTowerOpenLV;
var lastFloorConfig = Config.Instance.Get<RuneTowerFloorConfig>(lastFloor);
- m_RuneTowerNext.gameObject.SetActive(config.TowerId == lastFloorConfig.TowerId);
+ m_RuneTowerNext.gameObject.SetActive(lastFloorConfig.AutoExit == 0 && config.TowerId == lastFloorConfig.TowerId);
DisplayRunesUnLock(lastFloor);
}
--
Gitblit v1.8.0