From 76dcf6e656fdebe595cbfcb8ab9e7973e5ad2772 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 12 十一月 2024 20:45:23 +0800
Subject: [PATCH] Merge branch 'hyyngame' of http://mobile.secondworld.net.cn:10010/r/snxxz_scripts into hyyngame

---
 Core/GameEngine/Model/Config/PlayerFaceConfig.cs |   55 +++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/Core/GameEngine/Model/Config/PlayerFaceConfig.cs b/Core/GameEngine/Model/Config/PlayerFaceConfig.cs
index 147e0c3..fd8968d 100644
--- a/Core/GameEngine/Model/Config/PlayerFaceConfig.cs
+++ b/Core/GameEngine/Model/Config/PlayerFaceConfig.cs
@@ -1,6 +1,6 @@
 锘�//--------------------------------------------------------
 //    [Author]:           Fish
-//    [  Date ]:           2024骞�11鏈�6鏃�
+//    [  Date ]:           2024骞�11鏈�12鏃�
 //--------------------------------------------------------
 
 using System.Collections.Generic;
@@ -15,6 +15,7 @@
 
     public readonly int FaceID;
 	public readonly string Name;
+	public readonly int[] JobShowList;
 	public readonly int UnlockDefault;
 	public readonly int ExpireMinutes;
 	public readonly string Image;
@@ -39,25 +40,39 @@
 
 			Name = tables[1];
 
-			int.TryParse(tables[2],out UnlockDefault); 
-
-			int.TryParse(tables[3],out ExpireMinutes); 
-
-			Image = tables[4];
-
-			int.TryParse(tables[5],out BgColor); 
-
-			int.TryParse(tables[6],out EffectID); 
-
-			UnlockNeedItemList = JsonMapper.ToObject<int[][]>(tables[7].Replace("(", "[").Replace(")", "]")); 
-
-			if (tables[8].Contains("["))
+			if (tables[2].Contains("["))
 			{
-				LightAttrType = JsonMapper.ToObject<int[]>(tables[8]);
+				JobShowList = JsonMapper.ToObject<int[]>(tables[2]);
 			}
 			else
 			{
-				string[] LightAttrTypeStringArray = tables[8].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+				string[] JobShowListStringArray = tables[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+				JobShowList = new int[JobShowListStringArray.Length];
+				for (int i=0;i<JobShowListStringArray.Length;i++)
+				{
+					 int.TryParse(JobShowListStringArray[i],out JobShowList[i]);
+				}
+			}
+
+			int.TryParse(tables[3],out UnlockDefault); 
+
+			int.TryParse(tables[4],out ExpireMinutes); 
+
+			Image = tables[5];
+
+			int.TryParse(tables[6],out BgColor); 
+
+			int.TryParse(tables[7],out EffectID); 
+
+			UnlockNeedItemList = JsonMapper.ToObject<int[][]>(tables[8].Replace("(", "[").Replace(")", "]")); 
+
+			if (tables[9].Contains("["))
+			{
+				LightAttrType = JsonMapper.ToObject<int[]>(tables[9]);
+			}
+			else
+			{
+				string[] LightAttrTypeStringArray = tables[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
 				LightAttrType = new int[LightAttrTypeStringArray.Length];
 				for (int i=0;i<LightAttrTypeStringArray.Length;i++)
 				{
@@ -65,13 +80,13 @@
 				}
 			}
 
-			if (tables[9].Contains("["))
+			if (tables[10].Contains("["))
 			{
-				LightAttrValue = JsonMapper.ToObject<int[]>(tables[9]);
+				LightAttrValue = JsonMapper.ToObject<int[]>(tables[10]);
 			}
 			else
 			{
-				string[] LightAttrValueStringArray = tables[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+				string[] LightAttrValueStringArray = tables[10].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
 				LightAttrValue = new int[LightAttrValueStringArray.Length];
 				for (int i=0;i<LightAttrValueStringArray.Length;i++)
 				{
@@ -79,7 +94,7 @@
 				}
 			}
 
-			int.TryParse(tables[10],out LightFightPower); 
+			int.TryParse(tables[11],out LightFightPower); 
         }
         catch (Exception ex)
         {

--
Gitblit v1.8.0