From 469dbd2e5a06faab01e8190d038db83edb12cbe0 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 16 五月 2019 17:52:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Core/GameEngine/Model/Config/DungeonConfig.cs | 414 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 208 insertions(+), 206 deletions(-)
diff --git a/Core/GameEngine/Model/Config/DungeonConfig.cs b/Core/GameEngine/Model/Config/DungeonConfig.cs
index 8c57578..fb76e51 100644
--- a/Core/GameEngine/Model/Config/DungeonConfig.cs
+++ b/Core/GameEngine/Model/Config/DungeonConfig.cs
@@ -1,18 +1,18 @@
-锘�//--------------------------------------------------------
-// [Author]: Fish
-// [ Date ]: Wednesday, May 15, 2019
-//--------------------------------------------------------
-
-using System.Collections.Generic;
-using System.IO;
-using System.Threading;
-using System;
-using UnityEngine;
-
-[XLua.LuaCallCSharp]
-public partial class DungeonConfig
-{
-
+锘�//--------------------------------------------------------
+// [Author]: Fish
+// [ Date ]: Thursday, May 16, 2019
+//--------------------------------------------------------
+
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using System;
+using UnityEngine;
+
+[XLua.LuaCallCSharp]
+public partial class DungeonConfig
+{
+
public readonly int ID;
public readonly int DataMapID;
public readonly int LineID;
@@ -28,24 +28,25 @@
public readonly int SweepItemID;
public readonly int SweepCostCnt;
public readonly string StepTime;
+ public readonly string RefreshNPC;
public readonly int[] BossActorID;
public readonly int[] Rewards;
public readonly string[] RewardCountDescriptions;
public readonly string Description;
public readonly int AutomaticATK;
public readonly int MapButton;
- public readonly int ShowNewItemTip;
-
- public DungeonConfig()
- {
- }
-
- public DungeonConfig(string input)
- {
- try
- {
- var tables = input.Split('\t');
-
+ public readonly int ShowNewItemTip;
+
+ public DungeonConfig()
+ {
+ }
+
+ public DungeonConfig(string input)
+ {
+ try
+ {
+ var tables = input.Split('\t');
+
int.TryParse(tables[0],out ID);
int.TryParse(tables[1],out DataMapID);
@@ -81,198 +82,199 @@
StepTime = tables[14];
- string[] BossActorIDStringArray = tables[15].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ RefreshNPC = tables[15];
+
+ string[] BossActorIDStringArray = tables[16].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
BossActorID = new int[BossActorIDStringArray.Length];
for (int i=0;i<BossActorIDStringArray.Length;i++)
{
int.TryParse(BossActorIDStringArray[i],out BossActorID[i]);
}
- string[] RewardsStringArray = tables[16].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ string[] RewardsStringArray = tables[17].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
Rewards = new int[RewardsStringArray.Length];
for (int i=0;i<RewardsStringArray.Length;i++)
{
int.TryParse(RewardsStringArray[i],out Rewards[i]);
}
- RewardCountDescriptions = tables[17].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ RewardCountDescriptions = tables[18].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- Description = tables[18];
+ Description = tables[19];
- int.TryParse(tables[19],out AutomaticATK);
+ int.TryParse(tables[20],out AutomaticATK);
- int.TryParse(tables[20],out MapButton);
+ int.TryParse(tables[21],out MapButton);
- int.TryParse(tables[21],out ShowNewItemTip);
- }
- catch (Exception ex)
- {
- DebugEx.Log(ex);
- }
- }
-
- static Dictionary<string, DungeonConfig> configs = new Dictionary<string, DungeonConfig>();
- public static DungeonConfig Get(string id)
- {
- if (!inited)
- {
- Debug.Log("DungeonConfig 杩樻湭瀹屾垚鍒濆鍖栥��");
- return null;
- }
-
- if (configs.ContainsKey(id))
- {
- return configs[id];
- }
-
- DungeonConfig config = null;
- if (rawDatas.ContainsKey(id))
- {
- config = configs[id] = new DungeonConfig(rawDatas[id]);
- rawDatas.Remove(id);
- }
-
- return config;
- }
-
- public static DungeonConfig Get(int id)
- {
- return Get(id.ToString());
- }
-
- public static List<string> GetKeys()
- {
- var keys = new List<string>();
- keys.AddRange(configs.Keys);
- keys.AddRange(rawDatas.Keys);
- return keys;
- }
-
- public static List<DungeonConfig> GetValues()
- {
- var values = new List<DungeonConfig>();
- values.AddRange(configs.Values);
-
- var keys = new List<string>(rawDatas.Keys);
- foreach (var key in keys)
- {
- values.Add(Get(key));
- }
-
- return values;
- }
-
- public static bool Has(string id)
- {
- return configs.ContainsKey(id) || rawDatas.ContainsKey(id);
- }
-
- public static bool Has(int id)
- {
- return Has(id.ToString());
- }
-
- public static bool inited { get; private set; }
- protected static Dictionary<string, string> rawDatas = new Dictionary<string, string>();
- public static void Init(bool sync=false)
- {
- inited = false;
- var path = string.Empty;
- if (AssetSource.refdataFromEditor)
- {
- path = ResourcesPath.CONFIG_FODLER +"/Dungeon.txt";
- }
- else
- {
- path = AssetVersionUtility.GetAssetFilePath("config/Dungeon.txt");
- }
-
- configs.Clear();
- var tempConfig = new DungeonConfig();
- var preParse = tempConfig is IConfigPostProcess;
-
- if (sync)
- {
- var lines = File.ReadAllLines(path);
- if (!preParse)
- {
- rawDatas = new Dictionary<string, string>(lines.Length - 3);
- }
- for (int i = 3; i < lines.Length; i++)
- {
- try
- {
- var line = lines[i];
- var index = line.IndexOf("\t");
- if (index == -1)
- {
- continue;
- }
- var id = line.Substring(0, index);
-
- if (preParse)
- {
- var config = new DungeonConfig(line);
- configs[id] = config;
- (config as IConfigPostProcess).OnConfigParseCompleted();
- }
- else
- {
- rawDatas[id] = line;
- }
- }
- catch (System.Exception ex)
- {
- Debug.LogError(ex);
- }
- }
- inited = true;
- }
- else
- {
- ThreadPool.QueueUserWorkItem((object _object) =>
- {
- var lines = File.ReadAllLines(path);
- if (!preParse)
- {
- rawDatas = new Dictionary<string, string>(lines.Length - 3);
- }
- for (int i = 3; i < lines.Length; i++)
- {
- try
- {
- var line = lines[i];
- var index = line.IndexOf("\t");
- if (index == -1)
- {
- continue;
- }
- var id = line.Substring(0, index);
-
- if (preParse)
- {
- var config = new DungeonConfig(line);
- configs[id] = config;
- (config as IConfigPostProcess).OnConfigParseCompleted();
- }
- else
- {
- rawDatas[id] = line;
- }
- }
- catch (System.Exception ex)
- {
- Debug.LogError(ex);
- }
- }
-
- inited = true;
- });
- }
- }
-
-}
-
-
-
-
+ int.TryParse(tables[22],out ShowNewItemTip);
+ }
+ catch (Exception ex)
+ {
+ DebugEx.Log(ex);
+ }
+ }
+
+ static Dictionary<string, DungeonConfig> configs = new Dictionary<string, DungeonConfig>();
+ public static DungeonConfig Get(string id)
+ {
+ if (!inited)
+ {
+ Debug.Log("DungeonConfig 杩樻湭瀹屾垚鍒濆鍖栥��");
+ return null;
+ }
+
+ if (configs.ContainsKey(id))
+ {
+ return configs[id];
+ }
+
+ DungeonConfig config = null;
+ if (rawDatas.ContainsKey(id))
+ {
+ config = configs[id] = new DungeonConfig(rawDatas[id]);
+ rawDatas.Remove(id);
+ }
+
+ return config;
+ }
+
+ public static DungeonConfig Get(int id)
+ {
+ return Get(id.ToString());
+ }
+
+ public static List<string> GetKeys()
+ {
+ var keys = new List<string>();
+ keys.AddRange(configs.Keys);
+ keys.AddRange(rawDatas.Keys);
+ return keys;
+ }
+
+ public static List<DungeonConfig> GetValues()
+ {
+ var values = new List<DungeonConfig>();
+ values.AddRange(configs.Values);
+
+ var keys = new List<string>(rawDatas.Keys);
+ foreach (var key in keys)
+ {
+ values.Add(Get(key));
+ }
+
+ return values;
+ }
+
+ public static bool Has(string id)
+ {
+ return configs.ContainsKey(id) || rawDatas.ContainsKey(id);
+ }
+
+ public static bool Has(int id)
+ {
+ return Has(id.ToString());
+ }
+
+ public static bool inited { get; private set; }
+ protected static Dictionary<string, string> rawDatas = new Dictionary<string, string>();
+ public static void Init(bool sync=false)
+ {
+ inited = false;
+ var path = string.Empty;
+ if (AssetSource.refdataFromEditor)
+ {
+ path = ResourcesPath.CONFIG_FODLER +"/Dungeon.txt";
+ }
+ else
+ {
+ path = AssetVersionUtility.GetAssetFilePath("config/Dungeon.txt");
+ }
+
+ var tempConfig = new DungeonConfig();
+ var preParse = tempConfig is IConfigPostProcess;
+
+ if (sync)
+ {
+ var lines = File.ReadAllLines(path);
+ if (!preParse)
+ {
+ rawDatas = new Dictionary<string, string>(lines.Length - 3);
+ }
+ for (int i = 3; i < lines.Length; i++)
+ {
+ try
+ {
+ var line = lines[i];
+ var index = line.IndexOf("\t");
+ if (index == -1)
+ {
+ continue;
+ }
+ var id = line.Substring(0, index);
+
+ if (preParse)
+ {
+ var config = new DungeonConfig(line);
+ configs[id] = config;
+ (config as IConfigPostProcess).OnConfigParseCompleted();
+ }
+ else
+ {
+ rawDatas[id] = line;
+ }
+ }
+ catch (System.Exception ex)
+ {
+ Debug.LogError(ex);
+ }
+ }
+ inited = true;
+ }
+ else
+ {
+ ThreadPool.QueueUserWorkItem((object _object) =>
+ {
+ var lines = File.ReadAllLines(path);
+ if (!preParse)
+ {
+ rawDatas = new Dictionary<string, string>(lines.Length - 3);
+ }
+ for (int i = 3; i < lines.Length; i++)
+ {
+ try
+ {
+ var line = lines[i];
+ var index = line.IndexOf("\t");
+ if (index == -1)
+ {
+ continue;
+ }
+ var id = line.Substring(0, index);
+
+ if (preParse)
+ {
+ var config = new DungeonConfig(line);
+ configs[id] = config;
+ (config as IConfigPostProcess).OnConfigParseCompleted();
+ }
+ else
+ {
+ rawDatas[id] = line;
+ }
+ }
+ catch (System.Exception ex)
+ {
+ Debug.LogError(ex);
+ }
+ }
+
+ inited = true;
+ });
+ }
+ }
+
+}
+
+
+
+
--
Gitblit v1.8.0