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

# Conflicts:
#	Assets/Scripts/GameData/ExcelConfig/EventConfig.cs   resolved by origin/master(远端) version
#	Excel2Json/Excel/EventConfig.xlsx   resolved by origin/master(远端) version

Assets/Res/Config/DaoyouConfig.json

@@ -1,304 +0,0 @@
-{
-  "configList": [
-    {
-      "ID": 1,
-      "SkillPower1": 100,
-      "SkillPower2": 100.0
-    },
-    {
-      "ID": 2,
-      "SkillPower1": 110,
-      "SkillPower2": 110.0
-    },
-    {
-      "ID": 3,
-      "SkillPower1": 120,
-      "SkillPower2": 120.0
-    },
-    {
-      "ID": 4,
-      "SkillPower1": 130,
-      "SkillPower2": 130.0
-    },
-    {
-      "ID": 5,
-      "SkillPower1": 140,
-      "SkillPower2": 140.0
-    },
-    {
-      "ID": 6,
-      "SkillPower1": 150,
-      "SkillPower2": 150.0
-    },
-    {
-      "ID": 7,
-      "SkillPower1": 160,
-      "SkillPower2": 160.0
-    },
-    {
-      "ID": 8,
-      "SkillPower1": 170,
-      "SkillPower2": 170.0
-    },
-    {
-      "ID": 9,
-      "SkillPower1": 180,
-      "SkillPower2": 180.0
-    },
-    {
-      "ID": 10,
-      "SkillPower1": 190,
-      "SkillPower2": 190.0
-    },
-    {
-      "ID": 11,
-      "SkillPower1": 200,
-      "SkillPower2": 200.0
-    },
-    {
-      "ID": 12,
-      "SkillPower1": 210,
-      "SkillPower2": 210.0
-    },
-    {
-      "ID": 13,
-      "SkillPower1": 220,
-      "SkillPower2": 220.0
-    },
-    {
-      "ID": 14,
-      "SkillPower1": 230,
-      "SkillPower2": 230.0
-    },
-    {
-      "ID": 15,
-      "SkillPower1": 240,
-      "SkillPower2": 240.0
-    },
-    {
-      "ID": 16,
-      "SkillPower1": 250,
-      "SkillPower2": 250.0
-    },
-    {
-      "ID": 17,
-      "SkillPower1": 260,
-      "SkillPower2": 260.0
-    },
-    {
-      "ID": 18,
-      "SkillPower1": 270,
-      "SkillPower2": 270.0
-    },
-    {
-      "ID": 19,
-      "SkillPower1": 280,
-      "SkillPower2": 280.0
-    },
-    {
-      "ID": 20,
-      "SkillPower1": 290,
-      "SkillPower2": 290.0
-    },
-    {
-      "ID": 21,
-      "SkillPower1": 300,
-      "SkillPower2": 300.0
-    },
-    {
-      "ID": 22,
-      "SkillPower1": 310,
-      "SkillPower2": 310.0
-    },
-    {
-      "ID": 23,
-      "SkillPower1": 320,
-      "SkillPower2": 320.0
-    },
-    {
-      "ID": 24,
-      "SkillPower1": 330,
-      "SkillPower2": 330.0
-    },
-    {
-      "ID": 25,
-      "SkillPower1": 340,
-      "SkillPower2": 340.0
-    },
-    {
-      "ID": 26,
-      "SkillPower1": 350,
-      "SkillPower2": 350.0
-    },
-    {
-      "ID": 27,
-      "SkillPower1": 360,
-      "SkillPower2": 360.0
-    },
-    {
-      "ID": 28,
-      "SkillPower1": 370,
-      "SkillPower2": 370.0
-    },
-    {
-      "ID": 29,
-      "SkillPower1": 380,
-      "SkillPower2": 380.0
-    },
-    {
-      "ID": 30,
-      "SkillPower1": 390,
-      "SkillPower2": 390.0
-    },
-    {
-      "ID": 31,
-      "SkillPower1": 400,
-      "SkillPower2": 400.0
-    },
-    {
-      "ID": 32,
-      "SkillPower1": 410,
-      "SkillPower2": 410.0
-    },
-    {
-      "ID": 33,
-      "SkillPower1": 420,
-      "SkillPower2": 420.0
-    },
-    {
-      "ID": 34,
-      "SkillPower1": 430,
-      "SkillPower2": 430.0
-    },
-    {
-      "ID": 35,
-      "SkillPower1": 440,
-      "SkillPower2": 440.0
-    },
-    {
-      "ID": 36,
-      "SkillPower1": 450,
-      "SkillPower2": 450.0
-    },
-    {
-      "ID": 37,
-      "SkillPower1": 460,
-      "SkillPower2": 460.0
-    },
-    {
-      "ID": 38,
-      "SkillPower1": 470,
-      "SkillPower2": 470.0
-    },
-    {
-      "ID": 39,
-      "SkillPower1": 480,
-      "SkillPower2": 480.0
-    },
-    {
-      "ID": 40,
-      "SkillPower1": 490,
-      "SkillPower2": 490.0
-    },
-    {
-      "ID": 41,
-      "SkillPower1": 500,
-      "SkillPower2": 500.0
-    },
-    {
-      "ID": 42,
-      "SkillPower1": 510,
-      "SkillPower2": 510.0
-    },
-    {
-      "ID": 43,
-      "SkillPower1": 520,
-      "SkillPower2": 520.0
-    },
-    {
-      "ID": 44,
-      "SkillPower1": 530,
-      "SkillPower2": 530.0
-    },
-    {
-      "ID": 45,
-      "SkillPower1": 540,
-      "SkillPower2": 540.0
-    },
-    {
-      "ID": 46,
-      "SkillPower1": 550,
-      "SkillPower2": 550.0
-    },
-    {
-      "ID": 47,
-      "SkillPower1": 560,
-      "SkillPower2": 560.0
-    },
-    {
-      "ID": 48,
-      "SkillPower1": 570,
-      "SkillPower2": 570.0
-    },
-    {
-      "ID": 49,
-      "SkillPower1": 580,
-      "SkillPower2": 580.0
-    },
-    {
-      "ID": 50,
-      "SkillPower1": 590,
-      "SkillPower2": 590.0
-    },
-    {
-      "ID": 51,
-      "SkillPower1": 600,
-      "SkillPower2": 600.0
-    },
-    {
-      "ID": 52,
-      "SkillPower1": 610,
-      "SkillPower2": 610.0
-    },
-    {
-      "ID": 53,
-      "SkillPower1": 620,
-      "SkillPower2": 620.0
-    },
-    {
-      "ID": 54,
-      "SkillPower1": 630,
-      "SkillPower2": 630.0
-    },
-    {
-      "ID": 55,
-      "SkillPower1": 640,
-      "SkillPower2": 640.0
-    },
-    {
-      "ID": 56,
-      "SkillPower1": 650,
-      "SkillPower2": 650.0
-    },
-    {
-      "ID": 57,
-      "SkillPower1": 660,
-      "SkillPower2": 660.0
-    },
-    {
-      "ID": 58,
-      "SkillPower1": 670,
-      "SkillPower2": 670.0
-    },
-    {
-      "ID": 59,
-      "SkillPower1": 680,
-      "SkillPower2": 680.0
-    },
-    {
-      "ID": 60,
-      "SkillPower1": 690,
-      "SkillPower2": 690.0
-    }
-  ]
-}

