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

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

Assets/Res/Config/ItemConfig.json

@@ -4838,6 +4838,106 @@
       "associateID": 0,
       "sort": 0,
       "itemDesc2": 0
+    },
+    {
+      "ID": 23001,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_23001",
+      "itemTag": 24,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 23002,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_23002",
+      "itemTag": 24,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 23003,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_23003",
+      "itemTag": 24,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 23004,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_23004",
+      "itemTag": 24,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "sort": 0,
+      "itemDesc2": 0
     }
   ]
 }

Assets/Res/Config/OpenBoxConfig.json

@@ -25,6 +25,7 @@
       "reward1": 999005,
       "reward2": 999006,
       "reward2para1": 100,
+      "ProgressRewardChoukaCount": -1,
       "betPara1": [
         2.0,
         3.0,
@@ -61,6 +62,7 @@
       "reward1": 999008,
       "reward2": 999009,
       "reward2para1": 100,
+      "ProgressRewardChoukaCount": 300,
       "betPara1": [
         2.0,
         3.0,

Assets/Res/Config/OpenBoxProgressReward.json

@@ -1,3 +1,108 @@
 {
-  "configList": []
+  "configList": [
+    {
+      "ID": 1,
+      "OpenboxID": 2,
+      "TotalScore": 30,
+      "PrizeID": [
+        23001,
+        1701
+      ],
+      "PrizeCount": [
+        1,
+        1
+      ]
+    },
+    {
+      "ID": 2,
+      "OpenboxID": 2,
+      "TotalScore": 40,
+      "PrizeID": [
+        23003,
+        1701
+      ],
+      "PrizeCount": [
+        1,
+        2
+      ]
+    },
+    {
+      "ID": 3,
+      "OpenboxID": 2,
+      "TotalScore": 50,
+      "PrizeID": [
+        23003,
+        1702
+      ],
+      "PrizeCount": [
+        3,
+        1
+      ]
+    },
+    {
+      "ID": 4,
+      "OpenboxID": 2,
+      "TotalScore": 60,
+      "PrizeID": [
+        23003,
+        1702
+      ],
+      "PrizeCount": [
+        6,
+        1
+      ]
+    },
+    {
+      "ID": 5,
+      "OpenboxID": 2,
+      "TotalScore": 70,
+      "PrizeID": [
+        23004,
+        1702
+      ],
+      "PrizeCount": [
+        1,
+        2
+      ]
+    },
+    {
+      "ID": 6,
+      "OpenboxID": 2,
+      "TotalScore": 80,
+      "PrizeID": [
+        23004,
+        1702
+      ],
+      "PrizeCount": [
+        3,
+        2
+      ]
+    },
+    {
+      "ID": 7,
+      "OpenboxID": 2,
+      "TotalScore": 90,
+      "PrizeID": [
+        23004,
+        1702
+      ],
+      "PrizeCount": [
+        6,
+        2
+      ]
+    },
+    {
+      "ID": 8,
+      "OpenboxID": 2,
+      "TotalScore": 100,
+      "PrizeID": [
+        23001,
+        1703
+      ],
+      "PrizeCount": [
+        1,
+        1
+      ]
+    }
+  ]
 }

Assets/Res/Config/OpenBoxScoreRule.json

@@ -1,3 +1,164 @@
 {
-  "configList": []
+  "configList": [
+    {
+      "ID": 1,
+      "openBoxID": 2,
+      "para0": 1,
+      "para1": 1,
+      "para2": 1,
+      "para3": 3,
+      "para4": [
+        11,
+        12,
+        13,
+        14
+      ],
+      "lanID": 0,
+      "score": 1
+    },
+    {
+      "ID": 2,
+      "openBoxID": 2,
+      "para0": 1,
+      "para1": 1,
+      "para2": 1,
+      "para3": 4,
+      "para4": [
+        11,
+        12,
+        13,
+        14
+      ],
+      "lanID": 0,
+      "score": 2
+    },
+    {
+      "ID": 3,
+      "openBoxID": 2,
+      "para0": 2,
+      "para1": 1,
+      "para2": 1,
+      "para3": 4,
+      "para4": [
+        11,
+        12,
+        13,
+        14
+      ],
+      "lanID": 0,
+      "score": 5
+    },
+    {
+      "ID": 4,
+      "openBoxID": 2,
+      "para0": 1,
+      "para1": 2,
+      "para2": 1,
+      "para3": 4,
+      "para4": [
+        11,
+        12,
+        13,
+        14
+      ],
+      "lanID": 0,
+      "score": 10
+    },
+    {
+      "ID": 5,
+      "openBoxID": 2,
+      "para0": 1,
+      "para1": 3,
+      "para2": 1,
+      "para3": 4,
+      "para4": [
+        11,
+        12,
+        13,
+        14
+      ],
+      "lanID": 0,
+      "score": 25
+    },
+    {
+      "ID": 6,
+      "openBoxID": 2,
+      "para0": 1,
+      "para1": 4,
+      "para2": 1,
+      "para3": 4,
+      "para4": [
+        11,
+        12,
+        13,
+        14
+      ],
+      "lanID": 0,
+      "score": 50
+    },
+    {
+      "ID": 7,
+      "openBoxID": 2,
+      "para0": 1,
+      "para1": 1,
+      "para2": 1,
+      "para3": 5,
+      "para4": [
+        11,
+        12,
+        13,
+        14
+      ],
+      "lanID": 0,
+      "score": 4
+    },
+    {
+      "ID": 8,
+      "openBoxID": 2,
+      "para0": 2,
+      "para1": 1,
+      "para2": 1,
+      "para3": 5,
+      "para4": [
+        11,
+        12,
+        13,
+        14
+      ],
+      "lanID": 0,
+      "score": 12
+    },
+    {
+      "ID": 9,
+      "openBoxID": 2,
+      "para0": 1,
+      "para1": 2,
+      "para2": 1,
+      "para3": 5,
+      "para4": [
+        11,
+        12,
+        13,
+        14
+      ],
+      "lanID": 0,
+      "score": 20
+    },
+    {
+      "ID": 10,
+      "openBoxID": 2,
+      "para0": 2,
+      "para1": 2,
+      "para2": 1,
+      "para3": 5,
+      "para4": [
+        11,
+        12,
+        13,
+        14
+      ],
+      "lanID": 0,
+      "score": 40
+    }
+  ]
 }

Assets/Res/Config/SkillConfig.json

@@ -5592,7 +5592,11 @@
       "intensifierIndex": [
         0
       ],
-      "PromoteLan": -1
+      "PromoteLan": -1,
+      "PromoteLanPara_1": [
+        0.0,
+        -1.0
+      ]
     },
     {
       "ID": 20081,
@@ -5625,6 +5629,10 @@
       "PromoteLan": 1260,
       "PromoteLanPara": [
         3.0
+      ],
+      "PromoteLanPara_1": [
+        0.0,
+        -1.0
       ]
     },
     {
@@ -5658,6 +5666,10 @@
       "PromoteLan": 1261,
       "PromoteLanPara": [
         3.0
+      ],
+      "PromoteLanPara_1": [
+        0.0,
+        -1.0
       ]
     },
     {
@@ -5691,6 +5703,10 @@
       "PromoteLan": 1262,
       "PromoteLanPara": [
         3.0
+      ],
+      "PromoteLanPara_1": [
+        0.0,
+        -1.0
       ]
     },
     {
@@ -5724,6 +5740,10 @@
       "PromoteLan": 1263,
       "PromoteLanPara": [
         3.0
+      ],
+      "PromoteLanPara_1": [
+        0.0,
+        -1.0
       ]
     },
     {

Assets/Res/Config/SkillPowerupConfig.json

@@ -9,8 +9,8 @@
         1005
       ],
       "LevelupItemNum": [
-        1125,
-        188
+        26285,
+        656
       ],
       "PlayerLevelLimit": 6
     },
