Merge branch 'master' of https://git.17pkmj.com:3000/sunhengwei/xmmg_1

配置表/总json/masterSx.json

@@ -0,0 +1,10 @@
+{
+    "ItemX": {"id":"编号","star":"星级","power":"战斗力数值","Grad_required":"需要等级","cost":"升级素材","quantity":"数量","cd":"升级冷却时间/秒","upgrade":"升级条件","quantity_1":"数量"},
+    "Items": [
+        {"id":1,"star":1,"power":100,"Grad_required":10,"cost":"1500010003,100010001","quantity":"20,200000","cd":3000,"upgrade":"100010003","quantity_1":"2000"},
+        {"id":2,"star":2,"power":200,"Grad_required":20,"cost":"1500010004,1500010003,100010001","quantity":"10,30,500000","cd":6000,"upgrade":"100010003","quantity_1":4000},
+        {"id":3,"star":3,"power":300,"Grad_required":30,"cost":"1500010005,1500010004,1500010003,100010001","quantity":"10,30,60,800000","cd":9000,"upgrade":"100010003","quantity_1":6000},
+        {"id":4,"star":4,"power":400,"Grad_required":40,"cost":"1500010006,1500010005,1500010004,100010001","quantity":"20,40,80,1200000","cd":12000,"upgrade":"100010003","quantity_1":8000},
+        {"id":5,"star":5,"power":500,"Grad_required":50,"cost":"1500010006,1500010005,1500010004,100010001","quantity":"60,90,120,20000000","cd":15000,"upgrade":"100010003","quantity_1":10000}
+    ]
+}