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

Assets/Res/Config/ItemConfig.json

@@ -2179,7 +2179,7 @@
       "itemDesc": 1850,
       "icon": "icon_item_12501",
       "itemTag": 13,
-      "quality": 4,
+      "quality": 3,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
@@ -2208,7 +2208,7 @@
       "itemDesc": 1851,
       "icon": "icon_item_12502",
       "itemTag": 13,
-      "quality": 4,
+      "quality": 3,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
@@ -2237,7 +2237,7 @@
       "itemDesc": 1852,
       "icon": "icon_item_12503",
       "itemTag": 13,
-      "quality": 4,
+      "quality": 3,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
@@ -2266,7 +2266,7 @@
       "itemDesc": 1853,
       "icon": "icon_item_12504",
       "itemTag": 13,
-      "quality": 4,
+      "quality": 3,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
@@ -2295,7 +2295,7 @@
       "itemDesc": 1854,
       "icon": "icon_item_12505",
       "itemTag": 13,
-      "quality": 4,
+      "quality": 3,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,

Assets/Res/Config/OpenBoxConfig.json

@@ -2,9 +2,55 @@
   "configList": [
     {
       "ID": 1,
-      "oneConsume": 500,
-      "tenConsume": 4500,
-      "reward": 999004
+      "CostItemID": 1007,
+      "oneConsume": 1,
+      "oneConsumeFreePara": [
+        300,
+        10
+      ],
+      "oneConsumeChargePara": [
+        0,
+        5000
+      ],
+      "tenConsume": 1,
+      "oneConsumeFreePara_1": [
+        0,
+        1
+      ],
+      "oneConsumeChargePara_1": [
+        0,
+        5000
+      ],
+      "reward": 999004,
+      "reward1": 999005,
+      "reward2": 999006,
+      "reward2para1": 100
+    },
+    {
+      "ID": 2,
+      "CostItemID": 1002,
+      "oneConsume": 300,
+      "oneConsumeFreePara": [
+        0,
+        1
+      ],
+      "oneConsumeChargePara": [
+        0,
+        5000
+      ],
+      "tenConsume": 2700,
+      "oneConsumeFreePara_1": [
+        0,
+        0
+      ],
+      "oneConsumeChargePara_1": [
+        0,
+        5000
+      ],
+      "reward": 999004,
+      "reward1": 999005,
+      "reward2": 999006,
+      "reward2para1": 100
     }
   ]
 }

Assets/Scripts/GameData/ExcelConfig/OpenBoxConfig.cs

@@ -15,7 +15,7 @@ namespace Excel2Json
 	public struct OpenBoxConfig : IConfig
	{
 		public int GetID() {return ID;} 
 		/// <summary>
-		///ID （id段不再区分debuff和buff）
+		///ID 
 		/// </summary>
 #if !COMBAT_SERVER
 		public int ID;
@@ -24,6 +24,16 @@ namespace Excel2Json
 #endif
 		
 
+		/// <summary>
+		///开箱子所需道具ID
+		/// </summary>
+#if !COMBAT_SERVER
+		public int CostItemID;
+#else
+		public int CostItemID{ set; get; }
+#endif
+		
+
 		/// <summary>
 		///单次消耗
 		/// </summary>
@@ -34,6 +44,26 @@ namespace Excel2Json
 #endif
 		
 
+		/// <summary>
+		///免费单抽常量 CD（秒）；单日最大次数
+		/// </summary>
+#if !COMBAT_SERVER
+		public int[] oneConsumeFreePara;
+#else
+		public int[] oneConsumeFreePara{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///付费单抽常量 CD（秒）；单日最大次数
+		/// </summary>
+#if !COMBAT_SERVER
+		public int[] oneConsumeChargePara;
+#else
+		public int[] oneConsumeChargePara{ set; get; }
+#endif
+		
+
 		/// <summary>
 		///10次消耗
 		/// </summary>
@@ -45,7 +75,27 @@ namespace Excel2Json
 		
 
 		/// <summary>
-		///奖励池子
+		///免费十连常量 CD（秒）；单日最大次数
+		/// </summary>
+#if !COMBAT_SERVER
+		public int[] oneConsumeFreePara_1;
+#else
+		public int[] oneConsumeFreePara_1{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///付费十连常量 CD（秒）；单日最大次数
+		/// </summary>
+#if !COMBAT_SERVER
+		public int[] oneConsumeChargePara_1;
+#else
+		public int[] oneConsumeChargePara_1{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///基础池子
 		/// </summary>
 #if !COMBAT_SERVER
 		public int reward;
@@ -54,6 +104,36 @@ namespace Excel2Json
 #endif
 		
 
+		/// <summary>
+		///十连保底池子1 每次十连必出的道具池子
+		/// </summary>
+#if !COMBAT_SERVER
+		public int reward1;
+#else
+		public int reward1{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///十连保底池子2 每X次十连必出的道具池子
+		/// </summary>
+#if !COMBAT_SERVER
+		public int reward2;
+#else
+		public int reward2{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///十连保底池子2 每X次十连必出的道具池子中的X
+		/// </summary>
+#if !COMBAT_SERVER
+		public int reward2para1;
+#else
+		public int reward2para1{ set; get; }
+#endif
+		
+
 	}
 
 }