From 6ce4ae16561fd205c8bb3f530d5a20033f207f4f Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 24 八月 2018 18:19:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackPlayer
---
System/GeneralConfig/GeneralConfig.cs | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/System/GeneralConfig/GeneralConfig.cs b/System/GeneralConfig/GeneralConfig.cs
index 2ad19ed..76a1d23 100644
--- a/System/GeneralConfig/GeneralConfig.cs
+++ b/System/GeneralConfig/GeneralConfig.cs
@@ -126,10 +126,14 @@
public List<int> dungeonCanUseMoneyIds { get; private set; }
+ public Dictionary<int, int> dungeonRebornClientTimes { get; private set; }
+ public int[] CompareEquipPlaces { get; private set;}
+
public void Init()
{
try
{
+ CompareEquipPlaces = GetIntArray("EquipUpType");
greatMasterStartLV = GetInt("GreatMasterStartLV");
playerMaxLevel = GetInt("PlayerMaxLV");
potentialUpSuccessRecommend = GetFloat("SPSkillType", 2) * 0.0001f;
@@ -429,6 +433,7 @@
inGameDownLoadHighestLevelPoint = GetInt("DownReward", 2);
dungeonCanUseMoneyIds = new List<int>(GetIntArray("FBEnterTickeyAuto", 1));
+ dungeonRebornClientTimes = ConfigParse.GetDic<int, int>(GetInputString("DuplicatesRebornTime", 2));
}
catch (Exception ex)
{
--
Gitblit v1.8.0