Assets/Res/Config/DaoyouLevelupConfig.json

@@ -0,0 +1,34 @@
+{
+  "configList": [
+    {
+      "ID": 1
+    },
+    {
+      "ID": 2
+    },
+    {
+      "ID": 3
+    },
+    {
+      "ID": 4
+    },
+    {
+      "ID": 5
+    },
+    {
+      "ID": 6
+    },
+    {
+      "ID": 7
+    },
+    {
+      "ID": 8
+    },
+    {
+      "ID": 9
+    },
+    {
+      "ID": 10
+    }
+  ]
+}

Assets/Res/Config/DaoyouModelConfig.json

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

Assets/Res/Config/EventConfig.json

@@ -22,7 +22,7 @@
       ],
       "EventCount": null,
       "EventName": 174,
-      "Description": null
+      "Description": 1936
     },
     {
       "ID": 2,
@@ -48,7 +48,7 @@
       ],
       "EventCount": null,
       "EventName": 175,
-      "Description": null
+      "Description": 1937
     },
     {
       "ID": 3,
@@ -74,7 +74,7 @@
       ],
       "EventCount": null,
       "EventName": 176,
-      "Description": null
+      "Description": 1938
     },
     {
       "ID": 4,
@@ -94,7 +94,7 @@
       ],
       "EventCount": null,
       "EventName": 217,
-      "Description": null
+      "Description": 1939
     },
     {
       "ID": 5,
@@ -114,7 +114,7 @@
       ],
       "EventCount": null,
       "EventName": 218,
-      "Description": null
+      "Description": 1940
     },
     {
       "ID": 6,
@@ -134,7 +134,7 @@
       ],
       "EventCount": null,
       "EventName": 219,
-      "Description": null
+      "Description": 1941
     },
     {
       "ID": 7,
@@ -154,7 +154,7 @@
       ],
       "EventCount": null,
       "EventName": 220,
