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

Assets/Res/Config/AttributeConfig.json

@@ -2,102 +2,136 @@
   "configList": [
     {
       "ID": 1,
+      "name": null,
+      "des": null,
       "DefaultValue": -1.0,
       "MinValue": 0.0,
       "MaxValue": -1.0
     },
     {
       "ID": 2,
+      "name": null,
+      "des": null,
       "DefaultValue": -1.0,
       "MinValue": 0.0,
       "MaxValue": -1.0
     },
     {
       "ID": 3,
+      "name": null,
+      "des": null,
       "DefaultValue": -1.0,
       "MinValue": 0.0,
       "MaxValue": -1.0
     },
     {
       "ID": 4,
+      "name": null,
+      "des": null,
       "DefaultValue": -1.0,
       "MinValue": 0.0,
       "MaxValue": -1.0
     },
     {
       "ID": 101,
+      "name": null,
+      "des": null,
       "DefaultValue": 0.0,
       "MinValue": 0.0,
       "MaxValue": -1.0
     },
     {
       "ID": 102,
+      "name": null,
+      "des": null,
       "DefaultValue": 0.0,
       "MinValue": 0.0,
       "MaxValue": -1.0
     },
     {
       "ID": 103,
+      "name": null,
+      "des": null,
       "DefaultValue": 0.0,
       "MinValue": 0.0,
       "MaxValue": -1.0
     },
     {
       "ID": 104,
+      "name": null,
+      "des": null,
       "DefaultValue": 0.0,
       "MinValue": 0.0,
       "MaxValue": -1.0
     },
     {
       "ID": 105,
+      "name": null,
+      "des": null,
       "DefaultValue": 0.0,
       "MinValue": 0.0,
       "MaxValue": -1.0
     },
     {
       "ID": 106,
+      "name": null,
+      "des": null,
       "DefaultValue": 100.0,
       "MinValue": 10.0,
       "MaxValue": 200.0
     },
     {
       "ID": 107,
+      "name": null,
+      "des": null,
       "DefaultValue": 100.0,
       "MinValue": 10.0,
       "MaxValue": 200.0
     },
     {
       "ID": 108,
+      "name": null,
+      "des": null,
       "DefaultValue": 100.0,
       "MinValue": 10.0,
       "MaxValue": 200.0
     },
     {
       "ID": 109,
+      "name": null,
+      "des": null,
       "DefaultValue": 100.0,
       "MinValue": 10.0,
       "MaxValue": 200.0
     },
     {
       "ID": 110,
+      "name": null,
+      "des": null,
       "DefaultValue": 100.0,
       "MinValue": 10.0,
       "MaxValue": 200.0
     },
     {
       "ID": 111,
+      "name": null,
+      "des": null,
       "DefaultValue": 0.0,
       "MinValue": 0.0,
       "MaxValue": -1.0
     },
     {
       "ID": 112,
+      "name": null,
+      "des": null,
       "DefaultValue": 0.0,
       "MinValue": -100.0,
       "MaxValue": 50.0
     },
     {
       "ID": 113,
+      "name": null,
+      "des": null,
       "DefaultValue": 0.0,
       "MinValue": 0.0,
       "MaxValue": -1.0

Assets/Res/Config/ChanllegeResource.json

@@ -38,6 +38,9 @@
       "paraType": 2,
       "para1": [
         5
+      ],
+      "para2": [
+        200
       ]
     }
   ]

Assets/Res/Config/ChanllegeTower.json

@@ -0,0 +1,184 @@
+{
+  "configList": [
+    {
+      "ID": 1
+    },
+    {
+      "ID": 2
+    },
+    {
+      "ID": 3
+    },
+    {
+      "ID": 4
+    },
+    {
+      "ID": 5
+    },
+    {
+      "ID": 6
+    },
+    {
+      "ID": 7
+    },
+    {
+      "ID": 8
+    },
+    {
+      "ID": 9
+    },
+    {
+      "ID": 10
+    },
+    {
+      "ID": 11
+    },
+    {
+      "ID": 12
+    },
+    {
+      "ID": 13
+    },
+    {
+      "ID": 14
+    },
+    {
+      "ID": 15
+    },
+    {
+      "ID": 16
+    },
+    {
+      "ID": 17
+    },
+    {
+      "ID": 18
+    },
+    {
+      "ID": 19
+    },
+    {
+      "ID": 20
+    },
+    {
+      "ID": 21
+    },
+    {
+      "ID": 22
+    },
+    {
+      "ID": 23
+    },
+    {
+      "ID": 24
+    },
+    {
+      "ID": 25
+    },
+    {
+      "ID": 26
+    },
+    {
+      "ID": 27
+    },
+    {
+      "ID": 28
+    },
+    {
+      "ID": 29
+    },
+    {
+      "ID": 30
+    },
+    {
+      "ID": 31
+    },
+    {
+      "ID": 32
+    },
+    {
+      "ID": 33
+    },
+    {
+      "ID": 34
+    },
+    {
+      "ID": 35
+    },
+    {
+      "ID": 36
+    },
+    {
+      "ID": 37
+    },
+    {
+      "ID": 38
+    },
+    {
+      "ID": 39
+    },
+    {
+      "ID": 40
+    },
+    {
+      "ID": 41
+    },
+    {
+      "ID": 42
+    },
+    {
+      "ID": 43
+    },
+    {
+      "ID": 44
+    },
+    {
+      "ID": 45
+    },
+    {
+      "ID": 46
+    },
+    {
+      "ID": 47
+    },
+    {
+      "ID": 48
+    },
+    {
+      "ID": 49
+    },
+    {
+      "ID": 50
+    },
+    {
+      "ID": 51
+    },
+    {
+      "ID": 52
+    },
+    {
+      "ID": 53
+    },
+    {
+      "ID": 54
+    },
+    {
+      "ID": 55
+    },
+    {
+      "ID": 56
+    },
+    {
+      "ID": 57
+    },
+    {
+      "ID": 58
+    },
+    {
+      "ID": 59
+    },
+    {
+      "ID": 60
+    }
+  ]
+}