@@ -23,8 +23,8 @@
         1005
       ],
       "LevelupItemNum": [
-        1500,
-        250
+        27635,
+        694
       ],
       "PlayerLevelLimit": 11
     },
@@ -37,8 +37,8 @@
         1005
       ],
       "LevelupItemNum": [
-        1875,
-        313
+        29055,
+        725
       ],
       "PlayerLevelLimit": 16
     },
@@ -51,8 +51,8 @@
         1005
       ],
       "LevelupItemNum": [
-        2250,
-        375
+        30548,
+        763
       ],
       "PlayerLevelLimit": 21
     },
@@ -65,8 +65,8 @@
         1005
       ],
       "LevelupItemNum": [
-        2625,
-        438
+        32115,
+        800
       ],
       "PlayerLevelLimit": 26
     },
@@ -79,8 +79,8 @@
         1005
       ],
       "LevelupItemNum": [
-        3000,
-        500
+        33765,
+        844
       ],
       "PlayerLevelLimit": 31
     },
@@ -93,8 +93,8 @@
         1005
       ],
       "LevelupItemNum": [
-        3375,
-        563
+        35500,
+        888
       ],
       "PlayerLevelLimit": 36
     },
@@ -107,8 +107,8 @@
         1005
       ],
       "LevelupItemNum": [
-        3750,
-        625
+        37325,
+        931
       ],
       "PlayerLevelLimit": 41
     },
