From e7fc4aeab520d9b1774b745cc825c65c711cbd43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com> Date: Sat, 13 Sep 2025 21:40:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=8E=A9=E6=B3=95=E5=81=B6?= =?UTF-8?q?=E5=B0=94=E4=B8=8D=E4=BC=9A=E5=AE=9A=E4=BD=8D=E5=88=B0=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E6=B8=B8=E6=88=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MngView/GroupGameSettingView_jaingxi.lua | 7 ++-- .../comp_numberRecordDetailChild.xml | 10 +++-- wb_new_ui/assets/Lobby/Record.xml | 37 +++++++++++++----- .../Record/Component/listChild_detailMain.xml | 7 +++- .../NewHandCard/Player_card_info_S.xml | 6 +-- .../Main_new_4/Component/Btn_HandCard.xml | 2 +- .../Assets/ART/base/lobby/ui/Lobby_fui.bytes | Bin 126239 -> 126344 bytes .../main_majiang/ui/Main_Majiang_atlas0.png | Bin 4365420 -> 4365962 bytes .../main_majiang/ui/Main_Majiang_fui.bytes | Bin 365631 -> 365560 bytes .../main_majiang/ui/Main_Majiang_r8cy1k6.mp3 | Bin 2506 -> 0 bytes .../ui/Main_Majiang_r8cy1k6.mp3.meta | 22 ----------- 11 files changed, 47 insertions(+), 44 deletions(-) delete mode 100644 wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_r8cy1k6.mp3 delete mode 100644 wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_r8cy1k6.mp3.meta diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua index e5a0fbe6..271fb8f7 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua @@ -15,7 +15,6 @@ function GroupGameSettingView.new(blur_view, gid, pid, room_config, callback) self._animation = false --self._full = true self._full_offset = false - self.selectedIndex = index self._close_destroy = true self._put_map = false self._new_hide = false @@ -30,8 +29,6 @@ function GroupGameSettingView.new(blur_view, gid, pid, room_config, callback) self.room_config_config = json.decode(room_config.config) end - - self.rewards_data = {} self.callback = callback --self._full = true @@ -585,6 +582,7 @@ function M:FillFagData() play.xipai_rewardValueType = self.hpData.xipai_rewardValueType play.anchou_rewardValueType = 1 _data.maxPlayers = res.Data.maxPlayers + _data.gameType = res.Data.gameType play.config = json.encode(_data) play.hp_times = self.hpData.times play.maxPlayers = _data.maxPlayers @@ -626,6 +624,7 @@ function M:FillFagData() play.xipai_rewardValueType = self.hpData.xipai_rewardValueType play.anchou_rewardValueType = 1 _data.maxPlayers = res.Data.maxPlayers + _data.gameType = res.Data.gameType play.config = json.encode(_data) play.hp_times = self.hpData.times play.maxPlayers = _data.maxPlayers @@ -1085,6 +1084,7 @@ function M:FillFagData_jiangxi() play.xipai_rewardValueType = self.hpData.xipai_rewardValueType play.anchou_rewardValueType = 1 _data.maxPlayers = res.Data.maxPlayers + play.gameType = res.Data.gameType play.config = json.encode(_data) play.hp_times = self.hpData.times play.maxPlayers = _data.maxPlayers @@ -1126,6 +1126,7 @@ function M:FillFagData_jiangxi() play.xipai_rewardValueType = self.hpData.xipai_rewardValueType play.anchou_rewardValueType = 1 _data.maxPlayers = res.Data.maxPlayers + play.gameType = res.Data.gameType play.config = json.encode(_data) play.hp_times = self.hpData.times play.maxPlayers = _data.maxPlayers diff --git a/wb_new_ui/assets/Lobby/NumberRecord/Component/comp_numberRecordDetailChild.xml b/wb_new_ui/assets/Lobby/NumberRecord/Component/comp_numberRecordDetailChild.xml index a0614755..df9d0631 100644 --- a/wb_new_ui/assets/Lobby/NumberRecord/Component/comp_numberRecordDetailChild.xml +++ b/wb_new_ui/assets/Lobby/NumberRecord/Component/comp_numberRecordDetailChild.xml @@ -11,20 +11,21 @@ - + - + - + - + + @@ -35,6 +36,7 @@ + \ No newline at end of file diff --git a/wb_new_ui/assets/Lobby/Record.xml b/wb_new_ui/assets/Lobby/Record.xml index 4272cce1..6c456082 100644 --- a/wb_new_ui/assets/Lobby/Record.xml +++ b/wb_new_ui/assets/Lobby/Record.xml @@ -23,13 +23,27 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -45,10 +59,15 @@ - - + + + + + + + diff --git a/wb_new_ui/assets/Lobby/component/Record/Component/listChild_detailMain.xml b/wb_new_ui/assets/Lobby/component/Record/Component/listChild_detailMain.xml index 8d735109..1e69f634 100644 --- a/wb_new_ui/assets/Lobby/component/Record/Component/listChild_detailMain.xml +++ b/wb_new_ui/assets/Lobby/component/Record/Component/listChild_detailMain.xml @@ -6,18 +6,21 @@ - + - + +