显示更多
parent
b571dee504
commit
556099f297
|
|
@ -203,7 +203,6 @@ function M:tryWin()
|
|||
|
||||
local activeCard = self.cardList[1]
|
||||
if (self:tryPair(activeCard)) then
|
||||
print("tryPair")
|
||||
if (self:tryWin()) then
|
||||
return true
|
||||
end
|
||||
|
|
@ -212,23 +211,20 @@ function M:tryWin()
|
|||
end
|
||||
|
||||
if (self:tryKezi(activeCard)) then
|
||||
print("tryKezi")
|
||||
if (self:tryWin()) then
|
||||
return true
|
||||
end
|
||||
self:rollBack()
|
||||
end
|
||||
|
||||
-- if (self:tryShunzi(activeCard)) then
|
||||
-- print("tryShunzi")
|
||||
-- if (self:tryWin()) then
|
||||
-- return true
|
||||
-- end
|
||||
-- self:rollBack()
|
||||
-- end
|
||||
if (self:tryShunzi(activeCard)) then
|
||||
if (self:tryWin()) then
|
||||
return true
|
||||
end
|
||||
self:rollBack()
|
||||
end
|
||||
|
||||
if (self:tryKezi1Zhong(activeCard)) then
|
||||
print("tryKezi1Zhong")
|
||||
if (self:tryWin()) then
|
||||
return true
|
||||
end
|
||||
|
|
@ -236,7 +232,6 @@ function M:tryWin()
|
|||
end
|
||||
|
||||
if (self:tryKezi2Zhong(activeCard)) then
|
||||
print("tryKezi2Zhong")
|
||||
if (self:tryWin()) then
|
||||
return true
|
||||
end
|
||||
|
|
@ -244,7 +239,6 @@ function M:tryWin()
|
|||
end
|
||||
|
||||
if (self:tryShunzi1Zhong(activeCard)) then
|
||||
print("tryShunzi1Zhong")
|
||||
if (self:tryWin()) then
|
||||
return true
|
||||
end
|
||||
|
|
@ -252,7 +246,6 @@ function M:tryWin()
|
|||
end
|
||||
|
||||
if (self:tryPair1Zhong(activeCard)) then
|
||||
print("tryPair1Zhong")
|
||||
if (self:tryWin()) then
|
||||
return true
|
||||
end
|
||||
|
|
|
|||
|
|
@ -101,7 +101,6 @@ function M:UpdateRound()
|
|||
end
|
||||
|
||||
function M:ShowJing()
|
||||
print("==================================self._room.jing", self._room.jing)
|
||||
if self._room.jing then
|
||||
self.jing.icon = 'ui://Main_Majiang/' ..
|
||||
get_majiang_prefix(DataManager.CurrenRoom.game_id) .. "201_" .. self._room.jing
|
||||
|
|
|
|||
|
|
@ -117,11 +117,13 @@ function M:GetPrefix()
|
|||
end
|
||||
|
||||
function M:fillCard(obj, pos_str, card, use3d)
|
||||
if DataManager.CurrenRoom.jing and card == DataManager.CurrenRoom.jing then
|
||||
obj:GetController('jing').selectedIndex = 1
|
||||
end
|
||||
if self._current_card_type == 2 and (use3d == nil or use3d == true) then
|
||||
obj.icon = 'ui://MajiangCard3d/' .. 'b' .. pos_str .. card
|
||||
else
|
||||
obj.icon = 'ui://Main_Majiang/' .. self:GetPrefix() .. pos_str .. card
|
||||
print("====================================obj", obj.icon)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue