lingmeng
/
jx_client_neibu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

改了一大堆

master
1076390229 2025-08-18 21:44:31 +08:00
parent 61b0878de4
commit bfaf3e783b
40 changed files with 163 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lua_probject/base_project/Game/Controller/GroupMgrController.lua
View File

@ -486,6 +486,15 @@ end
function M:FG_Isopen_ChatRoom(evt_data)
print("收到是否开启聊天室推送")
local groupId = evt_data.groupId
local group = DataManager.groups:get(groupId)
local isOpenChatRoom = evt_data.chat_id
if group == nil then return end
group.isOpenChatRoom = isOpenChatRoom
pt(evt_data)
DispatchEvent(self._dispatcher, GroupMgrEvent.IsOpenChatRoom, evt_data)
end

2
lua_probject/base_project/Game/View/Family/FamilyEventView.lua
View File

@ -207,7 +207,7 @@ end
function M:_evtIsOpenChatRoom(...)
local arg = { ... }
self:ReflashChatRoomBtn()
print("_evtIsOpenChatRoom")
pt(arg)
end

11
lua_probject/base_project/Game/View/FamilyView.lua
View File

@ -557,6 +557,8 @@ function M:OnEnterGroupCallBack()
ReflashJoinsRedPoint(self)
self:ReflashChatRoomBtn()
fgCtr:FG_Get_Online_Member(self._group.id, function(res)
end)
@ -892,7 +894,7 @@ function M:OnUpdate()
self:UpdateFamilyRoom(fgCtr, self._group.id)
end
local HeartbeatTime = 15
local HeartbeatTime = 60
if newTime - self.lastTime > HeartbeatTime then
fgCtr:FG_SetFamilyHeartbeat(self._group.id, DataManager.SelfUser.account_id, function(res)
print(res)
@ -1144,4 +1146,11 @@ function M:Close()
BaseView.Close(self)
end
function M:ReflashChatRoomBtn()
self.btn_chatRoom.visible = true
if self._group.lev == 3 and self._group.isOpenChatRoom == 0 then
self.btn_chatRoom.visible = false
end
end
return M

16
lua_probject/base_project/Game/View/PlayerInfoView.lua
View File

@ -202,17 +202,17 @@ end
function M:UpdateScore(score, doAnimation)
if not score then
score = self._player.total_score
local room = DataManager.CurrenRoom
if room:checkHpNonnegative() then
if self._player.cur_hp then
--local room = DataManager.CurrenRoom
--if room:checkHpNonnegative() then
-- if self._player.cur_hp then
-- -- print(self._player.total_hp)
-- if self._player.total_hp then
-- score = d2ad(self._player.total_hp).."/"..d2ad(self._player.cur_hp)
-- else
score = d2ad(self._player.cur_hp)
--score = d2ad(self._player.cur_hp)
-- end
-- end
--end
end
end
end
if doAnimation then
@ -393,7 +393,9 @@ function M:ScoreAnimation(score)
end
self._list_scoreAnimation.numItems = #imgs
local obj = self._list_scoreAnimation:AddItemFromPool()
--local obj = self._list_scoreAnimation:AddItemFromPool()
local obj = self._list_scoreAnimation:GetFromPool("ui://v0j9abjyuans1b1")
self._list_scoreAnimation:AddChildAt(obj, 0)
local loader = obj:GetChild("n1")
loader.url = symbol

12
lua_probject/extend_project/extend/majiang/100zhang/EXMainView.lua
View File

@ -369,13 +369,13 @@ function M:EventInit()
end
info:UpdateScore()
info._view:GetChild("zhanji").visible = true
local num = data[i].hp_info.total_hp
local num = data[i].hp_info.total_score
if num > 0 then
info._view:GetController("text_color").selectedIndex = 0
info._view:GetChild("text_jifen").text = "+" .. d2ad(num)
info._view:GetChild("text_jifen").text = "+" .. num --d2ad(num)
else
info._view:GetController("text_color").selectedIndex = 1
info._view:GetChild("text_jifen").text = d2ad(num)
info._view:GetChild("text_jifen").text = num --d2ad(num)
end
info._view:GetChild("mask_piao").title = ""
@ -681,13 +681,13 @@ function M:ReloadRoom(bskip)
local head_info = self._player_info[self:GetPos(p.seat)]
head_info:UpdateScore()
head_info._view:GetChild('zhanji').visible = true
local num = p.total_hp or 0
local num = p.total_score or 0
if num > 0 then
head_info._view:GetController('text_color').selectedIndex = 0
head_info._view:GetChild('text_jifen').text = "+" .. d2ad(num)
head_info._view:GetChild('text_jifen').text = "+" .. num --d2ad(num)
else
head_info._view:GetController('text_color').selectedIndex = 1
head_info._view:GetChild('text_jifen').text = d2ad(num)
head_info._view:GetChild('text_jifen').text = num --d2ad(num)
end
if p.seat == room.last_outcard_seat then

12
lua_probject/extend_project/extend/majiang/changsha/EXMainView.lua
View File

@ -346,13 +346,13 @@ function M:EventInit()
end
info:UpdateScore()
info._view:GetChild("zhanji").visible = true
local num = data[i].hp_info.total_hp
local num = data[i].hp_info.total_score
if num > 0 then
info._view:GetController("text_color").selectedIndex = 0
info._view:GetChild("text_jifen").text = "+" .. d2ad(num)
info._view:GetChild("text_jifen").text = "+" .. num --d2ad(num)
else
info._view:GetController("text_color").selectedIndex = 1
info._view:GetChild("text_jifen").text = d2ad(num)
info._view:GetChild("text_jifen").text = num --d2ad(num)
end
info._view:GetChild("mask_piao").title = ""
@ -1054,13 +1054,13 @@ function M:ReloadRoom(bskip)
local info = self._player_card_info[self:GetPos(p.seat)]
local head_info = self._player_info[self:GetPos(p.seat)]
head_info._view:GetChild('zhanji').visible = true
local num = p.total_hp or 0
local num = p.total_score or 0
if num > 0 then
head_info._view:GetController('text_color').selectedIndex = 0
head_info._view:GetChild('text_jifen').text = "+" .. d2ad(num)
head_info._view:GetChild('text_jifen').text = "+" .. num --d2ad(num)
else
head_info._view:GetController('text_color').selectedIndex = 1
head_info._view:GetChild('text_jifen').text = d2ad(num)
head_info._view:GetChild('text_jifen').text = num --d2ad(num)
end
if p.win_count ~= nil and p.win_count >= 3 then

12
lua_probject/extend_project/extend/majiang/chaoshan/EXMainView.lua
View File

@ -369,13 +369,13 @@ function M:EventInit()
end
info:UpdateScore()
info._view:GetChild("zhanji").visible = true
local num = data[i].hp_info.total_hp
local num = data[i].hp_info.total_score
if num > 0 then
info._view:GetController("text_color").selectedIndex = 0
info._view:GetChild("text_jifen").text = "+" .. d2ad(num)
info._view:GetChild("text_jifen").text = "+" .. num --d2ad(num)
else
info._view:GetController("text_color").selectedIndex = 1
info._view:GetChild("text_jifen").text = d2ad(num)
info._view:GetChild("text_jifen").text = num --d2ad(num)
end
info._view:GetChild("mask_piao").title = ""
@ -681,13 +681,13 @@ function M:ReloadRoom(bskip)
local head_info = self._player_info[self:GetPos(p.seat)]
head_info:UpdateScore()
head_info._view:GetChild('zhanji').visible = true
local num = p.total_hp or 0
local num = p.total_score or 0
if num > 0 then
head_info._view:GetController('text_color').selectedIndex = 0
head_info._view:GetChild('text_jifen').text = "+" .. d2ad(num)
head_info._view:GetChild('text_jifen').text = "+" .. num --d2ad(num)
else
head_info._view:GetController('text_color').selectedIndex = 1
head_info._view:GetChild('text_jifen').text = d2ad(num)
head_info._view:GetChild('text_jifen').text = num --d2ad(num)
end
if p.seat == room.last_outcard_seat then

12
lua_probject/extend_project/extend/majiang/chaozhou/EXMainView.lua
View File

@ -379,13 +379,13 @@ function M:EventInit()
end
info:UpdateScore()
info._view:GetChild("zhanji").visible = true
local num = data[i].hp_info.total_hp
local num = data[i].hp_info.total_score
if num > 0 then
info._view:GetController("text_color").selectedIndex = 0
info._view:GetChild("text_jifen").text = "+" .. d2ad(num)
info._view:GetChild("text_jifen").text = "+" .. num --d2ad(num)
else
info._view:GetController("text_color").selectedIndex = 1
info._view:GetChild("text_jifen").text = d2ad(num)
info._view:GetChild("text_jifen").text = num --d2ad(num)
end
info._view:GetChild("mask_piao").title = ""
@ -746,13 +746,13 @@ function M:ReloadRoom(bskip)
local head_info = self._player_info[self:GetPos(p.seat)]
head_info:UpdateScore()
head_info._view:GetChild('zhanji').visible = true
local num = p.total_hp or 0
local num = p.total_score or 0
if num > 0 then
head_info._view:GetController('text_color').selectedIndex = 0
head_info._view:GetChild('text_jifen').text = "+" .. d2ad(num)
head_info._view:GetChild('text_jifen').text = "+" .. num --d2ad(num)
else
head_info._view:GetController('text_color').selectedIndex = 1
head_info._view:GetChild('text_jifen').text = d2ad(num)
head_info._view:GetChild('text_jifen').text = num --d2ad(num)
end
if p.seat == room.last_outcard_seat then

12
lua_probject/extend_project/extend/majiang/chaozhougui/EXMainView.lua
View File

@ -379,13 +379,13 @@ function M:EventInit()
end
info:UpdateScore()
info._view:GetChild("zhanji").visible = true
local num = data[i].hp_info.total_hp
local num = data[i].hp_info.total_score
if num > 0 then
info._view:GetController("text_color").selectedIndex = 0
info._view:GetChild("text_jifen").text = "+" .. d2ad(num)
info._view:GetChild("text_jifen").text = "+" .. num --d2ad(num)
else
info._view:GetController("text_color").selectedIndex = 1
info._view:GetChild("text_jifen").text = d2ad(num)
info._view:GetChild("text_jifen").text = num --d2ad(num)
end
info._view:GetChild("mask_piao").title = ""
@ -746,13 +746,13 @@ function M:ReloadRoom(bskip)
local head_info = self._player_info[self:GetPos(p.seat)]
head_info:UpdateScore()
head_info._view:GetChild('zhanji').visible = true
local num = p.total_hp or 0
local num = p.total_score or 0
if num > 0 then
head_info._view:GetController('text_color').selectedIndex = 0
head_info._view:GetChild('text_jifen').text = "+" .. d2ad(num)
head_info._view:GetChild('text_jifen').text = "+" .. num --d2ad(num)
else
head_info._view:GetController('text_color').selectedIndex = 1
head_info._view:GetChild('text_jifen').text = d2ad(num)
head_info._view:GetChild('text_jifen').text = num --d2ad(num)
end
if p.seat == room.last_outcard_seat then

6
lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua
View File

@ -805,13 +805,13 @@ function M:ReloadRoom(bskip)
local head_info = self._player_info[self:GetPos(p.seat)]
-- head_info:UpdateScore()
head_info._view:GetChild('zhanji').visible = true
local num = p.total_hp or 0
local num = p.total_score or 0
if num > 0 then
head_info._view:GetController('text_color').selectedIndex = 0
head_info._view:GetChild('text_jifen').text = "+" .. d2ad(num)
head_info._view:GetChild('text_jifen').text = "+" .. num --d2ad(num)
else
head_info._view:GetController('text_color').selectedIndex = 1
head_info._view:GetChild('text_jifen').text = d2ad(num)
head_info._view:GetChild('text_jifen').text = num --d2ad(num)
end
if p.seat == room.last_outcard_seat then

6
lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua
View File

@ -273,13 +273,13 @@ function M:EventInit()
end
-- info:UpdateScore()
info._view:GetChild("zhanji").visible = true
local num = data[i].hp_info.total_hp
local num = data[i].hp_info.total_score
if num >= 0 then
info._view:GetController("text_color").selectedIndex = 0
info._view:GetChild("text_jifen").text = "+" .. d2ad(num)
info._view:GetChild("text_jifen").text = "+" .. num --d2ad(num)
else
info._view:GetController("text_color").selectedIndex = 1
info._view:GetChild("text_jifen").text = d2ad(num)
info._view:GetChild("text_jifen").text = num --d2ad(num)
end
info._view:GetChild("mask_piao").title = ""

12
lua_probject/extend_project/extend/majiang/gejiu/EXMainView.lua
View File

@ -370,13 +370,13 @@ function M:EventInit()
end
info:UpdateScore()
info._view:GetChild("zhanji").visible = true
local num = data[i].hp_info.total_hp
local num = data[i].hp_info.total_score
if num > 0 then
info._view:GetController("text_color").selectedIndex = 0
info._view:GetChild("text_jifen").text = "+" .. d2ad(num)
info._view:GetChild("text_jifen").text = "+" .. num --d2ad(num)
else
info._view:GetController("text_color").selectedIndex = 1
info._view:GetChild("text_jifen").text = d2ad(num)
info._view:GetChild("text_jifen").text = num --d2ad(num)
end
info._view:GetChild("mask_piao").title = ""
@ -724,13 +724,13 @@ function M:ReloadRoom(bskip)
local head_info = self._player_info[self:GetPos(p.seat)]
head_info:UpdateScore()
head_info._view:GetChild('zhanji').visible = true
local num = p.total_hp or 0
local num = p.total_score or 0
if num > 0 then
head_info._view:GetController('text_color').selectedIndex = 0
head_info._view:GetChild('text_jifen').text = "+" .. d2ad(num)
head_info._view:GetChild('text_jifen').text = "+" .. num --d2ad(num)
else
head_info._view:GetController('text_color').selectedIndex = 1
head_info._view:GetChild('text_jifen').text = d2ad(num)
head_info._view:GetChild('text_jifen').text = num --d2ad(num)
end
if p.seat == room.last_outcard_seat then

12
lua_probject/extend_project/extend/majiang/hongzhong/EXMainView.lua
View File

@ -288,13 +288,13 @@ function M:EventInit()
end
info:UpdateScore()
info._view:GetChild("zhanji").visible = true
local num = data[i].hp_info.total_hp
local num = data[i].hp_info.total_score
if num > 0 then
info._view:GetController("text_color").selectedIndex = 0
info._view:GetChild("text_jifen").text = "+" .. d2ad(num)
info._view:GetChild("text_jifen").text = "+" .. num --d2ad(num)
else
info._view:GetController("text_color").selectedIndex = 1
info._view:GetChild("text_jifen").text = d2ad(num)
info._view:GetChild("text_jifen").text = num --d2ad(num)
end
info._view:GetChild("mask_piao").title = ""
@ -657,13 +657,13 @@ function M:ReloadRoom(bskip)
local head_info = self._player_info[self:GetPos(p.seat)]
head_info:UpdateScore()
head_info._view:GetChild('zhanji').visible = true
local num = p.total_hp or 0
local num = p.total_score or 0
if num > 0 then
head_info._view:GetController('text_color').selectedIndex = 0
head_info._view:GetChild('text_jifen').text = "+" .. d2ad(num)
head_info._view:GetChild('text_jifen').text = "+" .. num --d2ad(num)
else
head_info._view:GetController('text_color').selectedIndex = 1
head_info._view:GetChild('text_jifen').text = d2ad(num)
head_info._view:GetChild('text_jifen').text = num --d2ad(num)
end
if p.seat == room.last_outcard_seat then

3
lua_probject/extend_project/extend/majiang/jinxi/EXGameController.lua
View File

@ -316,12 +316,13 @@ function M:OnEventHu(evt_data)
local lose_p = self._room:GetPlayerBySeat(evt_data["from_seat"])
local win_card = evt_data["win_card"]
local win_list = evt_data["win_list"]
local scoreData = evt_data["result"].info_list
self._cacheEvent:Enqueue(function()
win_p.card_list = cards
table.sort(win_p.card_list, self.HandCardSortAndJing)
DispatchEvent(self._dispatcher, TX_GameEvent.ZPHuCard, evt_data["seat"], evt_data["from_seat"], win_card, cards,
win_list)
win_list, scoreData)
end)
end

