25-4-8打包
parent
1679c5edc6
commit
3fe036ca7d
|
|
@ -504,17 +504,17 @@ function M:OnUpdate()
|
|||
for i = 1, self._group.room_num do
|
||||
if self._group.rooms[i] and #self._group.rooms[i].plist == 0 then
|
||||
self._group.update_room = false
|
||||
-- fgCtr:FG_RemoveRoom(
|
||||
-- self._group.id,
|
||||
-- self._group.rooms[i].id,
|
||||
-- function(res)
|
||||
-- if res.ReturnCode ~= 0 then
|
||||
-- ViewUtil.ErrorTip(res.ReturnCode, string.format('删除房间-%s失败!', self._group.rooms[i].id))
|
||||
-- else
|
||||
-- self._roomNum = #self._group.rooms
|
||||
-- end
|
||||
-- end
|
||||
-- )
|
||||
fgCtr:FG_RemoveRoom(
|
||||
self._group.id,
|
||||
self._group.rooms[i].id,
|
||||
function(res)
|
||||
if res.ReturnCode ~= 0 then
|
||||
ViewUtil.ErrorTip(res.ReturnCode, string.format('删除房间-%s失败!', self._group.rooms[i].id))
|
||||
else
|
||||
self._roomNum = #self._group.rooms
|
||||
end
|
||||
end
|
||||
)
|
||||
end
|
||||
end
|
||||
else
|
||||
|
|
|
|||
|
|
@ -14,68 +14,73 @@ end
|
|||
function M:FillData()
|
||||
self._maxPlayer = 4 -- 默认玩家人数
|
||||
self._roundChoice = 3 -- 回合选项数
|
||||
self._config = UIPackage.CreateObjectFromURL("ui://Info_MJ_FuZhou/Cgm_create_room")
|
||||
self._config = UIPackage.CreateObjectFromURL("ui://Info_MJ_FuZhou/Label_Detail_83")
|
||||
|
||||
if oldGameVersion == 2 then
|
||||
self._config:GetController("xipai").selectedIndex = 0
|
||||
local jiangmaSlider = self._config:GetChild("n92")
|
||||
jiangmaSlider.onChanged:Set(function()
|
||||
self._config:GetChild("n93").text = string.format("奖%s马", Mathf.Round(jiangmaSlider.value) * 2)
|
||||
end)
|
||||
|
||||
self.xipaiValueText = self._config:GetChild('xipaifen')
|
||||
self.xipaiValueText.text = 1
|
||||
self.xipaiValue = 1
|
||||
-- if oldGameVersion == 2 then
|
||||
-- self._config:GetController("xipai").selectedIndex = 0
|
||||
|
||||
self.anchouValueText = self._config:GetChild('anchoufen')
|
||||
self.anchouValueText.text = 1
|
||||
self.anchouValue = 1
|
||||
-- self.xipaiValueText = self._config:GetChild('xipaifen')
|
||||
-- self.xipaiValueText.text = 1
|
||||
-- self.xipaiValue = 1
|
||||
|
||||
local btn_cr = self._config:GetChild('sdsrbtn')
|
||||
btn_cr.onClick:Set(
|
||||
function()
|
||||
local gniv = GroupNumberInputView_Game.new(nil, function(num)
|
||||
local value = limit
|
||||
if otype == 1 then
|
||||
value = value + ad2d(num)
|
||||
elseif otype == -1 then
|
||||
value = value - ad2d(num)
|
||||
else
|
||||
value = ad2d(num)
|
||||
end
|
||||
-- self.anchouValueText = self._config:GetChild('anchoufen')
|
||||
-- self.anchouValueText.text = 1
|
||||
-- self.anchouValue = 1
|
||||
|
||||
if value < 0 then
|
||||
ViewUtil.ErrorTip(1, "输入数据异常!")
|
||||
end
|
||||
-- local btn_cr = self._config:GetChild('sdsrbtn')
|
||||
-- btn_cr.onClick:Set(
|
||||
-- function()
|
||||
-- local gniv = GroupNumberInputView_Game.new(nil, function(num)
|
||||
-- local value = limit
|
||||
-- if otype == 1 then
|
||||
-- value = value + ad2d(num)
|
||||
-- elseif otype == -1 then
|
||||
-- value = value - ad2d(num)
|
||||
-- else
|
||||
-- value = ad2d(num)
|
||||
-- end
|
||||
|
||||
self.xipaiValueText.text = value / 1000
|
||||
self.xipaiValue = value / 1000
|
||||
end, 3, nil)
|
||||
gniv:Show()
|
||||
end
|
||||
)
|
||||
-- if value < 0 then
|
||||
-- ViewUtil.ErrorTip(1, "输入数据异常!")
|
||||
-- end
|
||||
|
||||
-- self.xipaiValueText.text = value / 1000
|
||||
-- self.xipaiValue = value / 1000
|
||||
-- end, 3, nil)
|
||||
-- gniv:Show()
|
||||
-- end
|
||||
-- )
|
||||
|
||||
|
||||
local btn_cr2 = self._config:GetChild('anchoubtn')
|
||||
btn_cr2.onClick:Set(
|
||||
function()
|
||||
local gniv = GroupNumberInputView_Game.new(nil, function(num)
|
||||
local value = limit
|
||||
if otype == 1 then
|
||||
value = value + ad2d(num)
|
||||
elseif otype == -1 then
|
||||
value = value - ad2d(num)
|
||||
else
|
||||
value = ad2d(num)
|
||||
end
|
||||
-- local btn_cr2 = self._config:GetChild('anchoubtn')
|
||||
-- btn_cr2.onClick:Set(
|
||||
-- function()
|
||||
-- local gniv = GroupNumberInputView_Game.new(nil, function(num)
|
||||
-- local value = limit
|
||||
-- if otype == 1 then
|
||||
-- value = value + ad2d(num)
|
||||
-- elseif otype == -1 then
|
||||
-- value = value - ad2d(num)
|
||||
-- else
|
||||
-- value = ad2d(num)
|
||||
-- end
|
||||
|
||||
if value < 0 then
|
||||
ViewUtil.ErrorTip(1, "输入数据异常!")
|
||||
end
|
||||
-- if value < 0 then
|
||||
-- ViewUtil.ErrorTip(1, "输入数据异常!")
|
||||
-- end
|
||||
|
||||
self.anchouValueText.text = value / 1000
|
||||
self.anchouValue = value / 1000
|
||||
end, 3, nil)
|
||||
gniv:Show()
|
||||
end
|
||||
)
|
||||
end
|
||||
-- self.anchouValueText.text = value / 1000
|
||||
-- self.anchouValue = value / 1000
|
||||
-- end, 3, nil)
|
||||
-- gniv:Show()
|
||||
-- end
|
||||
-- )
|
||||
-- end
|
||||
end
|
||||
|
||||
local _help_url = "ui://Info_MJ_FuZhou/Com_help"
|
||||
|
|
@ -101,16 +106,16 @@ end
|
|||
function M:SelectedConfigData()
|
||||
local _config = self._config
|
||||
local round = _config:GetController("round").selectedIndex + 1
|
||||
local people = _config:GetController("play_list").selectedIndex + 2
|
||||
local people = _config:GetController("peopleNum").selectedIndex + 2
|
||||
|
||||
local zimo = _config:GetController("ZiMo").selectedIndex
|
||||
local shaozhuang = _config:GetController("ShaoZhuang").selectedIndex
|
||||
local fengding = _config:GetController("FengDing").selectedIndex
|
||||
local Tiandihu = _config:GetController("TianDiHu").selectedIndex
|
||||
local zikechengshun = _config:GetController("ZiKeChengShun").selectedIndex
|
||||
|
||||
local jiangma = Mathf.Round(_config:GetChild("n92").value)
|
||||
|
||||
local fengding = _config:GetController("fengding").selectedIndex
|
||||
local wanfa = _config:GetController("wanfa").selectedIndex
|
||||
local qiduijiafan = _config:GetChild("btn_qidui").selected
|
||||
local shoudailongjiafan = _config:GetChild("btn_shoudailong").selected
|
||||
local loudilongjiafan = _config:GetChild("btn_loudilong").selected
|
||||
local bunengchi = _config:GetChild("btn_bunengchi").selected
|
||||
local doudizhu = _config:GetChild("btn_doudizhu").selected
|
||||
local doudizhufanbei = _config:GetChild("btn_doudizhufanbei").selected
|
||||
local xi_pai = false
|
||||
local xi_paifen = 0
|
||||
if _config:GetChild("xipai") then
|
||||
|
|
@ -124,22 +129,21 @@ function M:SelectedConfigData()
|
|||
_data["opt"] = round
|
||||
_data["maxPlayers"] = people
|
||||
|
||||
_data["zimo"] = zimo
|
||||
_data["shaozhuang"] = shaozhuang
|
||||
_data["fengding"] = fengding
|
||||
_data["wanfa"] = wanfa
|
||||
_data["qiduijiafan"] = qiduijiafan
|
||||
_data["shoudailongjiafan"] = shoudailongjiafan
|
||||
_data["loudilongjiafan"] = loudilongjiafan
|
||||
_data["bunengchi"] = bunengchi
|
||||
_data["doudizhu"] = doudizhu
|
||||
_data["doudizhufanbei"] = doudizhufanbei
|
||||
_data["Tiandihu"] = Tiandihu
|
||||
_data["zikechengshun"] = zikechengshun
|
||||
|
||||
_data["jiangma"] = jiangma
|
||||
_data['xi_pai'] = xi_pai
|
||||
|
||||
local xi_pai_score = 0
|
||||
local an_chou_score = 0
|
||||
if oldGameVersion == 2 then
|
||||
xi_pai_score = self.xipaiValue
|
||||
an_chou_score = self.anchouValue
|
||||
end
|
||||
-- if oldGameVersion == 2 then
|
||||
-- xi_pai_score = self.xipaiValue
|
||||
-- an_chou_score = self.anchouValue
|
||||
-- end
|
||||
|
||||
_data['xi_pai_score'] = xi_pai_score * 1000
|
||||
_data['an_chou_score'] = an_chou_score * 1000
|
||||
|
|
@ -181,6 +185,14 @@ 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
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -14,68 +14,73 @@ end
|
|||
function M:FillData()
|
||||
self._maxPlayer = 4 -- 默认玩家人数
|
||||
self._roundChoice = 3 -- 回合选项数
|
||||
self._config = UIPackage.CreateObjectFromURL("ui://Info_MJ_JinXi/Cgm_create_room")
|
||||
self._config = UIPackage.CreateObjectFromURL("ui://Info_MJ_JinXi/Label_Detail_83")
|
||||
|
||||
if oldGameVersion == 2 then
|
||||
self._config:GetController("xipai").selectedIndex = 0
|
||||
local jiangmaSlider = self._config:GetChild("n92")
|
||||
jiangmaSlider.onChanged:Set(function()
|
||||
self._config:GetChild("n93").text = string.format("奖%s马", Mathf.Round(jiangmaSlider.value) * 2)
|
||||
end)
|
||||
|
||||
self.xipaiValueText = self._config:GetChild('xipaifen')
|
||||
self.xipaiValueText.text = 1
|
||||
self.xipaiValue = 1
|
||||
-- if oldGameVersion == 2 then
|
||||
-- self._config:GetController("xipai").selectedIndex = 0
|
||||
|
||||
self.anchouValueText = self._config:GetChild('anchoufen')
|
||||
self.anchouValueText.text = 1
|
||||
self.anchouValue = 1
|
||||
-- self.xipaiValueText = self._config:GetChild('xipaifen')
|
||||
-- self.xipaiValueText.text = 1
|
||||
-- self.xipaiValue = 1
|
||||
|
||||
local btn_cr = self._config:GetChild('sdsrbtn')
|
||||
btn_cr.onClick:Set(
|
||||
function()
|
||||
local gniv = GroupNumberInputView_Game.new(nil, function(num)
|
||||
local value = limit
|
||||
if otype == 1 then
|
||||
value = value + ad2d(num)
|
||||
elseif otype == -1 then
|
||||
value = value - ad2d(num)
|
||||
else
|
||||
value = ad2d(num)
|
||||
end
|
||||
-- self.anchouValueText = self._config:GetChild('anchoufen')
|
||||
-- self.anchouValueText.text = 1
|
||||
-- self.anchouValue = 1
|
||||
|
||||
if value < 0 then
|
||||
ViewUtil.ErrorTip(1, "输入数据异常!")
|
||||
end
|
||||
-- local btn_cr = self._config:GetChild('sdsrbtn')
|
||||
-- btn_cr.onClick:Set(
|
||||
-- function()
|
||||
-- local gniv = GroupNumberInputView_Game.new(nil, function(num)
|
||||
-- local value = limit
|
||||
-- if otype == 1 then
|
||||
-- value = value + ad2d(num)
|
||||
-- elseif otype == -1 then
|
||||
-- value = value - ad2d(num)
|
||||
-- else
|
||||
-- value = ad2d(num)
|
||||
-- end
|
||||
|
||||
self.xipaiValueText.text = value / 1000
|
||||
self.xipaiValue = value / 1000
|
||||
end, 3, nil)
|
||||
gniv:Show()
|
||||
end
|
||||
)
|
||||
-- if value < 0 then
|
||||
-- ViewUtil.ErrorTip(1, "输入数据异常!")
|
||||
-- end
|
||||
|
||||
-- self.xipaiValueText.text = value / 1000
|
||||
-- self.xipaiValue = value / 1000
|
||||
-- end, 3, nil)
|
||||
-- gniv:Show()
|
||||
-- end
|
||||
-- )
|
||||
|
||||
|
||||
local btn_cr2 = self._config:GetChild('anchoubtn')
|
||||
btn_cr2.onClick:Set(
|
||||
function()
|
||||
local gniv = GroupNumberInputView_Game.new(nil, function(num)
|
||||
local value = limit
|
||||
if otype == 1 then
|
||||
value = value + ad2d(num)
|
||||
elseif otype == -1 then
|
||||
value = value - ad2d(num)
|
||||
else
|
||||
value = ad2d(num)
|
||||
end
|
||||
-- local btn_cr2 = self._config:GetChild('anchoubtn')
|
||||
-- btn_cr2.onClick:Set(
|
||||
-- function()
|
||||
-- local gniv = GroupNumberInputView_Game.new(nil, function(num)
|
||||
-- local value = limit
|
||||
-- if otype == 1 then
|
||||
-- value = value + ad2d(num)
|
||||
-- elseif otype == -1 then
|
||||
-- value = value - ad2d(num)
|
||||
-- else
|
||||
-- value = ad2d(num)
|
||||
-- end
|
||||
|
||||
if value < 0 then
|
||||
ViewUtil.ErrorTip(1, "输入数据异常!")
|
||||
end
|
||||
-- if value < 0 then
|
||||
-- ViewUtil.ErrorTip(1, "输入数据异常!")
|
||||
-- end
|
||||
|
||||
self.anchouValueText.text = value / 1000
|
||||
self.anchouValue = value / 1000
|
||||
end, 3, nil)
|
||||
gniv:Show()
|
||||
end
|
||||
)
|
||||
end
|
||||
-- self.anchouValueText.text = value / 1000
|
||||
-- self.anchouValue = value / 1000
|
||||
-- end, 3, nil)
|
||||
-- gniv:Show()
|
||||
-- end
|
||||
-- )
|
||||
-- end
|
||||
end
|
||||
|
||||
local _help_url = "ui://Info_MJ_JinXi/Com_help"
|
||||
|
|
@ -101,16 +106,16 @@ end
|
|||
function M:SelectedConfigData()
|
||||
local _config = self._config
|
||||
local round = _config:GetController("round").selectedIndex + 1
|
||||
local people = _config:GetController("play_list").selectedIndex + 2
|
||||
local people = _config:GetController("peopleNum").selectedIndex + 2
|
||||
|
||||
local zimo = _config:GetController("ZiMo").selectedIndex
|
||||
local gangjiangma = _config:GetController("GangJiangMa").selectedIndex
|
||||
local fengding = _config:GetController("FengDing").selectedIndex
|
||||
local sanjingjiangma = _config:GetController("SanJingJiangMa").selectedIndex
|
||||
local zikechengshun = _config:GetController("ZiKeChengShun").selectedIndex
|
||||
|
||||
local jiangma = Mathf.Round(_config:GetChild("n92").value)
|
||||
|
||||
local fengding = _config:GetController("fengding").selectedIndex
|
||||
local wanfa = _config:GetController("wanfa").selectedIndex
|
||||
local qiduijiafan = _config:GetChild("btn_qidui").selected
|
||||
local shoudailongjiafan = _config:GetChild("btn_shoudailong").selected
|
||||
local loudilongjiafan = _config:GetChild("btn_loudilong").selected
|
||||
local bunengchi = _config:GetChild("btn_bunengchi").selected
|
||||
local doudizhu = _config:GetChild("btn_doudizhu").selected
|
||||
local doudizhufanbei = _config:GetChild("btn_doudizhufanbei").selected
|
||||
local xi_pai = false
|
||||
local xi_paifen = 0
|
||||
if _config:GetChild("xipai") then
|
||||
|
|
@ -124,22 +129,21 @@ function M:SelectedConfigData()
|
|||
_data["opt"] = round
|
||||
_data["maxPlayers"] = people
|
||||
|
||||
_data["zimo"] = zimo
|
||||
_data["gangjiangma"] = gangjiangma
|
||||
_data["fengding"] = fengding
|
||||
_data["wanfa"] = wanfa
|
||||
_data["qiduijiafan"] = qiduijiafan
|
||||
_data["shoudailongjiafan"] = shoudailongjiafan
|
||||
_data["loudilongjiafan"] = loudilongjiafan
|
||||
_data["bunengchi"] = bunengchi
|
||||
_data["doudizhu"] = doudizhu
|
||||
_data["doudizhufanbei"] = doudizhufanbei
|
||||
_data["sanjingjiangma"] = sanjingjiangma
|
||||
_data["zikechengshun"] = zikechengshun
|
||||
|
||||
_data["jiangma"] = jiangma
|
||||
_data['xi_pai'] = xi_pai
|
||||
|
||||
local xi_pai_score = 0
|
||||
local an_chou_score = 0
|
||||
if oldGameVersion == 2 then
|
||||
xi_pai_score = self.xipaiValue
|
||||
an_chou_score = self.anchouValue
|
||||
end
|
||||
-- if oldGameVersion == 2 then
|
||||
-- xi_pai_score = self.xipaiValue
|
||||
-- an_chou_score = self.anchouValue
|
||||
-- end
|
||||
|
||||
_data['xi_pai_score'] = xi_pai_score * 1000
|
||||
_data['an_chou_score'] = an_chou_score * 1000
|
||||
|
|
@ -180,4 +184,16 @@ function M:LoadConfigData(data)
|
|||
end
|
||||
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
|
||||
end
|
||||
|
||||
return M
|
||||
|
|
|
|||
|
|
@ -14,68 +14,68 @@ end
|
|||
function M:FillData()
|
||||
self._maxPlayer = 4 -- 默认玩家人数
|
||||
self._roundChoice = 3 -- 回合选项数
|
||||
self._config = UIPackage.CreateObjectFromURL("ui://Info_MJ_LiChuan/Cgm_create_room")
|
||||
self._config = UIPackage.CreateObjectFromURL("ui://Info_MJ_LiChuan/Label_Detail_83")
|
||||
|
||||
if oldGameVersion == 2 then
|
||||
self._config:GetController("xipai").selectedIndex = 0
|
||||
-- if oldGameVersion == 2 then
|
||||
-- self._config:GetController("xipai").selectedIndex = 0
|
||||
|
||||
self.xipaiValueText = self._config:GetChild('xipaifen')
|
||||
self.xipaiValueText.text = 1
|
||||
self.xipaiValue = 1
|
||||
-- self.xipaiValueText = self._config:GetChild('xipaifen')
|
||||
-- self.xipaiValueText.text = 1
|
||||
-- self.xipaiValue = 1
|
||||
|
||||
self.anchouValueText = self._config:GetChild('anchoufen')
|
||||
self.anchouValueText.text = 1
|
||||
self.anchouValue = 1
|
||||
-- self.anchouValueText = self._config:GetChild('anchoufen')
|
||||
-- self.anchouValueText.text = 1
|
||||
-- self.anchouValue = 1
|
||||
|
||||
local btn_cr = self._config:GetChild('sdsrbtn')
|
||||
btn_cr.onClick:Set(
|
||||
function()
|
||||
local gniv = GroupNumberInputView_Game.new(nil, function(num)
|
||||
local value = limit
|
||||
if otype == 1 then
|
||||
value = value + ad2d(num)
|
||||
elseif otype == -1 then
|
||||
value = value - ad2d(num)
|
||||
else
|
||||
value = ad2d(num)
|
||||
end
|
||||
-- local btn_cr = self._config:GetChild('sdsrbtn')
|
||||
-- btn_cr.onClick:Set(
|
||||
-- function()
|
||||
-- local gniv = GroupNumberInputView_Game.new(nil, function(num)
|
||||
-- local value = limit
|
||||
-- if otype == 1 then
|
||||
-- value = value + ad2d(num)
|
||||
-- elseif otype == -1 then
|
||||
-- value = value - ad2d(num)
|
||||
-- else
|
||||
-- value = ad2d(num)
|
||||
-- end
|
||||
|
||||
if value < 0 then
|
||||
ViewUtil.ErrorTip(1, "输入数据异常!")
|
||||
end
|
||||
-- if value < 0 then
|
||||
-- ViewUtil.ErrorTip(1, "输入数据异常!")
|
||||
-- end
|
||||
|
||||
self.xipaiValueText.text = value / 1000
|
||||
self.xipaiValue = value / 1000
|
||||
end, 3, nil)
|
||||
gniv:Show()
|
||||
end
|
||||
)
|
||||
-- self.xipaiValueText.text = value / 1000
|
||||
-- self.xipaiValue = value / 1000
|
||||
-- end, 3, nil)
|
||||
-- gniv:Show()
|
||||
-- end
|
||||
-- )
|
||||
|
||||
|
||||
local btn_cr2 = self._config:GetChild('anchoubtn')
|
||||
btn_cr2.onClick:Set(
|
||||
function()
|
||||
local gniv = GroupNumberInputView_Game.new(nil, function(num)
|
||||
local value = limit
|
||||
if otype == 1 then
|
||||
value = value + ad2d(num)
|
||||
elseif otype == -1 then
|
||||
value = value - ad2d(num)
|
||||
else
|
||||
value = ad2d(num)
|
||||
end
|
||||
-- local btn_cr2 = self._config:GetChild('anchoubtn')
|
||||
-- btn_cr2.onClick:Set(
|
||||
-- function()
|
||||
-- local gniv = GroupNumberInputView_Game.new(nil, function(num)
|
||||
-- local value = limit
|
||||
-- if otype == 1 then
|
||||
-- value = value + ad2d(num)
|
||||
-- elseif otype == -1 then
|
||||
-- value = value - ad2d(num)
|
||||
-- else
|
||||
-- value = ad2d(num)
|
||||
-- end
|
||||
|
||||
if value < 0 then
|
||||
ViewUtil.ErrorTip(1, "输入数据异常!")
|
||||
end
|
||||
-- if value < 0 then
|
||||
-- ViewUtil.ErrorTip(1, "输入数据异常!")
|
||||
-- end
|
||||
|
||||
self.anchouValueText.text = value / 1000
|
||||
self.anchouValue = value / 1000
|
||||
end, 3, nil)
|
||||
gniv:Show()
|
||||
end
|
||||
)
|
||||
end
|
||||
-- self.anchouValueText.text = value / 1000
|
||||
-- self.anchouValue = value / 1000
|
||||
-- end, 3, nil)
|
||||
-- gniv:Show()
|
||||
-- end
|
||||
-- )
|
||||
-- end
|
||||
end
|
||||
|
||||
local _help_url = "ui://Info_MJ_LiChuan/Com_help"
|
||||
|
|
@ -101,16 +101,11 @@ end
|
|||
function M:SelectedConfigData()
|
||||
local _config = self._config
|
||||
local round = _config:GetController("round").selectedIndex + 1
|
||||
local people = _config:GetController("play_list").selectedIndex + 2
|
||||
local people = _config:GetController("peopleNum").selectedIndex + 2
|
||||
|
||||
local jingbibo = _config:GetController("jingbibo").selectedIndex
|
||||
|
||||
|
||||
local fengding = _config:GetController("fengding").selectedIndex
|
||||
local wanfa = _config:GetController("wanfa").selectedIndex
|
||||
local qiduijiafan = _config:GetChild("btn_qidui").selected
|
||||
local shoudailongjiafan = _config:GetChild("btn_shoudailong").selected
|
||||
local loudilongjiafan = _config:GetChild("btn_loudilong").selected
|
||||
local bunengchi = _config:GetChild("btn_bunengchi").selected
|
||||
local doudizhu = _config:GetChild("btn_doudizhu").selected
|
||||
local doudizhufanbei = _config:GetChild("btn_doudizhufanbei").selected
|
||||
local xi_pai = false
|
||||
local xi_paifen = 0
|
||||
if _config:GetChild("xipai") then
|
||||
|
|
@ -124,22 +119,16 @@ function M:SelectedConfigData()
|
|||
_data["opt"] = round
|
||||
_data["maxPlayers"] = people
|
||||
|
||||
_data["fengding"] = fengding
|
||||
_data["wanfa"] = wanfa
|
||||
_data["qiduijiafan"] = qiduijiafan
|
||||
_data["shoudailongjiafan"] = shoudailongjiafan
|
||||
_data["loudilongjiafan"] = loudilongjiafan
|
||||
_data["bunengchi"] = bunengchi
|
||||
_data["doudizhu"] = doudizhu
|
||||
_data["doudizhufanbei"] = doudizhufanbei
|
||||
_data["jingbibo"] = jingbibo
|
||||
|
||||
_data['xi_pai'] = xi_pai
|
||||
|
||||
local xi_pai_score = 0
|
||||
local an_chou_score = 0
|
||||
if oldGameVersion == 2 then
|
||||
xi_pai_score = self.xipaiValue
|
||||
an_chou_score = self.anchouValue
|
||||
end
|
||||
-- if oldGameVersion == 2 then
|
||||
-- xi_pai_score = self.xipaiValue
|
||||
-- an_chou_score = self.anchouValue
|
||||
-- end
|
||||
|
||||
_data['xi_pai_score'] = xi_pai_score * 1000
|
||||
_data['an_chou_score'] = an_chou_score * 1000
|
||||
|
|
@ -180,4 +169,16 @@ function M:LoadConfigData(data)
|
|||
end
|
||||
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
|
||||
end
|
||||
|
||||
return M
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ function M:FillData()
|
|||
|
||||
local jiangmaSlider = self._config:GetChild("n92")
|
||||
jiangmaSlider.onChanged:Set(function()
|
||||
self._config:GetChild("n93").text = string.format("奖%s马", Mathf.Round(jiangmaSlider.value))
|
||||
self._config:GetChild("n93").text = string.format("奖%s马", Mathf.Round(jiangmaSlider.value) * 2)
|
||||
end)
|
||||
-- if oldGameVersion == 2 then
|
||||
-- self._config:GetController("xipai").selectedIndex = 0
|
||||
|
|
|
|||
|
|
@ -39,9 +39,7 @@ function M:FillData(view, index)
|
|||
local btn_cr = self._config:GetChild('sdsrbtn')
|
||||
btn_cr.onClick:Set(
|
||||
function()
|
||||
|
||||
local gniv = GroupNumberInputView_Game.new(nil, function(num)
|
||||
|
||||
local value = limit
|
||||
if otype == 1 then
|
||||
value = value + ad2d(num)
|
||||
|
|
@ -57,11 +55,8 @@ function M:FillData(view, index)
|
|||
|
||||
self.xipaiValueText.text = value / 1000
|
||||
self.xipaiValue = value / 1000
|
||||
|
||||
end, 0, nil)
|
||||
gniv:Show()
|
||||
|
||||
|
||||
end
|
||||
)
|
||||
|
||||
|
|
@ -69,9 +64,7 @@ function M:FillData(view, index)
|
|||
local btn_cr2 = self._config:GetChild('anchoubtn')
|
||||
btn_cr2.onClick:Set(
|
||||
function()
|
||||
|
||||
local gniv = GroupNumberInputView_Game.new(nil, function(num)
|
||||
|
||||
local value = limit
|
||||
if otype == 1 then
|
||||
value = value + ad2d(num)
|
||||
|
|
@ -87,15 +80,10 @@ function M:FillData(view, index)
|
|||
|
||||
self.anchouValueText.text = value / 1000
|
||||
self.anchouValue = value / 1000
|
||||
|
||||
end, 3, nil)
|
||||
gniv:Show()
|
||||
|
||||
|
||||
end
|
||||
)
|
||||
|
||||
|
||||
end
|
||||
|
||||
|
||||
|
|
@ -118,7 +106,6 @@ function M:FillData(view, index)
|
|||
piao.selectedIndex = 0
|
||||
end
|
||||
end)
|
||||
|
||||
end
|
||||
|
||||
local _help_url = "ui://Info_Poker_RunFastNew/Com_help"
|
||||
|
|
@ -162,7 +149,6 @@ function M:LoadConfigData(data)
|
|||
|
||||
_config:GetChild("planelack").selected = false
|
||||
_config:GetChild("Threelack").selected = false
|
||||
|
||||
else
|
||||
_config:GetChild("sandaidan").selected = false
|
||||
|
||||
|
|
@ -213,9 +199,7 @@ function M:LoadConfigData(data)
|
|||
|
||||
self.anchouValueText.text = data.an_chou_score / 1000
|
||||
self.anchouValue = data.an_chou_score / 1000
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
function M:SelectedConfigData()
|
||||
|
|
@ -288,7 +272,6 @@ function M:SelectedConfigData()
|
|||
_data["planelack"] = 0
|
||||
_data["threelack"] = 0
|
||||
else
|
||||
|
||||
if sandaidan == 1 then
|
||||
_data["planelack"] = 0
|
||||
_data["threelack"] = 0
|
||||
|
|
@ -323,4 +306,16 @@ function M:OnChangeOption(ctype, pay_obj)
|
|||
end)
|
||||
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
|
||||
end
|
||||
|
||||
return M
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: c1652156a48ed314e92cb8121851e5aa
|
|||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/chat/c690b7c4ecc0dd8501b1a391699eb710
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: fe61c614f83effa48bc725d4b8eb4405
|
|||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/chat/c690b7c4ecc0dd8501b1a391699eb710
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: eb18ba26c546b664d8bcf40dfb22334c
|
|||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: b3fd47f6b807a5f4d99a067b8298e573
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: e2a43db26d7b42441972df6d9bdd7bd1
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: f494e792e67a66b4db65512383e25642
|
|||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: 8d495fdc99160ab4181d9f6fe501cad0
|
|||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: de2b01ac80600f6499db43b2ff17f696
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: f1752370255dc154f932fce085b1685a
|
|||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: 71aeeafc3b3e2004eb3d692111065754
|
|||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: 4feb3f8abbd884c458b4296210929c27
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: a1efe52fc0bb45145b912b159908141b
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: 4e71527ddcc48b241afccfdc71911112
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: ccc0b09c1fdf27c4a826d3834f1b4fed
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: a147c3877fbcbdf438f6d81cdec32d4c
|
|||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: 9b9554550fcc8464ebf97df5c779adc8
|
|||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: 4d900046c31c71a4b9a7711b7b44b95e
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: a2d94dcccf8451d489287aeda20f1457
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: eff76e4e8a280854ba1c328dc6dff75d
|
|||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: 8c4a1fc1b375cbd499621322399838c2
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: 6cd449bf29675d94699dddf1b3bdf90f
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: 92f803b0cf2dddf4ea2fa5043099c714
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: da6d58cfd8ba5c74a8441ccf3e6e295e
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: 178e63cdbd1fd8540a8daa36e9300857
|
|||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: 7683ae6b0b2786a4da753dece57cb4d4
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: 36eb1fc7c9141284c98ddd943ce27571
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: 7a3308f7772ae7c4d96eb97d176ecff6
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: cc3f665a776f59b4098319560a502a65
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: acb70191b16d81145ae233902b8d14cb
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: aedef8befb0909947a7bc9fa1040c5c2
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: f72bc9b6459f29647817761dec7871d7
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: 56992ce7be8c68c4ca5b166ecfbf46c8
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: 09699d668c184a34f9198461c536d556
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: 9cbdad8c66736ca4298d6e9931217bda
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: 27f46f8f2b619c5438b87443bc6f2bd8
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: 99abea027ba08f74a8f9adacbc086c13
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: 59fb2f0b76c6f8e409dad73fb2cd2486
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: ee628a4dd720b1642b5ce89c0765dc18
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: be0fc1e2f7d4ff74fa5d8fb80b51a1fd
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: 2ab22e527f191eb43a335e4ca2add5d5
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: f57ef6b5a7d98a148a3685b77897a4a6
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: 5862d5777b8c4d14fbd891b322348366
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: 41bd4dff15246284fa34e70705c8d12d
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: c5e23129388a6c1448a9757b6e29f73e
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: be08af1eb1128764196d5dce5c24ad77
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: c95073c82fbaeed4d9f0ad53e70e777a
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: f2696d1c3084efd428c1a0a0210907e2
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: c03de88edf30eeb44bd3f4ba6dde8bb6
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: 9d30d7ad1fbbb3a428628581675cc1b0
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: 62ccc9c510c7c5141a1714c2488cf70f
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: 8e72411e8de220a4092d7bacaabd5132
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: 9b56258c2e359d74da26f1fbfa361669
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: 9f0cf9fd9e4a5a04899d723ec2ae52f1
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/common/af187115a4824290240734622129b80b
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/lobby/4a425335ab0e1c246f741e6da62b244f
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/lobby/4a425335ab0e1c246f741e6da62b244f
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/lobby/4a425335ab0e1c246f741e6da62b244f
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/lobby/4a425335ab0e1c246f741e6da62b244f
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/lobby/4a425335ab0e1c246f741e6da62b244f
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/lobby/4a425335ab0e1c246f741e6da62b244f
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/lobby/4a425335ab0e1c246f741e6da62b244f
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: base/lobby/4a425335ab0e1c246f741e6da62b244f
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue