From e15efa8f24d64da0fccd2617cbeae6343889fd2b Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 21 Jan 2025 16:59:14 +0800
Subject: [PATCH] =?UTF-8?q?feat(config):=20=E6=B7=BB=E5=8A=A0=E7=89=A9?=
 =?UTF-8?q?=E5=93=81=E5=90=88=E6=88=90=E5=8D=81=E6=AC=A1=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=B9=B6=E8=B0=83=E6=95=B4=E5=90=88=E5=B9=B6=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 ItemMergeConfig.json 中添加合成十次相关配置
- 修改 MergeConfig.json 中的 Uitype 属性值
- 更新 json2lua.js 中的配置处理列表
---
 configs/ItemMergeConfig.json | 10 ++++++++++
 configs/MergeConfig.json     |  2 +-
 tools/json2lua.js            |  7 +++++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/configs/ItemMergeConfig.json b/configs/ItemMergeConfig.json
index f79e00c..d2c916b 100644
--- a/configs/ItemMergeConfig.json
+++ b/configs/ItemMergeConfig.json
@@ -3943,6 +3943,8 @@
         },
         "index": 3,
         "text": "兑换",
+        "buttontxt10": "合成10次",
+        "mergebutton10": 1,
         "Eid": 72,
         "second_index": 2,
         "table": [
@@ -3964,6 +3966,8 @@
         },
         "index": 3,
         "text": "兑换",
+        "buttontxt10": "合成10次",
+        "mergebutton10": 1,
         "Eid": 73,
         "second_index": 2,
         "table": [
@@ -3985,6 +3989,8 @@
         },
         "index": 3,
         "text": "兑换",
+        "buttontxt10": "合成10次",
+        "mergebutton10": 1,
         "Eid": 78,
         "second_index": 2,
         "table": [
@@ -4006,6 +4012,8 @@
         },
         "index": 3,
         "text": "兑换",
+        "buttontxt10": "合成10次",
+        "mergebutton10": 1,
         "Eid": 132,
         "second_index": 2,
         "table": [
@@ -4032,6 +4040,8 @@
         },
         "index": 3,
         "text": "兑换",
+        "buttontxt10": "合成10次",
+        "mergebutton10": 1,
         "Eid": 238,
         "second_index": 2,
         "table": [
diff --git a/configs/MergeConfig.json b/configs/MergeConfig.json
index 554a2b2..de43936 100644
--- a/configs/MergeConfig.json
+++ b/configs/MergeConfig.json
@@ -151,7 +151,7 @@
         "2": {
             "rebornconds": 0,
             "index": 2,
-            "Uitype": 2,
+            "Uitype": 1,
             "id": 3,
             "levelconds": 1,
             "dayconds": 1,
diff --git a/tools/json2lua.js b/tools/json2lua.js
index 649515c..2c15fdb 100644
--- a/tools/json2lua.js
+++ b/tools/json2lua.js
@@ -3,8 +3,11 @@ const fs = require("fs");
 const path = require("path");
 const folderPath = "./configs";
 const scope = [
-  "StdItems", "Monster"
-  //  "ItemMergeConfig", "MergeConfig", "MergeTotal", "RecyclingSettingConfig", "UpstarConfig", 
+  "StdItems",
+  "Monster",
+  "ItemMergeConfig",
+  "MergeConfig",
+  //  "MergeTotal", "RecyclingSettingConfig", "UpstarConfig",
 ];
 const strKey = (key) => (isNaN(key) ? `${key}` : `[${key}]`);
 function jsonToLua(jsonObj, indent = "", linefeed = "\n") {