全部修改,减缩动画数量
|
|
@ -443,12 +443,17 @@ function M:OnApplicationActive()
|
|||
end
|
||||
|
||||
function M:InitClip()
|
||||
UIPackage.AddPackage("base/lobby/ui/Lobby_KanBanNiang")
|
||||
local aMovie = UIPackage.CreateObject("Lobby_KanBanNiang", "KanBanNiang")
|
||||
aMovie.playing = true
|
||||
self._view:GetChild('kanBanNiang'):AddChild(aMovie)
|
||||
|
||||
local taohuaEnd = 114
|
||||
local taohuaName = "ui://Lobby/taohua_00"
|
||||
local taohua = self._view:GetChild('clip_bg')
|
||||
local taohuaIndex = 0
|
||||
|
||||
local renwuEnd = 142
|
||||
local renwuEnd = 140
|
||||
local renwuName = "ui://Lobby/renwu-AE_00"
|
||||
local renwu = self._view:GetChild('clip_renwu')
|
||||
local renwuIndex = 0
|
||||
|
|
@ -467,7 +472,7 @@ function M:InitClip()
|
|||
local hechengName = "ui://Lobby/hecheng 1_00"
|
||||
local hecheng = self._view:GetChild('btn_joinroom')
|
||||
local hechengIndex = 0
|
||||
coroutine.start(
|
||||
self.alldonhua = coroutine.start(
|
||||
function()
|
||||
while true do
|
||||
taohuaIndex = self:ReplaceClip1(taohuaEnd, taohua, taohuaIndex, taohuaName)
|
||||
|
|
@ -475,7 +480,7 @@ function M:InitClip()
|
|||
pukeIndex = self:ReplaceClip2(pukeEnd, puke, pukeIndex, pukeName)
|
||||
jiangbeiIndex = self:ReplaceClip2(jiangbeiEnd, jiangbei, jiangbeiIndex, jiangbeiName)
|
||||
hechengIndex = self:ReplaceClip2(hechengEnd, hecheng, hechengIndex, hechengName)
|
||||
coroutine.wait(0.060)
|
||||
coroutine.wait(0.080)
|
||||
end
|
||||
end
|
||||
)
|
||||
|
|
@ -486,7 +491,7 @@ function M:ReplaceClip1(e, t, i, n)
|
|||
i = 0
|
||||
end
|
||||
t.url = string.format("%s%03d", n, i)
|
||||
return i + 2
|
||||
return i + 4
|
||||
end
|
||||
|
||||
function M:ReplaceClip2(e, t, i, n)
|
||||
|
|
@ -494,5 +499,5 @@ function M:ReplaceClip2(e, t, i, n)
|
|||
i = 0
|
||||
end
|
||||
t.icon = string.format("%s%03d", n, i)
|
||||
return i + 2
|
||||
return i + 4
|
||||
end
|
||||
|
|
|
|||
|
|
@ -269,9 +269,9 @@ function M:InitClip()
|
|||
self.donhua = coroutine.start(
|
||||
function()
|
||||
while true do
|
||||
yunqueIndex = self:ReplaceClip1(yunqueEnd, yunque, yunqueIndex, yunqueName)
|
||||
-- yunqueIndex = self:ReplaceClip1(yunqueEnd, yunque, yunqueIndex, yunqueName)
|
||||
xuehuaIndex = self:ReplaceClip1(xuehuaEnd, xuehua, xuehuaIndex, xuehuaName)
|
||||
coroutine.wait(0.080)
|
||||
coroutine.wait(0.12)
|
||||
end
|
||||
end
|
||||
)
|
||||
|
|
@ -282,5 +282,5 @@ function M:ReplaceClip1(e, t, i, n)
|
|||
i = 0
|
||||
end
|
||||
t.url = string.format("%s%03d", n, i)
|
||||
return i + 2
|
||||
return i + 6
|
||||
end
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@ function M:FillData(player)
|
|||
self:UpdateScore(player.total_score * rt)
|
||||
end
|
||||
|
||||
if player.piao ~= nil and player.piao >= 0 then
|
||||
self.view_piao.title = player.piao == 0 and "不打鸟" or string.format("打鸟%d", player.piao)
|
||||
if player.daNiao ~= nil and player.niao ~= nil then
|
||||
self.view_piao.title = player.daNiao == 0 and "不打鸟" or string.format("打鸟%d", player.niao)
|
||||
self.ctr_piao.selectedIndex = 1
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@ local M = ExtendConfig
|
|||
|
||||
|
||||
function ExtendConfig.new()
|
||||
setmetatable(M, {__index = IExtendConfig})
|
||||
local self = setmetatable({}, {__index = M})
|
||||
setmetatable(M, { __index = IExtendConfig })
|
||||
local self = setmetatable({}, { __index = M })
|
||||
self.class = "ExtendConfig"
|
||||
self.extend_id = 14
|
||||
self._viewMap = {}
|
||||
|
|
@ -41,10 +41,10 @@ end
|
|||
|
||||
local _gameInfo = nil
|
||||
function M:GetGameInfo()
|
||||
if not _gameInfo then
|
||||
if not _gameInfo then
|
||||
_gameInfo = EXGameInfo.new()
|
||||
end
|
||||
return _gameInfo
|
||||
end
|
||||
return _gameInfo
|
||||
end
|
||||
|
||||
local _ctr_game = nil
|
||||
|
|
@ -68,7 +68,7 @@ function M:GetIconUrl()
|
|||
--
|
||||
end
|
||||
|
||||
function M:FillRoomConfig(room,_config)
|
||||
function M:FillRoomConfig(room, _config)
|
||||
room.room_config = RunFast_RoomConfig.new(_config)
|
||||
end
|
||||
|
||||
|
|
@ -82,7 +82,7 @@ function M:FillRoomData(s2croom)
|
|||
|
||||
local _tableInfo = s2croom["tableInfo"]
|
||||
|
||||
room.xipaiScore=_tableInfo["xipai_score"]
|
||||
room.xipaiScore = _tableInfo["xipai_score"]
|
||||
|
||||
local _config = _tableInfo["config"]
|
||||
room.room_config = RunFast_RoomConfig.new(_config)
|
||||
|
|
@ -93,7 +93,7 @@ function M:FillRoomData(s2croom)
|
|||
end
|
||||
|
||||
local playerList = _tableInfo["playerData"]
|
||||
for i = 1,#playerList do
|
||||
for i = 1, #playerList do
|
||||
local _jp = playerList[i]
|
||||
|
||||
local p = RunFast_Player.new()
|
||||
|
|
@ -133,7 +133,6 @@ function M:FillRoomData(s2croom)
|
|||
room.owner_id = owner
|
||||
room.game_status = 0
|
||||
if reload then
|
||||
|
||||
local reloadInfo = s2croom["reloadInfo"]
|
||||
|
||||
|
||||
|
|
@ -143,10 +142,8 @@ function M:FillRoomData(s2croom)
|
|||
room.curren_turn_seat = reloadInfo["active_seat"]
|
||||
local info_list = reloadInfo["info_list"]
|
||||
if playing == true then
|
||||
|
||||
|
||||
room.CurnrenState = StateType.Palying
|
||||
room.game_status=1
|
||||
room.game_status = 1
|
||||
|
||||
|
||||
for i = 1, #info_list do
|
||||
|
|
@ -154,26 +151,28 @@ function M:FillRoomData(s2croom)
|
|||
|
||||
if p == room.self_player then
|
||||
p.hand_list = reloadInfo["hand_card"]
|
||||
p.open= reloadInfo["open"]
|
||||
p.open = reloadInfo["open"]
|
||||
end
|
||||
|
||||
p.hand_count = info_list[i]["card_size"]
|
||||
p.piao = info_list[i]["piao"]
|
||||
p.niao = info_list[i]["niao"]
|
||||
p.daNiao = info_list[i]["daNiao"]
|
||||
p.handCards = info_list[i]["handCards"]
|
||||
p.outCards = info_list[i]["outCards"]
|
||||
local last_outcard = info_list[i]["last_outcard"]
|
||||
if last_outcard ~= nil and last_outcard[1] ~= 0 then
|
||||
local out_card_list = _ctr_game:ChangeCodeByFrom(last_outcard.card_list,true)
|
||||
local card_type,number,length,plan_three_count = _ctr_game:GetCardListInfo(out_card_list)
|
||||
p.out_card_list = _ctr_game:GetSortOutCardList(out_card_list,card_type,number,plan_three_count)
|
||||
local out_card_list = _ctr_game:ChangeCodeByFrom(last_outcard.card_list, true)
|
||||
local card_type, number, length, plan_three_count = _ctr_game:GetCardListInfo(out_card_list)
|
||||
p.out_card_list = _ctr_game:GetSortOutCardList(out_card_list, card_type, number, plan_three_count)
|
||||
else
|
||||
p.out_card_list = {0}
|
||||
p.out_card_list = { 0 }
|
||||
end
|
||||
end
|
||||
else
|
||||
-- print("aaaaaaaaaaaaaaaa1111111111111111111111111")
|
||||
--pt(s2croom)
|
||||
room.game_status=1
|
||||
room.game_status = 1
|
||||
|
||||
room.CurnrenState = StateType.PalyingWait
|
||||
|
||||
|
|
@ -188,20 +187,21 @@ function M:FillRoomData(s2croom)
|
|||
|
||||
local last_outcard = info_list[i]["last_outcard"]
|
||||
if last_outcard ~= nil and last_outcard[1] ~= 0 then
|
||||
|
||||
local out_card_list = _ctr_game:ChangeCodeByFrom(last_outcard.card_list,true)
|
||||
local card_type,number,length,plan_three_count = _ctr_game:GetCardListInfo(out_card_list)
|
||||
p.out_card_list = _ctr_game:GetSortOutCardList(out_card_list,card_type,number,plan_three_count)
|
||||
local out_card_list = _ctr_game:ChangeCodeByFrom(last_outcard.card_list, true)
|
||||
local card_type, number, length, plan_three_count = _ctr_game:GetCardListInfo(out_card_list)
|
||||
p.out_card_list = _ctr_game:GetSortOutCardList(out_card_list, card_type, number, plan_three_count)
|
||||
else
|
||||
p.out_card_list = {0}
|
||||
p.out_card_list = { 0 }
|
||||
end
|
||||
|
||||
p.hand_list = info_list[i]["cards"]
|
||||
p.winscore = info_list[i]["winscore"]
|
||||
p.piao = info_list[i]["piao"]
|
||||
p.niao = info_list[i]["niao"]
|
||||
p.daNiao = info_list[i]["daNiao"]
|
||||
p.hand_count = info_list[i]["card_size"]
|
||||
p.thisboomnum=info_list[i]["thisboomnum"]
|
||||
p.open= info_list[i]["open"]
|
||||
p.thisboomnum = info_list[i]["thisboomnum"]
|
||||
p.open = info_list[i]["open"]
|
||||
|
||||
p.handCards = info_list[i]["handCards"]
|
||||
p.outCards = info_list[i]["outCards"]
|
||||
|
|
@ -212,8 +212,6 @@ function M:FillRoomData(s2croom)
|
|||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
function M:FillPlayBackData(pd_data)
|
||||
local room = DataManager.CurrenRoom
|
||||
local _tableInfo = pd_data["info"]
|
||||
|
|
@ -228,7 +226,7 @@ function M:FillPlayBackData(pd_data)
|
|||
room.curren_turn_seat = active_seat
|
||||
room.curren_round = _tableInfo["round"]
|
||||
local _info_list = _tableInfo["playerData"]
|
||||
for i = 1,#_info_list do
|
||||
for i = 1, #_info_list do
|
||||
local _jp = _info_list[i]
|
||||
local p = RunFast_Player.new()
|
||||
p.seat = _jp["seat"]
|
||||
|
|
@ -250,7 +248,7 @@ function M:FillPlayBackData(pd_data)
|
|||
p.hand_count = #_hand_card
|
||||
p.total_score = _jp["score"]
|
||||
p.piao = _jp["piao"]
|
||||
p.open= _jp["open"]
|
||||
p.open = _jp["open"]
|
||||
p.hp_info = _jp["hp_info"]
|
||||
if _jp['hp_info'] then
|
||||
p.cur_hp = _jp.hp_info.cur_hp
|
||||
|
|
|
|||
|
After Width: | Height: | Size: 13 MiB |
|
|
@ -33,8 +33,8 @@
|
|||
"n50_lwcl": {
|
||||
"hidden": true
|
||||
},
|
||||
"n113_ker3": {
|
||||
"hidden": true
|
||||
"n145_h5le": {
|
||||
"locked": true
|
||||
},
|
||||
"n100_lumr": {
|
||||
"hidden": true
|
||||
|
|
@ -51,6 +51,9 @@
|
|||
"n119_g8kk": {
|
||||
"hidden": true
|
||||
},
|
||||
"n113_ker3": {
|
||||
"hidden": true
|
||||
},
|
||||
"n51_lwcl": {
|
||||
"hidden": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,10 @@
|
|||
{
|
||||
"objectStatus": {
|
||||
"n136_ilon": {
|
||||
"hidden": true
|
||||
"n35_rpaz": {
|
||||
"collapsed": true
|
||||
},
|
||||
"n33_rpaz": {
|
||||
"collapsed": true
|
||||
},
|
||||
"n69_jd7v": {
|
||||
"hidden": true
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
{
|
||||
"objectStatus": {
|
||||
"n94_kwi0": {
|
||||
"collapsed": true
|
||||
}
|
||||
},
|
||||
"adaptiveTest": true,
|
||||
"fitScreen": "FitSize"
|
||||
}
|
||||
|
|
@ -1,7 +1 @@
|
|||
{
|
||||
"objectStatus": {
|
||||
"n3_imp5": {
|
||||
"collapsed": true
|
||||
}
|
||||
}
|
||||
}
|
||||
{}
|
||||
|
|
@ -7,11 +7,11 @@
|
|||
<image id="n141_ht5v" name="n141" src="ht5v7cnr" fileName="mainbg.png" xy="-145,0" aspect="true">
|
||||
<relation target="" sidePair="width-width%,height-height%,center-center,middle-middle"/>
|
||||
</image>
|
||||
<loader id="n145_h5le" name="clip_bg" xy="-149,0" size="1633,972" url="ui://2d9xdj6zy1us7d3u" fill="scale">
|
||||
<loader id="n157_btip" name="clip_renwu" xy="0,12" size="696,771" url="ui://2d9xdj6zbtip7dr5" fill="scale">
|
||||
<relation target="" sidePair="width-width%,height-height%"/>
|
||||
</loader>
|
||||
<loader id="n142_h5le" name="clip_renwu" xy="55,97" size="435,651" url="ui://2d9xdj6ziaes7dfj" align="center" vAlign="middle">
|
||||
<relation target="" sidePair="left-left%"/>
|
||||
<loader id="n145_h5le" name="clip_bg" xy="-149,0" size="1633,972" url="ui://2d9xdj6zy1us7d3u" fill="scale">
|
||||
<relation target="" sidePair="width-width%,height-height%"/>
|
||||
</loader>
|
||||
<image id="n49_lwcl" name="n49" src="lwclq" fileName="denglu_bg_01.png" pkg="0khx14ar" xy="-209,0" size="1770,750" aspect="true" visible="false">
|
||||
<relation target="" sidePair="center-center,middle-middle"/>
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
<relation target="" sidePair="top-top%"/>
|
||||
<relation target="n29" sidePair="left-right"/>
|
||||
</text>
|
||||
<text id="n84_mv8k" name="tex_id" xy="127,69" size="143,42" group="n28" font="Microsoft YaHei" fontSize="30" color="#ffffff" bold="true" text="ID:123456">
|
||||
<text id="n84_mv8k" name="tex_id" xy="127,69" size="161,42" group="n28" font="Microsoft YaHei" fontSize="30" color="#ffffff" bold="true" text="ID:123456">
|
||||
<relation target="" sidePair="top-top%"/>
|
||||
<relation target="n29" sidePair="left-right"/>
|
||||
</text>
|
||||
|
|
@ -127,7 +127,5 @@
|
|||
<relation target="" sidePair="center-center"/>
|
||||
</component>
|
||||
</displayList>
|
||||
<transition name="t0">
|
||||
<item time="0" type="Transition" target="n127_naup" value="t0"/>
|
||||
</transition>
|
||||
<transition name="t1" autoPlayRepeat="-1"/>
|
||||
</component>
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="100,100">
|
||||
<displayList/>
|
||||
</component>
|
||||
|
Before Width: | Height: | Size: 199 KiB |
|
Before Width: | Height: | Size: 227 KiB |
|
Before Width: | Height: | Size: 242 KiB |
|
Before Width: | Height: | Size: 257 KiB |
|
Before Width: | Height: | Size: 268 KiB |
|
Before Width: | Height: | Size: 283 KiB |
|
Before Width: | Height: | Size: 286 KiB |
|
Before Width: | Height: | Size: 289 KiB |
|
Before Width: | Height: | Size: 291 KiB |
|
Before Width: | Height: | Size: 291 KiB |
|
Before Width: | Height: | Size: 294 KiB |
|
Before Width: | Height: | Size: 299 KiB |
|
Before Width: | Height: | Size: 302 KiB |
|
Before Width: | Height: | Size: 299 KiB |
|
Before Width: | Height: | Size: 300 KiB |
|
Before Width: | Height: | Size: 306 KiB |
|
Before Width: | Height: | Size: 307 KiB |
|
Before Width: | Height: | Size: 308 KiB |
|
Before Width: | Height: | Size: 307 KiB |
|
Before Width: | Height: | Size: 308 KiB |
|
Before Width: | Height: | Size: 308 KiB |
|
Before Width: | Height: | Size: 314 KiB |
|
Before Width: | Height: | Size: 320 KiB |
|
Before Width: | Height: | Size: 319 KiB |
|
Before Width: | Height: | Size: 302 KiB |
|
Before Width: | Height: | Size: 299 KiB |
|
Before Width: | Height: | Size: 283 KiB |
|
Before Width: | Height: | Size: 265 KiB |
|
Before Width: | Height: | Size: 214 KiB |
|
Before Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 31 KiB |
|
Before Width: | Height: | Size: 31 KiB |
|
Before Width: | Height: | Size: 31 KiB |
|
Before Width: | Height: | Size: 32 KiB |
|
Before Width: | Height: | Size: 32 KiB |
|
Before Width: | Height: | Size: 32 KiB |
|
Before Width: | Height: | Size: 33 KiB |
|
Before Width: | Height: | Size: 33 KiB |
|
Before Width: | Height: | Size: 34 KiB |
|
Before Width: | Height: | Size: 34 KiB |
|
Before Width: | Height: | Size: 34 KiB |
|
Before Width: | Height: | Size: 35 KiB |
|
Before Width: | Height: | Size: 35 KiB |
|
Before Width: | Height: | Size: 35 KiB |
|
Before Width: | Height: | Size: 35 KiB |
|
Before Width: | Height: | Size: 36 KiB |
|
Before Width: | Height: | Size: 36 KiB |
|
Before Width: | Height: | Size: 36 KiB |
|
Before Width: | Height: | Size: 36 KiB |
|
Before Width: | Height: | Size: 36 KiB |
|
Before Width: | Height: | Size: 36 KiB |
|
Before Width: | Height: | Size: 36 KiB |
|
Before Width: | Height: | Size: 36 KiB |
|
Before Width: | Height: | Size: 36 KiB |
|
Before Width: | Height: | Size: 36 KiB |
|
Before Width: | Height: | Size: 36 KiB |
|
Before Width: | Height: | Size: 35 KiB |
|
Before Width: | Height: | Size: 35 KiB |
|
Before Width: | Height: | Size: 35 KiB |
|
Before Width: | Height: | Size: 35 KiB |
|
Before Width: | Height: | Size: 34 KiB |
|
Before Width: | Height: | Size: 34 KiB |