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

# Conflicts:
#	Excel2Json/Excel/OpenBox.xlsx   resolved by origin/master(远端) version

Assets/Res/Config/DropConfig.json

@@ -1450,9 +1450,7 @@
         8,
         9,
         10,
-        11,
-        12,
-        13
+        11
       ],
       "dropType": 2,
       "showItemId": [
@@ -1486,30 +1484,53 @@
     {
       "ID": 999007,
       "dropGroupID": [
-        8,
-        9,
-        10,
-        11,
-        12,
-        13
+        20,
+        21,
+        22,
+        23,
+        24,
+        25,
+        26,
+        27,
+        28
       ],
       "dropType": 2
     },
     {
       "ID": 999008,
       "dropGroupID": [
-        14,
-        15,
-        16,
-        17
+        29,
+        30,
+        31,
+        32,
+        33,
+        34,
+        35,
+        36,
+        37,
+        38,
+        39
       ],
       "dropType": 2
     },
     {
       "ID": 999009,
       "dropGroupID": [
-        18,
-        19
+        40,
+        41,
+        42,
+        43,
+        44
+      ],
+      "dropType": 2
+    },
+    {
+      "ID": 999010,
+      "dropGroupID": [
+        45,
+        46,
+        47,
+        48
       ],
       "dropType": 2
     }

Assets/Res/Config/DropGroupConfig.json

@@ -51,42 +51,42 @@
     },
     {
       "ID": 8,
-      "dropRate": 907,
+      "dropRate": 946,
       "dropItemID": [
         8
       ]
     },
     {
       "ID": 9,
-      "dropRate": 60,
+      "dropRate": 36,
       "dropItemID": [
         9
       ]
     },
     {
       "ID": 10,
-      "dropRate": 20,
+      "dropRate": 12,
       "dropItemID": [
         10
       ]
     },
     {
       "ID": 11,
-      "dropRate": 10,
+      "dropRate": 6,
       "dropItemID": [
         11
       ]
     },
     {
       "ID": 12,
-      "dropRate": 2,
+      "dropRate": 0,
       "dropItemID": [
         12
       ]
     },
     {
       "ID": 13,
-      "dropRate": 1,
+      "dropRate": 0,
       "dropItemID": [
         13
       ]
@@ -121,17 +121,220 @@
     },
     {
       "ID": 18,
-      "dropRate": 920,
+      "dropRate": 900,
       "dropItemID": [
         12
       ]
     },
     {
       "ID": 19,
-      "dropRate": 80,
+      "dropRate": 100,
       "dropItemID": [
         13
       ]
+    },
+    {
+      "ID": 20,
+      "dropRate": 1110,
+      "dropItemID": [
+        19
+      ]
+    },
+    {
+      "ID": 21,
+      "dropRate": 370,
+      "dropItemID": [
+        20
+      ]
+    },
+    {
+      "ID": 22,
+      "dropRate": 111,
+      "dropItemID": [
+        21
+      ]
+    },
+    {
+      "ID": 23,
+      "dropRate": 1110,
+      "dropItemID": [
+        22
+      ]
+    },
+    {
+      "ID": 24,
+      "dropRate": 370,
+      "dropItemID": [
+        23
+      ]
+    },
+    {
+      "ID": 25,
+      "dropRate": 111,
+      "dropItemID": [
+        24
+      ]
+    },
+    {
+      "ID": 26,
+      "dropRate": 618,
+      "dropItemID": [
+        14
+      ]
+    },
+    {
+      "ID": 27,
+      "dropRate": 100,
+      "dropItemID": [
+        15
+      ]
+    },
+    {
+      "ID": 28,
+      "dropRate": 100,
+      "dropItemID": [
+        17
+      ]
+    },
+    {
+      "ID": 29,
+      "dropRate": 1110,
+      "dropItemID": [
+        19
+      ]
+    },
+    {
+      "ID": 30,
+      "dropRate": 370,
+      "dropItemID": [
+        20
+      ]
+    },
+    {
+      "ID": 31,
+      "dropRate": 111,
+      "dropItemID": [
+        21
+      ]
+    },
+    {
+      "ID": 32,
+      "dropRate": 1110,
+      "dropItemID": [
+        22
+      ]
+    },
+    {
+      "ID": 33,
+      "dropRate": 370,
+      "dropItemID": [
+        23
+      ]
+    },
+    {
+      "ID": 34,
+      "dropRate": 111,
+      "dropItemID": [
+        24
+      ]
+    },
+    {
+      "ID": 35,
+      "dropRate": 30,
+      "dropItemID": [
+        14
+      ]
+    },
+    {
+      "ID": 36,
+      "dropRate": 184,
+      "dropItemID": [
+        15
+      ]
+    },
+    {
+      "ID": 37,
+      "dropRate": 210,
+      "dropItemID": [
+        16
+      ]
+    },
+    {
+      "ID": 38,
+      "dropRate": 184,
+      "dropItemID": [
+        17
+      ]
+    },
+    {
+      "ID": 39,
+      "dropRate": 210,
+      "dropItemID": [
+        18
+      ]
+    },
+    {
+      "ID": 40,
+      "dropRate": 3212,
+      "dropItemID": [
+        14
+      ]
+    },
+    {
+      "ID": 41,
+      "dropRate": 184,
+      "dropItemID": [
+        15
+      ]
+    },
+    {
+      "ID": 42,
+      "dropRate": 210,
+      "dropItemID": [
+        16
+      ]
+    },
+    {
+      "ID": 43,
+      "dropRate": 184,
+      "dropItemID": [
+        17
+      ]
+    },
+    {
+      "ID": 44,
+      "dropRate": 210,
+      "dropItemID": [
+        18
+      ]
+    },
+    {
+      "ID": 45,
+      "dropRate": 1000,
+      "dropItemID": [
+        15
+      ]
+    },
+    {
+      "ID": 46,
+      "dropRate": 1000,
+      "dropItemID": [
+        16
+      ]
+    },
+    {
+      "ID": 47,
+      "dropRate": 1000,
+      "dropItemID": [
+        17
+      ]
+    },
+    {
+      "ID": 48,
+      "dropRate": 1000,
+      "dropItemID": [
+        18
+      ]
     }
   ]
 }