6
lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua
View File

@ -899,13 +899,13 @@ function M:ReloadRoom(bskip)
local head_info = self._player_info[self:GetPos(p.seat)]
-- head_info:UpdateScore()
head_info._view:GetChild('zhanji').visible = true
local num = p.total_hp or 0
local num = p.total_score or 0
if num > 0 then
head_info._view:GetController('text_color').selectedIndex = 0
head_info._view:GetChild('text_jifen').text = "+" .. d2ad(num)
head_info._view:GetChild('text_jifen').text = "+" .. num --d2ad(num)
else
head_info._view:GetController('text_color').selectedIndex = 1
head_info._view:GetChild('text_jifen').text = d2ad(num)
head_info._view:GetChild('text_jifen').text = num --d2ad(num)
end
if p.seat == room.last_outcard_seat then

6
lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua
View File

@ -272,13 +272,13 @@ function M:EventInit()
end
-- info:UpdateScore()
info._view:GetChild("zhanji").visible = true
local num = data[i].hp_info.total_hp
local num = data[i].hp_info.total_score
if num >= 0 then
info._view:GetController("text_color").selectedIndex = 0
info._view:GetChild("text_jifen").text = "+" .. d2ad(num)
info._view:GetChild("text_jifen").text = "+" .. num --d2ad(num)
else
info._view:GetController("text_color").selectedIndex = 1
info._view:GetChild("text_jifen").text = d2ad(num)
info._view:GetChild("text_jifen").text = num --d2ad(num)
end
info._view:GetChild("mask_piao").title = ""

