Family_fui.bytes冲突,直接发布并提交
commit
ff0248dca8
|
|
@ -261,7 +261,7 @@ function M:OnEvtUpdateRoom(evt_data)
|
||||||
player.playing = "stopPlaying"
|
player.playing = "stopPlaying"
|
||||||
end
|
end
|
||||||
|
|
||||||
for _, room in pairs(cmds) do
|
for _, room in pairs(group.rooms) do
|
||||||
for _, palyingUser in pairs(room.plist or {}) do
|
for _, palyingUser in pairs(room.plist or {}) do
|
||||||
local _player = group.memberMap[palyingUser.aid]
|
local _player = group.memberMap[palyingUser.aid]
|
||||||
if _player then
|
if _player then
|
||||||
|
|
|
||||||
|
|
@ -663,7 +663,14 @@ function M:UpdateFamilyRoom(fgCtr, id)
|
||||||
roomName = string.format("(%s)%s", playList[newIndex].game_name, roomName)
|
roomName = string.format("(%s)%s", playList[newIndex].game_name, roomName)
|
||||||
obj:GetChild('game_type').text = roomName
|
obj:GetChild('game_type').text = roomName
|
||||||
obj:GetChild('btn_joinGame'):GetController('type').selectedIndex = 0
|
obj:GetChild('btn_joinGame'):GetController('type').selectedIndex = 0
|
||||||
|
obj:GetController('type').selectedIndex = 0
|
||||||
obj:GetController('num').selectedIndex = playList[newIndex].maxPlayers - 2
|
obj:GetController('num').selectedIndex = playList[newIndex].maxPlayers - 2
|
||||||
|
obj:GetChild('Label_joinPlayers').text = ""
|
||||||
|
for i = 1, 4 do
|
||||||
|
local btn = obj:GetChild(string.format("player%d", i))
|
||||||
|
btn:GetChild("icon").url = "ui://Family/btn_mainGameNumberHead"
|
||||||
|
--ImageLoad.Load("ui://Family/btn_mainGameNumberHead", obj:GetChild(string.format("player%d", i))._iconObject)
|
||||||
|
end
|
||||||
obj:GetChild('btn_joinGame').onClick:Set(function()
|
obj:GetChild('btn_joinGame').onClick:Set(function()
|
||||||
roomCtr:PublicJoinRoom(
|
roomCtr:PublicJoinRoom(
|
||||||
Protocol.WEB_FG_MATCH_ROOM,
|
Protocol.WEB_FG_MATCH_ROOM,
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<component size="2532,1170">
|
<component size="2532,1170">
|
||||||
<controller name="familyType" exported="true" homePageType="specific" homePage="6" pages="6,空,0,main,1,playEdit,4,createAndJoin,5,numberList,7,numberRecord,8,auditNumber" selected="4"/>
|
<controller name="familyType" exported="true" homePageType="specific" homePage="6" pages="6,空,0,main,1,playEdit,4,createAndJoin,5,numberList,7,numberRecord,8,auditNumber" selected="1"/>
|
||||||
<controller name="createOrJoin" pages="0,create,1,join" selected="0"/>
|
<controller name="createOrJoin" pages="0,create,1,join" selected="0"/>
|
||||||
<controller name="listFamily" pages="0,,1,,10,,11,,12,,13,,14,,15," selected="0"/>
|
<controller name="listFamily" pages="0,,1,,10,,11,,12,,13,,14,,15," selected="0"/>
|
||||||
<controller name="numberRecordRank" pages="0,,1,,3," selected="0"/>
|
<controller name="numberRecordRank" pages="0,,1,,3," selected="0"/>
|
||||||
|
|
@ -8,7 +8,7 @@
|
||||||
<controller name="showChooseTime" pages="0,,1," selected="0"/>
|
<controller name="showChooseTime" pages="0,,1," selected="0"/>
|
||||||
<controller name="lev" pages="0,1,1,2,2,3" selected="0"/>
|
<controller name="lev" pages="0,1,1,2,2,3" selected="0"/>
|
||||||
<controller name="moreBtn" pages="0,,1," selected="0"/>
|
<controller name="moreBtn" pages="0,,1," selected="0"/>
|
||||||
<controller name="familyBan" pages="0,,1," selected="0"/>
|
<controller name="familyBan" pages="0,,1," selected="1"/>
|
||||||
<controller name="cMyfamilyList" pages="0,,1," selected="0"/>
|
<controller name="cMyfamilyList" pages="0,,1," selected="0"/>
|
||||||
<controller name="cIsChatRoom" pages="0,,1," selected="0">
|
<controller name="cIsChatRoom" pages="0,,1," selected="0">
|
||||||
<remark page="0" value="关闭聊天室"/>
|
<remark page="0" value="关闭聊天室"/>
|
||||||
|
|
@ -128,7 +128,7 @@
|
||||||
</text>
|
</text>
|
||||||
<graph id="n371_ajr3" name="bh_ban" xy="490,288" size="2006,830" group="n34_86ct" type="rect" lineSize="0" fillColor="#66000000">
|
<graph id="n371_ajr3" name="bh_ban" xy="490,288" size="2006,830" group="n34_86ct" type="rect" lineSize="0" fillColor="#66000000">
|
||||||
<gearDisplay controller="familyBan" pages="1"/>
|
<gearDisplay controller="familyBan" pages="1"/>
|
||||||
<relation target="" sidePair="height-height,left-left%"/>
|
<relation target="" sidePair="rightext-right,bottomext-bottom"/>
|
||||||
</graph>
|
</graph>
|
||||||
<text id="n372_ajr3" name="text_banMain" xy="1376,647" size="455,121" group="n34_86ct" font="ui://27vd145bh35o7iln" fontSize="50" autoSize="none" text="该亲友圈已打烊">
|
<text id="n372_ajr3" name="text_banMain" xy="1376,647" size="455,121" group="n34_86ct" font="ui://27vd145bh35o7iln" fontSize="50" autoSize="none" text="该亲友圈已打烊">
|
||||||
<gearDisplay controller="familyBan" pages="1"/>
|
<gearDisplay controller="familyBan" pages="1"/>
|
||||||
|
|
|
||||||
|
|
@ -107,7 +107,7 @@
|
||||||
<image id="jrro7cy5" name="btn_mainListStart.png" path="/Main/Image/"/>
|
<image id="jrro7cy5" name="btn_mainListStart.png" path="/Main/Image/"/>
|
||||||
<image id="jrro7cy6" name="btn_mainListOn.png" path="/Main/Image/"/>
|
<image id="jrro7cy6" name="btn_mainListOn.png" path="/Main/Image/"/>
|
||||||
<image id="jrro7cy7" name="btn_mainListJoin.png" path="/Main/Image/"/>
|
<image id="jrro7cy7" name="btn_mainListJoin.png" path="/Main/Image/"/>
|
||||||
<image id="jrro7cy8" name="btn_mainGameNumberHead.png" path="/Main/Image/"/>
|
<image id="jrro7cy8" name="btn_mainGameNumberHead.png" path="/Main/Image/" exported="true"/>
|
||||||
<image id="jrro7cy9" name="btn_hideRoom.png" path="/Main/Image/"/>
|
<image id="jrro7cy9" name="btn_hideRoom.png" path="/Main/Image/"/>
|
||||||
<image id="jrro7cya" name="btn_familyName_on.png" path="/Main/Image/"/>
|
<image id="jrro7cya" name="btn_familyName_on.png" path="/Main/Image/"/>
|
||||||
<image id="jrro7cyb" name="btn_familyName_off.png" path="/Main/Image/"/>
|
<image id="jrro7cyb" name="btn_familyName_off.png" path="/Main/Image/"/>
|
||||||
|
|
|
||||||
Binary file not shown.
Loading…
Reference in New Issue