覆盖导致缺失补全
parent
ffed5e0ac1
commit
b6670a1db7
|
|
@ -28,25 +28,72 @@ function M.new(view, mainView)
|
|||
end
|
||||
|
||||
function M:init()
|
||||
local view = self._view
|
||||
local _area_mask = view:GetChild('area_mask')
|
||||
local mask = _area_mask.text
|
||||
|
||||
self._mask_data = json.decode(mask)
|
||||
self._area_handcard_list = view:GetChild('area_handcard_list')
|
||||
|
||||
local CardInfo = self._view:GetChild('Text_CardInfo')
|
||||
self._viewText_cardInfo = json.decode(CardInfo.text)
|
||||
|
||||
local CardInfo = self._view:GetChild('Text_CardInfo')
|
||||
self._viewText_cardInfo = json.decode(CardInfo.text)
|
||||
|
||||
self._view_handCardList = self._view:GetChild('List_HandCard')
|
||||
self._view_FZList = self._view:GetChild('List_FZ')
|
||||
self._view_outCardList = self._view:GetChild('List_OutCard')
|
||||
self._viewBtn_getCard = self._view:GetChild('Btn_HandCard')
|
||||
|
||||
self._ctr_getCard = self._view:GetController('getCard')
|
||||
self._ctr_seletedGet = self._view:GetController('seletedGetCard')
|
||||
|
||||
self._area_fz_list = view:GetChild('area_fz_list')
|
||||
self._area_outcard_list = view:GetChild('area_outcard_list')
|
||||
self._src_fz_list =
|
||||
Vector4(self._area_fz_list.x, self._area_fz_list.y, self._area_fz_list.width, self._area_fz_list.height)
|
||||
local c3d = self._view:GetController('3d')
|
||||
if c3d ~= nil then
|
||||
c3d.selectedIndex = 1
|
||||
end
|
||||
self._src_fz_list_3d =
|
||||
Vector4(self._area_fz_list.x, self._area_fz_list.y, self._area_fz_list.width, self._area_fz_list.height)
|
||||
local c3d = self._view:GetController('3d')
|
||||
if c3d ~= nil then
|
||||
c3d.selectedIndex = 0
|
||||
end
|
||||
|
||||
self._mask_liangpai = view:GetChild('mask_liangpai')
|
||||
|
||||
local _gamectr = ControllerManager.GetController(GameController)
|
||||
if _gamectr then
|
||||
_gamectr:AddEventListener(GameEvent.MJModifySzie, handler(self, self.SetMJSize))
|
||||
end
|
||||
end
|
||||
|
||||
function M:SetMJSize(zS)
|
||||
local tempSzieConfig = {}
|
||||
tempSzieConfig.size = zS
|
||||
local filename = 'mjsize' .. DataManager.SelfUser.account_id
|
||||
Utils.SaveLocalFile(filename, json.encode(tempSzieConfig))
|
||||
|
||||
--ControllerManager.OnConnect(SocketCode.TimeoutDisconnect)
|
||||
ViewManager.refreshGameView()
|
||||
end
|
||||
|
||||
function M:SetPlayer(p)
|
||||
self._player = p
|
||||
end
|
||||
|
||||
function M:FillData(begin)
|
||||
if (begin) then
|
||||
for i = 1, #self._player.fz_list do
|
||||
self:UpdateFzList(self._player.fz_list[i], -1)
|
||||
end
|
||||
self:UpdateOutCardList()
|
||||
else
|
||||
self._current_card_type = DataManager.CurrenRoom.card_type
|
||||
|
||||
if self._current_card_type == 2 then
|
||||
local c3d = self._view:GetController('3d')
|
||||
if c3d ~= nil then
|
||||
c3d.selectedIndex = 1
|
||||
end
|
||||
else
|
||||
local c3d = self._view:GetController('3d')
|
||||
if c3d ~= nil then
|
||||
c3d.selectedIndex = 0
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
function M:Clear()
|
||||
--self._ctr_state.selectedIndex = 0
|
||||
|
|
@ -59,15 +106,6 @@ function M:Clear()
|
|||
self._area_handcard_list:RemoveChildren(0, -1, true)
|
||||
self._area_outcard_list:RemoveChildren(0, -1, true)
|
||||
self._mask_liangpai:RemoveChildren(0, -1, true)
|
||||
self._view_handCardList:RemoveChildren(0, -1, true)
|
||||
self._view_outCardList:RemoveChildren(0, -1, true)
|
||||
self._view_FZList:RemoveChildren(0, -1, true)
|
||||
self._view_getCard:RemoveChildren(0, -1, true)
|
||||
|
||||
self._view_handCardList.selectedIndex = -1
|
||||
self._click_index = self._view_handCardList.selectedIndex
|
||||
self._ctr_seletedGet.selectedIndex = 0
|
||||
|
||||
end
|
||||
|
||||
-- 获取麻将资源前缀
|
||||
|
|
@ -93,10 +131,7 @@ function M:fillCard2(obj, pos_str, card)
|
|||
if DataManager.CurrenRoom.jing and card == DataManager.CurrenRoom.jing and obj:GetController('jing') then
|
||||
obj:GetController('jing').selectedIndex = 1
|
||||
end
|
||||
|
||||
|
||||
obj:GetChild("icon").url = 'ui://Main_Majiang/' .. pos_str .. card
|
||||
|
||||
end
|
||||
|
||||
function M:getBackCard(card)
|
||||
|
|
@ -112,14 +147,73 @@ end
|
|||
function M:UpdateHandCard(getcard, mp)
|
||||
getcard = getcard or false
|
||||
mp = mp or false
|
||||
local handcard_list = self._mask_data['handcard_list']
|
||||
local oder = handcard_list['oder']
|
||||
local _player = self._player
|
||||
-- -- print(vardump(self._player))
|
||||
|
||||
self._view_handCardList:RemoveChildren()
|
||||
for i = 0, self._player.hand_left_count - 1 do
|
||||
-- if i >= self._view_handCardList.numItems then
|
||||
self._view_handCardList:AddItemFromPool()
|
||||
-- end
|
||||
self._area_handcard_list:RemoveChildren(0, -1, true)
|
||||
-- -- print(vardump(_player.card_list))
|
||||
if (not mp) then
|
||||
local comp_back = handcard_list['comp_back']
|
||||
if self._current_card_type == 2 then
|
||||
comp_back = comp_back .. '_3d'
|
||||
end
|
||||
|
||||
for i = 0, _player.hand_left_count - 1 do
|
||||
local obj = UIPackage.CreateObjectFromURL(self:getBackCard(comp_back))
|
||||
local _room = DataManager.CurrenRoom
|
||||
local people_num = _room.room_config.people_num
|
||||
local pos = ViewUtil.GetPos(_room.self_player.seat, _player.seat, people_num)
|
||||
local gap = (pos == 3 and people_num == 4 or pos == 2 and people_num == 2) and 15 or 45
|
||||
local offset = getcard and (i == _player.hand_left_count - 1 and gap or 0)
|
||||
-- local offset = getcard and (i == _player.hand_left_count - 1 and 15 or 0)
|
||||
ViewUtil.CardPos(obj, self._area_handcard_list, oder, i, offset)
|
||||
|
||||
--改变左右两边的手牌的x值
|
||||
if self._current_card_type == 2 and (oder == AreaOderType.down_up or oder == AreaOderType.up_down) then
|
||||
obj.x = i * -7.0
|
||||
end
|
||||
|
||||
if (oder == AreaOderType.down_up) then
|
||||
self._area_handcard_list:AddChildAt(obj, 0)
|
||||
else
|
||||
self._area_handcard_list:AddChild(obj)
|
||||
end
|
||||
end
|
||||
else
|
||||
local outcard_list = self._mask_data['outcard_list']
|
||||
local comp = handcard_list['comp']
|
||||
local card = outcard_list['card']
|
||||
---- print("comp"..comp)
|
||||
-- -- print(vardump(_player.card_list))
|
||||
|
||||
if self._current_card_type == 2 then
|
||||
comp = comp .. '_3d'
|
||||
end
|
||||
|
||||
for i = 0, #_player.card_list - 1 do
|
||||
local obj = UIPackage.CreateObject('Main_Majiang', comp)
|
||||
|
||||
self:fillCard(obj, card, _player.card_list[i + 1])
|
||||
-- obj.icon = UIPackage.GetItemURL("Main_Majiang", card .. _player.card_list[i+1])
|
||||
|
||||
local offset = getcard and (i == _player.hand_left_count - 1 and 0 or 0)
|
||||
|
||||
ViewUtil.CardPos(obj, self._area_handcard_list, oder, i, offset)
|
||||
|
||||
--改变左右两边的手牌的x值
|
||||
if self._current_card_type == 2 and (oder == AreaOderType.down_up or oder == AreaOderType.up_down) then
|
||||
obj.x = i * -7
|
||||
end
|
||||
|
||||
if (oder == AreaOderType.down_up) then
|
||||
self._area_handcard_list:AddChildAt(obj, 0)
|
||||
else
|
||||
self._area_handcard_list:AddChild(obj)
|
||||
end
|
||||
end
|
||||
end
|
||||
self._ctr_getCard.selectedIndex = getcard and 1 or 0
|
||||
end
|
||||
|
||||
-- 获取麻将图片资源位置，可以在扩展中复写
|
||||
|
|
@ -167,14 +261,91 @@ function M:UpdateOutCardList(outcard, card_item, cursor)
|
|||
card_item = card_item or 0
|
||||
cursor = cursor or nil
|
||||
|
||||
local outCardName = self._viewText_cardInfo['Out_Card']
|
||||
local outcard
|
||||
|
||||
local outlist = self._player.outcard_list
|
||||
if (outcard) then
|
||||
outcard:SetPivot(0.5, 0.5, true)
|
||||
outcard.touchable = false
|
||||
-- outcard.icon = "ui://Main_Majiang/" .. self:GetPrefix() .. "202_" .. card_item
|
||||
outcard.icon = string.format('ui://%s/%s202_%s', self:GetCardPicPack(), self:GetPrefix(), card_item)
|
||||
self._mask_liangpai:AddChild(outcard)
|
||||
end
|
||||
|
||||
local outcard_list = self._mask_data['outcard_list']
|
||||
local oder = outcard_list['oder']
|
||||
local comp = outcard_list['comp']
|
||||
local card = outcard_list['card']
|
||||
local multi_oder = outcard_list['multi_oder']
|
||||
local num = outcard_list['num']
|
||||
local multi_draw_oder = 0
|
||||
local sortStart = 0
|
||||
local sortType = 0
|
||||
local sortStep = 0
|
||||
if (outcard_list['multi_draw_oder']) then
|
||||
multi_draw_oder = outcard_list['multi_draw_oder']
|
||||
end
|
||||
|
||||
if self._current_card_type == 2 then
|
||||
comp = comp .. '_3d'
|
||||
num = outcard_list['num3d']
|
||||
multi_oder = outcard_list['multi_oder3d']
|
||||
sortType = outcard_list['sorting_order3d']
|
||||
card = outcard_list['card3d']
|
||||
if sortType == 1 then
|
||||
sortStart = 1
|
||||
sortStep = 1
|
||||
elseif sortType == -1 then
|
||||
sortStart = #outlist
|
||||
sortStep = -1
|
||||
end
|
||||
end
|
||||
|
||||
local obj = nil
|
||||
self._area_outcard_list:RemoveChildren(0, -1, true)
|
||||
for i = 0, #outlist - 1 do
|
||||
local outcard = self._view_outCardList:AddItemFromPool()
|
||||
self:fillCard2(outcard, outCardName, outlist[i + 1])
|
||||
obj = UIPackage.CreateObjectFromURL('ui://Main_Majiang/' .. comp)
|
||||
local row = math.floor(i / num)
|
||||
local col = math.floor(i % num)
|
||||
|
||||
if self._current_card_type == 2 then
|
||||
if i >= num then
|
||||
row = 1 + math.floor(((i - num) / (num + 2)))
|
||||
col = ((i - num) % (num + 2))
|
||||
end
|
||||
end
|
||||
if DataManager.CurrenRoom.room_config.people_num == 2 then
|
||||
ViewUtil.CardPos(obj, self._area_outcard_list, oder, col, nil, nil, -6)
|
||||
ViewUtil.CardPos(obj, self._area_outcard_list, multi_oder, row, nil, nil, -12)
|
||||
elseif DataManager.CurrenRoom.room_config.people_num == 4 then
|
||||
ViewUtil.CardPos(obj, self._area_outcard_list, oder, col, nil, nil, -6)
|
||||
ViewUtil.CardPos(obj, self._area_outcard_list, multi_oder, row, nil, nil, -12)
|
||||
else
|
||||
ViewUtil.CardPos(obj, self._area_outcard_list, oder, col)
|
||||
ViewUtil.CardPos(obj, self._area_outcard_list, multi_oder, row)
|
||||
end
|
||||
|
||||
|
||||
if self._current_card_type == 2 then
|
||||
self:adjust3dOutPut(obj, self._area_outcard_list, oder, num, i)
|
||||
end
|
||||
|
||||
self:fillCard(obj, card, outlist[i + 1])
|
||||
-- 添加角标
|
||||
self:AddFlag(i + 1, outlist[i], obj)
|
||||
-- obj.icon = "ui://Main_Majiang/"..card .. outlist[i+1]
|
||||
sortStart = sortStart + sortStep
|
||||
obj.sortingOrder = sortStart
|
||||
obj.data = outlist[i + 1]
|
||||
|
||||
if (oder == AreaOderType.down_up or (multi_draw_oder == 1)) then
|
||||
self._area_outcard_list:AddChildAt(obj, 0)
|
||||
else
|
||||
self._area_outcard_list:AddChild(obj)
|
||||
end
|
||||
end
|
||||
if (obj and cursor) then
|
||||
cursor.xy = Vector2(obj.width / 2, obj.height / 2)
|
||||
obj:AddChild(cursor)
|
||||
obj:GetController('color').selectedIndex = 1
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -206,49 +377,155 @@ local function getPos(my_seat, other_seat, total)
|
|||
end
|
||||
|
||||
function M:UpdateFzList(fz, index, show_card)
|
||||
|
||||
local gn = 3
|
||||
if fz.type == FZType.Gang or fz.type == FZType.Gang_An or fz.type == FZType.Gang_Peng then
|
||||
gn = 4
|
||||
end
|
||||
|
||||
local fz_list = self._mask_data['fz_list']
|
||||
local FZame = self._viewText_cardInfo['FZ_Card']
|
||||
index = index or 0
|
||||
show_card = show_card or nil
|
||||
local oder = fz_list['oder']
|
||||
local comp = fz_list['comp'] .. gn
|
||||
local card = fz_list['card']
|
||||
local card3d = ''
|
||||
local adjust3d = 0
|
||||
if self._current_card_type == 2 then
|
||||
comp = comp .. '_3d'
|
||||
oder = fz_list['oder3d']
|
||||
adjust3d = fz_list['adjust3d']
|
||||
card = fz_list['card3d']
|
||||
card3d = 'b'
|
||||
end
|
||||
|
||||
local outCard
|
||||
local obj = UIPackage.CreateObjectFromURL('ui://Main_Majiang/' .. comp)
|
||||
-- print("============================================pengpengpeng", comp)
|
||||
|
||||
-- if self._view_outCardList.numItems < #outlist - 1 then
|
||||
-- for i = 1, #outlist - 1 do
|
||||
-- outcard = self._view_outCardList:AddItemFromPool()
|
||||
-- -- end
|
||||
-- self:fillCard2(outcard, outCardName, outlist[i])
|
||||
-- end
|
||||
-- end
|
||||
local _area_fz_list = self._area_fz_list
|
||||
local _area_outcard_list = self._area_outcard_list
|
||||
|
||||
outCard = self._view_FZList:AddItemFromPool()
|
||||
if (index == -1) then
|
||||
local num = _area_fz_list.numChildren
|
||||
|
||||
if fz.type == FZType.Chi then
|
||||
for i = 1, 3 do
|
||||
local FZCard = outCard:GetChild(string.format("Comp_Card%d", i))
|
||||
self:fillCard2(FZCard, FZame, fz.opcard[i])
|
||||
if (oder == AreaOderType.down_up or oder == AreaOderType.up_down) then
|
||||
_area_fz_list.height = _area_fz_list.height + obj.height
|
||||
if (oder == AreaOderType.down_up) then
|
||||
local tem1 = obj.height
|
||||
for i = 1, num do
|
||||
local tem = _area_fz_list:GetChildAt(num - i)
|
||||
tem.y = tem.y + tem1
|
||||
end
|
||||
_area_fz_list.y = _area_fz_list.y - obj.height
|
||||
else
|
||||
ViewUtil.CardPos(obj, _area_outcard_list, oder, num)
|
||||
end
|
||||
elseif (oder == AreaOderType.left_right or oder == AreaOderType.right_left) then
|
||||
_area_fz_list.width = _area_fz_list.width + obj.width
|
||||
if (oder == AreaOderType.right_left) then
|
||||
local tem1 = obj.width
|
||||
for i = 1, num do
|
||||
local tem = _area_fz_list:GetChildAt(num - i)
|
||||
tem.x = tem.x + tem1
|
||||
end
|
||||
_area_fz_list.x = _area_fz_list.x - obj.width
|
||||
else
|
||||
ViewUtil.CardPos(obj, _area_outcard_list, oder, num)
|
||||
end
|
||||
end
|
||||
_area_fz_list:AddChild(obj)
|
||||
|
||||
if self._current_card_type == 2 and (oder == AreaOderType.down_up or oder == AreaOderType.up_down) then
|
||||
num = _area_fz_list.numChildren
|
||||
for i = 1, num do
|
||||
local tem = _area_fz_list:GetChildAt(i - 1)
|
||||
tem.x = adjust3d * (i - 1)
|
||||
end
|
||||
end
|
||||
else
|
||||
local ctr_Four = outCard:GetController("isFour")
|
||||
for i = 1, 3 do
|
||||
local FZCard = outCard:GetChild(string.format("Comp_Card%d", i))
|
||||
print("lingmengfz", string.format("Comp_Card%d", i), FZCard)
|
||||
self:fillCard2(FZCard, FZame, fz.card)
|
||||
local obj1 = _area_fz_list:RemoveChildAt(index)
|
||||
obj1:Dispose()
|
||||
obj.xy = obj1.xy
|
||||
_area_fz_list:AddChildAt(obj, index)
|
||||
end
|
||||
if fz.type == FZType.Peng then
|
||||
ctr_Four.selectedIndex = 0
|
||||
|
||||
-- 显示fz的牌
|
||||
local obj_show
|
||||
if show_card then
|
||||
obj_show = UIPackage.CreateObjectFromURL('ui://Main_Majiang/Fz_0_' .. gn)
|
||||
end
|
||||
|
||||
for i = 1, gn do
|
||||
local _oc = obj:GetChild('card_' .. i)
|
||||
local _oc2 = nil
|
||||
|
||||
if show_card then
|
||||
_oc2 = obj_show:GetChild('card_' .. i)
|
||||
end
|
||||
|
||||
if (fz.type == FZType.Gang_An and i == gn) then
|
||||
if self._current_card_type == 2 then
|
||||
_oc.icon = UIPackage.GetItemURL('MajiangCard3d', card3d .. card .. '00')
|
||||
else
|
||||
ctr_Four.selectedIndex = 1
|
||||
local FZCard = outCard:GetChild(string.format("Comp_Card%d", 4))
|
||||
self:fillCard2(FZCard, FZame, fz.card)
|
||||
if fz.type == FZType.Gang_An then
|
||||
self:fillCard2(FZCard, FZame, '00')
|
||||
_oc.icon = UIPackage.GetItemURL(self:GetCardPicPack(), card3d .. card .. '00')
|
||||
end
|
||||
|
||||
if show_card then
|
||||
_oc2.icon = UIPackage.GetItemURL('Main_Majiang', '202_00')
|
||||
end
|
||||
else
|
||||
if (fz.type == FZType.Chi) then
|
||||
local index = i
|
||||
if oder == AreaOderType.right_left or oder == AreaOderType.down_up then
|
||||
index = gn - i + 1
|
||||
end
|
||||
|
||||
self:fillCard(_oc, card, fz.opcard[index])
|
||||
|
||||
if show_card then
|
||||
self:fillCard(_oc2, '202_', fz.opcard[index], false)
|
||||
end
|
||||
else
|
||||
self:fillCard(_oc, card, fz.card)
|
||||
|
||||
if show_card then
|
||||
self:fillCard(_oc2, '202_', fz.card, false)
|
||||
end
|
||||
end
|
||||
end
|
||||
-- self:fillCard2(outcard, outCardName, card_item)
|
||||
end
|
||||
|
||||
obj.touchable = false
|
||||
|
||||
if show_card then
|
||||
obj_show.touchable = false
|
||||
obj_show:SetPivot(0.5, 0.5, true)
|
||||
obj_show:SetScale(0.8, 0.8)
|
||||
self._mask_liangpai:AddChildAt(obj_show, 0)
|
||||
coroutine.start(
|
||||
function()
|
||||
coroutine.wait(2)
|
||||
obj_show:Dispose()
|
||||
end
|
||||
)
|
||||
end
|
||||
|
||||
-- -- 标记碰牌对象
|
||||
-- local num = self._area_fz_list.numChildren
|
||||
-- if num == 0 then return end
|
||||
-- if index == -1 then
|
||||
-- -- local obj = self._area_fz_list:GetChildAt(num - 1)
|
||||
-- local pic_arrow = UIPackage.CreateObjectFromURL("ui://Main_Majiang/com_arrow")
|
||||
-- obj:AddChild(pic_arrow)
|
||||
-- pic_arrow:Center()
|
||||
-- local my_seat = self._player.seat
|
||||
-- if fz.from_seat ~= my_seat then
|
||||
-- pic_arrow:GetController("show").selectedIndex = 1
|
||||
-- pic_arrow:GetController("pos").selectedIndex = getPos(DataManager.CurrenRoom.self_player.seat, fz.from_seat, #DataManager.CurrenRoom.player_list)
|
||||
-- pic_arrow:SetPivot(0.5, 0.5)
|
||||
-- if DataManager.CurrenRoom.self_player.seat ~= self._player.seat then
|
||||
-- pic_arrow.scaleX = 0.5
|
||||
-- pic_arrow.scaleY = 0.5
|
||||
-- end
|
||||
-- end
|
||||
-- end
|
||||
end
|
||||
|
||||
function M:GetOutCardByIndex(index)
|
||||
|
|
|
|||
|
|
@ -28,44 +28,22 @@ function M.new(view, mainView)
|
|||
end
|
||||
|
||||
function M:init()
|
||||
local view = self._view
|
||||
local _area_mask = view:GetChild('area_mask')
|
||||
local mask = _area_mask.text
|
||||
|
||||
self._mask_data = json.decode(mask)
|
||||
self._area_handcard_list = view:GetChild('area_handcard_list')
|
||||
|
||||
self._area_fz_list = view:GetChild('area_fz_list')
|
||||
self._area_outcard_list = view:GetChild('area_outcard_list')
|
||||
self._src_fz_list =
|
||||
Vector4(self._area_fz_list.x, self._area_fz_list.y, self._area_fz_list.width, self._area_fz_list.height)
|
||||
local c3d = self._view:GetController('3d')
|
||||
if c3d ~= nil then
|
||||
c3d.selectedIndex = 1
|
||||
end
|
||||
self._src_fz_list_3d =
|
||||
Vector4(self._area_fz_list.x, self._area_fz_list.y, self._area_fz_list.width, self._area_fz_list.height)
|
||||
local c3d = self._view:GetController('3d')
|
||||
if c3d ~= nil then
|
||||
c3d.selectedIndex = 0
|
||||
end
|
||||
local CardInfo = self._view:GetChild('Text_CardInfo')
|
||||
self._viewText_cardInfo = json.decode(CardInfo.text)
|
||||
|
||||
self._mask_liangpai = view:GetChild('mask_liangpai')
|
||||
local CardInfo = self._view:GetChild('Text_CardInfo')
|
||||
self._viewText_cardInfo = json.decode(CardInfo.text)
|
||||
|
||||
local _gamectr = ControllerManager.GetController(GameController)
|
||||
if _gamectr then
|
||||
_gamectr:AddEventListener(GameEvent.MJModifySzie, handler(self, self.SetMJSize))
|
||||
end
|
||||
end
|
||||
self._view_handCardList = self._view:GetChild('List_HandCard')
|
||||
self._view_FZList = self._view:GetChild('List_FZ')
|
||||
self._view_outCardList = self._view:GetChild('List_OutCard')
|
||||
self._viewBtn_getCard = self._view:GetChild('Btn_HandCard')
|
||||
|
||||
function M:SetMJSize(zS)
|
||||
local tempSzieConfig = {}
|
||||
tempSzieConfig.size = zS
|
||||
local filename = 'mjsize' .. DataManager.SelfUser.account_id
|
||||
Utils.SaveLocalFile(filename, json.encode(tempSzieConfig))
|
||||
self._ctr_getCard = self._view:GetController('getCard')
|
||||
self._ctr_seletedGet = self._view:GetController('seletedGetCard')
|
||||
|
||||
--ControllerManager.OnConnect(SocketCode.TimeoutDisconnect)
|
||||
ViewManager.refreshGameView()
|
||||
end
|
||||
|
||||
function M:SetPlayer(p)
|
||||
|
|
@ -106,6 +84,15 @@ function M:Clear()
|
|||
self._area_handcard_list:RemoveChildren(0, -1, true)
|
||||
self._area_outcard_list:RemoveChildren(0, -1, true)
|
||||
self._mask_liangpai:RemoveChildren(0, -1, true)
|
||||
self._view_handCardList:RemoveChildren(0, -1, true)
|
||||
self._view_outCardList:RemoveChildren(0, -1, true)
|
||||
self._view_FZList:RemoveChildren(0, -1, true)
|
||||
self._view_getCard:RemoveChildren(0, -1, true)
|
||||
|
||||
self._view_handCardList.selectedIndex = -1
|
||||
self._click_index = self._view_handCardList.selectedIndex
|
||||
self._ctr_seletedGet.selectedIndex = 0
|
||||
|
||||
end
|
||||
|
||||
-- 获取麻将资源前缀
|
||||
|
|
@ -131,7 +118,10 @@ function M:fillCard2(obj, pos_str, card)
|
|||
if DataManager.CurrenRoom.jing and card == DataManager.CurrenRoom.jing and obj:GetController('jing') then
|
||||
obj:GetController('jing').selectedIndex = 1
|
||||
end
|
||||
|
||||
|
||||
obj:GetChild("icon").url = 'ui://Main_Majiang/' .. pos_str .. card
|
||||
|
||||
end
|
||||
|
||||
function M:getBackCard(card)
|
||||
|
|
@ -147,73 +137,14 @@ end
|
|||
function M:UpdateHandCard(getcard, mp)
|
||||
getcard = getcard or false
|
||||
mp = mp or false
|
||||
local handcard_list = self._mask_data['handcard_list']
|
||||
local oder = handcard_list['oder']
|
||||
local _player = self._player
|
||||
-- -- print(vardump(self._player))
|
||||
|
||||
self._area_handcard_list:RemoveChildren(0, -1, true)
|
||||
-- -- print(vardump(_player.card_list))
|
||||
if (not mp) then
|
||||
local comp_back = handcard_list['comp_back']
|
||||
if self._current_card_type == 2 then
|
||||
comp_back = comp_back .. '_3d'
|
||||
end
|
||||
|
||||
for i = 0, _player.hand_left_count - 1 do
|
||||
local obj = UIPackage.CreateObjectFromURL(self:getBackCard(comp_back))
|
||||
local _room = DataManager.CurrenRoom
|
||||
local people_num = _room.room_config.people_num
|
||||
local pos = ViewUtil.GetPos(_room.self_player.seat, _player.seat, people_num)
|
||||
local gap = (pos == 3 and people_num == 4 or pos == 2 and people_num == 2) and 15 or 45
|
||||
local offset = getcard and (i == _player.hand_left_count - 1 and gap or 0)
|
||||
-- local offset = getcard and (i == _player.hand_left_count - 1 and 15 or 0)
|
||||
ViewUtil.CardPos(obj, self._area_handcard_list, oder, i, offset)
|
||||
|
||||
--改变左右两边的手牌的x值
|
||||
if self._current_card_type == 2 and (oder == AreaOderType.down_up or oder == AreaOderType.up_down) then
|
||||
obj.x = i * -7.0
|
||||
end
|
||||
|
||||
if (oder == AreaOderType.down_up) then
|
||||
self._area_handcard_list:AddChildAt(obj, 0)
|
||||
else
|
||||
self._area_handcard_list:AddChild(obj)
|
||||
end
|
||||
end
|
||||
else
|
||||
local outcard_list = self._mask_data['outcard_list']
|
||||
local comp = handcard_list['comp']
|
||||
local card = outcard_list['card']
|
||||
---- print("comp"..comp)
|
||||
-- -- print(vardump(_player.card_list))
|
||||
|
||||
if self._current_card_type == 2 then
|
||||
comp = comp .. '_3d'
|
||||
end
|
||||
|
||||
for i = 0, #_player.card_list - 1 do
|
||||
local obj = UIPackage.CreateObject('Main_Majiang', comp)
|
||||
|
||||
self:fillCard(obj, card, _player.card_list[i + 1])
|
||||
-- obj.icon = UIPackage.GetItemURL("Main_Majiang", card .. _player.card_list[i+1])
|
||||
|
||||
local offset = getcard and (i == _player.hand_left_count - 1 and 0 or 0)
|
||||
|
||||
ViewUtil.CardPos(obj, self._area_handcard_list, oder, i, offset)
|
||||
|
||||
--改变左右两边的手牌的x值
|
||||
if self._current_card_type == 2 and (oder == AreaOderType.down_up or oder == AreaOderType.up_down) then
|
||||
obj.x = i * -7
|
||||
end
|
||||
|
||||
if (oder == AreaOderType.down_up) then
|
||||
self._area_handcard_list:AddChildAt(obj, 0)
|
||||
else
|
||||
self._area_handcard_list:AddChild(obj)
|
||||
end
|
||||
end
|
||||
self._view_handCardList:RemoveChildren()
|
||||
for i = 0, self._player.hand_left_count - 1 do
|
||||
-- if i >= self._view_handCardList.numItems then
|
||||
self._view_handCardList:AddItemFromPool()
|
||||
-- end
|
||||
end
|
||||
self._ctr_getCard.selectedIndex = getcard and 1 or 0
|
||||
end
|
||||
|
||||
-- 获取麻将图片资源位置，可以在扩展中复写
|
||||
|
|
@ -261,91 +192,14 @@ function M:UpdateOutCardList(outcard, card_item, cursor)
|
|||
card_item = card_item or 0
|
||||
cursor = cursor or nil
|
||||
|
||||
local outCardName = self._viewText_cardInfo['Out_Card']
|
||||
local outcard
|
||||
|
||||
local outlist = self._player.outcard_list
|
||||
if (outcard) then
|
||||
outcard:SetPivot(0.5, 0.5, true)
|
||||
outcard.touchable = false
|
||||
-- outcard.icon = "ui://Main_Majiang/" .. self:GetPrefix() .. "202_" .. card_item
|
||||
outcard.icon = string.format('ui://%s/%s202_%s', self:GetCardPicPack(), self:GetPrefix(), card_item)
|
||||
self._mask_liangpai:AddChild(outcard)
|
||||
end
|
||||
|
||||
local outcard_list = self._mask_data['outcard_list']
|
||||
local oder = outcard_list['oder']
|
||||
local comp = outcard_list['comp']
|
||||
local card = outcard_list['card']
|
||||
local multi_oder = outcard_list['multi_oder']
|
||||
local num = outcard_list['num']
|
||||
local multi_draw_oder = 0
|
||||
local sortStart = 0
|
||||
local sortType = 0
|
||||
local sortStep = 0
|
||||
if (outcard_list['multi_draw_oder']) then
|
||||
multi_draw_oder = outcard_list['multi_draw_oder']
|
||||
end
|
||||
|
||||
if self._current_card_type == 2 then
|
||||
comp = comp .. '_3d'
|
||||
num = outcard_list['num3d']
|
||||
multi_oder = outcard_list['multi_oder3d']
|
||||
sortType = outcard_list['sorting_order3d']
|
||||
card = outcard_list['card3d']
|
||||
if sortType == 1 then
|
||||
sortStart = 1
|
||||
sortStep = 1
|
||||
elseif sortType == -1 then
|
||||
sortStart = #outlist
|
||||
sortStep = -1
|
||||
end
|
||||
end
|
||||
|
||||
local obj = nil
|
||||
self._area_outcard_list:RemoveChildren(0, -1, true)
|
||||
for i = 0, #outlist - 1 do
|
||||
obj = UIPackage.CreateObjectFromURL('ui://Main_Majiang/' .. comp)
|
||||
local row = math.floor(i / num)
|
||||
local col = math.floor(i % num)
|
||||
|
||||
if self._current_card_type == 2 then
|
||||
if i >= num then
|
||||
row = 1 + math.floor(((i - num) / (num + 2)))
|
||||
col = ((i - num) % (num + 2))
|
||||
end
|
||||
end
|
||||
if DataManager.CurrenRoom.room_config.people_num == 2 then
|
||||
ViewUtil.CardPos(obj, self._area_outcard_list, oder, col, nil, nil, -6)
|
||||
ViewUtil.CardPos(obj, self._area_outcard_list, multi_oder, row, nil, nil, -12)
|
||||
elseif DataManager.CurrenRoom.room_config.people_num == 4 then
|
||||
ViewUtil.CardPos(obj, self._area_outcard_list, oder, col, nil, nil, -6)
|
||||
ViewUtil.CardPos(obj, self._area_outcard_list, multi_oder, row, nil, nil, -12)
|
||||
else
|
||||
ViewUtil.CardPos(obj, self._area_outcard_list, oder, col)
|
||||
ViewUtil.CardPos(obj, self._area_outcard_list, multi_oder, row)
|
||||
end
|
||||
|
||||
|
||||
if self._current_card_type == 2 then
|
||||
self:adjust3dOutPut(obj, self._area_outcard_list, oder, num, i)
|
||||
end
|
||||
|
||||
self:fillCard(obj, card, outlist[i + 1])
|
||||
-- 添加角标
|
||||
self:AddFlag(i + 1, outlist[i], obj)
|
||||
-- obj.icon = "ui://Main_Majiang/"..card .. outlist[i+1]
|
||||
sortStart = sortStart + sortStep
|
||||
-- obj.sortingOrder = sortStart
|
||||
obj.data = outlist[i + 1]
|
||||
|
||||
if (oder == AreaOderType.down_up or (multi_draw_oder == 1)) then
|
||||
self._area_outcard_list:AddChildAt(obj, 0)
|
||||
else
|
||||
self._area_outcard_list:AddChild(obj)
|
||||
end
|
||||
end
|
||||
if (obj and cursor) then
|
||||
cursor.xy = Vector2(obj.width / 2, obj.height / 2)
|
||||
obj:AddChild(cursor)
|
||||
obj:GetController('color').selectedIndex = 1
|
||||
local outcard = self._view_outCardList:AddItemFromPool()
|
||||
self:fillCard2(outcard, outCardName, outlist[i + 1])
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -377,155 +231,49 @@ local function getPos(my_seat, other_seat, total)
|
|||
end
|
||||
|
||||
function M:UpdateFzList(fz, index, show_card)
|
||||
local gn = 3
|
||||
if fz.type == FZType.Gang or fz.type == FZType.Gang_An or fz.type == FZType.Gang_Peng then
|
||||
gn = 4
|
||||
end
|
||||
|
||||
|
||||
local fz_list = self._mask_data['fz_list']
|
||||
local oder = fz_list['oder']
|
||||
local comp = fz_list['comp'] .. gn
|
||||
local card = fz_list['card']
|
||||
local card3d = ''
|
||||
local adjust3d = 0
|
||||
if self._current_card_type == 2 then
|
||||
comp = comp .. '_3d'
|
||||
oder = fz_list['oder3d']
|
||||
adjust3d = fz_list['adjust3d']
|
||||
card = fz_list['card3d']
|
||||
card3d = 'b'
|
||||
end
|
||||
local FZame = self._viewText_cardInfo['FZ_Card']
|
||||
index = index or 0
|
||||
show_card = show_card or nil
|
||||
|
||||
local obj = UIPackage.CreateObjectFromURL('ui://Main_Majiang/' .. comp)
|
||||
-- print("============================================pengpengpeng", comp)
|
||||
local outCard
|
||||
|
||||
local _area_fz_list = self._area_fz_list
|
||||
local _area_outcard_list = self._area_outcard_list
|
||||
|
||||
if (index == -1) then
|
||||
local num = _area_fz_list.numChildren
|
||||
|
||||
if (oder == AreaOderType.down_up or oder == AreaOderType.up_down) then
|
||||
_area_fz_list.height = _area_fz_list.height + obj.height
|
||||
if (oder == AreaOderType.down_up) then
|
||||
local tem1 = obj.height
|
||||
for i = 1, num do
|
||||
local tem = _area_fz_list:GetChildAt(num - i)
|
||||
tem.y = tem.y + tem1
|
||||
end
|
||||
_area_fz_list.y = _area_fz_list.y - obj.height
|
||||
else
|
||||
ViewUtil.CardPos(obj, _area_outcard_list, oder, num)
|
||||
end
|
||||
elseif (oder == AreaOderType.left_right or oder == AreaOderType.right_left) then
|
||||
_area_fz_list.width = _area_fz_list.width + obj.width
|
||||
if (oder == AreaOderType.right_left) then
|
||||
local tem1 = obj.width
|
||||
for i = 1, num do
|
||||
local tem = _area_fz_list:GetChildAt(num - i)
|
||||
tem.x = tem.x + tem1
|
||||
end
|
||||
_area_fz_list.x = _area_fz_list.x - obj.width
|
||||
else
|
||||
ViewUtil.CardPos(obj, _area_outcard_list, oder, num)
|
||||
end
|
||||
end
|
||||
_area_fz_list:AddChild(obj)
|
||||
|
||||
if self._current_card_type == 2 and (oder == AreaOderType.down_up or oder == AreaOderType.up_down) then
|
||||
num = _area_fz_list.numChildren
|
||||
for i = 1, num do
|
||||
local tem = _area_fz_list:GetChildAt(i - 1)
|
||||
tem.x = adjust3d * (i - 1)
|
||||
end
|
||||
end
|
||||
else
|
||||
local obj1 = _area_fz_list:RemoveChildAt(index)
|
||||
obj1:Dispose()
|
||||
obj.xy = obj1.xy
|
||||
_area_fz_list:AddChildAt(obj, index)
|
||||
end
|
||||
|
||||
-- 显示fz的牌
|
||||
local obj_show
|
||||
if show_card then
|
||||
obj_show = UIPackage.CreateObjectFromURL('ui://Main_Majiang/Fz_0_' .. gn)
|
||||
end
|
||||
|
||||
for i = 1, gn do
|
||||
local _oc = obj:GetChild('card_' .. i)
|
||||
local _oc2 = nil
|
||||
|
||||
if show_card then
|
||||
_oc2 = obj_show:GetChild('card_' .. i)
|
||||
end
|
||||
|
||||
if (fz.type == FZType.Gang_An and i == gn) then
|
||||
if self._current_card_type == 2 then
|
||||
_oc.icon = UIPackage.GetItemURL('MajiangCard3d', card3d .. card .. '00')
|
||||
else
|
||||
_oc.icon = UIPackage.GetItemURL(self:GetCardPicPack(), card3d .. card .. '00')
|
||||
end
|
||||
|
||||
if show_card then
|
||||
_oc2.icon = UIPackage.GetItemURL('Main_Majiang', '202_00')
|
||||
end
|
||||
else
|
||||
if (fz.type == FZType.Chi) then
|
||||
local index = i
|
||||
if oder == AreaOderType.right_left or oder == AreaOderType.down_up then
|
||||
index = gn - i + 1
|
||||
end
|
||||
|
||||
self:fillCard(_oc, card, fz.opcard[index])
|
||||
|
||||
if show_card then
|
||||
self:fillCard(_oc2, '202_', fz.opcard[index], false)
|
||||
end
|
||||
else
|
||||
self:fillCard(_oc, card, fz.card)
|
||||
|
||||
if show_card then
|
||||
self:fillCard(_oc2, '202_', fz.card, false)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
obj.touchable = false
|
||||
|
||||
if show_card then
|
||||
obj_show.touchable = false
|
||||
obj_show:SetPivot(0.5, 0.5, true)
|
||||
obj_show:SetScale(0.8, 0.8)
|
||||
self._mask_liangpai:AddChildAt(obj_show, 0)
|
||||
coroutine.start(
|
||||
function()
|
||||
coroutine.wait(2)
|
||||
obj_show:Dispose()
|
||||
end
|
||||
)
|
||||
end
|
||||
|
||||
-- -- 标记碰牌对象
|
||||
-- local num = self._area_fz_list.numChildren
|
||||
-- if num == 0 then return end
|
||||
-- if index == -1 then
|
||||
-- -- local obj = self._area_fz_list:GetChildAt(num - 1)
|
||||
-- local pic_arrow = UIPackage.CreateObjectFromURL("ui://Main_Majiang/com_arrow")
|
||||
-- obj:AddChild(pic_arrow)
|
||||
-- pic_arrow:Center()
|
||||
-- local my_seat = self._player.seat
|
||||
-- if fz.from_seat ~= my_seat then
|
||||
-- pic_arrow:GetController("show").selectedIndex = 1
|
||||
-- pic_arrow:GetController("pos").selectedIndex = getPos(DataManager.CurrenRoom.self_player.seat, fz.from_seat, #DataManager.CurrenRoom.player_list)
|
||||
-- pic_arrow:SetPivot(0.5, 0.5)
|
||||
-- if DataManager.CurrenRoom.self_player.seat ~= self._player.seat then
|
||||
-- pic_arrow.scaleX = 0.5
|
||||
-- pic_arrow.scaleY = 0.5
|
||||
-- end
|
||||
-- if self._view_outCardList.numItems < #outlist - 1 then
|
||||
-- for i = 1, #outlist - 1 do
|
||||
-- outcard = self._view_outCardList:AddItemFromPool()
|
||||
-- -- end
|
||||
-- self:fillCard2(outcard, outCardName, outlist[i])
|
||||
-- end
|
||||
-- end
|
||||
|
||||
outCard = self._view_FZList:AddItemFromPool()
|
||||
|
||||
if fz.type == FZType.Chi then
|
||||
for i = 1, 3 do
|
||||
local FZCard = outCard:GetChild(string.format("Comp_Card%d", i))
|
||||
self:fillCard2(FZCard, FZame, fz.opcard[i])
|
||||
end
|
||||
else
|
||||
local ctr_Four = outCard:GetController("isFour")
|
||||
for i = 1, 3 do
|
||||
local FZCard = outCard:GetChild(string.format("Comp_Card%d", i))
|
||||
print("lingmengfz", string.format("Comp_Card%d", i), FZCard)
|
||||
self:fillCard2(FZCard, FZame, fz.card)
|
||||
end
|
||||
if fz.type == FZType.Peng then
|
||||
ctr_Four.selectedIndex = 0
|
||||
else
|
||||
ctr_Four.selectedIndex = 1
|
||||
local FZCard = outCard:GetChild(string.format("Comp_Card%d", 4))
|
||||
self:fillCard2(FZCard, FZame, fz.card)
|
||||
if fz.type == FZType.Gang_An then
|
||||
self:fillCard2(FZCard, FZame, '00')
|
||||
end
|
||||
end
|
||||
end
|
||||
-- self:fillCard2(outcard, outCardName, card_item)
|
||||
end
|
||||
|
||||
function M:GetOutCardByIndex(index)
|
||||
|
|
|
|||
Loading…
Reference in New Issue