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

- 在登录页面增加奶昔论坛登录选项 - 实现奶昔论坛OAuth2.0认证流程 - 添加用户绑定和直接登录功能 - 优化登录界面布局和样式
chore(config): 更新物品掉落组 ID
2025-04-17 16:07:34 +08:00 · 2025-04-17 15:50:46 +08:00 · 2025-04-17 15:20:28 +08:00 · 2025-04-17 15:11:25 +08:00 · 2025-04-17 14:56:39 +08:00 · 2025-04-17 14:41:20 +08:00
13 changed files with 2132 additions and 2017 deletions
--- a/configs/BuffConf.json
+++ b/configs/BuffConf.json
--- a/configs/ItemMergeConfig.json
+++ b/configs/ItemMergeConfig.json
@@ -967,7 +967,7 @@
        "Eid": 57,
        "second_index": 7,
        "table": [
-          { "id": 365, "type": 0, "count": 5 },
+          { "id": 365, "type": 0, "count": 3 },
          { "id": 2, "type": 2, "count": 1000 }
        ],
        "openserverday": 1,
@@ -985,7 +985,7 @@
        "Eid": 58,
        "second_index": 7,
        "table": [
-          { "id": 366, "type": 0, "count": 5 },
+          { "id": 366, "type": 0, "count": 3 },
          { "id": 2, "type": 2, "count": 3000 }
        ],
        "openserverday": 1,
@@ -1003,7 +1003,7 @@
        "Eid": 59,
        "second_index": 7,
        "table": [
-          { "id": 367, "type": 0, "count": 5 },
+          { "id": 367, "type": 0, "count": 3 },
          { "id": 2, "type": 2, "count": 5000 }
        ],
        "openserverday": 1,
@@ -1021,7 +1021,7 @@
        "Eid": 60,
        "second_index": 7,
        "table": [
-          { "id": 368, "type": 0, "count": 5 },
+          { "id": 368, "type": 0, "count": 3 },
          { "id": 2, "type": 2, "count": 8000 }
        ],
        "openserverday": 1,
@@ -1037,7 +1037,7 @@
        "Eid": 61,
        "second_index": 7,
        "table": [
-          { "id": 369, "type": 0, "count": 5 },
+          { "id": 369, "type": 0, "count": 3 },
          { "id": 2, "type": 2, "count": 15000 }
        ],
        "openserverday": 1,
@@ -1053,7 +1053,7 @@
        "Eid": 62,
        "second_index": 7,
        "table": [
-          { "id": 370, "type": 0, "count": 5 },
+          { "id": 370, "type": 0, "count": 3 },
          { "id": 2, "type": 2, "count": 30000 }
        ],
        "openserverday": 1,
@@ -1069,7 +1069,7 @@
        "Eid": 63,
        "second_index": 7,
        "table": [
-          { "id": 371, "type": 0, "count": 5 },
+          { "id": 371, "type": 0, "count": 3 },
          { "id": 2, "type": 2, "count": 50000 }
        ],
        "openserverday": 1,
@@ -1085,7 +1085,7 @@
        "Eid": 64,
        "second_index": 7,
        "table": [
-          { "id": 863, "type": 0, "count": 5 },
+          { "id": 863, "type": 0, "count": 3 },
          { "id": 2, "type": 2, "count": 80000 }
        ],
        "openserverday": 1,
@@ -1101,7 +1101,7 @@
        "Eid": 65,
        "second_index": 7,
        "table": [
-          { "id": 864, "type": 0, "count": 5 },
+          { "id": 864, "type": 0, "count": 3 },
          { "id": 2, "type": 2, "count": 120000 }
        ],
        "openserverday": 1,
