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

设置界面

master
DESKTOP-7R8JEQQ\k 2025-07-10 01:52:55 +08:00
parent 5c6f18656f
commit ae902d0c42
37 changed files with 154 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -280,7 +280,7 @@ Protocol = {
-- 进入亲友圈 -- 进入亲友圈
WEB_FG_GET_ONLINE_MEMBER = "group/get_online_member", WEB_FG_GET_ONLINE_MEMBER = "group/get_online_member",
-- 退出亲友圈 -- 退出亲友圈
WEB_FG_GET_OFFLINE_MEMBER = "get_offline_member", WEB_FG_GET_OFFLINE_MEMBER = "group/get_offline_member",
-------------- group-log--------------------- -------------- group-log---------------------
-- 获取奖励日志 -- 获取奖励日志
WEB_FG_GET_REWARDS_LOG = "group/log/get_reward_log", WEB_FG_GET_REWARDS_LOG = "group/log/get_reward_log",

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

@ -71,7 +71,7 @@ function FamilyMyfamilyList:Init()
local loader_icon = obj:GetChild("loader_icon") local loader_icon = obj:GetChild("loader_icon")
tex_familyId.text = group.id tex_familyId.text = group.id
tex_familyName.text = group.name tex_familyName.text = Utils.TextOmit(group.name, 6)
tex_familyNumber.text = group.total_member_num tex_familyNumber.text = group.total_member_num
ImageLoad.Load(group.o_portrait, loader_icon) ImageLoad.Load(group.o_portrait, loader_icon)

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

@ -30,6 +30,13 @@ local function FamilyOnline(groupId)
end) end)
end end
local function FamilyOffline(groupId)
local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_Get_Offline_Member(groupId, function(res)
end)
end
function FamilyView.new() function FamilyView.new()
UIPackage.AddPackage("base/Family/ui/Family") UIPackage.AddPackage("base/Family/ui/Family")
@ -127,6 +134,11 @@ function M:InitCloseClick()
self.btn_close.onClick:Set(function() self.btn_close.onClick:Set(function()
print("lingmengfamily", self.lastType, self.familyType.selectedIndex) print("lingmengfamily", self.lastType, self.familyType.selectedIndex)
if not self.lastType or self.familyType.selectedIndex == 1 then if not self.lastType or self.familyType.selectedIndex == 1 then
if self._group then
FamilyOffline(self._group.id)
end
ControllerManager.ChangeController(LoddyController) ControllerManager.ChangeController(LoddyController)
ViewManager.ChangeView(ViewManager.View_Lobby) ViewManager.ChangeView(ViewManager.View_Lobby)
else else
@ -329,6 +341,10 @@ function M:ChangeNumber(fgCtr, group_id, limit, num, minus_only, sort_type)
end end
function M:ConnetFamilyRoom(fgCtr, id) function M:ConnetFamilyRoom(fgCtr, id)
if self._group then
FamilyOffline(self._group.id)
end
fgCtr:FG_EnterGroup(id, function(res) fgCtr:FG_EnterGroup(id, function(res)
ViewUtil:CloseModalWait() ViewUtil:CloseModalWait()
if res.ReturnCode ~= 0 then if res.ReturnCode ~= 0 then
@ -563,7 +579,6 @@ function M:ConnetFamily(index, groups, isCreate)
obj:GetChild("title").emojies = EmojiDitc.EmojiesDitc obj:GetChild("title").emojies = EmojiDitc.EmojiesDitc
obj.text = Utils.TextOmit(groups[j].name, 6) obj.text = Utils.TextOmit(groups[j].name, 6)
obj.onClick:Add(function() obj.onClick:Add(function()
if groups[j].id == self._group.id then if groups[j].id == self._group.id then
ViewUtil.ShowBannerOnScreenCenter("已在家族中") ViewUtil.ShowBannerOnScreenCenter("已在家族中")
return return

24
lua_probject/extend_project/extend/majiang/jinxi/EXSettingView.lua
View File

@ -5,6 +5,19 @@ local EXSettingView = {}
local M = EXSettingView local M = EXSettingView
setmetatable(M, { __index = BaseWindow }) setmetatable(M, { __index = BaseWindow })
function EXSettingView:Show(room)
self._room = room
local roomOwner = self._room.owner_id
if roomOwner == DataManager.SelfUser.account_id then
self.cBtn.selectedIndex = 1
else
self.cBtn.selectedIndex = 0
end
BaseWindow.Show(self)
end
function EXSettingView.new(main_view) function EXSettingView.new(main_view)
local self = setmetatable({}, { __index = M }) local self = setmetatable({}, { __index = M })
self.class = 'EXSettingView' self.class = 'EXSettingView'
@ -23,6 +36,9 @@ function M:init(url)
local btn_music = view:GetChild('btn_vedio_music') local btn_music = view:GetChild('btn_vedio_music')
local btn_sound = view:GetChild('btn_vedio_sound') local btn_sound = view:GetChild('btn_vedio_sound')
self.cBtn = self._view:GetController('cBtn')
-- slider_sound.value = GameApplication.Instance.SoundValue -- slider_sound.value = GameApplication.Instance.SoundValue
-- slider_music.value = GameApplication.Instance.MusicValue -- slider_music.value = GameApplication.Instance.MusicValue
@ -55,6 +71,14 @@ function M:init(url)
_gamectr:AskDismissRoom() _gamectr:AskDismissRoom()
end end
end) end)
self._view:GetChild("btn_cancelRoom").onClick:Set(function()
local _gamectr = ControllerManager.GetController(GameController)
_gamectr:LevelRoom(function(res)
print("退出房间")
pt(res)
end)
end)
end end
return M return M

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

@ -84,7 +84,7 @@ function M:InitView(url)
self._showNextName = nil self._showNextName = nil
end) end)
local btn_closeRoom = self._view:GetChild("btn_setting") local btn_setting = self._view:GetChild("btn_setting")
self._view:GetChild('btn_closeRoom').onClick:Set(function() self._view:GetChild('btn_closeRoom').onClick:Set(function()
---[[ ---[[
@ -124,9 +124,9 @@ function M:InitView(url)
--]] --]]
end) end)
btn_closeRoom.onClick:Add(handler(self, function() btn_setting.onClick:Add(handler(self, function()
local settingView = SettingView.new(self) local settingView = SettingView.new(self)
settingView:Show() settingView:Show(self._room)
end)) end))
-------- --------

20
wb_new_ui/assets/Common/MessageBox.xml
View File

@ -1,20 +1,18 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="737,595"> <component size="682,406">
<displayList> <displayList>
<image id="n19_nuxq" name="bg" src="nuxq7ije" fileName="font/images/win/bxx_bg_01.png" xy="0,0" size="737,493"> <component id="n20_xblm" name="btn_close1" src="xblm7jbn" fileName="buttons/btn_bg.xml" xy="-1159,-547" size="3000,1500"/>
<image id="n19_nuxq" name="bg" src="xblm7jbk" fileName="images/bg.png" xy="0,0" size="682,406">
<relation target="" sidePair="width-width,height-height"/> <relation target="" sidePair="width-width,height-height"/>
</image> </image>
<text id="n7_m0vo" name="tex_message" xy="17,81" size="705,289" font="ui://27vd145bqz637ij2" fontSize="34" color="#495f55" align="center" vAlign="middle" ubb="true" autoSize="none" text="空间和空间"/> <text id="n7_m0vo" name="tex_message" xy="0,110" size="682,151" font="Alimama FangYuanTi VF" fontSize="36" color="#614103" align="center" vAlign="middle" ubb="true" autoSize="none" text="空间和空间&#xA;空间和空间"/>
<component id="n4_m0vo" name="btn_ok" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="90,391" group="n8_m0vo"> <component id="n4_m0vo" name="btn_ok" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="86,272" size="235,92" group="n8_m0vo">
<Button title=" " icon="ui://27vd145bl2997icd"/> <Button title=" " icon="ui://27vd145bxblm7jbl"/>
</component> </component>
<component id="n15_cvc8" name="btn_close" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="387,391" group="n8_m0vo"> <component id="n15_cvc8" name="btn_close" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="361,272" size="235,92" group="n8_m0vo">
<Button title=" " icon="ui://27vd145bcvc87i5s"/> <Button title=" " icon="ui://27vd145bxblm7jbm"/>
</component>
<group id="n8_m0vo" name="n8" xy="90,391" size="559,82"/>
<component id="n11_lk2r" name="btn_close1" src="vg2c4" fileName="buttons/Btn_close.xml" xy="687,-26">
<Button icon="ui://27vd145bm0eibv"/>
</component> </component>
<group id="n8_m0vo" name="n8" xy="86,272" size="510,92"/>
<component id="n17_vtgq" name="btnCheck" src="h1uu3i" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="286,324" visible="false"> <component id="n17_vtgq" name="btnCheck" src="h1uu3i" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="286,324" visible="false">
<Button title="设置全部"/> <Button title="设置全部"/>
</component> </component>

14
wb_new_ui/assets/Common/MessageBox1.xml
View File

@ -1,15 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="737,595"> <component size="682,406">
<displayList> <displayList>
<image id="n17_nuxq" name="bg" src="nuxq7ije" fileName="font/images/win/bxx_bg_01.png" xy="0,0" size="737,493"> <component id="n19_xblm" name="btn_close1" src="xblm7jbn" fileName="buttons/btn_bg.xml" xy="-1159,-547" size="3000,1500"/>
<image id="n17_nuxq" name="bg" src="xblm7jbk" fileName="images/bg.png" xy="0,0" size="682,406">
<relation target="" sidePair="width-width,height-height"/> <relation target="" sidePair="width-width,height-height"/>
</image> </image>
<text id="n7_m0vo" name="tex_message" xy="17,81" size="705,289" font="ui://27vd145bqz637ij2" fontSize="34" color="#495f55" align="center" vAlign="middle" ubb="true" autoSize="none" text="空间和空间"/> <text id="n18_xblm" name="tex_message" xy="0,110" size="682,149" font="Alimama FangYuanTi VF" fontSize="36" color="#614103" align="center" vAlign="middle" ubb="true" autoSize="none" text="空间和空间&#xA;空间和空间"/>
<component id="n4_m0vo" name="btn_ok" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="255,391"> <component id="n4_m0vo" name="btn_ok" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="223,272" size="235,92">
<Button title=" " icon="ui://27vd145bcvc87i5i"/> <Button title=" " icon="ui://27vd145bxblm7jbl"/>
</component>
<component id="n11_lk2r" name="btn_close1" src="vg2c4" fileName="buttons/Btn_close.xml" xy="687,-26">
<Button icon="ui://27vd145bm0eibv"/>
</component> </component>
<component id="n15_f6mj" name="btnCheck" src="h1uu3i" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="-489,272" visible="false"> <component id="n15_f6mj" name="btnCheck" src="h1uu3i" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="-489,272" visible="false">
<Button title="是否设置全部单局"/> <Button title="是否设置全部单局"/>

6
wb_new_ui/assets/Common/buttons/Btn_Common.xml
View File

@ -2,10 +2,10 @@
<component size="262,82" extention="Button"> <component size="262,82" extention="Button">
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/> <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
<displayList> <displayList>
<loader id="n1_eeqm" name="icon" xy="0,0" size="262,82" url="ui://27vd145bofsx1k" align="center" vAlign="middle"> <text id="n2_ovii" name="title" xy="0,0" pivot="0.5,0.5" size="262,82" visible="false" font="Arial" fontSize="36" color="#ffffff" align="center" vAlign="middle" letterSpacing="5" autoSize="none" text="确定"/>
<loader id="n1_eeqm" name="icon" xy="0,0" size="262,82" url="ui://27vd145bofsx1k" align="center" vAlign="middle" fill="scaleFree">
<relation target="" sidePair="width-width,height-height"/> <relation target="" sidePair="width-width,height-height"/>
</loader> </loader>
<text id="n2_ovii" name="title" xy="0,0" pivot="0.5,0.5" size="262,82" font="Arial" fontSize="36" color="#ffffff" align="center" vAlign="middle" letterSpacing="5" autoSize="none" text="确定"/>
</displayList> </displayList>
<Button downEffect="dark" downEffectValue=".8"/> <Button downEffect="dark" downEffectValue="0.8"/>
</component> </component>

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

@ -2082,6 +2082,10 @@
<image id="tx8e7jbh" name="1f4a4.png" path="/images/Emojies/" exported="true"/> <image id="tx8e7jbh" name="1f4a4.png" path="/images/Emojies/" exported="true"/>
<image id="tx8e7jbi" name="1f3c9.png" path="/images/Emojies/" exported="true"/> <image id="tx8e7jbi" name="1f3c9.png" path="/images/Emojies/" exported="true"/>
<image id="tx8e7jbj" name="1f539.png" path="/images/Emojies/" exported="true"/> <image id="tx8e7jbj" name="1f539.png" path="/images/Emojies/" exported="true"/>
<image id="xblm7jbk" name="bg.png" path="/images/"/>
<image id="xblm7jbl" name="queren_btn1.png" path="/images/"/>
<image id="xblm7jbm" name="bt_cancel1.png" path="/images/"/>
<component id="xblm7jbn" name="btn_bg.xml" path="/buttons/" exported="true"/>
</resources> </resources>
<publish name="Common" path="..\wb_unity_pro\Assets\ART\base\common\ui" packageCount="2" maxAtlasSize="2048"> <publish name="Common" path="..\wb_unity_pro\Assets\ART\base\common\ui" packageCount="2" maxAtlasSize="2048">
<atlas name="默认" index="0"/> <atlas name="默认" index="0"/>

2
wb_new_ui/assets/Family/MyFamily/Component/item_myFamilyList.xml
View File

@ -10,7 +10,7 @@
<loader id="n1_yk1o" name="loader_icon" xy="30,24" size="186,186" group="n10_q3uh" align="center" vAlign="middle" fill="scaleMatchHeight"/> <loader id="n1_yk1o" name="loader_icon" xy="30,24" size="186,186" group="n10_q3uh" align="center" vAlign="middle" fill="scaleMatchHeight"/>
<image id="n6_yk1o" name="n6" src="yk1o7d40" fileName="MyFamily/Image/hall_club_common_club_liebiao_icon_renshu.png" xy="555,54" group="n10_q3uh"/> <image id="n6_yk1o" name="n6" src="yk1o7d40" fileName="MyFamily/Image/hall_club_common_club_liebiao_icon_renshu.png" xy="555,54" group="n10_q3uh"/>
<text id="n7_yk1o" name="tex_familyId" xy="282,52" size="243,49" group="n10_q3uh" font="ui://27vd145bg2mo7ij0" fontSize="36" color="#940f0e" vAlign="middle" autoSize="none" text="940F0E"/> <text id="n7_yk1o" name="tex_familyId" xy="282,52" size="243,49" group="n10_q3uh" font="ui://27vd145bg2mo7ij0" fontSize="36" color="#940f0e" vAlign="middle" autoSize="none" text="940F0E"/>
<text id="n8_yk1o" name="tex_familyName" xy="282,112" size="292,64" group="n10_q3uh" font="ui://27vd145bg2mo7ij0" fontSize="48" color="#333333" vAlign="middle" autoSize="none" text="333333"/> <text id="n8_yk1o" name="tex_familyName" xy="282,112" size="392,64" group="n10_q3uh" font="ui://27vd145bg2mo7ij0" fontSize="48" color="#333333" vAlign="middle" autoSize="none" text="家族名字家族名字"/>
<text id="n9_yk1o" name="tex_familyNumber" xy="595,43" size="272,56" group="n10_q3uh" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#333333" vAlign="middle" autoSize="none" text="333333"/> <text id="n9_yk1o" name="tex_familyNumber" xy="595,43" size="272,56" group="n10_q3uh" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#333333" vAlign="middle" autoSize="none" text="333333"/>
<group id="n10_q3uh" name="n10" xy="30,24" size="837,186" advanced="true"> <group id="n10_q3uh" name="n10" xy="30,24" size="837,186" advanced="true">
<relation target="" sidePair="left-left"/> <relation target="" sidePair="left-left"/>

39
wb_new_ui/assets/Lobby/Setting.xml
View File

@ -1,24 +1,31 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="1500,876"> <component size="1438,899">
<displayList> <displayList>
<image id="n0_tme1" name="bg1" src="tme17cqv" fileName="component/Setting/Image/Rectangle 39@3x.png" xy="0,0" group="n4_tme1"/> <image id="n16_xblm" name="n16" src="xblm7czh" fileName="component/Setting/Image/bg.png" xy="0,0" size="1438,899" group="n4_tme1">
<image id="n1_tme1" name="bg2" src="tme17cqq" fileName="component/Setting/Image/Group 69@3x.png" xy="30,45" group="n4_tme1"/> <relation target="" sidePair="width-width,height-height"/>
<image id="n2_tme1" name="bg_title" src="tme17cqp" fileName="component/Setting/Image/Group 68@3x.png" xy="30,30" group="n4_tme1"/> </image>
<image id="n3_tme1" name="title" src="tme17cqy" fileName="component/Setting/Image/设置@3x.png" xy="668,57" group="n4_tme1"/> <group id="n4_tme1" name="bg" xy="0,0" size="1438,899"/>
<group id="n4_tme1" name="bg" xy="0,0" size="1500,876"/> <text id="n17_xblm" name="title_click" xy="213,272" size="151,94" group="n20_xblm" font="ui://27vd145bh35o7ilb" fontSize="72" color="#695741" leading="0" letterSpacing="5" text="音效"/>
<text id="n5_tme1" name="title_sound" xy="213,242" size="153,94" group="n10_tme1" fontSize="72" color="#695741" leading="0" letterSpacing="5" text="音效"/> <component id="n21_xblm" name="btn_singleClick" src="xblm7czl" fileName="checkbtn_click.xml" xy="435,294" group="n20_xblm" customData="n2.text = &quot;双击&quot;">
<component id="n8_tme1" name="slider_vedio_sound" src="tme17cr6" fileName="component/Setting/Component/slider_vedio.xml" xy="417,267" group="n10_tme1"> <Button title="单击"/>
</component>
<component id="n22_xblm" name="btn_doubleClick" src="xblm7czl" fileName="checkbtn_click.xml" xy="654,294" group="n20_xblm" customData="n2.text = &quot;双击&quot;">
<Button title="单击"/>
</component>
<group id="n20_xblm" name="click" xy="213,272" size="491,94"/>
<text id="n5_tme1" name="title_sound" xy="213,406" size="151,94" group="n10_tme1" font="ui://27vd145bh35o7ilb" fontSize="72" color="#695741" leading="0" letterSpacing="5" text="音效"/>
<component id="n8_tme1" name="slider_vedio_sound" src="tme17cr6" fileName="component/Setting/Component/slider_vedio.xml" xy="417,431" group="n10_tme1">
<Slider value="50" max="100"/> <Slider value="50" max="100"/>
</component> </component>
<component id="n14_koxj" name="btn_vedio_sound" src="tme17cqz" fileName="component/Setting/Component/btn_vedio.xml" xy="1206,255" group="n10_tme1"/> <component id="n14_koxj" name="btn_vedio_sound" src="tme17cqz" fileName="component/Setting/Component/btn_vedio.xml" xy="1206,419" group="n10_tme1"/>
<group id="n10_tme1" name="sound" xy="213,242" size="1071,94"/> <group id="n10_tme1" name="sound" xy="213,406" size="1071,94"/>
<text id="n7_tme1" name="title_music" xy="213,410" size="153,94" group="n11_tme1" fontSize="72" color="#695741" leading="0" letterSpacing="5" text="音乐"/> <text id="n7_tme1" name="title_music" xy="213,540" size="151,94" group="n11_tme1" font="ui://27vd145bh35o7ilb" fontSize="72" color="#695741" leading="0" letterSpacing="5" text="音乐"/>
<component id="n9_tme1" name="slider_vedio_music" src="tme17cr6" fileName="component/Setting/Component/slider_vedio.xml" xy="417,435" group="n11_tme1"> <component id="n9_tme1" name="slider_vedio_music" src="tme17cr6" fileName="component/Setting/Component/slider_vedio.xml" xy="417,565" group="n11_tme1">
<Slider value="50" max="100"/> <Slider value="50" max="100"/>
</component> </component>
<component id="n15_koxj" name="btn_vedio_music" src="tme17cqz" fileName="component/Setting/Component/btn_vedio.xml" xy="1206,423" group="n11_tme1"/> <component id="n15_koxj" name="btn_vedio_music" src="tme17cqz" fileName="component/Setting/Component/btn_vedio.xml" xy="1206,553" group="n11_tme1"/>
<group id="n11_tme1" name="music" xy="213,410" size="1071,94"/> <group id="n11_tme1" name="music" xy="213,540" size="1071,94"/>
<component id="n12_tme1" name="btn_exitAccount" src="tme17cr1" fileName="component/Setting/Component/btn_exitAccount.xml" xy="876,582"/> <component id="n12_tme1" name="btn_exitAccount" src="tme17cr1" fileName="component/Setting/Component/btn_exitAccount.xml" xy="876,674"/>
<component id="n13_tme1" name="btn_switchAccount" src="tme17cr0" fileName="component/Setting/Component/btn_switchAccount.xml" xy="216,582"/> <component id="n13_tme1" name="btn_switchAccount" src="tme17cr0" fileName="component/Setting/Component/btn_switchAccount.xml" xy="216,674"/>
</displayList> </displayList>
</component> </component>

2
wb_new_ui/assets/Lobby/component/Setting/Component/btn_exitAccount.xml
View File

@ -2,7 +2,7 @@
<component size="408,159" extention="Button"> <component size="408,159" extention="Button">
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/> <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
<displayList> <displayList>
<image id="n3_tme1" name="n3" src="tme17cqr" fileName="component/Setting/Image/Group 75@3x.png" xy="0,0" size="408,159"/> <image id="n3_tme1" name="n3" src="xblm7czi" fileName="component/Setting/Image/Setting_6.png" xy="0,0" size="408,159"/>
</displayList> </displayList>
<Button mode="Radio"/> <Button mode="Radio"/>
</component> </component>

5
wb_new_ui/assets/Lobby/package.xml
View File

@ -576,6 +576,11 @@
<image id="p8hp7cze" name="jinximajiang2.png" path="/component/CreatePlay/Image/" exported="true"/> <image id="p8hp7cze" name="jinximajiang2.png" path="/component/CreatePlay/Image/" exported="true"/>
<image id="p8hp7czf" name="nanchengmajiang1.png" path="/component/CreatePlay/Image/" exported="true"/> <image id="p8hp7czf" name="nanchengmajiang1.png" path="/component/CreatePlay/Image/" exported="true"/>
<image id="p8hp7czg" name="nanchengmajiang2.png" path="/component/CreatePlay/Image/" exported="true"/> <image id="p8hp7czg" name="nanchengmajiang2.png" path="/component/CreatePlay/Image/" exported="true"/>
<image id="xblm7czh" name="bg.png" path="/component/Setting/Image/"/>
<image id="xblm7czi" name="Setting_6.png" path="/component/Setting/Image/"/>
<image id="xblm7czj" name="btn_dianxinchongzhi_2.png" path="/component/Setting/Image/"/>
<image id="xblm7czk" name="btn_dianxinchongzhi_1.png" path="/component/Setting/Image/"/>
<component id="xblm7czl" name="checkbtn_click.xml" path="/"/>
</resources> </resources>
<publish name="Lobby" path="..\wb_unity_pro\Assets\ART\base\lobby\ui" packageCount="2"> <publish name="Lobby" path="..\wb_unity_pro\Assets\ART\base\lobby\ui" packageCount="2">
<atlas name="默认" index="0"/> <atlas name="默认" index="0"/>

2
wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_closeRoom.xml
View File

@ -2,7 +2,7 @@
<component size="360,129" extention="Button"> <component size="360,129" extention="Button">
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/> <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
<displayList> <displayList>
<image id="n3_pkx5" name="n3" src="u63319y" fileName="Main_new/Main/Image/dismiss_room.png" xy="0,0" size="360,129"> <image id="n3_pkx5" name="n3" src="xblm1a9" fileName="Main_new/Main/Image/Setting_6.png" xy="0,0" size="360,129">
<relation target="" sidePair="width-width,height-height"/> <relation target="" sidePair="width-width,height-height"/>
</image> </image>
</displayList> </displayList>

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

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="2532,1170"> <component size="2532,1170">
<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="sdk" pages="0,,1," selected="0"/>
<controller name="action" pages="2,空,0,准备,1,开始" selected="0"/> <controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
<controller name="3d" pages="0,,1," selected="0"/> <controller name="3d" pages="0,,1," selected="0"/>
<controller name="showNext" pages="0,不展示,1,展示" selected="0"/> <controller name="showNext" pages="0,不展示,1,展示" selected="0"/>
<controller name="showNextConfrim" pages="0,不展示,1,展示" selected="1"/> <controller name="showNextConfrim" pages="0,不展示,1,展示" selected="0"/>
<controller name="more" pages="0,,1," selected="0"/> <controller name="more" pages="0,,1," selected="0"/>
<controller name="witness" pages="0,,1," selected="0"/> <controller name="witness" pages="0,,1," selected="0"/>
<controller name="voice" pages="0,,1," selected="0"/> <controller name="voice" pages="0,,1," selected="0"/>
@ -80,7 +80,7 @@
<gearDisplay controller="action" pages="0"/> <gearDisplay controller="action" pages="0"/>
</component> </component>
<component id="n122_pkx5" name="btn_invite" src="pkx5sx" fileName="Main_new/Main/Component/btn_invite.xml" xy="1281,522" size="408,114" group="n125_pkx5"/> <component id="n122_pkx5" name="btn_invite" src="pkx5sx" fileName="Main_new/Main/Component/btn_invite.xml" xy="1281,522" size="408,114" group="n125_pkx5"/>
<component id="n124_pkx5" name="btn_closeRoom" src="pkx5sv" fileName="Main_new/Main/Component/btn_closeRoom.xml" xy="777,522" size="408,114" group="n125_pkx5"/> <component id="n124_pkx5" name="btn_closeRoom" src="xblm1an" fileName="Main_new/Main/Component/btn_gameDismissRoom.xml" xy="777,522" size="408,114" group="n125_pkx5"/>
<group id="n125_pkx5" name="readyBtn" xy="777,522" size="912,249" advanced="true"> <group id="n125_pkx5" name="readyBtn" xy="777,522" size="912,249" advanced="true">
<gearDisplay controller="state" pages="0"/> <gearDisplay controller="state" pages="0"/>
<relation target="" sidePair="center-center,middle-middle"/> <relation target="" sidePair="center-center,middle-middle"/>
@ -124,23 +124,23 @@
<group id="n179_eqmd" name="center_text" xy="418,489" size="1696,172" advanced="true"> <group id="n179_eqmd" name="center_text" xy="418,489" size="1696,172" advanced="true">
<relation target="" sidePair="center-center"/> <relation target="" sidePair="center-center"/>
</group> </group>
<component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="100,808" size="153,120"> <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,921" size="153,120">
<gearDisplay controller="state" pages="0,2"/> <gearDisplay controller="state" pages="0,2"/>
<gearXY controller="state" pages="0,1,2" values="1189,921|100,808|1183,921" default="1183,921"/> <gearXY controller="state" pages="0,1,2" values="1189,921|100,808|1183,921" default="1183,921"/>
<gearSize controller="state" pages="0,1" values="153,120,1,1|153,120,1,1" default="144,144,1,1"/> <gearSize controller="state" pages="0,1" values="153,120,1,1|153,120,1,1" default="144,144,1,1"/>
<relation target="" sidePair="center-center,bottom-bottom"/> <relation target="" sidePair="center-center,bottom-bottom"/>
</component> </component>
<component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="100,796" size="153,132"> <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="739,916" size="153,132">
<gearDisplay controller="state" pages="1,3,4"/> <gearDisplay controller="state" pages="1,3,4"/>
<gearXY controller="state" pages="1,3,4" values="100,796|73,784|71,774" default="739,916"/> <gearXY controller="state" pages="1,3,4" values="100,796|73,784|71,774" default="739,916"/>
<relation target="n118_pkx5" sidePair="right-left,top-top"/> <relation target="n118_pkx5" sidePair="right-left,top-top"/>
</component> </component>
<component id="n150_kxhm" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1834,63" size="153,132"> <component id="n150_kxhm" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,274" size="153,132">
<gearDisplay controller="state" pages="0,2"/> <gearDisplay controller="state" pages="0,2"/>
<gearXY controller="state" pages="0,1,2" values="1189,274|1834,63|1188,274" default="1188,909"/> <gearXY controller="state" pages="0,1,2" values="1189,274|1834,63|1188,274" default="1188,909"/>
<relation target="" sidePair="center-center,top-top"/> <relation target="" sidePair="center-center,top-top"/>
</component> </component>
<component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="1819,82" size="153,132"> <component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="1886,538" size="153,132">
<gearDisplay controller="state" pages="1,3,4"/> <gearDisplay controller="state" pages="1,3,4"/>
<gearXY controller="state" pages="0,1,3,4" values="1886,538|1819,82|1740,46|1752,62" default="1192,928"/> <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"/> <relation target="n155_gi99" sidePair="left-right,top-top"/>

49
wb_new_ui/assets/Main_Majiang/Main_new/Setting/Setting.xml
View File

@ -1,23 +1,38 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="1500,876"> <component size="1438,899">
<controller name="cBtn" pages="0,,1," selected="0">
<remark page="0" value="退出房间"/>
<remark page="1" value="申请解散房间"/>
</controller>
<displayList> <displayList>
<image id="n0_tme1" name="bg1" src="gjnbzq" fileName="Main_new_2/Setting/Image/Rectangle 39@3x.png" xy="0,0" group="n4_tme1"/> <image id="n17_xblm" name="n17" src="xblm1a8" fileName="Main_new/Main/Image/bg.png" xy="0,0" size="1438,899">
<image id="n1_tme1" name="bg2" src="gjnbzr" fileName="Main_new_2/Setting/Image/Group 69@3x.png" xy="30,45" group="n4_tme1"/> <relation target="" sidePair="width-width,height-height"/>
<image id="n2_tme1" name="bg_title" src="gjnbzs" fileName="Main_new_2/Setting/Image/Group 68@3x.png" xy="30,30" group="n4_tme1"/> </image>
<image id="n3_tme1" name="title" src="gjnbzt" fileName="Main_new_2/Setting/Image/设置@3x.png" xy="668,57" group="n4_tme1"/> <text id="n21_xblm" name="title_click" xy="205,263" size="151,94" group="n24_xblm" font="ui://27vd145bh35o7ilb" fontSize="72" color="#695741" leading="0" letterSpacing="5" text="音效"/>
<group id="n4_tme1" name="bg" xy="0,0" size="1500,876"/> <component id="n22_xblm" name="btn_singleClick" src="xblm1ad" fileName="checkbtn_click.xml" xy="427,285" group="n24_xblm" customData="n2.text = &quot;双击&quot;">
<text id="n5_tme1" name="title_sound" xy="213,242" size="153,94" group="n10_tme1" fontSize="72" color="#695741" leading="0" letterSpacing="5" text="音效"/> <Button title="单击"/>
<component id="n8_tme1" name="slider_vedio_sound" src="gjnbzu" fileName="Main_new_2/Setting/Component/slider_vedio.xml" xy="417,267" group="n10_tme1">
<Slider max="100"/>
</component> </component>
<component id="n14_koxj" name="btn_vedio_sound" src="gjnbzy" fileName="Main_new_2/Setting/Component/btn_vedio.xml" xy="1206,255" group="n10_tme1"/> <component id="n23_xblm" name="btn_doubleClick" src="xblm1ad" fileName="checkbtn_click.xml" xy="646,285" group="n24_xblm" customData="n2.text = &quot;双击&quot;">
<group id="n10_tme1" name="sound" xy="213,242" size="1071,94"/> <Button title="单击"/>
<text id="n7_tme1" name="title_music" xy="213,410" size="153,94" group="n11_tme1" fontSize="72" color="#695741" leading="0" letterSpacing="5" text="音乐"/> </component>
<component id="n9_tme1" name="slider_vedio_music" src="gjnbzu" fileName="Main_new_2/Setting/Component/slider_vedio.xml" xy="417,435" group="n11_tme1"> <group id="n24_xblm" name="click" xy="205,263" size="491,94"/>
<Slider max="100"/> <text id="n25_xblm" name="title_sound" xy="205,397" size="151,94" group="n28_xblm" font="ui://27vd145bh35o7ilb" fontSize="72" color="#695741" leading="0" letterSpacing="5" text="音效"/>
<component id="n26_xblm" name="slider_vedio_sound" src="xblm1ag" fileName="component/Setting/Component/slider_vedio.xml" xy="409,422" group="n28_xblm">
<Slider value="50" max="100"/>
</component>
<component id="n27_xblm" name="btn_vedio_sound" src="xblm1ak" fileName="component/Setting/Component/btn_vedio.xml" xy="1198,410" group="n28_xblm"/>
<group id="n28_xblm" name="sound" xy="205,397" size="1071,94"/>
<text id="n29_xblm" name="title_music" xy="205,531" size="151,94" group="n32_xblm" font="ui://27vd145bh35o7ilb" fontSize="72" color="#695741" leading="0" letterSpacing="5" text="音乐"/>
<component id="n30_xblm" name="slider_vedio_music" src="xblm1ag" fileName="component/Setting/Component/slider_vedio.xml" xy="409,556" group="n32_xblm">
<Slider value="50" max="100"/>
</component>
<component id="n31_xblm" name="btn_vedio_music" src="xblm1ak" fileName="component/Setting/Component/btn_vedio.xml" xy="1198,544" group="n32_xblm"/>
<group id="n32_xblm" name="music" xy="205,531" size="1071,94"/>
<component id="n16_qt01" name="btn_closeRoom" src="pkx5sv" fileName="Main_new/Main/Component/btn_closeRoom.xml" xy="539,674" scale="1.2,1.2">
<gearDisplay controller="cBtn" pages="0"/>
</component>
<component id="n20_xblm" name="btn_cancelRoom" src="xblm1ac" fileName="Main_new/Main/Component/btn_cancelRoom.xml" xy="511,674">
<gearDisplay controller="cBtn" pages="1"/>
</component> </component>
<component id="n15_koxj" name="btn_vedio_music" src="gjnbzy" fileName="Main_new_2/Setting/Component/btn_vedio.xml" xy="1206,423" group="n11_tme1"/>
<group id="n11_tme1" name="music" xy="213,410" size="1071,94"/>
<component id="n16_qt01" name="btn_closeRoom" src="pkx5sv" fileName="Main_new_2/StartAndReady/Component/btn_closeRoom.xml" xy="570,595" scale="1.2,1.2"/>
</displayList> </displayList>
</component> </component>

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

@ -1407,6 +1407,21 @@
<image id="xblm1a5" name="jing 1.png" path="/Main_new/Main/Image/"/> <image id="xblm1a5" name="jing 1.png" path="/Main_new/Main/Image/"/>
<image id="xblm1a6" name="di.png" path="/Main_new/Main/Image/"/> <image id="xblm1a6" name="di.png" path="/Main_new/Main/Image/"/>
<image id="xblm1a7" name="di2.png" path="/Main_new/Main/Image/"/> <image id="xblm1a7" name="di2.png" path="/Main_new/Main/Image/"/>
<image id="xblm1a8" name="bg.png" path="/Main_new/Main/Image/"/>
<image id="xblm1a9" name="Setting_6.png" path="/Main_new/Main/Image/"/>
<image id="xblm1ab" name="dismiss.png" path="/Main_new/Main/Image/"/>
<component id="xblm1ac" name="btn_cancelRoom.xml" path="/Main_new/Main/Component/"/>
<component id="xblm1ad" name="checkbtn_click.xml" path="/"/>
<image id="xblm1ae" name="btn_dianxinchongzhi_2.png" path="/component/Setting/Image/"/>
<image id="xblm1af" name="btn_dianxinchongzhi_1.png" path="/component/Setting/Image/"/>
<component id="xblm1ag" name="slider_vedio.xml" path="/component/Setting/Component/"/>
<image id="xblm1ah" name="Rectangle 77@3x.png" path="/component/Setting/Image/" scale="9grid" scale9grid="30,7,324,22"/>
<component id="xblm1ai" name="slider_vedio_grip.xml" path="/component/Setting/Component/"/>
<image id="xblm1aj" name="image 26@3x.png" path="/component/Setting/Image/"/>
<component id="xblm1ak" name="btn_vedio.xml" path="/component/Setting/Component/"/>
<image id="xblm1al" name="Vector@3x.png" path="/component/Setting/Image/"/>
<image id="xblm1am" name="Group 82@3x.png" path="/component/Setting/Image/"/>
<component id="xblm1an" name="btn_gameDismissRoom.xml" path="/Main_new/Main/Component/"/>
</resources> </resources>
<publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/> <publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/>
</packageDescription> </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_atlas0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 MiB

After

Width:  |  Height:  |  Size: 5.1 MiB

BIN
wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 MiB

After

Width:  |  Height:  |  Size: 2.7 MiB

BIN
wb_unity_pro/Assets/ART/base/common/ui/Common_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: 587 KiB

BIN
wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 MiB

After

Width:  |  Height:  |  Size: 3.9 MiB

BIN
wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 MiB

After

Width:  |  Height:  |  Size: 2.4 MiB

BIN
wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 MiB

After

Width:  |  Height:  |  Size: 4.4 MiB

BIN
wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_6.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 927 KiB

After

Width:  |  Height:  |  Size: 1.6 MiB

BIN
wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_7.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 MiB

After

Width:  |  Height:  |  Size: 927 KiB

BIN
wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_8.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 482 KiB

After

Width:  |  Height:  |  Size: 1.2 MiB

BIN
wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 789 KiB

After

Width:  |  Height:  |  Size: 482 KiB

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: 1.9 MiB

After

Width:  |  Height:  |  Size: 2.0 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.8 MiB

After

Width:  |  Height:  |  Size: 4.6 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.3 MiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 882 KiB

After

Width:  |  Height:  |  Size: 1.2 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.4 MiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 478 KiB

92
wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png.meta
View File

@ -1,92 +0,0 @@
fileFormatVersion: 2
guid: 388412039b96d2744913bdecbf4ebd0c
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: -1
wrapV: -1
wrapW: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b
assetBundleVariant:

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

Binary file not shown.