3
lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua
View File

@ -317,12 +317,13 @@ function M:OnEventHu(evt_data)
local lose_p = self._room:GetPlayerBySeat(evt_data["from_seat"])
local win_card = evt_data["win_card"]
local win_list = evt_data["win_list"]
local scoreData = evt_data["result"].info_list
self._cacheEvent:Enqueue(function()
win_p.card_list = cards
table.sort(win_p.card_list, self.HandCardSortAndJing)
DispatchEvent(self._dispatcher, TX_GameEvent.ZPHuCard, evt_data["seat"], evt_data["from_seat"], win_card, cards,
win_list)
win_list, scoreData)
end)
end

6
lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua
View File

@ -901,13 +901,13 @@ function M:ReloadRoom(bskip)
local head_info = self._player_info[self:GetPos(p.seat)]
-- head_info:UpdateScore()
head_info._view:GetChild('zhanji').visible = true
local num = p.total_hp or 0
local num = p.total_score or 0
if num > 0 then
head_info._view:GetController('text_color').selectedIndex = 0
head_info._view:GetChild('text_jifen').text = "+" .. d2ad(num)
head_info._view:GetChild('text_jifen').text = "+" .. num --d2ad(num)
else
head_info._view:GetController('text_color').selectedIndex = 1
head_info._view:GetChild('text_jifen').text = d2ad(num)
head_info._view:GetChild('text_jifen').text = num --d2ad(num)
end
if p.seat == room.last_outcard_seat then