@@ -121,8 +121,8 @@
         1005
       ],
       "LevelupItemNum": [
-        4140,
-        688
+        39243,
+        981
       ],
       "PlayerLevelLimit": 46
     },
@@ -135,8 +135,8 @@
         1005
       ],
       "LevelupItemNum": [
-        4570,
-        750
+        41258,
+        1031
       ],
       "PlayerLevelLimit": 51
     },
@@ -149,8 +149,8 @@
         1005
       ],
       "LevelupItemNum": [
-        5048,
-        825
+        43378,
+        1088
       ],
       "PlayerLevelLimit": 56
     },
@@ -163,8 +163,8 @@
         1005
       ],
       "LevelupItemNum": [
-        5573,
-        919
+        45605,
+        1138
       ],
       "PlayerLevelLimit": 61
     },
@@ -177,8 +177,8 @@
         1005
       ],
       "LevelupItemNum": [
-        6150,
-        1013
+        47948,
+        1200
       ],
       "PlayerLevelLimit": 66
     },
@@ -191,8 +191,8 @@
         1005
       ],
       "LevelupItemNum": [
-        6788,
-        1106
+        50413,
+        1263
       ],
       "PlayerLevelLimit": 71
     },
@@ -205,8 +205,8 @@
         1005
       ],
       "LevelupItemNum": [
-        7493,
-        1231
+        53000,
+        1325
       ],
       "PlayerLevelLimit": 76
     },
@@ -219,8 +219,8 @@
         1005
       ],
       "LevelupItemNum": [
-        8273,
-        1356
+        55725,
+        1394
       ],
       "PlayerLevelLimit": 81
     },
@@ -233,8 +233,8 @@
         1005
       ],
       "LevelupItemNum": [
-        9135,
-        1500
+        58588,
+        1463
       ],
       "PlayerLevelLimit": 86
     },
@@ -247,8 +247,8 @@
         1005
       ],
       "LevelupItemNum": [
-        10088,
-        1656
+        61598,
+        1538
       ],
       "PlayerLevelLimit": 91
     },
@@ -261,8 +261,8 @@
         1005
       ],
       "LevelupItemNum": [
-        11138,
-        1831
+        64760,
+        1619
       ],
       "PlayerLevelLimit": 96
     },
@@ -275,8 +275,8 @@
         1005
       ],
       "LevelupItemNum": [
-        12298,
-        2019
+        68088,
+        1700
       ],
       "PlayerLevelLimit": 101
     },
@@ -289,8 +289,8 @@
         1005
       ],
       "LevelupItemNum": [
-        13573,
-        2231
+        71585,
+        1788
       ],
       "PlayerLevelLimit": 106
     },
@@ -303,8 +303,8 @@
         1005
       ],
       "LevelupItemNum": [
-        14988,
-        2463
+        75263,
+        1881
       ],
       "PlayerLevelLimit": 111
     },