@@ -2252,6 +2252,19 @@
      }
    },
    "2": {
+      "72": {
+        "circle": 0,
+        "compose": { "id": 840, "type": 0, "count": 1 },
+        "index": 3,
+        "text": "兑换",
+        "buttontxt10": "合成10次",
+        "mergebutton10": 1,
+        "Eid": 72,
+        "second_index": 2,
+        "table": [{ "id": 838, "type": 0, "count": 10 }],
+        "openserverday": 1,
+        "level": 1
+      },
      "73": {
        "circle": 0,
        "compose": { "id": 838, "type": 0, "count": 10 },
@@ -2468,6 +2481,21 @@
          { "id": 845, "type": 0, "count": 100 },
          { "id": 4, "type": 4, "count": 100000 }
        ]
+      },
+      "3301": {
+        "circle": 0,
+        "compose": { "id": 1394, "type": 0, "count": 1 },
+        "index": 1,
+        "text": "合成",
+        "Eid": 3301,
+        "second_index": 2,
+        "openserverday": 1,
+        "table": [
+          { "id": 845, "type": 0, "count": 10000 },
+          { "id": 4, "type": 4, "count": 1000000 }
+        ],
+        "mergelimit": { "office": 23, "zs": 15 },
+        "limitTips": "转生15且5珠亲王以上方可兑换"
      }
    },
    "4": {
@@ -2489,8 +2517,6 @@
        "compose": { "id": 13, "type": 13, "count": 250000000 },
        "index": 3,
        "text": "兑换",
-        "buttontxt10": "合成10次",
-        "mergebutton10": 1,
        "Eid": 3402,
        "second_index": 4,
        "table": [{ "id": 300, "type": 0, "count": 100 }],
@@ -2515,8 +2541,6 @@
        "compose": { "id": 13, "type": 13, "count": 800000000 },
        "index": 3,
        "text": "兑换",
-        "buttontxt10": "合成10次",
-        "mergebutton10": 1,
        "Eid": 3404,
        "second_index": 4,
        "table": [{ "id": 301, "type": 0, "count": 100 }],
@@ -4767,7 +4791,7 @@
    "2": {
      "7201": {
        "circle": 0,
-        "compose": { "id": 4, "type": 4, "count": 100 },
+        "compose": { "id": 4, "type": 4, "count": 1000 },
        "index": 7,
        "buttontxt10": "合成10次",
        "mergebutton10": 1,
@@ -4781,7 +4805,7 @@
      },
      "7202": {
        "circle": 0,
-        "compose": { "id": 4, "type": 4, "count": 10000 },
+        "compose": { "id": 4, "type": 4, "count": 100000 },
        "index": 7,
        "buttontxt10": "合成10次",
        "mergebutton10": 1,
@@ -4795,7 +4819,7 @@
      },
      "7203": {
        "circle": 0,
-        "compose": { "id": 4, "type": 4, "count": 200 },
+        "compose": { "id": 4, "type": 4, "count": 2000 },
        "index": 7,
        "buttontxt10": "合成10次",
        "mergebutton10": 1,
@@ -4809,7 +4833,7 @@
      },
      "7204": {
        "circle": 0,
-        "compose": { "id": 4, "type": 4, "count": 20000 },
+        "compose": { "id": 4, "type": 4, "count": 200000 },
        "index": 7,
        "buttontxt10": "合成10次",
        "mergebutton10": 1,
@@ -4823,7 +4847,7 @@
      },
      "7205": {
        "circle": 0,
-        "compose": { "id": 4, "type": 4, "count": 500 },
+        "compose": { "id": 4, "type": 4, "count": 5000 },
        "index": 7,
        "buttontxt10": "合成10次",
        "mergebutton10": 1,
@@ -4837,7 +4861,7 @@
      },
      "7206": {
        "circle": 0,
-        "compose": { "id": 4, "type": 4, "count": 50000 },
+        "compose": { "id": 4, "type": 4, "count": 500000 },
        "index": 7,
        "buttontxt10": "合成10次",
        "mergebutton10": 1,
@@ -4851,7 +4875,7 @@
      },
      "7207": {
        "circle": 0,
-        "compose": { "id": 4, "type": 4, "count": 1000 },
+        "compose": { "id": 4, "type": 4, "count": 10000 },
        "index": 7,
        "buttontxt10": "合成10次",
        "mergebutton10": 1,
@@ -4865,7 +4889,7 @@
      },
      "7208": {
        "circle": 0,
-        "compose": { "id": 4, "type": 4, "count": 100000 },
+        "compose": { "id": 4, "type": 4, "count": 1000000 },
        "index": 7,
        "buttontxt10": "合成10次",
        "mergebutton10": 1,
@@ -4879,7 +4903,7 @@
      },
      "7209": {
        "circle": 0,
-        "compose": { "id": 4, "type": 4, "count": 2000 },
+        "compose": { "id": 4, "type": 4, "count": 20000 },
        "index": 7,
        "buttontxt10": "合成10次",
        "mergebutton10": 1,
@@ -4893,7 +4917,7 @@
      },
      "7210": {
        "circle": 0,
-        "compose": { "id": 4, "type": 4, "count": 200000 },
+        "compose": { "id": 4, "type": 4, "count": 2000000 },
        "index": 7,
        "buttontxt10": "合成10次",
        "mergebutton10": 1,
@@ -4907,7 +4931,7 @@
      },
      "7211": {
        "circle": 0,
-        "compose": { "id": 4, "type": 4, "count": 5000 },
+        "compose": { "id": 4, "type": 4, "count": 50000 },
        "index": 7,
        "buttontxt10": "合成10次",
        "mergebutton10": 1,
@@ -4921,7 +4945,7 @@
      },
      "7212": {
        "circle": 0,
-        "compose": { "id": 4, "type": 4, "count": 500000 },
+        "compose": { "id": 4, "type": 4, "count": 5000000 },
        "index": 7,
        "buttontxt10": "合成10次",
        "mergebutton10": 1,
@@ -4935,7 +4959,7 @@
      },
      "7213": {
        "circle": 0,
-        "compose": { "id": 4, "type": 4, "count": 10000 },
+        "compose": { "id": 4, "type": 4, "count": 100000 },
        "index": 7,
        "buttontxt10": "合成10次",
        "mergebutton10": 1,
@@ -4949,7 +4973,7 @@
      },
      "7214": {
        "circle": 0,
-        "compose": { "id": 4, "type": 4, "count": 1000000 },
+        "compose": { "id": 4, "type": 4, "count": 10000000 },
        "index": 7,
        "buttontxt10": "合成10次",
        "mergebutton10": 1,
@@ -4963,7 +4987,7 @@
      },
      "7215": {
        "circle": 0,
-        "compose": { "id": 4, "type": 4, "count": 1 },
+        "compose": { "id": 4, "type": 4, "count": 10 },
        "index": 7,
        "buttontxt10": "合成10次",
        "mergebutton10": 1,
@@ -4977,7 +5001,7 @@
      },
      "7216": {
        "circle": 0,
-        "compose": { "id": 4, "type": 4, "count": 100 },
+        "compose": { "id": 4, "type": 4, "count": 1000 },
        "index": 7,
        "buttontxt10": "合成10次",
        "mergebutton10": 1,
@@ -4991,7 +5015,7 @@
      },
      "7217": {
        "circle": 0,
-        "compose": { "id": 4, "type": 4, "count": 5 },
+        "compose": { "id": 4, "type": 4, "count": 50 },
        "index": 7,
        "buttontxt10": "合成10次",
        "mergebutton10": 1,
@@ -5005,7 +5029,7 @@
      },
      "7218": {
        "circle": 0,
-        "compose": { "id": 4, "type": 4, "count": 500 },
+        "compose": { "id": 4, "type": 4, "count": 5000 },
        "index": 7,
        "buttontxt10": "合成10次",
        "mergebutton10": 1,
@@ -5019,7 +5043,7 @@
      },
      "7219": {
        "circle": 0,
-        "compose": { "id": 4, "type": 4, "count": 10 },
+        "compose": { "id": 4, "type": 4, "count": 100 },
        "index": 7,
        "buttontxt10": "合成10次",
        "mergebutton10": 1,
@@ -5033,7 +5057,7 @@
      },
      "7220": {
        "circle": 0,
-        "compose": { "id": 4, "type": 4, "count": 1000 },
+        "compose": { "id": 4, "type": 4, "count": 10000 },
        "index": 7,
        "buttontxt10": "合成10次",
        "mergebutton10": 1,
@@ -5047,7 +5071,7 @@
      },
      "7221": {
        "circle": 0,
-        "compose": { "id": 4, "type": 4, "count": 15 },
+        "compose": { "id": 4, "type": 4, "count": 150 },
        "index": 7,
        "buttontxt10": "合成10次",
        "mergebutton10": 1,
@@ -5061,7 +5085,7 @@
      },
      "7222": {
        "circle": 0,
-        "compose": { "id": 4, "type": 4, "count": 1500 },
+        "compose": { "id": 4, "type": 4, "count": 15000 },
        "index": 7,
        "buttontxt10": "合成10次",
        "mergebutton10": 1,
@@ -5075,7 +5099,7 @@
      },
      "7223": {
        "circle": 0,
-        "compose": { "id": 4, "type": 4, "count": 30 },
+        "compose": { "id": 4, "type": 4, "count": 300 },
        "index": 7,
        "buttontxt10": "合成10次",
        "mergebutton10": 1,
@@ -5089,7 +5113,7 @@
      },
      "7224": {
        "circle": 0,
-        "compose": { "id": 4, "type": 4, "count": 3000 },
+        "compose": { "id": 4, "type": 4, "count": 30000 },
        "index": 7,
        "buttontxt10": "合成10次",
        "mergebutton10": 1,
@@ -5103,7 +5127,7 @@
      },
      "7225": {
        "circle": 0,
-        "compose": { "id": 4, "type": 4, "count": 50 },
+        "compose": { "id": 4, "type": 4, "count": 500 },
        "index": 7,
        "buttontxt10": "合成10次",
        "mergebutton10": 1,
@@ -5117,7 +5141,7 @@
      },
      "7226": {
        "circle": 0,
-        "compose": { "id": 4, "type": 4, "count": 5000 },
+        "compose": { "id": 4, "type": 4, "count": 50000 },
        "index": 7,
        "buttontxt10": "合成10次",
        "mergebutton10": 1,
@@ -5131,7 +5155,7 @@
      },
      "7227": {
        "circle": 0,
-        "compose": { "id": 4, "type": 4, "count": 80 },
+        "compose": { "id": 4, "type": 4, "count": 800 },
        "index": 7,
        "buttontxt10": "合成10次",
        "mergebutton10": 1,
@@ -5145,7 +5169,7 @@
      },
      "7228": {
        "circle": 0,
-        "compose": { "id": 4, "type": 4, "count": 8000 },
+        "compose": { "id": 4, "type": 4, "count": 80000 },
        "index": 7,
        "buttontxt10": "合成10次",
        "mergebutton10": 1,
--- a/configs/Monster.json
+++ b/configs/Monster.json
@@ -10906,7 +10906,7 @@
    "damageMusicRate": 100,
    "dieMusicId": "pttongyong-5",
    "dieMusicRate": 100,
-    "dropid": 200120,
+    "dropid": 200119,
    "entityType": 1,
    "entityid": 433,
    "exp": 39400,
--- a/configs/MonthCardConfig.json
+++ b/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 }
+  }
+}
--- a/configs/ShopConfig.json
+++ b/configs/ShopConfig.json
--- a/configs/StdItems.json
+++ b/configs/StdItems.json
@@ -9729,12 +9729,11 @@
    "desc": "双击使用增加99飞鞋点数",
    "dropBroadcast": 0,
    "dropGroupid": 100516,
