update
parent
af3db3a8ee
commit
bdb6f43110
|
|
@ -71,7 +71,12 @@ function M:InitView(url)
|
||||||
local list = _room.player_list
|
local list = _room.player_list
|
||||||
for i = 1, #list do
|
for i = 1, #list do
|
||||||
local p = list[i]
|
local p = list[i]
|
||||||
local info = _player_info[self:GetPos(p.seat)]
|
if p.seat then
|
||||||
|
local info = _player_info[self:GetPos(p.seat)]
|
||||||
|
else
|
||||||
|
local info = _player_info[self:GetPos(1)]
|
||||||
|
end
|
||||||
|
|
||||||
info._view.visible = true
|
info._view.visible = true
|
||||||
info:FillData(p)
|
info:FillData(p)
|
||||||
info:MarkBank(p.seat == _room.banker_seat)
|
info:MarkBank(p.seat == _room.banker_seat)
|
||||||
|
|
@ -310,7 +315,7 @@ end
|
||||||
|
|
||||||
function M:GetPos(seat, myseat)
|
function M:GetPos(seat, myseat)
|
||||||
local my_seat = 1
|
local my_seat = 1
|
||||||
if not myseat then
|
if not myseat and self._room.self_player ~= nil then
|
||||||
my_seat = self._room.self_player.seat
|
my_seat = self._room.self_player.seat
|
||||||
else
|
else
|
||||||
my_seat = myseat
|
my_seat = myseat
|
||||||
|
|
|
||||||
|
|
@ -997,7 +997,7 @@ function M:OnFangziAction(...)
|
||||||
end
|
end
|
||||||
coroutine.start(
|
coroutine.start(
|
||||||
function()
|
function()
|
||||||
coroutine.wait(0.3)
|
coroutine.wait(1.3)
|
||||||
if fz.type ~= RB_FZType.Kan then
|
if fz.type ~= RB_FZType.Kan then
|
||||||
info:SendChangeCard()
|
info:SendChangeCard()
|
||||||
end
|
end
|
||||||
|
|
@ -1080,7 +1080,7 @@ function M:OnFangziAction(...)
|
||||||
self._popEvent = true
|
self._popEvent = true
|
||||||
coroutine.start(
|
coroutine.start(
|
||||||
function()
|
function()
|
||||||
coroutine.wait(0.3)
|
coroutine.wait(1.3)
|
||||||
local info = _player_card_info[1]
|
local info = _player_card_info[1]
|
||||||
info:UpdateIsOnClick(true)
|
info:UpdateIsOnClick(true)
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -35,6 +35,7 @@ function M:InitView(url)
|
||||||
self._gamectr = ControllerManager.GetController(GameController)
|
self._gamectr = ControllerManager.GetController(GameController)
|
||||||
UIPackage.AddPackage('base/main_zipai/ui/Main_RunBeard')
|
UIPackage.AddPackage('base/main_zipai/ui/Main_RunBeard')
|
||||||
UIPackage.AddPackage('extend/zipai/fanpaofa/ui/Extend_Poker_FanPaoFa')
|
UIPackage.AddPackage('extend/zipai/fanpaofa/ui/Extend_Poker_FanPaoFa')
|
||||||
|
printlog("room.room_config.people_num"..room.room_config.people_num)
|
||||||
ZPPlayBackView.InitView(self, 'ui://Main_RunBeard/Main_' .. room.room_config.people_num)
|
ZPPlayBackView.InitView(self, 'ui://Main_RunBeard/Main_' .. room.room_config.people_num)
|
||||||
UpdateBeat:Add(self.OnUpdate, self)
|
UpdateBeat:Add(self.OnUpdate, self)
|
||||||
|
|
||||||
|
|
@ -44,9 +45,9 @@ function M:InitView(url)
|
||||||
local _data = json.decode(json_data)
|
local _data = json.decode(json_data)
|
||||||
local typeface = _data['game_typeface']
|
local typeface = _data['game_typeface']
|
||||||
if typeface == 1 then
|
if typeface == 1 then
|
||||||
room.change_card_display = '2_'
|
room.change_card_display = '6_'
|
||||||
else
|
else
|
||||||
room.change_card_display = '1_'
|
room.change_card_display = '6_'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
self._player_card_info = {}
|
self._player_card_info = {}
|
||||||
|
|
|
||||||
|
|
@ -754,7 +754,7 @@ function M:FillItemData(room, data, item)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
--printlog("FillItemData11333333")
|
--printlog("FillItemData11333333")
|
||||||
if #win_data.hand_card > 0 then
|
--[[ if #win_data.hand_card > 0 then
|
||||||
for i = 1, #win_data.hand_card, 4 do
|
for i = 1, #win_data.hand_card, 4 do
|
||||||
local cards = card_list:AddItemFromPool()
|
local cards = card_list:AddItemFromPool()
|
||||||
cards:GetChild('card_type').text = '散'
|
cards:GetChild('card_type').text = '散'
|
||||||
|
|
@ -771,7 +771,7 @@ function M:FillItemData(room, data, item)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end]]
|
||||||
end
|
end
|
||||||
item:RemoveChildrenToPool()
|
item:RemoveChildrenToPool()
|
||||||
--printlog("FillItemData133331")
|
--printlog("FillItemData133331")
|
||||||
|
|
|
||||||
|
|
@ -39,9 +39,9 @@ function M:init()
|
||||||
local width = self._view.width
|
local width = self._view.width
|
||||||
local m_width = self._main_view._view.width
|
local m_width = self._main_view._view.width
|
||||||
local m_height = self._main_view._view.height
|
local m_height = self._main_view._view.height
|
||||||
-- self._view.x = 0.5 * m_width - 0.5 * width
|
self._view.x = 0.115 * m_width --- 0.5 * width
|
||||||
self._view.x = 0
|
--self._view.x = 0
|
||||||
self._view.y = 0.7 * m_height
|
self._view.y = 0.65 * m_height
|
||||||
SetObjEnabled(self._view, false)
|
SetObjEnabled(self._view, false)
|
||||||
self._view.onTouchBegin:Add(handler(self, self.OnTouchBegin))
|
self._view.onTouchBegin:Add(handler(self, self.OnTouchBegin))
|
||||||
self._view.onTouchMove:Add(handler(self, self.OnTouchMove))
|
self._view.onTouchMove:Add(handler(self, self.OnTouchMove))
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"libview.firstColumnWidth": 522,
|
"libview.firstColumnWidth": 297,
|
||||||
"expanded_nodes": [
|
"expanded_nodes": [
|
||||||
"27vd145b",
|
"27vd145b",
|
||||||
"/",
|
"/",
|
||||||
|
|
@ -10,6 +10,7 @@
|
||||||
"doc.openedDocs": [
|
"doc.openedDocs": [
|
||||||
"ui://2d9xdj6zfn7fao",
|
"ui://2d9xdj6zfn7fao",
|
||||||
"ui://m7iejg46kwi0hma",
|
"ui://m7iejg46kwi0hma",
|
||||||
|
"ui://v6yvqp7wf55qwa",
|
||||||
"ui://2d9xdj6zm16m7dqt",
|
"ui://2d9xdj6zm16m7dqt",
|
||||||
"ui://ppu1wv76j4mf9j",
|
"ui://ppu1wv76j4mf9j",
|
||||||
"ui://ppu1wv76j4mf9k",
|
"ui://ppu1wv76j4mf9k",
|
||||||
|
|
@ -21,15 +22,15 @@
|
||||||
"test.device": "720p Phone",
|
"test.device": "720p Phone",
|
||||||
"canvasColor": 10066329,
|
"canvasColor": 10066329,
|
||||||
"auxline2": true,
|
"auxline2": true,
|
||||||
"doc.activeDoc": "ui://m7iejg46kwi0hma",
|
"doc.activeDoc": "ui://v6yvqp7wf55qwa",
|
||||||
"libview.twoColumn": false,
|
"libview.twoColumn": false,
|
||||||
"libview.expandedNodes": [
|
"libview.expandedNodes": [
|
||||||
"m7iejg46",
|
"v6yvqp7w",
|
||||||
"/",
|
"/",
|
||||||
"m7iejg46",
|
"v6yvqp7w",
|
||||||
"/mgr/",
|
"/component/",
|
||||||
"m7iejg46",
|
"v6yvqp7w",
|
||||||
"/mgr/component/"
|
"/component/Main/"
|
||||||
],
|
],
|
||||||
"auxline1": true,
|
"auxline1": true,
|
||||||
"snapToGrid": true,
|
"snapToGrid": true,
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<component size="1334,750" designImageAlpha="100" designImageLayer="1">
|
<component size="1334,750" designImageAlpha="100" designImageLayer="1">
|
||||||
<controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放" selected="1"/>
|
<controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放" selected="0"/>
|
||||||
<controller name="sdk" pages="0,,1," selected="0"/>
|
<controller name="sdk" pages="0,,1," selected="0"/>
|
||||||
<controller name="action" pages="2,空,0,准备,1,开始,3,打鸟" selected="0"/>
|
<controller name="action" pages="2,空,0,准备,1,开始,3,打鸟" selected="0"/>
|
||||||
<controller name="time" pages="0,,1,,2,,3," selected="0"/>
|
<controller name="time" pages="0,,1,,2,,3," selected="1"/>
|
||||||
<controller name="card_eff" pages="0,,1," selected="0"/>
|
<controller name="card_eff" pages="0,,1," selected="0"/>
|
||||||
<controller name="zidongtishi" pages="0,,1," selected="0"/>
|
<controller name="zidongtishi" pages="0,,1," selected="0"/>
|
||||||
<controller name="showBtn" pages="0,,1," selected="0"/>
|
<controller name="showBtn" pages="0,,1," selected="0"/>
|
||||||
|
|
@ -33,11 +33,11 @@
|
||||||
<gearDisplay controller="state" pages="0,1,2"/>
|
<gearDisplay controller="state" pages="0,1,2"/>
|
||||||
<relation target="" sidePair="center-center"/>
|
<relation target="" sidePair="center-center"/>
|
||||||
</group>
|
</group>
|
||||||
<component id="n18" name="player_info2" src="prgzam" fileName="component/head/PlayerHead_2.xml" xy="1161,111" size="120,151">
|
<component id="n18" name="player_info2" src="prgzam" fileName="component/head/PlayerHead_2.xml" xy="1168,106" size="120,151">
|
||||||
<gearXY controller="state" pages="0,1,2,3" values="1168,106|1161,111|1157,250|1174,84"/>
|
<gearXY controller="state" pages="0,1,2,3" values="1168,106|1161,111|1157,250|1174,84"/>
|
||||||
<relation target="" sidePair="right-right%,top-top%"/>
|
<relation target="" sidePair="right-right%,top-top%"/>
|
||||||
</component>
|
</component>
|
||||||
<component id="n7" name="player_info1" src="prgzab" fileName="component/head/PlayerHead_1.xml" xy="1,299" size="150,154">
|
<component id="n7" name="player_info1" src="prgzab" fileName="component/head/PlayerHead_1.xml" xy="1,295" size="150,154">
|
||||||
<gearXY controller="state" pages="0,1,2,3" values="1,295|1,299|37,355|9,334"/>
|
<gearXY controller="state" pages="0,1,2,3" values="1,295|1,299|37,355|9,334"/>
|
||||||
<relation target="" sidePair="left-left,bottom-bottom"/>
|
<relation target="" sidePair="left-left,bottom-bottom"/>
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -46,11 +46,11 @@
|
||||||
<gearLook controller="state" pages="3" values="1,0,0,1" default="1,0,0,1"/>
|
<gearLook controller="state" pages="3" values="1,0,0,1" default="1,0,0,1"/>
|
||||||
<relation target="" sidePair="center-center,bottom-bottom"/>
|
<relation target="" sidePair="center-center,bottom-bottom"/>
|
||||||
</component>
|
</component>
|
||||||
<component id="n71_sdax" name="player_card_info_2" src="prgz8d" fileName="component/card_info/Player_card_info_2.xml" xy="790,122" touchable="false">
|
<component id="n71_sdax" name="player_card_info_2" src="prgz8d" fileName="component/card_info/Player_card_info_2.xml" xy="797,117" touchable="false">
|
||||||
<gearDisplay controller="state" pages="1,3"/>
|
<gearDisplay controller="state" pages="1,3"/>
|
||||||
<relation target="n18" sidePair="right-left,middle-middle"/>
|
<relation target="n18" sidePair="right-left,middle-middle"/>
|
||||||
</component>
|
</component>
|
||||||
<component id="n67_qfrg" name="time" src="prgzer" fileName="component/Clock.xml" xy="625,198" size="82,88" scale="0.8,0.8" touchable="false">
|
<component id="n67_qfrg" name="time" src="prgzer" fileName="component/Clock.xml" xy="171,315" size="82,88" scale="0.8,0.8" visible="false" touchable="false">
|
||||||
<gearDisplay controller="time" pages="1,2,3"/>
|
<gearDisplay controller="time" pages="1,2,3"/>
|
||||||
<gearXY controller="time" pages="1,2" values="171,315|1133,63" default="625,198"/>
|
<gearXY controller="time" pages="1,2" values="171,315|1133,63" default="625,198"/>
|
||||||
<relation target="" sidePair="left-left%,top-top%"/>
|
<relation target="" sidePair="left-left%,top-top%"/>
|
||||||
|
|
@ -146,7 +146,7 @@
|
||||||
<relation target="" sidePair="left-right%"/>
|
<relation target="" sidePair="left-right%"/>
|
||||||
<Button controller="showBtn" page="1"/>
|
<Button controller="showBtn" page="1"/>
|
||||||
</component>
|
</component>
|
||||||
<image id="n122_thxk" name="n122" src="thxkcim" fileName="images/Rectangle 397.png" xy="1239,63" size="80,78" group="n123_thxk">
|
<image id="n122_thxk" name="n122" src="thxkcim" fileName="images/Rectangle 397.png" xy="1239,63" size="80,163" group="n123_thxk">
|
||||||
<gearSize controller="state" pages="0,1" values="80,163,1,1|80,78,1,1" default="80,258,1,1"/>
|
<gearSize controller="state" pages="0,1" values="80,163,1,1|80,78,1,1" default="80,258,1,1"/>
|
||||||
</image>
|
</image>
|
||||||
<component id="n84_q50p" name="btn_back_lobby" src="prgzds" fileName="component/poker/Btn_back_lobby.xml" xy="1258,70" size="44,65" group="n123_thxk">
|
<component id="n84_q50p" name="btn_back_lobby" src="prgzds" fileName="component/poker/Btn_back_lobby.xml" xy="1258,70" size="44,65" group="n123_thxk">
|
||||||
|
|
@ -161,7 +161,7 @@
|
||||||
<component id="n100_n6fs" name="btn_back_jiesan" src="prgzdw" fileName="component/poker/Btn_back_jiesan.xml" xy="1258,69" group="n123_thxk">
|
<component id="n100_n6fs" name="btn_back_jiesan" src="prgzdw" fileName="component/poker/Btn_back_jiesan.xml" xy="1258,69" group="n123_thxk">
|
||||||
<gearDisplay controller="state" pages="1"/>
|
<gearDisplay controller="state" pages="1"/>
|
||||||
</component>
|
</component>
|
||||||
<group id="n123_thxk" name="ShowMore" xy="1239,63" size="80,159" advanced="true">
|
<group id="n123_thxk" name="ShowMore" xy="1239,63" size="80,163" advanced="true">
|
||||||
<gearDisplay controller="showBtn" pages="1"/>
|
<gearDisplay controller="showBtn" pages="1"/>
|
||||||
<relation target="" sidePair="left-right%"/>
|
<relation target="" sidePair="left-right%"/>
|
||||||
</group>
|
</group>
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<component size="1334,750" designImage="ui://3vytbifonu0l2f" designImageOffsetX="-200" designImageOffsetY="-100">
|
<component size="1334,750" designImage="ui://3vytbifonu0l2f" designImageOffsetX="-200" designImageOffsetY="-100">
|
||||||
<controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="3"/>
|
<controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="0"/>
|
||||||
<controller name="sdk" pages="0,,1," 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="0"/>
|
||||||
<controller name="jushu" pages="0,,1," selected="0"/>
|
<controller name="jushu" pages="0,,1," selected="0"/>
|
||||||
|
|
@ -27,7 +27,7 @@
|
||||||
<component id="n147_nu0l" name="player_info2" src="f55qw7" fileName="component/Main/component/PlayerHead_2.xml" xy="11,71">
|
<component id="n147_nu0l" name="player_info2" src="f55qw7" fileName="component/Main/component/PlayerHead_2.xml" xy="11,71">
|
||||||
<relation target="" sidePair="left-left,leftext-left"/>
|
<relation target="" sidePair="left-left,leftext-left"/>
|
||||||
</component>
|
</component>
|
||||||
<component id="n7" name="player_info1" src="f55qw4" fileName="component/Main/component/PlayerHead_1.xml" xy="8,570" size="189,67">
|
<component id="n7" name="player_info1" src="f55qw4" fileName="component/Main/component/PlayerHead_1.xml" xy="20,524" size="189,67">
|
||||||
<gearXY controller="state" pages="0,1,2,3" values="20,524|22,548|8,570|8,570"/>
|
<gearXY controller="state" pages="0,1,2,3" values="20,524|22,548|8,570|8,570"/>
|
||||||
<relation target="" sidePair="left-left,leftext-left"/>
|
<relation target="" sidePair="left-left,leftext-left"/>
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -56,7 +56,7 @@
|
||||||
<gearDisplay controller="state" pages="0"/>
|
<gearDisplay controller="state" pages="0"/>
|
||||||
<relation target="" sidePair="center-center"/>
|
<relation target="" sidePair="center-center"/>
|
||||||
</group>
|
</group>
|
||||||
<text id="n58_zzcq" name="tex_version" xy="1203,709" size="130,38" visible="false" fontSize="30" color="#ffffff" align="center" autoSize="none" text="v2.0.0">
|
<text id="n58_zzcq" name="tex_version" xy="1198,242" size="130,33" fontSize="22" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="v2.0.0">
|
||||||
<gearDisplay controller="state" pages="0,1,2"/>
|
<gearDisplay controller="state" pages="0,1,2"/>
|
||||||
<relation target="" sidePair="right-right"/>
|
<relation target="" sidePair="right-right"/>
|
||||||
</text>
|
</text>
|
||||||
|
|
@ -71,9 +71,11 @@
|
||||||
<gearDisplay controller="state" pages="0,1,2"/>
|
<gearDisplay controller="state" pages="0,1,2"/>
|
||||||
<relation target="" sidePair="left-left"/>
|
<relation target="" sidePair="left-left"/>
|
||||||
</component>
|
</component>
|
||||||
<component id="n31_h1uu" name="roominfo_panel" src="f55qwb" fileName="component/Main/RoomInfoPanel1.xml" xy="856,-25" size="461,97" group="n150_8th3" touchable="false"/>
|
<component id="n31_h1uu" name="roominfo_panel" src="f55qwb" fileName="component/Main/RoomInfoPanel1.xml" xy="854,-30" size="461,97" group="n150_8th3" touchable="false">
|
||||||
|
<relation target="" sidePair="right-right,top-top"/>
|
||||||
|
</component>
|
||||||
<component id="n46_u4l2" name="btn_rule1" src="f55qvn" fileName="component/Main/component/Folder/component/phone_info/Btn_log.xml" xy="562,-92" size="157,4" group="n150_8th3" visible="false"/>
|
<component id="n46_u4l2" name="btn_rule1" src="f55qvn" fileName="component/Main/component/Folder/component/phone_info/Btn_log.xml" xy="562,-92" size="157,4" group="n150_8th3" visible="false"/>
|
||||||
<group id="n150_8th3" name="n150" xy="0,-92" size="1317,164" advanced="true">
|
<group id="n150_8th3" name="n150" xy="0,-92" size="1315,163" advanced="true">
|
||||||
<relation target="" sidePair="left-left"/>
|
<relation target="" sidePair="left-left"/>
|
||||||
</group>
|
</group>
|
||||||
<image id="n152_8th3" name="n152" src="f55qvu" fileName="component/Main/images/di00.png" xy="377,-91" size="580,86" visible="false">
|
<image id="n152_8th3" name="n152" src="f55qvu" fileName="component/Main/images/di00.png" xy="377,-91" size="580,86" visible="false">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue