zg 1 ngày trước cách đây
mục cha
commit
3b9ae56db4

+ 0 - 207
Assets/Res/Config/SubunlockConfig.json

@@ -1,207 +0,0 @@
-{
-  "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
-    }
-  ]
-}

+ 3 - 3
Assets/Scripts/GameData/ExcelConfig/ItemConfig.cs

@@ -95,12 +95,12 @@ namespace Excel2Json
 		
 
 		/// <summary>
-		///按需配置 装备(职业;位置)
+		///跳转ID
 		/// </summary>
 #if !COMBAT_SERVER
-		public int[] itemParam;
+		public int[] SkiptoID;
 #else
-		public int[] itemParam{ set; get; }
+		public int[] SkiptoID{ set; get; }
 #endif
 		
 

+ 0 - 70
Assets/Scripts/GameData/ExcelConfig/SubunlockConfig.cs

@@ -1,70 +0,0 @@
-// 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

BIN
Excel2Json/Excel/Item.xlsx