Assets/Res/Config/DropItemConfig.json

@@ -105,6 +105,66 @@
     {
       "ID": 8,
       "dropItemType": 1,
+      "itemID": [
+        1101
+      ],
+      "dropMinV": 1,
+      "dropMaxV": 1,
+      "dropCountGoupID": -1
+    },
+    {
+      "ID": 9,
+      "dropItemType": 1,
+      "itemID": [
+        1102
+      ],
+      "dropMinV": 1,
+      "dropMaxV": 1,
+      "dropCountGoupID": -1
+    },
+    {
+      "ID": 10,
+      "dropItemType": 1,
+      "itemID": [
+        1103
+      ],
+      "dropMinV": 1,
+      "dropMaxV": 1,
+      "dropCountGoupID": -1
+    },
+    {
+      "ID": 11,
+      "dropItemType": 1,
+      "itemID": [
+        1104
+      ],
+      "dropMinV": 1,
+      "dropMaxV": 1,
+      "dropCountGoupID": -1
+    },
+    {
+      "ID": 12,
+      "dropItemType": 1,
+      "itemID": [
+        1105
+      ],
+      "dropMinV": 1,
+      "dropMaxV": 1,
+      "dropCountGoupID": -1
+    },
+    {
+      "ID": 13,
+      "dropItemType": 1,
+      "itemID": [
+        1106
+      ],
+      "dropMinV": 1,
+      "dropMaxV": 1,
+      "dropCountGoupID": -1
+    },
+    {
+      "ID": 14,
+      "dropItemType": 1,
       "itemID": [
         12005,
         12010,
@@ -122,7 +182,7 @@
       "dropCountGoupID": -1
     },
     {
-      "ID": 9,
+      "ID": 15,
       "dropItemType": 1,
       "itemID": [
         12004,
@@ -141,7 +201,7 @@
       "dropCountGoupID": -1
     },
     {
-      "ID": 10,
+      "ID": 16,
       "dropItemType": 1,
       "itemID": [
         12001,
@@ -174,7 +234,7 @@
       "dropCountGoupID": -1
     },
     {
-      "ID": 11,
+      "ID": 17,
       "dropItemType": 1,
       "itemID": [
         10001,
@@ -188,7 +248,7 @@
       "dropCountGoupID": -1
     },
     {
-      "ID": 12,
+      "ID": 18,
       "dropItemType": 1,
       "itemID": [
         10002,
@@ -203,43 +263,63 @@
       "dropCountGoupID": -1
     },
     {
-      "ID": 13,
+      "ID": 19,
       "dropItemType": 1,
       "itemID": [
         1005
       ],
-      "dropMinV": -1000,
-      "dropMaxV": -1000,
+      "dropMinV": 100,
+      "dropMaxV": 100,
       "dropCountGoupID": -1
     },
     {
-      "ID": 14,
+      "ID": 20,
       "dropItemType": 1,
       "itemID": [
         1005
       ],
-      "dropMinV": -2000,
-      "dropMaxV": -2000,
+      "dropMinV": 300,
+      "dropMaxV": 300,
       "dropCountGoupID": -1
     },
     {
-      "ID": 15,
+      "ID": 21,
+      "dropItemType": 1,
+      "itemID": [
+        1005
+      ],
+      "dropMinV": 1000,
+      "dropMaxV": 1000,
+      "dropCountGoupID": -1
+    },
+    {
+      "ID": 22,
       "dropItemType": 1,
       "itemID": [
         1006
       ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
+      "dropMinV": 100,
+      "dropMaxV": 100,
       "dropCountGoupID": -1
     },
     {
-      "ID": 16,
+      "ID": 23,
       "dropItemType": 1,
       "itemID": [
         1006
       ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
+      "dropMinV": 300,
+      "dropMaxV": 300,
+      "dropCountGoupID": -1
+    },
+    {
+      "ID": 24,
+      "dropItemType": 1,
+      "itemID": [
+        1006
+      ],
+      "dropMinV": 1000,
+      "dropMaxV": 1000,
       "dropCountGoupID": -1
     }
   ]

Assets/Res/Config/ItemConfig.json

@@ -4841,8 +4841,8 @@
     },
     {
       "ID": 23001,
-      "itemName": 0,
-      "itemDesc": 0,
+      "itemName": 10098,
+      "itemDesc": 10102,
       "icon": "icon_item_23001",
       "itemTag": 24,
       "quality": 4,
@@ -4866,8 +4866,8 @@
     },
     {
       "ID": 23002,
-      "itemName": 0,
-      "itemDesc": 0,
+      "itemName": 10099,
+      "itemDesc": 10103,
       "icon": "icon_item_23002",
       "itemTag": 24,
       "quality": 5,
@@ -4890,10 +4890,10 @@
       "itemDesc2": 0
     },
     {
-      "ID": 23003,
-      "itemName": 0,
-      "itemDesc": 0,
-      "icon": "icon_item_23003",
+      "ID": 23101,
+      "itemName": 10100,
+      "itemDesc": 10104,
+      "icon": "icon_item_23101",
       "itemTag": 24,
       "quality": 4,
       "stack": 0,
@@ -4910,15 +4910,19 @@
         0
       ],
       "stack_1": 0,
-      "associateID": 0,
+      "associateID": 10,
+      "associateVlaue": [
+        18,
+        23001
+      ],
       "sort": 0,
       "itemDesc2": 0
     },
     {
-      "ID": 23004,
-      "itemName": 0,
-      "itemDesc": 0,
-      "icon": "icon_item_23004",
+      "ID": 23102,
+      "itemName": 10101,
+      "itemDesc": 10105,
+      "icon": "icon_item_23102",
       "itemTag": 24,
       "quality": 5,
       "stack": 0,
@@ -4935,7 +4939,11 @@
         0
       ],
       "stack_1": 0,
-      "associateID": 0,
+      "associateID": 10,
+      "associateVlaue": [
+        30,
+        23002
+      ],
       "sort": 0,
       "itemDesc2": 0
     }

Assets/Res/Config/LanguageChineseConfig.json

@@ -37423,6 +37423,42 @@
     {
       "ID": 10096,
       "txt": "点击领取"
+    },
+    {
+      "ID": 10097,
+      "txt": "概率规则一览\n橙色功法法宝----------5%\n紫色功法法宝----------20%\n蓝色功法法宝----------75%\n30个功法法宝经验丹---5%\n5个功法法宝经验丹----15%\n1个功法法宝经验丹----50%\n十连必出一个功法或法宝\n10次十连必出一个紫色功法或法宝"
+    },
+    {
+      "ID": 10098,
+      "txt": "免双倍广告卡"
+    },
+    {
+      "ID": 10099,
+      "txt": "免所有广告卡"
+    },
+    {
+      "ID": 10100,
+      "txt": "免双倍广告卡碎片"
+    },
+    {
+      "ID": 10101,
+      "txt": "免所有广告卡碎片"
+    },
+    {
+      "ID": 10102,
+      "txt": "永久免去资源翻倍类广告！"
+    },
+    {
+      "ID": 10103,
+      "txt": "永久免去所有广告！"
+    },
+    {
+      "ID": 10104,
+      "txt": "集齐18枚碎片可兑换免双倍广告卡"
+    },
+    {
+      "ID": 10105,
+      "txt": "集齐30枚碎片可兑换免所有广告卡"
     }
   ]
 }

Assets/Res/Config/OpenBoxConfig.json

@@ -5,23 +5,33 @@
       "CostItemID": 1007,
       "oneConsume": 1,
       "oneConsumeFreePara": [
-        300,
-        10
+        60,
+        5000
       ],
       "oneConsumeChargePara": [
         0,
-        5000
+        0
       ],
       "tenConsume": 1,
       "oneConsumeFreePara_1": [
-        0,
-        1
+        28800,
+        4
       ],
       "oneConsumeChargePara_1": [
         0,
         5000
       ],
-      "reward": 999004,
+      "reward": [
+        999004,
+        999004,
+        999004,
+        999004,
+        999004,
+        999004,
+        999004,
+        999004,
+        999004
+      ],
       "reward1": 999005,
       "reward2": 999006,
       "reward2para1": 100,
@@ -43,7 +53,7 @@
       "oneConsume": 300,
       "oneConsumeFreePara": [
         0,
-        1
+        0
       ],
       "oneConsumeChargePara": [
         0,
@@ -58,11 +68,21 @@
         0,
         5000
       ],
-      "reward": 999007,
-      "reward1": 999008,
-      "reward2": 999009,
+      "reward": [
+        999007,
+        999007,
+        999007,
+        999007,
+        999007,
+        999007,
+        999007,
+        999007,
+        999008
+      ],
+      "reward1": 999009,
+      "reward2": 999010,
       "reward2para1": 100,
-      "ProgressRewardChoukaCount": 300,
+      "ProgressRewardChoukaCount": 200,
       "betPara1": [
         2.0,
         3.0,

Assets/Res/Config/OpenBoxProgressReward.json

@@ -3,9 +3,9 @@
     {
       "ID": 1,
       "OpenboxID": 2,
-      "TotalScore": 30,
+      "TotalScore": 20,
       "PrizeID": [
-        23001,
+        23101,
         1701
       ],
       "PrizeCount": [
@@ -16,9 +16,9 @@
     {
       "ID": 2,
       "OpenboxID": 2,
-      "TotalScore": 40,
+      "TotalScore": 30,
       "PrizeID": [
-        23003,
+        23001,
         1701
       ],
       "PrizeCount": [
@@ -29,9 +29,9 @@
     {
       "ID": 3,
       "OpenboxID": 2,
-      "TotalScore": 50,
+      "TotalScore": 40,
       "PrizeID": [
-        23003,
+        23101,
         1702
       ],
       "PrizeCount": [
@@ -42,9 +42,9 @@
     {
       "ID": 4,
       "OpenboxID": 2,
-      "TotalScore": 60,
+      "TotalScore": 50,
       "PrizeID": [
-        23003,
+        23101,
         1702
       ],
       "PrizeCount": [
@@ -55,9 +55,9 @@
     {
       "ID": 5,
       "OpenboxID": 2,
-      "TotalScore": 70,
+      "TotalScore": 60,
       "PrizeID": [
-        23004,
+        23102,
         1702
       ],
       "PrizeCount": [
@@ -68,9 +68,9 @@
     {
       "ID": 6,
       "OpenboxID": 2,
-      "TotalScore": 80,
+      "TotalScore": 70,
       "PrizeID": [
-        23004,
+        23102,
         1702
       ],
       "PrizeCount": [
@@ -81,9 +81,9 @@
     {
       "ID": 7,
       "OpenboxID": 2,
-      "TotalScore": 90,
+      "TotalScore": 80,
       "PrizeID": [
-        23004,
+        23102,
         1702
       ],
       "PrizeCount": [
@@ -94,7 +94,7 @@
     {
       "ID": 8,
       "OpenboxID": 2,
-      "TotalScore": 100,
+      "TotalScore": 90,
       "PrizeID": [
         23001,
         1703

Assets/Scripts/GameData/ExcelConfig/OpenBoxConfig.cs

@@ -98,9 +98,9 @@ namespace Excel2Json
 		///基础池子
 		/// </summary>
 #if !COMBAT_SERVER
-		public int reward;
+		public int[] reward;
 #else
-		public int reward{ set; get; }
+		public int[] reward{ set; get; }
 #endif