From ec9b52f707cfe0b2f173c8258d77ea92665e729b Mon Sep 17 00:00:00 2001
From: 1076390229 <1076390229@qq.com>
Date: Fri, 1 Aug 2025 18:07:26 +0800
Subject: [PATCH] =?UTF-8?q?fgui=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CreatePlay/Component/com_editSetting.xml  | 109 ++++++++++++++++++
 .../Assets/StreamingAssets/init1_1.json       |  20 ++--
 .../Assets/StreamingAssets/init2_1.json       |  60 +++++-----
 .../ProjectSettings/GraphicsSettings.asset    |   1 +
 .../ProjectSettings/ProjectSettings.asset     |   4 +-
 5 files changed, 152 insertions(+), 42 deletions(-)
 create mode 100644 wb_new_ui/assets/Lobby/component/CreatePlay/Component/com_editSetting.xml

diff --git a/wb_new_ui/assets/Lobby/component/CreatePlay/Component/com_editSetting.xml b/wb_new_ui/assets/Lobby/component/CreatePlay/Component/com_editSetting.xml
new file mode 100644
index 00000000..f82e4d58
--- /dev/null
+++ b/wb_new_ui/assets/Lobby/component/CreatePlay/Component/com_editSetting.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1906,600">
+  <controller name="cGps" pages="0,,1,,2," selected="0"/>
+  <controller name="cTuoguan" pages="0,,1,,2,,3," selected="3"/>
+  <controller name="cJiesan" pages="0,,1,,2,,3," selected="3"/>
+  <controller name="cGongneng" pages="0,,1," selected="0"/>
+  <controller name="cChat" pages="0,,1," selected="0"/>
+  <controller name="cMisslie" pages="0,,1," selected="0"/>
+  <displayList>
+    <text id="n0_f8c3" name="n0" xy="220,0" size="134,86" group="n6_f8c3" font="ui://27vd145bh35o7im7" fontSize="66" color="#450f05" text="定位">
+      <relation target="" sidePair="right-right"/>
+    </text>
+    <component id="n1_f8c3" name="n1" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" xy="384,10" size="66,66" group="n6_f8c3">
+      <Button checked="true" controller="cGps" page="0"/>
+    </component>
+    <text id="n2_f8c3" name="n2" xy="474,7" size="363,72" group="n6_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#51933c" text="限制距离100米">
+      <gearColor controller="cGps" pages="1,2" values="#450f05,#000000|#450f05,#000000" default="#51933c,#000000"/>
+    </text>
+    <component id="n3_f8c3" name="n3" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" xy="857,10" size="66,66" group="n6_f8c3">
+      <Button controller="cGps" page="1"/>
+    </component>
+    <text id="n4_f8c3" name="n4" xy="947,7" size="363,72" group="n6_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="限制距离500米">
+      <gearColor controller="cGps" pages="1" values="#51933c,#000000" default="#450f05,#000000"/>
+    </text>
+    <component id="n7_f8c3" name="n7" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" xy="1330,10" size="66,66" group="n6_f8c3">
+      <Button controller="cGps" page="2"/>
+    </component>
+    <text id="n8_f8c3" name="n8" xy="1420,7" size="270,72" group="n6_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="距离不限制">
+      <gearColor controller="cGps" pages="2" values="#51933c,#000000" default="#450f05,#000000"/>
+    </text>
+    <image id="n5_f8c3" name="n5" src="pzuc7cx6" fileName="component/CreatePlay/Image/Line 2.png" xy="195,90" size="1515,3" group="n6_f8c3"/>
+    <group id="n6_f8c3" name="gps" xy="195,0" size="1515,93" advanced="true"/>
+    <text id="n16_f8c3" name="n16" xy="220,93" size="134,86" group="n24_f8c3" font="ui://27vd145bh35o7im7" fontSize="66" color="#450f05" text="托管">
+      <relation target="" sidePair="right-right"/>
+    </text>
+    <component id="n17_f8c3" name="n17" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" xy="384,103" size="66,66" group="n24_f8c3">
+      <Button controller="cTuoguan" page="0"/>
+    </component>
+    <text id="n18_f8c3" name="n18" xy="474,100" size="270,72" group="n24_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="不自动托管">
+      <gearColor controller="cTuoguan" pages="1,2,3" values="#450f05,#000000|#450f05,#000000|#450f05,#000000" default="#51933c,#000000"/>
+    </text>
+    <component id="n19_f8c3" name="n19" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" xy="857,103" size="66,66" group="n24_f8c3">
+      <Button controller="cTuoguan" page="1"/>
+    </component>
+    <text id="n20_f8c3" name="n20" xy="947,100" size="226,72" group="n24_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="30秒托管">
+      <gearColor controller="cTuoguan" pages="1" values="#51933c,#000000" default="#450f05,#000000"/>
+    </text>
+    <component id="n21_f8c3" name="n21" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" xy="1330,103" size="66,66" group="n24_f8c3">
+      <Button controller="cTuoguan" page="2"/>
+    </component>
+    <text id="n22_f8c3" name="n22" xy="1420,100" size="226,72" group="n24_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="60秒托管">
+      <gearColor controller="cTuoguan" pages="2,3" values="#51933c,#000000|#450f05,#000000" default="#450f05,#000000"/>
+    </text>
+    <component id="n25_f8c3" name="n25" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" xy="384,190" size="66,66" group="n24_f8c3">
+      <Button checked="true" controller="cTuoguan" page="3"/>
+    </component>
+    <text id="n26_f8c3" name="n26" xy="474,187" size="257,72" group="n24_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#51933c" text="120秒托管">
+      <gearColor controller="cTuoguan" pages="3" values="#51933c,#000000" default="#450f05,#000000"/>
+    </text>
+    <image id="n23_f8c3" name="n23" src="pzuc7cx6" fileName="component/CreatePlay/Image/Line 2.png" xy="195,276" size="1515,3" group="n24_f8c3"/>
+    <group id="n24_f8c3" name="tuoguan" xy="195,93" size="1515,186" advanced="true"/>
+    <text id="n9_f8c3" name="n9" xy="219,279" size="134,86" group="n15_f8c3" font="ui://27vd145bh35o7im7" fontSize="66" color="#450f05" text="解散">
+      <relation target="" sidePair="right-right"/>
+    </text>
+    <component id="n10_f8c3" name="n10" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" xy="383,289" size="66,66" group="n15_f8c3">
+      <Button controller="cJiesan" page="0"/>
+    </component>
+    <text id="n11_f8c3" name="n11" xy="473,286" size="429,72" group="n15_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="托管结束后不解散">
+      <gearColor controller="cJiesan" pages="0" values="#51933c,#000000" default="#450f05,#000000"/>
+    </text>
+    <component id="n12_f8c3" name="n12" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" xy="1237,289" size="66,66" group="n15_f8c3">
+      <Button controller="cJiesan" page="1"/>
+    </component>
+    <text id="n13_f8c3" name="n13" xy="1327,286" size="589,72" group="n15_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="托管当局结束后强制解散">
+      <gearColor controller="cJiesan" pages="1" values="#51933c,#000000" default="#450f05,#000000"/>
+    </text>
+    <component id="n27_f8c3" name="n27" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" xy="383,397" size="66,66" group="n15_f8c3">
+      <Button controller="cJiesan" page="2"/>
+    </component>
+    <text id="n28_f8c3" name="n28" xy="473,394" size="566,72" group="n15_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="托管2局结束后强制解散">
+      <gearColor controller="cJiesan" pages="2" values="#51933c,#000000" default="#450f05,#000000"/>
+    </text>
+    <component id="n29_f8c3" name="n29" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" xy="1237,399" size="66,66" group="n15_f8c3">
+      <Button checked="true" controller="cJiesan" page="3"/>
+    </component>
+    <text id="n30_f8c3" name="n30" xy="1327,396" size="566,72" group="n15_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#51933c" text="托管3局结束后强制解散">
+      <gearColor controller="cJiesan" pages="3" values="#51933c,#000000" default="#450f05,#000000"/>
+    </text>
+    <image id="n14_f8c3" name="n14" src="pzuc7cx6" fileName="component/CreatePlay/Image/Line 2.png" xy="195,472" size="1515,3" group="n15_f8c3"/>
+    <group id="n15_f8c3" name="jiesan" xy="195,279" size="1721,196" advanced="true"/>
+    <text id="n31_f8c3" name="n31" xy="220,475" size="134,86" group="n37_f8c3" font="ui://27vd145bh35o7im7" fontSize="66" color="#450f05" text="功能">
+      <relation target="" sidePair="right-right"/>
+    </text>
+    <component id="n38_f8c3" name="n38" src="kxhm7cx8" fileName="component/CreatePlay/Component/Multiple_choose.xml" xy="384,485" group="n37_f8c3">
+      <Button controller="cChat" page="1"/>
+    </component>
+    <text id="n33_f8c3" name="n33" xy="474,482" size="376,72" group="n37_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="不允许快捷聊天">
+      <gearColor controller="cChat" pages="0" values="#450f05,#000000" default="#51933c,#000000"/>
+    </text>
+    <component id="n39_f8c3" name="n39" src="kxhm7cx8" fileName="component/CreatePlay/Component/Multiple_choose.xml" xy="1238,485" group="n37_f8c3">
+      <Button controller="cMisslie" page="1"/>
+    </component>
+    <text id="n35_f8c3" name="n35" xy="1328,482" size="323,72" group="n37_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="关闭互动表情">
+      <gearColor controller="cMisslie" pages="1" values="#51933c,#000000" default="#450f05,#000000"/>
+    </text>
+    <image id="n36_f8c3" name="n36" src="pzuc7cx6" fileName="component/CreatePlay/Image/Line 2.png" xy="195,565" size="1515,3" group="n37_f8c3"/>
+    <group id="n37_f8c3" name="gongneng" xy="195,475" size="1515,93" advanced="true"/>
+  </displayList>
+</component>
\ No newline at end of file
diff --git a/wb_unity_pro/Assets/StreamingAssets/init1_1.json b/wb_unity_pro/Assets/StreamingAssets/init1_1.json
index 5e4dcf6f..a99dd863 100644
--- a/wb_unity_pro/Assets/StreamingAssets/init1_1.json
+++ b/wb_unity_pro/Assets/StreamingAssets/init1_1.json
@@ -1,9 +1,9 @@
 [
   {
-    "ver": "1.0.22",
+    "ver": "1.0.23",
     "name": "跑得快",
     "check": true,
-    "version": "1.0.22",
+    "version": "1.0.23",
     "game_id": "66",
     "bundle": "extend/poker/runfast"
   },
@@ -24,34 +24,34 @@
     "bundle": "extend/poker2/suoha"
   },
   {
-    "ver": "1.0.26",
+    "ver": "1.0.27",
     "name": "南城麻将",
     "check": true,
-    "version": "1.0.26",
+    "version": "1.0.27",
     "game_id": "86",
     "bundle": "extend/majiang/nancheng"
   },
   {
-    "ver": "1.0.27",
+    "ver": "1.0.28",
     "name": "黎川麻将",
     "check": true,
-    "version": "1.0.27",
+    "version": "1.0.28",
     "game_id": "87",
     "bundle": "extend/majiang/lichuan"
   },
   {
-    "ver": "1.0.13",
+    "ver": "1.0.14",
     "name": "金溪麻将",
     "check": true,
-    "version": "1.0.13",
+    "version": "1.0.14",
     "game_id": "88",
     "bundle": "extend/majiang/jinxi"
   },
   {
-    "ver": "1.0.12",
+    "ver": "1.0.13",
     "name": "抚州麻将",
     "check": true,
-    "version": "1.0.12",
+    "version": "1.0.13",
     "game_id": "89",
     "bundle": "extend/majiang/fuzhou"
   }
