黎川完成
parent
254be4db24
commit
d4591f9d94
|
|
@ -67,13 +67,33 @@ function M:InitView()
|
|||
self:InitPlayerInfoView()
|
||||
self._player_card_info = {}
|
||||
local _player_card_info = self._player_card_info
|
||||
for i = 1, #room.player_list do
|
||||
if room.curren_round > 0 then
|
||||
for i = 1, #room.room_config.people_num do
|
||||
local p = room.player_list[i]
|
||||
local index = self:GetPos(p.seat)
|
||||
print("lingmeng index", index)
|
||||
local info = self._player_info[index]
|
||||
local tem = self._view:GetChild("player_card_info" .. index)
|
||||
_player_card_info[index] = self:NewMJPlayerCardInfoView(tem, index)
|
||||
local info = self._player_info[i]
|
||||
local tem = self._view:GetChild("player_card_info" .. i)
|
||||
_player_card_info[i] = self:NewMJPlayerCardInfoView(tem, i)
|
||||
local cardInfo = _player_card_info[i]
|
||||
cardInfo:SetPlayer(p)
|
||||
cardInfo:UpdateHandCardWitness(false)
|
||||
cardInfo:UpdateOutCardList(nil, nil, self._cursor)
|
||||
for i = 1, #p.fz_list do
|
||||
cardInfo:UpdateFzList(p.fz_list[i], -1)
|
||||
end
|
||||
info:FillData(p)
|
||||
info._view.visible = false
|
||||
end
|
||||
else
|
||||
for i = 1, room.room_config.people_num do
|
||||
local tem = self._view:GetChild("player_card_info" .. i)
|
||||
_player_card_info[i] = self:NewMJPlayerCardInfoView(tem, i)
|
||||
end
|
||||
for i = 1, #room.player_list do
|
||||
local p = room.player_list[i]
|
||||
local index = self:GetPos(p.seat)
|
||||
local info = self._player_info[i]
|
||||
local cardInfo = _player_card_info[index]
|
||||
cardInfo:SetPlayer(p)
|
||||
cardInfo:UpdateHandCardWitness(false)
|
||||
|
|
@ -84,6 +104,8 @@ function M:InitView()
|
|||
info:FillData(p)
|
||||
info._view.visible = true
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
local btn_rule = self._view:GetChild('btn_rule')
|
||||
if btn_rule ~= nil then
|
||||
|
|
@ -146,11 +168,21 @@ function M:EventInit()
|
|||
self:PlayMJSound("user_enter.mp3")
|
||||
local arg = { ... }
|
||||
local p = arg[1]
|
||||
local info = self._player_info[self:GetPos(p.seat)]
|
||||
info:FillData(p)
|
||||
info._view.visible = true
|
||||
info:SetPlayer(p)
|
||||
info:FillData()
|
||||
local info1 = self._player_info[self:GetPos(p.seat)]
|
||||
info1:FillData(p)
|
||||
info1._view.visible = true
|
||||
|
||||
local info2 = self._player_card_info[self:GetPos(p.seat)]
|
||||
info2:SetPlayer(p)
|
||||
info2:FillData()
|
||||
end)
|
||||
|
||||
_gamectr:AddEventListener(GameEvent.PlayerLeave, function(...)
|
||||
local arg = { ... }
|
||||
local p = arg[1]
|
||||
local info1 = self._player_info[self:GetPos(p.seat)]
|
||||
info1._view.visible = false
|
||||
self:PlayMJSound("user_leave.mp3")
|
||||
end)
|
||||
|
||||
_gamectr:AddEventListener(GameEvent.WitnessPlayerEnter, function(...)
|
||||
|
|
@ -161,7 +193,6 @@ function M:EventInit()
|
|||
|
||||
local _room = DataManager.CurrenRoom
|
||||
local viewList_witness = self._view:GetChild('comp_witness'):GetChild('list_players')
|
||||
print("linemng tcp", _room._flag_updateWitness, #_room.witness_player_list, viewList_witness.numItems)
|
||||
if viewList_witness.numItems == #_room.witness_player_list then
|
||||
viewList_witness:RefreshVirtualList()
|
||||
else
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="2532,1170" designImage="ui://v0j9abjyj6yy1ft" designImageAlpha="0">
|
||||
<controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="1"/>
|
||||
<controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="0"/>
|
||||
<controller name="sdk" pages="0,,1," selected="0"/>
|
||||
<controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
|
||||
<controller name="action" pages="2,空,0,准备,1,开始" selected="1"/>
|
||||
<controller name="3d" pages="0,,1," selected="0"/>
|
||||
<controller name="showNext" pages="0,不展示,1,展示" selected="0"/>
|
||||
<controller name="showNextConfrim" pages="0,不展示,1,展示" selected="0"/>
|
||||
|
|
@ -35,19 +35,19 @@
|
|||
<relation target="n224_ogwn" sidePair="right-right"/>
|
||||
</component>
|
||||
<component id="n226_ogwn" name="roominfo_panel1" src="gq7m8g" fileName="Main_style_2/RoomInfoPanel1.xml" xy="118,-382" size="274,41" scale="2,2" touchable="false"/>
|
||||
<component id="n227_ogwn" name="btn_ready--" src="gq7m8w" fileName="Main_style_2/btn_ready.xml" xy="8054,794" group="n230_ogwn">
|
||||
<component id="n227_ogwn" name="btn_ready--" src="gq7m8w" fileName="Main_style_2/btn_ready.xml" xy="-16246,794" group="n230_ogwn">
|
||||
<gearDisplay controller="action" pages="0,1"/>
|
||||
<gearXY controller="action" pages="2,0,1" values="8054,794|-14734,794|5853,170"/>
|
||||
<gearXY controller="action" pages="2,0,1" values="8054,794|-16246,794|5853,170"/>
|
||||
<Button icon="ui://v0j9abjygq7m48"/>
|
||||
</component>
|
||||
<component id="n228_ogwn" name="btn_start" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-1992,480" group="n230_ogwn" visible="false">
|
||||
<component id="n228_ogwn" name="btn_start" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-3503,480" group="n230_ogwn" visible="false">
|
||||
<Button icon="ui://v0j9abjygq7m49"/>
|
||||
</component>
|
||||
<component id="n229_ogwn" name="btn_xipai--" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-1582,487" group="n230_ogwn" scale="0.9,1">
|
||||
<component id="n229_ogwn" name="btn_xipai--" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-3093,487" group="n230_ogwn" scale="0.9,1">
|
||||
<gearDisplay controller="action" pages="1"/>
|
||||
<Button icon="ui://v0j9abjygq7m4i"/>
|
||||
</component>
|
||||
<group id="n230_ogwn" name="n230" xy="-1992,480" size="10313,414" visible="false" advanced="true">
|
||||
<group id="n230_ogwn" name="n230" xy="-16246,480" size="13336,414" visible="false" advanced="true">
|
||||
<relation target="" sidePair="bottom-bottom,center-center"/>
|
||||
</group>
|
||||
<component id="n231_ogwn" name="gcm_chat" src="gq7m8z" fileName="Main_style_2/Gcm_chat.xml" xy="1933,-505">
|
||||
|
|
@ -89,7 +89,7 @@
|
|||
</group>
|
||||
<component id="n244_ogwn" name="btn_ready" src="pkx5sw" fileName="Main_new/Main/Component/btn_ready.xml" xy="1062,721" size="408,114">
|
||||
<gearDisplay controller="action" pages="0"/>
|
||||
<relation target="n247_ogwn" sidePair=""/>
|
||||
<relation target="n247_ogwn" sidePair="top-bottom"/>
|
||||
</component>
|
||||
<component id="n248_ogwn" name="jing" src="ckvb11l" fileName="Main_new/Main/Component/Comp_jing.xml" xy="405,25" size="115,121" visible="false" touchable="false"/>
|
||||
<text id="n249_ogwn" name="text_time" xy="132,15" size="159,56" group="n253_ogwn" font="ui://27vd145bh35o7ika" fontSize="42" color="#ffffff" align="center" letterSpacing="3" autoSize="none" text="14:13"/>
|
||||
|
|
@ -139,7 +139,7 @@
|
|||
<relation target="" sidePair="width-width,height-height"/>
|
||||
</component>
|
||||
<component id="n294_kikc" name="com_notice" src="kikc1g4" fileName="Main_new/com_notice.xml" xy="567,124" size="1290,63"/>
|
||||
<component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="89,789" size="153,132">
|
||||
<component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,891" size="153,132">
|
||||
<gearDisplay controller="state" pages="0,2"/>
|
||||
<gearXY controller="state" pages="0" values="1189,891" default="89,789"/>
|
||||
<relation target="" sidePair="center-center,bottom-bottom"/>
|
||||
|
|
@ -147,7 +147,7 @@
|
|||
<component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="87,788" size="153,132">
|
||||
<gearDisplay controller="state" pages="1,3,4"/>
|
||||
</component>
|
||||
<component id="n116_pkx5" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="2004,77" size="153,132">
|
||||
<component id="n116_pkx5" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1888,519" size="153,132">
|
||||
<gearDisplay controller="state" pages="0,2"/>
|
||||
<gearXY controller="state" pages="0,1,2,3" values="1888,519|2004,77|2311,292|2314,294" default="1194,274"/>
|
||||
<relation target="" sidePair="middle-middle"/>
|
||||
|
|
|
|||
Binary file not shown.
Loading…
Reference in New Issue