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

Assets/Res/Config/LanguageChineseConfig.json

@@ -21122,7 +21122,7 @@
     },
     {
       "ID": 6021,
-      "txt": ""
+      "txt": "你击败了疯道人。"
     },
     {
       "ID": 6022,
@@ -37463,6 +37463,26 @@
     {
       "ID": 10106,
       "txt": "礼包"
+    },
+    {
+      "ID": 10107,
+      "txt": "功法"
+    },
+    {
+      "ID": 10108,
+      "txt": "法宝"
+    },
+    {
+      "ID": 10109,
+      "txt": "洞府"
+    },
+    {
+      "ID": 10110,
+      "txt": "商店"
+    },
+    {
+      "ID": 10111,
+      "txt": "使用神识"
     }
   ]
 }

Assets/Res/Config/SkiptoConfig.json

@@ -4,36 +4,41 @@
       "ID": 1,
       "SkipType": 1,
       "SkipID": 1,
-      "SkipTxt1": 3257,
-      "SkipTxt2": -1
+      "SkipTxt": 10107,
+      "UnlockType": 1,
+      "UnlockPara2": 0
     },
     {
       "ID": 2,
       "SkipType": 2,
       "SkipID": 2,
-      "SkipTxt1": 3258,
-      "SkipTxt2": -1
+      "SkipTxt": 10108,
+      "UnlockType": 0,
+      "UnlockPara2": 0
     },
     {
       "ID": 3,
       "SkipType": 3,
       "SkipID": 3,
-      "SkipTxt1": 3259,
-      "SkipTxt2": -1
+      "SkipTxt": 10109,
+      "UnlockType": 0,
+      "UnlockPara2": 0
     },
     {
       "ID": 4,
       "SkipType": 4,
       "SkipID": 4,
-      "SkipTxt1": 3260,
-      "SkipTxt2": -1
+      "SkipTxt": 10110,
+      "UnlockType": 0,
+      "UnlockPara2": 0
     },
     {
       "ID": 5,
       "SkipType": 5,
       "SkipID": 5,
-      "SkipTxt1": 10047,
-      "SkipTxt2": -1
+      "SkipTxt": 10111,
+      "UnlockType": 0,
+      "UnlockPara2": 0
     }
   ]
 }

Assets/Scripts/GameData/ExcelConfig/SkiptoConfig.cs

@@ -55,22 +55,42 @@ namespace Excel2Json
 		
 
 		/// <summary>
-		///跳转来源语言表ID1
+		///跳转来源语言表ID
 		/// </summary>
 #if !COMBAT_SERVER
-		public int SkipTxt1;
+		public int SkipTxt;
 #else
-		public int SkipTxt1{ set; get; }
+		public int SkipTxt{ set; get; }
 #endif
 		
 
 		/// <summary>
-		///跳转来源语言表ID2
+		///该跳转解锁条件类型
 		/// </summary>
 #if !COMBAT_SERVER
-		public int SkipTxt2;
+		public int UnlockType;
 #else
-		public int SkipTxt2{ set; get; }
+		public int UnlockType{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///该跳转解锁条件参数
+		/// </summary>
+#if !COMBAT_SERVER
+		public int[] UnlockPara1;
+#else
+		public int[] UnlockPara1{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///该跳转在不可跳转时给玩家看的【达成条件】语言表
+		/// </summary>
+#if !COMBAT_SERVER
+		public int UnlockPara2;
+#else
+		public int UnlockPara2{ set; get; }
 #endif