6
lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua
View File

@ -297,13 +297,13 @@ function M:EventInit()
end
-- info:UpdateScore()
info._view:GetChild("zhanji").visible = true
local num = data[i].hp_info.total_hp
local num = data[i].hp_info.total_score
if num >= 0 then
info._view:GetController("text_color").selectedIndex = 0
info._view:GetChild("text_jifen").text = "+" .. d2ad(num)
info._view:GetChild("text_jifen").text = "+" .. num --d2ad(num)
else
info._view:GetController("text_color").selectedIndex = 1
info._view:GetChild("text_jifen").text = d2ad(num)
info._view:GetChild("text_jifen").text = num --d2ad(num)
end
info._view:GetChild("mask_piao").title = ""

3
lua_probject/extend_project/extend/majiang/nancheng/EXGameController.lua
View File

@ -316,12 +316,13 @@ function M:OnEventHu(evt_data)
local lose_p = self._room:GetPlayerBySeat(evt_data["from_seat"])
local win_card = evt_data["win_card"]
local win_list = evt_data["win_list"]
local scoreData = evt_data["result"].info_list
self._cacheEvent:Enqueue(function()
win_p.card_list = cards
table.sort(win_p.card_list, self.HandCardSortAndJing)
DispatchEvent(self._dispatcher, TX_GameEvent.ZPHuCard, evt_data["seat"], evt_data["from_seat"], win_card, cards,
win_list)
win_list, scoreData)
end)
end

6
lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua
View File

@ -900,13 +900,13 @@ function M:ReloadRoom(bskip)
local head_info = self._player_info[self:GetPos(p.seat)]
-- head_info:UpdateScore()
head_info._view:GetChild('zhanji').visible = true
local num = p.total_hp or 0
local num = p.total_score or 0
if num > 0 then
head_info._view:GetController('text_color').selectedIndex = 0
head_info._view:GetChild('text_jifen').text = "+" .. d2ad(num)
head_info._view:GetChild('text_jifen').text = "+" .. num --d2ad(num)
else
head_info._view:GetController('text_color').selectedIndex = 1
head_info._view:GetChild('text_jifen').text = d2ad(num)
head_info._view:GetChild('text_jifen').text = num --d2ad(num)
end
if p.seat == room.last_outcard_seat then

6
lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua
View File

@ -272,13 +272,13 @@ function M:EventInit()
end
-- info:UpdateScore()
info._view:GetChild("zhanji").visible = true
local num = data[i].hp_info.total_hp
local num = data[i].hp_info.total_score
if num >= 0 then
info._view:GetController("text_color").selectedIndex = 0
info._view:GetChild("text_jifen").text = "+" .. d2ad(num)
info._view:GetChild("text_jifen").text = "+" .. num --d2ad(num)
else
info._view:GetController("text_color").selectedIndex = 1
info._view:GetChild("text_jifen").text = d2ad(num)
info._view:GetChild("text_jifen").text = num --d2ad(num)
end
info._view:GetChild("mask_piao").title = ""

12
lua_probject/extend_project/extend/majiang/qizhiba/EXMainView.lua
View File

@ -371,13 +371,13 @@ function M:EventInit()
end
info:UpdateScore()
info._view:GetChild("zhanji").visible = true
local num = data[i].hp_info.total_hp
local num = data[i].hp_info.total_score
if num > 0 then
info._view:GetController("text_color").selectedIndex = 0
info._view:GetChild("text_jifen").text = "+" .. d2ad(num)
info._view:GetChild("text_jifen").text = "+" .. num --d2ad(num)
else
info._view:GetController("text_color").selectedIndex = 1
info._view:GetChild("text_jifen").text = d2ad(num)
info._view:GetChild("text_jifen").text = num --d2ad(num)
end
info._view:GetChild("mask_piao").title = ""
@ -737,13 +737,13 @@ function M:ReloadRoom(bskip)
local head_info = self._player_info[self:GetPos(p.seat)]
head_info:UpdateScore()
head_info._view:GetChild('zhanji').visible = true
local num = p.total_hp or 0
local num = p.total_score or 0
if num > 0 then
head_info._view:GetController('text_color').selectedIndex = 0
head_info._view:GetChild('text_jifen').text = "+" .. d2ad(num)
head_info._view:GetChild('text_jifen').text = "+" .. num --d2ad(num)
else
head_info._view:GetController('text_color').selectedIndex = 1
head_info._view:GetChild('text_jifen').text = d2ad(num)
head_info._view:GetChild('text_jifen').text = num --d2ad(num)
end
if p.seat == room.last_outcard_seat then

12
lua_probject/extend_project/extend/majiang/tuidaohu/EXMainView.lua
View File

