feat(login): 添加奶昔论坛第三方登录支持

- 在登录页面增加奶昔论坛登录选项
- 实现奶昔论坛OAuth2.0认证流程
- 添加用户绑定和直接登录功能
- 优化登录界面布局和样式

.gitignore

@@ -3,3 +3,5 @@ package-lock.json
 config.xml
 /dist.zip
 dist/
+luaConfigs/
+gm/

batchSetting.js

@@ -1,68 +0,0 @@
-const fs = require('fs')
-const key = "SpecialRing.config"
-const values = [71, 100, 500] // 登记,伤害加倍,元宝花费
-const interval = [1, 50, 50]
-const num = 130
-const start = () => {
-    const template = `"S1": {
-            "attr": [
-                {
-                    "value": S2,
-                    "type": 75
-                },
-                {
-                    "value": 585,
-                    "type": 76
-                },
-                {
-                    "value": 1115,
-                    "type": 77
-                },
-                {
-                    "value": 70,
-                    "type": 21
-                },
-                {
-                    "value": 70,
-                    "type": 23
-                },
-                {
-                    "value": 70,
-                    "type": 25
-                },
-                {
-                    "value": 70,
-                    "type": 27
-                },
-                {
-                    "value": 3400,
-                    "type": 79
-                }
-            ],
-            "lv": S1,
-            "cost": [
-                {
-                    "id": 1022,
-                    "type": 0,
-                    "count": 1600
-                },
-                {
-                    "id":4,
-                    "type": 4,
-                    "count": S3
-                }
-            ],
-            "pos": 5
-        }`
-    const getStr = (index) => {
-        let str = template
-        values.forEach((v, i) => {
-            const reg = new RegExp(`S${i + 1}`, 'g')
-            str = str.replace(reg, v + index * interval[i])
-        })
-        return str
-    }
-    const content = Array(num).fill(1).map((e, i) => `${getStr(i)}`).join(',')
-    fs.writeFileSync(`./dist/${key}.txt`, content)
-}
-start()

batchTemples/UpstarConfig.js

@@ -0,0 +1,55 @@
+module.exports = {
+  key: "UpstarConfig",
+  desc: "等级,物品ID,属性调整,元宝花费,升级概率",
+  values: [0, 1387, 10, 500, 10000, 5, 0],
+  interval: [1, 0, 15, 50, -450, 10, 1],
+  num: 21,
+  template: `"S1": {
+      "consume": [
+        {
+          "id": 4,
+          "type": 4,
+          "count": S4
+        },
+        {
+          "id": 845,
+          "type": 0,
+          "count": S6
+        },
+        {
+          "id": 852,
+          "type": 0,
+          "count": S3
+        }
+      ],
+      "id": S2,
+      "level": S1,
+      "attribute": [
+        {
+          "value": S7,
+          "type": 9
+        },
+        {
+          "value": S7,
+          "type": 11
+        },
+        {
+          "value": S7,
+          "type": 13
+        },
+        {
+          "value": S7,
+          "type": 15
+        },
+        {
+          "value": S7,
+          "type": 17
+        },
+        {
+          "value": S7,
+          "type": 19
+        }
+      ],
+      "rate": S5
+    }`,
+};

configs/ActivityDrawConf.json

@@ -1 +1,17 @@
-{"GlobalId2":[10241,10242,10243],"GlobalId":[10225,10226,10227,10228],"ActivityId":[10025]}
+{
+    "GlobalId2": [
+        10241,
+        10242,
+        10243,
+        10421
+    ],
+    "GlobalId": [
+        10225,
+        10226,
+        10227,
+        10228
+    ],
+    "ActivityId": [
+        10025
+    ]
+}

configs/ActivityWelfareConf.json

@@ -1 +1,6 @@
-{"1":{"Id":1,"actId":10005,"name":"每日签到"},"2":{"Id":2,"actId":10408,"name":"在线豪礼","view":"app.OnlineRewardsView"},"3":{"Id":3,"actId":10149,"name":"装备首爆","view":"app.OpenServerSportsView"},"4":{"Id":4,"actId":10148,"name":"BOSS首杀","view":"app.OpenServerSportsView"},"5":{"Id":5,"actId":10011,"name":"激活码"}}
+{
+  "1": { "Id": 1, "actId": 10005, "name": "每日签到" },
+  "3": { "Id": 3, "actId": 10149, "name": "装备首爆", "view": "app.OpenServerSportsView" },
+  "4": { "Id": 4, "actId": 10148, "name": "BOSS首杀", "view": "app.OpenServerSportsView" },
+  "5": { "Id": 5, "actId": 10011, "name": "激活码" }
+}

configs/CrossServerGroupConf.json

@@ -1 +1,22 @@
-{"7":{"id":7,"ruleid":104},"24":{"id":24,"ruleid":105},"49":{"id":49,"ruleid":106},"84":{"id":84,"ruleid":107},"10000":{"id":10000,"ruleid":108}}
+{
+    "7": {
+        "id": 7,
+        "ruleid": 104
+    },
+    "24": {
+        "id": 24,
+        "ruleid": 105
+    },
+    "49": {
+        "id": 49,
+        "ruleid": 106
+    },
+    "84": {
+        "id": 84,
+        "ruleid": 107
+    },
+    "10000": {
+        "id": 10000,
+        "ruleid": 108
+    }
+}

configs/FunExhibitionConfig.json

@@ -1 +1,335 @@
-{"1":{"view":"app.ShopView","id":1,"funName":"商城","isOpenNeed":{"openDay":1,"level":1},"param":[1]},"2":{"id":2,"funName":"行会","isOpenNeed":{"openDay":1,"level":24},"view":"app.GuildNoGuildListView"},"3":{"id":3,"funName":"挂机","isOpenNeed":{"openDay":1,"level":1},"view":""},"4":{"view":"app.RoleView","id":4,"funName":"技能","isOpenNeed":{"openDay":1,"level":1},"param":[1,0]},"5":{"view":"app.RoleView","id":5,"funName":"角色","isOpenNeed":{"openDay":1,"level":1},"param":[0,0]},"6":{"id":6,"funName":"背包","isOpenNeed":{"openDay":1,"level":1},"view":"app.BagView"},"7":{"id":7,"funName":"普攻","isOpenNeed":{"openDay":1,"level":1},"view":""},"8":{"id":8,"funName":"锻造","isOpenNeed":{"openDay":1,"level":1},"view":"app.ForgeWin"},"9":{"id":9,"funName":"邮件","isOpenNeed":{"openDay":1,"level":1},"view":"app.MailView"},"10":{"id":10,"funName":"排行","isOpenNeed":{"openDay":1,"level":1},"view":"app.RankView"},"11":{"id":11,"funName":"寄售行","isOpenNeed":{"openDay":1,"level":1},"view":"app.TradeLineWin"},"12":{"id":12,"funName":"私人交易","isOpenNeed":{"openDay":1,"level":25},"view":"app.PrivateDealsWin"},"13":{"id":13,"funName":"设置","isOpenNeed":{"openDay":1,"level":1},"view":"app.SetUpView"},"14":{"id":14,"funName":"组队","isOpenNeed":{"openDay":1,"level":1},"view":"app.TeamView"},"15":{"id":15,"funName":"好友","isOpenNeed":{"openDay":1,"level":1},"view":"app.FriendView"},"16":{"id":16,"funName":"洗红名","isOpenNeed":{"openDay":1,"level":1},"view":"app.WashRedNameView"},"17":{"id":17,"funName":"活动","isOpenNeed":{"openDay":1,"level":1},"view":"app.ActivityCopiesWin"},"18":{"view":"app.WarehouseWin","id":18,"showTips":"白卡会员开启仓库功能","isOpenNeed":{"vip":1,"level":1},"funName":"仓库"},"19":{"id":19,"funName":"会员特权","isOpenNeed":{"openDay":1,"level":1},"view":"app.VipView"},"20":{"id":20,"funName":"首充","isOpenNeed":{"openDay":1,"level":1},"view":"app.ActvityFirstChargeView"},"21":{"id":21,"funName":"微端福利","isOpenNeed":{"openDay":1,"level":1},"view":"app.FuLi4366MicroWin"},"22":{"id":22,"funName":"微端福利","isOpenNeed":{"openDay":1,"level":1},"view":"app.CommonMicroWin"},"23":{"view":"app.SetUpView","id":23,"funName":"一键回收","isOpenNeed":{"openDay":1,"level":1},"param":[6]},"24":{"view":"app.ShopView","id":24,"funName":"商城","isOpenNeed":{"openDay":1,"level":1},"param":[[1,1]]},"25":{"id":25,"funName":"狂暴之力","isOpenNeed":{"openDay":1,"level":1},"view":"app.ViolentStateWin"},"26":{"view":"app.ActivityWlelfareView","id":26,"funName":"摇钱树","isOpenNeed":{"zsLevel":2,"level":1},"param":["yqs"]},"27":{"id":27,"funName":"玛法战令","isOpenNeed":{"zsLevel":1,"level":30,"openDay":8},"view":"app.ActivityWarView"},"28":{"view":"app.OpenServerTreasureWin2","id":28,"funName":"幸运寻宝","isOpenNeed":{"openDay":1,"level":1},"param":{"id":[10225,10226,10227,10228],"type":1}},"29":{"view":"app.OpenServerTreasureWin","id":29,"funName":"幸运寻宝","isOpenNeed":{"openDay":1,"level":1},"param":{"id":[10025],"type":2}},"30":{"view":"app.OpenServerTreasureWin3","id":30,"funName":"藏经阁","isOpenNeed":{"openDay":1,"level":1},"param":{"id":[10241,10242,10243],"type":1,"title":"biaoti_cangjingge"}}}
+{
+    "1": {
+        "view": "app.ShopView",
+        "id": 1,
+        "funName": "商城",
+        "isOpenNeed": {
+            "openDay": 1,
+            "level": 1
+        },
+        "param": [
+            1
+        ]
+    },
+    "2": {
+        "id": 2,
+        "funName": "行会",
+        "isOpenNeed": {
+            "openDay": 1,
+            "level": 24
+        },
+        "view": "app.GuildNoGuildListView"
+    },
+    "3": {
+        "id": 3,
+        "funName": "挂机",
+        "isOpenNeed": {
+            "openDay": 1,
+            "level": 1
+        },
+        "view": ""
+    },
+    "4": {
+        "view": "app.RoleView",
+        "id": 4,
+        "funName": "技能",
+        "isOpenNeed": {
+            "openDay": 1,
+            "level": 1
+        },
+        "param": [
+            1,
+            0
+        ]
+    },
+    "5": {
+        "view": "app.RoleView",
+        "id": 5,
+        "funName": "角色",
+        "isOpenNeed": {
+            "openDay": 1,
+            "level": 1
+        },
+        "param": [
+            0,
+            0
+        ]
+    },
+    "6": {
+        "id": 6,
+        "funName": "背包",
+        "isOpenNeed": {
+            "openDay": 1,
+            "level": 1
+        },
+        "view": "app.BagView"
+    },
+    "7": {
+        "id": 7,
+        "funName": "普攻",
+        "isOpenNeed": {
+            "openDay": 1,
+            "level": 1
+        },
+        "view": ""
+    },
+    "8": {
+        "id": 8,
+        "funName": "锻造",
+        "isOpenNeed": {
+            "openDay": 1,
+            "level": 1
+        },
+        "view": "app.ForgeWin"
+    },
+    "9": {
+        "id": 9,
+        "funName": "邮件",
+        "isOpenNeed": {
+            "openDay": 1,
+            "level": 1
+        },
+        "view": "app.MailView"
+    },
+    "10": {
+        "id": 10,
+        "funName": "排行",
+        "isOpenNeed": {
+            "openDay": 1,
+            "level": 1
+        },
+        "view": "app.RankView"
+    },
+    "11": {
+        "id": 11,
+        "funName": "寄售行",
+        "isOpenNeed": {
+            "openDay": 1,
+            "level": 1
+        },
+        "view": "app.TradeLineWin"
+    },
+    "12": {
+        "id": 12,
+        "funName": "私人交易",
+        "isOpenNeed": {
+            "openDay": 1,
+            "level": 25
+        },
+        "view": "app.PrivateDealsWin"
+    },
+    "13": {
+        "id": 13,
+        "funName": "设置",
+        "isOpenNeed": {
+            "openDay": 1,
+            "level": 1
+        },
+        "view": "app.SetUpView"
+    },
+    "14": {
+        "id": 14,
+        "funName": "组队",
+        "isOpenNeed": {
+            "openDay": 1,
+            "level": 1
+        },
+        "view": "app.TeamView"
+    },
+    "15": {
+        "id": 15,
+        "funName": "好友",
+        "isOpenNeed": {
+            "openDay": 1,
+            "level": 1
+        },
+        "view": "app.FriendView"
+    },
+    "16": {
+        "id": 16,
+        "funName": "洗红名",
+        "isOpenNeed": {
+            "openDay": 1,
+            "level": 1
+        },
+        "view": "app.WashRedNameView"
+    },
+    "17": {
+        "id": 17,
+        "funName": "活动",
+        "isOpenNeed": {
+            "openDay": 1,
+            "level": 1
+        },
+        "view": "app.ActivityCopiesWin"
+    },
+    "18": {
+        "view": "app.WarehouseWin",
+        "id": 18,
+        "showTips": "白卡会员开启仓库功能",
+        "isOpenNeed": {
+            "vip": 1,
+            "level": 1
+        },
+        "funName": "仓库"
+    },
+    "19": {
+        "id": 19,
+        "funName": "会员特权",
+        "isOpenNeed": {
+            "openDay": 1,
+            "level": 1
+        },
+        "view": "app.VipView"
+    },
+    "20": {
+        "id": 20,
+        "funName": "首充",
+        "isOpenNeed": {
+            "openDay": 1,
+            "level": 1
+        },
+        "view": "app.ActvityFirstChargeView"
+    },
+    "21": {
+        "id": 21,
+        "funName": "微端福利",
+        "isOpenNeed": {
+            "openDay": 1,
+            "level": 1
+        },
+        "view": "app.FuLi4366MicroWin"
+    },
+    "22": {
+        "id": 22,
+        "funName": "微端福利",
+        "isOpenNeed": {
+            "openDay": 1,
+            "level": 1
+        },
+        "view": "app.CommonMicroWin"
+    },
+    "23": {
+        "view": "app.SetUpView",
+        "id": 23,
+        "funName": "一键回收",
+        "isOpenNeed": {
+            "openDay": 1,
+            "level": 1
+        },
+        "param": [
+            6
+        ]
+    },
+    "24": {
+        "view": "app.ShopView",
+        "id": 24,
+        "funName": "商城",
+        "isOpenNeed": {
+            "openDay": 1,
+            "level": 1
+        },
+        "param": [
+            [
+                1,
+                1
+            ]
+        ]
+    },
+    "25": {
+        "id": 25,
+        "funName": "狂暴之力",
+        "isOpenNeed": {
+            "openDay": 1,
+            "level": 1
+        },
+        "view": "app.ViolentStateWin"
+    },
+    "26": {
+        "view": "app.ActivityWlelfareView",
+        "id": 26,
+        "funName": "摇钱树",
+        "isOpenNeed": {
+            "zsLevel": 2,
+            "level": 1
+        },
+        "param": [
+            "yqs"
+        ]
+    },
+    "27": {
+        "id": 27,
+        "funName": "玛法战令",
+        "isOpenNeed": {
+            "zsLevel": 1,
+            "level": 30,
+            "openDay": 8
+        },
+        "view": "app.ActivityWarView"
+    },
+    "28": {
+        "view": "app.OpenServerTreasureWin2",
+        "id": 28,
+        "funName": "幸运寻宝",
+        "isOpenNeed": {
+            "openDay": 1,
+            "level": 1
+        },
+        "param": {
+            "id": [
+                10225,
+                10226,
+                10227,
+                10228
+            ],
+            "type": 1
+        }
+    },
+    "29": {
+        "view": "app.OpenServerTreasureWin",
+        "id": 29,
+        "funName": "幸运寻宝",
+        "isOpenNeed": {
+            "openDay": 1,
+            "level": 1
+        },
+        "param": {
+            "id": [
+                10025
+            ],
+            "type": 2
+        }
+    },
+    "30": {
+        "view": "app.OpenServerTreasureWin3",
+        "id": 30,
+        "funName": "藏经阁",
+        "isOpenNeed": {
+            "openDay": 1,
+            "level": 1
+        },
+        "param": {
+            "id": [
+                10241,
+                10242,
+                10243
+            ],
+            "type": 1,
+            "title": "biaoti_cangjingge"
+        }
+    },
+    "31": {
+        "view": "app.OpenServerTreasureWin3",
+        "id": 31,
+        "funName": "王者抽奖",
+        "isOpenNeed": {
+            "openDay": 1,
+            "level": 1
+        },
+        "param": {
+            "id": [
+                10421
+            ]
+        }
+    }
+}

