From 9fc9ba23156b6c52d1aaa88b9185cc0cdbfabe66 Mon Sep 17 00:00:00 2001 From: "DESKTOP-7R8JEQQ\\k" <1076390229@qq.com> Date: Mon, 21 Jul 2025 21:44:50 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=87=BA=E6=88=BF=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Game/View/Family/FamilyEventView.lua | 10 +++- .../base_project/Game/View/FamilyView.lua | 9 +++- .../extend/majiang/fuzhou/EXSettingView.lua | 50 +++++++++++++++--- .../extend/majiang/nancheng/EXSettingView.lua | 50 +++++++++++++++--- wb_new_ui/assets/Family/Main.xml | 3 +- .../ART/base/Family/ui/Family_fui.bytes | Bin 118697 -> 118835 bytes .../base/common/ui/Common_atlas0_10.png.meta | 2 +- .../common/ui/Common_atlas_qmc17jbz.png.meta | 2 +- .../ui/Main_Majiang_atlas10.png.meta | 2 +- .../Assets/StreamingAssets/init1_1.json | 20 +++---- .../ProjectSettings/ProjectSettings.asset | 4 +- 11 files changed, 121 insertions(+), 31 deletions(-) diff --git a/lua_probject/base_project/Game/View/Family/FamilyEventView.lua b/lua_probject/base_project/Game/View/Family/FamilyEventView.lua index c06c3922..e1a1b3ec 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyEventView.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyEventView.lua @@ -200,7 +200,15 @@ function M:_evtOnPush_assistant(...) return end - view:ChangeOther(tonumber(view._group.lev) + 1) + local arg = {...} + local groupId = arg[1].id + local lev = arg[1].lev + + if groupId ~= view._group.id then + return + end + + view:ChangeOther(lev + 1) end return M diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index fa46e182..2deddaa2 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -54,7 +54,7 @@ function M:init(url) BaseView.InitView(self, url) self._full_offset = false local view = self._view - self.lastTime = 0 + self.lastTime = os.time() self.com_FamilyChatRoom = FamilyChatRoom:Init(view:GetChild('com_chatRoom'), self) @@ -469,7 +469,7 @@ function M:UpdateFamilyRoom(fgCtr, id) local config = ExtendManager.GetExtendConfig(playList[newIndex].gameId) local mode = config:GetGameInfo() -- times倍数 - local times = json.decode(playList[newIndex].hpData).times + local times = json.decode(playList[newIndex].hpData).times local gamePlay = times / 1000 .. "倍," gamePlay = gamePlay .. mode:LoadConfigToDetail(playList[newIndex].config) obj:GetChild('Label_gameRule').title = gamePlay @@ -690,6 +690,11 @@ function M:OnUpdate() end) ]] self.lastTime = newTime + --self._view:GetChild('list_familyNumber').numItems = 0 + + if self._view:GetChild('list_familyNumber').itemRenderer then + self._view:GetChild('list_familyNumber').numItems = #self._group.members + end end end diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXSettingView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXSettingView.lua index 05dc7a7e..51905481 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXSettingView.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXSettingView.lua @@ -5,11 +5,27 @@ local EXSettingView = {} local M = EXSettingView setmetatable(M, { __index = BaseWindow }) -function EXSettingView.new(main_view) +function EXSettingView:Show(room) + self._room = room + + -- 房主，第一个进房间的人 + local roomOwner = self._room.player_list[1].self_user.account_id + + if roomOwner == DataManager.SelfUser.account_id then + self.cBtn.selectedIndex = 1 + else + self.cBtn.selectedIndex = 0 + end + + BaseWindow.Show(self) +end + +function EXSettingView.new(main_view, flag_witness) local self = setmetatable({}, { __index = M }) self.class = 'EXSettingView' self._close_destroy = true self._mainView = main_view + self._flag_witness = flag_witness self:init('ui://Main_Majiang/Setting') return self end @@ -23,6 +39,8 @@ function M:init(url) local btn_music = view:GetChild('btn_vedio_music') local btn_sound = view:GetChild('btn_vedio_sound') + self.cBtn = self._view:GetController('cBtn') + -- slider_sound.value = GameApplication.Instance.SoundValue -- slider_music.value = GameApplication.Instance.MusicValue @@ -46,15 +64,35 @@ function M:init(url) -- GameApplication.Instance.MusicMute = btn_music.selected; end) - local _btn_logout = self._view:GetChild('btn_closeRoom') + local _btn_logout = self._view:GetChild('btn_cancelRoom') _btn_logout.onClick:Set(function() - if self._mainView.dismiss_room_cd_time > 0 then - ViewUtil.ErrorTip(nil, "您还处于解散冷却时间当中，请稍后重试！") + if self._flag_witness then + local _room = DataManager.CurrenRoom + pt(_room) + self._mainView._gamectr:ExitWitnessGame(_room.play_id, _room.game_id, + _room.room_id) + ViewManager.ChangeView(ViewManager.View_Family) else - local _gamectr = ControllerManager.GetController(GameController) - _gamectr:AskDismissRoom() + if self._mainView.dismiss_room_cd_time > 0 then + ViewUtil.ErrorTip(nil, "您还处于解散冷却时间当中，请稍后重试！") + else + local _gamectr = ControllerManager.GetController(GameController) + _gamectr:AskDismissRoom() + end end end) + + self._view:GetChild("btn_closeRoom").onClick:Set(function() + local _gamectr = ControllerManager.GetController(GameController) + _gamectr:LevelRoom(function(res) + print("退出房间") + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode) + return + end + ViewManager.ChangeView(ViewManager.View_Family) + end) + end) end return M diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXSettingView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXSettingView.lua index 05dc7a7e..51905481 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXSettingView.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXSettingView.lua @@ -5,11 +5,27 @@ local EXSettingView = {} local M = EXSettingView setmetatable(M, { __index = BaseWindow }) -function EXSettingView.new(main_view) +function EXSettingView:Show(room) + self._room = room + + -- 房主，第一个进房间的人 + local roomOwner = self._room.player_list[1].self_user.account_id + + if roomOwner == DataManager.SelfUser.account_id then + self.cBtn.selectedIndex = 1 + else + self.cBtn.selectedIndex = 0 + end + + BaseWindow.Show(self) +end + +function EXSettingView.new(main_view, flag_witness) local self = setmetatable({}, { __index = M }) self.class = 'EXSettingView' self._close_destroy = true self._mainView = main_view + self._flag_witness = flag_witness self:init('ui://Main_Majiang/Setting') return self end @@ -23,6 +39,8 @@ function M:init(url) local btn_music = view:GetChild('btn_vedio_music') local btn_sound = view:GetChild('btn_vedio_sound') + self.cBtn = self._view:GetController('cBtn') + -- slider_sound.value = GameApplication.Instance.SoundValue -- slider_music.value = GameApplication.Instance.MusicValue @@ -46,15 +64,35 @@ function M:init(url) -- GameApplication.Instance.MusicMute = btn_music.selected; end) - local _btn_logout = self._view:GetChild('btn_closeRoom') + local _btn_logout = self._view:GetChild('btn_cancelRoom') _btn_logout.onClick:Set(function() - if self._mainView.dismiss_room_cd_time > 0 then - ViewUtil.ErrorTip(nil, "您还处于解散冷却时间当中，请稍后重试！") + if self._flag_witness then + local _room = DataManager.CurrenRoom + pt(_room) + self._mainView._gamectr:ExitWitnessGame(_room.play_id, _room.game_id, + _room.room_id) + ViewManager.ChangeView(ViewManager.View_Family) else - local _gamectr = ControllerManager.GetController(GameController) - _gamectr:AskDismissRoom() + if self._mainView.dismiss_room_cd_time > 0 then + ViewUtil.ErrorTip(nil, "您还处于解散冷却时间当中，请稍后重试！") + else + local _gamectr = ControllerManager.GetController(GameController) + _gamectr:AskDismissRoom() + end end end) + + self._view:GetChild("btn_closeRoom").onClick:Set(function() + local _gamectr = ControllerManager.GetController(GameController) + _gamectr:LevelRoom(function(res) + print("退出房间") + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode) + return + end + ViewManager.ChangeView(ViewManager.View_Family) + end) + end) end return M diff --git a/wb_new_ui/assets/Family/Main.xml b/wb_new_ui/assets/Family/Main.xml index 0c1c8d1d..92e7d6a7 100644 --- a/wb_new_ui/assets/Family/Main.xml +++ b/wb_new_ui/assets/Family/Main.xml @@ -10,7 +10,7 @@ - + @@ -22,6 +22,7 @@ + diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes index 9a98663bed8b15cb50a6acb0bac9626bc576014e..786047ae68e7ddc8900f73c599759380303f628b 100644 GIT binary patch delta 6940 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 KUD^n_;r|6{gGzk> diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png.meta b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png.meta index cc10da7c..a3378cab 100644 --- a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png.meta +++ b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: base/common/af187115a4824290240734622129b80b assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_qmc17jbz.png.meta b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_qmc17jbz.png.meta index d4f5c7f5..ee618bcd 100644 --- a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_qmc17jbz.png.meta +++ b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_qmc17jbz.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: base/common/af187115a4824290240734622129b80b assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas10.png.meta b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas10.png.meta index 9b5a193a..5ce17719 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas10.png.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas10.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b assetBundleVariant: diff --git a/wb_unity_pro/Assets/StreamingAssets/init1_1.json b/wb_unity_pro/Assets/StreamingAssets/init1_1.json index 73dfe7ac..99ba8f04 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.29", + "ver": "1.0.21", "name": "跑得快", "check": true, - "version": "1.0.29", + "version": "1.0.21", "game_id": "66", "bundle": "extend/poker/runfast" }, @@ -24,34 +24,34 @@ "bundle": "extend/poker2/suoha" }, { - "ver": "1.0.21", + "ver": "1.0.22", "name": "南城麻将", "check": true, - "version": "1.0.21", + "version": "1.0.22", "game_id": "86", "bundle": "extend/majiang/nancheng" }, { - "ver": "1.0.22", + "ver": "1.0.23", "name": "黎川麻将", "check": true, - "version": "1.0.22", + "version": "1.0.23", "game_id": "87", "bundle": "extend/majiang/lichuan" }, { - "ver": "1.0.17", + "ver": "1.0.18", "name": "金溪麻将", "check": true, - "version": "1.0.17", + "version": "1.0.18", "game_id": "88", "bundle": "extend/majiang/jinxi" }, { - "ver": "1.0.16", + "ver": "1.0.17", "name": "抚州麻将", "check": true, - "version": "1.0.16", + "version": "1.0.17", "game_id": "89", "bundle": "extend/majiang/fuzhou" } diff --git a/wb_unity_pro/ProjectSettings/ProjectSettings.asset b/wb_unity_pro/ProjectSettings/ProjectSettings.asset index 59a779f4..1503613e 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: 26 - AndroidTargetSdkVersion: 30 + AndroidTargetSdkVersion: 26 AndroidPreferredInstallLocation: 1 aotOptions: stripEngineCode: 0 @@ -787,7 +787,7 @@ PlayerSettings: platformArchitecture: iPhone: 1 scriptingBackend: - Android: 1 + Android: 0 Standalone: 1 iPhone: 1 il2cppCompilerConfiguration: {}