同步四人,暂未发现优化点
parent
b1371a6a51
commit
7b0d30649e
|
|
@ -185,15 +185,31 @@ function M:LoadConfigData(data)
|
|||
end
|
||||
|
||||
function M:LoadConfigToDetail(data)
|
||||
-- local configData = json.decode(data)
|
||||
-- local returnString = string.format("人数%s人,%s马%s%s%s%s%s%s,%s", configData.maxPlayers,
|
||||
-- configData.jiangma and string.format("奖%d", configData.jiangma) or "不奖", configData.shaozhuang and ",有烧庄" or "",
|
||||
-- configData.zuoma and ",庄家坐马" or "",
|
||||
-- configData.zimo and ",只能自摸" or ",自摸可点炮",
|
||||
-- configData.tuoguan and string.format(",%d秒后自动托管", configData.tuoguan_active_time) or "不能托管",
|
||||
-- configData.jiahu and ",可以假胡" or "", configData.fengding and ",封顶20炮" or "",
|
||||
-- configData.zhuanwan and "大转弯" or "小转弯")
|
||||
return data
|
||||
local configData = json.decode(data)
|
||||
local returnString = string.format("人数%s人", configData.maxPlayers)
|
||||
if configData.jiangma then
|
||||
returnString = string.format("%s,%s马", returnString,
|
||||
configData.jiangma == 0 and "不奖" or string.format("奖%s", configData.jiangma))
|
||||
end
|
||||
if configData.zimo then
|
||||
returnString = string.format("%s,%s", returnString, configData.zimo == 0 and "可点炮,可自摸" or "必须自摸")
|
||||
end
|
||||
if configData.shaozhuang then
|
||||
returnString = string.format("%s%s", returnString, configData.shaozhuang == 0 and "" or ",有烧庄")
|
||||
end
|
||||
if configData.fengding then
|
||||
local matString = "%s,%s"
|
||||
if configData.fengding == 0 then
|
||||
returnString = string.format(matString, returnString, ",封顶20炮")
|
||||
end
|
||||
end
|
||||
if configData.TianDiHu then
|
||||
returnString = string.format("%s%s", returnString, configData.TianDiHu == 0 and ",有天地胡" or "")
|
||||
end
|
||||
if configData.zikechengshun then
|
||||
returnString = string.format("%s%s", returnString, configData.zikechengshun == 0 and ",有字可成顺" or "")
|
||||
end
|
||||
return returnString
|
||||
end
|
||||
|
||||
return M
|
||||
|
|
|
|||
|
|
@ -186,12 +186,37 @@ end
|
|||
|
||||
function M:LoadConfigToDetail(data)
|
||||
local configData = json.decode(data)
|
||||
local returnString = string.format("人数%s人,%s马,%s,%s,%s%s,%s", configData.maxPlayers,
|
||||
configData.jiangma and string.format("奖%d", configData.jiangma) or "不奖",
|
||||
configData.zimo and "只能自摸" or "自摸可点炮",
|
||||
configData.tuoguan and string.format("%d秒后自动托管", configData.tuoguan_active_time) or "不能托管",
|
||||
configData.sanjingjiangma and "三精算奖马" or "三精不算奖马", configData.fengding and ",封顶10炮" or "",
|
||||
configData.zikechengshun and "字可成顺" or "字不可成顺")
|
||||
local returnString = string.format("人数%s人", configData.maxPlayers)
|
||||
if configData.jiangma then
|
||||
returnString = string.format("%s,%s马", returnString,
|
||||
configData.jiangma == 0 and "不奖" or string.format("奖%s", configData.jiangma))
|
||||
end
|
||||
if configData.zimo then
|
||||
returnString = string.format("%s,%s", returnString, configData.zimo == 0 and "可点炮,可自摸" or "必须自摸")
|
||||
end
|
||||
if configData.shaozhuang then
|
||||
returnString = string.format("%s%s", returnString, configData.shaozhuang == 0 and "" or ",有烧庄")
|
||||
end
|
||||
if configData.fengding then
|
||||
local matString = "%s,%s"
|
||||
if configData.fengding == 0 then
|
||||
returnString = string.format(matString, returnString, "封顶20炮")
|
||||
elseif configData.fengding == 1 then
|
||||
returnString = string.format(matString, returnString, "封顶10炮")
|
||||
end
|
||||
end
|
||||
if configData.TianDiHu then
|
||||
returnString = string.format("%s%s", returnString, configData.TianDiHu == 0 and ",有天地胡" or "")
|
||||
end
|
||||
if configData.zikechengshun then
|
||||
returnString = string.format("%s%s", returnString, configData.zikechengshun == 0 and ",有字可成顺" or "")
|
||||
end
|
||||
if configData.gangjiangma then
|
||||
returnString = string.format("%s%s", returnString, configData.gangjiangma == 0 and ",杠算奖马" or "")
|
||||
end
|
||||
if configData.sanjingjiangma then
|
||||
returnString = string.format("%s%s", returnString, configData.sanjingjiangma == 0 and ",三精算奖马" or "")
|
||||
end
|
||||
return returnString
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -222,7 +222,6 @@ function M:UpdateFzList(fz, index, show_card)
|
|||
show_card = show_card or nil
|
||||
|
||||
local 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))
|
||||
|
|
@ -230,6 +229,8 @@ function M:UpdateFzList(fz, index, show_card)
|
|||
end
|
||||
else
|
||||
local ctr_Four = outCard:GetController("isFour")
|
||||
outCard.data = fz.card
|
||||
|
||||
for i = 1, 3 do
|
||||
local FZCard = outCard:GetChild(string.format("Comp_Card%d", i))
|
||||
self:fillCard2(FZCard, FZame, fz.card)
|
||||
|
|
@ -243,7 +244,15 @@ function M:UpdateFzList(fz, index, show_card)
|
|||
if fz.type == FZType.Gang_An then
|
||||
self:fillCard2(FZCard, FZame, '00')
|
||||
elseif fz.type == FZType.Gang_Peng then
|
||||
self._view_FZList:RemoveChildAt(self._view_FZList.numItems - 2)
|
||||
for i = 1, self._view_FZList.numItems do
|
||||
print("lingmengpenggang", i, self._view_FZList:GetChildAt(i - 1).data, fz.card)
|
||||
if self._view_FZList:GetChildAt(i - 1).data and self._view_FZList:GetChildAt(i - 1).data == fz.card then
|
||||
print("lingmenggang1")
|
||||
self._view_FZList:RemoveChildrenToPool(i - 1, i - 1)
|
||||
print("lingmenggang2")
|
||||
return
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -39,9 +39,16 @@ function M:init()
|
|||
|
||||
self._view_getCard = self._view:GetChild('Btn_HandCard')
|
||||
self._view_FZTips = self._view:GetChild('Comp_FZTips')
|
||||
self._area_allDown = self._view:GetChild('area_allDown')
|
||||
|
||||
self._ctr_seletedGet = self._view:GetController('seletedGetCard')
|
||||
self._ctr_tip = self._view:GetController('tip')
|
||||
|
||||
self._area_allDown.onClick:Set(function()
|
||||
self._view_handCardList.selectedIndex = -1
|
||||
self._click_index = self._view_handCardList.selectedIndex
|
||||
self._ctr_seletedGet.selectedIndex = 1
|
||||
end)
|
||||
end
|
||||
|
||||
function M:ShowHuTip(card_list)
|
||||
|
|
@ -164,7 +171,7 @@ function M:__OnClickHandCard(context)
|
|||
self._mainView:OutCard(card.card_item)
|
||||
self._view_handCardList.selectedIndex = -1
|
||||
self._click_index = self._view_handCardList.selectedIndex
|
||||
self._ctr_seletedGet.selectedIndex = 0
|
||||
self._ctr_seletedGet.selectedIndex = 1
|
||||
end
|
||||
self._click_index = self._view_handCardList.selectedIndex
|
||||
end
|
||||
|
|
@ -178,7 +185,7 @@ function M:__OnClickGetCard(context)
|
|||
self._mainView:OutCard(card.card_item)
|
||||
self._view_handCardList.selectedIndex = -1
|
||||
self._click_index = self._view_handCardList.selectedIndex
|
||||
self._ctr_seletedGet.selectedIndex = 0
|
||||
self._ctr_seletedGet.selectedIndex = 1
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -228,7 +235,7 @@ function M:Clear()
|
|||
|
||||
-- self._view_FZTips:RemoveChildren(0, -1, true)
|
||||
|
||||
self._ctr_seletedGet.selectedIndex = 0
|
||||
self._ctr_seletedGet.selectedIndex = 1
|
||||
end
|
||||
|
||||
return M
|
||||
|
|
|
|||
Binary file not shown.
Loading…
Reference in New Issue