From a1715131bed2669c90c34226a0ed7722cc11b76e Mon Sep 17 00:00:00 2001 From: 1076390229 <1076390229@qq.com> Date: Wed, 6 Aug 2025 18:34:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=B6=E6=97=8F=E7=95=8C=E9=9D=A2=E7=94=9F?= =?UTF-8?q?=E5=91=BD=E5=91=A8=E6=9C=9F=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Game/Controller/GameController.lua | 2 +- .../Game/Controller/GroupMgrController.lua | 2 -- .../Game/Controller/RoomController.lua | 6 +++-- .../Game/View/Family/FamilyAllNumbers.lua | 1 + .../base_project/Game/View/FamilyView.lua | 2 ++ .../base_project/Game/View/MainView.lua | 21 ++++++++++++++---- .../MngView/GroupGameSettingView_jaingxi.lua | 4 ++-- wb_new_ui/assets/Family/Main.xml | 2 +- .../ART/base/Family/ui/Family_fui.bytes | Bin 121496 -> 121496 bytes 9 files changed, 28 insertions(+), 12 deletions(-) diff --git a/lua_probject/base_project/Game/Controller/GameController.lua b/lua_probject/base_project/Game/Controller/GameController.lua index 5f07d563..5c5ee0b4 100644 --- a/lua_probject/base_project/Game/Controller/GameController.lua +++ b/lua_probject/base_project/Game/Controller/GameController.lua @@ -74,7 +74,7 @@ function M:init(name) self._eventmap[Protocol.GAME_EVT_EXIT_ROOM_DISMISS] = self.OnEventExitRoomDismiss self._eventmap[Protocol.GAME_EVT_DISMISS_ROOM] = self.OnEventDismissRoom - self._eventmap[Protocol.GAME_EVT_DISMISS_ROOM_VOTE] = self.OnEventDismissRoomVote + --self._eventmap[Protocol.GAME_EVT_DISMISS_ROOM_VOTE] = self.OnEventDismissRoomVote self._eventmap[Protocol.GAME_EVT_DISMISS_ROOM_FAIL] = self.OnEventDismissRoomFail self._eventmap[Protocol.GAME_EVT_INTERACTION] = self.OnEventInteraction diff --git a/lua_probject/base_project/Game/Controller/GroupMgrController.lua b/lua_probject/base_project/Game/Controller/GroupMgrController.lua index 5f3eeafe..77e332a8 100644 --- a/lua_probject/base_project/Game/Controller/GroupMgrController.lua +++ b/lua_probject/base_project/Game/Controller/GroupMgrController.lua @@ -591,7 +591,6 @@ function M:OnMemberOut(evt_data) end function M:OnMemberOnline(evt_data) - --[[ print("收到在线成员推送") pt(evt_data) @@ -611,7 +610,6 @@ function M:OnMemberOnline(evt_data) DispatchEvent(self._dispatcher, GroupMgrEvent.OnMemberState, evt_data) Broadcast.Send(BroadcastEvent.OnMemberChange) - ]] end function M:OnMemberGameState(evt_data) diff --git a/lua_probject/base_project/Game/Controller/RoomController.lua b/lua_probject/base_project/Game/Controller/RoomController.lua index 794016a4..52587bc0 100644 --- a/lua_probject/base_project/Game/Controller/RoomController.lua +++ b/lua_probject/base_project/Game/Controller/RoomController.lua @@ -169,8 +169,10 @@ function M:PublicJoinRoom(cmd, roomid, tem, callback, group_id, pid) -- 圈子信息，圈子id和玩法id room.group_id = json["groupId"] -- 圈子禁止文字聊天，禁止语音聊天 - room.ban_chat1 = json["ban_chat1"] - room.ban_chat2 = json["ban_chat2"] + --room.ban_chat1 = json["ban_chat1"] + --room.ban_chat2 = json["ban_chat2"] + -- + -- 玩法id room.play_id = json["pid"] -- 体力值开关 diff --git a/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua b/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua index 400a98ea..fda6d0cf 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua @@ -8,6 +8,7 @@ function FamilyInviteFamilyView.new() setmetatable(M, { __index = BaseView }) local self = setmetatable({}, { __index = M }) self.class = "com_numberList" + self._scale = true BaseView.InitView(self, "ui://Family/com_numberList") self:initBtn() return self diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index 06935891..77657edc 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -1135,6 +1135,8 @@ function M:Show() Broadcast.AddListener(BroadcastEvent.OnOutFamily, self.Reflash, self) BaseView.Show(self) + + self:Reflash() end function M:Close() diff --git a/lua_probject/base_project/Game/View/MainView.lua b/lua_probject/base_project/Game/View/MainView.lua index 9c25ccdf..90fec03c 100644 --- a/lua_probject/base_project/Game/View/MainView.lua +++ b/lua_probject/base_project/Game/View/MainView.lua @@ -157,6 +157,7 @@ function M:InitView(url, isHideIpAdds) self:FillRoomConfig(roominfo_panel1, _room) -- 显示玩家距离 + --[[ -- self.btn_distance = self._view:GetChild('btn_distance') --self.btn_distance.displayObject.gameObject:SetActive(false) if self.btn_distance then @@ -173,6 +174,7 @@ function M:InitView(url, isHideIpAdds) -- self.distance_view:Show() end) end + ]] local btn_rule = self._view:GetChild('btn_rule') if btn_rule ~= nil then @@ -282,11 +284,22 @@ function M:InitView(url, isHideIpAdds) if self.chat_view == nil then self.chat_view = ChatView.new(self) end + --[[ if self._room.ban_chat1 then if self.chat_view.HideInputField then self.chat_view:HideInputField() end end + ]] + + local group = DataManager.groups:get(self._room.group_id) + local play = group:getPlay(self._room.play_id) + local hpData = json.decode(play.hpData) + if hpData.BanChat and hpData.BanChat == 1 then + ViewUtil.ShowTips("本房间禁止快捷聊天") + return + end + self.chat_view:Show() end) end @@ -1018,9 +1031,9 @@ function M:OnPlayerEnter(...) -- self.distance_view._view:GetController("state").selectedIndex = self._state.selectedIndex > 0 and -- self._state.selectedIndex < 3 and 1 or 0 -- self.distance_view:Show() - if self.btn_distance then - self.btn_distance:GetController("state").selectedIndex = 1 - end + --if self.btn_distance then + -- self.btn_distance:GetController("state").selectedIndex = 1 + --end end local info = self._player_info[self:GetPos(p.seat)] info:FillData(p) @@ -1201,7 +1214,7 @@ function M:OnPlayerLeave(...) local info = self._player_info[self:GetPos(p.seat)] info._view.visible = false if not self._gamectr:CheckGPS() then - self.btn_distance:GetController("state").selectedIndex = 0 + --self.btn_distance:GetController("state").selectedIndex = 0 end end 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 f32a57cb..55b1e362 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 @@ -896,9 +896,9 @@ function M:FillFagData_jiangxi() -- 功能 self.hpData.GongNeng = cGongneng.selectedIndex + 1 -- 开启聊天 - self.hpData.canChat = cChat.selectedIndex + self.hpData.BanChat = cChat.selectedIndex -- 开启表情互动 - self.hpData.canMissile = cMisslie.selectedIndex + self.hpData.BanMissile = cMisslie.selectedIndex local hpType = mod.data.game_data.hpType diff --git a/wb_new_ui/assets/Family/Main.xml b/wb_new_ui/assets/Family/Main.xml index 2e78cdb1..5699d280 100644 --- a/wb_new_ui/assets/Family/Main.xml +++ b/wb_new_ui/assets/Family/Main.xml @@ -117,7 +117,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 7edcaa09d743dbf4b3f52a89eeb4a3f5c8c197c9..360d42b35320d89d9a3e1cce432deb186493a8b0 100644 GIT binary patch delta 19 bcmbQSm3_um_6Dl-k^Lhvy#vU2X|_ delta 18 acmbQSm3_um_6