@@ -317,8 +317,8 @@
         1005
       ],
       "LevelupItemNum": [
-        16548,
-        2719
+        79130,
+        1981
       ],
       "PlayerLevelLimit": 116
     },
@@ -331,8 +331,8 @@
         1005
       ],
       "LevelupItemNum": [
-        18268,
-        3000
+        83195,
+        2081
       ],
       "PlayerLevelLimit": 121
     },
@@ -345,8 +345,8 @@
         1005
       ],
       "LevelupItemNum": [
-        20168,
-        3313
+        87468,
+        2188
       ],
       "PlayerLevelLimit": 126
     },
@@ -359,8 +359,8 @@
         1005
       ],
       "LevelupItemNum": [
-        22268,
-        3656
+        91963,
+        2300
       ],
       "PlayerLevelLimit": 131
     },
@@ -373,8 +373,8 @@
         1005
       ],
       "LevelupItemNum": [
-        24585,
-        4038
+        96685,
+        2419
       ],
       "PlayerLevelLimit": 136
     },
@@ -387,8 +387,8 @@
         1005
       ],
       "LevelupItemNum": [
-        27148,
-        4456
+        101653,
+        2544
       ],
       "PlayerLevelLimit": 141
     },
@@ -401,8 +401,8 @@
         1005
       ],
       "LevelupItemNum": [
-        29973,
-        4919
+        106875,
+        2669
       ],
       "PlayerLevelLimit": 146
     },
@@ -415,8 +415,8 @@
         1005
       ],
       "LevelupItemNum": [
-        33093,
-        5431
+        112365,
+        2806
       ],
       "PlayerLevelLimit": 151
     },
@@ -429,8 +429,8 @@
         1005
       ],
       "LevelupItemNum": [
-        36538,
-        5994
+        118138,
+        2956
       ],
       "PlayerLevelLimit": 156
     },
@@ -443,8 +443,8 @@
         1005
       ],
       "LevelupItemNum": [
-        40338,
-        6619
+        124205,
+        3106
       ],
       "PlayerLevelLimit": 161
     },
@@ -457,8 +457,8 @@
         1005
       ],
       "LevelupItemNum": [
-        44535,
-        7306
+        130588,
+        3263
       ],
       "PlayerLevelLimit": 166
     },
@@ -471,8 +471,8 @@
         1005
       ],
       "LevelupItemNum": [
-        49170,
-        8063
+        137295,
+        3431
       ],
       "PlayerLevelLimit": 171
     },
@@ -485,8 +485,8 @@
         1005
       ],
       "LevelupItemNum": [
-        54285,
-        8900
+        144348,
+        3606
       ],
       "PlayerLevelLimit": 176
     },
@@ -499,8 +499,8 @@
         1005
       ],
       "LevelupItemNum": [
-        59935,
-        9825
+        151765,
+        3794
       ],
       "PlayerLevelLimit": 181
     },
@@ -513,8 +513,8 @@
         1005
       ],
       "LevelupItemNum": [
-        66173,
-        10844
+        159560,
+        3988
       ],
       "PlayerLevelLimit": 186
     },
@@ -527,8 +527,8 @@
         1005
       ],
       "LevelupItemNum": [
-        73060,
-        11975
+        167758,
+        4194
       ],
       "PlayerLevelLimit": 191
     },
@@ -541,8 +541,8 @@
         1005
       ],
       "LevelupItemNum": [
-        80663,
-        13219
+        176375,
+        4413
       ],
       "PlayerLevelLimit": 196
     },
@@ -555,8 +555,8 @@
         1005
       ],
       "LevelupItemNum": [
-        89055,
-        14594
+        185435,
+        4638
       ],
       "PlayerLevelLimit": 201
     },
@@ -569,8 +569,8 @@
         1005
       ],
       "LevelupItemNum": [
-        98323,
-        16125
+        194963,
+        4875
       ],
       "PlayerLevelLimit": 206
     },
@@ -583,8 +583,8 @@
         1005
       ],
       "LevelupItemNum": [
-        108555,
-        17813
+        204978,
+        5125
       ],
       "PlayerLevelLimit": 211
     },