-    "dup": 9999,
+    "dup": 99,
    "existScenes": [-1],
    "forcetips": 1,
    "icon": 13132,
    "id": 307,
-    "isShowUseBtn": 1,
    "itemlvl": 3,
    "name": "飞鞋",
    "openUi": { "type": 1, "view": "app.BagBatchUseWin" },
@@ -9759,12 +9758,11 @@
    "desc": "双击使用增加999飞鞋点数",
    "dropBroadcast": 0,
    "dropGroupid": 100517,
-    "dup": 9999,
+    "dup": 99,
    "existScenes": [-1],
    "forcetips": 1,
    "icon": 13132,
    "id": 308,
-    "isShowUseBtn": 1,
    "itemlvl": 3,
    "name": "飞鞋(大)",
    "openUi": { "type": 1, "view": "app.BagBatchUseWin" },
@@ -28780,7 +28778,7 @@
    "desc": "可在【合成-换真充-银两兑换】中兑换银两。游戏内BOSS、夺宝有几率爆出，参加各类玩法活动均有机会获得",
    "dropBroadcast": 1,
    "dropEffect": 3,
-    "dup": 9999,
+    "dup": 99999,
    "existScenes": [-1],
    "icon": 13131,
    "id": 829,
@@ -28811,7 +28809,7 @@
    "desc": "可在【合成-换真充-银两兑换】中兑换银两。游戏内BOSS、夺宝有几率爆出，参加各类玩法活动均有机会获得",
    "dropBroadcast": -1,
    "dropEffect": 14,
