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 9a98663b..786047ae 100644 Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes differ 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: {}