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

# Conflicts:
#	Assets/Res/Config/OpenBoxConfig.json   resolved by origin/master(远端) version
#	Assets/Scripts/GameData/ExcelConfig/OpenBoxConfig.cs   resolved by origin/master(远端) version
#	Excel2Json/Excel/OpenBox.xlsx   resolved by master version
#	Excel2Json/Excel/修仙游戏数据规划表.xlsx   resolved by master version

Assets/Res/Config/OpenBoxConfig.json

@@ -4,30 +4,52 @@
       "ID": 1,
       "CostItemID": 1007,
       "oneConsume": 1,
-      "oneConsumeFreePara": 1,
-      "oneConsumeChargePara": 1,
+      "oneConsumeFreePara": [
+        300,
+        10
+      ],
+      "oneConsumeChargePara": [
+        0,
+        5000
+      ],
       "tenConsume": 1,
-      "oneConsumeFreePara_1": 1,
-      "oneConsumeChargePara_1": 1,
-      "rewardType": 1,
+      "oneConsumeFreePara_1": [
+        0,
+        1
+      ],
+      "oneConsumeChargePara_1": [
+        0,
+        5000
+      ],
       "reward": 999004,
       "reward1": 999005,
       "reward2": 999006,
-      "reward2para1": -1
+      "reward2para1": 100
     },
     {
       "ID": 2,
       "CostItemID": 1002,
       "oneConsume": 300,
-      "oneConsumeFreePara": 1,
-      "oneConsumeChargePara": 1,
+      "oneConsumeFreePara": [
+        0,
+        1
+      ],
+      "oneConsumeChargePara": [
+        0,
+        5000
+      ],
       "tenConsume": 2700,
-      "oneConsumeFreePara_1": 1,
-      "oneConsumeChargePara_1": 1,
-      "rewardType": 2,
-      "reward": 101,
-      "reward1": 102,
-      "reward2": 103,
+      "oneConsumeFreePara_1": [
+        0,
+        0
+      ],
+      "oneConsumeChargePara_1": [
+        0,
+        5000
+      ],
+      "reward": 999004,
+      "reward1": 999005,
+      "reward2": 999006,
       "reward2para1": 100
     }
   ]

Assets/Scripts/GameData/ExcelConfig/OpenBoxConfig.cs

@@ -48,9 +48,9 @@ namespace Excel2Json
 		///免费单抽常量 CD（秒）；单日最大次数
 		/// </summary>
 #if !COMBAT_SERVER
-		public int oneConsumeFreePara;
+		public int[] oneConsumeFreePara;
 #else
-		public int oneConsumeFreePara{ set; get; }
+		public int[] oneConsumeFreePara{ set; get; }
 #endif
 		
 
@@ -58,9 +58,9 @@ namespace Excel2Json
 		///付费单抽常量 CD（秒）；单日最大次数
 		/// </summary>
 #if !COMBAT_SERVER
-		public int oneConsumeChargePara;
+		public int[] oneConsumeChargePara;
 #else
-		public int oneConsumeChargePara{ set; get; }
+		public int[] oneConsumeChargePara{ set; get; }
 #endif
 		
 
@@ -78,9 +78,9 @@ namespace Excel2Json
 		///免费十连常量 CD（秒）；单日最大次数
 		/// </summary>
 #if !COMBAT_SERVER
-		public int oneConsumeFreePara_1;
+		public int[] oneConsumeFreePara_1;
 #else
-		public int oneConsumeFreePara_1{ set; get; }
+		public int[] oneConsumeFreePara_1{ set; get; }
 #endif
 		
 
@@ -88,19 +88,9 @@ namespace Excel2Json
 		///付费十连常量 CD（秒）；单日最大次数
 		/// </summary>
 #if !COMBAT_SERVER
-		public int oneConsumeChargePara_1;
+		public int[] oneConsumeChargePara_1;
 #else
-		public int oneConsumeChargePara_1{ set; get; }
-#endif
-		
-
-		/// <summary>
-		///1=掉落组 2=DropList
-		/// </summary>
-#if !COMBAT_SERVER
-		public int rewardType;
-#else
-		public int rewardType{ set; get; }
+		public int[] oneConsumeChargePara_1{ set; get; }
 #endif