configs/GuildDonateConfig.json

@@ -1 +1,4 @@
-{"2":{"staticcounttype":30,"type":2,"cost":200000,"adddonate":20,"addcion":20,"limittimes":5},"3":{"staticcounttype":31,"type":3,"cost":20,"adddonate":88,"addcion":88,"limittimes":5}}
+{
+  "2": { "staticcounttype": 30, "type": 2, "cost": 200000, "adddonate": 20, "addcion": 20, "limittimes": 50 },
+  "3": { "staticcounttype": 31, "type": 3, "cost": 20, "adddonate": 88, "addcion": 88, "limittimes": 50 }
+}

configs/MergeConfig.json

@@ -1 +1,342 @@
-{"1":{"1":{"rebornconds":0,"index":1,"Uitype":1,"id":1,"levelconds":1,"dayconds":1,"name":"魂玉"},"2":{"rebornconds":0,"index":2,"Uitype":1,"id":1,"levelconds":1,"dayconds":1,"name":"勋章"},"3":{"rebornconds":2,"index":3,"Uitype":1,"id":1,"levelconds":1,"dayconds":1,"name":"治疗宝玉"},"4":{"rebornconds":2,"index":4,"Uitype":1,"id":1,"levelconds":1,"dayconds":1,"name":"神装-斗笠"},"5":{"rebornconds":2,"index":5,"Uitype":1,"id":1,"levelconds":1,"dayconds":1,"name":"神装-盾牌"},"6":{"rebornconds":2,"index":6,"Uitype":1,"id":1,"levelconds":1,"dayconds":1,"name":"神装-面甲"},"7":{"rebornconds":2,"index":7,"Uitype":1,"id":1,"levelconds":1,"dayconds":1,"name":"神装-披风"},"8":{"rebornconds":2,"index":8,"Uitype":1,"id":1,"levelconds":1,"dayconds":1,"name":"官职证明"},"9":{"rebornconds":2,"index":9,"Uitype":2,"id":1,"levelconds":1,"dayconds":60,"name":"星月装备"}},"2":{"1":{"rebornconds":0,"index":1,"Uitype":2,"id":2,"levelconds":1,"dayconds":1,"name":"特权"},"2":{"rebornconds":2,"index":2,"Uitype":2,"id":2,"levelconds":1,"dayconds":1,"name":"证明兑换"},"3":{"rebornconds":0,"index":3,"Uitype":2,"id":2,"levelconds":1,"dayconds":1,"name":"神水"},"4":{"rebornconds":0,"index":4,"Uitype":1,"id":2,"levelconds":1,"dayconds":5,"name":"圣宠"},"5":{"rebornconds":0,"index":5,"Uitype":2,"id":2,"levelconds":1,"dayconds":1,"name":"高阶材料"}},"3":{"1":{"rebornconds":0,"index":1,"Uitype":2,"id":3,"levelconds":1,"dayconds":1,"name":"佩饰"},"2":{"rebornconds":0,"index":2,"Uitype":2,"id":3,"levelconds":1,"dayconds":1,"name":"装备凭证"}},"4":{"1":{"rebornconds":4,"index":1,"Uitype":2,"id":4,"levelconds":1,"dayconds":1,"name":"神兵"},"2":{"rebornconds":4,"index":2,"Uitype":2,"id":4,"levelconds":1,"dayconds":1,"name":"天之神兵"},"3":{"rebornconds":4,"index":3,"Uitype":2,"id":4,"levelconds":1,"dayconds":1,"name":"圣甲"},"4":{"rebornconds":4,"index":4,"Uitype":2,"id":4,"levelconds":1,"dayconds":1,"name":"天之圣甲"},"5":{"rebornconds":4,"index":5,"Uitype":2,"id":4,"levelconds":1,"dayconds":1,"name":"天之互换"}},"5":{"1":{"rebornconds":999,"index":1,"Uitype":2,"id":5,"levelconds":1,"dayconds":1,"name":"祝福国庆"}},"6":{"1":{"rebornconds":0,"index":1,"Uitype":1,"id":6,"levelconds":1,"dayconds":8,"name":"银花簪"},"2":{"rebornconds":0,"index":2,"Uitype":1,"id":6,"levelconds":1,"dayconds":8,"name":"养心玉"},"3":{"rebornconds":0,"index":3,"Uitype":1,"id":6,"levelconds":1,"dayconds":8,"name":"金曜珠"},"4":{"rebornconds":0,"index":4,"Uitype":1,"id":6,"levelconds":1,"dayconds":8,"name":"黑檀石"},"5":{"rebornconds":0,"index":5,"Uitype":2,"id":6,"levelconds":1,"dayconds":30,"name":"檀珠"},"6":{"rebornconds":0,"index":6,"Uitype":2,"id":6,"levelconds":1,"dayconds":60,"name":"易筋经"},"7":{"rebornconds":6,"index":7,"Uitype":2,"id":6,"levelconds":1,"dayconds":1,"name":"内功秘籍"}},"7":{"1":{"rebornconds":0,"index":1,"Uitype":1,"id":7,"levelconds":1,"dayconds":1,"name":"换真充"},"2":{"rebornconds":0,"index":2,"Uitype":1,"id":7,"levelconds":1,"dayconds":1,"name":"元宝合成"},"3":{"rebornconds":0,"index":3,"Uitype":1,"id":7,"levelconds":1,"dayconds":1,"name":"银两兑换"}},"8":{"1":{"rebornconds":3,"index":1,"Uitype":2,"id":8,"levelconds":1,"dayconds":15,"name":"字诀"}}}
+{
+    "1": {
+        "1": {
+            "rebornconds": 0,
+            "index": 1,
+            "Uitype": 1,
+            "id": 1,
+            "levelconds": 1,
+            "dayconds": 1,
+            "name": "魂玉"
+        },
+        "2": {
+            "rebornconds": 0,
+            "index": 2,
+            "Uitype": 1,
+            "id": 1,
+            "levelconds": 1,
+            "dayconds": 1,
+            "name": "勋章"
+        },
+        "3": {
+            "rebornconds": 2,
+            "index": 3,
+            "Uitype": 1,
+            "id": 1,
+            "levelconds": 1,
+            "dayconds": 1,
+            "name": "治疗宝玉"
+        },
+        "4": {
+            "rebornconds": 2,
+            "index": 4,
+            "Uitype": 1,
+            "id": 1,
+            "levelconds": 1,
+            "dayconds": 1,
+            "name": "神装-斗笠"
+        },
+        "5": {
+            "rebornconds": 2,
+            "index": 5,
+            "Uitype": 1,
+            "id": 1,
+            "levelconds": 1,
+            "dayconds": 1,
+            "name": "神装-盾牌"
+        },
+        "6": {
+            "rebornconds": 2,
+            "index": 6,
+            "Uitype": 1,
+            "id": 1,
+            "levelconds": 1,
+            "dayconds": 1,
+            "name": "神装-面甲"
+        },
+        "7": {
+            "rebornconds": 2,
+            "index": 7,
+            "Uitype": 1,
+            "id": 1,
+            "levelconds": 1,
+            "dayconds": 1,
+            "name": "神装-披风"
+        },
+        "8": {
+            "rebornconds": 2,
+            "index": 8,
+            "Uitype": 1,
+            "id": 1,
+            "levelconds": 1,
+            "dayconds": 1,
+            "name": "官职证明"
+        },
+        "9": {
+            "rebornconds": 2,
+            "index": 9,
+            "Uitype": 2,
+            "id": 1,
+            "levelconds": 1,
+            "dayconds": 60,
+            "name": "星月装备"
+        }
+    },
+    "2": {
+        "1": {
+            "rebornconds": 0,
+            "index": 1,
+            "Uitype": 2,
+            "id": 2,
+            "levelconds": 1,
+            "dayconds": 1,
+            "name": "特权"
+        },
+        "2": {
+            "rebornconds": 2,
+            "index": 2,
+            "Uitype": 2,
+            "id": 2,
+            "levelconds": 1,
+            "dayconds": 1,
+            "name": "证明兑换"
+        },
+        "3": {
+            "rebornconds": 0,
+            "index": 3,
+            "Uitype": 2,
+            "id": 2,
+            "levelconds": 1,
+            "dayconds": 1,
+            "name": "神水"
+        },
+        "4": {
+            "rebornconds": 0,
+            "index": 4,
+            "Uitype": 1,
+            "id": 2,
+            "levelconds": 1,
+            "dayconds": 5,
+            "name": "圣宠"
+        },
+        "5": {
+            "rebornconds": 0,
+            "index": 5,
+            "Uitype": 2,
+            "id": 2,
+            "levelconds": 1,
+            "dayconds": 1,
+            "name": "高阶材料"
+        },
+        "6": {
+            "rebornconds": 0,
+            "index": 6,
+            "Uitype": 1,
+            "id": 2,
+            "levelconds": 1,
+            "dayconds": 1,
+            "name": "兵魂"
+        }
+    },
+    "3": {
+        "1": {
+            "rebornconds": 0,
+            "index": 1,
+            "Uitype": 2,
+            "id": 3,
+            "levelconds": 1,
+            "dayconds": 1,
+            "name": "佩饰"
+        },
+        "2": {
+            "rebornconds": 0,
+            "index": 2,
+            "Uitype": 1,
+            "id": 3,
+            "levelconds": 1,
+            "dayconds": 1,
+            "name": "装备凭证"
+        },
+        "3": {
+            "rebornconds": 0,
+            "index": 3,
+            "Uitype": 1,
+            "id": 3,
+            "levelconds": 1,
+            "dayconds": 1,
+            "name": "高阶装备"
+        },
+        "4": {
+            "rebornconds": 0,
+            "index": 4,
+            "Uitype": 1,
+            "id": 3,
+            "levelconds": 1,
+            "dayconds": 1,
+            "name": "多倍经验"
+        }
+    },
+    "4": {
+        "1": {
+            "rebornconds": 4,
+            "index": 1,
+            "Uitype": 2,
+            "id": 4,
+            "levelconds": 1,
+            "dayconds": 1,
+            "name": "神兵"
+        },
+        "2": {
+            "rebornconds": 4,
+            "index": 2,
+            "Uitype": 2,
+            "id": 4,
+            "levelconds": 1,
+            "dayconds": 1,
+            "name": "天之神兵"
+        },
+        "3": {
+            "rebornconds": 4,
+            "index": 3,
+            "Uitype": 2,
+            "id": 4,
+            "levelconds": 1,
+            "dayconds": 1,
+            "name": "圣甲"
+        },
+        "4": {
+            "rebornconds": 4,
+            "index": 4,
+            "Uitype": 2,
+            "id": 4,
+            "levelconds": 1,
+            "dayconds": 1,
+            "name": "天之圣甲"
+        },
+        "5": {
+            "rebornconds": 4,
+            "index": 5,
+            "Uitype": 2,
+            "id": 4,
+            "levelconds": 1,
+            "dayconds": 1,
+            "name": "天之互换"
+        }
+    },
+    "5": {
+        "1": {
+            "rebornconds": 999,
+            "index": 1,
+            "Uitype": 2,
+            "id": 5,
+            "levelconds": 1,
+            "dayconds": 1,
+            "name": "祝福国庆"
+        }
+    },
+    "6": {
+        "1": {
+            "rebornconds": 0,
+            "index": 1,
+            "Uitype": 1,
+            "id": 6,
+            "levelconds": 1,
+            "dayconds": 8,
+            "name": "银花簪"
+        },
+        "2": {
+            "rebornconds": 0,
+            "index": 2,
+            "Uitype": 1,
+            "id": 6,
+            "levelconds": 1,
+            "dayconds": 8,
+            "name": "养心玉"
+        },
+        "3": {
+            "rebornconds": 0,
+            "index": 3,
+            "Uitype": 1,
+            "id": 6,
+            "levelconds": 1,
+            "dayconds": 8,
+            "name": "金曜珠"
+        },
+        "4": {
+            "rebornconds": 0,
+            "index": 4,
+            "Uitype": 1,
+            "id": 6,
+            "levelconds": 1,
+            "dayconds": 8,
+            "name": "黑檀石"
+        },
+        "5": {
+            "rebornconds": 0,
+            "index": 5,
+            "Uitype": 2,
+            "id": 6,
+            "levelconds": 1,
+            "dayconds": 30,
+            "name": "檀珠"
+        },
+        "6": {
+            "rebornconds": 0,
+            "index": 6,
+            "Uitype": 2,
+            "id": 6,
+            "levelconds": 1,
+            "dayconds": 60,
+            "name": "易筋经"
+        },
+        "7": {
+            "rebornconds": 6,
+            "index": 7,
+            "Uitype": 2,
+            "id": 6,
+            "levelconds": 1,
+            "dayconds": 1,
+            "name": "内功秘籍"
+        }
+    },
+    "7": {
+        "1": {
+            "rebornconds": 0,
+            "index": 1,
+            "Uitype": 1,
+            "id": 7,
+            "levelconds": 1,
+            "dayconds": 1,
+            "name": "换真充"
+        },
+        "2": {
+            "rebornconds": 0,
+            "index": 2,
+            "Uitype": 1,
+            "id": 7,
+            "levelconds": 1,
+            "dayconds": 1,
+            "name": "元宝兑换"
+        },
+        "3": {
+            "rebornconds": 0,
+            "index": 3,
+            "Uitype": 1,
+            "id": 7,
+            "levelconds": 1,
+            "dayconds": 1,
+            "name": "银两兑换"
+        }
+    },
+    "8": {
+        "1": {
+            "rebornconds": 3,
+            "index": 1,
+            "Uitype": 2,
+            "id": 8,
+            "levelconds": 1,
+            "dayconds": 15,
+            "name": "字诀"
+        }
+    }
+}

