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

Assets/Res/Config/EventConfig.json

@@ -949,127 +949,6 @@
       "EventName": 4027,
       "Description": 4102
     },
-    {
-      "ID": 11,
-      "EventLinksId": [
-        1101,
-        1102,
-        1103,
-        100,
-        102
-      ],
-      "EventTriggerType": 2,
-      "EventTag": 3,
-      "EventType": 1,
-      "Score": 0,
-      "EventQuality": 1,
-      "PrizeIDs": [
-        1003
-      ],
-      "PrizeNums": [
-        -5
-      ],
-      "RefreshProbability": 0,
-      "RefreshCount": 0,
-      "placeID": 0,
-      "SmallPlacesId": 0,
-      "XiantuID": 0,
-      "EventConditionId": 0,
-      "EventCount": 0,
-      "EventName": 0,
-      "Description": 0
-    },
-    {
-      "ID": 12,
-      "EventLinksId": [
-        1201,
-        1202,
-        1203,
-        100,
-        102
-      ],
-      "EventTriggerType": 2,
-      "EventTag": 3,
-      "EventType": 1,
-      "Score": 0,
-      "EventQuality": 1,
-      "PrizeIDs": [
-        1005
-      ],
-      "PrizeNums": [
-        -5
-      ],
-      "RefreshProbability": 0,
-      "RefreshCount": 0,
-      "placeID": 0,
-      "SmallPlacesId": 0,
-      "XiantuID": 0,
-      "EventConditionId": 0,
-      "EventCount": 0,
-      "EventName": 0,
-      "Description": 0
-    },
-    {
-      "ID": 13,
-      "EventLinksId": [
-        1301,
-        1302,
-        1303,
-        1304,
-        100,
-        102
-      ],
-      "EventTriggerType": 2,
-      "EventTag": 3,
-      "EventType": 1,
-      "Score": 0,
-      "EventQuality": 1,
-      "PrizeIDs": [
-        1006
-      ],
-      "PrizeNums": [
-        -5
-      ],
-      "RefreshProbability": 0,
-      "RefreshCount": 0,
-      "placeID": 0,
-      "SmallPlacesId": 0,
-      "XiantuID": 0,
-      "EventConditionId": 0,
-      "EventCount": 0,
-      "EventName": 0,
-      "Description": 0
-    },
-    {
-      "ID": 14,
-      "EventLinksId": [
-        1401,
-        1402,
-        1403,
-        100,
-        102
-      ],
-      "EventTriggerType": 2,
-      "EventTag": 3,
-      "EventType": 1,
-      "Score": 0,
-      "EventQuality": 1,
-      "PrizeIDs": [
-        1001
-      ],
-      "PrizeNums": [
-        -5
-      ],
-      "RefreshProbability": 0,
-      "RefreshCount": 0,
-      "placeID": 0,
-      "SmallPlacesId": 0,
-      "XiantuID": 0,
-      "EventConditionId": 0,
-      "EventCount": 0,
-      "EventName": 0,
-      "Description": 0
-    },
     {
       "ID": 10001,
       "EventLinksId": [

Assets/Res/Config/SubunlockConfig.json

@@ -0,0 +1,207 @@
+{
+  "configList": [
+    {
+      "ID": 101,
+      "unlockSystem": 1,
+      "unlockSubystem": 1,
+      "unlocHeroDuty": 1,
+      "ulockHeroLevel": 10
+    },
+    {
+      "ID": 102,
+      "unlockSystem": 1,
+      "unlockSubystem": 1,
+      "unlocHeroDuty": 2,
+      "ulockHeroLevel": 200
+    },
+    {
+      "ID": 103,
+      "unlockSystem": 1,
+      "unlockSubystem": 1,
+      "unlocHeroDuty": 3,
+      "ulockHeroLevel": 400
+    },
+    {
+      "ID": 104,
+      "unlockSystem": 1,
+      "unlockSubystem": 1,
+      "unlocHeroDuty": 4,
+      "ulockHeroLevel": 200
+    },
+    {
+      "ID": 105,
+      "unlockSystem": 1,
+      "unlockSubystem": 2,
+      "unlocHeroDuty": 1,
+      "ulockHeroLevel": 200
+    },
+    {
+      "ID": 106,
+      "unlockSystem": 1,
+      "unlockSubystem": 2,
+      "unlocHeroDuty": 2,
+      "ulockHeroLevel": 400
+    },
+    {
+      "ID": 107,
+      "unlockSystem": 1,
+      "unlockSubystem": 2,
+      "unlocHeroDuty": 3,
+      "ulockHeroLevel": 10
+    },
+    {
+      "ID": 108,
+      "unlockSystem": 1,
+      "unlockSubystem": 2,
+      "unlocHeroDuty": 4,
+      "ulockHeroLevel": 10
+    },
+    {
+      "ID": 109,
+      "unlockSystem": 1,
+      "unlockSubystem": 3,
+      "unlocHeroDuty": 1,
+      "ulockHeroLevel": 400
+    },
+    {
+      "ID": 110,
+      "unlockSystem": 1,
+      "unlockSubystem": 3,
+      "unlocHeroDuty": 2,
+      "ulockHeroLevel": 10
+    },
+    {
+      "ID": 111,
+      "unlockSystem": 1,
+      "unlockSubystem": 3,
+      "unlocHeroDuty": 3,
+      "ulockHeroLevel": 200
+    },
+    {
+      "ID": 112,
+      "unlockSystem": 1,
+      "unlockSubystem": 3,
+      "unlocHeroDuty": 4,
+      "ulockHeroLevel": 400
+    },
+    {
+      "ID": 201,
+      "unlockSystem": 2,
+      "unlockSubystem": 1,
+      "unlocHeroDuty": 1,
+      "ulockHeroLevel": 90
+    },
+    {
+      "ID": 202,
+      "unlockSystem": 2,
+      "unlockSubystem": 1,
+      "unlocHeroDuty": 2,
+      "ulockHeroLevel": 90
+    },
+    {
+      "ID": 203,
+      "unlockSystem": 2,
+      "unlockSubystem": 1,
+      "unlocHeroDuty": 3,
+      "ulockHeroLevel": 90
+    },
+    {
+      "ID": 204,
+      "unlockSystem": 2,
+      "unlockSubystem": 1,
+      "unlocHeroDuty": 4,
+      "ulockHeroLevel": 90
+    },
+    {
+      "ID": 205,
+      "unlockSystem": 2,
+      "unlockSubystem": 2,
+      "unlocHeroDuty": 1,
+      "ulockHeroLevel": 90
+    },
+    {
+      "ID": 206,
+      "unlockSystem": 2,
+      "unlockSubystem": 2,
+      "unlocHeroDuty": 2,
+      "ulockHeroLevel": 90
+    },
+    {
+      "ID": 207,
+      "unlockSystem": 2,
+      "unlockSubystem": 2,
+      "unlocHeroDuty": 3,
+      "ulockHeroLevel": 90
+    },
+    {
+      "ID": 208,
+      "unlockSystem": 2,
+      "unlockSubystem": 2,
+      "unlocHeroDuty": 4,
+      "ulockHeroLevel": 90
+    },
+    {
+      "ID": 209,
+      "unlockSystem": 2,
+      "unlockSubystem": 3,
+      "unlocHeroDuty": 1,
+      "ulockHeroLevel": 90
+    },
+    {
+      "ID": 210,
+      "unlockSystem": 2,
+      "unlockSubystem": 3,
+      "unlocHeroDuty": 2,
+      "ulockHeroLevel": 90
+    },
+    {
+      "ID": 211,
+      "unlockSystem": 2,
+      "unlockSubystem": 3,
+      "unlocHeroDuty": 3,
+      "ulockHeroLevel": 90
+    },
+    {
+      "ID": 212,
+      "unlockSystem": 2,
+      "unlockSubystem": 3,
+      "unlocHeroDuty": 4,
+      "ulockHeroLevel": 90
+    },
+    {
+      "ID": 213,
+      "unlockSystem": 2,
+      "unlockSubystem": 4,
+      "unlocHeroDuty": 1,
+      "ulockHeroLevel": 90
+    },
+    {
+      "ID": 214,
+      "unlockSystem": 2,
+      "unlockSubystem": 4,
+      "unlocHeroDuty": 2,
+      "ulockHeroLevel": 90
+    },
+    {
+      "ID": 215,
+      "unlockSystem": 2,
+      "unlockSubystem": 4,
+      "unlocHeroDuty": 3,
+      "ulockHeroLevel": 90
+    },
+    {
+      "ID": 216,
+      "unlockSystem": 2,
+      "unlockSubystem": 4,
+      "unlocHeroDuty": 4,
+      "ulockHeroLevel": 90
+    },
+    {
+      "ID": 301,
+      "unlockSystem": 3,
+      "unlockSubystem": 1,
+      "unlocHeroDuty": 0,
+      "ulockHeroLevel": 500
+    }
+  ]
+}

Assets/Scripts/GameData/ExcelConfig/SubunlockConfig.cs

@@ -0,0 +1,70 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\Unlock.xlsx. SheetName: SubunlockConfig
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "SubunlockConfig.json")]
+	public partial class SubunlockConfigHolder : ConfigHolder<SubunlockConfig>
	{
+	}
+
+
+	[Serializable]
+	public struct SubunlockConfig : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///ID
+		/// </summary>
+#if !COMBAT_SERVER
+		public int ID;
+#else
+		public int ID{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///1=防具栏位 2=遗物栏位 3=秘石栏位
+		/// </summary>
+#if !COMBAT_SERVER
+		public int unlockSystem;
+#else
+		public int unlockSystem{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///unlockSystem=1时：随身装备部位 1=鞋子 2=衣服 3=腰带 unlockSystem=2时：遗物部位 1=部件A-希音遗物 2=部件B-曜烨遗物 3=部件C-馨香遗物 4=部件D-藏微遗物
+		/// </summary>
+#if !COMBAT_SERVER
+		public int unlockSubystem;
+#else
+		public int unlockSubystem{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///解锁所需英雄定位 0=任意定位 1=肉盾 2=输出 3=治疗 4=辅助
+		/// </summary>
+#if !COMBAT_SERVER
+		public int unlocHeroDuty;
+#else
+		public int unlocHeroDuty{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///解锁所需英雄等级
+		/// </summary>
+#if !COMBAT_SERVER
+		public int ulockHeroLevel;
+#else
+		public int ulockHeroLevel{ set; get; }
+#endif
+		
+
+	}
+
+}
+// End of Auto Generated Code