hengyang
/
hengyang_client
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

改了一大推

master
DESKTOP-7R8JEQQ\k 2025-07-27 00:05:46 +08:00
parent 9ec586442d
commit 31f8424637
41 changed files with 230 additions and 142 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

@ -21,6 +21,7 @@ GroupMgrEvent = {
Onpush_assistant = "Onpush_assistant",
OnFamilyReflash = "OnFamilyReflash",
OnFamilyRoomReflash = "OnFamilyRoomReflash",
OnFamilyMemberOut = "OnFamilyMemberOut",
}
GroupMgrController = {
@ -62,6 +63,7 @@ function GroupMgrController.new()
self._eventmap[Protocol.FGMGR_EVT_Member_State] = self.FG_Data_Member_State
self._eventmap[Protocol.FGMGR_EVT_Push_Assistant] = self.OnEVT_Push_Assistant
self._eventmap[Protocol.WEB_FG_REFLASH] = self.FG_Data_Family_Reflash
self._eventmap[Protocol.WEB_FG_MEMBER_OUT] = self.OnMemberOut
-- self:connect(callback)
return self
end
@ -154,6 +156,7 @@ function M:connect(host, groupId, callback)
group.ban_chat2 = res.Data.ban_chat2
group.isvip = res.Data.isvip
group.isWatch = res.Data.isWatch
group.joinsData = {}
else
self.code = SocketCode.ExceptionOnConnect
_mgr_client:destroy()
@ -482,6 +485,12 @@ function M:FG_Data_Family_Reflash(evt_data)
DispatchEvent(self._dispatcher, GroupMgrEvent.OnFamilyReflash, evt_data)
end
function M:OnMemberOut(evt_data)
print("收到成员退出推送")
pt(evt_data)
DispatchEvent(self._dispatcher, GroupMgrEvent.OnFamilyMemberOut, evt_data)
end
function M:PopEvent()
local _cacheEvent = self._cacheEvent
if (_cacheEvent:Count() > 0) then

3
lua_probject/base_project/Game/Protocol.lua
View File

@ -284,6 +284,9 @@ Protocol = {
-- 家族界面刷新推送
WEB_FG_REFLASH = "11111",
-- 成员退出
WEB_FG_MEMBER_OUT = "13008",
-- 获得申请列表的数量
WEB_FG_APPLYCOUNT = "group/request_apply_count",
-------------- group-log---------------------

22
lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua
View File

@ -26,9 +26,22 @@ function FamilyAuditNumber.new(root)
setmetatable(M, { __index = root })
local self = setmetatable({}, { __index = M })
local list = self._view:GetChild('list_auditNumberList')
--list:RemoveChildrenToPool()
--list:SetVirtual()
list.itemRenderer = function(index, obj)
AddItem(self, index, obj)
end
return self
end
function M:Reflash()
local list = self._view:GetChild('list_auditNumberList')
local group = DataManager.groups:get(self._group.id)
list.numItems = #group.joinsData
end
function M:Show()
local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_GroupJoins(self._group.id, function(res)
@ -38,14 +51,7 @@ function M:Show()
else
--self.data[self._group.id] = res.Data.joins
self.familyType.selectedIndex = 6
local list = self._view:GetChild('list_auditNumberList')
--list:RemoveChildrenToPool()
--list:SetVirtual()
list.itemRenderer = function(index, obj)
AddItem(self, index, obj)
end
local group = DataManager.groups:get(self._group.id)
list.numItems = #group.joinsData
self:Reflash()
end
end)
end

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

@ -29,7 +29,7 @@ function FamilyEventView.new(root)
mgr_ctr:AddEventListener(GroupMgrEvent.OnMemberState, handler(self, self._evtOnMemberState))
mgr_ctr:AddEventListener(GroupMgrEvent.OnFamilyReflash, handler(self, self._evtOnFamilyReflash))
mgr_ctr:AddEventListener(GroupMgrEvent.OnFamilyRoomReflash, handler(self, self._evtOnFamilyRoomReflash))
mgr_ctr:AddEventListener(GroupMgrEvent.OnFamilyMemberOut, handler(self, self._evtOnFamilyMemberOut))
print("家族添加监听")
return self
end
@ -54,7 +54,7 @@ function M:RemoveAll()
mgr_ctr:RemoveEventListener(GroupMgrEvent.Onpush_assistant, handler(self, self._evtOnPush_assistant))
mgr_ctr:RemoveEventListener(GroupMgrEvent.OnMemberState, handler(self, self._evtOnMemberState))
mgr_ctr:RemoveEventListener(GroupMgrEvent.OnFamilyRoomReflash, handler(self, self._evtOnFamilyRoomReflash))
mgr_ctr:RemoveEventListener(GroupMgrEvent.OnFamilyMemberOut, handler(self, self._evtOnFamilyMemberOut))
print("家族去除监听")
end
@ -273,6 +273,7 @@ end
-- reflashType == "joinFamily" 成功加入了亲友圈
-- reflashType == "outFamily" 成员退出了亲友圈
-- reflashType == "kickoutFamily" 成员被踢出了亲友圈
-- reflashType == "changeJoins" 修改了申请信息
function M:_evtOnFamilyReflash(...)
local view = ViewManager.GetCurrenView()
if view.class ~= "FamilyMainView" then
@ -281,22 +282,41 @@ function M:_evtOnFamilyReflash(...)
local arg = { ... }
local reflashType = arg[1].reflashType
local gourpId = arg[1].gourpId
local parm = arg[1].parm
if reflashType == "joinFamily" then
view:Reflash()
end
if reflashType == "outFamily" then
local player = DataManager.
--local player = DataManager.
--local tips = "成员 【%s(%s)】退出了【%s(%s)】亲友圈"
--string.format(tips, )
MsgWindow.new(self._root_view, "确定要点过吗？")
--MsgWindow.new(self._root_view, "确定要点过吗？")
end
if reflashType == "changeJoins" then
local uid = arg[1].uid
local joins = arg[1].joins
local gMgr = ControllerManager.GetController(GroupMgrController)
local group = DataManager.groups:get(gMgr.groupId)
group.joins = joins
for _, data in pairs(group.joinsData) do
if data.id == uid then
group.joinsData[_] = nil
end
end
view:ChangeOther()
view._child_familyAuditNumber:Reflash()
end
if reflashType == "" then
end
end
@ -318,4 +338,23 @@ function M:_evtOnFamilyRoomReflash(...)
view:UpdateFamilyRoom(nil, groupId)
end
function M:_evtOnFamilyMemberOut(...)
local arg = { ... }
local arg = arg[1]
local uid = arg.uid
local groupId = arg.groupId
local name = arg.name
local group = DataManager.groups:get(groupId)
local view = ViewManager.GetCurrenView()
if view.class ~= "FamilyMainView" then
return
end
local tips = "成员 【%s(%s)】退出了【%s(%s)】亲友圈"
tips = string.format(tips, name, uid, group.name, groupId)
ViewUtil.ShowTips("成员 【%s】")
end
return M

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

@ -133,6 +133,7 @@ function M:init(url)
end
function M:Reflash()
local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_GroupList(function(res)
local groups = res.Data.groups
if #groups > 0 then

7
lua_probject/base_project/Game/View/playerDetailView.lua
View File

@ -24,6 +24,11 @@ function playerDetailView:Refalsh(player)
self.tex_ip.text = "网络：" .. player.self_user.host_ip
self.tex_id.text = "编号：" .. player.self_user.account_id
ImageLoad.Load(player.self_user.head_url, self.loader_icon)
self.cMissile.selectedIndex = 1
if self.player.self_user.account_id == DataManager.SelfUser.account_id then
self.cMissile.selectedIndex = 0
end
end
function playerDetailView:Show(player)
@ -44,6 +49,8 @@ function playerDetailView:Init()
self.loader_icon = self._view:GetChild("loader_icon")
self.cMissile = self._view:GetController("cMissile")
self.btn_boom.onClick:Set(function()
Send(self, "boom")
self:Close()

3
lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua
View File

@ -49,7 +49,8 @@ function M:InitData(over, room, result, total_result, callback, isWitness, witne
if result then
result.cardList = json.decode(result.cardList)
table.sort(result.cardList)
--排序
--table.sort(result.cardList)
end
self.list_lastCard = self._view:GetChild('list_lastCard')

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

@ -95,8 +95,8 @@ function M:InitView(url)
end
---------为了下次复现出牌情况
self._viewText_testName = self._view:GetChild('text_testName')
self._viewText_testName.text = 0
--self._viewText_testName = self._view:GetChild('text_testName')
--self._viewText_testName.text = 0
end
function M:__BuGang(cardInfo, callback)
@ -227,7 +227,7 @@ function M:EventInit()
_gamectr:AddEventListener(TX_GameEvent.SendCards, function(...)
-- self:ShowHuTip()
self._viewText_testName.text = 0
--self._viewText_testName.text = 0
self:UpdateRound()
self._state.selectedIndex = 1
self:ShowJing()
@ -254,7 +254,7 @@ function M:EventInit()
_gamectr:AddEventListener(TX_GameEvent.OutHint, function(...)
local info = self._player_card_info[self:GetPos(_room.self_player.seat)]
self._viewText_testName.text = tonumber(self._viewText_testName.text) + 1
--self._viewText_testName.text = tonumber(self._viewText_testName.text) + 1
info:UpdateHandCard(true)
end)

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

@ -92,8 +92,8 @@ function M:InitView(url)
end
---------为了下次复现出牌情况
self._viewText_testName = self._view:GetChild('text_testName')
self._viewText_testName.text = 0
--self._viewText_testName = self._view:GetChild('text_testName')
--self._viewText_testName.text = 0
end
function M:__BuGang(cardInfo, callback)
@ -224,7 +224,7 @@ function M:EventInit()
_gamectr:AddEventListener(TX_GameEvent.SendCards, function(...)
-- self:ShowHuTip()
self._viewText_testName.text = 0
--self._viewText_testName.text = 0
self:UpdateRound()
self._state.selectedIndex = 1
self:ShowJing()
@ -251,7 +251,7 @@ function M:EventInit()
_gamectr:AddEventListener(TX_GameEvent.OutHint, function(...)
local info = self._player_card_info[self:GetPos(_room.self_player.seat)]
self._viewText_testName.text = tonumber(self._viewText_testName.text) + 1
--self._viewText_testName.text = tonumber(self._viewText_testName.text) + 1
info:UpdateHandCard(true)
end)

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

@ -92,8 +92,8 @@ function M:InitView(url)
end
---------为了下次复现出牌情况
self._viewText_testName = self._view:GetChild('text_testName')
self._viewText_testName.text = 0
--self._viewText_testName = self._view:GetChild('text_testName')
--self._viewText_testName.text = 0
end
function M:__BuGang(cardInfo, callback)
@ -224,7 +224,7 @@ function M:EventInit()
_gamectr:AddEventListener(TX_GameEvent.SendCards, function(...)
-- self:ShowHuTip()
--测试用记录出牌权次数
self._viewText_testName.text = 0
--self._viewText_testName.text = 0
self:UpdateRound()
self._state.selectedIndex = 1
self:ShowJing()
@ -251,7 +251,7 @@ function M:EventInit()
_gamectr:AddEventListener(TX_GameEvent.OutHint, function(...)
local info = self._player_card_info[self:GetPos(_room.self_player.seat)]
self._viewText_testName.text = tonumber(self._viewText_testName.text) + 1
--self._viewText_testName.text = tonumber(self._viewText_testName.text) + 1
info:UpdateHandCard(true)
end)

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

@ -94,8 +94,8 @@ function M:InitView(url)
end
---------为了下次复现出牌情况
self._viewText_testName = self._view:GetChild('text_testName')
self._viewText_testName.text = 0
--self._viewText_testName = self._view:GetChild('text_testName')
--self._viewText_testName.text = 0
end
function M:__BuGang(cardInfo, callback)
@ -226,7 +226,7 @@ function M:EventInit()
_gamectr:AddEventListener(TX_GameEvent.SendCards, function(...)
-- self:ShowHuTip()
self._viewText_testName.text = 0
--self._viewText_testName.text = 0
self:UpdateRound()
self._state.selectedIndex = 1
self:ShowJing()
@ -253,7 +253,7 @@ function M:EventInit()
_gamectr:AddEventListener(TX_GameEvent.OutHint, function(...)
local info = self._player_card_info[self:GetPos(_room.self_player.seat)]
self._viewText_testName.text = tonumber(self._viewText_testName.text) + 1
--self._viewText_testName.text = tonumber(self._viewText_testName.text) + 1
info:UpdateHandCard(true)
end)

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

@ -2110,6 +2110,7 @@
<component id="brmc7jc9" name="btn_confirmNotice.xml" path="/MyFamily/Component/"/>
<image id="brmc7jca" name="hall_club_common_btntext_queding.png" path="/MyFamily/Image/"/>
<image id="brmc7jcb" name="Rectangle 113.png" path="/window/Image/" scale="9grid" scale9grid="39,37,82,77"/>
<font id="fj6f7jcc" name="兰亭黑简.TTF" path="/font/" exported="true" renderMode="" samplePointSize="16"/>
</resources>
<publish name="Common" path="..\wb_unity_pro\Assets\ART\base\common\ui" packageCount="2" maxAtlasSize="2048">
<atlas name="默认" index="0"/>

16
wb_new_ui/assets/Common/window/playerDetail.xml
View File

@ -1,25 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="1038,484">
<controller name="cMissile" pages="0,,1," selected="0">
<remark page="1" value="开启互动栏"/>
</controller>
<displayList>
<image id="n0_qmc1" name="n0" src="qmc17jbq" fileName="images/Rectangle 297.png" xy="0,0" size="1038,484"/>
<image id="n3_qmc1" name="n3" src="qmc17jbt" fileName="images/Rectangle 298.png" xy="22,20" size="994,444"/>
<component id="n2_qmc1" name="btn_close" src="qmc17jbs" fileName="window/Component/btn_close.xml" xy="946,-20"/>
<loader id="n4_qmc1" name="loader_icon" xy="72,72" size="212,212" align="center" vAlign="middle" fill="scaleFree"/>
<graph id="n5_qmc1" name="n5" xy="72,72" size="212,212" type="rect" corner="8"/>
<loader id="n4_qmc1" name="loader_icon" xy="72,72" size="212,212" align="center" vAlign="middle" fill="scaleFree"/>
<text id="n6_qmc1" name="tex_name" xy="320,88" size="563,49" font="ui://27vd145bh35o7ilb" fontSize="36" color="#9a5f34" autoSize="none" text="9A5F34"/>
<text id="n7_qmc1" name="tex_ip" xy="320,234" size="561,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#9a5f34" autoSize="none" text="9A5F34"/>
<text id="n8_qmc1" name="tex_id" xy="320,158" size="561,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#9a5f34" autoSize="none" text="9A5F34"/>
<component id="n9_qmc1" name="btn_boom" src="qmc17jbu" fileName="window/Component/btn_emoji.xml" xy="80,311" size="112,112">
<component id="n9_qmc1" name="btn_boom" src="qmc17jbu" fileName="window/Component/btn_emoji.xml" xy="80,311" size="112,112" group="n13_fj6f">
<Button icon="ui://27vd145bqmc17jbx"/>
</component>
<component id="n10_qmc1" name="btn_egg" src="qmc17jbu" fileName="window/Component/btn_emoji.xml" xy="232,332" size="112,112">
<component id="n10_qmc1" name="btn_egg" src="qmc17jbu" fileName="window/Component/btn_emoji.xml" xy="232,332" size="112,112" group="n13_fj6f">
<Button icon="ui://27vd145bqmc17jby"/>
</component>
<component id="n11_qmc1" name="btn_ring" src="qmc17jbu" fileName="window/Component/btn_emoji.xml" xy="384,320" size="112,112">
<component id="n11_qmc1" name="btn_ring" src="qmc17jbu" fileName="window/Component/btn_emoji.xml" xy="384,320" size="112,112" group="n13_fj6f">
<Button icon="ui://27vd145bqmc17jbv"/>
</component>
<component id="n12_qmc1" name="btn_flower" src="qmc17jbu" fileName="window/Component/btn_emoji.xml" xy="536,320" size="112,112">
<component id="n12_qmc1" name="btn_flower" src="qmc17jbu" fileName="window/Component/btn_emoji.xml" xy="536,320" size="112,112" group="n13_fj6f">
<Button icon="ui://27vd145bqmc17jbw"/>
</component>
<group id="n13_fj6f" name="n13" xy="80,311" size="568,133" advanced="true">
<gearDisplay controller="cMissile" pages="1"/>
</group>
</displayList>
</component>

6
wb_new_ui/assets/Family/Main.xml
View File

@ -10,7 +10,7 @@
<controller name="moreBtn" pages="0,,1," selected="0"/>
<controller name="familyBan" pages="0,,1," selected="0"/>
<controller name="cMyfamilyList" pages="0,,1," selected="0"/>
<controller name="cIsChatRoom" pages="0,,1," selected="1">
<controller name="cIsChatRoom" pages="0,,1," selected="0">
<remark page="0" value="关闭聊天室"/>
<remark page="1" value="打开聊天室"/>
</controller>
@ -94,7 +94,7 @@
<item/>
<item/>
</list>
<list id="n18_in3i" name="list_family" xy="505,186" size="1977,93" group="n34_86ct" layout="row" overflow="scroll" scroll="horizontal" colGap="24" defaultItem="ui://htcn7v3rin3i7cuf" vAlign="middle" selectionController="listFamily" autoClearItems="true">
<list id="n18_in3i" name="list_family" xy="505,186" size="1977,93" group="n34_86ct" layout="row" overflow="scroll" scroll="horizontal" colGap="3" defaultItem="ui://htcn7v3rin3i7cuf" vAlign="middle" selectionController="listFamily" autoClearItems="true">
<relation target="" sidePair="rightext-right"/>
<item/>
<item/>
@ -130,7 +130,7 @@
<gearDisplay controller="familyBan" pages="1"/>
<relation target="" sidePair="height-height,left-left%"/>
</graph>
<text id="n372_ajr3" name="text_banMain" xy="1376,647" size="455,121" group="n34_86ct" font="ui://27vd145bh35o7iln" fontSize="50" autoSize="none" text="该亲友圈已打样">
<text id="n372_ajr3" name="text_banMain" xy="1376,647" size="455,121" group="n34_86ct" font="ui://27vd145bh35o7iln" fontSize="50" autoSize="none" text="该亲友圈已打烊">
<gearDisplay controller="familyBan" pages="1"/>
</text>
<component id="n391_j0cy" name="com_chatRoom" src="ieus7d1d" fileName="ChatRoom/com_chatRoom.xml" xy="1,0" size="2532,1170" group="n34_86ct">

2
wb_new_ui/assets/Family/Main/Component/btn_familyName.xml
View File

@ -8,7 +8,7 @@
<image id="n8_jrro" name="n8" src="jrro7cyb" fileName="Main/Image/btn_familyName_off.png" xy="0,0">
<gearDisplay controller="button" pages="0"/>
</image>
<richtext id="n9_jrro" name="title" xy="-1,18" size="296,56" font="ui://27vd145bh35o7iln" fontSize="42" color="#2c1f16" align="center" vAlign="middle" autoSize="none" text="亲友圈名称名称名友圈名称名称名">
<richtext id="n9_jrro" name="title" xy="-1,18" size="296,56" font="ui://27vd145bfj6f7jcc" fontSize="42" align="center" vAlign="middle" autoSize="none" text="亲友圈名称名称名友圈名称名称名">
<relation target="" sidePair="center-center,middle-middle"/>
</richtext>
</displayList>

4
wb_new_ui/assets/Family/Main/Component/c_roomChild.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="1620,180">
<controller name="type" pages="0,玩法匹配,1,加入房间" selected="1"/>
<controller name="type" pages="0,玩法匹配,1,加入房间" selected="0"/>
<controller name="num" pages="0,,1,,2," selected="0"/>
<displayList>
<image id="n23_jrro" name="n23" src="q2iu7d5k" fileName="Main/Image/bg_mainListChild(1).png" xy="0,0" size="1326,180">
@ -28,7 +28,7 @@
<gearDisplay controller="num" pages="1,2"/>
</component>
<group id="n29_q2iu" name="n29" xy="12,51" size="186,111"/>
<richtext id="n2_in3i" name="game_type" xy="205,13" size="938,64" group="n30_q2iu" font="ui://27vd145bh35o7ika" fontSize="48" color="#474747" leading="0" autoSize="none" text="（抚州麻将）123123456">
<richtext id="n2_in3i" name="game_type" xy="205,13" size="938,64" group="n30_q2iu" font="Microsoft YaHei" fontSize="48" color="#474747" leading="0" autoSize="none" text="（抚州麻将）123123456">
<relation target="" sidePair="width-width"/>
</richtext>
<text id="n3_in3i" name="n3" xy="244,71" size="115,49" group="n30_q2iu" font="ui://27vd145bh35o7il2" fontSize="36" color="#474747" leading="0" autoSize="none" text="玩法：12316"/>

24
wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_PlayInfo.xml
View File

@ -1,27 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="2340,186">
<controller name="IsMe" alias="是否是我" pages="0,不是,1,是" selected="0"/>
<controller name="IsMe" alias="是否是我" pages="0,不是,1,是" selected="1"/>
<controller name="isZiMo" alias="是否自摸" pages="0,不是,1,是" selected="0"/>
<controller name="isPao" alias="是否点炮" pages="0,不是,1,是" selected="0"/>
<controller name="zhuang" pages="0,,1," selected="0"/>
<displayList>
<graph id="n0_yry6" name="bg_up" xy="0,0" size="2340,186" type="rect" lineSize="2" lineColor="#ff804b2e" fillColor="#ff8d6c43">
<graph id="n0_yry6" name="bg_up" xy="0,0" size="2340,186" type="rect" lineSize="2" lineColor="#ff804b2e" fillColor="#ff8d6c43" corner="18">
<gearDisplay controller="IsMe" pages="0"/>
</graph>
<graph id="n1_yry6" name="bg_down" xy="0,0" size="2340,186" type="rect" lineSize="2" lineColor="#ff804b2e" fillColor="#ff694a23">
<graph id="n1_yry6" name="bg_down" xy="0,0" size="2340,186" type="rect" lineSize="2" lineColor="#ff804b2e" fillColor="#ff694a23" corner="18">
<gearDisplay controller="IsMe" pages="1"/>
</graph>
<graph id="n2_yry6" name="bg_head" xy="12,12" size="162,162" type="rect" lineSize="2" lineColor="#ff804b2e" fillColor="#ffe0a94f" corner="12"/>
<component id="n3_yry6" name="Btn_Head" src="yry6z2" fileName="Main_new/Clearing/Component/Btn_Head.xml" xy="19,19"/>
<text id="n4_yry6" name="text_name" xy="173,23" size="327,58" font="ui://27vd145bh35o7ik0" fontSize="43" color="#ffffff" align="center" leading="0" autoSize="shrink" bold="true" text="微信用户1111"/>
<text id="n5_yry6" name="text_huShow" xy="503,4" size="522,76" font="ui://27vd145bh35o7ik0" fontSize="58" color="#fcd696" leading="0" bold="true" text="平胡dsad 实打实收">
<text id="n4_yry6" name="text_name" xy="189,23" size="327,58" font="ui://27vd145bh35o7ili" fontSize="36" color="#fbbb46" vAlign="middle" leading="0" autoSize="shrink" text="微信用户1111"/>
<text id="n5_yry6" name="text_huShow" xy="503,4" size="491,76" font="ui://27vd145bg2mo7ij0" fontSize="58" color="#fcd696" leading="0" text="平胡dsad 实打实收">
<relation target="n2_yry6" sidePair="left-right"/>
</text>
<list id="n6_yry6" name="list_allCards" xy="253,91" size="967,84" layout="row" scroll="horizontal" colGap="36" vAlign="middle" autoClearItems="true">
<list id="n6_yry6" name="list_allCards" xy="189,55" size="967,119" touchable="false" layout="row" selectionMode="none" overflow="hidden" scroll="horizontal" colGap="36" autoItemSize="false" vAlign="bottom" autoClearItems="true">
<relation target="" sidePair="left-left"/>
<item url="ui://v0j9abjyyry6zj"/>
</list>
<component id="n7_yry6" name="Btn_Card_Hu" src="mwqz1bk" fileName="Main_new/Clearing/Component/Btn_RemindCard.xml" xy="1258,89">
<component id="n7_yry6" name="Btn_Card_Hu" src="mwqz1bk" fileName="Main_new/Clearing/Component/Btn_RemindCard.xml" xy="1194,89" touchable="false">
<relation target="n6_yry6" sidePair="left-right"/>
</component>
<list id="n8_yry6" name="list_JiangMa" xy="1424,36" size="206,138" layout="flow_hz" overflow="scroll" lineGap="18" colGap="-3" defaultItem="ui://v0j9abjyyry6zk">
@ -39,22 +39,22 @@
<image id="n10_yry6" name="Ima_ZiMo" src="yry6zm" fileName="Main_new/Clearing/Image/xzmj_result_29 1.png" xy="1571,0">
<gearDisplay controller="isZiMo" pages="1"/>
</image>
<text id="n11_yry6" name="Text_BoJing" xy="1856,57" size="66,72" font="ui://27vd145bh35o7ik0" fontSize="54" color="#fbbb46" align="center" vAlign="middle" leading="0" bold="true" text="+9">
<text id="n11_yry6" name="Text_BoJing" xy="1855,57" size="67,72" font="ui://27vd145bg2mo7ij0" fontSize="54" color="#fbbb46" align="center" vAlign="middle" leading="0" text="+9">
<relation target="" sidePair="center-center,top-top"/>
</text>
<text id="n12_yry6" name="Text_Gang" xy="1966,57" size="66,72" font="ui://27vd145bh35o7ik0" fontSize="54" color="#fbbb46" align="center" vAlign="middle" leading="0" bold="true" text="+9">
<text id="n12_yry6" name="Text_Gang" xy="1965,57" size="67,72" font="ui://27vd145bg2mo7ij0" fontSize="54" color="#fbbb46" align="center" vAlign="middle" leading="0" text="+9">
<relation target="" sidePair="center-center,top-top"/>
</text>
<text id="n13_yry6" name="Text_Hu" xy="2080,57" size="66,72" font="ui://27vd145bh35o7ik0" fontSize="54" color="#5dbd24" align="center" vAlign="middle" leading="0" bold="true" text="+9">
<text id="n13_yry6" name="Text_Hu" xy="2079,57" size="67,72" font="ui://27vd145bg2mo7ij0" fontSize="54" color="#5dbd24" align="center" vAlign="middle" leading="0" text="+9">
<relation target="" sidePair="center-center,top-top"/>
</text>
<text id="n14_yry6" name="Text_Tatal" xy="2201,57" size="66,72" font="ui://27vd145bh35o7ik0" fontSize="54" color="#c9372e" align="center" vAlign="middle" leading="0" bold="true" text="+9">
<text id="n14_yry6" name="Text_Tatal" xy="2200,57" size="67,72" font="ui://27vd145bg2mo7ij0" fontSize="54" color="#c9372e" align="center" vAlign="middle" leading="0" text="+9">
<relation target="" sidePair="center-center,top-top"/>
</text>
<image id="n15_ehpl" name="fangzhu" src="gq7m5t" fileName="images/z02.png" xy="12,108" size="62,66" aspect="true" visible="false">
<relation target="" sidePair="left-left,bottom-bottom"/>
</image>
<image id="n16_ehpl" name="zhuang" src="gq7m5u" fileName="images/z01.png" xy="112,12" size="62,66" aspect="true">
<image id="n16_ehpl" name="zhuang" src="fj6f1bm" fileName="images/xzmj_result_35 1.png" xy="12,129" size="63,45">
<gearDisplay controller="zhuang" pages="1"/>
<relation target="" sidePair="right-right,top-top"/>
</image>

2
wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Label_GamePlayInfo.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="645,91" overflow="scroll" extention="Label">
<displayList>
<text id="n0_yry6" name="title" xy="0,0" size="645,101" font="ui://27vd145bh35o7ik0" fontSize="43" color="#c06a2d" vAlign="middle" leading="-10" letterSpacing="3" autoSize="height" bold="true" autoClearText="true" text="第2/5局，1倍，2人，奖10马，不烧庄">
<text id="n0_yry6" name="title" xy="0,0" size="645,111" font="ui://27vd145bh35o7ik0" fontSize="43" color="#c06a2d" vAlign="middle" leading="0" letterSpacing="3" autoSize="height" bold="true" autoClearText="true" text="第2/5局，1倍，2人，奖10马，不烧庄">
<relation target="" sidePair="width-width,height-height"/>
</text>
</displayList>

36
wb_new_ui/assets/Main_Majiang/Main_new/Clearing/clearing.xml
View File

@ -16,39 +16,39 @@
<gearDisplay controller="main" pages="0"/>
</group>
<image id="n114_yry6" name="n114" src="yry6yx" fileName="Main_new/Clearing/Image/Group 239.png" xy="-3,72" group="n116_yry6"/>
<image id="n115_yry6" name="n115" src="yry6yw" fileName="Main_new/Clearing/Image/final_result_title 1.png" xy="540,-15" group="n116_yry6">
<image id="n115_yry6" name="n115" src="yry6yw" fileName="Main_new/Clearing/Image/final_result_title 1.png" xy="540,-15" group="n116_yry6" visible="false">
<gearDisplay controller="over" pages="0"/>
</image>
<component id="n118_yry6" name="Label_GamePlay" src="yry6yy" fileName="Main_new/Clearing/Component/Label_GamePlayInfo.xml" xy="185,116" group="n121_yry6"/>
<component id="n120_yry6" name="Btn_NextRound2" src="yry6yz" fileName="Main_new/Clearing/Component/Btn_NextRound.xml" xy="2031,1019" group="n121_yry6"/>
<component id="n122_yry6" name="Comp_Player1" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="95,218" group="n121_yry6">
<component id="n118_yry6" name="Label_GamePlay" src="yry6yy" fileName="Main_new/Clearing/Component/Label_GamePlayInfo.xml" xy="185,115" group="n121_yry6"/>
<component id="n120_yry6" name="Btn_NextRound2" src="yry6yz" fileName="Main_new/Clearing/Component/Btn_NextRound.xml" xy="2031,1018" group="n121_yry6"/>
<component id="n122_yry6" name="Comp_Player1" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="95,217" group="n121_yry6">
<gearDisplay controller="playerNum" pages="0,1,2"/>
</component>
<component id="n123_yry6" name="Comp_Player2" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="95,590" group="n121_yry6">
<component id="n123_yry6" name="Comp_Player2" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="95,421" group="n121_yry6">
<gearDisplay controller="playerNum" pages="0,1,2"/>
<gearXY controller="playerNum" pages="0,1" values="95,590|96,516" default="96,417"/>
<gearXY controller="playerNum" pages="0,1" values="95,421|96,516" default="96,417"/>
</component>
<component id="n124_yry6" name="Comp_Player3" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="95,614" group="n121_yry6">
<component id="n124_yry6" name="Comp_Player3" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="95,625" group="n121_yry6">
<gearDisplay controller="playerNum" pages="1,2"/>
<gearXY controller="playerNum" pages="0,1" values="95,614|96,813" default="96,615"/>
<gearXY controller="playerNum" pages="0,1" values="95,625|96,813" default="96,615"/>
</component>
<text id="n141_kxhm" name="Text_BoJing" xy="1941,149" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#fbbb46" align="center" vAlign="middle" leading="0" bold="true" text="精分">
<text id="n141_kxhm" name="Text_BoJing" xy="1941,148" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#fbbb46" align="center" vAlign="middle" leading="0" bold="true" text="精分">
<relation target="" sidePair=""/>
</text>
<text id="n142_kxhm" name="Text_Gang" xy="2051,149" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#fbbb46" align="center" vAlign="middle" leading="0" bold="true" text="杠分">
<text id="n142_kxhm" name="Text_Gang" xy="2051,148" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#fbbb46" align="center" vAlign="middle" leading="0" bold="true" text="杠分">
<relation target="" sidePair=""/>
</text>
<text id="n143_kxhm" name="Text_Hu" xy="2165,149" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#5dbd24" align="center" vAlign="middle" leading="0" bold="true" text="胡分">
<text id="n143_kxhm" name="Text_Hu" xy="2165,148" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#5dbd24" align="center" vAlign="middle" leading="0" bold="true" text="胡分">
<relation target="" sidePair="top-top"/>
</text>
<text id="n144_kxhm" name="Text_Tatal" xy="2286,149" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#c9372e" align="center" vAlign="middle" leading="0" bold="true" text="总分">
<text id="n144_kxhm" name="Text_Tatal" xy="2286,148" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#c9372e" align="center" vAlign="middle" leading="0" bold="true" text="总分">
<relation target="" sidePair="top-top"/>
</text>
<component id="n125_yry6" name="Comp_Player4" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="95,812" group="n121_yry6">
<component id="n125_yry6" name="Comp_Player4" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="95,811" group="n121_yry6">
<gearDisplay controller="playerNum" pages="2"/>
<gearXY controller="playerNum" pages="0" values="95,812" default="96,813"/>
<gearXY controller="playerNum" pages="0" values="95,811" default="96,813"/>
</component>
<list id="n145_uans" name="list_lastCard" xy="302,1037" size="1256,84" group="n121_yry6" layout="row" overflow="scroll" scroll="horizontal" defaultItem="ui://v0j9abjymwqz1bk" vAlign="middle" autoClearItems="true">
<list id="n145_uans" name="list_lastCard" xy="302,1036" size="1256,84" group="n121_yry6" layout="row" selectionMode="none" overflow="scroll" scroll="horizontal" defaultItem="ui://v0j9abjymwqz1bk" vAlign="middle" autoClearItems="true">
<item/>
<item/>
<item/>
@ -82,9 +82,9 @@
<item/>
<item/>
</list>
<text id="n146_uans" name="n146" xy="191,1055" size="88,56" group="n121_yry6" font="Alimama FangYuanTi VF" fontSize="42" color="#c06a2d" text="剩牌"/>
<text id="n147_uans" name="n147" xy="1637,1055" size="302,56" group="n121_yry6" fontSize="42" color="#c06a2d" text="剩余50张未显示"/>
<group id="n121_yry6" name="over0" xy="95,116" size="2340,1017" group="n116_yry6" advanced="true">
<text id="n146_uans" name="n146" xy="190,1047" size="96,62" group="n121_yry6" font="ui://27vd145bg2mo7ij0" fontSize="46" color="#c06a2d" text="剩牌"/>
<text id="n147_uans" name="n147" xy="1637,1047" size="332,62" group="n121_yry6" font="ui://27vd145bg2mo7ij0" fontSize="46" color="#c06a2d" text="剩余50张未显示"/>
<group id="n121_yry6" name="over0" xy="95,115" size="2340,1017" group="n116_yry6" advanced="true">
<gearDisplay controller="over" pages="0"/>
</group>
<graph id="n126_yry6" name="Bg_over1" xy="185,183" size="2160,864" group="n140_yry6" type="rect" lineSize="0" fillColor="#ff9c8f70" corner="54"/>

2
wb_new_ui/assets/Main_Majiang/Main_new/FZTips/Component/btn_FZCard.xml
View File

@ -3,7 +3,7 @@
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
<controller name="jing" pages="0,,1," selected="0"/>
<displayList>
<loader id="n3_nee3" name="icon" xy="0,0" size="60,87" url="ui://v0j9abjyk0pa131" fill="scale">
<loader id="n3_nee3" name="icon" xy="0,0" size="60,87" url="ui://v0j9abjyk0pa131" fill="scaleFree">
<relation target="" sidePair="width-width,height-height"/>
</loader>
<image id="n4_nee3" name="n4" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="0,0" size="30,31" aspect="true">

6
wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/Comp_jing.xml
View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="64,90">
<component size="174,186">
<controller name="jing" pages="0,,1," selected="1"/>
<displayList>
<loader id="n0_ckvb" name="icon" xy="0,0" size="64,90" url="ui://v0j9abjyk0pa126" align="center" fill="scaleFree" clearOnPublish="true">
<loader id="n0_ckvb" name="icon" xy="0,0" size="174,186" url="ui://v0j9abjyk0pa126" align="center" fill="scaleFree" clearOnPublish="true">
<relation target="" sidePair="width-width,height-height"/>
</loader>
<image id="n1_ckvb" name="n1" src="xblm1a5" fileName="Main_new/Main/Image/jing 1.png" xy="5,3" size="59,61">
<image id="n1_ckvb" name="n1" src="xblm1a5" fileName="Main_new/Main/Image/jing 1.png" xy="13,6" size="160,126">
<gearDisplay controller="jing" pages="1"/>
<relation target="" sidePair="width-width%,height-height%,left-left%,top-top%"/>
</image>

18
wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml
View File

@ -3,30 +3,22 @@
<controller name="room_owner" pages="0,,1," selected="0"/>
<controller name="bank" pages="0,,1," selected="0"/>
<controller name="read" pages="0,,1," selected="0"/>
<controller name="offline" pages="0,,1," selected="0"/>
<controller name="offline" pages="0,,1," selected="1"/>
<controller name="mask_voice" pages="0,,1," selected="0"/>
<controller name="piao_niao" pages="0,,1," selected="0"/>
<controller name="three_win" pages="0,,1," selected="0"/>
<controller name="ting" pages="0,,1," selected="0"/>
<controller name="text_color" pages="0,,1," selected="0"/>
<controller name="site" pages="2,normol,0,2-1,1,2-2" selected="0"/>
<controller name="cScore" alias="分数飘字" pages="0,,1," selected="1"/>
<controller name="cScore" alias="分数飘字" pages="0,,1," selected="0"/>
<displayList>
<text id="n47_nkur" name="tuoguanTips" xy="-26,-84" size="184,48" fontSize="22" color="#ff0000" align="center" vAlign="middle" autoSize="none" text="开启托管剩余时间">
<gearXY controller="site" pages="2,1" values="-26,-84|154,50" default="-85,-104"/>
<relation target="" sidePair="center-center,top-top"/>
</text>
<graph id="n32_kba2" name="offLine" xy="21,21" size="90,90" group="n33_e7qn" aspect="true" touchable="false" type="eclipse" lineSize="0" fillColor="#b3000000">
<gearDisplay controller="offline" pages="1"/>
<relation target="" sidePair="width-width,height-height"/>
</graph>
<component id="n49_pkx5" name="btn_head" src="pkx5sz" fileName="Main_new/Main/Component/btn_head.xml" xy="0,0" size="132,132" group="n33_e7qn" aspect="true">
<relation target="" sidePair="width-width,height-height"/>
</component>
<text id="n37_aawn" name="n37" xy="34,45" size="64,42" group="n33_e7qn" fontSize="30" color="#ffffff" text="离线">
<gearDisplay controller="offline" pages="1"/>
<relation target="" sidePair="width-width,height-height"/>
</text>
<image id="n6" name="fangzhu" src="gq7m5t" fileName="images/z02.png" xy="0,89" size="40,43" group="n33_e7qn" visible="false">
<gearDisplay controller="room_owner" pages="1"/>
<relation target="" sidePair="width-width,height-height"/>
@ -65,7 +57,7 @@
<component id="n41_7q1m" name="n41" src="gq7m67" fileName="ting.xml" xy="-3,7">
<gearDisplay controller="ting" pages="1"/>
</component>
<text id="n50_u633" name="text_jifen" xy="-10,126" size="153,58" group="n46_rfcn" font="ui://27vd145bg2mo7ij0" fontSize="43" color="#ffff99" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="+33"/>
<text id="n50_u633" name="text_jifen" xy="-10,126" size="153,58" group="n46_rfcn" font="ui://27vd145bg2mo7ij0" fontSize="43" color="#e0bf7b" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="+33"/>
<group id="n46_rfcn" name="zhanji" xy="-10,126" size="153,58" advanced="true">
<gearXY controller="site" pages="2,1" values="-10,126|154,97" default="29,136"/>
</group>
@ -76,5 +68,9 @@
<item/>
<item/>
</list>
<image id="n32_kba2" name="offLine" src="fj6f1bn" fileName="images/微信图片_20250726215551_78.png" xy="0,0" size="132,132">
<gearDisplay controller="offline" pages="1"/>
<relation target="" sidePair="width-width,height-height"/>
</image>
</displayList>
</component>

21
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/PlayerHead2_2.xml
View File

@ -3,10 +3,10 @@
<controller name="room_owner" pages="0,,1," selected="0"/>
<controller name="bank" pages="0,,1," selected="0"/>
<controller name="read" pages="0,,1," selected="0"/>
<controller name="offline" pages="0,,1," selected="0"/>
<controller name="offline" pages="0,,1," selected="1"/>
<controller name="mask_voice" pages="0,,1," selected="0"/>
<controller name="piao_niao" pages="0,,1," selected="0"/>
<controller name="three_win" pages="0,,1," selected="1"/>
<controller name="three_win" pages="0,,1," selected="0"/>
<controller name="ting" pages="0,,1," selected="0"/>
<controller name="text_color" pages="0,,1," selected="1"/>
<controller name="site" pages="2,normol,0,2-1,1,2-2" selected="0"/>
@ -16,15 +16,9 @@
<gearXY controller="site" pages="2,1" values="-85,-84|154,50" default="-85,-104"/>
<relation target="" sidePair="center-center,top-bottom"/>
</text>
<graph id="n32_kba2" name="offLine" xy="21,21" size="90,90" group="n33_e7qn" aspect="true" touchable="false" type="eclipse" lineSize="0" fillColor="#b3000000">
<gearDisplay controller="offline" pages="1"/>
</graph>
<component id="n49_pkx5" name="btn_head" src="pkx5sz" fileName="Main_new/Main/Component/btn_head.xml" xy="0,0" group="n33_e7qn">
<relation target="" sidePair="width-width,height-height"/>
</component>
<text id="n37_aawn" name="n37" xy="34,45" size="64,42" group="n33_e7qn" fontSize="30" color="#ffffff" text="离线">
<gearDisplay controller="offline" pages="1"/>
</text>
<image id="n6" name="fangzhu" src="gq7m5t" fileName="images/z02.png" xy="0,89" group="n33_e7qn" visible="false">
<gearDisplay controller="room_owner" pages="1"/>
</image>
@ -33,8 +27,9 @@
<relation target="" sidePair="width-width,height-height"/>
</image>
<group id="n33_e7qn" name="n33" xy="0,0" size="139,139"/>
<image id="n8" name="ready" src="gq7m5y" fileName="font/images/game/game_fonts_01.png" xy="158,32">
<image id="n8" name="ready" src="qmc11ao" fileName="images/gamexzmj_9 1.png" xy="38,166" size="55,65">
<gearDisplay controller="read" pages="1"/>
<relation target="" sidePair="center-center"/>
</image>
<text id="n48_pkx5" name="name" xy="-69,-46" size="271,49" font="ui://27vd145bh35o7ik0" fontSize="36" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" singleLine="true" text="萌萌六个字了">
<gearXY controller="site" pages="2,0,1" values="-69,-46|-33,-57|154,0"/>
@ -57,8 +52,8 @@
<component id="n41_7q1m" name="n41" src="gq7m67" fileName="ting.xml" xy="-3,7">
<gearDisplay controller="ting" pages="1"/>
</component>
<text id="n44_rfcn" name="text_jifen" xy="-10,126" size="153,58" group="n46_rfcn" font="ui://27vd145bg2mo7ij0" fontSize="43" color="#ffff99" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="0">
<gearColor controller="text_color" pages="0,1" values="#ffff99,#000000|#ffff99,#000000"/>
<text id="n44_rfcn" name="text_jifen" xy="-10,126" size="153,58" group="n46_rfcn" font="ui://27vd145bg2mo7ij0" fontSize="43" color="#e0bf7b" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="0">
<gearColor controller="text_color" pages="0,1" values="#e0bf7b,#000000|#e0bf7b,#000000"/>
</text>
<group id="n46_rfcn" name="zhanji" xy="-10,126" size="153,58" advanced="true">
<gearXY controller="site" pages="2,1" values="-10,126|154,97" default="29,136"/>
@ -71,5 +66,9 @@
<item/>
<item/>
</list>
<image id="n32_kba2" name="offLine" src="fj6f1bn" fileName="images/微信图片_20250726215551_78.png" xy="0,0" size="132,132">
<gearDisplay controller="offline" pages="1"/>
<relation target="" sidePair="width-width,height-height"/>
</image>
</displayList>
</component>

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

@ -145,15 +145,17 @@
<gearXY controller="state" pages="0,1,3,4" values="1886,538|1819,82|1740,46|1752,62" default="1192,928"/>
<relation target="n155_gi99" sidePair="left-right,top-top"/>
</component>
<text id="n162_qz7i" name="text_testName" xy="47,178" size="266,49" visible="false" fontSize="36" color="#ffffff" bold="true" text="|一个玩家的名字"/>
<component id="n159_ckvb" name="Comp_ConterBox" src="gjnb107" fileName="Main_new/Main/Comp_ConterBox.xml" xy="1091,348" size="350,293" group="n169_gmbn">
<gearDisplay controller="state" pages="1,3,4"/>
<relation target="" sidePair="center-center"/>
</component>
<group id="n169_gmbn" name="conter_box" xy="1091,348" size="350,293"/>
<component id="n137_lu84" name="btn_setting" src="t6zvw5" fileName="Main_new/Main/Component/btn_setting.xml" xy="2172,12" size="141,117" group="n138_lu84">
<gearDisplay controller="state" pages="0,1,2,3,4"/>
<component id="n183_kzuz" name="btn_inviteFamily" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2415,264" size="117,249">
<gearDisplay controller="state" pages="0"/>
<relation target="" sidePair="right-right"/>
<Button icon="ui://v0j9abjyu63319u"/>
</component>
<component id="n137_lu84" name="btn_setting" src="t6zvw5" fileName="Main_new/Main/Component/btn_setting.xml" xy="2172,12" size="141,117" group="n138_lu84"/>
<component id="n170_gmbn" name="btn_more" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2412,18" pivot="0.5,0.5" size="108,96" group="n138_lu84">
<gearLook controller="more" pages="1" values="1,180,0,1" default="1,0,0,1"/>
<Button icon="ui://v0j9abjyu63319w" controller="more" page="1"/>
@ -231,11 +233,6 @@
<text id="n181_kw9h" name="n181" xy="1114,1035" size="304,79" fontSize="60" color="#ffffff" text="正在旁观中">
<gearDisplay controller="state" pages="4"/>
</text>
<component id="n183_kzuz" name="btn_inviteFamily" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2415,264" size="117,249">
<gearDisplay controller="state" pages="0"/>
<relation target="" sidePair="right-right"/>
<Button icon="ui://v0j9abjyu63319u"/>
</component>
<component id="n186_sx7x" name="n186" src="sx7x14f" fileName="Main_new/Main/Component/btn_bg.xml" xy="0,0" size="2532,1170">
<gearDisplay controller="witness" pages="1"/>
<relation target="" sidePair="width-width,height-height"/>

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

@ -6,7 +6,7 @@
<controller name="3d" pages="0,,1," selected="0"/>
<controller name="showNext" pages="0,不展示,1,展示" selected="0"/>
<controller name="showNextConfrim" pages="0,不展示,1,展示" selected="0"/>
<controller name="more" pages="0,,1," selected="0"/>
<controller name="more" pages="0,,1," selected="1"/>
<controller name="witness" pages="0,,1," selected="0"/>
<controller name="voice" pages="0,,1," selected="0"/>
<displayList>
@ -44,7 +44,7 @@
<gearXY controller="3d" pages="0,1" values="1278,-294|603,254"/>
</component>
<component id="n71_l2u4" name="com_roominfo" src="gq7m2z" fileName="Main_style_2/component/room_info/RightPanel(1).xml" xy="744,-1170" size="1329,102" group="n90_8sat" scale="1.5,1.5"/>
<component id="n88_8sat" name="btn_rule" src="gq7m4l" fileName="Main_style_2/poker/Btn_log.xml" xy="4,-885" group="n90_8sat"/>
<component id="n88_8sat" name="btn_rule--" src="gq7m4l" fileName="Main_style_2/poker/Btn_log.xml" xy="4,-885" group="n90_8sat"/>
<component id="n89_8sat" name="btn_back_jiesan" src="gq7m4n" fileName="Main_style_2/poker/Btn_back_jiesan.xml" xy="2486,-382" size="110,75" group="n90_8sat" scale="2,2">
<gearDisplay controller="state" pages="1,2"/>
</component>
@ -140,8 +140,33 @@
<relation target="" sidePair="center-center,middle-middle"/>
</group>
<component id="n132_swus" name="jing" src="ckvb11l" fileName="Main_new/Main/Component/Comp_jing.xml" xy="550,33" size="64,90" visible="false" touchable="false"/>
<component id="n137_lu84" name="btn_setting" src="t6zvw5" fileName="Main_new/Main/Component/btn_setting.xml" xy="2232,36" group="n138_lu84"/>
<group id="n138_lu84" name="top_right" xy="2232,36" size="120,120"/>
<component id="n173_ncpl" name="btn_inviteFamily" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2420,264" size="117,249">
<gearDisplay controller="state" pages="0"/>
<relation target="" sidePair="right-right"/>
<Button icon="ui://v0j9abjyu63319u"/>
</component>
<component id="n177_fj6f" name="btn_setting" src="t6zvw5" fileName="Main_new/Main/Component/btn_setting.xml" xy="2172,12" size="141,117" group="n138_lu84"/>
<component id="n178_fj6f" name="btn_more" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2412,18" pivot="0.5,0.5" size="108,96" group="n138_lu84" rotation="180">
<gearLook controller="more" pages="1" values="1,180,0,1" default="1,0,0,1"/>
<Button checked="true" icon="ui://v0j9abjyu63319w" controller="more" page="1"/>
</component>
<component id="n179_fj6f" name="btn_change" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2031,47" pivot="0.5,0.5" size="102,91" group="n138_lu84">
<gearDisplay controller="more" pages="1"/>
<Button checked="true" icon="ui://v0j9abjyu6331a4"/>
</component>
<component id="n180_fj6f" name="btn_rule" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2094,198" pivot="0.5,0.5" size="150,78" group="n138_lu84">
<gearDisplay controller="more" pages="1"/>
<Button icon="ui://v0j9abjyu6331a1"/>
</component>
<component id="n181_fj6f" name="btn_sendText" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2208,319" pivot="0.5,0.5" size="126,106" group="n138_lu84">
<gearDisplay controller="more" pages="1"/>
<Button icon="ui://v0j9abjyu6331a2"/>
</component>
<component id="n182_fj6f" name="btn_pangGuang" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2373,367" pivot="0.5,0.5" size="126,112" group="n138_lu84">
<gearDisplay controller="more" pages="1"/>
<Button icon="ui://v0j9abjyu6331a3"/>
</component>
<group id="n138_lu84" name="top_right" xy="2031,12" size="489,467"/>
<text id="n134_lu84" name="text_time" xy="162,44" size="96,49" group="n135_lu84" font="ui://27vd145bh35o7ika" fontSize="36" color="#ffffff" text="22:20"/>
<component id="n133_lu84" name="ProgressBar_jiangxi" src="lu84tv" fileName="Main_new/Main/ProgressBar_jiangxi.xml" xy="48,48" group="n135_lu84">
<ProgressBar value="50" max="100"/>
@ -223,11 +248,6 @@
<group id="n172_ncpl" name="chatTalk" xy="4,-2" size="2532,1170" advanced="true">
<gearDisplay controller="voice" pages="1"/>
</group>
<component id="n173_ncpl" name="btn_inviteFamily" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2420,264" size="117,249">
<gearDisplay controller="state" pages="0"/>
<relation target="" sidePair="right-right"/>
<Button icon="ui://v0j9abjyu63319u"/>
</component>
<component id="n174_ncpl" name="n174" src="sx7x14f" fileName="Main_new/Main/Component/btn_bg.xml" xy="5,0" size="2532,1170">
<gearDisplay controller="witness" pages="1"/>
<relation target="" sidePair="width-width,height-height"/>

6
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Btn_HandCard.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="174,186" extention="Button">
<controller name="button" pages="0,up,1,down" selected="0"/>
<controller name="jing" pages="0,,1," selected="0"/>
<controller name="jing" pages="0,,1," selected="1"/>
<controller name="move" pages="0,,1," selected="0"/>
<displayList>
<loader id="n3_hp0b" name="icon" xy="0,0" size="174,186" url="ui://Main_Majiang/b201_101" fill="scaleFree">
@ -9,9 +9,9 @@
<gearLook controller="move" pages="1" values="0.3,0,0,1" default="1,0,0,1"/>
<relation target="" sidePair="width-width,height-height"/>
</loader>
<image id="n12_k1od" name="jing" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="3,-1" size="101,52" aspect="true">
<image id="n12_k1od" name="jing" src="xblm1a5" fileName="Main_new/Main/Image/jing 1.png" xy="14,6" size="160,126">
<gearDisplay controller="jing" pages="1"/>
<gearXY controller="button" pages="0,1" values="3,-1|0,-22" duration="0.1"/>
<gearXY controller="button" pages="0,1" values="14,6|0,-22" duration="0.1"/>
<gearLook controller="move" pages="1" values="0.3,0,0,0" default="1,0,0,0"/>
<relation target="" sidePair="width-width,height-height"/>
</image>

4
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_1_FZ_Card.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="158,158">
<controller name="jing" pages="0,,1," selected="0"/>
<controller name="jing" pages="0,,1," selected="1"/>
<displayList>
<loader id="n0_gi99" name="icon" xy="0,0" size="158,158" url="ui://Main_Majiang/b202_101" fill="scaleFree">
<loader id="n0_gi99" name="icon" xy="0,0" size="158,158" url="ui://v0j9abjygmbn13n" fill="scaleFree">
<relation target="" sidePair="width-width,height-height"/>
</loader>
<image id="n1_gi99" name="n1" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="0,0" size="113,67" aspect="true">

4
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_3_FZ_Card.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="85,85">
<controller name="jing" pages="0,,1," selected="1"/>
<controller name="jing" pages="0,,1," selected="0"/>
<displayList>
<loader id="n0_gi99" name="icon" xy="0,0" size="85,85" url="ui://Main_Majiang/b202_101" fill="scale">
<loader id="n0_gi99" name="icon" xy="0,0" size="85,85" url="ui://Main_Majiang/b202_101" fill="scaleFree">
<relation target="" sidePair="width-width,height-height"/>
</loader>
<image id="n1_gi99" name="n1" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="3,0" size="44,45" aspect="true">

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

@ -130,28 +130,33 @@
<relation target="" sidePair="center-center,middle-middle"/>
</group>
<component id="n132_swus" name="jing" src="ckvb11l" fileName="Main_new/Main/Component/Comp_jing.xml" xy="550,33" size="64,90" visible="false" touchable="false"/>
<component id="n137_lu84" name="btn_setting" src="t6zvw5" fileName="Main_new/Main/Component/btn_setting.xml" xy="2232,34" group="n138_lu84"/>
<component id="n170_gmbn" name="btn_more" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2412,58" pivot="0.5,0.5" size="72,72" group="n138_lu84">
<component id="n181_ncpl" name="btn_inviteFamily" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2411,261" size="117,249">
<gearDisplay controller="state" pages="0"/>
<relation target="" sidePair="right-right"/>
<Button icon="ui://v0j9abjyu63319u"/>
</component>
<component id="n185_fj6f" name="btn_setting" src="t6zvw5" fileName="Main_new/Main/Component/btn_setting.xml" xy="2172,12" size="141,117" group="n138_lu84"/>
<component id="n186_fj6f" name="btn_more" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2412,18" pivot="0.5,0.5" size="108,96" group="n138_lu84">
<gearLook controller="more" pages="1" values="1,180,0,1" default="1,0,0,1"/>
<Button icon="ui://v0j9abjygmbn13t" controller="more" page="1"/>
<Button icon="ui://v0j9abjyu63319w" controller="more" page="1"/>
</component>
<component id="n171_gmbn" name="btn_change" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2031,31" pivot="0.5,0.5" size="102,119" group="n138_lu84">
<component id="n187_fj6f" name="btn_change" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2031,47" pivot="0.5,0.5" size="102,91" group="n138_lu84">
<gearDisplay controller="more" pages="1"/>
<Button checked="true" icon="ui://v0j9abjygmbn13p"/>
<Button checked="true" icon="ui://v0j9abjyu6331a4"/>
</component>
<component id="n172_gmbn" name="btn_rule" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2094,196" pivot="0.5,0.5" size="150,78" group="n138_lu84">
<component id="n188_fj6f" name="btn_rule" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2094,198" pivot="0.5,0.5" size="150,78" group="n138_lu84">
<gearDisplay controller="more" pages="1"/>
<Button icon="ui://v0j9abjygmbn13o"/>
<Button icon="ui://v0j9abjyu6331a1"/>
</component>
<component id="n173_gmbn" name="btn_sendText" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2208,307" pivot="0.5,0.5" size="126,126" group="n138_lu84">
<component id="n189_fj6f" name="btn_sendText" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2208,319" pivot="0.5,0.5" size="126,106" group="n138_lu84">
<gearDisplay controller="more" pages="1"/>
<Button icon="ui://v0j9abjygmbn13q"/>
<Button icon="ui://v0j9abjyu6331a2"/>
</component>
<component id="n174_gmbn" name="btn_pangGuang" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2373,358" pivot="0.5,0.5" size="126,126" group="n138_lu84">
<component id="n190_fj6f" name="btn_pangGuang" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2373,367" pivot="0.5,0.5" size="126,112" group="n138_lu84">
<gearDisplay controller="more" pages="1"/>
<Button icon="ui://v0j9abjygmbn13r"/>
<Button icon="ui://v0j9abjyu6331a3"/>
</component>
<group id="n138_lu84" name="top_right" xy="2031,31" size="468,453"/>
<group id="n138_lu84" name="top_right" xy="2031,12" size="489,467"/>
<text id="n157_ckvb" name="remaining_card" xy="897,469" size="215,74" group="n161_ckvb" font="ui://27vd145bh35o7ik0" fontSize="56" color="#cccccc" align="center" vAlign="middle" bold="true" text="余999张">
<gearDisplay controller="state" pages="1,3"/>
<relation target="n159_ckvb" sidePair="right-left"/>
@ -262,11 +267,6 @@
<group id="n180_ncpl" name="chatTalk" xy="1,-5" size="2532,1170" advanced="true">
<gearDisplay controller="voice" pages="1"/>
</group>
<component id="n181_ncpl" name="btn_inviteFamily" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2411,261" size="117,249">
<gearDisplay controller="state" pages="0"/>
<relation target="" sidePair="right-right"/>
<Button icon="ui://v0j9abjyu63319u"/>
</component>
<component id="n182_ncpl" name="n182" src="sx7x14f" fileName="Main_new/Main/Component/btn_bg.xml" xy="-4,-3" size="2532,1170">
<gearDisplay controller="witness" pages="1"/>
<relation target="" sidePair="width-width,height-height"/>

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

@ -1455,6 +1455,9 @@
<movieclip id="otcu1bi" name="Missile_flower.jta" path="/Missile/" exported="true" atlas="10"/>
<image id="qncf1bj" name="exit_room.png" path="/Main_new/Main/Image/"/>
<component id="mwqz1bk" name="Btn_RemindCard.xml" path="/Main_new/Clearing/Component/" exported="true"/>
<image id="fj6f1bl" name="离线.png" path="/images/"/>
<image id="fj6f1bm" name="xzmj_result_35 1.png" path="/images/"/>
<image id="fj6f1bn" name="微信图片_20250726215551_78.png" path="/images/"/>
</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/Family/ui/Family_fui.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 MiB

After

Width:  |  Height:  |  Size: 2.2 MiB

BIN
wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 MiB

After

Width:  |  Height:  |  Size: 4.5 MiB

BIN
wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 MiB

After

Width:  |  Height:  |  Size: 3.5 MiB

BIN
wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 MiB

After

Width:  |  Height:  |  Size: 1.5 MiB

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

Binary file not shown.

BIN
wb_unity_pro/Assets/ART/extend/majiang/lichuan/bg/bg1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 530 KiB

BIN
wb_unity_pro/Assets/ART/extend/majiang/lichuan/bg/bg2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 236 KiB

After

Width:  |  Height:  |  Size: 1022 KiB

BIN
wb_unity_pro/Assets/ART/extend/majiang/lichuan/bg/bg3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 2.7 MiB

BIN
wb_unity_pro/Assets/ART/extend/majiang/lichuan/bg/bg4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 132 KiB