-    "dup": 9999,
+    "dup": 99999,
    "existScenes": [-1],
    "icon": 13131,
    "id": 830,
@@ -28842,7 +28840,7 @@
    "desc": "可在【合成-换真充-银两兑换】中兑换银两。游戏内BOSS、夺宝有几率爆出，参加各类玩法活动均有机会获得",
    "dropBroadcast": -1,
    "dropEffect": 11,
-    "dup": 9999,
+    "dup": 99999,
    "existScenes": [-1],
    "icon": 13131,
    "id": 831,
@@ -28873,7 +28871,7 @@
    "desc": "可在【合成-换真充-银两兑换】中兑换银两。游戏内BOSS、夺宝有几率爆出，参加各类玩法活动均有机会获得",
    "dropBroadcast": -1,
    "dropEffect": 12,
-    "dup": 9999,
+    "dup": 99999,
    "existScenes": [-1],
    "icon": 13131,
    "id": 832,
@@ -36305,7 +36303,7 @@
    "desc": "该道具不可交易，开服第8天可以开启。使用后立即返还5元宝、并随机抽取一件永久时装！包含红玫瑰、紫玫瑰、黄金裁决、黄金屠龙、黄金嗜魂、黄金羽扇",
    "dropBroadcast": 0,
    "dropGroupid": 151016,