@ -369,13 +369,13 @@ function M:EventInit()
end
info:UpdateScore()
info._view:GetChild("zhanji").visible = true
local num = data[i].hp_info.total_hp
local num = data[i].hp_info.total_score
if num > 0 then
info._view:GetController("text_color").selectedIndex = 0
info._view:GetChild("text_jifen").text = "+" .. d2ad(num)
info._view:GetChild("text_jifen").text = "+" .. num --d2ad(num)
else
info._view:GetController("text_color").selectedIndex = 1
info._view:GetChild("text_jifen").text = d2ad(num)
info._view:GetChild("text_jifen").text = num --d2ad(num)
end
info._view:GetChild("mask_piao").title = ""
@ -681,13 +681,13 @@ function M:ReloadRoom(bskip)
local head_info = self._player_info[self:GetPos(p.seat)]
head_info:UpdateScore()
head_info._view:GetChild('zhanji').visible = true
local num = p.total_hp or 0
local num = p.total_score or 0
if num > 0 then
head_info._view:GetController('text_color').selectedIndex = 0
head_info._view:GetChild('text_jifen').text = "+" .. d2ad(num)
head_info._view:GetChild('text_jifen').text = "+" .. num --d2ad(num)
else
head_info._view:GetController('text_color').selectedIndex = 1
head_info._view:GetChild('text_jifen').text = d2ad(num)
head_info._view:GetChild('text_jifen').text = num --d2ad(num)
end
if p.seat == room.last_outcard_seat then

12
lua_probject/extend_project/extend/majiang/zhuanzhuan/EXMainView.lua
View File

@ -283,13 +283,13 @@ function M:EventInit()
end
info:UpdateScore()
info._view:GetChild("zhanji").visible = true
local num = data[i].hp_info.total_hp
local num = data[i].hp_info.total_score
if num > 0 then
info._view:GetController("text_color").selectedIndex = 0
info._view:GetChild("text_jifen").text = "+" .. d2ad(num)
info._view:GetChild("text_jifen").text = "+" .. num --d2ad(num)
else
info._view:GetController("text_color").selectedIndex = 1
info._view:GetChild("text_jifen").text = d2ad(num)
info._view:GetChild("text_jifen").text = num --d2ad(num)
end
info._view:GetChild("mask_piao").title = ""
@ -641,13 +641,13 @@ function M:ReloadRoom(bskip)
local head_info = self._player_info[self:GetPos(p.seat)]
head_info:UpdateScore()
head_info._view:GetChild('zhanji').visible = true
local num = p.total_hp or 0
local num = p.total_score or 0
if num > 0 then
head_info._view:GetController('text_color').selectedIndex = 0
head_info._view:GetChild('text_jifen').text = "+" .. d2ad(num)
head_info._view:GetChild('text_jifen').text = "+" .. num --d2ad(num)
else
head_info._view:GetController('text_color').selectedIndex = 1
head_info._view:GetChild('text_jifen').text = d2ad(num)
head_info._view:GetChild('text_jifen').text = num --d2ad(num)
end
if p.seat == room.last_outcard_seat then

14
lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua
View File

@ -465,11 +465,21 @@ function M:ResetCardType()
end
function M:ShowHand(cards)
self._view_handCardList:RemoveChildren()
local list = self._view_handCardList
local cardType = self._viewText_cardInfo["Out_Card"]
if self._viewText_cardInfo['IS_SIDE'] == "true" then
list = self._view:GetChild('List_HandCard2')
cardType = self._viewText_cardInfo["Hand_Card"]
end
--list:RemoveChildren()
for _, card in pairs(cards) do
if self.winCard ~= card then
local obj = self._view_handCardList:AddItemFromPool()
obj:GetChild("icon").url = 'ui://Main_Majiang/' .. self._viewText_cardInfo['Out_Card'] .. card
local obj = list:AddItemFromPool()
obj:GetChild("icon").url = 'ui://Main_Majiang/' .. cardType .. card
end
end
end

4
wb_new_ui/assets/Lobby/Main_New.xml
View File

@ -72,10 +72,10 @@
<group id="n183_isi5" name="menu_center" xy="301,225" size="1760,790" advanced="true">
<relation target="" sidePair="center-center"/>
</group>
<component id="n131_ozgf" name="com_message" src="ozgfcks" fileName="component/notice_old/Cgm_message.xml" xy="334,129" visible="false">
<component id="n131_ozgf" name="com_message" src="ozgfcks" fileName="component/notice_old/Cgm_message.xml" xy="733,130" size="1093,57" visible="false">
<relation target="" sidePair="center-center"/>
</component>
<component id="n196_tme1" name="c_message" src="tme17cp7" fileName="component/Main/Component/notice/c_message.xml" xy="711,142">
<component id="n196_tme1" name="c_message" src="tme17cp7" fileName="component/Main/Component/notice/c_message.xml" xy="733,130" size="1093,57">
<relation target="" sidePair="center-center,top-top%"/>
</component>
<component id="n129_naup" name="n129" src="naupl7" fileName="component/share/btn_mask_share.xml" xy="62,1709" size="2532,1170" group="n130_naup">

4
wb_new_ui/assets/Lobby/component/Main/Component/notice/c_message.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="1093,57">
<component size="1093,57" overflow="hidden">
<displayList>
<graph id="n2_tme1" name="message" xy="175,9" size="759,42" visible="false" touchable="false" type="rect"/>
<image id="n0_tme1" name="bg" src="jrro7cyg" fileName="component/Main/Image/paomadeng.png" xy="0,0"/>
<text id="n1_tme1" name="text" xy="175,4" size="759,49" font="ui://27vd145bh35o7ilb" fontSize="36" color="#ffffff" vAlign="middle" leading="2" autoSize="none" text="tishihtishithi"/>
<graph id="n2_tme1" name="message" xy="175,9" size="759,42" visible="false" touchable="false" type="rect"/>
</displayList>
</component>