configs/MergeTotal.json

@@ -1 +1,66 @@
-{"1":{"openZs":0,"sort":1,"id":1,"btn_source":"合成装备","openserverDay":0,"openLv":1},"2":{"openZs":0,"sort":3,"id":2,"btn_source":"材料","openserverDay":0,"openLv":1},"3":{"openZs":0,"sort":4,"id":3,"btn_source":"高阶装备","openserverDay":0,"openLv":1},"4":{"openZs":4,"sort":5,"id":4,"btn_source":"神兵圣甲","openserverDay":0,"openLv":1},"5":{"openZs":999,"sort":6,"id":5,"btn_source":"活动","openserverDay":1,"openLv":1},"6":{"openZs":6,"sort":2,"id":6,"btn_source":"内功","openserverDay":1,"openLv":1},"7":{"openZs":0,"sort":7,"id":7,"btn_source":"元宝银两","openserverDay":1,"openLv":1},"8":{"openZs":3,"sort":8,"id":8,"btn_source":"字诀","openserverDay":15,"openLv":1}}
+{
+    "1": {
+        "openZs": 0,
+        "sort": 1,
+        "id": 1,
+        "btn_source": "合成装备",
+        "openserverDay": 0,
+        "openLv": 1
+    },
+    "2": {
+        "openZs": 0,
+        "sort": 3,
+        "id": 2,
+        "btn_source": "材料",
+        "openserverDay": 0,
+        "openLv": 1
+    },
+    "3": {
+        "openZs": 0,
+        "sort": 4,
+        "id": 3,
+        "btn_source": "成长",
+        "openserverDay": 0,
+        "openLv": 1
+    },
+    "4": {
+        "openZs": 4,
+        "sort": 5,
+        "id": 4,
+        "btn_source": "神兵圣甲",
+        "openserverDay": 0,
+        "openLv": 1
+    },
+    "5": {
+        "openZs": 999,
+        "sort": 6,
+        "id": 5,
+        "btn_source": "活动",
+        "openserverDay": 1,
+        "openLv": 1
+    },
+    "6": {
+        "openZs": 6,
+        "sort": 2,
+        "id": 6,
+        "btn_source": "内功",
+        "openserverDay": 1,
+        "openLv": 1
+    },
+    "7": {
+        "openZs": 0,
+        "sort": 7,
+        "id": 7,
+        "btn_source": "元宝银两",
+        "openserverDay": 1,
+        "openLv": 1
+    },
+    "8": {
+        "openZs": 18,
+        "sort": 8,
+        "id": 8,
+        "btn_source": "字诀",
+        "openserverDay": 15,
+        "openLv": 1
+    }
+}

configs/MonthCardConfig.json

@@ -1 +1,173 @@
-{"1":{"idx":1,"name":"免费特权","dailyAward":[],"buyAward":[{"id":474,"type":0,"count":1}],"consume":{"id":2,"type":2,"count":10000}},"2":{"idx":2,"name":"月卡","dailyAward":[{"id":302,"type":0,"count":1},{"id":269,"type":0,"count":1},{"id":261,"type":0,"count":5}],"buyAward":[{"id":249,"type":0,"count":1},{"id":302,"type":0,"count":8}],"consume":{"id":4,"type":4,"count":280}},"3":{"idx":3,"name":"大药月卡","dailyAward":[{"id":311,"type":0,"count":1}],"buyAward":[{"id":3,"type":3,"count":66},{"id":11,"type":11,"count":5}],"consume":{"id":4,"type":4,"count":1000}},"4":{"idx":4,"name":"永久卡","dailyAward":[{"id":7,"type":7,"count":10},{"id":2,"type":2,"count":200000}],"buyAward":[{"id":462,"type":0,"count":1},{"id":468,"type":0,"count":1}],"consume":{"id":4,"type":4,"count":1580}},"5":{"idx":5,"dailyAward":[],"Ybprice":2,"superRightLV":1,"name":"白卡","ViewType":2,"buyAward":[{"id":474,"type":0,"count":1},{"id":261,"type":0,"count":50},{"id":926,"type":0,"count":1},{"id":3,"type":3,"count":18},{"id":1058,"type":0,"count":1},{"id":300,"type":0,"count":2}],"pictures":["tq_p_1_1","tq_p_1_2","tq_p_1_3"],"consume":{"id":1242,"type":0,"count":2}},"6":{"idx":6,"dailyAward":[],"Ybprice":10,"superRightLV":2,"name":"绿卡","ViewType":2,"buyAward":[{"id":475,"type":0,"count":1},{"id":823,"type":0,"count":1},{"id":261,"type":0,"count":100},{"id":367,"type":0,"count":1},{"id":249,"type":0,"count":2},{"id":927,"type":0,"count":1}],"pictures":["tq_p_2_2","tq_p_2_1","tq_p_2_3"],"consume":{"id":1242,"type":0,"count":10}},"7":{"idx":7,"dailyAward":[],"Ybprice":20,"superRightLV":3,"name":"蓝卡","ViewType":2,"buyAward":[{"id":468,"type":0,"count":1},{"id":507,"type":0,"count":1},{"id":853,"type":0,"count":113},{"id":854,"type":0,"count":113},{"id":249,"type":0,"count":2},{"id":928,"type":0,"count":1}],"pictures":["tq_p_4_3","tq_p_3_1","tq_p_3_3"],"consume":{"id":1242,"type":0,"count":20}},"8":{"idx":8,"dailyAward":[],"Ybprice":70,"superRightLV":4,"name":"紫卡","ViewType":2,"buyAward":[{"id":929,"type":0,"count":1},{"id":976,"type":0,"count":1},{"id":852,"type":0,"count":30},{"id":250,"type":0,"count":2},{"id":853,"type":0,"count":450},{"id":854,"type":0,"count":450}],"pictures":["tq_p_4_2","tq_p_4_1","tq_p_3_2"],"consume":{"id":1242,"type":0,"count":70}},"9":{"idx":9,"dailyAward":[],"Ybprice":220,"superRightLV":5,"name":"橙卡","ViewType":2,"heraldid":"tq_btnt14_2","buyAward":[{"id":930,"type":0,"count":1},{"id":824,"type":0,"count":1},{"id":953,"type":0,"count":14},{"id":977,"type":0,"count":1},{"id":300,"type":0,"count":50},{"id":250,"type":0,"count":10}],"pictures":["tq_p_5_2","tq_p_5_1","tq_p_5_3"],"consume":{"id":1242,"type":0,"count":220}},"10":{"idx":10,"name":"首充卡","superRightLV":-1},"11":{"idx":11,"name":"白卡"},"12":{"idx":12,"dailyAward":[],"Ybprice":250,"superRightLV":6,"displaylimit":{"openDay":1,"vip":0},"name":"橙星","ViewType":2,"heraldid":"tq_btnt14_4","buyAward":[{"id":1073,"type":0,"count":1},{"id":1146,"type":0,"count":1},{"id":1066,"type":0,"count":300},{"id":1115,"type":0,"count":1},{"id":970,"type":0,"count":666},{"id":300,"type":0,"count":100}],"pictures":["tq_p_6_2","tq_p_6_1","tq_p_6_3"],"consume":{"id":1242,"type":0,"count":250}},"13":{"idx":13,"dailyAward":[],"Ybprice":350,"superRightLV":7,"displaylimit":{"openDay":1,"vip":0},"name":"橙月","ViewType":2,"heraldid":"tq_btnt14_3","buyAward":[{"id":1273,"type":0,"count":1},{"id":1272,"type":0,"count":1},{"id":1241,"type":0,"count":1},{"id":265,"type":0,"count":1888},{"id":970,"type":0,"count":666},{"id":852,"type":0,"count":158}],"pictures":["tq_p_7_2","tq_p_7_1","tq_p_7_3"],"consume":{"id":1242,"type":0,"count":350}}}
+{
+  "1": { "idx": 1, "name": "免费特权", "dailyAward": [], "buyAward": [{ "id": 474, "type": 0, "count": 1 }], "consume": { "id": 2, "type": 2, "count": 10000 } },
+  "2": {
+    "idx": 2,
+    "name": "月卡",
+    "dailyAward": [
+      { "id": 302, "type": 0, "count": 1 },
+      { "id": 269, "type": 0, "count": 1 },
+      { "id": 261, "type": 0, "count": 5 }
+    ],
+    "buyAward": [
+      { "id": 249, "type": 0, "count": 1 },
+      { "id": 302, "type": 0, "count": 8 }
+    ],
+    "consume": { "id": 4, "type": 4, "count": 280 }
+  },
+  "3": {
+    "idx": 3,
+    "name": "大药月卡",
+    "dailyAward": [{ "id": 311, "type": 0, "count": 1 }],
+    "buyAward": [
+      { "id": 3, "type": 3, "count": 66 },
+      { "id": 11, "type": 11, "count": 5 }
+    ],
+    "consume": { "id": 4, "type": 4, "count": 1000 }
+  },
+  "4": {
+    "idx": 4,
+    "name": "永久卡",
+    "dailyAward": [
+      { "id": 7, "type": 7, "count": 10 },
+      { "id": 2, "type": 2, "count": 200000 }
+    ],
+    "buyAward": [
+      { "id": 462, "type": 0, "count": 1 },
+      { "id": 468, "type": 0, "count": 1 }
+    ],
+    "consume": { "id": 4, "type": 4, "count": 1580 }
+  },
+  "5": {
+    "idx": 5,
+    "dailyAward": [],
+    "Ybprice": 2,
+    "superRightLV": 1,
+    "name": "白卡",
+    "ViewType": 2,
+    "buyAward": [
+      { "id": 474, "type": 0, "count": 1 },
+      { "id": 261, "type": 0, "count": 50 },
+      { "id": 926, "type": 0, "count": 1 },
+      { "id": 3, "type": 3, "count": 18 },
+      { "id": 1058, "type": 0, "count": 1 },
+      { "id": 300, "type": 0, "count": 2 }
+    ],
+    "pictures": ["tq_p_1_1", "tq_p_1_2", "tq_p_1_3"],
+    "consume": { "id": 1242, "type": 0, "count": 2 }
+  },
+  "6": {
+    "idx": 6,
+    "dailyAward": [],
+    "Ybprice": 10,
+    "superRightLV": 2,
+    "name": "绿卡",
+    "ViewType": 2,
+    "buyAward": [
+      { "id": 475, "type": 0, "count": 1 },
+      { "id": 823, "type": 0, "count": 1 },
+      { "id": 261, "type": 0, "count": 100 },
+      { "id": 367, "type": 0, "count": 1 },
+      { "id": 249, "type": 0, "count": 2 },
+      { "id": 927, "type": 0, "count": 1 }
+    ],
+    "pictures": ["tq_p_2_2", "tq_p_2_1", "tq_p_2_3"],
+    "consume": { "id": 1242, "type": 0, "count": 10 }
+  },
+  "7": {
+    "idx": 7,
+    "dailyAward": [],
+    "Ybprice": 20,
+    "superRightLV": 3,
+    "name": "蓝卡",
+    "ViewType": 2,
+    "buyAward": [
+      { "id": 468, "type": 0, "count": 1 },
+      { "id": 507, "type": 0, "count": 1 },
+      { "id": 853, "type": 0, "count": 113 },
+      { "id": 854, "type": 0, "count": 113 },
+      { "id": 249, "type": 0, "count": 2 },
+      { "id": 928, "type": 0, "count": 1 }
+    ],
+    "pictures": ["tq_p_4_3", "tq_p_3_1", "tq_p_3_3"],
+    "consume": { "id": 1242, "type": 0, "count": 20 }
+  },
+  "8": {
+    "idx": 8,
+    "dailyAward": [],
+    "Ybprice": 70,
+    "superRightLV": 4,
+    "name": "紫卡",
+    "ViewType": 2,
+    "buyAward": [
+      { "id": 929, "type": 0, "count": 1 },
+      { "id": 976, "type": 0, "count": 1 },
+      { "id": 852, "type": 0, "count": 30 },
+      { "id": 250, "type": 0, "count": 2 },
+      { "id": 853, "type": 0, "count": 450 },
+      { "id": 854, "type": 0, "count": 450 }
+    ],
+    "pictures": ["tq_p_4_2", "tq_p_4_1", "tq_p_3_2"],
+    "consume": { "id": 1242, "type": 0, "count": 70 }
+  },
+  "9": {
+    "idx": 9,
+    "dailyAward": [],
+    "Ybprice": 220,
+    "superRightLV": 5,
+    "name": "橙卡",
+    "ViewType": 2,
+    "heraldid": "tq_btnt14_2",
+    "buyAward": [
+      { "id": 930, "type": 0, "count": 1 },
+      { "id": 824, "type": 0, "count": 1 },
+      { "id": 953, "type": 0, "count": 14 },
+      { "id": 977, "type": 0, "count": 1 },
+      { "id": 300, "type": 0, "count": 50 },
+      { "id": 250, "type": 0, "count": 10 }
+    ],
+    "pictures": ["tq_p_5_2", "tq_p_5_1", "tq_p_5_3"],
+    "consume": { "id": 1242, "type": 0, "count": 220 }
+  },
+  "10": { "idx": 10, "name": "首充卡", "superRightLV": -1 },
+  "11": { "idx": 11, "name": "白卡" },
+  "12": {
+    "idx": 12,
+    "dailyAward": [],
+    "Ybprice": 250,
+    "superRightLV": 6,
+    "displaylimit": { "openDay": 1, "vip": 0 ,"zsLevel":11},
+    "name": "橙星",
+    "ViewType": 2,
+    "heraldid": "tq_btnt14_4",
+    "buyAward": [
+      { "id": 1073, "type": 0, "count": 1 },
+      { "id": 1146, "type": 0, "count": 1 },
+      { "id": 1066, "type": 0, "count": 300 },
+      { "id": 1115, "type": 0, "count": 1 },
+      { "id": 970, "type": 0, "count": 666 },
+      { "id": 300, "type": 0, "count": 100 }
+    ],
+    "pictures": ["tq_p_6_2", "tq_p_6_1", "tq_p_6_3"],
+    "consume": { "id": 1242, "type": 0, "count": 250 }
+  },
+  "13": {
+    "idx": 13,
+    "dailyAward": [],
+    "Ybprice": 350,
+    "superRightLV": 7,
+    "displaylimit": { "openDay": 1, "vip": 0,"zsLevel":12},
+    "name": "橙月",
+    "ViewType": 2,
+    "heraldid": "tq_btnt14_3",
+    "buyAward": [
+      { "id": 1273, "type": 0, "count": 1 },
+      { "id": 1272, "type": 0, "count": 1 },
+      { "id": 1241, "type": 0, "count": 1 },
+      { "id": 265, "type": 0, "count": 1888 },
+      { "id": 970, "type": 0, "count": 666 },
+      { "id": 852, "type": 0, "count": 158 }
+    ],
+    "pictures": ["tq_p_7_2", "tq_p_7_1", "tq_p_7_3"],
+    "consume": { "id": 1242, "type": 0, "count": 350 }
+  }
+}

