跑得快显2,三张不带发送字段
parent
645e9a576b
commit
bd0feb2a37
|
|
@ -228,9 +228,10 @@ function M:SelectedConfigData()
|
|||
_data["maxPlayers"] = peopleNum == 1 and 2 or 3 --人数 2是2人 3是三人
|
||||
_data["rule"] = wanfa1_5 == 0 and 2 or 1 --黑桃3必出 2是选择了该玩法 1是没有该玩法
|
||||
_data["showlength"] = (showCardNum + 1) % 2 --显示手牌数量 0是不显示 1是显示
|
||||
_data["planelack"] = wanfa1_2 or wanfa1_1 --[[三张、飞机可少带接完 0是没有该玩法 1是有该玩法,
|
||||
吴哥说这个玩法可能包含了三张、飞机可不带,没有告诉我添加字段,这个字段是飞机,下个字段是三带]]
|
||||
_data["threelack"] = wanfa1_2 or wanfa1_1
|
||||
_data["planeNoBelt"] = wanfa1_1 --飞机不带
|
||||
_data["threeNoBelt"] = wanfa1_1 --三张不带
|
||||
_data["planelack"] = wanfa1_2 --飞机可少带接完
|
||||
_data["threelack"] = wanfa1_2 --三张可少带接完
|
||||
_data["fourDaiThree"] = false --四带三 false没有该玩法 true有该玩法
|
||||
if wanfa1_3 then
|
||||
_data["fourDaiThree"] = true
|
||||
|
|
|
|||
|
|
@ -852,7 +852,6 @@ function M:GetHandCardPos(index, card_count)
|
|||
local middle_x = self.cards_view.width / 2
|
||||
local start_x = middle_x - (card_count / 2 * (self.card_width + offset)) + (offset / 2)
|
||||
x = start_x + (self.card_width + offset) * (index - 1)
|
||||
print("================================GetHandCardPos", x, y)
|
||||
return Vector2.New(x, y)
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ local RunFast_ResultView = {}
|
|||
local M = RunFast_ResultView
|
||||
|
||||
function RunFast_ResultView.new(blur_view, data, roomid, over, win_seat, dissolve, remaincards)
|
||||
setmetatable(M, {__index = ResultView})
|
||||
local self = setmetatable({}, {__index = M})
|
||||
setmetatable(M, { __index = ResultView })
|
||||
local self = setmetatable({}, { __index = M })
|
||||
|
||||
self.class = "RunFast_ResultView"
|
||||
self._currenIndex = 0
|
||||
|
|
@ -23,36 +23,35 @@ function RunFast_ResultView.new(blur_view, data, roomid, over, win_seat, dissolv
|
|||
end
|
||||
|
||||
function M:init(url, data, roomid, over, win_seat, dissolve, remaincards)
|
||||
|
||||
ResultView.init(self, url,true)
|
||||
self.xiPaiCtr=self._view:GetController("xipai")
|
||||
ResultView.init(self, url, true)
|
||||
self.xiPaiCtr = self._view:GetController("xipai")
|
||||
|
||||
|
||||
local round=DataManager.CurrenRoom.room_config.config.times or 1
|
||||
local xpconfig=DataManager.CurrenRoom.room_config.config.xi_pai
|
||||
if xpconfig and round>1 then
|
||||
self.xiPaiCtr.selectedIndex=1
|
||||
local round = DataManager.CurrenRoom.room_config.config.times or 1
|
||||
local xpconfig = DataManager.CurrenRoom.room_config.config.xi_pai
|
||||
if xpconfig and round > 1 then
|
||||
self.xiPaiCtr.selectedIndex = 1
|
||||
else
|
||||
self.xiPaiCtr.selectedIndex=0
|
||||
self.xiPaiCtr.selectedIndex = 0
|
||||
end
|
||||
|
||||
|
||||
--self:InitData(data,roomid)
|
||||
--self:InitData(data,roomid)
|
||||
printlog("aaaaaaaaaaaaaaaa1111111111111111111111111222222222222222 ",dissolve)
|
||||
printlog("aaaaaaaaaaaaaaaa1111111111111111111111111222222222222222 ", dissolve)
|
||||
pt(data)
|
||||
if dissolve == 1 then
|
||||
-- body
|
||||
self.xiPaiCtr.selectedIndex=0
|
||||
self.xiPaiCtr.selectedIndex = 0
|
||||
self:InitData(data, win_seat, roomid)
|
||||
else
|
||||
local xipai=self._view:GetChild("btn_xipai")
|
||||
xipai.touchable=true
|
||||
local xipai = self._view:GetChild("btn_xipai")
|
||||
xipai.touchable = true
|
||||
xipai.onClick:Add(function()
|
||||
local xiPaiCallBack=function ()
|
||||
xipai.touchable=false
|
||||
self.xiPaiCtr.selectedIndex=0
|
||||
ViewUtil.ErrorTip(1000000,"申请洗牌成功")
|
||||
local xiPaiCallBack = function()
|
||||
xipai.touchable = false
|
||||
self.xiPaiCtr.selectedIndex = 0
|
||||
ViewUtil.ErrorTip(1000000, "申请洗牌成功")
|
||||
end
|
||||
local _gamectr = ControllerManager.GetController(GameController)
|
||||
_gamectr:SendXiPaiAction(xiPaiCallBack)
|
||||
|
|
@ -65,10 +64,9 @@ function M:init(url, data, roomid, over, win_seat, dissolve, remaincards)
|
|||
|
||||
self:InitData_One(data, win_seat, over, roomid, remaincards)
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
function M:ChangeCodeByTo( card )
|
||||
function M:ChangeCodeByTo(card)
|
||||
local flower = card % 10
|
||||
local number = math.floor(card / 10)
|
||||
if number == 15 then
|
||||
|
|
@ -79,7 +77,6 @@ end
|
|||
|
||||
-- 小结算
|
||||
function M:InitData_One(data, winseat, over, roomid, remaincards)
|
||||
|
||||
local room = DataManager.CurrenRoom
|
||||
self._view:GetController("sdk").selectedIndex = 1
|
||||
local _gamectr = ControllerManager.GetController(GameController)
|
||||
|
|
@ -89,13 +86,12 @@ function M:InitData_One(data, winseat, over, roomid, remaincards)
|
|||
local leftCardAll = self._view:GetChild("leftCardHand")
|
||||
leftCardAll:RemoveChildrenToPool()
|
||||
|
||||
if remaincards and #remaincards>0 then
|
||||
table.sort(remaincards,function (a,b)
|
||||
if remaincards and #remaincards > 0 then
|
||||
table.sort(remaincards, function(a, b)
|
||||
return a % 100 < b % 100
|
||||
|
||||
end)
|
||||
for i=1,#remaincards do
|
||||
local card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/"..remaincards[i])
|
||||
for i = 1, #remaincards do
|
||||
local card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. remaincards[i])
|
||||
leftCardAll:AddChild(card_code_obj)
|
||||
end
|
||||
end
|
||||
|
|
@ -113,9 +109,9 @@ function M:InitData_One(data, winseat, over, roomid, remaincards)
|
|||
-- return a % 100 < b % 100
|
||||
-- end)
|
||||
|
||||
for j=1,#data[i].handCards do
|
||||
for j = 1, #data[i].handCards do
|
||||
local code = data[i].handCards[j]
|
||||
local card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/"..code)
|
||||
local card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code)
|
||||
leftCard:AddChild(card_code_obj)
|
||||
end
|
||||
|
||||
|
|
@ -125,11 +121,12 @@ function M:InitData_One(data, winseat, over, roomid, remaincards)
|
|||
|
||||
|
||||
|
||||
for k=1,#data[i].outCards do
|
||||
for k = 1, #data[i].outCards do
|
||||
local code = data[i].outCards[k]
|
||||
local card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/"..code)
|
||||
local card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code)
|
||||
print("==================================================card_code_obj", card_code_obj, code)
|
||||
leftCard:AddChild(card_code_obj)
|
||||
card_code_obj:GetChildAt(0):GetChildAt(0).color = Color(0.7,0.7,0.7)
|
||||
card_code_obj:GetChildAt(0):GetChildAt(0).color = Color(0.7, 0.7, 0.7)
|
||||
end
|
||||
|
||||
|
||||
|
|
@ -150,7 +147,6 @@ function M:InitData_One(data, winseat, over, roomid, remaincards)
|
|||
-- body
|
||||
nichen.text = tostring(player.nick)
|
||||
else
|
||||
|
||||
nichen.text = tostring(player.self_user.nick_name)
|
||||
end
|
||||
|
||||
|
|
@ -171,7 +167,6 @@ function M:InitData_One(data, winseat, over, roomid, remaincards)
|
|||
local hp_nonnegative = room:checkHpNonnegative()
|
||||
local roundScore = player.winscore
|
||||
if hp_nonnegative then
|
||||
|
||||
local jifen = ""
|
||||
if roundScore > 0 then
|
||||
jifen = "+" .. roundScore
|
||||
|
|
@ -195,7 +190,6 @@ function M:InitData_One(data, winseat, over, roomid, remaincards)
|
|||
|
||||
item:GetChild("score").text = jifen .. tili .. limit
|
||||
else
|
||||
|
||||
local jifen = ""
|
||||
if roundScore >= 0 then
|
||||
jifen = "+" .. roundScore
|
||||
|
|
@ -206,7 +200,6 @@ function M:InitData_One(data, winseat, over, roomid, remaincards)
|
|||
|
||||
local tili = ""
|
||||
if room.hpOnOff > 0 then
|
||||
|
||||
local need = roundScore * rt
|
||||
tili = "("
|
||||
if roundScore > 0 then
|
||||
|
|
@ -223,18 +216,15 @@ function M:InitData_One(data, winseat, over, roomid, remaincards)
|
|||
end
|
||||
|
||||
if roundScore >= 0 then
|
||||
|
||||
if room.self_player.seat == player.seat then
|
||||
-- body
|
||||
self._view:GetController("result").selectedIndex = 1
|
||||
end
|
||||
else
|
||||
|
||||
if room.self_player.seat == player.seat then
|
||||
self._view:GetController("result").selectedIndex = 0
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
|
||||
|
|
@ -245,23 +235,21 @@ function M:InitData_One(data, winseat, over, roomid, remaincards)
|
|||
self:Destroy()
|
||||
local _gamectr = ControllerManager.GetController(GameController)
|
||||
_gamectr:ConformToNextGame()
|
||||
|
||||
end)
|
||||
else
|
||||
self.xiPaiCtr.selectedIndex=0
|
||||
self.xiPaiCtr.selectedIndex = 0
|
||||
local btn_confirm = self._view:GetChild("btn_confirm")
|
||||
btn_confirm.onClick:Set(function()
|
||||
--self:Destroy()
|
||||
self:InitData(data, winseat, roomid)
|
||||
-- ViewManager.ChangeView(ViewManager.View_Lobby)
|
||||
end)
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
-- 大结算
|
||||
function M:InitData(data, winseat, roomid)
|
||||
self.xiPaiCtr.selectedIndex=0
|
||||
self.xiPaiCtr.selectedIndex = 0
|
||||
self._view:GetController("sdk").selectedIndex = 0
|
||||
|
||||
local room = DataManager.CurrenRoom
|
||||
|
|
@ -312,11 +300,12 @@ function M:InitData(data, winseat, roomid)
|
|||
player_list[i].param[4].value = tostring(data[i].settle_log.maxscore * rt)
|
||||
|
||||
if data[i].daniao > 0 then
|
||||
player_list[i].flag = {"打鸟"}
|
||||
player_list[i].flag = { "打鸟" }
|
||||
end
|
||||
end
|
||||
|
||||
self:GenerateRoomResultInfo(room.room_config.Times, room.room_config:GetGameName(), room.room_id, room.create_time, player_list)
|
||||
self:GenerateRoomResultInfo(room.room_config.Times, room.room_config:GetGameName(), room.room_id, room.create_time,
|
||||
player_list)
|
||||
self:InitBigResult(room)
|
||||
local big_result = self._view:GetChild("big_result")
|
||||
local lst_p = big_result:GetChild("player_list")
|
||||
|
|
@ -329,7 +318,6 @@ function M:InitData(data, winseat, roomid)
|
|||
tem:GetChild("txt_value").textFormat.size = 30
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
return M
|
||||
|
|
|
|||
Binary file not shown.
Loading…
Reference in New Issue