-    "dup": 0,
+    "dup": 9999,
    "existScenes": [-1],
    "fashionTips": "bx_show_001",
    "icon": 13532,
@@ -40465,7 +40463,7 @@
    "desc": "银针[四方]，四大内功装备之一，可以激活内功宝石【银花簪】的共鸣效果",
    "dropBroadcast": -1,
    "dropEffect": 11,
-    "dup": 0,
+    "dup": 999,
    "existScenes": [-1],
    "icon": 13611,
    "id": 1170,
@@ -40510,7 +40508,7 @@
    "desc": "银针[五福]，四大内功装备之一，可以激活内功宝石【银花簪】的共鸣效果",
    "dropBroadcast": -1,
    "dropEffect": 12,
-    "dup": 0,
+    "dup": 999,
    "existScenes": [-1],
    "icon": 13612,
    "id": 1171,
@@ -40538,7 +40536,7 @@
      { "type": 19, "value": 120 },
      { "type": 17, "value": 120 },
      { "type": 15, "value": 120 },
-      { "type": 13, "value": 1200 },
+      { "type": 13, "value": 120 },
      { "type": 11, "value": 120 },
      { "type": 9, "value": 120 }
    ],
@@ -40690,7 +40688,7 @@
    "desc": "心决[四方]，四大内功装备之一，可以激活内功宝石【养心玉】的共鸣效果",
    "dropBroadcast": -1,
    "dropEffect": 11,
-    "dup": 0,
+    "dup": 999,
    "existScenes": [-1],
    "icon": 13606,
    "id": 1175,
@@ -40734,7 +40732,7 @@
    "desc": "心决[五福]，四大内功装备之一，可以激活内功宝石【养心玉】的共鸣效果",
    "dropBroadcast": -1,
    "dropEffect": 12,
-    "dup": 0,
+    "dup": 999,
    "existScenes": [-1],
    "icon": 13607,
    "id": 1176,
@@ -40913,7 +40911,7 @@
    "desc": "金印[四方]，四大内功装备之一，可以激活内功宝石【金曜珠】的共鸣效果",
    "dropBroadcast": -1,
    "dropEffect": 11,
-    "dup": 0,
+    "dup": 999,
    "existScenes": [-1],
    "icon": 13601,
    "id": 1180,
@@ -40957,7 +40955,7 @@
    "desc": "金印[五福]，四大内功装备之一，可以激活内功宝石【金曜珠】的共鸣效果",
    "dropBroadcast": -1,
    "dropEffect": 12,