-      "Description": null
+      "Description": 1942
     },
     {
       "ID": 11,

Assets/Res/Config/EventLinkConfig.json

@@ -266,9 +266,12 @@
       "LanID": [
         192
       ],
-      "ConditionType": null,
-      "finishCount": null,
-      "optionType": 3,
+      "ConditionType": 1,
+      "ConditionPara": [
+        1002
+      ],
+      "finishCount": 1,
+      "optionType": 4,
       "PrizeIDs": [
         1002
       ],

Assets/Res/Config/LanguageChineseConfig.json

@@ -830,11 +830,11 @@
     },
     {
       "ID": 208,
-      "txt": "事件10001：一只[怪物1]袭击了你，准备迎战"
+      "txt": ""
     },
     {
       "ID": 209,
-      "txt": "你击败了怪物，并从它身上吸取了一些修为"
+      "txt": ""
     },
     {
       "ID": 210,
@@ -7742,31 +7742,31 @@
     },
     {
       "ID": 1936,
-      "txt": "0"
+      "txt": "你发现一只奄奄一息的狼，决定上前一探究竟。"
     },
     {
       "ID": 1937,
-      "txt": "0"
+      "txt": "附近的小树林闹的不可开交，你决定去看看怎么回事。"
     },
     {
       "ID": 1938,
-      "txt": "0"
+      "txt": "附近的小树林闹的不可开交，你决定去看看怎么回事。"
     },
     {
       "ID": 1939,
-      "txt": "0"
+      "txt": "不远处有一个小红点，走近一看你发现是一个带血的背包。"
     },
     {
       "ID": 1940,
-      "txt": "0"
+      "txt": "底下一座矿山甚是磅礴雄伟，走，去看一看。"
     },
     {
       "ID": 1941,
-      "txt": "0"
+      "txt": "你被一男一女的吵架声吸引。"
     },
     {
       "ID": 1942,
-      "txt": "0"
+      "txt": "远处一座道观仙气缭绕，似有仙人在此。"
     },
     {
       "ID": 1943,

Assets/Scripts/GameData/ExcelConfig/DaoyouConfig.cs

@@ -1,38 +0,0 @@
-// Auto Generated Code By excel2json
-// Generate From Excel\DaoyouConfig.xlsx. SheetName: DaoyouConfig
-
-using System;
-using Fort23.GameData;
-
-namespace Excel2Json
-{
-	[Config(prefab = "DaoyouConfig.json")]
-	public partial class DaoyouConfigHolder : ConfigHolder<DaoyouConfig>
	{
-	}
-
-
-	[Serializable]
-	public struct DaoyouConfig : IConfig
	{
-		public int GetID() {return ID;} 
-		/// <summary>
-		///等级
-		/// </summary>
-public int ID;
-
-
-		/// <summary>
-		///标准强度固定值
-		/// </summary>
-public int SkillPower1;
-
-
-		/// <summary>
-		///标准强度百分比
-		/// </summary>
-public float SkillPower2;
-
-
-	}
-
-}
-// End of Auto Generated Code

Assets/Scripts/GameData/ExcelConfig/DaoyouLevelupConfig.cs

@@ -0,0 +1,56 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\DaoyouConfig.xlsx. SheetName: DaoyouLevelupConfig
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "DaoyouLevelupConfig.json")]
+	public partial class DaoyouLevelupConfigHolder : ConfigHolder<DaoyouLevelupConfig>
	{
+	}
+
+
+	[Serializable]
+	public struct DaoyouLevelupConfig : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///LV
+		/// </summary>
+public int ID;
+
+
+		/// <summary>
+		///名称
+		/// </summary>
+public int Column1;
+
+
+		/// <summary>
+		///升级所需经验
+		/// </summary>
+public int Column3;
+
+
+		/// <summary>
+		///道具奖励ID
+		/// </summary>
+public int[] Column4;
+
+
+		/// <summary>
+		///道具奖励数量
+		/// </summary>
+public int[] Column5;
+
+
+		/// <summary>
+		///挂机增益成长率 100=100%
+		/// </summary>
+public int Column6;
+
+
+	}
+
+}
+// End of Auto Generated Code

Assets/Scripts/GameData/ExcelConfig/DaoyouModelConfig.cs

@@ -0,0 +1,86 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\DaoyouConfig.xlsx. SheetName: DaoyouModelConfig
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "DaoyouModelConfig.json")]
+	public partial class DaoyouModelConfigHolder : ConfigHolder<DaoyouModelConfig>
	{
+	}
+
+
+	[Serializable]
+	public struct DaoyouModelConfig : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///ID
+		/// </summary>
+public int ID;
+
+
+		/// <summary>
+		///名称
+		/// </summary>
+public int Column1;
+
+
+		/// <summary>
+		///道友品质
+		/// </summary>
+public int Column3;
+
+
+		/// <summary>
+		///潜力 80=80% 等级差
+		/// </summary>
+public int Column4;
+
+
+		/// <summary>
+		///介绍
+		/// </summary>
+public int[] Column5;
+
+
+		/// <summary>
+		///介绍解锁相熟等级
+		/// </summary>
+public int[] Column6;
+
+
+		/// <summary>
+		///喜好的礼物ID
+		/// </summary>
+public int[] Column7;
+
+
+		/// <summary>
+		///喜好礼物可见相熟等级
+		/// </summary>
+public int[] Column8;
+
+
+		/// <summary>
+		///挂机增益比例 10=10%
+		/// </summary>
+public int Column9;
+
+
+		/// <summary>
+		///成为道侣后提供的加成类型
+		/// </summary>
+public int BuffType;
+
+
+		/// <summary>
+		///成为道侣后提供的加成值
+		/// </summary>
+public int[] BuffValue;
+
+
+	}
+
+}
+// End of Auto Generated Code