3
wb_new_ui/assets/Lobby/component/notice_old/Cgm_message.xml
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="1864,84">
<component size="1864,84" overflow="hidden" mask="n5_smbw">
<displayList>
<graph id="n5_smbw" name="n5" xy="0,0" size="1864,84" visible="false" type="rect"/>
<image id="n0" name="n0" src="kikc7d67" fileName="component/notice_old/result_tips_bg.png" xy="0,0" size="1864,84" aspect="true">
<relation target="" sidePair="width-width,height-height"/>
</image>

BIN
wb_new_ui/assets/Main_Majiang/Main_new/Image/4918b5270e436c54b44d48f0bb79114 3(1).png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 MiB

6
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_E.xml
View File

@ -13,7 +13,7 @@
<item/>
<item/>
</list>
<list id="n53_j6yy" name="List_OutCard" xy="1220,192" pivot="0.5,0.5" size="935,699" skew="180,180" touchable="false" pageController="ting" layout="flow_vt" selectionMode="none" lineGap="-20" colGap="-7" defaultItem="ui://v0j9abjygi9910o" renderOrder="descent" autoClearItems="true">
<list id="n53_j6yy" name="List_OutCard" xy="1220,192" pivot="0.5,0.5" size="935,699" skew="180,180" touchable="false" pageController="ting" layout="flow_vt" selectionMode="none" lineGap="-20" colGap="-7" defaultItem="ui://v0j9abjygi9910o" autoItemSize="true" renderOrder="descent" autoClearItems="true">
<item/>
<item/>
<item/>
@ -56,7 +56,7 @@
<item/>
<item/>
</list>
<list id="n56_j6yy" name="List_HandCard2" xy="2171,197" size="101,711" touchable="false" selectionMode="none" lineGap="-26" defaultItem="ui://v0j9abjylj2n19b" autoItemSize="false" align="center" autoClearItems="true" scrollItemToViewOnClick="false">
<list id="n56_j6yy" name="List_HandCard2" xy="2171,197" size="101,711" touchable="false" selectionMode="none" lineGap="-26" defaultItem="ui://v0j9abjylj2n19b" align="center" vAlign="middle" autoClearItems="true" scrollItemToViewOnClick="false">
<relation target="" sidePair="width-width,height-height"/>
<item/>
<item/>
@ -86,6 +86,6 @@
<gearDisplay controller="ting" pages="1"/>
<gearXY controller="3d" pages="0" values="-1945,-1060" default="616,100"/>
</image>
<text id="n66_ogwn" name="Text_CardInfo" xy="-2053,594" size="813,973" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;FZ_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;b203_&quot;,&#xA;&quot;Get_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;100&quot;,&#xA;&quot;Pos_Y&quot;:28,&#xA;&quot;Order&quot;:&quot;desc&quot;&#xA;}"/>
<text id="n66_ogwn" name="Text_CardInfo" xy="-2053,594" size="813,973" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;FZ_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;b203_&quot;,&#xA;&quot;Get_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;100&quot;,&#xA;&quot;Pos_Y&quot;:28,&#xA;&quot;Order&quot;:&quot;desc&quot;,&#xA;&quot;IS_SIDE&quot;:&quot;true&quot;&#xA;}"/>
</displayList>
</component>

14
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_N.xml
View File

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="2532,1170" opaque="false" initName="player_card_info" designImage="ui://v0j9abjyj6yy1fw" designImageAlpha="0">
<component size="2532,1170" opaque="false" initName="player_card_info" designImage="ui://v0j9abjyj6yy1fw" designImageAlpha="100">
<controller name="3d" pages="0,,1," selected="0"/>
<controller name="ting" pages="0,,1," selected="0"/>
<controller name="site" pages="0,2-1,1,2-2" selected="0"/>
<controller name="getCard" pages="0,,1," selected="0"/>
<controller name="cStie" exported="true" pages="0,,1,,2," selected="0">
<controller name="cStie" exported="true" pages="0,,1,,2," selected="2">
<remark page="0" value="2人"/>
<remark page="1" value="3人"/>
<remark page="2" value="4人"/>
</controller>
<displayList>
<list id="n37_gi99" name="List_HandCard" xy="687,31" size="1076,99" touchable="false" layout="row" selectionMode="none" colGap="-9" defaultItem="ui://v0j9abjygi9910q" autoItemSize="false" autoClearItems="true">
<list id="n37_gi99" name="List_HandCard" xy="687,31" size="1076,99" touchable="false" layout="row" selectionMode="none" colGap="-9" defaultItem="ui://v0j9abjygi9910q" autoClearItems="true">
<item/>
<item/>
<item/>
@ -25,14 +25,14 @@
<item/>
<item/>
</list>
<list id="n38_gi99" name="List_FZ" xy="454,18" size="1329,103" touchable="false" layout="row" selectionMode="none" colGap="7" defaultItem="ui://v0j9abjygi9910r" autoItemSize="false" align="right" vAlign="bottom" autoClearItems="true">
<list id="n38_gi99" name="List_FZ" xy="454,18" size="1329,103" touchable="false" layout="row" selectionMode="none" colGap="7" defaultItem="ui://v0j9abjygi9910r" align="right" vAlign="bottom" autoClearItems="true">
<item/>
<item/>
<item/>
<item/>
</list>
<list id="n41_gi99" name="List_OutCard" xy="1314,401" pivot="0.5,0.5" anchor="true" size="2097,502" skew="0,180" touchable="false" pageController="ting" layout="flow_hz" selectionMode="none" margin="40,0,0,0" lineGap="-20" colGap="-7" defaultItem="ui://v0j9abjygi9910t" autoClearItems="true">
<gearXY controller="cStie" pages="0,1,2" values="1314,401|299,102|832,149"/>
<list id="n41_gi99" name="List_OutCard" xy="1275,400" pivot="0.5,0.5" anchor="true" size="887,502" skew="0,180" touchable="false" pageController="ting" layout="flow_hz" selectionMode="none" margin="40,0,0,0" lineGap="-20" colGap="-7" defaultItem="ui://v0j9abjygi9910t" autoItemSize="true" autoClearItems="true">
<gearXY controller="cStie" pages="0,1,2" values="1314,401|920,355|1275,400"/>
<gearSize controller="cStie" pages="1,2" values="1239,502,1,1|887,502,1,1" default="2097,502,1,1"/>
<item/>
<item/>
@ -67,7 +67,7 @@
<gearXY controller="3d" pages="0,1" values="-2500,-1150|517,-145"/>
<gearSize controller="3d" pages="0,1" values="2022,111,1,1|300,117,1,1"/>
</component>
<component id="n45_ogwn" name="area_handcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-3155,-1198" pivot="0.5,0.5" size="2124,249" aspect="true">
<component id="n45_ogwn" name="area_handcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-3484,-1026" pivot="0.5,0.5" size="2124,249" aspect="true">
<relation target="n46_ogwn" sidePair="leftext-right"/>
</component>
<component id="n46_ogwn" name="area_fz_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-2072,-1236" size="11,249"/>