configs/NumericalIcon.json

@@ -1 +1,170 @@
-{"1":{"id":1,"description":"行走玛法大陆哪里都需要金币，可兑换成绑定金币直接使用，也可通过私人交易赠送给其他玩家","name":"金币","icon":13009},"2":{"id":2,"description":"行走玛法大陆哪里都需要的绑定金币，可购买商城所有道具","name":"绑定金币","icon":13009},"3":{"id":3,"description":"回收装备、击败boss、参与游戏内活动都有机会获得，也可以通过元宝兑换获得；可在银两商城购买物品；与角色绑定","name":"银两","icon":13131},"4":{"id":4,"description":"充值获得；可在元宝商场，寄售行购买物品；也可以通过私人交易赠送给其他玩家","name":"元宝","icon":13123},"5":{"id":5,"description":"经验值：用于提升角色等级","name":"经验值","icon":13127},"6":{"id":6,"description":"转生修为：用于提升转生级别","name":"转生修为","icon":13332},"7":{"id":7,"description":"飞鞋点数：使用飞鞋时需要消耗","name":"飞鞋点数","icon":13132},"8":{"id":8,"description":"喇叭次数：在世界频道发言需要消耗","name":"喇叭点数","icon":13074},"9":{"id":9,"description":"回收积分：回收极品属性装备时获得的积分，可用于兑换物品","name":"回收积分","icon":13134},"10":{"id":10,"description":"行会贡献：完成行会捐献获得的奖励，可在行会商城购买物品","name":"行会贡献","icon":13135},"11":{"id":11,"description":"声望","name":"声望","icon":13160},"12":{"id":12,"description":"活跃度","name":"活跃度","icon":13161},"13":{"id":13,"description":"多倍经验：打怪获得额外10倍经验，多倍经验使用期间不增加当日基础经验累计获得上限(也不触发衰减)","name":"多倍经验","icon":13162},"14":{"id":14,"description":"经验值：用于提升角色等级","name":"当前基础经验值","icon":13135},"15":{"id":15,"description":"神装BOSS挑战次数","name":"神装BOSS挑战次数","icon":13135},"16":{"id":16,"description":"称号","name":"称号ID","icon":13135},"17":{"id":17,"description":"战令积分：通过完成战令任务获得的积分，积分达到要求后即可升级战令等级","name":"战令积分","icon":13292},"18":{"id":18,"description":"增加神魔之体所有条目祝福值，可提升神魔修炼成功率，祝福值达到10000后每次修炼必成","name":"神魔保险祝福值","icon":13292},"19":{"id":19,"description":"交易额度：【交易额度】支付元宝(寄售行、自由交易)需要消耗额度。充值可提升交易额度","name":"交易额度","icon":13161},"20":{"id":20,"description":"战令币：通过完成战令任务获得的珍贵货币，每期战令活动结束后都会被清空，请及时使用","name":"战令币","icon":13546},"21":{"id":21,"description":"次元钥匙：每天自动获得3枚，也可以通过道具获得。可用于开启跨服次元首领获得的宝箱。","name":"次元钥匙","icon":13066},"22":{"id":22,"description":"复活特权：拥有此特权，参加活动时复活时间减半","name":"复活特权","icon":13066},"23":{"id":23,"description":"宠物","name":"宠物","icon":13066},"24":{"id":24,"description":"个性称号","name":"个性称号ID","icon":13135},"25":{"id":25,"description":"秘境宝箱","name":"秘境宝箱","icon":13066},"26":{"id":26,"description":"字诀宝箱","name":"字诀宝箱","icon":13066},"27":{"id":27,"description":"材料宝箱","name":"材料宝箱","icon":13066},"120":{"id":120,"description":"行会资金","name":"行会资金","icon":13066}}
+{
+    "1": {
+        "id": 1,
+        "description": "行走玛法大陆哪里都需要金币，可兑换成绑定金币直接使用，也可通过私人交易赠送给其他玩家",
+        "name": "金币",
+        "icon": 13009
+    },
+    "2": {
+        "id": 2,
+        "description": "行走玛法大陆哪里都需要的绑定金币，可购买商城所有道具",
+        "name": "绑定金币",
+        "icon": 13009
+    },
+    "3": {
+        "id": 3,
+        "description": "回收装备、击败boss、参与游戏内活动都有机会获得，也可以通过元宝兑换获得；可在银两商城购买物品；与角色绑定",
+        "name": "银两",
+        "icon": 13131
+    },
+    "4": {
+        "id": 4,
+        "description": "充值获得；可在元宝商场，寄售行购买物品；也可以通过私人交易赠送给其他玩家",
+        "name": "元宝",
+        "icon": 13123
+    },
+    "5": {
+        "id": 5,
+        "description": "经验值：用于提升角色等级",
+        "name": "经验值",
+        "icon": 13127
+    },
+    "6": {
+        "id": 6,
+        "description": "转生修为：用于提升转生级别",
+        "name": "转生修为",
+        "icon": 13332
+    },
+    "7": {
+        "id": 7,
+        "description": "飞鞋点数：使用飞鞋时需要消耗",
+        "name": "飞鞋点数",
+        "icon": 13132
+    },
+    "8": {
+        "id": 8,
+        "description": "喇叭次数：在世界频道发言需要消耗",
+        "name": "喇叭点数",
+        "icon": 13074
+    },
+    "9": {
+        "id": 9,
+        "description": "回收积分：回收极品属性装备时获得的积分，可用于兑换物品",
+        "name": "回收积分",
+        "icon": 13134
+    },
+    "10": {
+        "id": 10,
+        "description": "行会贡献：完成行会捐献获得的奖励，可在行会商城购买物品",
+        "name": "行会贡献",
+        "icon": 13135
+    },
+    "11": {
+        "id": 11,
+        "description": "声望",
+        "name": "声望",
+        "icon": 13160
+    },
+    "12": {
+        "id": 12,
+        "description": "活跃度",
+        "name": "活跃度",
+        "icon": 13161
+    },
+    "13": {
+        "id": 13,
+        "description": "多倍经验：打怪获得额外10倍经验，多倍经验使用期间不增加当日基础经验累计获得上限(也不触发衰减)",
+        "name": "多倍经验",
+        "icon": 13162
+    },
+    "14": {
+        "id": 14,
+        "description": "经验值：用于提升角色等级",
+        "name": "当前基础经验值",
+        "icon": 13135
+    },
+    "15": {
+        "id": 15,
+        "description": "神装BOSS挑战次数",
+        "name": "神装BOSS挑战次数",
+        "icon": 13135
+    },
+    "16": {
+        "id": 16,
+        "description": "称号",
+        "name": "称号ID",
+        "icon": 13135
+    },
+    "17": {
+        "id": 17,
+        "description": "战令积分：通过完成战令任务获得的积分，积分达到要求后即可升级战令等级",
+        "name": "战令积分",
+        "icon": 13292
+    },
+    "18": {
+        "id": 18,
+        "description": "增加神魔之体所有条目祝福值，可提升神魔修炼成功率，祝福值达到10000后每次修炼必成",
+        "name": "神魔保险祝福值",
+        "icon": 13292
+    },
+    "19": {
+        "id": 19,
+        "description": "交易额度：【交易额度】支付元宝(寄售行、自由交易)需要消耗额度。充值可提升交易额度",
+        "name": "交易额度",
+        "icon": 13161
+    },
+    "20": {
+        "id": 20,
+        "description": "战令币：通过完成战令任务获得的珍贵货币，每期战令活动结束后都会被清空，请及时使用",
+        "name": "战令币",
+        "icon": 13546
+    },
+    "21": {
+        "id": 21,
+        "description": "次元钥匙：每天自动获得3枚，也可以通过道具获得。可用于开启跨服次元首领获得的宝箱。",
+        "name": "次元钥匙",
+        "icon": 13066
+    },
+    "22": {
+        "id": 22,
+        "description": "复活特权：拥有此特权，参加活动时复活时间减半",
+        "name": "复活特权",
+        "icon": 13066
+    },
+    "23": {
+        "id": 23,
+        "description": "宠物",
+        "name": "宠物",
+        "icon": 13066
+    },
+    "24": {
+        "id": 24,
+        "description": "个性称号",
+        "name": "个性称号ID",
+        "icon": 13135
+    },
+    "25": {
+        "id": 25,
+        "description": "秘境宝箱",
+        "name": "秘境宝箱",
+        "icon": 13066
+    },
+    "26": {
+        "id": 26,
+        "description": "字诀宝箱",
+        "name": "字诀宝箱",
+        "icon": 13066
+    },
+    "27": {
+        "id": 27,
+        "description": "材料宝箱",
+        "name": "材料宝箱",
+        "icon": 13066
+    },
+    "120": {
+        "id": 120,
+        "description": "行会资金",
+        "name": "行会资金",
+        "icon": 13066
+    }
+}

configs/ServerInfoConfig.json

