From 17c684a98dd8811fd22ced8da1590e08d3bc4831 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期日, 28 四月 2019 10:32:26 +0800
Subject: [PATCH] Merge branch 'master' into ViewOtherPlayer
---
Core/GameEngine/Model/Config/ActorShowConfig.cs | 609 ++++++++++++++++++++++++++++---------------------------
1 files changed, 311 insertions(+), 298 deletions(-)
diff --git a/Core/GameEngine/Model/Config/ActorShowConfig.cs b/Core/GameEngine/Model/Config/ActorShowConfig.cs
index 8612464..5b78591 100644
--- a/Core/GameEngine/Model/Config/ActorShowConfig.cs
+++ b/Core/GameEngine/Model/Config/ActorShowConfig.cs
@@ -1,298 +1,311 @@
-锘�//--------------------------------------------------------
-// [Author]: Fish
-// [ Date ]: Thursday, February 14, 2019
-//--------------------------------------------------------
-
-using System.Collections.Generic;
-using System.IO;
-using System.Threading;
-using System;
-using UnityEngine;
-
-[XLua.LuaCallCSharp]
-public partial class ActorShowConfig
-{
-
- public readonly int ID;
- public readonly int NpcID;
- public readonly int MapID;
- public readonly int line;
- public readonly int[] showNpcs;
- public readonly int length;
- public readonly int showNameTime;
- public readonly int BindMissionID;
- public readonly int type;
- public readonly int[] scale;
- public readonly int[] NpcFace;
- public readonly int[] PosX;
- public readonly int[] PosY;
- public readonly int shadow;
- public readonly int effect;
- public readonly int uieffect;
- public readonly string[] mob;
- public readonly string cam;
- public readonly int[] Height;
- public readonly int DialogueTime;
- public readonly int Dialogue;
- public readonly int soundId;
- public readonly int soundTime;
- public readonly int step;
-
- public ActorShowConfig()
- {
- }
-
- public ActorShowConfig(string input)
- {
- try
- {
- var tables = input.Split('\t');
-
- int.TryParse(tables[0],out ID);
-
- int.TryParse(tables[1],out NpcID);
-
- int.TryParse(tables[2],out MapID);
-
- int.TryParse(tables[3],out line);
-
- string[] showNpcsStringArray = tables[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- showNpcs = new int[showNpcsStringArray.Length];
- for (int i=0;i<showNpcsStringArray.Length;i++)
- {
- int.TryParse(showNpcsStringArray[i],out showNpcs[i]);
- }
-
- int.TryParse(tables[5],out length);
-
- int.TryParse(tables[6],out showNameTime);
-
- int.TryParse(tables[7],out BindMissionID);
-
- int.TryParse(tables[8],out type);
-
- string[] scaleStringArray = tables[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- scale = new int[scaleStringArray.Length];
- for (int i=0;i<scaleStringArray.Length;i++)
- {
- int.TryParse(scaleStringArray[i],out scale[i]);
- }
-
- string[] NpcFaceStringArray = tables[10].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- NpcFace = new int[NpcFaceStringArray.Length];
- for (int i=0;i<NpcFaceStringArray.Length;i++)
- {
- int.TryParse(NpcFaceStringArray[i],out NpcFace[i]);
- }
-
- string[] PosXStringArray = tables[11].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- PosX = new int[PosXStringArray.Length];
- for (int i=0;i<PosXStringArray.Length;i++)
- {
- int.TryParse(PosXStringArray[i],out PosX[i]);
- }
-
- string[] PosYStringArray = tables[12].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- PosY = new int[PosYStringArray.Length];
- for (int i=0;i<PosYStringArray.Length;i++)
- {
- int.TryParse(PosYStringArray[i],out PosY[i]);
- }
-
- int.TryParse(tables[13],out shadow);
-
- int.TryParse(tables[14],out effect);
-
- int.TryParse(tables[15],out uieffect);
-
- mob = tables[16].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
-
- cam = tables[17];
-
- string[] HeightStringArray = tables[18].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- Height = new int[HeightStringArray.Length];
- for (int i=0;i<HeightStringArray.Length;i++)
- {
- int.TryParse(HeightStringArray[i],out Height[i]);
- }
-
- int.TryParse(tables[19],out DialogueTime);
-
- int.TryParse(tables[20],out Dialogue);
-
- int.TryParse(tables[21],out soundId);
-
- int.TryParse(tables[22],out soundTime);
-
- int.TryParse(tables[23],out step);
- }
- catch (Exception ex)
- {
- DebugEx.Log(ex);
- }
- }
-
- static Dictionary<string, ActorShowConfig> configs = new Dictionary<string, ActorShowConfig>();
- public static ActorShowConfig Get(string id)
- {
- if (!inited)
- {
- Debug.Log("ActorShowConfig 杩樻湭瀹屾垚鍒濆鍖栥��");
- return null;
- }
-
- if (configs.ContainsKey(id))
- {
- return configs[id];
- }
-
- ActorShowConfig config = null;
- if (rawDatas.ContainsKey(id))
- {
- config = configs[id] = new ActorShowConfig(rawDatas[id]);
- rawDatas.Remove(id);
- }
-
- return config;
- }
-
- public static ActorShowConfig 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<ActorShowConfig> GetValues()
- {
- var values = new List<ActorShowConfig>();
- 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 +"/ActorShow.txt";
- }
- else
- {
- path = AssetVersionUtility.GetAssetFilePath("config/ActorShow.txt");
- }
-
- var tempConfig = new ActorShowConfig();
- 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 ActorShowConfig(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 ActorShowConfig(line);
- configs[id] = config;
- (config as IConfigPostProcess).OnConfigParseCompleted();
- }
- else
- {
- rawDatas[id] = line;
- }
- }
- catch (System.Exception ex)
- {
- Debug.LogError(ex);
- }
- }
-
- inited = true;
- });
- }
- }
-
-}
-
-
-
-
+锘�//--------------------------------------------------------
+// [Author]: Fish
+// [ Date ]: Saturday, April 27, 2019
+//--------------------------------------------------------
+
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using System;
+using UnityEngine;
+
+[XLua.LuaCallCSharp]
+public partial class ActorShowConfig
+{
+
+ public readonly int ID;
+ public readonly int NpcID;
+ public readonly int MapID;
+ public readonly int line;
+ public readonly int[] showNpcs;
+ public readonly int length;
+ public readonly int showNameTime;
+ public readonly int BindMissionID;
+ public readonly int type;
+ public readonly int[] scale;
+ public readonly int[] NpcFace;
+ public readonly int[] PosX;
+ public readonly int[] PosY;
+ public readonly int shadow;
+ public readonly int[] effect;
+ public readonly int uieffect;
+ public readonly string[] mob;
+ public readonly int[] clipActions;
+ public readonly string cam;
+ public readonly int[] Height;
+ public readonly int DialogueTime;
+ public readonly int Dialogue;
+ public readonly int soundId;
+ public readonly int soundTime;
+ public readonly int step;
+
+ public ActorShowConfig()
+ {
+ }
+
+ public ActorShowConfig(string input)
+ {
+ try
+ {
+ var tables = input.Split('\t');
+
+ int.TryParse(tables[0], out ID);
+
+ int.TryParse(tables[1], out NpcID);
+
+ int.TryParse(tables[2], out MapID);
+
+ int.TryParse(tables[3], out line);
+
+ string[] showNpcsStringArray = tables[4].Trim().Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries);
+ showNpcs = new int[showNpcsStringArray.Length];
+ for (int i = 0; i < showNpcsStringArray.Length; i++)
+ {
+ int.TryParse(showNpcsStringArray[i], out showNpcs[i]);
+ }
+
+ int.TryParse(tables[5], out length);
+
+ int.TryParse(tables[6], out showNameTime);
+
+ int.TryParse(tables[7], out BindMissionID);
+
+ int.TryParse(tables[8], out type);
+
+ string[] scaleStringArray = tables[9].Trim().Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries);
+ scale = new int[scaleStringArray.Length];
+ for (int i = 0; i < scaleStringArray.Length; i++)
+ {
+ int.TryParse(scaleStringArray[i], out scale[i]);
+ }
+
+ string[] NpcFaceStringArray = tables[10].Trim().Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries);
+ NpcFace = new int[NpcFaceStringArray.Length];
+ for (int i = 0; i < NpcFaceStringArray.Length; i++)
+ {
+ int.TryParse(NpcFaceStringArray[i], out NpcFace[i]);
+ }
+
+ string[] PosXStringArray = tables[11].Trim().Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries);
+ PosX = new int[PosXStringArray.Length];
+ for (int i = 0; i < PosXStringArray.Length; i++)
+ {
+ int.TryParse(PosXStringArray[i], out PosX[i]);
+ }
+
+ string[] PosYStringArray = tables[12].Trim().Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries);
+ PosY = new int[PosYStringArray.Length];
+ for (int i = 0; i < PosYStringArray.Length; i++)
+ {
+ int.TryParse(PosYStringArray[i], out PosY[i]);
+ }
+
+ int.TryParse(tables[13], out shadow);
+
+ string[] effectStringArray = tables[14].Trim().Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries);
+ effect = new int[effectStringArray.Length];
+ for (int i = 0; i < effectStringArray.Length; i++)
+ {
+ int.TryParse(effectStringArray[i], out effect[i]);
+ }
+
+ int.TryParse(tables[15], out uieffect);
+
+ mob = tables[16].Trim().Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries);
+
+ string[] clipActionsStringArray = tables[17].Trim().Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries);
+ clipActions = new int[clipActionsStringArray.Length];
+ for (int i = 0; i < clipActionsStringArray.Length; i++)
+ {
+ int.TryParse(clipActionsStringArray[i], out clipActions[i]);
+ }
+
+ cam = tables[18];
+
+ string[] HeightStringArray = tables[19].Trim().Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries);
+ Height = new int[HeightStringArray.Length];
+ for (int i = 0; i < HeightStringArray.Length; i++)
+ {
+ int.TryParse(HeightStringArray[i], out Height[i]);
+ }
+
+ int.TryParse(tables[20], out DialogueTime);
+
+ int.TryParse(tables[21], out Dialogue);
+
+ int.TryParse(tables[22], out soundId);
+
+ int.TryParse(tables[23], out soundTime);
+
+ int.TryParse(tables[24], out step);
+ }
+ catch (Exception ex)
+ {
+ DebugEx.Log(ex);
+ }
+ }
+
+ static Dictionary<string, ActorShowConfig> configs = new Dictionary<string, ActorShowConfig>();
+ public static ActorShowConfig Get(string id)
+ {
+ if (!inited)
+ {
+ Debug.Log("ActorShowConfig 杩樻湭瀹屾垚鍒濆鍖栥��");
+ return null;
+ }
+
+ if (configs.ContainsKey(id))
+ {
+ return configs[id];
+ }
+
+ ActorShowConfig config = null;
+ if (rawDatas.ContainsKey(id))
+ {
+ config = configs[id] = new ActorShowConfig(rawDatas[id]);
+ rawDatas.Remove(id);
+ }
+
+ return config;
+ }
+
+ public static ActorShowConfig 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<ActorShowConfig> GetValues()
+ {
+ var values = new List<ActorShowConfig>();
+ 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 + "/ActorShow.txt";
+ }
+ else
+ {
+ path = AssetVersionUtility.GetAssetFilePath("config/ActorShow.txt");
+ }
+
+ var tempConfig = new ActorShowConfig();
+ 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 ActorShowConfig(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 ActorShowConfig(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