@@ -597,8 +597,8 @@
         1005
       ],
       "LevelupItemNum": [
-        119855,
-        19663
+        215508,
+        5388
       ],
       "PlayerLevelLimit": 216
     },
@@ -611,8 +611,8 @@
         1005
       ],
       "LevelupItemNum": [
-        132333,
-        21706
+        226580,
+        5663
       ],
       "PlayerLevelLimit": 221
     },
@@ -625,8 +625,8 @@
         1005
       ],
       "LevelupItemNum": [
-        146105,
-        23963
+        238218,
+        5956
       ],
       "PlayerLevelLimit": 226
     },
@@ -639,8 +639,8 @@
         1005
       ],
       "LevelupItemNum": [
-        161310,
-        26456
+        250458,
+        6263
       ],
       "PlayerLevelLimit": 231
     },
@@ -653,8 +653,8 @@
         1005
       ],
       "LevelupItemNum": [
-        178098,
-        29213
+        263323,
+        6581
       ],
       "PlayerLevelLimit": 236
     },
@@ -667,8 +667,8 @@
         1005
       ],
       "LevelupItemNum": [
-        196633,
-        32244
+        276850,
+        6919
       ],
       "PlayerLevelLimit": 241
     },
@@ -681,8 +681,8 @@
         1005
       ],
       "LevelupItemNum": [
-        217100,
-        35594
+        291073,
+        7275
       ],
       "PlayerLevelLimit": 246
     },
@@ -695,8 +695,8 @@
         1005
       ],
       "LevelupItemNum": [
-        239698,
-        39300
+        306025,
+        7650
       ],
       "PlayerLevelLimit": 251
     },
@@ -709,8 +709,8 @@
         1005
       ],
       "LevelupItemNum": [
-        264648,
-        43388
+        321748,
+        8044
       ],
       "PlayerLevelLimit": 256
     },
@@ -723,8 +723,8 @@
         1005
       ],
       "LevelupItemNum": [
-        292195,
-        47900
+        338275,
+        8456
       ],
       "PlayerLevelLimit": 261
     },
@@ -737,8 +737,8 @@
         1005
       ],
       "LevelupItemNum": [
-        322608,
-        52881
+        355653,
+        8894
       ],
       "PlayerLevelLimit": 266
     },
@@ -751,8 +751,8 @@
         1005
       ],
       "LevelupItemNum": [
-        356185,
-        58388
+        373923,
+        9350
       ],
       "PlayerLevelLimit": 271
     },
@@ -765,8 +765,8 @@
         1005
       ],
       "LevelupItemNum": [
-        393255,
-        64463
+        393133,
+        9831
       ],
       "PlayerLevelLimit": 276
     },
@@ -779,8 +779,8 @@
         1005
       ],
       "LevelupItemNum": [
-        434185,
-        71169
+        413330,
+        10331
       ],
       "PlayerLevelLimit": 281
     },
@@ -793,8 +793,8 @@
         1005
       ],
       "LevelupItemNum": [
-        479375,
-        78581
+        434563,
+        10863
       ],
       "PlayerLevelLimit": 286
     },
@@ -807,8 +807,8 @@
         1005
       ],
       "LevelupItemNum": [
-        529270,
-        86756
+        456888,
+        11425
       ],
       "PlayerLevelLimit": 291
     },
@@ -821,8 +821,8 @@
         1005
       ],
       "LevelupItemNum": [
-        584355,
-        95794
+        480358,
+        12006
       ],
       "PlayerLevelLimit": 296
     },
@@ -835,8 +835,8 @@
         1005
       ],
       "LevelupItemNum": [
-        632525,
-        103694
+        500000,
+        12500
       ],
       "PlayerLevelLimit": 300
     },

Assets/Scripts/GameData/ExcelConfig/OpenBoxConfig.cs

@@ -134,6 +134,16 @@ namespace Excel2Json
 #endif
 		
 