4
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_S.xml
View File

@ -20,7 +20,7 @@
<item/>
<item/>
</list>
<list id="n32_kxhm" name="List_HandCard" xy="37,975" size="2234,191" layout="row" colGap="-4" defaultItem="ui://v0j9abjygi9910i" autoItemSize="false" align="right" autoClearItems="true">
<list id="n32_kxhm" name="List_HandCard" xy="37,975" size="2234,191" layout="row" colGap="-4" defaultItem="ui://v0j9abjygi9910i" align="right" autoClearItems="true">
<item/>
<item/>
<item/>
@ -35,7 +35,7 @@
<item/>
<item/>
</list>
<list id="n35_gi99" name="List_OutCard" xy="287,606" pivot="0.5,0.5" size="2097,312" skew="180,0" pageController="ting" layout="flow_hz" selectionMode="none" scroll="horizontal" margin="0,40,0,0" lineGap="-20" colGap="-7" defaultItem="ui://v0j9abjygi9910j" renderOrder="descent" autoClearItems="true">
<list id="n35_gi99" name="List_OutCard" xy="287,606" pivot="0.5,0.5" size="2097,312" skew="180,0" pageController="ting" layout="flow_hz" selectionMode="none" scroll="horizontal" margin="0,40,0,0" lineGap="-20" colGap="-7" defaultItem="ui://v0j9abjygi9910j" autoItemSize="true" renderOrder="descent" autoClearItems="true">
<gearXY controller="cStie" pages="1,2" values="322,609|836,608" default="287,606"/>
<gearSize controller="cStie" pages="1,2" values="1217,312,1,1|887,312,1,1" default="2097,312,1,1"/>
<item/>

6
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_W.xml
View File

@ -5,7 +5,7 @@
<controller name="site" pages="0,2-1,1,2-2" selected="0"/>
<controller name="getCard" pages="0,,1," selected="0"/>
<displayList>
<list id="n52_j6yy" name="List_HandCard" xy="288,192" pivot="1,1" size="76,675" touchable="false" selectionMode="none" lineGap="-69" defaultItem="ui://v0j9abjygi9910w" autoItemSize="false" align="center" vAlign="bottom" autoClearItems="true">
<list id="n52_j6yy" name="List_HandCard" xy="288,192" pivot="1,1" size="76,675" touchable="false" selectionMode="none" lineGap="-69" defaultItem="ui://v0j9abjygi9910w" align="center" vAlign="bottom" autoClearItems="true">
<item/>
<item/>
<item/>
@ -25,7 +25,7 @@
<item/>
<item/>
</list>
<list id="n54_j6yy" name="List_OutCard" xy="406,192" pivot="0.5,0.5" size="935,699" touchable="false" pageController="ting" layout="flow_vt" selectionMode="none" lineGap="-20" colGap="-7" defaultItem="ui://v0j9abjygi9910x" autoClearItems="true">
<list id="n54_j6yy" name="List_OutCard" xy="406,192" pivot="0.5,0.5" size="935,699" touchable="false" pageController="ting" layout="flow_vt" selectionMode="none" lineGap="-20" colGap="-7" defaultItem="ui://v0j9abjygi9910x" autoItemSize="true" autoClearItems="true">
<item/>
<item/>
<item/>
@ -84,6 +84,6 @@
<gearDisplay controller="ting" pages="1"/>
<gearXY controller="3d" pages="0" values="-2501,-1505" default="616,100"/>
</image>
<text id="n65_ogwn" name="Text_CardInfo" xy="-3046,456" size="813,973" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;FZ_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;b203_&quot;,&#xA;&quot;Get_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;100&quot;,&#xA;&quot;Pos_Y&quot;:-28,&#xA;&quot;Order&quot;:&quot;asc&quot;&#xA;}"/>
<text id="n65_ogwn" name="Text_CardInfo" xy="-3046,456" size="813,973" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;FZ_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;b203_&quot;,&#xA;&quot;Get_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;100&quot;,&#xA;&quot;Pos_Y&quot;:-28,&#xA;&quot;Order&quot;:&quot;asc&quot;,&#xA;&quot;IS_SIDE&quot;:&quot;true&quot;&#xA;}"/>
</displayList>
</component>

