From ba69d4899f5e96b488ffcb64b66891e8f263e1b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com> Date: Mon, 9 Jun 2025 19:10:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=8D=E5=90=8C=E6=AD=A5=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Game/Controller/RoomController.lua | 83 +++++++--------- .../base_project/Game/View/FamilyView.lua | 13 +-- wb_new_ui/assets/Chat/Main.xml | 56 ++++------- .../assets/Chat/component/Btn_YYItem.xml | 4 +- .../assets/Chat/component/Btn_biaoqing.xml | 10 +- .../assets/Chat/images/jiangxi/face/1.jta | Bin 0 -> 22290 bytes .../assets/Chat/images/jiangxi/face/2.jta | Bin 0 -> 29896 bytes .../assets/Chat/images/jiangxi/face/3.jta | Bin 0 -> 43639 bytes .../assets/Chat/images/jiangxi/face/4.jta | Bin 0 -> 21818 bytes .../assets/Chat/images/jiangxi/face/5.jta | Bin 0 -> 26612 bytes .../assets/Chat/images/jiangxi/face/6.jta | Bin 0 -> 26192 bytes .../assets/Chat/images/jiangxi/face/7.jta | Bin 0 -> 26277 bytes .../assets/Chat/images/jiangxi/face/8.jta | Bin 0 -> 24946 bytes wb_new_ui/assets/Chat/package.xml | 8 ++ .../Assets/ART/base/chat/ui/Chat_atlas0.png | Bin 588315 -> 811532 bytes .../Assets/ART/base/chat/ui/Chat_atlas0_1.png | Bin 0 -> 342687 bytes .../ART/base/chat/ui/Chat_atlas0_1.png.meta | 92 ++++++++++++++++++ .../Assets/ART/base/chat/ui/Chat_fui.bytes | Bin 31821 -> 34316 bytes 18 files changed, 166 insertions(+), 100 deletions(-) create mode 100644 wb_new_ui/assets/Chat/images/jiangxi/face/1.jta create mode 100644 wb_new_ui/assets/Chat/images/jiangxi/face/2.jta create mode 100644 wb_new_ui/assets/Chat/images/jiangxi/face/3.jta create mode 100644 wb_new_ui/assets/Chat/images/jiangxi/face/4.jta create mode 100644 wb_new_ui/assets/Chat/images/jiangxi/face/5.jta create mode 100644 wb_new_ui/assets/Chat/images/jiangxi/face/6.jta create mode 100644 wb_new_ui/assets/Chat/images/jiangxi/face/7.jta create mode 100644 wb_new_ui/assets/Chat/images/jiangxi/face/8.jta create mode 100644 wb_unity_pro/Assets/ART/base/chat/ui/Chat_atlas0_1.png create mode 100644 wb_unity_pro/Assets/ART/base/chat/ui/Chat_atlas0_1.png.meta diff --git a/lua_probject/base_project/Game/Controller/RoomController.lua b/lua_probject/base_project/Game/Controller/RoomController.lua index a50bef37..d38c8f58 100644 --- a/lua_probject/base_project/Game/Controller/RoomController.lua +++ b/lua_probject/base_project/Game/Controller/RoomController.lua @@ -222,7 +222,8 @@ local witness_room_frame = 0 ---@param roomid number 房间号 ---@param group_id number 亲友圈id ---@param callback function 回调函数 -function M:PublicWitnessRoom(cmd, roomid, group_id, callback) +---@param game_id number 游戏id +function M:PublicWitnessRoom(cmd, roomid, group_id, callback, game_id, pid) printlog("公共观战房间接口=============PublicWitnessRoom") -- 同一帧不重复调用 local last_frame = witness_room_frame @@ -243,37 +244,21 @@ function M:PublicWitnessRoom(cmd, roomid, group_id, callback) pt(res) if (res.ReturnCode == 0) then local json = res.Data - local game_info = json["game_info"] - pt(game_info) - if ExtendHotupdate.CheckVersion(game_info) ~= ExtendHotupdate.VERSION_NORMAL then - ExtendHotupdate.UpdateGame(game_info, function() - res.ReturnCode = -2 - callback(res) - end) - return - end - local game_id = game_info.game_id local server_ip = json["server_ip"] local server_port = json["server_port"] local room = ExtendManager.GetExtendConfig(game_id):NewRoom() - room.lev = json["lev"] -- 自己在当前房间所在圈子的职位，1盟主，2管理员，3用户，非圈子房间就是3 - room.room_id = json["room_id"] + room.room_id = roomid room.game_id = game_id - room.status = json["status"] room.server_host = string.concat(server_ip, ":", server_port) room.session = _client:getSession() -- 圈子信息，圈子id和玩法id - room.group_id = json["groupId"] + room.group_id = group_id -- 圈子禁止文字聊天，禁止语音聊天 - room.ban_chat1 = json["ban_chat1"] - room.ban_chat2 = json["ban_chat2"] + room.ban_chat1 = 0 + room.ban_chat2 = 0 -- 玩法id - room.play_id = json["pid"] - -- 体力值开关 - room.hpOnOff = json["hpOnOff"] - -- 体力值倍数 - room.score_times = d2ad(json.hp_times) or 1 + room.play_id = pid DataManager.CurrenRoom = room local j_data = {} if not DataManager.SelfUser.location then @@ -281,33 +266,33 @@ function M:PublicWitnessRoom(cmd, roomid, group_id, callback) end j_data["pos"] = DataManager.SelfUser.location:Location2String() printlog("++++++++++++++++++++++++++++++++++++++++++") - -- __ConntectGameServer(Protocol.GAME_JOIN_ROOM, room, room.server_host, j_data, function(res1) - -- printlog("===============================-------------") - -- pt(res1) - -- ControllerManager.IsSendCard = false - -- if (res1.ReturnCode ~= 0) then - -- if (callback) then callback(res1) end - -- else - -- -- ControllerManager.enterPlayerData = res1.Data.tableInfo.playerData - -- -- local _s2croom = res1.Data - -- -- room.owner_id = _s2croom["owner"] - -- -- if _s2croom.createTime then - -- -- room.create_time = _s2croom["createTime"] - -- -- end - -- -- if _s2croom.manor then - -- -- room.banker_seat = _s2croom.manor - -- -- end - -- -- room.agent = _s2croom.agent == 1 and true or false - -- -- -- ControllerManager.SetGameNetClient(game_net) - -- -- local extend = ExtendManager.GetExtendConfig(room.game_id) - -- -- extend:FillRoomData(_s2croom) - -- -- ControllerManager.ChangeController(GameController) - -- -- local gamectr = ControllerManager.GetCurrenController() - -- -- gamectr.tmpRoomID = room.room_id - -- -- gamectr.tmpGroupID = room.group_id - -- -- if callback then callback(res1) end - -- end - -- end) + __ConntectGameServer(Protocol.GAME_WITNESS_ROOM, room, room.server_host, j_data, function(res1) + printlog("===============================-------------") + pt(res1) + ControllerManager.IsSendCard = false + if (res1.ReturnCode ~= 0) then + if (callback) then callback(res1) end + else + -- ControllerManager.enterPlayerData = res1.Data.tableInfo.playerData + -- local _s2croom = res1.Data + -- room.owner_id = _s2croom["owner"] + -- if _s2croom.createTime then + -- room.create_time = _s2croom["createTime"] + -- end + -- if _s2croom.manor then + -- room.banker_seat = _s2croom.manor + -- end + -- room.agent = _s2croom.agent == 1 and true or false + -- -- ControllerManager.SetGameNetClient(game_net) + -- local extend = ExtendManager.GetExtendConfig(room.game_id) + -- extend:FillRoomData(_s2croom) + -- ControllerManager.ChangeController(GameController) + -- local gamectr = ControllerManager.GetCurrenController() + -- gamectr.tmpRoomID = room.room_id + -- gamectr.tmpGroupID = room.group_id + -- if callback then callback(res1) end + end + end) else if callback then callback(res) end end diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index 19484c2c..d2a8dc3b 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -199,7 +199,8 @@ function M:UpdateFamilyRoom(fgCtr, id) list_room.itemRenderer = function(index, obj) if index < #roomList then local newIndex = index + 1 - local config = ExtendManager.GetExtendConfig(playGameInfoTable[roomList[newIndex].pid].gameId) + local gameId = playGameInfoTable[roomList[newIndex].pid].gameId + local config = ExtendManager.GetExtendConfig(gameId) local mode = config:GetGameInfo() local gamePlay = mode:LoadConfigToDetail(playGameInfoTable[roomList[newIndex].pid].config) obj:GetChild('Label_gameRule').title = gamePlay @@ -233,8 +234,7 @@ function M:UpdateFamilyRoom(fgCtr, id) -- ViewManager.ChangeView(ViewManager.View_Lobby) return else - ViewManager.ChangeView(ViewManager.View_Main, playGameInfoTable[roomList[newIndex].pid] - .gameId) + ViewManager.ChangeView(ViewManager.View_Main, gameId) end end, id, @@ -258,10 +258,11 @@ function M:UpdateFamilyRoom(fgCtr, id) -- ViewManager.ChangeView(ViewManager.View_Lobby) return else - ViewManager.ChangeView(ViewManager.View_Main, playGameInfoTable[roomList[newIndex].pid] - .gameId) + ViewManager.ChangeView(ViewManager.View_Main, gameId) end - end + end, + gameId, + roomList[newIndex].pid ) -- self._gamectr = ControllerManager.GetController(GameController) -- self._gamectr:WitnessGame(DataManager.SelfUser.account_id, id, roomList[newIndex].id) diff --git a/wb_new_ui/assets/Chat/Main.xml b/wb_new_ui/assets/Chat/Main.xml index 2fc74b77..2f576b7b 100644 --- a/wb_new_ui/assets/Chat/Main.xml +++ b/wb_new_ui/assets/Chat/Main.xml @@ -1,6 +1,6 @@ - + @@ -12,42 +12,20 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - + + @@ -73,13 +51,13 @@ -