Assets/Scripts/GameData/ExcelConfig/EventConfig.cs

@@ -1,100 +1,92 @@
-// Auto Generated Code By excel2json
-// Generate From Excel\EventConfig.xlsx. SheetName: EventConfig
+// Auto Generated Code By excel2json
+// Generate From Excel\EventConfig.xlsx. SheetName: EventConfig
 
-using System;
+using System;
 using Fort23.GameData;
-
+
 namespace Excel2Json
-{
-	[Config(prefab = "EventConfig.json")]
-	public partial class EventConfigHolder : ConfigHolder<EventConfig>
-	{
-	}
-
-
-	[Serializable]
-	public struct EventConfig : IConfig
-	{
-		public int GetID() {return ID;} 
+{
+	[Config(prefab = "EventConfig.json")]
+	public partial class EventConfigHolder : ConfigHolder<EventConfig>
	{
+	}
+
+
+	[Serializable]
+	public struct EventConfig : IConfig
	{
+		public int GetID() {return ID;} 
 		/// <summary>
 		///ID
 		/// </summary>
 public int ID;
-
-
+
+
 		/// <summary>
-		///事件的起始ID
+		///事件包含的ID
 		/// </summary>
 public int[] EventLinksId;
-
-
+
+
 		/// <summary>
 		///触发事件类型： 1.通用事件 2.挂机事件 4.主线任务 99.无标记事件 
 		/// </summary>
 public int EventTriggerType;
-
-
+
+
 		/// <summary>
 		///tag 1主线 2支线 3通用 4地图通用 5道友
 		/// </summary>
 public int EventTag;
-
-
+
+
 		/// <summary>
 		///1.正常触发 2.直接结算
 		/// </summary>
 public int EventType;
-
-
+
+
 		/// <summary>
 		///增加进度值
 		/// </summary>
 public int Score;
-
-
+
+
 		/// <summary>
 		///事件品质
 		/// </summary>
 public int EventQuality;
-
-
+
+
 		/// <summary>
 		///触发条件类型 只能配处于什么状态和数值，不能配变化的数值
 		/// </summary>
-public int EventConditionId;
-
-
+public int[] EventConditionId;
+
+
 		/// <summary>
 		///触发效果值
 		/// </summary>
 public int[] EventValue;
-
-
+
+
 		/// <summary>
 		///触发判定数量or次数
 		/// </summary>
 public int EventCount;
-
-
+
+
 		/// <summary>
 		///描述（题目）
 		/// </summary>
 public int EventName;
-
-
+
+
 		/// <summary>
-		///
+		///事件主体描述
 		/// </summary>
 public int Description;
-
-
-		/// <summary>
-		///特殊功能参数
-		/// </summary>
-public int[] associateVlaue;
-
-
-	}
-
-}
-// End of Auto Generated Code
+
+
+	}
+
+}
+// End of Auto Generated Code

Assets/Scripts/GameData/ExcelConfig/EventLinkConfig.cs

@@ -51,19 +51,19 @@ public int finishCount;
 
 
 		/// <summary>
-		///步骤类型 1=提供选项 2=进入战斗 3=获得奖励
+		///步骤类型 1=提供选项 2=进入战斗 3=获得奖励 4=扣除道具
 		/// </summary>
 public int optionType;
 
 
 		/// <summary>
-		///事件常量1 1=事件IDs 2=战斗ID 3= 4=eventConfigID
+		///事件常量1 1=事件IDs 2=战斗ID
 		/// </summary>
 public int[] optionPara1;
 
 
 		/// <summary>
-		///事件常量2 1=事件文本 2= 3=
+		///事件常量2 1=事件文本
 		/// </summary>
 public int[] optionPara2;
 

Assets/Scripts/GameData/ExcelConfig/HeroPowerUpConfig.cs

@@ -170,6 +170,12 @@ public int MaxFabaoNum;
 public float MPFactor;
 
 
+		/// <summary>
+		///允许出现的最大挂机道友数量
+		/// </summary>
+public int DaoyouCount;
+
+
 	}
 
 }