8
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="2532,1170" pivot="0.5,0.5" designImage="ui://v0j9abjyj6yy1fw" designImageAlpha="0">
<controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="1"/>
<controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="0"/>
<controller name="sdk" pages="0,,1," selected="0"/>
<controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
<controller name="3d" pages="0,,1," selected="0"/>
@ -28,7 +28,7 @@
<gearDisplay controller="state" pages="0,2"/>
<relation target="" sidePair="center-center,bottom-bottom"/>
</component>
<component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="87,788" size="153,132">
<component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="730,-59" size="153,132">
<gearDisplay controller="state" pages="1,3,4"/>
<gearXY controller="state" pages="1,3,4" values="87,788|64,-191|62,-201" default="730,-59"/>
<relation target="n118_pkx5" sidePair="right-left,top-top"/>
@ -37,11 +37,12 @@
<gearDisplay controller="state" pages="0,2"/>
<relation target="" sidePair="center-center,top-top"/>
</component>
<component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="1865,29" size="153,132">
<component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="2701,486" size="153,132">
<gearDisplay controller="state" pages="1,3,4"/>
<gearXY controller="state" pages="0,1,3,4" values="2701,486|1865,29|2555,-6|2567,10" default="2007,876"/>
<relation target="n155_gi99" sidePair="left-right,top-top"/>
</component>
<component id="n206_kikc" name="com_notice" src="kikc1g4" fileName="Main_new/com_notice.xml" xy="567,124"/>
<component id="n81_l2u4" name="cardbox" src="gq7m5e" fileName="Main_style_2/turn/Gcm_box_4.xml" xy="1281,-296" pivot="0.5,0.5">
<gearDisplay controller="state" pages="1,3"/>
<gearXY controller="3d" pages="0,1" values="1281,-296|603,254"/>
@ -283,6 +284,5 @@
<movieclip id="n203_whhc" name="effect_ZiMo" src="whhc1fo" fileName="Main_new/Main/Effect_ZiMo.jta" xy="1266,-574" pivot="0.5,0.5" anchor="true">
<gearDisplay controller="cHuCardEffect" pages="1"/>
</movieclip>
<component id="n206_kikc" name="com_notice" src="kikc1g4" fileName="Main_new/com_notice.xml" xy="567,124"/>
</displayList>
</component>

2
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml
View File

@ -45,6 +45,7 @@
<component id="n152_kxhm" name="player_info3_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1865,29" size="153,132">
<gearDisplay controller="state" pages="1,3,4"/>
</component>
<component id="n294_kikc" name="com_notice" src="kikc1g4" fileName="Main_new/com_notice.xml" xy="567,124"/>
<component id="n219_ogwn" name="cardbox" src="gq7m5e" fileName="Main_style_2/turn/Gcm_box_4.xml" xy="1281,-296" pivot="0.5,0.5">
<gearDisplay controller="state" pages="1,3"/>
<gearXY controller="3d" pages="0,1" values="1281,-296|603,254"/>
@ -284,6 +285,5 @@
<movieclip id="n293_ogwn" name="effect_ZiMo" src="whhc1fo" fileName="Main_new/Main/Effect_ZiMo.jta" xy="1266,-574" pivot="0.5,0.5" anchor="true">
<gearDisplay controller="cHuCardEffect" pages="1"/>
</movieclip>
<component id="n294_kikc" name="com_notice" src="kikc1g4" fileName="Main_new/com_notice.xml" xy="567,124"/>
</displayList>
</component>

10
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml
View File

@ -15,16 +15,16 @@
<component id="n213_hyws" name="com_logo" src="o4nh1ei" fileName="Main_new/Component/com_logo.xml" xy="1209,328" size="435,73">
<relation target="" sidePair="center-center,middle-middle"/>
</component>
<component id="n224_ogwn" name="player_card_info2" src="j6yy1fu" fileName="Main_new/Main_new_2/Player_card_info_E.xml" xy="0,0">
<component id="n224_ogwn" name="player_card_info2" src="j6yy1fu" fileName="Main_new/Main_new_2/Player_card_info_E.xml" xy="0,0" size="2532,1170">
<gearDisplay controller="state" pages="1,3,5"/>
</component>
<component id="n225_ogwn" name="player_card_info3" src="inqx13x" fileName="Main_new/Main_new_2/Player_card_info_N.xml" xy="0,0" controller="cStie,2">
<component id="n225_ogwn" name="player_card_info3" src="inqx13x" fileName="Main_new/Main_new_2/Player_card_info_N.xml" xy="0,0" size="2532,1170" controller="cStie,2">
<gearDisplay controller="state" pages="1,3,5"/>
</component>
<component id="n227_ogwn" name="player_card_info4" src="j6yy1fv" fileName="Main_new/Main_new_2/Player_card_info_W.xml" xy="0,0">
<component id="n227_ogwn" name="player_card_info4" src="j6yy1fv" fileName="Main_new/Main_new_2/Player_card_info_W.xml" xy="0,0" size="2532,1170">
<gearDisplay controller="state" pages="1,3,5"/>
</component>
<component id="n226_ogwn" name="player_card_info1" src="inqx13w" fileName="Main_new/Main_new_2/Player_card_info_S.xml" xy="0,0" controller="cStie,2">
<component id="n226_ogwn" name="player_card_info1" src="inqx13w" fileName="Main_new/Main_new_2/Player_card_info_S.xml" xy="0,0" size="2532,1170" controller="cStie,2">
<gearDisplay controller="state" pages="1,3,5"/>
</component>
<component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,909" size="153,132">
@ -55,6 +55,7 @@
<component id="n153_kxhm" name="player_info4_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="91,521" size="153,132">
<gearDisplay controller="state" pages="1,3,5"/>
</component>
<component id="n371_kikc" name="com_notice" src="kikc1g4" fileName="Main_new/com_notice.xml" xy="567,124"/>
<component id="n81_l2u4" name="cardbox" src="gq7m5e" fileName="Main_style_2/turn/Gcm_box_4.xml" xy="1278,-294" pivot="0.5,0.5">
<gearDisplay controller="state" pages="1,3"/>
<gearXY controller="3d" pages="0,1" values="1278,-294|603,254"/>
@ -293,6 +294,5 @@
<group id="n370_ogwn" name="n370" xy="-143,-1398" size="2592,863" advanced="true">
<relation target="" sidePair="center-center,top-top"/>
</group>
<component id="n371_kikc" name="com_notice" src="kikc1g4" fileName="Main_new/com_notice.xml" xy="567,124"/>
</displayList>
</component>

1
wb_new_ui/assets/Main_Majiang/package.xml
View File

@ -1539,6 +1539,7 @@
<image id="kikc1g3" name="Rectangle 54(1).png" path="/component/notice_old/"/>
<component id="kikc1g4" name="com_notice.xml" path="/Main_new/"/>
<image id="kikc1g5" name="result_tips_bg.png" path="/component/notice_old/"/>
<image id="smbw1g6" name="4918b5270e436c54b44d48f0bb79114 3(1).png" path="/Main_new/Image/"/>
</resources>
<publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/>
</packageDescription>

BIN
wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes
View File

Binary file not shown.