@@ -1 +1,26 @@
-{"1":{"openserverday":1,"ServerInfo":"当前版本：开服-盟重称王\n升到|C:0x2eb52d&T:24级|，就可以加入行会，和朋友们一起闯荡玛法\n升到|C:0x2eb52d&T:28级|可以挑战|C:0x318aff&T:世界BOSS|，每天19:30哦\n开服第1天起，每日黄金时间20点，各种好玩活动等着你\n|C:0x2eb52d&T:每周四、周日||C:0x318aff&T:独闯天涯|，比比谁是速度最快的除魔猎手\n|C:0x2eb52d&T:每周一、周三、周五||C:0x318aff&T:夜战沃玛三|，随机阵营激情无限，PK抢积分\n|C:0x2eb52d&T:每周二、周六||C:0x318aff&T:竞技大乱斗|，没有朋友任意PK，坚持到最后才是王者\n开服第2天起，星王首饰、二阶魔器、高转材料爆率全开，就等你来爆\n开服第2天，更多|C:0x318aff&T:经典BOSS|等你来挑战！|C:0xda1e00&T:魔龙特使|带着它的小弟|C:0xda1e00&T:绿魔蜘蛛|出现在地下宫殿长廊，更有可怕的特权BOSS|C:0xda1e00&T:赤月恶魔|来袭\n开服第3天开启|C:0x318aff&T:重装BOSS|，六大重装地图|C:0xf56f00&T:困惑殿堂|、|C:0xf56f00&T:堕落坟场|、|C:0xf56f00&T:深渊魔域|、|C:0xf56f00&T:地狱烈焰|、|C:0xf56f00&T:死亡神殿|、|C:0xf56f00&T:钳虫巢穴|等你探索\n开服第4天开放狂风神戒，参加|C:0x318aff&T:竞技大乱斗|也有机会获得狂风碎片\n开服第4天起，参加|C:0x318aff&T:世界BOSS|竟然还有机会开出四象佩饰\n开服第5天起，星王神兵圣甲爆率全开，开天、镇天、玄天、凤天魔甲即将拥有\n开服第3天起，每周三、周六|C:0x318aff&T:沙巴克攻城|活动上线，千军万马竞逐玛法最高行会荣誉，本服头沙花落谁家？\n\n\n下一版本：进阶-迈向天空之城（开服第8天）"},"8":{"openserverday":8,"ServerInfo":"当前版本：进阶-迈向天空之城\n角色|C:0x2eb52d&T:4转|，就可以前往天空之城，在|C:0xf56f00&T:东西关|多打点装备，就朝着更高阶的地图挑战吧\n开服第8天开放虹魔神戒，参加|C:0x318aff&T:夜战沃玛三|也有机会获得虹魔碎片\n开服第10天起，炎之星王首饰、三阶魔器爆率全开，就看你有没有好运气了\n开服第14天起，四象佩饰爆率全开，就看你有没有好运气了\n\n\n下一版本：挑战-决胜跨服（开服第25天）"},"25":{"openserverday":25,"ServerInfo":"当前版本：挑战-决胜跨服\n天空之城地图很多，不过你的目标当然是|C:0xf56f00&T:太行山|。在前期地图积累好等级、转生、装备，才能去终极地图挑战\n开服第25天起，跨服战场全面升级，跨服等级上限180级。跨服行会开启，谁能成为跨服城主？\n开服第25天起，跨服秘境打宝开放，获取字诀就在此刻\n开服第25天起，一品证明爆率全开，提升官职更高更强\n开服第28天起，王者神兵圣甲（5转以上地图）爆率开启，酷炫武器衣服即将拥有\n开服第30天起，救主灵刃（5转以上地图）爆率开启，神秘的兵魂揭开面纱\n开服第30天起，兵甲结晶开放爆率，天之神兵圣甲的威力，让你难以置信！\n开服第35天起，黄色桑巴（6转以上地图）爆率全开，南美旋风即将来袭\n开服第38天起，狂风碎片（6转以上地图）爆率开启\n开服第35天起，王者首饰爆率开启\n\n\n下一版本：突破-冲向迷失之城（开服第1天）"},"50":{"openserverday":50,"ServerInfo":"当前版本：突破-冲向迷失之城\n角色|C:0x2eb52d&T:1转|，就可以前往迷失之城，楼兰和龙门窟有的是未发现的宝藏，问题是：你做好充分的准备了吗？\n开服第45天起，炎王者首饰（11转以上地图）爆率开启\n开服第1天，金牛级神兵圣甲开放合成\n开服第60天起，天星神装和散件开放合成\n开服第65天起，虹魔戒指（7转以上地图）爆率开启\n开服第65天起，内功装备银针、心决、金印、檀珠现世，爆率开启\n开服第70天起，炼狱转生材料（8转以上地图）爆率开启\n开服第70天起，9转地图龙门窟开放\n\n\n下一版本：皓月-新兵甲来袭（开服第85天）"},"85":{"openserverday":85,"ServerInfo":"当前版本：传奇-新兵甲来袭\n开服第85天，跨服战场终极组，最高挑战开始\n开服第85天，天之皓月神兵圣甲开放合成\n开服第85天起，炎之王者首饰爆率全面提升\n\n\n下一版本：？？？"}}
+{
+    "1": {
+        "openserverday": 90,
+        "ServerInfo": "当前版本：开服-盟重称王\n升到|C:0x2eb52d&T:24级|，就可以加入行会，和朋友们一起闯荡玛法\n升到|C:0x2eb52d&T:28级|可以挑战|C:0x318aff&T:世界BOSS|，每天19:30哦\n开服第1天起，每日黄金时间20点，各种好玩活动等着你\n|C:0x2eb52d&T:每周四、周日||C:0x318aff&T:独闯天涯|，比比谁是速度最快的除魔猎手\n|C:0x2eb52d&T:每周一、周三、周五||C:0x318aff&T:夜战沃玛三|，随机阵营激情无限，PK抢积分\n|C:0x2eb52d&T:每周二、周六||C:0x318aff&T:竞技大乱斗|，没有朋友任意PK，坚持到最后才是王者\n开服第2天起，星王首饰、二阶魔器、高转材料爆率全开，就等你来爆\n开服第2天，更多|C:0x318aff&T:经典BOSS|等你来挑战！|C:0xda1e00&T:魔龙特使|带着它的小弟|C:0xda1e00&T:绿魔蜘蛛|出现在地下宫殿长廊，更有可怕的特权BOSS|C:0xda1e00&T:赤月恶魔|来袭\n开服第3天开启|C:0x318aff&T:重装BOSS|，六大重装地图|C:0xf56f00&T:困惑殿堂|、|C:0xf56f00&T:堕落坟场|、|C:0xf56f00&T:深渊魔域|、|C:0xf56f00&T:地狱烈焰|、|C:0xf56f00&T:死亡神殿|、|C:0xf56f00&T:钳虫巢穴|等你探索\n开服第4天开放狂风神戒，参加|C:0x318aff&T:竞技大乱斗|也有机会获得狂风碎片\n开服第4天起，参加|C:0x318aff&T:世界BOSS|竟然还有机会开出四象佩饰\n开服第5天起，星王神兵圣甲爆率全开，开天、镇天、玄天、凤天魔甲即将拥有\n开服第3天起，每周三、周六|C:0x318aff&T:沙巴克攻城|活动上线，千军万马竞逐玛法最高行会荣誉，本服头沙花落谁家？\n\n\n下一版本：进阶-迈向天空之城（开服第8天）"
+    },
+    "8": {
+        "openserverday": 8,
+        "ServerInfo": "当前版本：进阶-迈向天空之城\n角色|C:0x2eb52d&T:4转|，就可以前往天空之城，在|C:0xf56f00&T:东西关|多打点装备，就朝着更高阶的地图挑战吧\n开服第8天开放虹魔神戒，参加|C:0x318aff&T:夜战沃玛三|也有机会获得虹魔碎片\n开服第10天起，炎之星王首饰、三阶魔器爆率全开，就看你有没有好运气了\n开服第14天起，四象佩饰爆率全开，就看你有没有好运气了\n\n\n下一版本：挑战-决胜跨服（开服第25天）"
+    },
+    "25": {
+        "openserverday": 25,
+        "ServerInfo": "当前版本：挑战-决胜跨服\n天空之城地图很多，不过你的目标当然是|C:0xf56f00&T:太行山|。在前期地图积累好等级、转生、装备，才能去终极地图挑战\n开服第25天起，跨服战场全面升级，跨服等级上限180级。跨服行会开启，谁能成为跨服城主？\n开服第25天起，跨服秘境打宝开放，获取字诀就在此刻\n开服第25天起，一品证明爆率全开，提升官职更高更强\n开服第28天起，王者神兵圣甲（5转以上地图）爆率开启，酷炫武器衣服即将拥有\n开服第30天起，救主灵刃（5转以上地图）爆率开启，神秘的兵魂揭开面纱\n开服第30天起，兵甲结晶开放爆率，天之神兵圣甲的威力，让你难以置信！\n开服第35天起，黄色桑巴（6转以上地图）爆率全开，南美旋风即将来袭\n开服第38天起，狂风碎片（6转以上地图）爆率开启\n开服第35天起，王者首饰爆率开启\n\n\n下一版本：突破-冲向迷失之城（开服第1天）"
+    },
+    "50": {
+        "openserverday": 50,
+        "ServerInfo": "当前版本：突破-冲向迷失之城\n角色|C:0x2eb52d&T:1转|，就可以前往迷失之城，楼兰和龙门窟有的是未发现的宝藏，问题是：你做好充分的准备了吗？\n开服第45天起，炎王者首饰（11转以上地图）爆率开启\n开服第1天，金牛级神兵圣甲开放合成\n开服第60天起，天星神装和散件开放合成\n开服第65天起，虹魔戒指（7转以上地图）爆率开启\n开服第65天起，内功装备银针、心决、金印、檀珠现世，爆率开启\n开服第70天起，炼狱转生材料（8转以上地图）爆率开启\n开服第70天起，9转地图龙门窟开放\n\n\n下一版本：皓月-新兵甲来袭（开服第85天）"
+    },
+    "85": {
+        "openserverday": 85,
+        "ServerInfo": "当前版本：传奇-新兵甲来袭\n开服第85天，跨服战场终极组，最高挑战开始\n开服第85天，天之皓月神兵圣甲开放合成\n开服第85天起，炎之王者首饰爆率全面提升"
+    },
+    "90":{
+        "openserverday":90,
+        "ServerInfo":"当前版本：神临苍月\n 增加了苍月岛,封魔岛等高等级世界地图战场,挑战获取最高装备,圣宠\n 全面开启手打真充,开启跨服世界 \n\n\n\n 下个版本:神兵降临,新版神兵将降临,新的副本将开启新的冒险"
+    }
+}

configs/ShoptagConfig.json

@@ -1 +1,15 @@
-{"1":{"1":{"Tabshop":1,"name":"功能","title":"商城","dealtype":"兑换银两","shoptype":1,"tabname":"功能","sctype":2},"2":{"Tabshop":2,"name":"成长","title":"商城","dealtype":"兑换银两","shoptype":1,"tabname":"成长","sctype":2},"3":{"Tabshop":3,"name":"补给","title":"商城","dealtype":"兑换银两","shoptype":1,"tabname":"补给","sctype":2},"4":{"Tabshop":4,"name":"材料","title":"商城","dealtype":"兑换银两","shoptype":1,"tabname":"材料","sctype":2},"5":{"Tabshop":5,"name":"时装","title":"商城","dealtype":"兑换银两","shoptype":1,"tabname":"时装","sctype":2},"6":{"Tabshop":6,"name":"打宝","title":"商城","dealtype":"兑换银两","shoptype":1,"tabname":"打宝","sctype":2},"7":{"Tabshop":7,"name":"圣物","title":"商城","dealtype":"兑换银两","shoptype":1,"tabname":"圣物","sctype":2}},"2":{"1":{"Tabshop":1,"name":"行会商店","dealtype":"","shoptype":2,"tabname":"行会商店","sctype":0}},"3":{"1":{"Tabshop":1,"name":"杂货","title":"小贩","dealtype":"兑换绑金","shoptype":3,"tabname":"杂货","sctype":1}},"4":{"1":{"Tabshop":1,"name":"杂货","title":"杂货铺","dealtype":"兑换绑金","shoptype":4,"tabname":"杂货","sctype":1}},"6":{"1":{"Tabshop":1,"name":"战令","dealtype":"","shoptype":6,"tabname":"战令","sctype":0}}}
+{
+  "1": {
+    "1": { "Tabshop": 1, "name": "功能", "title": "商城", "dealtype": "兑换银两", "shoptype": 1, "tabname": "功能", "sctype": 2 },
+    "2": { "Tabshop": 2, "name": "成长", "title": "商城", "dealtype": "兑换银两", "shoptype": 1, "tabname": "成长", "sctype": 2 },
+    "3": { "Tabshop": 3, "name": "补给", "title": "商城", "dealtype": "兑换银两", "shoptype": 1, "tabname": "补给", "sctype": 2 },
+    "4": { "Tabshop": 4, "name": "材料", "title": "商城", "dealtype": "兑换银两", "shoptype": 1, "tabname": "材料", "sctype": 2 },
+    "5": { "Tabshop": 5, "name": "时装", "title": "商城", "dealtype": "兑换银两", "shoptype": 1, "tabname": "时装", "sctype": 2 },
+    "6": { "Tabshop": 6, "name": "打宝", "title": "商城", "dealtype": "兑换银两", "shoptype": 1, "tabname": "打宝", "sctype": 2 },
+    "7": { "Tabshop": 7, "name": "圣物", "title": "商城", "dealtype": "兑换银两", "shoptype": 1, "tabname": "圣物", "sctype": 2 }
+  },
+  "2": { "1": { "Tabshop": 1, "name": "行会商店", "dealtype": "", "shoptype": 2, "tabname": "行会商店", "sctype": 0 } },
+  "3": { "1": { "Tabshop": 1, "name": "杂货", "title": "小贩", "dealtype": "兑换绑金", "shoptype": 3, "tabname": "杂货", "sctype": 1 } },
+  "4": { "1": { "Tabshop": 1, "name": "杂货", "title": "杂货铺", "dealtype": "兑换绑金", "shoptype": 4, "tabname": "杂货", "sctype": 1 } },
+  "6": { "1": { "Tabshop": 1, "name": "战令", "dealtype": "", "shoptype": 6, "tabname": "战令", "sctype": 0 } }
+}

configs/ShowActivityidConfig.json