-    "dup": 0,
+    "dup": 999,
    "existScenes": [-1],
    "icon": 13602,
    "id": 1181,
@@ -41136,7 +41134,7 @@
    "desc": "檀珠[四方]，四大内功装备之一，可以激活内功宝石【黑檀石】的共鸣效果",
    "dropBroadcast": -1,
    "dropEffect": 11,
-    "dup": 0,
+    "dup": 999,
    "existScenes": [-1],
    "icon": 13596,
    "id": 1185,
@@ -41180,7 +41178,7 @@
    "desc": "檀珠[五福]，四大内功装备之一，可以激活内功宝石【黑檀石】的共鸣效果",
    "dropBroadcast": -1,
    "dropEffect": 12,
-    "dup": 0,
+    "dup": 999,
    "existScenes": [-1],
    "icon": 13597,
    "id": 1186,
@@ -48352,5 +48350,69 @@
    "time": 0,
    "trade": 1,
    "type": 8
+  },
+  "1394": {
+    "cdTime": 0,
+    "colGroup": 0,
+    "conds": [],
+    "dealPrice": 10,
+    "dealType": 0,
+    "denyDeal": 1,
+    "denyDestroy": 1,
+    "denySell": 1,
+    "desc": "打开后随机获得三阶魔器中的任意一件，获得随机奖励",
+    "dropBroadcast": 0,
+    "dropGroupid": 100881,
+    "dup": 9999,
+    "existScenes": [-1],
+    "icon": 13509,
+    "id": 1394,
+    "isShowUseBtn": 1,
+    "iseffect": 127,
+    "itemlvl": 3,
+    "name": "三阶魔器宝箱",
+    "packageType": 2,
+    "recordLog": 1,
+    "recoverid": 0,
+    "shape": 0,
+    "showQuality": 5,
+    "staitcAttrs": [],
+    "suggVocation": 0,
+    "suitId": 0,
+    "time": 0,
+    "trade": 3,
+    "type": 131
+  },
+  "1395": {
+    "cdTime": 0,
+    "colGroup": 0,
+    "conds": [],
+    "dealPrice": 10,
+    "dealType": 0,
+    "denyDeal": 1,
+    "denyDestroy": 1,
+    "denySell": 1,
+    "desc": "打开后随机获得三阶魔器中的任意一件，获得随机奖励",
+    "dropBroadcast": 0,
+    "dropGroupid": 100882,
+    "dup": 9999,
+    "existScenes": [-1],
+    "icon": 13509,
+    "id": 1395,
+    "isShowUseBtn": 1,
+    "iseffect": 127,
+    "itemlvl": 3,
+    "name": "天赐机缘盒",
+    "packageType": 2,
+    "recordLog": 1,
+    "recoverid": 0,
+    "shape": 0,
+    "showQuality": 5,
+    "staitcAttrs": [],
+    "suggVocation": 0,
+    "suitId": 0,
+    "time": 0,
+    "trade": 3,
+    "type": 131
  }
 }
