hengyang
/
hengyang_client
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

同步一下

master
罗家炜 2025-06-09 17:41:34 +08:00
parent 491822aaff
commit df16dcc72f
7 changed files with 67 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lua_probject/base_project/Game/Controller/GameController.lua
View File

@ -119,6 +119,21 @@ function M:StartGame()
_client:send(Protocol.GAME_START)
end
--临时
--观战进入房间
function M:WitnessGame(group_id, player_id, room_id)
local _client = ControllerManager.GameNetClinet
print("lingmeng game_client", _client)
if not _client then
return
end
local _data = {}
_data["group_id"] = 0
_data["player_id"] = 0
_data["room_id"] = 0
_client:send(Protocol.GAME_WITNESS_ROOM, _data)
end
--聊天
--<param name="playid"></param>
--<param name="type">1表情 2固定语音 3语音 4文本 5互动</param>

60
lua_probject/base_project/Game/Controller/RoomController.lua
View File

@ -225,9 +225,9 @@ local witness_room_frame = 0
function M:PublicWitnessRoom(cmd, roomid, group_id, callback)
printlog("公共观战房间接口=============PublicWitnessRoom")
-- 同一帧不重复调用
local last_frame = join_room_frame
join_room_frame = Time.frameCount
if join_room_frame == last_frame then
local last_frame = witness_room_frame
witness_room_frame = Time.frameCount
if witness_room_frame == last_frame then
return
end
-- 防止游戏没有离开控制器
@ -281,33 +281,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_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)
else
if callback then callback(res) end
end

2
lua_probject/base_project/Game/Protocol.lua
View File

@ -376,6 +376,8 @@ Protocol = {
-------------------Game ----------------------------
-- 进入房间
GAME_WITNESS_ROOM = "3013",
-- 进入房间
GAME_JOIN_ROOM = "1002",
-- 玩家进入房间

2
lua_probject/base_project/Game/View/FamilyView.lua
View File

@ -263,6 +263,8 @@ function M:UpdateFamilyRoom(fgCtr, id)
end
end
)
-- self._gamectr = ControllerManager.GetController(GameController)
-- self._gamectr:WitnessGame(DataManager.SelfUser.account_id, id, roomList[newIndex].id)
end)
else
local newIndex = index - #roomList + 1

14
wb_new_ui/assets/Chat/Main.xml
View File

@ -65,12 +65,22 @@
<Button icon="ui://27vd145bi2p67hzf"/>
</component>
<image id="n68_zgd9" name="n68" src="o8k8an" fileName="images/jiangxi/Rectangle 230.png" xy="78,66" group="n70_zgd9"/>
<text id="n71_zgd9" name="tex_chat" xy="78,66" size="1068,112" group="n70_zgd9" font="ui://27vd145bh35o7ilo" fontSize="54" color="#cfd3de" vAlign="middle" autoSize="shrink" singleLine="true" autoClearText="true" text="" input="true" prompt="[color=#888888]请输入聊天内容[/color]" maxLength="20"/>
<text id="n71_zgd9" name="tex_chat" xy="78,66" size="1068,112" group="n70_zgd9" font="ui://27vd145bh35o7ilo" fontSize="54" color="#444444" vAlign="middle" autoSize="shrink" singleLine="true" autoClearText="true" text="你好啊" input="true" prompt="[color=#888888]请输入聊天内容[/color]" maxLength="20"/>
<component id="n69_zgd9" name="btn_send" src="o8k8as" fileName="component/btn_normol.xml" xy="1176,75" size="240,102" group="n70_zgd9">
<Button icon="ui://l0ds4ys6o8k8ak"/>
</component>
<group id="n70_zgd9" name="n70" xy="78,66" size="1338,114" advanced="true">
<gearDisplay controller="sdk" pages="0"/>
</group>
</displayList>
<component id="n76_o8k8" name="text" src="o8k8at" fileName="images/jiangxi/btn_textMul.xml" xy="78,204">
<Button title="常用语" icon="ui://l0ds4ys6o8k8aq" selectedIcon="ui://l0ds4ys6o8k8ap"/>
</component>
<component id="n77_o8k8" name="image" src="o8k8at" fileName="images/jiangxi/btn_textMul.xml" xy="972,204">
<Button title="表情" icon="ui://l0ds4ys6o8k8aq" selectedIcon="ui://l0ds4ys6o8k8ap"/>
</component>
<component id="n78_o8k8" name="history" src="o8k8at" fileName="images/jiangxi/btn_textMul.xml" xy="526,204">
<Button title="聊天记录" icon="ui://l0ds4ys6o8k8aq" selectedIcon="ui://l0ds4ys6o8k8ap"/>
</component>
</displayList>
<customProperty target="text2" propertyId="0" label="111"/>
</component>

4
wb_new_ui/assets/Chat/component/Btn_YYItem.xml
View File

@ -2,10 +2,6 @@
<component size="550,62" pivot="0.5,0.5" extention="Button">
<controller name="button" pages="0,up,1,down" selected="0"/>
<displayList>
<image id="n3_h1uu" name="n3" src="trjma9" fileName="images/bsltd.png" xy="0,0" size="550,62" visible="false">
<gearDisplay controller="button" pages="0"/>
</image>
<image id="n4_hr0l" name="n4" src="hr0l7hzk" fileName="images/win/9bg_05.png" pkg="27vd145b" xy="5,2" size="545,56"/>
<text id="n1" name="title" xy="8,2" size="532,57" font="FZHei-B01S" fontSize="24" color="#ffffff" vAlign="middle" letterSpacing="-1" autoSize="none" singleLine="true" text="你太牛了">
<relation target="" sidePair="width-width,height-height"/>
</text>

14
wb_new_ui/assets/Chat/images/jiangxi/btn_textMul.xml
View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="450,96" extention="Button">
<controller name="button" pages="0,up,1,down" selected="0"/>
<controller name="button" pages="0,up,1,down" selected="1"/>
<displayList>
<image id="n3_o8k8" name="n3" src="o8k8aq" fileName="images/jiangxi/Rectangle 234.png" xy="0,0">
<gearDisplay controller="button" pages="0,1"/>
</image>
<image id="n4_o8k8" name="n4" src="o8k8ap" fileName="images/jiangxi/Rectangle 233.png" xy="0,0">
<gearDisplay controller="button" pages="1"/>
</image>
<loader id="n6_o8k8" name="icon" xy="0,0" size="450,96" url="ui://l0ds4ys6o8k8ap" fill="scale">
<relation target="" sidePair="width-width,height-height"/>
</loader>
<text id="n5_o8k8" name="title" xy="0,0" size="450,96" font="ui://27vd145bh35o7ilo" fontSize="60" color="#a47546" align="center" vAlign="middle" autoSize="shrink" text="小标题">
<gearColor controller="button" pages="0" values="#ffffff,#000000" default="#a47546,#000000"/>
</text>
</displayList>
<Button mode="Check"/>
</component>