@@ -1 +1,9 @@
-{"1":{"actID":1,"actIDArr":[7],"btnName":"送宝"},"2":{"actID":2,"actIDArr":[7],"btnName":"领取夺宝战宝箱"},"3":{"actID":3,"actIDArr":[8],"btnName":"送宝"},"4":{"actID":4,"actIDArr":[8],"btnName":"领取夺宝战宝箱"},"5":{"actID":5,"actIDArr":[12],"btnName":"领取独闯天涯礼包"},"6":{"actID":6,"actIDArr":[12],"btnName":"领取神速礼包"}}
+{
+  "1": { "actID": 1, "actIDArr": [7], "btnName": "送宝" },
+  "2": { "actID": 2, "actIDArr": [7], "btnName": "领取夺宝战宝箱" },
+  "3": { "actID": 3, "actIDArr": [8], "btnName": "送宝" },
+  "4": { "actID": 4, "actIDArr": [8], "btnName": "领取夺宝战宝箱" },
+  "5": { "actID": 5, "actIDArr": [12], "btnName": "领取独闯天涯礼包" },
+  "6": { "actID": 6, "actIDArr": [12], "btnName": "领取神速礼包" },
+  "7": { "actID": 7, "actIDArr": [1818], "btnName": "拜年红包" }
+}

configs/UpstarPriceConfig.json

@@ -1 +1,5 @@
-{"852":{"id":2,"itemid":852,"price":50},"954":{"id":1,"itemid":954,"price":10}}
+{
+  "852": { "id": 2, "itemid": 852, "price": 50 },
+  "954": { "id": 1, "itemid": 954, "price": 10 },
+  "845": { "id": 1, "itemid": 845, "price": 1000 }
+}

configs/lootPetConfig.json

@@ -1 +1,428 @@
-{"1":{"1":{"attr":[{"value":0,"type":21},{"value":1,"type":23},{"value":0,"type":25},{"value":1,"type":27}],"type":1,"nameIcon":"pet006_name","id":1,"PetTime":259200,"PetStr":"自动拾取范围：7*7","nDropPetLootDistance":3,"icon":"pet006","PetName":"多角虫"},"5":{"attr":[{"value":0,"type":21},{"value":1,"type":23},{"value":0,"type":25},{"value":1,"type":27}],"type":1,"nameIcon":"pet006_name","id":5,"PetTime":604800,"PetStr":"自动拾取范围：7*7","nDropPetLootDistance":3,"icon":"pet006","PetName":"多角虫"},"9":{"attr":[{"value":0,"type":21},{"value":1,"type":23},{"value":0,"type":25},{"value":1,"type":27}],"type":1,"nameIcon":"pet006_name","id":9,"PetTime":86400,"PetStr":"自动拾取范围：7*7","nDropPetLootDistance":3,"icon":"pet006","PetName":"多角虫"},"13":{"attr":[{"value":0,"type":21},{"value":1,"type":23},{"value":0,"type":25},{"value":1,"type":27}],"type":1,"nameIcon":"pet006_name","id":13,"PetTime":3600,"PetStr":"自动拾取范围：7*7","nDropPetLootDistance":3,"icon":"pet006","PetName":"多角虫"},"17":{"attr":[{"value":0,"type":21},{"value":1,"type":23},{"value":0,"type":25},{"value":1,"type":27}],"type":1,"nameIcon":"pet006_name","id":17,"PetTime":10800,"PetStr":"自动拾取范围：7*7","nDropPetLootDistance":3,"icon":"pet006","PetName":"多角虫"}},"2":{"2":{"attr":[{"value":500,"type":140}],"type":2,"nameIcon":"pet007_name","id":2,"PetTime":259200,"PetStr":"自动拾取范围：7*7","nDropPetLootDistance":3,"icon":"pet007","PetName":"雪狼"},"6":{"attr":[{"value":500,"type":140}],"type":2,"nameIcon":"pet007_name","id":6,"PetTime":604800,"PetStr":"自动拾取范围：7*7","nDropPetLootDistance":3,"icon":"pet007","PetName":"雪狼"},"10":{"attr":[{"value":500,"type":140}],"type":2,"nameIcon":"pet007_name","id":10,"PetTime":86400,"PetStr":"自动拾取范围：7*7","nDropPetLootDistance":3,"icon":"pet007","PetName":"雪狼"},"14":{"attr":[{"value":500,"type":140}],"type":2,"nameIcon":"pet007_name","id":14,"PetTime":3600,"PetStr":"自动拾取范围：7*7","nDropPetLootDistance":3,"icon":"pet007","PetName":"雪狼"},"18":{"attr":[{"value":500,"type":140}],"type":2,"nameIcon":"pet007_name","id":18,"PetTime":10800,"PetStr":"自动拾取范围：7*7","nDropPetLootDistance":3,"icon":"pet007","PetName":"雪狼"}},"3":{"3":{"attr":[{"value":1,"type":76},{"value":3,"type":77}],"type":3,"nameIcon":"pet001_name","id":3,"PetTime":259200,"PetStr":"自动拾取范围：7*7","nDropPetLootDistance":3,"icon":"pet001","PetName":"大眼鹰"},"7":{"attr":[{"value":1,"type":76},{"value":3,"type":77}],"type":3,"nameIcon":"pet001_name","id":7,"PetTime":604800,"PetStr":"自动拾取范围：7*7","nDropPetLootDistance":3,"icon":"pet001","PetName":"大眼鹰"},"11":{"attr":[{"value":1,"type":76},{"value":3,"type":77}],"type":3,"nameIcon":"pet001_name","id":11,"PetTime":86400,"PetStr":"自动拾取范围：7*7","nDropPetLootDistance":3,"icon":"pet001","PetName":"大眼鹰"},"15":{"attr":[{"value":1,"type":76},{"value":3,"type":77}],"type":3,"nameIcon":"pet001_name","id":15,"PetTime":3600,"PetStr":"自动拾取范围：7*7","nDropPetLootDistance":3,"icon":"pet001","PetName":"大眼鹰"},"19":{"attr":[{"value":1,"type":76},{"value":3,"type":77}],"type":3,"nameIcon":"pet001_name","id":19,"PetTime":10800,"PetStr":"自动拾取范围：7*7","nDropPetLootDistance":3,"icon":"pet001","PetName":"大眼鹰"}},"4":{"4":{"attr":[{"value":100,"type":54}],"type":4,"nameIcon":"pet004_name","id":4,"PetTime":259200,"PetStr":"自动拾取范围：7*7","nDropPetLootDistance":3,"icon":"pet004","PetName":"小火灵"},"8":{"attr":[{"value":100,"type":54}],"type":4,"nameIcon":"pet004_name","id":8,"PetTime":604800,"PetStr":"自动拾取范围：7*7","nDropPetLootDistance":3,"icon":"pet004","PetName":"小火灵"},"12":{"attr":[{"value":100,"type":54}],"type":4,"nameIcon":"pet004_name","id":12,"PetTime":86400,"PetStr":"自动拾取范围：7*7","nDropPetLootDistance":3,"icon":"pet004","PetName":"小火灵"},"16":{"attr":[{"value":100,"type":54}],"type":4,"nameIcon":"pet004_name","id":16,"PetTime":3600,"PetStr":"自动拾取范围：7*7","nDropPetLootDistance":3,"icon":"pet004","PetName":"小火灵"},"20":{"attr":[{"value":100,"type":54}],"type":4,"nameIcon":"pet004_name","id":20,"PetTime":10800,"PetStr":"自动拾取范围：7*7","nDropPetLootDistance":3,"icon":"pet004","PetName":"小火灵"}}}
+{
+    "1": {
+        "1": {
+            "attr": [
+                {
+                    "value": 0,
+                    "type": 21
+                },
+                {
+                    "value": 1,
+                    "type": 23
+                },
+                {
+                    "value": 0,
+                    "type": 25
+                },
+                {
+                    "value": 1,
+                    "type": 27
+                }
+            ],
+            "type": 1,
+            "nameIcon": "pet006_name",
+            "id": 1,
+            "PetTime": 259200,
+            "PetStr": "自动拾取范围：20*20",
+            "nDropPetLootDistance": 10,
+            "icon": "pet006",
+            "PetName": "多角虫"
+        },
+        "5": {
+            "attr": [
+                {
+                    "value": 0,
+                    "type": 21
+                },
+                {
+                    "value": 1,
+                    "type": 23
+                },
+                {
+                    "value": 0,
+                    "type": 25
+                },
+                {
+                    "value": 1,
+                    "type": 27
+                }
+            ],
+            "type": 1,
+            "nameIcon": "pet006_name",
+            "id": 5,
+            "PetTime": 604800,
+            "PetStr": "自动拾取范围：20*20",
+            "nDropPetLootDistance": 10,
+            "icon": "pet006",
+            "PetName": "多角虫"
+        },
+        "9": {
+            "attr": [
+                {
+                    "value": 0,
+                    "type": 21
+                },
+                {
+                    "value": 1,
+                    "type": 23
+                },
+                {
+                    "value": 0,
+                    "type": 25
+                },
+                {
+                    "value": 1,
+                    "type": 27
+                }
+            ],
+            "type": 1,
+            "nameIcon": "pet006_name",
+            "id": 9,
+            "PetTime": 86400,
+            "PetStr": "自动拾取范围：20*20",
+            "nDropPetLootDistance": 10,
+            "icon": "pet006",
+            "PetName": "多角虫"
+        },
+        "13": {
+            "attr": [
+                {
+                    "value": 0,
+                    "type": 21
+                },
+                {
+                    "value": 1,
+                    "type": 23
+                },
+                {
+                    "value": 0,
+                    "type": 25
+                },
+                {
+                    "value": 1,
+                    "type": 27
+                }
+            ],
+            "type": 1,
+            "nameIcon": "pet006_name",
+            "id": 13,
+            "PetTime": 3600,
+            "PetStr": "自动拾取范围：20*20",
+            "nDropPetLootDistance": 10,
+            "icon": "pet006",
+            "PetName": "多角虫"
+        },
+        "17": {
+            "attr": [
+                {
+                    "value": 0,
+                    "type": 21
+                },
+                {
+                    "value": 1,
+                    "type": 23
+                },
+                {
+                    "value": 0,
+                    "type": 25
+                },
+                {
+                    "value": 1,
+                    "type": 27
+                }
+            ],
+            "type": 1,
+            "nameIcon": "pet006_name",
+            "id": 17,
+            "PetTime": 10800,
+            "PetStr": "自动拾取范围：20*20",
+            "nDropPetLootDistance": 10,
+            "icon": "pet006",
+            "PetName": "多角虫"
+        }
+    },
+    "2": {
+        "2": {
+            "attr": [
+                {
+                    "value": 500,
+                    "type": 140
+                }
+            ],
+            "type": 2,
+            "nameIcon": "pet007_name",
+            "id": 2,
+            "PetTime": 259200,
+            "PetStr": "自动拾取范围：20*20",
+            "nDropPetLootDistance": 10,
+            "icon": "pet007",
+            "PetName": "雪狼"
+        },
+        "6": {
+            "attr": [
+                {
+                    "value": 500,
+                    "type": 140
+                }
+            ],
+            "type": 2,
+            "nameIcon": "pet007_name",
+            "id": 6,
+            "PetTime": 604800,
+            "PetStr": "自动拾取范围：20*20",
+            "nDropPetLootDistance": 10,
+            "icon": "pet007",
+            "PetName": "雪狼"
+        },
+        "10": {
+            "attr": [
+                {
+                    "value": 500,
+                    "type": 140
+                }
+            ],
+            "type": 2,
+            "nameIcon": "pet007_name",
+            "id": 10,
+            "PetTime": 86400,
+            "PetStr": "自动拾取范围：20*20",
+            "nDropPetLootDistance": 10,
+            "icon": "pet007",
+            "PetName": "雪狼"
+        },
+        "14": {
+            "attr": [
+                {
+                    "value": 500,
+                    "type": 140
+                }
+            ],
+            "type": 2,
+            "nameIcon": "pet007_name",
+            "id": 14,
+            "PetTime": 3600,
+            "PetStr": "自动拾取范围：20*20",
+            "nDropPetLootDistance": 10,
+            "icon": "pet007",
+            "PetName": "雪狼"
+        },
+        "18": {
+            "attr": [
+                {
+                    "value": 500,
+                    "type": 140
+                }
+            ],
+            "type": 2,
+            "nameIcon": "pet007_name",
+            "id": 18,
+            "PetTime": 10800,
+            "PetStr": "自动拾取范围：20*20",
+            "nDropPetLootDistance": 10,
+            "icon": "pet007",
+            "PetName": "雪狼"
+        }
+    },
+    "3": {
+        "3": {
+            "attr": [
+                {
+                    "value": 1,
+                    "type": 76
+                },
+                {
+                    "value": 3,
+                    "type": 77
+                }
+            ],
+            "type": 3,
+            "nameIcon": "pet001_name",
+            "id": 3,
+            "PetTime": 259200,
+            "PetStr": "自动拾取范围：20*20",
+            "nDropPetLootDistance": 10,
+            "icon": "pet001",
+            "PetName": "大眼鹰"
+        },
+        "7": {
+            "attr": [
+                {
+                    "value": 1,
+                    "type": 76
+                },
+                {
+                    "value": 3,
+                    "type": 77
+                }
+            ],
+            "type": 3,
+            "nameIcon": "pet001_name",
+            "id": 7,
+            "PetTime": 604800,
+            "PetStr": "自动拾取范围：20*20",
+            "nDropPetLootDistance": 10,
+            "icon": "pet001",
+            "PetName": "大眼鹰"
+        },
+        "11": {
+            "attr": [
+                {
+                    "value": 1,
+                    "type": 76
+                },
+                {
+                    "value": 3,
+                    "type": 77
+                }
+            ],
+            "type": 3,
+            "nameIcon": "pet001_name",
+            "id": 11,
+            "PetTime": 86400,
+            "PetStr": "自动拾取范围：20*20",
+            "nDropPetLootDistance": 10,
+            "icon": "pet001",
+            "PetName": "大眼鹰"
+        },
+        "15": {
+            "attr": [
+                {
+                    "value": 1,
+                    "type": 76
+                },
+                {
+                    "value": 3,
+                    "type": 77
+                }
+            ],
+            "type": 3,
+            "nameIcon": "pet001_name",
+            "id": 15,
+            "PetTime": 3600,
+            "PetStr": "自动拾取范围：20*20",
+            "nDropPetLootDistance": 10,
+            "icon": "pet001",
+            "PetName": "大眼鹰"
+        },
+        "19": {
+            "attr": [
+                {
+                    "value": 1,
+                    "type": 76
+                },
+                {
+                    "value": 3,
+                    "type": 77
+                }
+            ],
+            "type": 3,
+            "nameIcon": "pet001_name",
+            "id": 19,
+            "PetTime": 10800,
+            "PetStr": "自动拾取范围：20*20",
+            "nDropPetLootDistance": 10,
+            "icon": "pet001",
+            "PetName": "大眼鹰"
+        }
+    },
+    "4": {
+        "4": {
+            "attr": [
+                {
+                    "value": 100,
+                    "type": 54
+                }
+            ],
+            "type": 4,
+            "nameIcon": "pet004_name",
+            "id": 4,
+            "PetTime": 259200,
+            "PetStr": "自动拾取范围：20*20",
+            "nDropPetLootDistance": 10,
+            "icon": "pet004",
+            "PetName": "小火灵"
+        },
+        "8": {
+            "attr": [
+                {
+                    "value": 100,
+                    "type": 54
+                }
+            ],
+            "type": 4,
+            "nameIcon": "pet004_name",
+            "id": 8,
+            "PetTime": 604800,
+            "PetStr": "自动拾取范围：20*20",
+            "nDropPetLootDistance": 10,
+            "icon": "pet004",
+            "PetName": "小火灵"
+        },
+        "12": {
+            "attr": [
+                {
+                    "value": 100,
+                    "type": 54
+                }
+            ],
+            "type": 4,
+            "nameIcon": "pet004_name",
+            "id": 12,
+            "PetTime": 86400,
+            "PetStr": "自动拾取范围：20*20",
+            "nDropPetLootDistance": 10,
+            "icon": "pet004",
+            "PetName": "小火灵"
+        },
+        "16": {
+            "attr": [
+                {
+                    "value": 100,
+                    "type": 54
+                }
+            ],
+            "type": 4,
+            "nameIcon": "pet004_name",
+            "id": 16,
+            "PetTime": 3600,
+            "PetStr": "自动拾取范围：20*20",
+            "nDropPetLootDistance": 10,
+            "icon": "pet004",
+            "PetName": "小火灵"
+        },
+        "20": {
+            "attr": [
+                {
+                    "value": 100,
+                    "type": 54
+                }
+            ],
+            "type": 4,
+            "nameIcon": "pet004_name",
+            "id": 20,
+            "PetTime": 10800,
+            "PetStr": "自动拾取范围：20*20",
+            "nDropPetLootDistance": 10,
+            "icon": "pet004",
+            "PetName": "小火灵"
+        }
+    },
+    "5": {
+        "21": {
+            "attr": [
+                {
+                    "value": 10000,
+                    "type": 75
+                }
+            ],
+            "type": 5,
+            "nameIcon": "pet002_name",
+            "id": 21,
+            "PetTime": 31536000,
+            "PetStr": "自动拾取范围：50*50",
+            "nDropPetLootDistance": 25,
+            "icon": "pet002",
+            "PetName": "黄金宸龙"
+        }
+    }
+}