Assets/Res/Config/DaoyouModelConfig.json

@@ -2,43 +2,56 @@
   "configList": [
     {
       "ID": 1,
-      "BuffType": null
+      "BuffType": 112,
+      "BuffValue": [
+        10
+      ],
+      "BuffQuality": 3
     },
     {
       "ID": 2,
-      "BuffType": null
+      "BuffType": null,
+      "BuffQuality": null
     },
     {
       "ID": 3,
-      "BuffType": null
+      "BuffType": null,
+      "BuffQuality": null
     },
     {
       "ID": 4,
-      "BuffType": null
+      "BuffType": null,
+      "BuffQuality": null
     },
     {
       "ID": 5,
-      "BuffType": null
+      "BuffType": null,
+      "BuffQuality": null
     },
     {
       "ID": 6,
-      "BuffType": null
+      "BuffType": null,
+      "BuffQuality": null
     },
     {
       "ID": 7,
-      "BuffType": null
+      "BuffType": null,
+      "BuffQuality": null
     },
     {
       "ID": 8,
-      "BuffType": null
+      "BuffType": null,
+      "BuffQuality": null
     },
     {
       "ID": 9,
-      "BuffType": null
+      "BuffType": null,
+      "BuffQuality": null
     },
     {
       "ID": 10,
-      "BuffType": null
+      "BuffType": null,
+      "BuffQuality": null
     }
   ]
 }

Assets/Res/Config/TanxianConfig.json

@@ -0,0 +1,39 @@
+{
+  "configList": [
+    {
+      "ID": 1,
+      "EventID": 11,
+      "icon": "",
+      "weight": 10,
+      "des": null
+    },
+    {
+      "ID": 2,
+      "EventID": 12,
+      "icon": "",
+      "weight": 20,
+      "des": null
+    },
+    {
+      "ID": 3,
+      "EventID": 13,
+      "icon": "",
+      "weight": 30,
+      "des": null
+    },
+    {
+      "ID": 4,
+      "EventID": 14,
+      "icon": "",
+      "weight": 40,
+      "des": null
+    },
+    {
+      "ID": 5,
+      "EventID": 15,
+      "icon": "",
+      "weight": 50,
+      "des": null
+    }
+  ]
+}

Assets/Res/Config/TaskConfig.json

@@ -1,80 +0,0 @@
-{
-  "configList": [
-    {
-      "ID": 1,
-      "taskName": 1906,
-      "Description": 1914,
-      "conciseTaskMessage": 1910,
-      "mapID": 1,
-      "taskType": 10,
-      "finishConditionType": 3,
-      "finishVlaue": [
-        1914
-      ],
-      "finishCount": 1,
-      "awardItemId": [
-        1002
-      ],
-      "awardItemCount": [
-        10
-      ],
-      "unlockType": -1,
-      "unlockLevel": 1,
-      "nextTaskID": 2
-    },
-    {
-      "ID": 2,
-      "taskName": 1907,
-      "Description": 1915,
-      "conciseTaskMessage": 1911,
-      "mapID": 1,
-      "taskType": 10,
-      "finishConditionType": 2,
-      "finishVlaue": [
-        100001
-      ],
-      "finishCount": 2,
-      "unlockType": -1,
-      "unlockLevel": 1,
-      "nextTaskID": 3
-    },
-    {
-      "ID": 3,
-      "taskName": 1908,
-      "Description": 1916,
-      "conciseTaskMessage": 1912,
-      "mapID": 1,
-      "taskType": 10,
-      "finishConditionType": 1,
-      "finishVlaue": [
-        1001
-      ],
-      "finishCount": 1,
-      "unlockType": -1,
-      "unlockLevel": 1,
-      "nextTaskID": 4
-    },
-    {
-      "ID": 4,
-      "taskName": 1909,
-      "Description": 1917,
-      "conciseTaskMessage": 1913,
-      "mapID": 1,
-      "taskType": 10,
-      "finishConditionType": 4,
-      "finishVlaue": [
-        10
-      ],
-      "finishCount": 1,
-      "awardItemId": [
-        1003
-      ],
-      "awardItemCount": [
-        1
-      ],
-      "unlockType": -1,
-      "unlockLevel": 1,
-      "nextTaskID": 0
-    }
-  ]
-}