+		/// <summary>
+		///累计积分每X抽结算奖励
+		/// </summary>
+#if !COMBAT_SERVER
+		public int ProgressRewardChoukaCount;
+#else
+		public int ProgressRewardChoukaCount{ set; get; }
+#endif
+		
+
 		/// <summary>
 		///看广告翻倍的倍率选项
 		/// </summary>

Assets/Scripts/GameData/ExcelConfig/OpenBoxProgressReward.cs

@@ -0,0 +1,70 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\OpenBox.xlsx. SheetName: OpenBoxProgressReward
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "OpenBoxProgressReward.json")]
+	public partial class OpenBoxProgressRewardHolder : ConfigHolder<OpenBoxProgressReward>
	{
+	}
+
+
+	[Serializable]
+	public struct OpenBoxProgressReward : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///ID 
+		/// </summary>
+#if !COMBAT_SERVER
+		public int ID;
+#else
+		public int ID{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///抽奖组ID 
+		/// </summary>
+#if !COMBAT_SERVER
+		public int OpenboxID;
+#else
+		public int OpenboxID{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///积累分数 
+		/// </summary>
+#if !COMBAT_SERVER
+		public int TotalScore;
+#else
+		public int TotalScore{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///奖励道具
+		/// </summary>
+#if !COMBAT_SERVER
+		public int[] PrizeID;
+#else
+		public int[] PrizeID{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///奖励数量
+		/// </summary>
+#if !COMBAT_SERVER
+		public int[] PrizeCount;
+#else
+		public int[] PrizeCount{ set; get; }
+#endif
+		
+
+	}
+
+}
+// End of Auto Generated Code

Assets/Scripts/GameData/ExcelConfig/OpenBoxScoreRule.cs

@@ -0,0 +1,110 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\OpenBox.xlsx. SheetName: OpenBoxScoreRule
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "OpenBoxScoreRule.json")]
+	public partial class OpenBoxScoreRuleHolder : ConfigHolder<OpenBoxScoreRule>
	{
+	}
+
+
+	[Serializable]
+	public struct OpenBoxScoreRule : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///ID 
+		/// </summary>
+#if !COMBAT_SERVER
+		public int ID;
+#else
+		public int ID{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///openboxID
+		/// </summary>
+#if !COMBAT_SERVER
+		public int openBoxID;
+#else
+		public int openBoxID{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///连续{0}次十连同时得到{1}个品质{2}{3}的道具 参数0
+		/// </summary>
+#if !COMBAT_SERVER
+		public int para0;
+#else
+		public int para0{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///连续{0}次十连同时得到{1}个品质{2}{3}的道具 参数1
+		/// </summary>
+#if !COMBAT_SERVER
+		public int para1;
+#else
+		public int para1{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///连续{0}次十连同时得到{1}个品质{2}{3}的道具 参数2：1= 2≥ 3≤
+		/// </summary>
+#if !COMBAT_SERVER
+		public int para2;
+#else
+		public int para2{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///连续{0}次十连同时得到{1}个品质{2}{3}的道具 参数3
+		/// </summary>
+#if !COMBAT_SERVER
+		public int para3;
+#else
+		public int para3{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///计入分数的Itemtag 不填就是所有tag
+		/// </summary>
+#if !COMBAT_SERVER
+		public int[] para4;
+#else
+		public int[] para4{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///语言表ID
+		/// </summary>
+#if !COMBAT_SERVER
+		public int lanID;
+#else
+		public int lanID{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///获得分数
+		/// </summary>
+#if !COMBAT_SERVER
+		public int score;
+#else
+		public int score{ set; get; }
+#endif
+		
+
+	}
+
+}
+// End of Auto Generated Code

Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\skill.xlsx. SheetName: SkillConfig
+// Generate From Excel\Skill.xlsx. SheetName: SkillConfig
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameData/ExcelConfig/SkillConstant.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\skill.xlsx. SheetName: SkillConstant
+// Generate From Excel\Skill.xlsx. SheetName: SkillConstant
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameData/ExcelConfig/SkillPowerupConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\skill.xlsx. SheetName: SkillPowerupConfig
+// Generate From Excel\Skill.xlsx. SheetName: SkillPowerupConfig
 
 using System;
 using Fort23.GameData;