deploy.js

@@ -4,7 +4,7 @@ const zip = require("./zip.js")
 const start = () => {
   zip.start().then(() => {
     const tar = new JSZip();
-    ['config.xml', 'api.php', 'linuxdo.php','login.php'].forEach(e => {
+    ['config.xml', 'api.php', 'linuxdo.php','login.php','gameEui.json'].forEach(e => {
       const file = fs.readFileSync(e)
       tar.file(e, file);
     })

gmItems.js

@@ -0,0 +1,27 @@
+const fs = require('fs')
+const path = require('path');
+const folderPath = "./configs"
+const props = ["id", "name"]
+function jsonToPhp(jsonObj, indent = '', linefeed = '\n') {
+    return Object.values(jsonObj).map(item => {
+        return `array(${props.map(e => `'${e}'=>${typeof (v = item[e]) == 'string' ? `'${v}'` : v}`).join(",")})`
+    }).join(",\n")
+}
+const start = () => {
+    const files = fs.readdirSync(folderPath);
+
+    // 过滤出所有的 JSON 文件
+    const jsonFiles = files.filter(file => path.extname(file) === '.json').filter(file => ["StdItems"].map(e => `${e}.json`).includes(file));
+    fs.access("./gm", fs.constants.F_OK, err => {
+        if (err) {
+            fs.mkdirSync("./gm")
+        }
+    })
+    jsonFiles.forEach(file => {
+        const json = JSON.parse(fs.readFileSync(path.join(folderPath, file), 'utf8'))
+        const filename = path.basename(file, path.extname(file));
+        const luaConfig = `<?php\n $items=array(\n${jsonToPhp(json)}\n);`
+        fs.writeFileSync(`./gm/${filename}.php`, luaConfig);
+    });
+}
+start()

login.php

@@ -6,7 +6,7 @@
  * @wx        123456
  * @qq        123456
  -->
-<?php
+ <?php
 
 include 'config.php';
 
@@ -98,10 +98,14 @@ $stmt->store_result();
             	    我已阅读并同意 <a href="javascript:void(0);" id="agree_btn">用户协议及隐私协议<a/>
                 </div>
             	<a href="javascript:process_login();" id="submitButton" class="button fit">登 录</a>
-                <div style="display:flex;justify-content:center" id="linuxdoConnect">
-                    <div style="display:flex;align-items:center;flex-direction:column;gap:4px;cursor:pointer">
+                <div style="display:flex;justify-content:center;gap:8px;font-size:12px" >
+                    <div style="display:flex;align-items:center;flex-direction:column;gap:4px;cursor:pointer" id="linuxdoConnect">
                         <img src="static/img/linuxdo_logo.png" style="width:60px;height:60px" alt="Linux.Do登录"/>
-                        <div>Linux.do登录</div>
+                        <div>Linux.do</div>
+                    </div>
+                    <div style="display:flex;align-items:center;flex-direction:column;gap:4px;cursor:pointer" id="naixiConnect">
+                        <img src="https://forum.naixi.net/favicon.ico" style="width:60px;height:60px" alt="奶昔登录"/>
+                        <div>奶昔登录</div>
                     </div>
                 </div>
             	<div class="forget_password">
@@ -127,8 +131,13 @@ $stmt->store_result();
                 switchBtn = $('#switchBtn');
             const linuxdoConnect = $("#linuxdoConnect")
                   linuxdoConnect.click(()=>{
-                    location.href="https://connect.linux.do/oauth2/authorize?response_type=code&client_id=tfKevot5lSwB5A5gcqPQMMhaXDLjib0P"
+                    location.href="https://connect.linux.do/oauth2/authorize?response_type=code&client_id=fqAFU2cQVWtM3CiSLWZEzHb1nFw6evlY"
                   })
+            const naixiConnect = $("#naixiConnect")
+                  naixiConnect.click(()=>{
+                    location.href="https://auth.naixi.net/login/oauth/authorize?client_id=6c597d1551b868dce9fe&redirect_uri=http://cq.eb.cx/naixi_callback&response_type=code&scope=profile&state=STATE"
+                  })
+                  
             var isPhone = isMobile(),
                 agent_id = getQueryString('agent_id'),
                 codeOpen = <?=$_CONFIG['code_open']?>,

naixi_callback.php

@@ -0,0 +1,183 @@
+<?php
+
+// 奶昔论坛三方登录
+$_LINUXDO_CONNECT = [
+    'base'=>'https://auth.naixi.net',
+    'client_id' => '6c597d1551b868dce9fe',
+    'client_secret' => '065b759106ce704cb49082b9ebc790266f4e7105'
+];
+// cURL 函数
+function get_curl($url, $post = 0, $referer = 0, $cookie = 0, $header = 0, $ua = 0, $nobaody = 0, $addheader = 0)
+{
+    $ch = curl_init();
+    curl_setopt($ch, CURLOPT_URL, $url);
+    $httpheader[] = "Accept: */*";
+    $httpheader[] = "Accept-Encoding: gzip,deflate,sdch";
+    $httpheader[] = "Accept-Language: zh-CN,zh;q=0.8";
+    $httpheader[] = "Connection: close";
+    if ($header) {
+        $httpheader = array_merge($httpheader, $header);
+    }
+    curl_setopt($ch, CURLOPT_HTTPHEADER, $httpheader);
+    if ($post) {
+        curl_setopt($ch, CURLOPT_POST, 1);
+        curl_setopt($ch, CURLOPT_POSTFIELDS, $post);
+    }
+    if ($header) {
+        curl_setopt($ch, CURLOPT_HEADER, false);
+    }
+    if ($cookie) {
+        curl_setopt($ch, CURLOPT_COOKIE, $cookie);
+    }
+    if ($referer) {
+        if ($referer == 1) {
+            curl_setopt($ch, CURLOPT_REFERER, '');
+        } else {
+            curl_setopt($ch, CURLOPT_REFERER, $referer);
+        }
+    }
+    if ($ua) {
+        curl_setopt($ch, CURLOPT_USERAGENT, $ua);
+    } else {
+        curl_setopt($ch, CURLOPT_USERAGENT, "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36");
+    }
+    if ($nobaody) {
+        curl_setopt($ch, CURLOPT_NOBODY, 1);
+    }
+    curl_setopt($ch, CURLOPT_ENCODING, "gzip");
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+    $ret = curl_exec($ch);
+    curl_close($ch);
+    return $ret;
+}
+
+$code = $_GET['code'];
+$header = [];
+$post = http_build_query([
+    'grant_type' => 'authorization_code',
+    'code' => $code,
+    "client_id"=> $_LINUXDO_CONNECT["client_id"],
+    "client_secret"=> $_LINUXDO_CONNECT["client_secret"],
+]);
+
+$getTokenRes = get_curl($_LINUXDO_CONNECT["base"].'/api/login/oauth/access_token', $post, 0, 0, $header);
+
+$getTokenArr = json_decode($getTokenRes, true);
+
+if (isset($getTokenArr['access_token'])) {
+    $access_token = $getTokenArr['access_token'];
+
+    $header = [
+        'Authorization: Bearer ' . $access_token
+    ];
+
+    $getUserRes = get_curl($_LINUXDO_CONNECT["base"].'/api/userinfo', 0, 0, 0, $header);
+    $getUserArr = json_decode($getUserRes, true);
+} else {
+    $err = json_encode($getTokenArr);
+}
+
+?>
+<!DOCTYPE HTML>
+<html>
+
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+    <meta name="applicable-device" content="mobile">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+
+    <meta name="full-screen" content="yes" />
+    <meta name="x5-fullscreen" content="true" />
+    <meta name="360-fullscreen" content="true" />
+
+    <meta name="screen-orientation" content="portrait">
+    <meta name="x5-orientation" content="portrait">
+    <meta name="x5-page-mode" content="app">
+
+    <title><?= $_CONFIG['game_name'] ?> <?= $_CONFIG['game_description'] ?></title>
+    <meta name="description" content="<?= $_CONFIG['game_name'] ?> <?= $_CONFIG['game_description'] ?>">
+    <meta name="keywords" content="<?= $_CONFIG['game_name'] ?>,<?= $_CONFIG['game_description'] ?>">
+
+    <link rel="stylesheet" href="static/css/login.css?v=1.1.6" />
+    <script>
+        const initPasswd = "H0CE3sheqe8sp"
+        function request(url, params) {
+            return fetch(url, params).then(res => res.json())
+        }
+        function handleBind(account, linuxdo_account) {
+            return request("/api?act=bind&account=" + account + "&connect_id=" + linuxdo_account+"&type=naixi").then(res => {
+                if (res.password) {
+                    alert("绑定成功,请点击确定开始游戏!")
+                    location.href = "/play?account=" + account + "&token=" + res.password;
+                }
+            })
+        }
+        function processLogin(params = {}, connect_id) {
+            const formData = new FormData();
+            formData.append("serverId", "1");
+            Object.entries(params).forEach(([key, value]) => formData.append(key, value));
+            request("/api?act=reg", { method: "POST", body: formData }).then(res => {
+                if (res.code == '0') {
+                    handleBind(params.account, connect_id)
+                } else {
+                    console.error(res)
+                    document.body.innerHTML = "授权失败"
+                    return
+                }
+            }).catch(err=>console.error(err))
+        }
+
+        function registerDirect() {
+            const linuxdo_account = document.getElementById("linuxdo").value;
+            processLogin({ type: "1", account: linuxdo_account, password: initPasswd, password2: initPasswd }, linuxdo_account)
+        }
+        function linkAccount() {
+            const account = document.getElementById("account").value;
+            const password = document.getElementById("password").value;
+            const linuxdo_account = document.getElementById("linuxdo").value;
+            processLogin({ type: "0", account, password, }, linuxdo_account)
+        }
+
+    </script>
+</head>
+
+<body>
+    <input type="hidden" id="linuxdo" value="<?= $getUserArr['email'] ?>">
+    <?php if (!empty($getUserArr['email'])) { ?>
+        <script>
+            const connectId = document.getElementById('linuxdo').value
+            request("/api?act=link&connect_id=" + connectId, { method: "POST" }).then(res => {
+                if (res.code == '0') {
+                    location.href = "/play?account=" + res.data.username + "&token=" + res.data.password;
+                } else {
+                    document.getElementById("bindBox").style.display = "block"
+                    const linkAccountBtn = document.getElementById("linkAccount");
+                    linkAccountBtn.addEventListener("click", linkAccount)
+                    const registerDirectBtn = document.getElementById("registerDirect");
+                    registerDirectBtn.addEventListener("click", registerDirect)
+                }
+            })
+
+        </script>
+        <div id="bindBox"
+            style="width:400px;position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);display:flex;justify-content:center;align-items:center;flex-direction:column;display:none;">
+            <!-- <div>当前尚未有你的游戏账号,请选择</div><br> -->
+            <button id="registerDirect" onclick="registerDirect" style="cursor:pointer;font-weight:bold">奶昔论坛账号登录</a><br>
+            <!-- <div>如果已有账号,请输入账号和密码</div><br>
+            <input type="text" id="account" placeholder="请输入账号" onKeyUp="value = value.replace(/[\W]/g, '')"
+                autocomplete="off" disableautocomplete><br>
+            <input type="password" id="password" placeholder="请输入密码"><br>
+            <button id="linkAccount">绑定并登录</button> -->
+        </div>
+    <?php } ?>
+    <?php if (!empty($err)) { ?>
+        授权发生异常:<?= $err ?>
+    <?php } ?>
+</body>
+
+</html>

package.json

@@ -1,6 +1,8 @@
 {
   "dependencies": {
-    "jszip": "^3.10.1"
+    "jszip": "^3.10.1",
+    "lua-json": "^1.0.1",
+    "xlsx": "^0.18.5"
   },
   "scripts": {
     "build": "node build.js",

tools/batchSetting.js

@@ -0,0 +1,146 @@
+const fs = require("fs");
+const ringType = 6;
+const YBvoucher = {
+  '380': '100',
+  '388': '200',
+  '389': '500',
+  '390': '1000',
+  '391': '2000',
+  '392': '5000',
+  '393': '10000',
+  '394': '1',
+  '395': '5',
+  '396': '10',
+  '397': '15',
+  '398': '30',
+  '399': '50',
+  '400': '80'
+}
+const tpls = {
+  SpecialRing: {
+    key: "SpecialRing",
+    desc: "戒指种类,登记,伤害加倍,元宝花费",
+    values: [ringType, 51, 10, 10],
+    interval: [0, 1, 10, 10],
+    num: 150,
+    template: {
+      4: `"S2": {
+          "attr": [
+            { "value": S3, "type": 75 },
+            { "value": 428, "type": 76 },
+            { "value": 536, "type": 77 },
+            { "value": 55, "type": 21 },
+            { "value": 55, "type": 23 },
+            { "value": 55, "type": 25 },
+            { "value": 55, "type": 27 },
+            { "value": 5000, "type": 83 }
+          ],
+          "lv": S2,
+          "cost": [
+            { "id": 4, "type": 4, "count": S4 },
+            { "id": 1018, "type": 0, "count": 1000 }
+          ],
+          "pos": S1
+        }`,
+      5: `"S2": {
+          "attr": [
+            { "value": S3, "type": 75 },
+            { "value": 585, "type": 76 },
+            { "value": 1115, "type": 77 },
+            { "value": 70, "type": 21 },
+            { "value": 70, "type": 23 },
+            { "value": 70, "type": 25 },
+            { "value": 70, "type": 27 },
+            { "value": 3400, "type": 79 }
+          ],
+          "lv": S2,
+          "cost": [
+              { "id": 1022, "type": 0, "count": 1600 },
+              { "id": 4, "type": 4, "count": S4 }
+          ],
+          "pos": S1
+        }`,
+      6: `"S2": {
+          "attr": [
+            { "value": 1000, "type": 5 },
+            { "value": 100, "type": 76 },
+            { "value": 100, "type": 77 },
+            { "value": 2500, "type": 64 },
+            { "value": S3, "type": 75 }
+          ],
+          "lv": S2,
+          "cost": [
+            { "id": 1037, "type": 0, "count": 180 },
+            { "id": 4, "type": 4, "count": S4 }
+          ],
+          "pos": S1
+        }`,
+    }[ringType],
+  },
+  ItemMergeConfig: {
+    key: "ItemMergeConfig",
+    desc: "ID1,ID2,代金券ID,元宝数",
+    values: [7201, 7202,Object.keys(YBvoucher),Object.values(YBvoucher)],
+    interval: [2, 2],
+    num: Object.keys(YBvoucher).length,
+    template: `
+    "S1": {
+        "circle": 0,
+        "compose": { "id": 4, "type": 4, "count": S40 },
+        "index": 7,
+        "buttontxt10": "合成10次",
+        "mergebutton10": 1,
+        "text": "兑换",
+        "clicklimit": 1,
+        "Eid": S1,
+        "second_index": 1,
+        "table": [{ "id": S3, "type": 0, "count": 1 }],
+        "openserverday": 1,
+        "level": 1
+      },
+      "S2": {
+        "circle": 0,
+        "compose": { "id": 4, "type": 4, "count": S4000 },
+        "index": 7,
+        "buttontxt10": "合成10次",
+        "mergebutton10": 1,
+        "text": "兑换",
+        "clicklimit": 1,
+        "Eid": S2,
+        "second_index": 1,
+        "table": [{ "id": S3, "type": 0, "count": 100 }],
+        "openserverday": 1,
+        "level": 1
+      }
+    `,
+  },
+};
+
+const scope = [
+  // "UpstarConfig",
+  "ItemMergeConfig",
+].filter(Boolean);
+const start = () => {
+  const configs = scope.map((key) => {
+    return tpls[key];
+  });
+  configs.forEach((file) => {
+    const { key, values, interval, num, template } = file;
+    const getStr = (index) => {
+      let str = template;
+      values.forEach((v, i) => {
+        const reg = new RegExp(`S${i + 1}`, "g");
+        if (Array.isArray(v)) {
+          str = str.replace(reg, v[index]);
+        } else str = str.replace(reg, v + index * interval[i]);
+      });
+      return str;
+    };
+    const content = Array(num)
+      .fill(1)
+      .map((e, i) => `${getStr(i)}`)
+      .join(",");
+    fs.writeFileSync(`./dist/${key}.txt`, content);
+  });
+};
+start();

tools/json2excel.js

@@ -0,0 +1,54 @@
+const XLSX = require("xlsx");
+const fs = require("fs");
+const path = require("path");
+const { json } = require("stream/consumers");
+const { log } = require("console");
+const folderPath = "./configs";
+const scope = [
+  // "SpecialRingConfig",
+  "StdItems",
+  // "Monster",
+  // "ItemMergeConfig",
+  // "MergeConfig",
+  // "NpcTransConf"
+  //  "MergeTotal", "RecyclingSettingConfig", "UpstarConfig",
+].filter(Boolean);
+
+function handleJson2ArrayJson(jsonData) {
+  const arr = [];
+  const findElement = (obj) => {
+    for (const key in obj) {
+      if (isNaN(key) && Object.hasOwnProperty.call(obj, key)) {
+        if(typeof obj[key] === "object")
+            obj[key] = JSON.stringify(obj[key]);
+      } else if (typeof obj[key] === "object") {
+        findElement(obj[key]);
+      }
+    }
+    arr.push(obj);
+  };
+  findElement(jsonData);
+  return arr;
+}
+function json2excel(jsonData, fileName) {
+  if (!Array.isArray(jsonData)) jsonData = Object.values(jsonData);
+  const data = handleJson2ArrayJson(jsonData)?.filter(Boolean);
+  
+  const workbook = XLSX.utils.book_new();
+  const worksheet = XLSX.utils.json_to_sheet(data);
+  XLSX.utils.book_append_sheet(workbook, worksheet, fileName);
+  XLSX.writeFile(workbook, `./excels/${fileName}.xlsx`);
+}
+
+const start = () => {
+  const files = fs.readdirSync(folderPath);
+
+  // 过滤出所有的 JSON 文件
+  const jsonFiles = files.filter((file) => path.extname(file) === ".json").filter((file) => scope.map((e) => `${e}.json`).includes(file));
+  jsonFiles.forEach((file) => {
+    const json = JSON.parse(fs.readFileSync(path.join(folderPath, file), "utf8"));
+    const filename = path.basename(file, path.extname(file));
+    json2excel(json, filename);
+  });
+};
+start();

tools/json2lua.js

@@ -0,0 +1,68 @@
+const { log } = require("console");
+const fs = require("fs");
+const path = require("path");
+const folderPath = "./configs";
+const scope = [
+  "StdItems",
+  "Monster",
+  "ItemMergeConfig",
+  "MergeConfig",
+  "SpecialRingConfig",
+  "RecyclingSettingConfig",
+  "ActivitiesConf",
+  "UpstarPriceConfig",
+  "UpstarConfig",
+  // "GuildDonateConfig",
+  "ShopConfig",
+  // "NpcTransConf"
+  //  "MergeTotal", "RecyclingSettingConfig", "UpstarConfig",
+].filter(Boolean);
+const strKey = (key) => (isNaN(key) ? `${key}` : `[${key}]`);
+function jsonToLua(jsonObj, indent = "", linefeed = "\n") {
+  let luaStr = "";
+  for (key in jsonObj) {
+    let value = jsonObj[key];
+    key = strKey(key);
+    if (typeof value === "object" && value !== null && !Array.isArray(value)) {
+      // 对象
+      luaStr += `${indent}${key} = {`;
+      luaStr += jsonToLua(value, indent + "  ");
+      luaStr += `${indent}},\n`;
+    } else if (Array.isArray(value)) {
+      // 数组
+      luaStr += `${indent}${key} = {`;
+      value.forEach((item) => {
+        if (typeof item === "string") {
+          luaStr += `${indent}  '${item}',`;
+        } else if (typeof item == "object") {
+          luaStr += `{${jsonToLua(item, "", "")}},`;
+        } else {
+          luaStr += `${indent}  ${item},`;
+        }
+      });
+      luaStr += `${indent}},\n`;
+    } else {
+      // 基础类型
+      if (typeof value === "string") {
+        luaStr += `${indent}${key}="${value}",${linefeed}`;
+      } else {
+        luaStr += `${indent}${key}=${value},${linefeed}`;
+      }
+    }
+  }
+  return luaStr;
+}
+const start = () => {
+  const files = fs.readdirSync(folderPath);
+
+  // 过滤出所有的 JSON 文件
+  const jsonFiles = files.filter((file) => path.extname(file) === ".json").filter((file) => scope.map((e) => `${e}.json`).includes(file));
+  jsonFiles.forEach((file) => {
+    const json = JSON.parse(fs.readFileSync(path.join(folderPath, file), "utf8"));
+    const filename = path.basename(file, path.extname(file));
+    const luaConfig = `${filename}={\n${jsonToLua(json)}\n}`;
+
+    fs.writeFileSync(`./luaConfigs/${filename}.config`, luaConfig);
+  });
+};
+start();

tools/lua2json.js

@@ -0,0 +1,38 @@
+const { log } = require("console");
+const fs = require("fs");
+const path = require("path");
+const { parse } = require("lua-json");
+const folderPath = "./luaConfigs";
+
+const scope = [
+  // "MergeTotal",
+  // "ActivitiesConf",
+  "ShopConfig"
+].filter(Boolean);
+
+const start = () => {
+  const files = fs.readdirSync(folderPath);
+
+  // 过滤出所有的 JSON 文件
+  const luaFiles = files.filter((file) => path.extname(file) === ".config").filter((file) => scope.map((e) => `${e}.config`).includes(file));
+  luaFiles.forEach((file) => {
+    const luaContent = fs.readFileSync(path.join(folderPath, file), "utf8");
+    const filename = path.basename(file, path.extname(file));
+    const content = luaContent.replace(filename, "").slice(1);
+    const luaConfig = parse(`return ${content}`);
+    for (const key in luaConfig) {
+      const item = luaConfig[key];
+      const arr = [];
+      Object.entries(item).forEach(([k, v]) => {
+        if (!isNaN(k) && typeof v === "object") {
+          arr.push(v);
+        }
+      });
+      if (arr.length > 0) {
+        luaConfig[key] = arr;
+      }
+    }
+    fs.writeFileSync(`./configs/${filename}.json`, JSON.stringify(luaConfig, "utf-8"));
+  });
+};
+start();

tools/sortJson.js

@@ -0,0 +1,60 @@
+const { log } = require("console");
+const fs = require("fs");
+const path = require("path");
+const folderPath = "./configs";
+const scope = [
+  "StdItems","Monster"
+  //  "ItemMergeConfig", "MergeConfig", "MergeTotal", "RecyclingSettingConfig", "UpstarConfig", "Monster"
+];
+
+// 自定义排序函数
+function customSort(arr) {
+  return arr.sort((a, b) => {
+    const isANumeric = !isNaN(a);
+    const isBNumeric = !isNaN(b);
+    if (isANumeric && isBNumeric) {
+      return parseFloat(a) - parseFloat(b);
+    } else if (isANumeric) {
+      return -1;
+    } else if (typeof a == "object") {
+      return -1;
+    } else if (isBNumeric) {
+      return 1;
+    } else {
+      return a.localeCompare(b);
+    }
+  });
+}
+
+// 递归排序函数
+function sortObject(obj) {
+  if (Array.isArray(obj)) {
+    // 如果是数组，使用自定义排序函数
+    return customSort(obj.map((item) => sortObject(item)));
+  } else if (typeof obj === "object" && obj !== null) {
+    // 如果是对象，递归处理每个属性
+    const sortedObj = {};
+    Object.keys(obj)
+      .sort()
+      .forEach((key) => {
+        sortedObj[key] = sortObject(obj[key]);
+      });
+    return sortedObj;
+  } else {
+    // 如果是基本类型，直接返回
+    return obj;
+  }
+}
+const start = () => {
+  const files = fs.readdirSync(folderPath);
+  // 过滤出所有的 JSON 文件
+  const jsonFiles = files.filter((file) => path.extname(file) === ".json").filter((file) => scope.map((e) => `${e}.json`).includes(file));
+  jsonFiles.forEach((file) => {
+    const json = JSON.parse(fs.readFileSync(path.join(folderPath, file), "utf8"));
+    const filename = path.basename(file, path.extname(file));
+    const sortedJson = sortObject(json);
+    const jsonstr = JSON.stringify(sortedJson, null, 2);
+    fs.writeFileSync(`${folderPath}/${filename}.json`, jsonstr);
+  });
+};
+start();