Assets/Scripts/GameData/ExcelConfig/AttributeConfig.cs

@@ -20,6 +20,18 @@ namespace Excel2Json
 public int ID;
 
 
+		/// <summary>
+		///中文名称
+		/// </summary>
+public int name;
+
+
+		/// <summary>
+		///中文说明
+		/// </summary>
+public int des;
+
+
 		/// <summary>
 		///默认值 -1为无默认值or由其他系统决定
 		/// </summary>

Assets/Scripts/GameData/ExcelConfig/ChanllegeTower.cs

@@ -0,0 +1,32 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\ChanllegeTower.xlsx. SheetName: ChanllegeTower
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "ChanllegeTower.json")]
+	public partial class ChanllegeTowerHolder : ConfigHolder<ChanllegeTower>
	{
+	}
+
+
+	[Serializable]
+	public struct ChanllegeTower : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///ID
+		/// </summary>
+public int ID;
+
+
+		/// <summary>
+		///道具名称 
+		/// </summary>
+public int Column1;
+
+
+	}
+
+}
+// End of Auto Generated Code

Assets/Scripts/GameData/ExcelConfig/DaoyouModelConfig.cs

@@ -80,10 +80,16 @@ public int BuffType;
 public int[] BuffValue;
 
 
+		/// <summary>
+		///词缀品质
+		/// </summary>
+public int BuffQuality;
+
+
 		/// <summary>
 		///道侣任务ID
 		/// </summary>
-public int Column12;
+public int Column13;
 
 
 	}

Assets/Scripts/GameData/ExcelConfig/TanxianConfig.cs

@@ -0,0 +1,50 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\ChanllegeResource.xlsx. SheetName: TanxianConfig
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "TanxianConfig.json")]
+	public partial class TanxianConfigHolder : ConfigHolder<TanxianConfig>
	{
+	}
+
+
+	[Serializable]
+	public struct TanxianConfig : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///ID
+		/// </summary>
+public int ID;
+
+
+		/// <summary>
+		///事件的ID
+		/// </summary>
+public int EventID;
+
+
+		/// <summary>
+		///事件icon
+		/// </summary>
+public string icon;
+
+
+		/// <summary>
+		///出现权重
+		/// </summary>
+public int weight;
+
+
+		/// <summary>
+		///完成后的成就描述
+		/// </summary>
+public int des;
+
+
+	}
+
+}
+// End of Auto Generated Code

Assets/Scripts/GameData/ExcelConfig/TaskConfig.cs

@@ -1,104 +0,0 @@
-// Auto Generated Code By excel2json
-// Generate From Excel\Task.xlsx. SheetName: TaskConfig
-
-using System;
-using Fort23.GameData;
-
-namespace Excel2Json
-{
-	[Config(prefab = "TaskConfig.json")]
-	public partial class TaskConfigHolder : ConfigHolder<TaskConfig>
	{
-	}
-
-
-	[Serializable]
-	public struct TaskConfig : IConfig
	{
-		public int GetID() {return ID;} 
-		/// <summary>
-		///ID序列号
-		/// </summary>
-public int ID;
-
-
-		/// <summary>
-		///任务名 
-		/// </summary>
-public int taskName;
-
-
-		/// <summary>
-		///任务描述
-		/// </summary>
-public int Description;
-
-
-		/// <summary>
-		///简洁描述
-		/// </summary>
-public int conciseTaskMessage;
-
-
-		/// <summary>
-		///属于哪张地图
-		/// </summary>
-public int mapID;
-
-
-		/// <summary>
-		///任务类型 见任务索引
-		/// </summary>
-public int taskType;
-
-
-		/// <summary>
-		///完成条件类型 读第二页ID
-		/// </summary>
-public int finishConditionType;
-
-
-		/// <summary>
-		///完成效果值
-		/// </summary>
-public int[] finishVlaue;
-
-
-		/// <summary>
-		///完成次数
-		/// </summary>
-public int finishCount;
-
-
-		/// <summary>
-		///奖励道具ID
-		/// </summary>
-public int[] awardItemId;
-
-
-		/// <summary>
-		///奖励道具数量
-		/// </summary>
-public int[] awardItemCount;
-
-
-		/// <summary>
-		///解锁类型 -1=不需要解锁 1=修为解锁 
-		/// </summary>
-public int unlockType;
-
-
-		/// <summary>
-		///解锁关卡id（完成） 或Unlock表ID
-		/// </summary>
-public int unlockLevel;
-
-
-		/// <summary>
-		///下一个任务ID（0表示无后续）
-		/// </summary>
-public int nextTaskID;
-
-
-	}
-
-}
-// End of Auto Generated Code