diff --git a/wb_unity_pro/Assets/StreamingAssets/init2_1.json b/wb_unity_pro/Assets/StreamingAssets/init2_1.json
index ab54858e..dbe4feae 100644
--- a/wb_unity_pro/Assets/StreamingAssets/init2_1.json
+++ b/wb_unity_pro/Assets/StreamingAssets/init2_1.json
@@ -1,109 +1,109 @@
 [
   {
     "lua_path": "/tolua_project,/base_project,/main_project",
-    "ver": "1.0.9",
+    "ver": "1.0.6",
     "name": "base_script",
     "check": true,
     "bundle": "base/base_script",
-    "version": "1.0.9"
+    "version": "1.0.6"
   },
   {
-    "ver": "1.0.9",
+    "ver": "1.0.6",
     "name": "common",
     "check": true,
     "bundle": "base/common",
-    "version": "1.0.9"
+    "version": "1.0.6"
   },
   {
-    "ver": "1.0.9",
+    "ver": "1.0.6",
     "name": "login",
     "check": true,
     "bundle": "base/login",
-    "version": "1.0.9"
+    "version": "1.0.6"
   },
   {
-    "ver": "1.0.9",
+    "ver": "1.0.6",
     "name": "lobby",
     "check": true,
     "bundle": "base/lobby",
-    "version": "1.0.9"
+    "version": "1.0.6"
   },
   {
-    "ver": "1.0.9",
+    "ver": "1.0.6",
     "name": "Family",
     "check": true,
     "bundle": "base/Family",
-    "version": "1.0.9"
+    "version": "1.0.6"
   },
   {
-    "ver": "1.0.9",
+    "ver": "1.0.6",
     "name": "chat",
     "check": true,
     "bundle": "base/chat",
-    "version": "1.0.9"
+    "version": "1.0.6"
   },
   {
-    "ver": "1.0.9",
+    "ver": "1.0.6",
     "name": "newgroup",
     "check": true,
     "bundle": "base/newgroup",
-    "version": "1.0.9"
+    "version": "1.0.6"
   },
   {
-    "ver": "1.0.9",
+    "ver": "1.0.6",
     "name": "rank",
     "check": true,
-    "version": "1.0.9",
+    "version": "1.0.6",
     "bundle": "base/rank"
   },
   {
-    "ver": "1.0.9",
+    "ver": "1.0.6",
     "name": "main_majiang",
     "check": true,
-    "version": "1.0.9",
+    "version": "1.0.6",
     "bundle": "base/main_majiang"
   },
   {
-    "ver": "1.0.9",
+    "ver": "1.0.6",
     "name": "main_poker",
     "check": true,
-    "version": "1.0.9",
+    "version": "1.0.6",
     "bundle": "base/main_poker"
   },
   {
-    "ver": "1.0.9",
+    "ver": "1.0.6",
     "name": "main_zipai",
     "check": true,
-    "version": "1.0.9",
+    "version": "1.0.6",
     "bundle": "base/main_zipai"
   },
   {
-    "ver": "1.0.9",
+    "ver": "1.0.6",
     "name": "static",
     "check": true,
     "bundle": "base/static",
-    "version": "1.0.9"
+    "version": "1.0.6"
   },
   {
-    "ver": "1.0.9",
+    "ver": "1.0.6",
     "is_res": true,
     "name": "embed",
     "check": true,
     "bundle": "base/embed",
-    "version": "1.0.9"
+    "version": "1.0.6"
   },
   {
-    "ver": "1.0.9",
+    "ver": "1.0.6",
     "name": "main_pokemajiang",
     "check": true,
-    "version": "1.0.9",
+    "version": "1.0.6",
     "bundle": "base/main_pokemajiang"
   },
   {
-    "ver": "1.0.9",
+    "ver": "1.0.6",
     "name": "main_zipaimajiang",
     "check": true,
-    "version": "1.0.9",
+    "version": "1.0.6",
     "bundle": "base/main_zipaimajiang"
   }
 ]
