Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Res/Config/DaoyouModelConfig.json

@@ -4,6 +4,8 @@
       "ID": 1,
       "name": 1953,
       "quality": 2,
+      "bodyIcon": "",
+      "headIcon": "",
       "growupRate": 60,
       "des": [
         1963,
@@ -46,6 +48,8 @@
       "ID": 2,
       "name": 1954,
       "quality": 2,
+      "bodyIcon": "",
+      "headIcon": "",
       "growupRate": 60,
       "des": [
         1966,
@@ -85,6 +89,8 @@
       "ID": 3,
       "name": 1955,
       "quality": 2,
+      "bodyIcon": "",
+      "headIcon": "",
       "growupRate": 60,
       "des": [
         1969,
@@ -124,6 +130,8 @@
       "ID": 4,
       "name": 1956,
       "quality": 3,
+      "bodyIcon": "",
+      "headIcon": "",
       "growupRate": 80,
       "des": [
         1972,
@@ -163,6 +171,8 @@
       "ID": 5,
       "name": 1957,
       "quality": 3,
+      "bodyIcon": "",
+      "headIcon": "",
       "growupRate": 80,
       "des": [
         1975,
@@ -202,6 +212,8 @@
       "ID": 6,
       "name": 1958,
       "quality": 3,
+      "bodyIcon": "",
+      "headIcon": "",
       "growupRate": 80,
       "des": [
         1978,
@@ -241,6 +253,8 @@
       "ID": 7,
       "name": 1959,
       "quality": 4,
+      "bodyIcon": "",
+      "headIcon": "",
       "growupRate": 100,
       "des": [
         1981,
@@ -280,6 +294,8 @@
       "ID": 8,
       "name": 1960,
       "quality": 4,
+      "bodyIcon": "",
+      "headIcon": "",
       "growupRate": 100,
       "des": [
         1984,
@@ -319,6 +335,8 @@
       "ID": 9,
       "name": 1961,
       "quality": 5,
+      "bodyIcon": "",
+      "headIcon": "",
       "growupRate": 110,
       "des": [
         1987,
@@ -358,6 +376,8 @@
       "ID": 10,
       "name": 1962,
       "quality": 6,
+      "bodyIcon": "",
+      "headIcon": "",
       "growupRate": 120,
       "des": [
         1990,

Assets/Res/Config/EventLinkConfig.json

@@ -6,6 +6,7 @@
       "LanID": [
         216
       ],
+      "NPCID": null,
       "ConditionType": null,
       "finishCount": null,
       "optionType": null,
@@ -17,6 +18,7 @@
       "LanID": [
         177
       ],
+      "NPCID": 2,
       "ConditionType": null,
       "finishCount": null,
       "optionType": 1,
@@ -36,6 +38,7 @@
       "LanID": [
         178
       ],
+      "NPCID": null,
       "ConditionType": 1,
       "ConditionPara": [
         1001
@@ -57,6 +60,7 @@
       "LanID": [
         179
       ],
+      "NPCID": null,
       "ConditionType": 1,
       "ConditionPara": [
         1002
@@ -77,6 +81,7 @@
       "LanID": [
         180
       ],
+      "NPCID": null,
       "ConditionType": null,
       "finishCount": null,
       "optionType": 3,
@@ -94,6 +99,7 @@
       "LanID": [
         181
       ],
+      "NPCID": null,
       "ConditionType": 3,
       "ConditionPara": [
         10
@@ -114,6 +120,7 @@
       "LanID": [
         182
       ],
+      "NPCID": null,
       "ConditionType": null,
       "finishCount": null,
       "optionType": 1,
@@ -133,6 +140,7 @@
       "LanID": [
         183
       ],
+      "NPCID": null,
       "ConditionType": null,
       "finishCount": null,
       "optionType": 1,
@@ -153,6 +161,7 @@
         184,
         187
       ],
+      "NPCID": null,
       "ConditionType": null,
       "finishCount": null,
       "optionType": 3,
@@ -170,6 +179,7 @@
       "LanID": [
         185
       ],
+      "NPCID": null,
       "ConditionType": null,
       "finishCount": null,
       "optionType": 2,
@@ -189,6 +199,7 @@
         186,
         189
       ],
+      "NPCID": null,
       "ConditionType": null,
       "finishCount": null,
       "optionType": 3,
@@ -206,6 +217,7 @@
       "LanID": [
         188
       ],
+      "NPCID": null,
       "ConditionType": null,
       "finishCount": null,
       "optionType": null,
@@ -223,6 +235,7 @@
       "LanID": [
         190
       ],
+      "NPCID": null,
       "ConditionType": null,
       "finishCount": null,
       "optionType": 1,
@@ -242,6 +255,7 @@
       "LanID": [
         191
       ],
+      "NPCID": null,
       "ConditionType": null,
       "finishCount": null,
       "optionType": 2,
@@ -266,6 +280,7 @@
       "LanID": [
         192
       ],
+      "NPCID": null,
       "ConditionType": 1,
       "ConditionPara": [
         10007
@@ -287,6 +302,7 @@
         193,
         196
       ],
+      "NPCID": null,
       "ConditionType": null,
       "finishCount": null,
       "optionType": 2,
@@ -312,6 +328,7 @@
         194,
         197
       ],
+      "NPCID": null,
       "ConditionType": null,
       "finishCount": null,
       "optionType": 3,
@@ -329,6 +346,7 @@
       "LanID": [
         207
       ],
+      "NPCID": null,
       "ConditionType": null,
       "finishCount": null,
       "optionType": 1,
@@ -348,6 +366,7 @@
       "LanID": [
         221
       ],
+      "NPCID": null,
       "ConditionType": null,
       "finishCount": null,
       "optionType": 3,
@@ -365,6 +384,7 @@
       "LanID": [
         222
       ],
+      "NPCID": null,
       "ConditionType": null,
       "finishCount": null,
       "optionType": 3,
@@ -382,6 +402,7 @@
       "LanID": [
         223
       ],
+      "NPCID": null,
       "ConditionType": null,
       "finishCount": null,
       "optionType": 3,
@@ -401,6 +422,7 @@
       "LanID": [
         224
       ],
+      "NPCID": null,
       "ConditionType": null,
       "finishCount": null,
       "optionType": null,
@@ -412,6 +434,7 @@
       "LanID": [
         208
       ],
+      "NPCID": null,
       "ConditionType": null,
       "finishCount": null,
       "optionType": 2,
@@ -430,6 +453,7 @@
       "LanID": [
         209
       ],
+      "NPCID": null,
       "ConditionType": null,
       "finishCount": null,
       "optionType": 3,
@@ -449,6 +473,7 @@
         211,
         1903
       ],
+      "NPCID": null,
       "ConditionType": null,
       "finishCount": null,
       "optionType": 3,
@@ -469,6 +494,7 @@
         214,
         215
       ],
+      "NPCID": null,
       "ConditionType": null,
       "finishCount": null,
       "optionType": 3,
@@ -486,6 +512,7 @@
       "LanID": [
         1901
       ],
+      "NPCID": null,
       "ConditionType": null,
       "finishCount": null,
       "optionType": 2,
@@ -504,6 +531,7 @@
       "LanID": [
         1902
       ],
+      "NPCID": null,
       "ConditionType": null,
       "finishCount": null,
       "optionType": 2,
@@ -522,6 +550,7 @@
       "LanID": [
         1914
       ],
+      "NPCID": null,
       "ConditionType": null,
       "finishCount": 1,
       "optionType": null,
@@ -533,6 +562,7 @@
     {
       "ID": 100002,
       "conciseEventMessage": 1911,
+      "NPCID": null,
       "ConditionType": 5,
       "ConditionPara": [
         100001
@@ -550,6 +580,7 @@
     {
       "ID": 100003,
       "conciseEventMessage": 1912,
+      "NPCID": null,
       "ConditionType": 6,
       "ConditionPara": [
         1001
@@ -564,6 +595,7 @@
     {
       "ID": 100004,
       "conciseEventMessage": 1913,
+      "NPCID": null,
       "ConditionType": 3,
       "ConditionPara": [
         10

Assets/Res/Config/EventNPC.json

@@ -0,0 +1,59 @@
+{
+  "configList": [
+    {
+      "ID": 1,
+      "ID_1": null,
+      "DaoyouID": null
+    },
+    {
+      "ID": 2,
+      "ID_1": null,
+      "DaoyouID": 1
+    },
+    {
+      "ID": 3,
+      "ID_1": null,
+      "DaoyouID": 2
+    },
+    {
+      "ID": 4,
+      "ID_1": null,
+      "DaoyouID": 3
+    },
+    {
+      "ID": 5,
+      "ID_1": null,
+      "DaoyouID": 4
+    },
+    {
+      "ID": 6,
+      "ID_1": null,
+      "DaoyouID": 5
+    },
+    {
+      "ID": 7,
+      "ID_1": null,
+      "DaoyouID": 6
+    },
+    {
+      "ID": 8,
+      "ID_1": null,
+      "DaoyouID": 7
+    },
+    {
+      "ID": 9,
+      "ID_1": null,
+      "DaoyouID": 8
+    },
+    {
+      "ID": 10,
+      "ID_1": null,
+      "DaoyouID": 9
+    },
+    {
+      "ID": 11,
+      "ID_1": null,
+      "DaoyouID": 10
+    }
+  ]
+}

Assets/Scripts/GameData/ExcelConfig/DaoyouModelConfig.cs

@@ -32,6 +32,18 @@ public int name;
 public int quality;
 
 
+		/// <summary>
+		///半身像
+		/// </summary>
+public string bodyIcon;
+
+
+		/// <summary>
+		///头像
+		/// </summary>
+public string headIcon;
+
+
 		/// <summary>
 		///潜力 80=80% 等级差
 		/// </summary>

Assets/Scripts/GameData/ExcelConfig/EventLinkConfig.cs

@@ -32,6 +32,12 @@ public int conciseEventMessage;
 public int[] LanID;
 
 
+		/// <summary>
+		///对话NPCID
+		/// </summary>
+public int NPCID;
+
+
 		/// <summary>
 		///条件判断类型
 		/// </summary>

Assets/Scripts/GameData/ExcelConfig/EventNPC.cs

@@ -0,0 +1,38 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\EventConfig.xlsx. SheetName: EventNPC
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "EventNPC.json")]
+	public partial class EventNPCHolder : ConfigHolder<EventNPC>
	{
+	}
+
+
+	[Serializable]
+	public struct EventNPC : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///ID
+		/// </summary>
+public int ID;
+
+
+		/// <summary>
+		///半身像icon
+		/// </summary>
+public int ID_1;
+
+
+		/// <summary>
+		///道友ID
+		/// </summary>
+public int DaoyouID;
+
+
+	}
+
+}
+// End of Auto Generated Code

Assets/Scripts/GameData/ExcelConfig/daolvSkill.cs

@@ -0,0 +1,38 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\DaoyouConfig.xlsx. SheetName: daolvSkill
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "daolvSkill.json")]
+	public partial class daolvSkillHolder : ConfigHolder<daolvSkill>
	{
+	}
+
+
+	[Serializable]
+	public struct daolvSkill : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///ID
+		/// </summary>
+public int ID;
+
+
+		/// <summary>
+		///Idgroup
+		/// </summary>
+public int Idgroup;
+
+
+		/// <summary>
+		///等级
+		/// </summary>
+public int lv;
+
+
+	}
+
+}
+// End of Auto Generated Code