diff --git a/lua_probject/base_project/Game/View/LobbyView.lua b/lua_probject/base_project/Game/View/LobbyView.lua
index ba1f7fae..bc3c4c74 100644
--- a/lua_probject/base_project/Game/View/LobbyView.lua
+++ b/lua_probject/base_project/Game/View/LobbyView.lua
@@ -443,31 +443,36 @@ function M:OnApplicationActive()
end
function M:InitClip()
- local taohuaEnd = 114
- local taohuaName = "ui://Lobby/taohua_00"
- local taohua = self._view:GetChild('clip_bg')
- local taohuaIndex = 0
+ UIPackage.AddPackage("base/lobby/ui/Lobby_KanBanNiang")
+ local aMovie = UIPackage.CreateObject("Lobby_KanBanNiang", "KanBanNiang")
+ aMovie.playing = true
+ self._view:GetChild('kanBanNiang'):AddChild(aMovie)
- local renwuEnd = 142
- local renwuName = "ui://Lobby/renwu-AE_00"
- local renwu = self._view:GetChild('clip_renwu')
- local renwuIndex = 0
+ local taohuaEnd = 114
+ local taohuaName = "ui://Lobby/taohua_00"
+ local taohua = self._view:GetChild('clip_bg')
+ local taohuaIndex = 0
- local pukeEnd = 60
- local pukeName = "ui://Lobby/puke_00"
- local puke = self._view:GetChild('btn_ChuangJian')
- local pukeIndex = 0
+ local renwuEnd = 140
+ local renwuName = "ui://Lobby/renwu-AE_00"
+ local renwu = self._view:GetChild('clip_renwu')
+ local renwuIndex = 0
- local jiangbeiEnd = 180
- local jiangbeiName = "ui://Lobby/jiangbei_00"
- local jiangbei = self._view:GetChild('btn_more_group')
+ local pukeEnd = 60
+ local pukeName = "ui://Lobby/puke_00"
+ local puke = self._view:GetChild('btn_ChuangJian')
+ local pukeIndex = 0
+
+ local jiangbeiEnd = 180
+ local jiangbeiName = "ui://Lobby/jiangbei_00"
+ local jiangbei = self._view:GetChild('btn_more_group')
local jiangbeiIndex = 0
- local hechengEnd = 96
- local hechengName = "ui://Lobby/hecheng 1_00"
- local hecheng = self._view:GetChild('btn_joinroom')
- local hechengIndex = 0
- coroutine.start(
+ local hechengEnd = 96
+ local hechengName = "ui://Lobby/hecheng 1_00"
+ local hecheng = self._view:GetChild('btn_joinroom')
+ local hechengIndex = 0
+ 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
diff --git a/lua_probject/base_project/Game/View/LoginView.lua b/lua_probject/base_project/Game/View/LoginView.lua
index b9f28795..059da673 100644
--- a/lua_probject/base_project/Game/View/LoginView.lua
+++ b/lua_probject/base_project/Game/View/LoginView.lua
@@ -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
diff --git a/lua_probject/extend_project/extend/poker/runfast/EXPlayerInfoView.lua b/lua_probject/extend_project/extend/poker/runfast/EXPlayerInfoView.lua
index fcf8e889..13300cb6 100644
--- a/lua_probject/extend_project/extend/poker/runfast/EXPlayerInfoView.lua
+++ b/lua_probject/extend_project/extend/poker/runfast/EXPlayerInfoView.lua
@@ -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
diff --git a/lua_probject/extend_project/extend/poker/runfast/ExtendConfig.lua b/lua_probject/extend_project/extend/poker/runfast/ExtendConfig.lua
index 2bf347d3..10df7cd1 100644
--- a/lua_probject/extend_project/extend/poker/runfast/ExtendConfig.lua
+++ b/lua_probject/extend_project/extend/poker/runfast/ExtendConfig.lua
@@ -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 = {}
@@ -38,13 +38,13 @@ function M:UnAssets()
UIPackage.RemovePackage("extend/poker/runfast/ui/Extend_Poker_RunFastNew")
ResourcesManager.UnLoadGroup("RunFase_PK")
end
-
+
local _gameInfo = nil
function M:GetGameInfo()
-if not _gameInfo then
- _gameInfo = EXGameInfo.new()
-end
-return _gameInfo
+ if not _gameInfo then
+ _gameInfo = EXGameInfo.new()
+ 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
@@ -81,19 +81,19 @@ function M:FillRoomData(s2croom)
local reload = s2croom["reload"]
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)
room.curren_round = _tableInfo["round"]
- if room.curren_round == 0 and reload then
- room.curren_round = 1
+ if room.curren_round == 0 and reload then
+ room.curren_round = 1
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,47 +133,46 @@ function M:FillRoomData(s2croom)
room.owner_id = owner
room.game_status = 0
if reload then
-
local reloadInfo = s2croom["reloadInfo"]
-
-
+
+
local playing = reloadInfo["playing"]
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
local p = room:GetPlayerById(info_list[i]["playerid"])
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")
+ -- print("aaaaaaaaaaaaaaaa1111111111111111111111111")
--pt(s2croom)
- room.game_status=1
+ room.game_status = 1
room.CurnrenState = StateType.PalyingWait
@@ -183,37 +182,36 @@ function M:FillRoomData(s2croom)
for i = 1, #info_list do
local playerData = info_list[i]
local p = room:GetPlayerById(playerData["playerid"])
-
+
p.ready = playerData["certainseat"] == 1 and true or false
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"]
- end
+ end
end
else
room.CurnrenState = StateType.Ready
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
@@ -261,4 +259,4 @@ function M:FillPlayBackData(pd_data)
room.cmdList = pd_data["cmdList"]
end
-return M
\ No newline at end of file
+return M
diff --git a/qyq_new_unity/Assets/ART/base/ui/Lobby_KanBanNiang_atlas0.png b/qyq_new_unity/Assets/ART/base/ui/Lobby_KanBanNiang_atlas0.png
new file mode 100644
index 00000000..e99603c0
Binary files /dev/null and b/qyq_new_unity/Assets/ART/base/ui/Lobby_KanBanNiang_atlas0.png differ
diff --git a/qyq_new_unity/Assets/ART/base/ui/Lobby_KanBanNiang_fui.bytes b/qyq_new_unity/Assets/ART/base/ui/Lobby_KanBanNiang_fui.bytes
new file mode 100644
index 00000000..fae8f624
Binary files /dev/null and b/qyq_new_unity/Assets/ART/base/ui/Lobby_KanBanNiang_fui.bytes differ
diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info b/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info
index cfe95c07..be6f6bd1 100644
--- a/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info
+++ b/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info
@@ -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
}
diff --git a/wb_new_ui/.objs/metas/m7iejg46/imp57igy.info b/wb_new_ui/.objs/metas/m7iejg46/imp57igy.info
index c2a07736..23ec9e08 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/imp57igy.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/imp57igy.info
@@ -1,7 +1,10 @@
{
"objectStatus": {
- "n136_ilon": {
- "hidden": true
+ "n35_rpaz": {
+ "collapsed": true
+ },
+ "n33_rpaz": {
+ "collapsed": true
},
"n69_jd7v": {
"hidden": true
diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hk0.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hk0.info
index e5ec0083..a4799416 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hk0.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hk0.info
@@ -1,4 +1,9 @@
{
+ "objectStatus": {
+ "n94_kwi0": {
+ "collapsed": true
+ }
+ },
"adaptiveTest": true,
"fitScreen": "FitSize"
}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/m7iejg46/m16m7igb.info b/wb_new_ui/.objs/metas/m7iejg46/m16m7igb.info
index 65778ede..9e26dfee 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/m16m7igb.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/m16m7igb.info
@@ -1,7 +1 @@
-{
- "objectStatus": {
- "n3_imp5": {
- "collapsed": true
- }
- }
-}
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/Main.xml b/wb_new_ui/assets/Lobby/Main.xml
index 4dc45cad..3044daf1 100644
--- a/wb_new_ui/assets/Lobby/Main.xml
+++ b/wb_new_ui/assets/Lobby/Main.xml
@@ -7,11 +7,11 @@
-
+
-
-
+
+
@@ -29,7 +29,7 @@
-
+
@@ -127,7 +127,5 @@
-
-
+
+
+
+
+
+
+
+
-
+
-
-
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupFagList.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupFagList.xml
index cdf6722d..6d3dbae1 100644
--- a/wb_new_ui/assets/NewGroup/mgr/View_GroupFagList.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupFagList.xml
@@ -85,7 +85,7 @@
-
+
@@ -118,11 +118,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberInviteAlone.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberInviteAlone.xml
index b202d128..f157a893 100644
--- a/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberInviteAlone.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberInviteAlone.xml
@@ -5,47 +5,47 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList1.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList1.xml
index 25b44f97..0f7410d4 100644
--- a/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList1.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList1.xml
@@ -1,12 +1,12 @@
-
-
-
+
+
+
-
+
-
+
@@ -16,7 +16,7 @@
-
+
@@ -73,13 +73,6 @@
-
-
-
-
-
-
-
+
-
+
@@ -49,24 +49,24 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/member/item_member1.xml b/wb_new_ui/assets/NewGroup/mgr/component/member/item_member1.xml
index c6d095bb..aeaa38df 100644
--- a/wb_new_ui/assets/NewGroup/mgr/component/member/item_member1.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/component/member/item_member1.xml
@@ -54,16 +54,16 @@
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/imgs/addMenberAlone/Group 515.png b/wb_new_ui/assets/NewGroup/mgr/imgs/addMenberAlone/Group 515.png
index 07a27b08..e2478f65 100644
Binary files a/wb_new_ui/assets/NewGroup/mgr/imgs/addMenberAlone/Group 515.png and b/wb_new_ui/assets/NewGroup/mgr/imgs/addMenberAlone/Group 515.png differ
diff --git a/wb_new_ui/assets/NewGroup/package.xml b/wb_new_ui/assets/NewGroup/package.xml
index ca38a803..19d5538e 100644
--- a/wb_new_ui/assets/NewGroup/package.xml
+++ b/wb_new_ui/assets/NewGroup/package.xml
@@ -1086,6 +1086,13 @@
+
+
+
+
+
+
+
\ No newline at end of file