--- a/excels/StdItems.xlsx
+++ b/excels/StdItems.xlsx
--- a/login.php
+++ b/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']?>,
--- a/naixi_callback.php
+++ b/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>
--- a/tools/batchSetting.js
+++ b/tools/batchSetting.js
@@ -86,7 +86,7 @@ const tpls = {
    template: `
    "S1": {
        "circle": 0,
-        "compose": { "id": 4, "type": 4, "count": S4 },
+        "compose": { "id": 4, "type": 4, "count": S40 },
        "index": 7,
        "buttontxt10": "合成10次",
        "mergebutton10": 1,
@@ -100,7 +100,7 @@ const tpls = {
      },
      "S2": {
        "circle": 0,
-        "compose": { "id": 4, "type": 4, "count": S400 },
+        "compose": { "id": 4, "type": 4, "count": S4000 },
        "index": 7,
        "buttontxt10": "合成10次",
        "mergebutton10": 1,
--- a/tools/json2excel.js
+++ b/tools/json2excel.js
@@ -5,8 +5,8 @@ const { json } = require("stream/consumers");
 const { log } = require("console");
 const folderPath = "./configs";
 const scope = [
-  "SpecialRingConfig",
-  // "StdItems",
+  // "SpecialRingConfig",
+  "StdItems",
  // "Monster",
  // "ItemMergeConfig",
  // "MergeConfig",
--- a/tools/json2lua.js
+++ b/tools/json2lua.js
@@ -12,7 +12,8 @@ const scope = [
  "ActivitiesConf",
  "UpstarPriceConfig",
  "UpstarConfig",
-  "GuildDonateConfig",
+  // "GuildDonateConfig",
+  "ShopConfig",
  // "NpcTransConf"
  //  "MergeTotal", "RecyclingSettingConfig", "UpstarConfig",
 ].filter(Boolean);
--- a/tools/lua2json.js
+++ b/tools/lua2json.js
@@ -6,7 +6,8 @@ const folderPath = "./luaConfigs";

 const scope = [
  // "MergeTotal",
-  "ActivitiesConf",
+  // "ActivitiesConf",
+  "ShopConfig"
 ].filter(Boolean);

 const start = () => {
Author	SHA1	Message	Date
kubbo	f941751304	feat(login): 添加奶昔论坛第三方登录支持 - 在登录页面增加奶昔论坛登录选项 - 实现奶昔论坛OAuth2.0认证流程 - 添加用户绑定和直接登录功能 - 优化登录界面布局和样式	2025-04-17 16:07:34 +08:00
kubbo	eb74743826	chore(config): 更新物品掉落组 ID 将物品 ID 为 48394 的掉落组 ID 从 100881 修改为 100882	2025-04-17 15:50:46 +08:00
kubbo	8171485c95	refactor(config): 更新物品合成配置 - 将物品 ID 3206 更改为 72 - 更新相应的 Eid 和 table 中的 ID	2025-04-17 15:20:28 +08:00
kubbo	8e4d5fd69d	feat(config): 增加兑换功能并调整道具数量 - 在 ItemMergeConfig.json 中添加了新的兑换配置项 - 在 StdItems.json 中将多个道具的最大堆叠数量从 9999 调整为 99999	2025-04-17 15:11:25 +08:00
kubbo	d700be4fe7	feat(config): 调整道具合成数量 - 将多个道具的合成数量从 5 个调整为 3 个 - 涉及的道具 ID 包括 365、366、367、368、369、370、371、863 和 864	2025-04-17 14:56:39 +08:00
kubbo	1c414a5f8c	feat(configs): 更新 StdItems.json 道具配置 - 将道具 id 为 36303 的可叠加数量从 0 修改为 9999 - 新增道具 id 为 1395 的"天赐机缘盒"配置项	2025-04-17 14:41:20 +08:00
kubbo	96ea0c4a4c	build: 更新物品配置并调整数据处理顺序 - 新增 StdItems.xlsx 文件，用于物品配置 - 修改 json2excel.js 中的处理顺序： - 注释掉 SpecialRingConfig 的处理 - 解除 StdItems 处理的注释	2025-04-17 14:17:03 +08:00
kubbo	dbcd06b2b2	fix: 修改文件名大小写	2025-02-23 18:38:31 +08:00
kubbo	ee500c51be	feat(config): 设置四大内功装备的可叠加数量为 999 - 将银针[四方]、心决[四方]、金印[四方]和檀珠[四方]的可叠加数量从 0 修改为 999 - 此修改提高了玩家携带这些重要装备的数量，便于内功宝石的激活和使用	2025-02-23 18:11:03 +08:00
Kubbo	66d96187b2	feat(config): 更新月卡配置并增加新卡种 - 更新现有月卡的每日奖励、购买奖励等信息 - 新增"橙星"和"橙月"两种新卡种 - 调整部分卡种的开放条件，如"橙星"和"橙月"需要满足特定等级条件	2025-02-18 23:14:29 +08:00
aixianling	4758f7e90f	feat(config): 将五福内功装备的可叠加数量设置为 999 - 修改了银针[五福]、心决[五福]、金印[五福]和檀珠[五福]的可叠加数量 - 从不可叠加（dup: 0）改为可叠加 999 个（dup: 999） - 此修改可能旨在提高玩家携带这些装备的便利性	2025-02-18 17:43:12 +08:00
Kubbo	0923c0d0a7	feat(ShopConfig): 更新商城配置 - 修改商品 ID 从 1394 到 1242 - 调整限制次数从 15 次到 0 次 - 变更限制类型从 2 到 3 - 更新商品价格配置： - ID 从 4 改为 3 - 类型从 4 改为 3 - 价格从 1000000 降至 188	2025-02-13 22:08:36 +08:00
Kubbo	56bea22ff3	refactor(configs): 调整道具合并配置和商店配置 - 修改 ItemMergeConfig.json 中的 mergelimit 字段，将 circle 改为 zs - 更新 ShopConfig.json 中的商品 ID、价格和限制条件	2025-02-12 23:42:37 +08:00
Kubbo	e3fdac04bc	refactor(config): 简化 ItemMergeConfig.json 中的兑换限制提示文本 - 将 "转生等级15且官职为5珠亲王以上方可兑换" 修改为 "转生15且5珠亲王以上方可兑换" - 优化了提示文本的简洁性，保留了原有的语义	2025-02-12 23:05:50 +08:00
Kubbo	4b022cde37	feat(config): 新增合成配置项 - 在 ItemMergeConfig.json 中添加了新的合成配置项，ID 为 3301 - 新增配置项包括合成条件、产出物品及限制条件等信息 - 此次更新增加了合成产出的多样性和游戏内兑换的限制条件	2025-02-12 23:00:57 +08:00
Kubbo	e6b4ffd952	feat(configs): 添加三阶魔器宝箱物品配置 - 在 StdItems.json 文件中添加了新的物品配置，ID 为 1394 - 该物品为三阶魔器宝箱，具有以下特点： - 打开后可随机获得三阶魔器中的任意一件 - 获得随机奖励 - 限制交易、销毁和出售 - 设有专属图标和描述 - 属于高级物品，具有较高的品质和稀有度	2025-02-12 22:49:57 +08:00
Kubbo	d7bfd860dc	fix(configs): 调整物品使用次数限制 - 修改 StdItems.json 文件中物品类型 13 的使用次数限制 - 将物品类型 13 的使用次数从 1200 次降低到 120 次 - 此修改旨在平衡游戏内物品的使用频率和效果	2025-02-12 22:35:15 +08:00
Kubbo	3de79cc1fa	refactor(ShopConfig): 移除 ShopConfig 中的冗余配置项 - 删除了 ShopConfig 中的多个冗余 shopid 配置项 - 优化了 ShopConfig 的结构，提高了配置的可读性和维护性 - 同时更新了 lua2json 工具的配置，以适应新的 ShopConfig 结构	2025-02-11 17:11:24 +08:00
Kubbo	c24eb74bcf	fix: 修改文件名大小写	2025-02-11 14:38:04 +08:00
Kubbo	3c8e92a7d1	feat(config): 移除物品合成配置中的合成10次按钮 - 在 ItemMergeConfig.json 文件中，移除了两个物品配置中的 "buttontxt10" 和 "mergebutton10" 字段 - 受影响的物品 ID 为 3402 和 3404	2025-02-11 13:53:02 +08:00
kubbo	3c926a4f46	refactor(configs): 调整飞鞋道具属性 - 移除 307 和 308 道具的 isShowUseBtn 属性 - 将 308 道具的 dup 属性从 9999 修改为 99	2025-01-27 23:09:04 +08:00
kubbo	e4fc710ca2	fix(configs): 修正飞鞋点数道具数量 - 将道具"dup"属性值从 9999 修改为 99 - 确保双击使用时正确增加 99 点飞鞋点数	2025-01-27 23:07:56 +08:00
kubbo	1a3db7fb28	fix(configs): 修改 Monster 配置中的 dropid 将 Monster 配置中 entityid 为 433 的怪物的 dropid 从 200120 修改为 200119。	2025-01-27 22:45:00 +08:00
kubbo	b0591ef625	refactor(config): 调整合成系统材料消耗 - 修改了多个物品的合成条件，将材料消耗量增加了10倍 - 更新了批量设置模板，相应调整了材料消耗参数	2025-01-27 22:39:20 +08:00