跑的快观战。回放上次调整同步，继续调整回放，声音调整之类的
罗家炜
parent
3232602634
commit
ad6a07242f
|
|
@ -38,9 +38,8 @@ function M:InitView(url)
|
|||
local room = self._room
|
||||
BaseView.InitView(self, url)
|
||||
|
||||
|
||||
|
||||
self.com_logocType = self._view:GetChild("com_logo"):GetController("cType")
|
||||
self._state = self._view:GetController("state")
|
||||
|
||||
self.com_notice = self._view:GetChild("com_notice")
|
||||
end
|
||||
|
|
@ -50,7 +49,7 @@ function M:EventInit()
|
|||
local _room = self._room
|
||||
|
||||
_gamectr:AddEventListener(GameEvent.PlayerEnter, function(...)
|
||||
self:PlayMJSound("user_enter.mp3")
|
||||
ViewUtil.PlaySound("WitnessView", "base/main_majiang/sound/user_enter.mp3")
|
||||
local arg = { ... }
|
||||
local p = arg[1]
|
||||
local info1 = self._player_info[self:GetPos(p.seat)]
|
||||
|
|
@ -58,8 +57,10 @@ function M:EventInit()
|
|||
info1._view.visible = true
|
||||
|
||||
local info2 = self._player_card_info[self:GetPos(p.seat)]
|
||||
info2:SetPlayer(p)
|
||||
info2:FillData()
|
||||
if info2.SetPlayer then
|
||||
info2:SetPlayer(p)
|
||||
info2:FillData()
|
||||
end
|
||||
end)
|
||||
|
||||
_gamectr:AddEventListener(GameEvent.PlayerLeave, function(...)
|
||||
|
|
@ -67,11 +68,12 @@ function M:EventInit()
|
|||
local p = arg[1]
|
||||
local info1 = self._player_info[self:GetPos(p.seat)]
|
||||
info1._view.visible = false
|
||||
self:PlayMJSound("user_leave.mp3")
|
||||
ViewUtil.PlaySound("WitnessView", "base/main_majiang/sound/user_leave.mp3")
|
||||
end)
|
||||
|
||||
_gamectr:AddEventListener(GameEvent.WitnessPlayerEnter, function(...)
|
||||
self:PlayMJSound("user_enter.mp3")
|
||||
ViewUtil.PlaySound("WitnessView", "base/main_majiang/sound/user_enter.mp3")
|
||||
|
||||
local arg = { ... }
|
||||
local witnessPlayerList = arg[1]
|
||||
self._room.witness_player_list = witnessPlayerList
|
||||
|
|
@ -221,47 +223,6 @@ function M:MarkSelfTuoguan()
|
|||
GRoot.inst:AddChild(com_tuoguan)
|
||||
com_tuoguan:MakeFullScreen()
|
||||
com_tuoguan:Center()
|
||||
--com_tuoguan.y = GRoot.inst.height - com_tuoguan.height
|
||||
--com_tuoguan.x = (GRoot.inst.width - com_tuoguan.width) * 0.5
|
||||
-- local _msg_view = nil
|
||||
-- com_tuoguan:GetChild('n0').onClick:Set(
|
||||
-- function()
|
||||
-- if _msg_view then
|
||||
-- _msg_view:Dispose()
|
||||
-- end
|
||||
-- local _curren_msg = UIPackage.CreateObjectFromURL('ui://Common/MessageBox')
|
||||
-- _msg_view = _curren_msg
|
||||
-- _msg_view:GetChild('btn_ok').onClick:Set(
|
||||
-- function()
|
||||
-- _msg_view:Dispose()
|
||||
-- _msg_view = nil
|
||||
-- self._gamectr:Entrust(false)
|
||||
-- end
|
||||
-- )
|
||||
-- _msg_view:GetChild('btn_close').onClick:Set(
|
||||
-- function()
|
||||
-- _msg_view:Dispose()
|
||||
-- _msg_view = nil
|
||||
-- end
|
||||
-- )
|
||||
|
||||
-- _msg_view:GetChild('btn_close1').onClick:Set(
|
||||
-- function()
|
||||
-- _msg_view:Dispose()
|
||||
-- _msg_view = nil
|
||||
-- end
|
||||
-- )
|
||||
-- local roate = GRoot.inst.width / GRoot.inst.height
|
||||
-- local num = 100
|
||||
-- if roate < 1.9 then
|
||||
-- num = 250
|
||||
-- end
|
||||
-- com_tuoguan:AddChild(_msg_view)
|
||||
-- _msg_view:GetChild('tex_message').text = '确定要取消托管吗？'
|
||||
-- _msg_view.x = (com_tuoguan.width - _msg_view.width) * 0.5 - num
|
||||
-- _msg_view.y = (com_tuoguan.height - com_tuoguan.y - _msg_view.height) * 0.5
|
||||
-- end
|
||||
-- )
|
||||
end
|
||||
|
||||
-- 取消标记自己托管
|
||||
|
|
@ -393,12 +354,7 @@ function M:OnUpdate()
|
|||
print("witness error")
|
||||
print(result)
|
||||
error(result)
|
||||
-- self._gamectr = ControllerManager.GetController(GameController)
|
||||
-- if self._gamectr then
|
||||
-- self._gamectr:ResetConnect()
|
||||
-- end
|
||||
end
|
||||
--func()
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -269,6 +269,10 @@ function M:fillResult0(room, peopleNum, result)
|
|||
isMeCtr.selectedIndex = 1
|
||||
end
|
||||
|
||||
if infoList.seat == room.self_player.seat then
|
||||
isMeCtr.selectedIndex = 1
|
||||
end
|
||||
|
||||
if infoList.seat == room.banker_seat then
|
||||
isZhuang.selectedIndex = 1
|
||||
end
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ function M:FillRoomData(data)
|
|||
for i = 1, #room.player_list do
|
||||
local p = room.player_list[i]
|
||||
local card_info = _player_card_info[self:GetPos(p.seat)]
|
||||
-- card_info:Clear()
|
||||
card_info:Clear()
|
||||
table.sort(p.card_list, self.HandCardSortAndJing)
|
||||
card_info:UpdateHandCard(false, true)
|
||||
self._player_info[i]._view:GetController("piao_niao").selectedIndex = 0
|
||||
|
|
@ -103,7 +103,7 @@ function M:ShowStep(index)
|
|||
else
|
||||
info:UpdateOutCardList()
|
||||
end
|
||||
if step.cmd == Record_Event.Evt_GetCard and p.seat == step.current_out_seat then
|
||||
if (step.cmd == Record_Event.Evt_GetCard and p.seat == step.current_out_seat) or step.cmd == Record_Event.Evt_Action then
|
||||
info:UpdateHandCard(true, true)
|
||||
else
|
||||
info:UpdateHandCard(false, true)
|
||||
|
|
@ -141,7 +141,7 @@ function M:ShowStep(index)
|
|||
end
|
||||
if step.cmd == Record_Event.Evt_Result then
|
||||
if not self.result then
|
||||
self.result = EXClearingView.new(self._root_view, { flag_back = true })
|
||||
self.result = EXClearingView.new(self, { flag_back = true })
|
||||
self.result:InitData(0, self._room, step.result_data)
|
||||
self.result._view.x = (GRoot.inst.width - self.result._view.width) * -0.5
|
||||
self.result._view.width = GRoot.inst.width
|
||||
|
|
@ -225,6 +225,7 @@ function M:CmdAction(cmd, index)
|
|||
fz.type = cmd.data.type
|
||||
fz.card = cmd.data.card
|
||||
fz.opcard = cmd.data.opcard
|
||||
fz.from_seat = cmd.data.from_seat
|
||||
local uf = data.player_card_data[cmd.data.from_seat]
|
||||
if fz.type ~= FZType.Gang_An and fz.type ~= FZType.Gang_Peng then
|
||||
table.remove(uf.outcard_list, #uf.outcard_list)
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ function M:FillRoomData(data)
|
|||
for i = 1, #room.player_list do
|
||||
local p = room.player_list[i]
|
||||
local card_info = _player_card_info[self:GetPos(p.seat)]
|
||||
-- card_info:Clear()
|
||||
card_info:Clear()
|
||||
table.sort(p.card_list, self.HandCardSortAndJing)
|
||||
card_info:UpdateHandCard(false, true)
|
||||
self._player_info[i]._view:GetController("piao_niao").selectedIndex = 0
|
||||
|
|
@ -67,6 +67,7 @@ function M:FillRoomData(data)
|
|||
|
||||
self:GenerateAllStepData(data)
|
||||
self:UpdateStep(1)
|
||||
self:Play()
|
||||
-- self:ShowStep(0)
|
||||
end
|
||||
|
||||
|
|
@ -102,7 +103,7 @@ function M:ShowStep(index)
|
|||
else
|
||||
info:UpdateOutCardList()
|
||||
end
|
||||
if step.cmd == Record_Event.Evt_GetCard and p.seat == step.current_out_seat then
|
||||
if (step.cmd == Record_Event.Evt_GetCard and p.seat == step.current_out_seat) or step.cmd == Record_Event.Evt_Action then
|
||||
info:UpdateHandCard(true, true)
|
||||
else
|
||||
info:UpdateHandCard(false, true)
|
||||
|
|
@ -140,7 +141,7 @@ function M:ShowStep(index)
|
|||
end
|
||||
if step.cmd == Record_Event.Evt_Result then
|
||||
if not self.result then
|
||||
self.result = EXClearingView.new(self._root_view, { flag_back = true })
|
||||
self.result = EXClearingView.new(self, { flag_back = true })
|
||||
self.result:InitData(0, self._room, step.result_data)
|
||||
self.result._view.x = (GRoot.inst.width - self.result._view.width) * -0.5
|
||||
self.result._view.width = GRoot.inst.width
|
||||
|
|
@ -224,6 +225,7 @@ function M:CmdAction(cmd, index)
|
|||
fz.type = cmd.data.type
|
||||
fz.card = cmd.data.card
|
||||
fz.opcard = cmd.data.opcard
|
||||
fz.from_seat = cmd.data.from_seat
|
||||
local uf = data.player_card_data[cmd.data.from_seat]
|
||||
if fz.type ~= FZType.Gang_An and fz.type ~= FZType.Gang_Peng then
|
||||
table.remove(uf.outcard_list, #uf.outcard_list)
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ function M:FillRoomData(data)
|
|||
for i = 1, #room.player_list do
|
||||
local p = room.player_list[i]
|
||||
local card_info = _player_card_info[self:GetPos(p.seat)]
|
||||
-- card_info:Clear()
|
||||
card_info:Clear()
|
||||
table.sort(p.card_list, self.HandCardSortAndJing)
|
||||
card_info:UpdateHandCard(false, true)
|
||||
self._player_info[i]._view:GetController("piao_niao").selectedIndex = 0
|
||||
|
|
@ -101,14 +101,19 @@ function M:ShowStep(index)
|
|||
if step.cmd == Record_Event.Evt_OutCard and i == step.last_out_seat then
|
||||
local card = p.outcard_list[#p.outcard_list]
|
||||
info:UpdateOutCardList(nil, nil, self._cursor)
|
||||
self:PlayMJSound("chupai.mp3")
|
||||
self:PlaySound("LiChuan_MJ", p.self_user.sex, tostring(card))
|
||||
else
|
||||
info:UpdateOutCardList()
|
||||
end
|
||||
if (step.cmd == Record_Event.Evt_GetCard and p.seat == step.current_out_seat) or step.cmd == Record_Event.Evt_Action then
|
||||
if (step.cmd == Record_Event.Evt_GetCard or step.cmd == Record_Event.Evt_Action) and p.seat == step.current_out_seat then
|
||||
info:UpdateHandCard(true, true)
|
||||
else
|
||||
info:UpdateHandCard(false, true)
|
||||
end
|
||||
if step.cmd == Record_Event.Evt_Action then
|
||||
|
||||
end
|
||||
end
|
||||
if step.cmd == Record_Event.Evt_Win then
|
||||
self._win_pic = UIPackage.CreateObjectFromURL("ui://Main_Majiang/胡")
|
||||
|
|
|
|||
|
|
@ -912,7 +912,7 @@ function M:ReloadRoom(bskip)
|
|||
self._room._reload_flag = true
|
||||
end
|
||||
end
|
||||
|
||||
self:reqResidueCard()
|
||||
self:ShowJing()
|
||||
for i = 1, #room.player_list do
|
||||
local p = room.player_list[i]
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ function M:FillRoomData(data)
|
|||
for i = 1, #room.player_list do
|
||||
local p = room.player_list[i]
|
||||
local card_info = _player_card_info[self:GetPos(p.seat)]
|
||||
-- card_info:Clear()
|
||||
card_info:Clear()
|
||||
table.sort(p.card_list, self.HandCardSortAndJing)
|
||||
card_info:UpdateHandCard(false, true)
|
||||
self._player_info[i]._view:GetController("piao_niao").selectedIndex = 0
|
||||
|
|
@ -67,6 +67,7 @@ function M:FillRoomData(data)
|
|||
|
||||
self:GenerateAllStepData(data)
|
||||
self:UpdateStep(1)
|
||||
self:Play()
|
||||
-- self:ShowStep(0)
|
||||
end
|
||||
|
||||
|
|
@ -102,7 +103,7 @@ function M:ShowStep(index)
|
|||
else
|
||||
info:UpdateOutCardList()
|
||||
end
|
||||
if step.cmd == Record_Event.Evt_GetCard and p.seat == step.current_out_seat then
|
||||
if (step.cmd == Record_Event.Evt_GetCard and p.seat == step.current_out_seat) or step.cmd == Record_Event.Evt_Action then
|
||||
info:UpdateHandCard(true, true)
|
||||
else
|
||||
info:UpdateHandCard(false, true)
|
||||
|
|
@ -140,7 +141,7 @@ function M:ShowStep(index)
|
|||
end
|
||||
if step.cmd == Record_Event.Evt_Result then
|
||||
if not self.result then
|
||||
self.result = EXClearingView.new(self._root_view, { flag_back = true })
|
||||
self.result = EXClearingView.new(self, { flag_back = true })
|
||||
self.result:InitData(0, self._room, step.result_data)
|
||||
self.result._view.x = (GRoot.inst.width - self.result._view.width) * -0.5
|
||||
self.result._view.width = GRoot.inst.width
|
||||
|
|
@ -224,6 +225,7 @@ function M:CmdAction(cmd, index)
|
|||
fz.type = cmd.data.type
|
||||
fz.card = cmd.data.card
|
||||
fz.opcard = cmd.data.opcard
|
||||
fz.from_seat = cmd.data.from_seat
|
||||
local uf = data.player_card_data[cmd.data.from_seat]
|
||||
if fz.type ~= FZType.Gang_An and fz.type ~= FZType.Gang_Peng then
|
||||
table.remove(uf.outcard_list, #uf.outcard_list)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,724 @@
|
|||
local PKMainView = import("main.poker.PKMainView")
|
||||
local RunFast_PlayerPokerInfoView = import(".RunFast_PlayerPokerInfoView")
|
||||
local RunFast_PlayerSelfPokerInfoView = import(".RunFast_PlayerSelfPokerInfoView")
|
||||
local RunFast_GameEvent = import(".RunFast_GameEvent")
|
||||
local RunFast_ResultView = import(".RunFast_ResultView")
|
||||
local RunFast_RightPanelView = import(".RunFast_RightPanelView")
|
||||
local PlayerInfoView = import(".EXPlayerInfoView")
|
||||
local TableBG = import('Game.Data.TableBG')
|
||||
local WitnessView = require("main.poker.PKWitnessView")
|
||||
local RunFast_CardCheck = import(".CardCheck")
|
||||
|
||||
local M = {}
|
||||
|
||||
function M.new()
|
||||
setmetatable(M, { __index = WitnessView })
|
||||
local self = setmetatable({}, { __index = M })
|
||||
self.class = "EXMJWitness"
|
||||
self:init()
|
||||
|
||||
self._gamectr = ControllerManager.GetController(GameController)
|
||||
return self
|
||||
end
|
||||
|
||||
function M:InitView(url)
|
||||
local _room = DataManager.CurrenRoom
|
||||
self._full = true
|
||||
UIPackage.AddPackage("extend/poker/runfast/ui/Extend_Poker_RunFastNew")
|
||||
getmetatable(M).__index.InitView(self,
|
||||
"ui://Extend_Poker_RunFastNew/RunFast_Main_New_" .. _room.room_config.people_num)
|
||||
local user_id = DataManager.SelfUser.account_id
|
||||
|
||||
local json_data = Utils.LoadLocalFile(user_id .. _room.game_id .. "pai")
|
||||
if json_data == nil then
|
||||
local _gamectr = self._gamectr
|
||||
self._room.pai = 0
|
||||
else
|
||||
local _data = json.decode(json_data)
|
||||
local pai = _data["pai"]
|
||||
self._room.pai = pai
|
||||
end
|
||||
|
||||
self._player_info = {}
|
||||
local _player_info = self._player_info
|
||||
for i = 1, self._room.room_config.people_num do
|
||||
local tem = self._view:GetChild("player_info" .. i)
|
||||
_player_info[i] = PlayerInfoView.new(tem, self)
|
||||
tem.visible = false
|
||||
end
|
||||
local list = self._room.player_list
|
||||
for i = 1, #list do
|
||||
local p = list[i]
|
||||
local info = _player_info[self:GetPos(p.seat)]
|
||||
info._view.visible = true
|
||||
info:FillData(p)
|
||||
end
|
||||
|
||||
for i = 1, #self._room.player_list do
|
||||
if self._room.self_player.seat == self._room.player_list[i].seat and self._room.self_player.self_user.account_id ~= self._room.player_list[i].self_user.account_id then
|
||||
-- body
|
||||
local ErrorMsgTip = UIPackage.CreateObject("Common", "Win_ConnectTip")
|
||||
local _action = self._view:AddChild(ErrorMsgTip)
|
||||
_action.xy = Vector2((self._view.width - _action.width) / 4, self._view.height / 4)
|
||||
local text = _action:GetChild("tex_message")
|
||||
local btn1 = _action:GetChild("btn_connect")
|
||||
local btn2 = _action:GetChild("btn_back")
|
||||
text.text = "您来晚了，座位有人，请重新进牌桌"
|
||||
btn1.visible = false
|
||||
btn2:Center()
|
||||
btn2.y = btn2.y + 50
|
||||
btn2.onClick:Set(function()
|
||||
-- body
|
||||
ErrorMsgTip:Destroy()
|
||||
ErrorMsgTip = nil
|
||||
self._gamectr:LevelRoom(function(res)
|
||||
ViewUtil.CloseModalWait()
|
||||
NetResetConnectWindow.CloseNetReset()
|
||||
ControllerManager.ChangeController(LoddyController)
|
||||
ViewManager.ChangeView(ViewManager.View_Lobby)
|
||||
end)
|
||||
end)
|
||||
end
|
||||
end
|
||||
|
||||
self.ctr_state = self._view:GetController("state")
|
||||
self._ctr_action = self._view:GetController("action")
|
||||
self.ctr_time = self._view:GetController("time")
|
||||
self.ctr_card_eff = self._view:GetController("card_eff")
|
||||
self._player_card_info = {}
|
||||
|
||||
local _player_card_info = self._player_card_info
|
||||
for i = 1, _room.room_config.people_num do
|
||||
local tem = self._view:GetChild("player_card_info_" .. i)
|
||||
_player_card_info[i] = self:NewPlayerCardInfoView(tem, i)
|
||||
end
|
||||
|
||||
if not _room.self_player.ready then
|
||||
local round = DataManager.CurrenRoom.room_config.config.times or 1
|
||||
local xpconfig = DataManager.CurrenRoom.room_config.config.xi_pai
|
||||
if xpconfig then
|
||||
if round > 1 then
|
||||
self._ctr_action.selectedIndex = 1
|
||||
else
|
||||
self._ctr_action.selectedIndex = 2
|
||||
end
|
||||
else
|
||||
self._ctr_action.selectedIndex = 1
|
||||
end
|
||||
else
|
||||
self._ctr_action.selectedIndex = 0
|
||||
end
|
||||
self._left_time = 0
|
||||
self.bgm_index = 1
|
||||
self._state.selectedIndex = 4
|
||||
|
||||
self._view:GetChild("btn_back_jiesan").onClick:Set(function()
|
||||
if self.dismiss_room_cd_time > 0 then
|
||||
ViewUtil.ErrorTip(nil, "您还处于解散冷却时间当中，请稍后重试！")
|
||||
else
|
||||
local _gamectr = ControllerManager.GetController(GameController)
|
||||
_gamectr:AskDismissRoom()
|
||||
end
|
||||
end)
|
||||
|
||||
self:ChangeBgmMusic()
|
||||
self:EventInit()
|
||||
UpdateBeat:Add(self.OnUpdate, self)
|
||||
|
||||
self._text_currenRound = self._view:GetChild('Text_CurrenRound')
|
||||
self._text_maxRound = self._view:GetChild('Text_MaxMaxRound')
|
||||
|
||||
self._cardCheck = RunFast_CardCheck:InitFlag()
|
||||
self._gamectr._cardCheck = self._cardCheck
|
||||
self:UpdateRound(0)
|
||||
|
||||
--按钮功能全部未开放
|
||||
self._view:GetChild('Btn_Spectator').onClick:Set(function()
|
||||
ViewUtil.ErrorMsg(self._view, "", "该功能还未开放")
|
||||
end)
|
||||
self._view:GetChild('Btn_Invite').onClick:Set(function()
|
||||
ViewUtil.ErrorMsg(self._view, "", "该功能还未开放")
|
||||
end)
|
||||
|
||||
self._view:GetChild('text_roomId').text = self._room.room_id
|
||||
self._ctr_inClear = self._view:GetController('Inclear')
|
||||
self._view:GetChild('btn_ready_inClear').onClick:Set(function()
|
||||
if self.result_view and self.result_view._view then
|
||||
self._ctr_inClear.selectedIndex = 0
|
||||
self.result_view:ClearReady()
|
||||
else
|
||||
self.result_view = nil
|
||||
local _gamectr = ControllerManager.GetController(GameController)
|
||||
_gamectr:ConformToNextGame()
|
||||
end
|
||||
end)
|
||||
----------------------------------------------------
|
||||
--闹钟倒计时报时
|
||||
self._leftTime_xiangling = 5
|
||||
self._leftTime_bianhong = true
|
||||
|
||||
-----------如果进入观战时，已经开始游戏，则渲染画面------------
|
||||
if _room.curren_round > 0 then
|
||||
self:UpdateRound(_room.curren_round)
|
||||
local list = _room.player_list
|
||||
for i = 1, #list do
|
||||
local p = list[i]
|
||||
local head_info = self._player_info[self:GetPos(p.seat)]
|
||||
if head_info._view:GetChild("shengyu") ~= nil and head_info._view:GetController("shengyu") ~= nil then
|
||||
-- body
|
||||
|
||||
if self._room.room_config.showlength == 1 then
|
||||
-- body
|
||||
head_info._view:GetController("shengyu").selectedIndex = 1
|
||||
else
|
||||
head_info._view:GetController("shengyu").selectedIndex = 0
|
||||
end
|
||||
|
||||
-- body
|
||||
head_info._view:GetChild("shengyu").text = p.hand_count
|
||||
end
|
||||
p:Clear()
|
||||
head_info:MarkBank(p.seat == _room.banker_seat)
|
||||
head_info:FillData(p)
|
||||
local card_info = self._player_card_info[self:GetPos(p.seat)]
|
||||
card_info:Clear()
|
||||
head_info:Ready(false)
|
||||
end
|
||||
end
|
||||
-----------
|
||||
local rightpanel = self._view:GetChild("right_panel")
|
||||
if self._rightPanelView ~= nil then
|
||||
self._rightPanelView:Destroy()
|
||||
end
|
||||
|
||||
self._rightPanelView = RunFast_RightPanelView.new(self, rightpanel)
|
||||
end
|
||||
|
||||
function M:ChangeBgmMusic(bgm_index)
|
||||
if bgm_index == nil then
|
||||
bgm_index = self.bgm_index
|
||||
else
|
||||
self.bgm_index = bgm_index
|
||||
end
|
||||
ViewUtil.PlayMuisc("RunFastNew_PK", string.format("extend/poker/runfast/sound/bgm%d.mp3", 1))
|
||||
end
|
||||
|
||||
function M:EventInit()
|
||||
local _gamectr = ControllerManager.GetController(GameController)
|
||||
getmetatable(M).__index.EventInit(self)
|
||||
local _player_info = self._player_info
|
||||
local _player_card_info = self._player_card_info
|
||||
local _room = self._room
|
||||
|
||||
|
||||
_gamectr:AddEventListener(RunFast_GameEvent.EventXiPai, function(...)
|
||||
printlog("lingmeng pkwitness EventXiPai")
|
||||
end)
|
||||
|
||||
_gamectr:AddEventListener(RunFast_GameEvent.OnMingCard, function(...)
|
||||
printlog("lingmeng pkwitness OnMingCard")
|
||||
end)
|
||||
|
||||
_gamectr:AddEventListener(RunFast_GameEvent.OnInitCard, function(...)
|
||||
local arg = { ... }
|
||||
local round = arg[1]
|
||||
local cardlist = arg[2]
|
||||
|
||||
if self.result_view ~= nil then
|
||||
self.result_view:Destroy()
|
||||
self.result_view = nil
|
||||
end
|
||||
|
||||
self._player_card_info[1]:HidePiao()
|
||||
|
||||
if self._room.room_config.people_num == 3 and self._room.room_config.fangzuobi == 1 then
|
||||
-- body
|
||||
self.MypokerList = cardlist
|
||||
end
|
||||
local otherpoker_list = self._view:GetChild("otherpoker_list")
|
||||
|
||||
if otherpoker_list ~= nil then
|
||||
-- body
|
||||
otherpoker_list.visible = false
|
||||
otherpoker_list:RemoveChildrenToPool()
|
||||
end
|
||||
self.ctr_card_eff.selectedIndex = 0
|
||||
if self.rank_view ~= nil then
|
||||
self.rank_view:Dispose()
|
||||
self.rank_view = nil
|
||||
end
|
||||
self._ctr_inClear.selectedIndex = 0
|
||||
self:UpdateRound(round)
|
||||
-- ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/runfast/sound/fapai.mp3")
|
||||
local list = _room.player_list
|
||||
for i = 1, #list do
|
||||
local p = list[i]
|
||||
local head_info = self._player_info[self:GetPos(p.seat)]
|
||||
if head_info._view:GetChild("shengyu") ~= nil and head_info._view:GetController("shengyu") ~= nil then
|
||||
-- body
|
||||
|
||||
if self._room.room_config.showlength == 1 then
|
||||
-- body
|
||||
head_info._view:GetController("shengyu").selectedIndex = 1
|
||||
else
|
||||
head_info._view:GetController("shengyu").selectedIndex = 0
|
||||
end
|
||||
|
||||
-- body
|
||||
head_info._view:GetChild("shengyu").text = p.hand_count
|
||||
end
|
||||
p:Clear()
|
||||
head_info:MarkBank(p.seat == _room.banker_seat)
|
||||
head_info:FillData(p)
|
||||
local card_info = self._player_card_info[self:GetPos(p.seat)]
|
||||
card_info:Clear()
|
||||
head_info:Ready(false)
|
||||
end
|
||||
end)
|
||||
|
||||
_gamectr:AddEventListener(RunFast_GameEvent.OnIndexMove, function(...)
|
||||
local arg = { ... }
|
||||
local seat = arg[1]
|
||||
local isNewBout = arg[2]
|
||||
local index = self:GetPos(seat)
|
||||
|
||||
|
||||
self.ctr_time.selectedIndex = index
|
||||
-- for i = 1, #self._player_info do
|
||||
-- if index == i then
|
||||
-- -- body
|
||||
-- local head_info = self._player_info[index]
|
||||
-- head_info:MarkBank(true)
|
||||
-- else
|
||||
-- local head_info = self._player_info[i]
|
||||
-- head_info:MarkBank(false)
|
||||
-- end
|
||||
-- end
|
||||
|
||||
-- if index == 1 then
|
||||
local card_info = self._player_card_info[index]
|
||||
card_info:SetOutCardInfo(nil, false)
|
||||
-- if self.MypokerList ~= nil then
|
||||
-- -- body
|
||||
-- card_info:Clear()
|
||||
-- card_info:InitPoker(self.MypokerList, false)
|
||||
-- self.MypokerList = nil
|
||||
-- end
|
||||
-- end
|
||||
self._leftClock_continue = coroutine.start(function()
|
||||
coroutine.wait(1)
|
||||
for i = 1, #self._player_card_info do
|
||||
local card_info = self._player_card_info[i]
|
||||
if i == index then
|
||||
card_info._ctr_time_clock.selectedIndex = 1
|
||||
self._tex_leftTime = card_info._view_comp_clock
|
||||
else
|
||||
card_info._ctr_time_clock.selectedIndex = 0
|
||||
end
|
||||
-- if self._room.is_new_bout then
|
||||
-- card_info.ctr_outpoker.selectedIndex = 0
|
||||
-- end
|
||||
end
|
||||
if self._left_time and self._left_time < 15 then
|
||||
self._left_time = 15
|
||||
end
|
||||
end)
|
||||
|
||||
|
||||
if self._room.ming_card ~= nil then
|
||||
self._view:GetTransition("t" .. index):Play()
|
||||
self._room.ming_card = nil
|
||||
if self.tween ~= nil then
|
||||
TweenUtils.Kill(self.tween)
|
||||
self.tween = nil
|
||||
end
|
||||
end
|
||||
end)
|
||||
|
||||
_gamectr:AddEventListener(RunFast_GameEvent.OnBombScore, function(...)
|
||||
printlog("lingmeng pkwitness OnBombScore")
|
||||
end)
|
||||
|
||||
_gamectr:AddEventListener(RunFast_GameEvent.OnPlaySucc, function(...)
|
||||
ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/runfast/sound/playcard_chup.mp3")
|
||||
self._popEvent = false
|
||||
local arg = { ... }
|
||||
local p = arg[1]
|
||||
local card_number = arg[2]
|
||||
local cardstype = arg[3]
|
||||
local num = arg[4]
|
||||
local otherList = arg[5]
|
||||
local length = arg[6]
|
||||
local lastCardList = arg[7]
|
||||
self.ctr_time.selectedIndex = 0
|
||||
local index = self:GetPos(p.seat)
|
||||
if index == 1 then
|
||||
self.caozuo = 0
|
||||
end
|
||||
|
||||
local head_info = self._player_info[index]
|
||||
if head_info._view:GetChild("shengyu") ~= nil then
|
||||
-- body
|
||||
-- body
|
||||
if card_number ~= nil then
|
||||
-- body
|
||||
head_info._view:GetChild("shengyu").text = card_number
|
||||
end
|
||||
end
|
||||
head_info:SetBaoDan(card_number == 1)
|
||||
local card_info = self._player_card_info[index]
|
||||
card_info:SetOutCardInfo(p.out_card_list, false, true)
|
||||
|
||||
for i = 1, #otherList do
|
||||
local other_seat = otherList[i]
|
||||
local other_card_info = self._player_card_info[self:GetPos(other_seat)]
|
||||
other_card_info:SetOutCardBlack()
|
||||
end
|
||||
|
||||
if index == 1 then
|
||||
card_info:DeleteHandCards(p.out_card_list)
|
||||
else
|
||||
-- card_info:SetRemainCardNumber(card_number == 1)
|
||||
--card_info:UpdateHandPoker(card_number,false,false) -- todo
|
||||
end
|
||||
|
||||
-- if self._room.is_new_bout == true then
|
||||
-- for i = 1, #self._room.player_list do
|
||||
-- local player = self._room.player_list[i]
|
||||
-- local card_info_i = self._player_card_info[self:GetPos(player.seat)]
|
||||
-- if p.seat ~= player.seat then
|
||||
-- card_info_i:SetOutCardInfo(nil, false)
|
||||
-- end
|
||||
-- end
|
||||
-- self:_Effect(cardstype, p)
|
||||
-- else
|
||||
-- if cardstype == 11 and cardstype ~= 12 then
|
||||
-- self:_Effect(cardstype, p)
|
||||
-- end
|
||||
-- end
|
||||
self:_Effect(self._cardCheck.type, p)
|
||||
|
||||
self:PlaySound(p.self_user.sex,
|
||||
self:GetSoundFileName(self._cardCheck.type, num, self._room.is_new_bout))
|
||||
-- self:PlaySound(p.self_user.sex, self:GetSoundFileName(cardstype, num, self._room.is_new_bout))
|
||||
|
||||
if card_number == 1 then
|
||||
--self:ChangeBgmMusic(2)
|
||||
self:ChangeBgmMusic(1)
|
||||
if self._cor_sound ~= nil then
|
||||
coroutine.stop(self._cor_sound)
|
||||
end
|
||||
self._cor_sound = nil
|
||||
self._cor_sound = coroutine.start(function()
|
||||
self:PlaySound(p.self_user.sex, "card_1")
|
||||
end)
|
||||
end
|
||||
end)
|
||||
|
||||
|
||||
_gamectr:AddEventListener(RunFast_GameEvent.OnPassSuccCheckCard, function(...)
|
||||
self._popEvent = false
|
||||
local arg = { ... }
|
||||
local seat = arg[1]
|
||||
local cards = arg[2]
|
||||
--self.MypokerList=cards
|
||||
self.ctr_time.selectedIndex = 0
|
||||
local card_info = self._player_card_info[self:GetPos(seat)]
|
||||
if seat == self._room.self_player.seat then
|
||||
card_info:ClearCheck()
|
||||
card_info:InitPoker(cards, false)
|
||||
end
|
||||
|
||||
self._popEvent = true
|
||||
end)
|
||||
|
||||
_gamectr:AddEventListener(RunFast_GameEvent.OnPassSucc, function(...)
|
||||
local arg = { ... }
|
||||
local p = arg[1]
|
||||
|
||||
self.ctr_time.selectedIndex = 0
|
||||
local card_info = self._player_card_info[self:GetPos(p.seat)]
|
||||
|
||||
--card_info:SetOutCardInfo(nil, false)
|
||||
if p.seat == self._room.self_player.seat and self.MypokerList ~= nil then
|
||||
-- body
|
||||
card_info:Clear()
|
||||
card_info:InitPoker(self.MypokerList, false)
|
||||
self.MypokerList = nil
|
||||
end
|
||||
coroutine.stop(self._leftClock_continue)
|
||||
card_info._ctr_time_clock.selectedIndex = 0
|
||||
card_info:SetOutCardInfo(nil, true)
|
||||
self:PlaySound(p.self_user.sex, "pass_" .. math.random(1, 4))
|
||||
end)
|
||||
|
||||
_gamectr:AddEventListener(RunFast_GameEvent.OnErrorTip, function(...)
|
||||
local arg = { ... }
|
||||
local error_str = arg[1]
|
||||
self._player_card_info[1]:ErrorTip(error_str)
|
||||
end)
|
||||
|
||||
_gamectr:AddEventListener(RunFast_GameEvent.OnPiaoTips, function(...)
|
||||
printlog("lingmeng pkwitness OnPiaoTips")
|
||||
end)
|
||||
|
||||
_gamectr:AddEventListener(RunFast_GameEvent.OnPiaoAction, function(...)
|
||||
printlog("lingmeng pkwitness OnPiaoAction")
|
||||
end)
|
||||
|
||||
_gamectr:AddEventListener(RunFast_GameEvent.OnOptions, function(...)
|
||||
printlog("lingmeng pkwitness OnOptions")
|
||||
end)
|
||||
-- 托管
|
||||
_gamectr:AddEventListener(RunFast_GameEvent.Game_TuoGuan, function(...)
|
||||
printlog("lingmeng pkwitness Game_TuoGuan")
|
||||
end)
|
||||
_gamectr:AddEventListener(RunFast_GameEvent.OnResult, function(...)
|
||||
local arg = { ... }
|
||||
local over = arg[1]
|
||||
local info = arg[2]
|
||||
local win_seat = arg[3]
|
||||
local remaincards = arg[4]
|
||||
-- local energyTab = arg[5]
|
||||
local otherpoker_list = self._view:GetChild("otherpoker_list")
|
||||
local card_info = self._player_card_info[self:GetPos(self._room.self_player.seat)]
|
||||
|
||||
if self.MypokerList ~= nil then
|
||||
-- body
|
||||
card_info:Clear()
|
||||
card_info:InitPoker(self.MypokerList, false)
|
||||
self.MypokerList = nil
|
||||
end
|
||||
if otherpoker_list ~= nil then
|
||||
-- body
|
||||
otherpoker_list:RemoveChildrenToPool()
|
||||
otherpoker_list.visible = true
|
||||
end
|
||||
|
||||
if self._cor_sound ~= nil then
|
||||
coroutine.stop(self._cor_sound)
|
||||
self._cor_sound = nil
|
||||
end
|
||||
|
||||
if self.destory_win ~= nil then
|
||||
coroutine.stop(self.destory_win)
|
||||
end
|
||||
|
||||
self.destory_win = nil
|
||||
self.destory_win = coroutine.start(function()
|
||||
if win_seat == self._room.self_player.seat then
|
||||
ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/runfast/sound/end_music.mp3")
|
||||
else
|
||||
ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/runfast/sound/lose_music.mp3")
|
||||
end
|
||||
coroutine.stop(self._leftClock_continue)
|
||||
for i = 1, #self._player_card_info do
|
||||
local card_info = self._player_card_info[i]
|
||||
card_info._ctr_time_clock.selectedIndex = 0
|
||||
self._left_time = 0
|
||||
end
|
||||
|
||||
for i = 1, #info do
|
||||
local player = info[i]
|
||||
local p = self._room:GetPlayerBySeat(player.seat)
|
||||
local head_info = self._player_info[self:GetPos(player.seat)]
|
||||
local card_info = self._player_card_info[self:GetPos(player.seat)]
|
||||
|
||||
if player.seat ~= self._room.self_player.seat then
|
||||
local oneTime = 7 / 60
|
||||
|
||||
-- card_info:UpdateHandPoker(player.cards, false, true)
|
||||
|
||||
card_info._view_resultOut:RemoveChildrenToPool()
|
||||
card_info._ctr_resultOut.selectedIndex = 1
|
||||
card_info.ctr_outpoker.selectedIndex = 0
|
||||
for i = 1, #player.handCards do
|
||||
local child_card = card_info._view_resultOut:AddItemFromPool()
|
||||
card_info:FillPoker(child_card, "", nil, player.handCards[i])
|
||||
ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/runfast/sound/fanCard.mp3")
|
||||
printlog("lingmeng oneTime", oneTime)
|
||||
coroutine.wait(oneTime)
|
||||
end
|
||||
end
|
||||
end
|
||||
for i = 1, #info do
|
||||
local player = info[i]
|
||||
local p = self._room:GetPlayerBySeat(player.seat)
|
||||
local head_info = self._player_info[self:GetPos(player.seat)]
|
||||
head_info:SetBaoDan(false)
|
||||
|
||||
head_info._view:GetChild('text_jifen').text = player.score
|
||||
-- head_info:PlayScore(player.winscore, win_seat == player.seat)
|
||||
head_info:PlayScore(player.card_score, win_seat == player.seat)
|
||||
end
|
||||
self:ChangeBgmMusic(1)
|
||||
coroutine.wait(2)
|
||||
|
||||
self.result_view = RunFast_ResultView.new(self, info, self._room.room_id, over, win_seat, 0,
|
||||
remaincards)
|
||||
self.result_view:SetDestroryCallback(function()
|
||||
for i = 1, #self._player_card_info do
|
||||
local card_info = self._player_card_info[i]
|
||||
card_info.ctr_outpoker.selectedIndex = 0
|
||||
if card_info._ctr_resultOut then
|
||||
card_info._ctr_resultOut.selectedIndex = 0
|
||||
end
|
||||
end
|
||||
end)
|
||||
------------观战把准备按钮隐藏了-----------
|
||||
self._ctr_inClear.selectedIndex = 0
|
||||
self.result_view._view:GetChild('btn_nextRound').visible = false
|
||||
------------------------
|
||||
self.result_view:Show()
|
||||
if self.WinItem_view ~= nil then
|
||||
self.WinItem_view:Dispose()
|
||||
self.WinItem_view = nil
|
||||
end
|
||||
if self.rank_view ~= nil then
|
||||
self.rank_view:Dispose()
|
||||
self.rank_view = nil
|
||||
end
|
||||
|
||||
if self._room.self_player.entrust == true then
|
||||
local btn_confirm = self.result_view._view:GetChild("btn_confirm")
|
||||
btn_confirm.onClick:Call()
|
||||
end
|
||||
ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/runfast/sound/end_music.mp3")
|
||||
end)
|
||||
if over == 1 then
|
||||
-- body
|
||||
self:UnmarkSelfTuoguan()
|
||||
ControllerManager.ChangeController(LoddyController)
|
||||
end
|
||||
end)
|
||||
|
||||
_gamectr:AddEventListener(RunFast_GameEvent.OnResultByDissolve, function(...)
|
||||
local arg = { ... }
|
||||
local over = arg[1]
|
||||
local info = arg[2]
|
||||
local winseat = arg[3]
|
||||
local dissolve = arg[4]
|
||||
ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/runfast/sound/end_music.mp3")
|
||||
for i = 1, #self._player_card_info do
|
||||
local card_info = self._player_card_info[i]
|
||||
card_info._ctr_time_clock.selectedIndex = 0
|
||||
end
|
||||
self.result_view = RunFast_ResultView.new(self, info, self._room.room_id, over, winseat, dissolve, nil)
|
||||
self.result_view:Show()
|
||||
ControllerManager.ChangeController(LoddyController)
|
||||
self:UnmarkSelfTuoguan()
|
||||
end)
|
||||
|
||||
-- 确定开始下一局 成功
|
||||
_gamectr:AddEventListener(RunFast_GameEvent.OnConfrimToNextGameSucc, function(...)
|
||||
local arg = { ... }
|
||||
local aid = arg[1]
|
||||
local p = self._room:GetPlayerById(aid)
|
||||
if p.seat == self._room.self_player.seat then
|
||||
if self.rank_view ~= nil then
|
||||
self.rank_view:Dispose()
|
||||
self.rank_view = nil
|
||||
end
|
||||
if self.destory_win ~= nil then
|
||||
coroutine.stop(self.destory_win)
|
||||
self.destory_win = nil
|
||||
end
|
||||
for _, player in ipairs(self._room.player_list) do
|
||||
local player_card_info = self._player_card_info[self:GetPos(player.seat)]
|
||||
local player_head = self._player_info[self:GetPos(player.seat)]
|
||||
player_card_info:Clear()
|
||||
local otherpoker_list = self._view:GetChild("otherpoker_list")
|
||||
if otherpoker_list ~= nil then
|
||||
-- body
|
||||
otherpoker_list.visible = false
|
||||
otherpoker_list:RemoveChildrenToPool()
|
||||
end
|
||||
--player_head._view:GetController("Oener").selectedIndex=0
|
||||
end
|
||||
end
|
||||
local player_info = self._player_info[self:GetPos(p.seat)]
|
||||
player_info:Ready(true)
|
||||
end)
|
||||
|
||||
_gamectr:AddEventListener(RunFast_GameEvent.OnBompScoreNew, function(...)
|
||||
local arg = { ... }
|
||||
local scoreList = arg[1]
|
||||
for i = 1, #scoreList do
|
||||
local score = scoreList[i].pomSore
|
||||
local player = self._room:GetPlayerBySeat(scoreList[i].seat)
|
||||
local head_info = self._player_info[self:GetPos(scoreList[i].seat)]
|
||||
head_info:PlayScore(score, true)
|
||||
head_info:UpdateScore(player.total_score)
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
function M:NewPlayerCardInfoView(tem, index)
|
||||
if index == 1 then
|
||||
return RunFast_PlayerSelfPokerInfoView.new(tem, self)
|
||||
end
|
||||
return RunFast_PlayerPokerInfoView.new(tem, self)
|
||||
end
|
||||
|
||||
function M:GetPos(seat)
|
||||
return ViewUtil.GetPos(self._room.self_player.seat, seat, self._room.room_config.people_num)
|
||||
end
|
||||
|
||||
function M:UpdateRound(round)
|
||||
local total_round = self._room.room_config.Times
|
||||
-- self._text_round.text = string.format("%d / %d 局", round, total_round)
|
||||
if not self._text_currenRound then
|
||||
self._text_currenRound = self._view:GetChild('Text_CurrenRound')
|
||||
end
|
||||
if not self._text_maxRound then
|
||||
self._text_maxRound = self._view:GetChild('Text_MaxMaxRound')
|
||||
end
|
||||
self._text_currenRound.text = round
|
||||
self._text_maxRound.text = string.format("/%s局", total_round)
|
||||
end
|
||||
|
||||
function M:_Effect(type1, player)
|
||||
if type1 == 1 or type1 == 3 or type1 == 7 then
|
||||
self._popEvent = true
|
||||
return
|
||||
end
|
||||
local info = self._player_card_info[self:GetPos(player.seat)]
|
||||
info:PlayEffect(type1, function()
|
||||
self._popEvent = true
|
||||
end)
|
||||
end
|
||||
|
||||
function M:GetSoundFileName(type, num, isNewBout)
|
||||
local fileName
|
||||
if type == 1 or type == 3 or type == 7 then
|
||||
local num = self._cardCheck.lastMinCard
|
||||
if type == 1 then
|
||||
fileName = string.format("1_%d", num)
|
||||
elseif type == 3 then
|
||||
fileName = string.format("2_%d", num)
|
||||
elseif type == 7 then
|
||||
fileName = string.format("3_%d", num)
|
||||
end
|
||||
else
|
||||
if not isNewBout and type ~= 6 then
|
||||
local r = math.random(1, 3)
|
||||
fileName = "dani_" .. r
|
||||
else
|
||||
if type == 8 or type == 12 then
|
||||
fileName = 5
|
||||
else
|
||||
fileName = type
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
return fileName
|
||||
end
|
||||
|
||||
function M:PlaySound(sex, path)
|
||||
local sex_path = ViewUtil.Sex_Chat[sex] -- 1 男 2 女
|
||||
local sound_path = string.format("extend/poker/runfast/sound/%s/%s.mp3", sex_path, path)
|
||||
ViewUtil.PlaySound("RunFastNew_PK", sound_path)
|
||||
end
|
||||
|
||||
return M
|
||||
|
|
@ -11,6 +11,7 @@ local RunFast_RoomConfig = import(".RunFast_RoomConfig")
|
|||
local RunFast_Player = import(".RunFast_Player")
|
||||
local RunFast_Room = import(".RunFast_Room")
|
||||
local RunFast_PlayerBackView = import(".RunFast_PlayerBackView")
|
||||
local EXWitnessView = import(".EXWitnessView")
|
||||
|
||||
local ExtendConfig = {}
|
||||
|
||||
|
|
@ -25,6 +26,8 @@ function ExtendConfig.new()
|
|||
self._viewMap = {}
|
||||
self._viewMap[ViewManager.View_Main] = RunFast_MainView
|
||||
self._viewMap[ViewManager.View_PlayBack] = RunFast_PlayerBackView
|
||||
self._viewMap[ViewManager.View_Witness] = EXWitnessView
|
||||
|
||||
return self
|
||||
end
|
||||
|
||||
|
|
@ -252,6 +255,60 @@ function M:FillPlayBackData(pd_data)
|
|||
room.cmdList = pd_data["cmdList"]
|
||||
end
|
||||
|
||||
function M:FillWitnessData(pd_data)
|
||||
print("==========================FillWitnessData1")
|
||||
local room = DataManager.CurrenRoom
|
||||
pt(room)
|
||||
if _ctr_game == nil then
|
||||
self:GetGameController()
|
||||
end
|
||||
|
||||
local _tableInfo = pd_data["tableInfo"]
|
||||
room.xipaiScore = _tableInfo["xipai_score"]
|
||||
|
||||
local _config = _tableInfo["config"]
|
||||
room.room_config = RunFast_RoomConfig.new(_config)
|
||||
|
||||
room.curren_round = _tableInfo["round"]
|
||||
|
||||
local playerList = _tableInfo["playerData"]
|
||||
for i = 1, #playerList do
|
||||
local _jp = playerList[i]
|
||||
|
||||
local p = RunFast_Player.new()
|
||||
p.seat = _jp["seat"]
|
||||
local online = _jp["online"]
|
||||
p.line_state = online
|
||||
p.ready = _jp["ready"] == 1 and true or false
|
||||
local pid = _jp["aid"]
|
||||
if p.seat == 1 then room.self_player = p end
|
||||
local u = User.new()
|
||||
u.account_id = pid
|
||||
p.self_user = u
|
||||
u.nick_name = _jp["nick"]
|
||||
u.head_url = _jp["portrait"]
|
||||
u.sex = _jp["sex"]
|
||||
p.self_user.location = Location.new(_jp["pos"] or "")
|
||||
p.self_user.host_ip = _jp["ip"]
|
||||
p.total_score = _jp["score"] or 0
|
||||
if _jp.hp_info then
|
||||
p.cur_hp = _jp.hp_info.cur_hp
|
||||
end
|
||||
p.hp_info = _jp["hp_info"]
|
||||
|
||||
if _jp["entrust"] then
|
||||
p.entrust = _jp.entrust
|
||||
end
|
||||
room:AddPlayer(p)
|
||||
end
|
||||
|
||||
|
||||
|
||||
local owner = pd_data["owner"]
|
||||
room.owner_id = owner
|
||||
room.game_status = 0
|
||||
end
|
||||
|
||||
function M:LoadConfigToDetail(data)
|
||||
return data
|
||||
end
|
||||
|
|
|
|||
|
|
@ -938,7 +938,7 @@ function M:EventInit()
|
|||
if player.seat ~= self._room.self_player.seat then
|
||||
local oneTime = 7 / 60
|
||||
|
||||
card_info:UpdateHandPoker(player.cards, false, true)
|
||||
-- card_info:UpdateHandPoker(player.cards, false, true)
|
||||
|
||||
card_info._view_resultOut:RemoveChildrenToPool()
|
||||
card_info._ctr_resultOut.selectedIndex = 1
|
||||
|
|
@ -1214,7 +1214,7 @@ function M:ReconnectForClearing()
|
|||
if player.seat == self._room.self_player.seat then
|
||||
player_card_info:InitPoker(player.hand_list, false)
|
||||
else
|
||||
player_card_info:UpdateHandPoker(player.hand_list, false, true)
|
||||
-- player_card_info:UpdateHandPoker(player.hand_list, false, true)
|
||||
end
|
||||
if player.out_card_list[1] == 0 then
|
||||
player_card_info:SetOutCardInfo(nil, false)
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@ function M:InitView(url)
|
|||
UIPackage.AddPackage('extend/poker/runfast/ui/Extend_Poker_RunFastNew')
|
||||
PKPlayBackView.InitView(self, "ui://Extend_Poker_RunFastNew/RunFast_Main_New_" .. room.room_config.people_num,
|
||||
default_bg, bg_config)
|
||||
|
||||
self._tex_round = self._view:GetChild('round')
|
||||
self._player_card_info = {}
|
||||
local _player_card_info = self._player_card_info
|
||||
|
|
@ -101,6 +102,7 @@ function M:FillRoomData(data)
|
|||
self._room = DataManager.CurrenRoom
|
||||
local _player_card_info = self._player_card_info
|
||||
local roominfo_panel = self._view:GetChild('roominfo_panel1')
|
||||
self._room.pai = 0
|
||||
|
||||
roominfo_panel:GetChild('tex_roomid').text = data.info.roomid
|
||||
roominfo_panel:GetChild('tex_gametype').text = room.room_config:GetGameName()
|
||||
|
|
|
|||
|
|
@ -45,7 +45,6 @@ function M:init(url, data, roomid, over, win_seat, dissolve, remaincards)
|
|||
self._view:GetChild('btn_over1Close').onClick:Set(function()
|
||||
if over == 0 then
|
||||
self:Close()
|
||||
self._root_runFast._ctr_inClear.selectedIndex = 1
|
||||
else
|
||||
self._view:GetController('over').selectedIndex = 1
|
||||
end
|
||||
|
|
@ -89,7 +88,7 @@ function M:init(url, data, roomid, over, win_seat, dissolve, remaincards)
|
|||
obj:GetController('chuntian').selectedIndex = info.chuntian and 1 or 0
|
||||
end
|
||||
over0List.numItems = #data
|
||||
|
||||
self._root_runFast._ctr_inClear.selectedIndex = 1
|
||||
|
||||
if over == 1 or (not over and #data == 2) then
|
||||
local bigSeat = 0
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ function M:NextRecordPlay()
|
|||
self:RemoveCursor()
|
||||
local result = PlayBackView.NextRecordPlay(self)
|
||||
if not result then return end
|
||||
self:ChangePlayState(true)
|
||||
self:ChangePlayState(false)
|
||||
self._speed = 1
|
||||
self._playFoward = true
|
||||
self:ChangeTextSpeed()
|
||||
|
|
@ -121,7 +121,7 @@ function M:LastRecordPlay()
|
|||
self:RemoveCursor()
|
||||
local result = PlayBackView.LastRecordPlay(self)
|
||||
if not result then return end
|
||||
self:ChangePlayState(true)
|
||||
self:ChangePlayState(false)
|
||||
self._speed = 1
|
||||
self._playFoward = true
|
||||
self:ChangeTextSpeed()
|
||||
|
|
@ -217,6 +217,21 @@ function M:MaxSpeedArriws()
|
|||
self._speed = 30
|
||||
end
|
||||
|
||||
local majiang_asset_path = "base/main_majiang/sound/"
|
||||
function M:PlayMJSound(path)
|
||||
ViewUtil.PlaySound(self.asset_group, majiang_asset_path .. path)
|
||||
end
|
||||
|
||||
function M:PlayMJMusic(path)
|
||||
ViewUtil.PlayMuisc(self.asset_group, majiang_asset_path .. path)
|
||||
end
|
||||
|
||||
function M:PlaySound(group, sex, path)
|
||||
local sex_path = ViewUtil.Sex_Chat[sex]
|
||||
local path1 = majiang_asset_path .. string.format("%s/%s.mp3", sex_path, path)
|
||||
ViewUtil.PlaySound(group, path1)
|
||||
end
|
||||
|
||||
function M:OnUpdate()
|
||||
if self._play then
|
||||
if (self._currentStep == #self.cmdList and self._playFoward) then
|
||||
|
|
|
|||
|
|
@ -26,46 +26,8 @@ function M:InitView(url, isHideIpAdds, settingViewType, ex_defaultbg, ex_bgconfi
|
|||
local bg_config = ex_bgconfig or pk_bg_config
|
||||
-- 设置界面初始化方法
|
||||
self.NewSettingView = function(self)
|
||||
-- -- 根据settingViewType和self._state判断界面按钮功能显示
|
||||
-- local stype = 0
|
||||
-- local room = DataManager.CurrenRoom
|
||||
-- local ispanguangzhe = room.self_player.seat == 0
|
||||
-- if self._state.selectedIndex == 3 then
|
||||
-- stype = 0
|
||||
-- elseif settingViewType < 2 then
|
||||
-- stype = settingViewType
|
||||
-- elseif settingViewType == 2 then
|
||||
-- if (ispanguangzhe or self._state.selectedIndex == 0) then
|
||||
-- stype = 2
|
||||
-- else
|
||||
-- stype = 3
|
||||
-- end
|
||||
-- elseif settingViewType == 3 then
|
||||
-- if not ispanguangzhe and self._state.selectedIndex > 0 then
|
||||
-- stype = 3
|
||||
-- else
|
||||
-- stype = 2
|
||||
-- end
|
||||
-- end--self._root_view
|
||||
local settingView = PKSettingView.new(self, 0, isHideJiesan, settingUrl,
|
||||
handler(self, self.UpdateCardSize))
|
||||
-- 获取MainView界面state控制器选项
|
||||
-- settingView.__checkMainViewState = function()
|
||||
-- return self._state.selectedIndex
|
||||
-- end
|
||||
-- -- 设置界面换牌功能回调
|
||||
-- if settingViewType == 1 then
|
||||
-- settingView.__changePokerCallBack = handler(self, self.UpdateCard)
|
||||
-- settingView.__changePokerSizeCallBack = handler(self, self.UpdateCardSize)
|
||||
-- end
|
||||
-- settingView:FillBgSection(
|
||||
-- function(url)
|
||||
-- LoadGameBg(url, self._root_view)
|
||||
-- end,
|
||||
-- self._room.game_id,
|
||||
-- default_bg,
|
||||
-- bg_config
|
||||
-- )
|
||||
return settingView
|
||||
end
|
||||
|
||||
|
|
@ -85,6 +47,8 @@ function M:InitView(url, isHideIpAdds, settingViewType, ex_defaultbg, ex_bgconfi
|
|||
checkG:Show()
|
||||
end)
|
||||
end
|
||||
|
||||
self.com_notice = self._view:GetChild("com_notice")
|
||||
end
|
||||
|
||||
function M:InitXiPai()
|
||||
|
|
@ -150,6 +114,31 @@ function M:PlayXiPai1(xipaiCallBack)
|
|||
end
|
||||
end
|
||||
|
||||
function M:DoNoticeAnimation()
|
||||
self.noticeIndex = self.noticeIndex or 1
|
||||
if not DataManager.GameNotice or #DataManager.GameNotice == 0 then
|
||||
return
|
||||
end
|
||||
|
||||
local text_notice = self.com_notice:GetChild("text_notice")
|
||||
text_notice.text = DataManager.GameNotice[self.noticeIndex]
|
||||
local speed = 44
|
||||
local time = text_notice.width / speed
|
||||
|
||||
text_notice.x = self.com_notice.width
|
||||
|
||||
local tween = text_notice:TweenMove(Vector2(-text_notice.width, text_notice.y), time):OnComplete(function()
|
||||
self:DoNoticeAnimation()
|
||||
end)
|
||||
|
||||
tween:SetEase(EaseType.Linear)
|
||||
|
||||
self.noticeIndex = self.noticeIndex + 1
|
||||
if self.noticeIndex > #DataManager.GameNotice then
|
||||
self.noticeIndex = 1
|
||||
end
|
||||
end
|
||||
|
||||
-- 设置界面的换牌回调,需要换牌的玩法settingViewType传1,重写这个方法
|
||||
function M:UpdateCard(index)
|
||||
end
|
||||
|
|
@ -157,6 +146,12 @@ end
|
|||
function M:UpdateCardSize(index)
|
||||
end
|
||||
|
||||
function M:Show()
|
||||
getmetatable(M).__index.Show(self)
|
||||
ViewUtil.PlaySound("RunFastNew_PK", "base/main_majiang/sound/game_backmusic.mp3")
|
||||
self:DoNoticeAnimation()
|
||||
end
|
||||
|
||||
function M:Destroy()
|
||||
UIPackage.RemovePackage('base/main_poker/ui/Main_Poker')
|
||||
MainView.Destroy(self)
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ function M:Close()
|
|||
BaseWindow.Close(self)
|
||||
end
|
||||
|
||||
function PKSettingView.new(blur_view, show_type, isjiesan, url, cardSizeHandle)
|
||||
function PKSettingView.new(blur_view, show_type, isjiesan, url, cardSizeHandle, flag_witness)
|
||||
setmetatable(SettingView, { __index = BaseWindow })
|
||||
setmetatable(M, { __index = SettingView })
|
||||
-- setmetatable(M, { __index = BaseWindow })
|
||||
|
|
|
|||
|
|
@ -0,0 +1,79 @@
|
|||
local WitnessView = require("Game.View.WitnessView")
|
||||
local PKSettingView = import('.PKSettingView')
|
||||
local TableBG = require("Game.Data.TableBG")
|
||||
|
||||
local M = {}
|
||||
setmetatable(M, { __index = WitnessView })
|
||||
|
||||
local pk_default_bg = 1
|
||||
local pk_bg_config = {
|
||||
{ id = 1, url = 'extend/poker/runfast/bg/bg1', thumb = 'ui://Extend_Poker_RunFastNew/table_bg1' },
|
||||
{ id = 2, url = 'extend/poker/runfast/bg/bg2', thumb = 'ui://Extend_Poker_RunFastNew/table_bg2' },
|
||||
{ id = 3, url = 'extend/poker/runfast/bg/bg3', thumb = 'ui://Extend_Poker_RunFastNew/table_bg3' }
|
||||
}
|
||||
|
||||
function M.new()
|
||||
local self = setmetatable({}, { __index = M })
|
||||
self.class = "PKMJWitness"
|
||||
self:init()
|
||||
|
||||
return self
|
||||
end
|
||||
|
||||
function M:init()
|
||||
getmetatable(M).__index.init(self)
|
||||
end
|
||||
|
||||
function M:InitView(url)
|
||||
UIPackage.AddPackage('base/main_poker/ui/Main_Poker')
|
||||
getmetatable(M).__index.InitView(self, url, isHideIpAdds)
|
||||
|
||||
local default_bg = ex_defaultbg or pk_default_bg
|
||||
local bg_config = ex_bgconfig or pk_bg_config
|
||||
-- 设置界面初始化方法
|
||||
self.NewSettingView = function(self)
|
||||
local settingView = PKSettingView.new(self, 0, isHideJiesan, settingUrl,
|
||||
handler(self, self.UpdateCardSize), true)
|
||||
return settingView
|
||||
end
|
||||
|
||||
local _view = self._view
|
||||
TableBG.LoadTableBG(default_bg, self._room.game_id, self._root_view, bg_config)
|
||||
-- self:InitXiPai()
|
||||
-- self:InitXiPai1()
|
||||
|
||||
self.com_notice = self._view:GetChild("com_notice")
|
||||
end
|
||||
|
||||
function M:DoNoticeAnimation()
|
||||
self.noticeIndex = self.noticeIndex or 1
|
||||
if not DataManager.GameNotice or #DataManager.GameNotice == 0 then
|
||||
return
|
||||
end
|
||||
|
||||
local text_notice = self.com_notice:GetChild("text_notice")
|
||||
text_notice.text = DataManager.GameNotice[self.noticeIndex]
|
||||
local speed = 44
|
||||
local time = text_notice.width / speed
|
||||
|
||||
text_notice.x = self.com_notice.width
|
||||
|
||||
local tween = text_notice:TweenMove(Vector2(-text_notice.width, text_notice.y), time):OnComplete(function()
|
||||
self:DoNoticeAnimation()
|
||||
end)
|
||||
|
||||
tween:SetEase(EaseType.Linear)
|
||||
|
||||
self.noticeIndex = self.noticeIndex + 1
|
||||
if self.noticeIndex > #DataManager.GameNotice then
|
||||
self.noticeIndex = 1
|
||||
end
|
||||
end
|
||||
|
||||
function M:Show()
|
||||
getmetatable(M).__index.Show(self)
|
||||
ViewUtil.PlaySound("RunFastNew_PK", "base/main_majiang/sound/game_backmusic.mp3")
|
||||
self:DoNoticeAnimation()
|
||||
end
|
||||
|
||||
return M
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="189,69" extention="Button">
|
||||
<component size="189,69" pivot="0.5,0.5" extention="Button">
|
||||
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
|
||||
<displayList>
|
||||
<image id="n3_ckvb" name="n3" src="n9qrclw" fileName="Main_New/Image/button_checkWaiGua.png" xy="0,0" size="189,69">
|
||||
<relation target="" sidePair="width-width,height-height"/>
|
||||
</image>
|
||||
</displayList>
|
||||
<Button downEffect="dark" downEffectValue="0.8"/>
|
||||
<Button downEffect="scale" downEffectValue="1.1"/>
|
||||
</component>
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="112,67" extention="Button">
|
||||
<component size="112,67" pivot="0.5,0.5" extention="Button">
|
||||
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
|
||||
<displayList>
|
||||
<image id="n3_ckvb" name="n3" src="n9qrclo" fileName="Main_New/Image/button_wanfa.png" xy="0,0" size="112,67">
|
||||
<relation target="" sidePair="width-width,height-height"/>
|
||||
</image>
|
||||
</displayList>
|
||||
<Button downEffect="dark" downEffectValue="0.8"/>
|
||||
<Button downEffect="scale" downEffectValue="1.1"/>
|
||||
</component>
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="120,120" extention="Button">
|
||||
<component size="120,120" pivot="0.5,0.5" extention="Button">
|
||||
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
|
||||
<displayList>
|
||||
<image id="n3_ckvb" name="n3" src="n9qrclu" fileName="Main_New/Image/button_chat.png" xy="0,0" size="120,120">
|
||||
<relation target="" sidePair="width-width,height-height"/>
|
||||
</image>
|
||||
</displayList>
|
||||
<Button downEffect="dark" downEffectValue="0.8"/>
|
||||
<Button downEffect="scale" downEffectValue="1.1"/>
|
||||
</component>
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="120,120" extention="Button">
|
||||
<component size="120,120" pivot="0.5,0.5" extention="Button">
|
||||
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
|
||||
<displayList>
|
||||
<image id="n3_ckvb" name="n3" src="n9qrcln" fileName="Main_New/Image/button_voice.png" xy="0,0" size="120,120">
|
||||
<relation target="" sidePair="width-width,height-height"/>
|
||||
</image>
|
||||
</displayList>
|
||||
<Button downEffect="dark" downEffectValue="0.8"/>
|
||||
<Button downEffect="scale" downEffectValue="1.1"/>
|
||||
</component>
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="81,78" extention="Button">
|
||||
<component size="81,78" pivot="0.5,0.5" extention="Button">
|
||||
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
|
||||
<displayList>
|
||||
<image id="n3_ckvb" name="setting" src="n9qrclm" fileName="Main_New/Image/button_setting.png" xy="0,0" size="81,78">
|
||||
<relation target="" sidePair="width-width,height-height"/>
|
||||
</image>
|
||||
</displayList>
|
||||
<Button downEffect="dark" downEffectValue="0.8"/>
|
||||
<Button downEffect="scale" downEffectValue="1.1"/>
|
||||
</component>
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="132,132" pivot="0.5,0.5" extention="Button" mask="n2_pkx5">
|
||||
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
|
||||
<displayList>
|
||||
<graph id="n2_pkx5" name="mask" xy="0,0" size="132,132" touchable="false" type="rect" lineSize="0" fillColor="#ffcccccc">
|
||||
<relation target="" sidePair="width-width,height-height"/>
|
||||
</graph>
|
||||
<loader id="n3_pkx5" name="icon" xy="1,1" size="130,130" url="ui://27vd145bnlvy7iaa" align="center" vAlign="middle" fill="scaleFree" clearOnPublish="true">
|
||||
<relation target="" sidePair="width-width,height-height"/>
|
||||
</loader>
|
||||
<graph id="n1_pkx5" name="border" xy="0,0" size="132,132" visible="false" touchable="false" type="rect" lineSize="2" lineColor="#ff804b2e" fillColor="#00fafafa" corner="12">
|
||||
<relation target="" sidePair="width-width,height-height"/>
|
||||
</graph>
|
||||
</displayList>
|
||||
<Button downEffect="scale" downEffectValue="1.1"/>
|
||||
</component>
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="100,100" pivot="0.5,0.5" extention="Button">
|
||||
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
|
||||
<displayList>
|
||||
<loader id="n4_gmbn" name="icon" xy="0,0" size="100,100" align="center" vAlign="middle" fill="scaleFree">
|
||||
<relation target="" sidePair="width-width,height-height"/>
|
||||
</loader>
|
||||
</displayList>
|
||||
<Button downEffect="scale" downEffectValue="1.1"/>
|
||||
</component>
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="435,435">
|
||||
<displayList>
|
||||
<image id="n1_kzuz" name="n1" src="ukp7tcr2" fileName="Main_new/Main/Image/Group 541.png" xy="0,0"/>
|
||||
<list id="n2_kzuz" name="list_players" xy="13,12" size="422,428" overflow="scroll" defaultItem="ui://9n9stu2eukp7tcr3" autoClearItems="true">
|
||||
<item/>
|
||||
<item/>
|
||||
</list>
|
||||
</displayList>
|
||||
</component>
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="411,138">
|
||||
<controller name="lev" pages="0,,1," selected="0"/>
|
||||
<displayList>
|
||||
<component id="n0_kzuz" name="btn_head" src="ukp7tcr4" fileName="Main_new/Main/Component/btn_head.xml" xy="24,24" size="96,96" aspect="true"/>
|
||||
<text id="n1_kzuz" name="title" xy="144,27" size="265,42" fontSize="30" color="#444444" autoSize="shrink" text="微型姓名"/>
|
||||
<component id="n2_kzuz" name="btn_tick" src="ukp7tcr5" fileName="Main_new/Main/Component/btn_normol.xml" xy="144,77" size="117,47">
|
||||
<gearDisplay controller="lev" pages="1"/>
|
||||
<Button icon="ui://9n9stu2eukp7tcr6"/>
|
||||
</component>
|
||||
<graph id="n3_g9ft" name="n3" xy="0,135" size="411,3" alpha="0.08" type="rect" lineSize="0" fillColor="#ff000000">
|
||||
<relation target="" sidePair="width-width,bottom-bottom"/>
|
||||
</graph>
|
||||
</displayList>
|
||||
</component>
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 6.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.9 KiB |
|
|
@ -2,7 +2,7 @@
|
|||
<component size="1760,157" opaque="false" initName="player_card_info">
|
||||
<controller name="output" homePageType="specific" homePage="1" pages="0,,1,,2," selected="0"/>
|
||||
<controller name="one_card" pages="0,,1," selected="0"/>
|
||||
<controller name="resultOut" pages="0,,1," selected="0"/>
|
||||
<controller name="resultOut" pages="0,,1," selected="1"/>
|
||||
<controller name="time_clock" pages="0,,1," selected="0"/>
|
||||
<displayList>
|
||||
<list id="n53_q9cc" name="hand_card_list" xy="-697,-634" size="445,78" visible="false" layout="row" selectionMode="none" overflow="scroll" lineGap="-15" colGap="-25" defaultItem="ui://9n9stu2eprgz8e" align="right"/>
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
<item/>
|
||||
</list>
|
||||
<list id="n62_ckvb" name="n62" xy="570,-1020" size="200,300" overflow="scroll"/>
|
||||
<list id="n63_ckvb" name="list_resultOut" xy="498,-26" pivot="0.5,0.5" size="1014,210" layout="flow_hz" colGap="-101" defaultItem="ui://9n9stu2eckvbcjn" align="right">
|
||||
<list id="n63_ckvb" name="list_resultOut" xy="498,-26" pivot="0.5,0.5" size="1014,210" layout="flow_hz" lineGap="-90" colGap="-101" defaultItem="ui://9n9stu2eckvbcjn" align="right" autoClearItems="true">
|
||||
<gearDisplay controller="resultOut" pages="1"/>
|
||||
<item/>
|
||||
<item/>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="2532,1170" designImageAlpha="100" designImageLayer="1">
|
||||
<controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放" selected="1"/>
|
||||
<controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放,4,观战" selected="4"/>
|
||||
<controller name="sdk" pages="0,,1," selected="0"/>
|
||||
<controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
|
||||
<controller name="time" pages="0,,1,,2,,3," selected="0"/>
|
||||
|
|
@ -8,6 +8,7 @@
|
|||
<controller name="zidongtishi" pages="0,,1," selected="0"/>
|
||||
<controller name="voice" pages="0,,1," selected="0"/>
|
||||
<controller name="Inclear" pages="0,,1," selected="0"/>
|
||||
<controller name="witness" pages="0,,1," selected="0"/>
|
||||
<displayList>
|
||||
<graph id="n141_ckvb" name="bg_mask" xy="6,7" size="2532,751" type="rect" lineSize="0" fillColor="#00ffffff"/>
|
||||
<component id="n76_rqeb" name="mask" src="prgzeq" fileName="component/mask.xml" xy="14,1956" alpha="0">
|
||||
|
|
@ -129,13 +130,20 @@
|
|||
<relation target="" sidePair="left-left,bottom-bottom"/>
|
||||
</component>
|
||||
<group id="n121_ckvb" name="playiinfo" xy="18,17" size="2497,700"/>
|
||||
<component id="n127_ckvb" name="btn_sendText" src="ckvbcj7" fileName="Main_New/Component/Btn_Message.xml" xy="2337,507" size="135,116" group="n129_ckvb">
|
||||
<relation target="" sidePair="right-right,top-top%"/>
|
||||
</component>
|
||||
<component id="n142_eqmd" name="btn_sendTalk" src="eqmdckh" fileName="Main_New/Component/Btn_MessageTalk.xml" xy="2335,642" size="135,120" group="n129_ckvb">
|
||||
<relation target="" sidePair="right-right,top-top%"/>
|
||||
</component>
|
||||
<group id="n129_ckvb" name="left" xy="2335,507" size="137,255"/>
|
||||
<component id="n69_sdax" name="player_card_info_1" src="ckvbcjl" fileName="Main_New/Player_card_info_1.xml" xy="126,838" group="n122_ckvb">
|
||||
<gearDisplay controller="state" pages="1,3"/>
|
||||
<gearDisplay controller="state" pages="1,3,4"/>
|
||||
<gearLook controller="state" pages="3" values="1,0,0,1" default="1,0,0,1"/>
|
||||
<relation target="" sidePair="width-width%,height-height%,center-center,bottom-bottom"/>
|
||||
</component>
|
||||
<component id="n71_sdax" name="player_card_info_2" src="ckvbcjo" fileName="Main_New/Player_card_info_2.xml" xy="447,175" group="n122_ckvb" touchable="false">
|
||||
<gearDisplay controller="state" pages="1,3"/>
|
||||
<gearDisplay controller="state" pages="1,3,4"/>
|
||||
<relation target="n18" sidePair="right-left,middle-middle"/>
|
||||
</component>
|
||||
<group id="n122_ckvb" name="playCardInfo" xy="126,175" size="2280,991"/>
|
||||
|
|
@ -160,13 +168,6 @@
|
|||
<group id="n126_ckvb" name="readyBtn" xy="831,481" size="866,360" advanced="true">
|
||||
<gearDisplay controller="state" pages="0,2"/>
|
||||
</group>
|
||||
<component id="n127_ckvb" name="btn_sendText" src="ckvbcj7" fileName="Main_New/Component/Btn_Message.xml" xy="2337,507" size="135,116" group="n129_ckvb">
|
||||
<relation target="" sidePair="right-right,top-top%"/>
|
||||
</component>
|
||||
<component id="n142_eqmd" name="btn_sendTalk" src="eqmdckh" fileName="Main_New/Component/Btn_MessageTalk.xml" xy="2335,642" size="135,120" group="n129_ckvb">
|
||||
<relation target="" sidePair="right-right,top-top%"/>
|
||||
</component>
|
||||
<group id="n129_ckvb" name="left" xy="2335,507" size="137,255"/>
|
||||
<component id="n153_n9qr" name="btn_ready_inClear" src="ckvbcjb" fileName="Main_New/Component/Btn_Ready.xml" xy="1078,712" size="378,127">
|
||||
<gearDisplay controller="Inclear" pages="1"/>
|
||||
<relation target="" sidePair="width-width%,height-height%,center-center,top-middle%"/>
|
||||
|
|
@ -247,6 +248,23 @@
|
|||
<component id="n166_ukp7" name="com_notice" src="ukp7tcqy" fileName="Main_new/com_notice.xml" xy="681,104" size="1169,62">
|
||||
<relation target="" sidePair="top-top"/>
|
||||
</component>
|
||||
<graph id="n169_ukp7" name="n169" xy="886,999" size="760,92" type="rect" lineSize="0" fillColor="#4c000000">
|
||||
<gearDisplay controller="state" pages="4"/>
|
||||
<relation target="" sidePair="center-center,bottom-bottom"/>
|
||||
</graph>
|
||||
<text id="n170_ukp7" name="n170" xy="1103,1004" size="326,82" font="FZCuYuan-M03" fontSize="62" color="#ffffff" letterSpacing="3" text="正在旁观中">
|
||||
<gearDisplay controller="state" pages="4"/>
|
||||
<relation target="" sidePair="center-center,bottom-bottom"/>
|
||||
</text>
|
||||
<component id="n171_ukp7" name="n171" src="sx7x14f" fileName="Main_new/Main/Component/btn_bg.xml" pkg="v0j9abjy" xy="0,0" size="2532,1170">
|
||||
<gearDisplay controller="witness" pages="1"/>
|
||||
<relation target="" sidePair="width-width,height-height"/>
|
||||
<Button controller="witness" page="0"/>
|
||||
</component>
|
||||
<component id="n172_ukp7" name="comp_witness" src="ukp7tcr1" fileName="Main_new/Main/Component/comp_witness.xml" xy="2537,30">
|
||||
<gearDisplay controller="witness" pages="1"/>
|
||||
<gearXY controller="witness" pages="0" values="2537,30" default="2097,30" tween="true" ease="Linear" duration="0.5"/>
|
||||
</component>
|
||||
</displayList>
|
||||
<transition name="t1">
|
||||
<item time="0" type="Alpha" target="n75_jmab" tween="true" startValue="1" endValue="1" duration="18"/>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="2532,1170" designImageAlpha="100" designImageLayer="1">
|
||||
<controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放" selected="0"/>
|
||||
<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="time" pages="0,,1,,2,,3," selected="0"/>
|
||||
|
|
@ -8,13 +8,14 @@
|
|||
<controller name="zidongtishi" pages="0,,1," selected="0"/>
|
||||
<controller name="voice" pages="0,,1," selected="0"/>
|
||||
<controller name="Inclear" pages="0,,1," selected="0"/>
|
||||
<controller name="witness" pages="0,,1," selected="0"/>
|
||||
<displayList>
|
||||
<graph id="n141_ckvb" name="bg_mask" xy="6,7" size="2532,751" type="rect" lineSize="0" fillColor="#00ffffff"/>
|
||||
<component id="n76_rqeb" name="mask" src="prgzeq" fileName="component/mask.xml" xy="14,1956" alpha="0">
|
||||
<gearDisplay controller="state" pages="1"/>
|
||||
<gearLook controller="state" pages="0,2,3" values="0,0,0,1|0,0,0,1|0,0,0,1" default="0,0,0,1"/>
|
||||
</component>
|
||||
<image id="n158_ukp7" name="n158" src="11k4tcqe" fileName="logo_301.png" xy="1265,372" size="400,61"/>
|
||||
<image id="n158_ukp7" name="n158" src="11k4tcqe" fileName="Main_new/Image/logo_301.png" xy="1265,372" size="400,61"/>
|
||||
<component id="n12" name="btn_wxyqhy" src="o3tbcgo" fileName="component/Btn_wxyq.xml" xy="1188,2161" group="n13">
|
||||
<gearDisplay controller="sdk" pages="0"/>
|
||||
</component>
|
||||
|
|
@ -124,15 +125,15 @@
|
|||
<graph id="n102_t2e2" name="n109" xy="342,-1343" size="1670,834" visible="false" type="rect" lineSize="0" fillColor="#80000000"/>
|
||||
<component id="n101_t2e2" name="tuoguanzhong" src="prgzew" fileName="component/tuoguanzhong.xml" xy="996,2338" visible="false"/>
|
||||
<component id="n18" name="player_info2" src="ckvbcje" fileName="Main_New/PlayerHead_2.xml" xy="2359,17" size="156,126" group="n121_ckvb">
|
||||
<gearXY controller="state" pages="0,1,2,3" values="2359,17|2359,17|2336,32|2372,294"/>
|
||||
<gearXY controller="state" pages="0,1,2,3" values="2359,17|2359,17|2336,32|2372,294" default="2359,17"/>
|
||||
<relation target="" sidePair="right-right,middle-middle"/>
|
||||
</component>
|
||||
<component id="n7" name="player_info1" src="ckvbcim" fileName="Main_New/PlayerHead_1.xml" xy="18,586" size="157,131" group="n121_ckvb">
|
||||
<gearXY controller="state" pages="0,1,2,3" values="18,586|18,586|80,495|9,721"/>
|
||||
<gearXY controller="state" pages="0,1,2,3" values="18,586|18,586|80,495|9,721" default="18,586"/>
|
||||
<relation target="" sidePair="left-left,bottom-bottom"/>
|
||||
</component>
|
||||
<component id="n156_11k4t" name="player_info3" src="11k4tcq6" fileName="Main_New/PlayerHead_3.xml" xy="18,17" size="156,126" group="n121_ckvb">
|
||||
<gearXY controller="state" pages="0,1,2,3" values="18,17|2359,17|2336,32|2372,294"/>
|
||||
<gearXY controller="state" pages="0,1,2,3" values="18,17|2359,17|2336,32|2372,294" default="18,17"/>
|
||||
<relation target="" sidePair="right-right,middle-middle"/>
|
||||
</component>
|
||||
<group id="n121_ckvb" name="playiinfo" xy="18,17" size="2497,700"/>
|
||||
|
|
@ -237,6 +238,23 @@
|
|||
<gearDisplay controller="voice" pages="1"/>
|
||||
<relation target="" sidePair="width-width,height-height"/>
|
||||
</component>
|
||||
<graph id="n159_ukp7" name="n159" xy="886,999" size="760,92" type="rect" lineSize="0" fillColor="#4c000000">
|
||||
<gearDisplay controller="state" pages="4"/>
|
||||
<relation target="" sidePair="center-center,bottom-bottom"/>
|
||||
</graph>
|
||||
<text id="n160_ukp7" name="n160" xy="1103,1004" size="326,82" font="FZCuYuan-M03" fontSize="62" color="#ffffff" letterSpacing="3" text="正在旁观中">
|
||||
<gearDisplay controller="state" pages="4"/>
|
||||
<relation target="" sidePair="center-center,bottom-bottom"/>
|
||||
</text>
|
||||
<component id="n161_ukp7" name="n161" src="sx7x14f" fileName="Main_new/Main/Component/btn_bg.xml" pkg="v0j9abjy" xy="0,0" size="2532,1170">
|
||||
<gearDisplay controller="witness" pages="1"/>
|
||||
<relation target="" sidePair="width-width,height-height"/>
|
||||
<Button controller="witness" page="0"/>
|
||||
</component>
|
||||
<component id="n162_ukp7" name="comp_witness" src="ukp7tcr1" fileName="Main_new/Main/Component/comp_witness.xml" xy="2537,30">
|
||||
<gearDisplay controller="witness" pages="1"/>
|
||||
<gearXY controller="witness" pages="0" values="2537,30" default="2097,30" tween="true" ease="Linear" duration="0.5"/>
|
||||
</component>
|
||||
</displayList>
|
||||
<transition name="t1">
|
||||
<item time="0" type="Alpha" target="n75_jmab" tween="true" startValue="1" endValue="1" duration="18"/>
|
||||
|
|
|
|||
|
|
@ -688,6 +688,12 @@
|
|||
<component id="ukp7tcqt" name="com_logo.xml" path="/Main_new/Component/"/>
|
||||
<component id="ukp7tcqy" name="com_notice.xml" path="/Main_new/"/>
|
||||
<image id="ukp7tcqz" name="result_tips_bg.png" path="/component/notice_old/" scale9grid="284,16,215,32"/>
|
||||
<component id="ukp7tcr1" name="comp_witness.xml" path="/Main_new/Main/Component/"/>
|
||||
<image id="ukp7tcr2" name="Group 541.png" path="/Main_new/Main/Image/"/>
|
||||
<component id="ukp7tcr3" name="comp_witnessPlayer.xml" path="/Main_new/Main/Component/"/>
|
||||
<component id="ukp7tcr4" name="btn_head.xml" path="/Main_new/Main/Component/"/>
|
||||
<component id="ukp7tcr5" name="btn_normol(2).xml" path="/Main_new/Main/Component/"/>
|
||||
<image id="ukp7tcr6" name="Group 241(1).png" path="/Main_new/Main/Image/"/>
|
||||
</resources>
|
||||
<publish name="Extend_Poker_RunFastNew" path="..\wb_unity_pro\Assets\ART\extend\poker\runfast\ui" packageCount="2"/>
|
||||
</packageDescription>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 2.1 MiB After Width: | Height: | Size: 2.4 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.8 MiB After Width: | Height: | Size: 1.6 MiB |
Binary file not shown.
Loading…
Reference in New Issue