diff --git a/wb_unity_pro/ProjectSettings/GraphicsSettings.asset b/wb_unity_pro/ProjectSettings/GraphicsSettings.asset
index 4f4dac17..ad8f23e5 100644
--- a/wb_unity_pro/ProjectSettings/GraphicsSettings.asset
+++ b/wb_unity_pro/ProjectSettings/GraphicsSettings.asset
@@ -38,6 +38,7 @@ GraphicsSettings:
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}
diff --git a/wb_unity_pro/ProjectSettings/ProjectSettings.asset b/wb_unity_pro/ProjectSettings/ProjectSettings.asset
index e4ad479c..e83e8862 100644
--- a/wb_unity_pro/ProjectSettings/ProjectSettings.asset
+++ b/wb_unity_pro/ProjectSettings/ProjectSettings.asset
@@ -179,7 +179,7 @@ PlayerSettings:
     iPhone: 1
   AndroidBundleVersionCode: 12
   AndroidMinSdkVersion: 22
-  AndroidTargetSdkVersion: 22
+  AndroidTargetSdkVersion: 28
   AndroidPreferredInstallLocation: 1
   aotOptions: 
   stripEngineCode: 0
@@ -787,7 +787,7 @@ PlayerSettings:
   platformArchitecture:
     iPhone: 1
   scriptingBackend:
-    Android: 1
+    Android: 0
     Standalone: 1
     iPhone: 1
   il2cppCompilerConfiguration: {}