master
罗家炜 2025-09-17 19:51:05 +08:00
parent e4776139f4
commit 8991d545a9
69 changed files with 889 additions and 69 deletions

View File

@ -4,21 +4,23 @@ local imgAssetMap = {}
local imgQueue = Queue.new(2000)
local function DownLoadImg(url)
local www = UnityEngine.WWW(url)
coroutine.www(www)
if string.utf8len(www.error) == 0 then
local obj = imgAssetMap[url]
if obj and not obj.load then
local texture = www.texture
www:Dispose()
if (texture ~= null) then
local ntexture = FairyGUI.NTexture(texture)
obj.ntexture = ntexture
obj.load = true
obj.co = nil
local www = UnityEngine.WWW(url)
coroutine.www(www)
if (www.error == nil or www.error == "") and www.bytesDownloaded > 0 then
local texture = www.texture
if texture ~= nil and texture.width > 2 and texture.height > 2 then
local obj = imgAssetMap[url]
if obj and not obj.load then
www:Dispose()
if (texture ~= null) then
local ntexture = FairyGUI.NTexture(texture)
obj.ntexture = ntexture
obj.load = true
obj.co = nil
end
end
end
end
end
end
local function SetTexture()
@ -32,6 +34,9 @@ local function SetTexture()
tem.callback()
end
else
local _co = coroutine.start(DownLoadImg, tem.url)
-- local _co_load = coroutine.start(SetTexture,_iconObject,url,callback)
tem.co = _co
imgQueue:Enqueue(tem)
end
end
@ -40,35 +45,35 @@ end
UpdateBeat:Add(SetTexture)
-- group 图片分组
function ImageLoad.Load(url,_iconObject,group,callback)
if string.utf8len(url) == 0 then
return
end
function ImageLoad.Load(url, _iconObject, group, callback)
if string.utf8len(url) == 0 then
return
end
if not group then
group = "common"
end
local asset = imgAssetMap[url]
local asset = imgAssetMap[url]
if (asset ~= nil) then
if asset.load then
_iconObject.texture = asset.ntexture
if callback then callback() end
else
imgQueue:Enqueue({url = url,_iconObject = _iconObject,callback = callback})
imgQueue:Enqueue({ url = url, _iconObject = _iconObject, callback = callback })
end
return
end
local _co = coroutine.start(DownLoadImg,url)
local _co = coroutine.start(DownLoadImg, url)
-- local _co_load = coroutine.start(SetTexture,_iconObject,url,callback)
imgAssetMap[url] = {group = group,load=false,co = _co}
imgQueue:Enqueue({url = url,_iconObject = _iconObject,callback = callback})
end
imgAssetMap[url] = { group = group, load = false, co = _co }
imgQueue:Enqueue({ url = url, _iconObject = _iconObject, callback = callback })
end
function ImageLoad.Clear(group)
for i,v in pairs(imgAssetMap) do
for i, v in pairs(imgAssetMap) do
if v.group == group then
if v.co then
coroutine.stop(v.co)
@ -82,4 +87,4 @@ function ImageLoad.Clear(group)
imgAssetMap[i] = nil
end
end
end
end

View File

@ -9,21 +9,32 @@ local data = {
local FamilyRoomCard = {}
local function charge(num, self)
local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_Recharge_Diamo(self.groupId, num, function(res)
print("收到充值房卡回调")
pt(res)
if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, "操作失败")
return
local _curren_msg =
MsgWindow.new(
self._root_view,
'确定要将房卡重置在改亲友圈?',
MsgWindow.MsgMode.OkAndCancel
)
_curren_msg.onOk:Add(
function()
local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_Recharge_Diamo(self.groupId, num, function(res)
print("收到充值房卡回调")
pt(res)
if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, "操作失败")
return
end
local groupDiamo = res.Data.groupDiamo
local playerDiamo = res.Data.userDiamo
self.tex_curCard.text = "当前帐号房卡:" .. playerDiamo
self.tex_famliyCard.text = "亲友圈房卡:" .. groupDiamo
self.group.groupDiamo = groupDiamo
DataManager.SelfUser.diamo = playerDiamo
end)
end
local groupDiamo = res.Data.groupDiamo
local playerDiamo = res.Data.userDiamo
self.tex_curCard.text = "当前帐号房卡:" .. playerDiamo
self.tex_famliyCard.text = "亲友圈房卡:" .. groupDiamo
self.group.groupDiamo = groupDiamo
DataManager.SelfUser.diamo = playerDiamo
end)
)
_curren_msg:Show()
end
--#endregion

View File

@ -0,0 +1,49 @@
local DiamondRecord = {}
local M = DiamondRecord
--类型字段1为进入游戏预扣2为结束游戏返还
local TypeTable = { "亲友圈开局游戏预扣", "因游戏结束返还您" }
function M.New(data, callback)
setmetatable(M, { __index = BaseWindow })
local self = setmetatable({}, { __index = M })
self._full = true
self._full_offset = false
self.class = "com_FamilyMsgRecord"
BaseWindow.init(self, 'ui://Lobby/DiamondRecord')
self.data = data
self:Init()
self.closeCallback = callback
return self
end
function M:Init()
local list_msg = self._view:GetChild('list_msg')
list_msg.itemRenderer = function(index, obj)
self:msgRenderer(index, obj)
end
--大厅的请求
end
function M:msgRenderer(index, obj)
local data = self.msgData
obj:GetChild('tex_time').text = os.date("%Y-%m-%d %H:%M:%S", math.floor(data[index + 1].m_time / 1000))
obj:GetChild('tex_msg').text = string.format("%s%d房卡剩余%d房卡", TypeTable[data[index + 1].diamo_type + 1],
data[index + 1].diamo_num, data[index + 1].diamo_cur)
end
function M:Show(groupId)
getmetatable(M).__index.Show(self)
end
function M:Close()
if self.closeCallback then
self.closeCallback()
end
getmetatable(M).__index.Close(self)
end
return M

View File

@ -0,0 +1,98 @@
local GamePlayDetail = {}
local M = GamePlayDetail
--玩法详情
local gamePlayDetail = {
--麻将
{
{
icon0 = "lichuan0",
icon1 = "lichuan1",
detail = "lichuanDetail"
},
{
icon0 = "jinxi0",
icon1 = "jinxi1",
detail = "金溪麻将"
},
{
icon0 = "fuzhou0",
icon1 = "fuzhou1",
detail = "抚州麻将"
},
{
icon0 = "nancheng0",
icon1 = "nancheng1",
detail = "南城麻将"
},
},
--扑克
{
{
icon0 = "paodekuai0",
icon1 = "paodekuai1",
detail = "跑得快"
},
},
--字牌
{
},
}
function M.New(data, callback)
setmetatable(M, { __index = BaseWindow })
local self = setmetatable({}, { __index = M })
self._full = true
self._full_offset = false
self.class = "com_GamePlayDetail"
BaseWindow.init(self, 'ui://Lobby/GamePlay')
self.data = data
self:Init()
self.closeCallback = callback
return self
end
function M:Init()
local list_gamePlay = self._view:GetChild('list_gameName')
list_gamePlay.itemRenderer = function(index, obj)
obj:GetChild('icon0').url = string.format("ui://Lobby/%s",
gamePlayDetail[self._ctr_gameType.selectedIndex + 1][index + 1].icon0)
obj:GetChild('icon1').url = string.format("ui://Lobby/%s",
gamePlayDetail[self._ctr_gameType.selectedIndex + 1][index + 1].icon1)
end
list_gamePlay.onClickItem:Set(function(context)
self._view:GetChild("gamePlayDetail").url = string.format("ui://Lobby/%s",
gamePlayDetail[self._ctr_gameType.selectedIndex + 1][context.sender.selectedIndex + 1].detail)
end)
self._ctr_gameType = self._view:GetController('gameType')
self._ctr_gameType.onChanged:Set(function(context)
list_gamePlay.numItems = #gamePlayDetail[context.sender.selectedIndex + 1]
if list_gamePlay.numItems > 0 then
self._view:GetChild("gamePlayDetail").url = string.format("ui://Lobby/%s",
gamePlayDetail[context.sender.selectedIndex + 1][1].detail)
list_gamePlay.selectedIndex = 0
end
end)
self._ctr_gameType.selectedIndex = 0
list_gamePlay.numItems = #gamePlayDetail[1]
self._view:GetChild("gamePlayDetail").url = string.format("ui://Lobby/%s", gamePlayDetail[1][1].detail)
list_gamePlay.selectedIndex = 0
end
function M:Show()
getmetatable(M).__index.Show(self)
end
function M:Close()
if self.closeCallback then
self.closeCallback()
end
getmetatable(M).__index.Close(self)
end
return M

View File

@ -8,6 +8,8 @@ local LobbyMessagesView = import(".Lobby.LobbyMessagesView")
local LobbyRecordView = import(".Lobby.LobbyRecordView")
local LobbyPlayerInfoView = import(".Lobby.LobbyPlayerInfoView")
local CreatePlayView = import(".Family.CreatePlayView")
local DiamondRecord = import(".Lobby.DiamondRecord")
local GamePlayDetail = import(".Lobby.GamePlayDetail")
local CreateRoomView = import(".Lobby.CreateRoomView")
local RankView = import(".Lobby.RankView")
@ -70,9 +72,9 @@ function M:InitView(url)
local btn_notice = self._view:GetChild("btn_notice")
btn_notice.onClick:Set(function()
local noticeView = LobbyMessagesView.new(self._root_view)
local diamondRecord = DiamondRecord.New(self._root_view)
-- noticeView:FillData(DataManager.SelfUser.notices.data)
noticeView:Show()
diamondRecord:Show()
end)
local btn_record = self._view:GetChild("btn_record")
@ -84,7 +86,8 @@ function M:InitView(url)
local btn_gamePlay = self._view:GetChild("btn_gamePlay")
btn_gamePlay.onClick:Add(function()
ViewUtil.ErrorTip(self._view, "该功能还会开放,敬请期待")
local gamePlayDetail = GamePlayDetail.New()
gamePlayDetail:Show()
end)
local btn_more = self._view:GetChild("btn_more")
@ -507,18 +510,18 @@ function M:GetPlayerInfoData()
self:ShowPlayerInfo(data.raffle, data.diamo, data.newMail)
if data.group_id ~= 0 then
-- 重连,确保头像加载成功才能重连
ViewUtil.ShowModalWait2(self._root_view)
coroutine.start(function()
local waitTimes = 0
while not self._flag_loadImageSucces do
if waitTimes > 10 then
break
end
coroutine.wait(0.2)
end
ViewUtil.CloseModalWait()
self:ReconnectRoom(data.groupId)
end)
-- ViewUtil.ShowModalWait2(self._root_view)
-- coroutine.start(function()
-- local waitTimes = 0
-- while not self._flag_loadImageSucces do
-- if waitTimes > 10 then
-- break
-- end
-- coroutine.wait(0.2)
-- end
-- ViewUtil.CloseModalWait()
self:ReconnectRoom(data.groupId)
-- end)
end
end
end)

View File

@ -838,7 +838,7 @@ function M:OnHuCard(...)
--先循环一遍把杠上开花放在最前面
for i = 1, #win_list do
local HuMsg = win_list[i]
if HuMsg.type > 2 and HuMsg.type < 32 then
if HuMsg.type > 2 and HuMsg.type < 60 then
if self.HuCardImg[HuMsg.type][1] == "tile_cs_gangshanghua" then
local imgPath = "ui://Main_Majiang/tile_cs_gangshanghua"
local imgObj = list_HuCardEffect:AddItemFromPool()
@ -856,7 +856,7 @@ function M:OnHuCard(...)
local HuMsg = win_list[i]
-- ↓↓↓先排列好特效图片
if HuMsg.type > 2 and HuMsg.type < 32 then
if HuMsg.type > 2 and HuMsg.type < 60 then
local sound_name = string.format(self.Sound_path .. "%s/%s.mp3",
ViewUtil.Sex_Chat[player.self_user.sex],
"he" .. HuMsg.type)

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>
@ -123,7 +123,7 @@
<item/>
<item/>
</list>
<component id="n381_ieus" name="btn_chatRoom" src="ieus7d1c" fileName="Main/Component/btn_chatRoom.xml" xy="576,1026" group="n34_86ct">
<component id="n381_ieus" name="btn_chatRoom" src="ieus7d1c" fileName="Main/Component/btn_chatRoom.xml" xy="566,1020" size="174,99" group="n34_86ct">
<relation target="" sidePair="left-left,bottom-bottom"/>
</component>
<text id="n364_jrro" name="n364" xy="1546,297" size="232,64" group="n34_86ct" font="ui://27vd145bh35o7iln" fontSize="48" color="#444444" autoClearText="true" text="dangqian">

View File

@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="174,99" pivot="0.5,0.5" extention="Button">
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
<controller name="cRedPoint" pages="0,,1," selected="1">
<controller name="cRedPoint" homePageType="specific" homePage="1" pages="0,,1," selected="1">
<remark page="1" value="开启红点"/>
</controller>
<displayList>
<image id="n0_ieus" name="n0" src="ieus7d1b" fileName="Main/Image/Group 108.png" xy="0,0" size="174,99">
<relation target="" sidePair="width-width,height-height"/>
</image>
<image id="n1_l4fo" name="n1" src="icft7d63" fileName="Main/Image/Group 687.png" xy="141,-10" size="44,44">
<image id="n1_l4fo" name="n1" src="icft7d63" fileName="Main/Image/Group 687.png" xy="134,-10" size="43,39">
<gearDisplay controller="cRedPoint" pages="1"/>
<relation target="n0_ieus" sidePair="right-right,top-top"/>
</image>
<text id="n2_l4fo" name="tex_redPoint" xy="146,-18" size="37,58" font="Arial" fontSize="43" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="shrink" text="20">
<text id="n2_l4fo" name="tex_redPoint" xy="139,-17" size="32,54" font="Microsoft YaHei" fontSize="40" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="shrink" singleLine="true" text="99">
<gearDisplay controller="cRedPoint" pages="1"/>
<relation target="n1_l4fo" sidePair="center-center,middle-middle"/>
</text>

Binary file not shown.

After

Width:  |  Height:  |  Size: 496 KiB

View File

@ -0,0 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="2532,1170">
<displayList>
<image id="n9_hyws" name="n9" src="xx1c7d7h" fileName="Image/loginBg.png" xy="0,0" size="2532,1170" group="n17_hyws">
<relation target="" sidePair="width-width,height-height"/>
</image>
<image id="n10_hyws" name="n10" src="xx1c7d7i" fileName="Image/bt_top.png" xy="0,0" group="n17_hyws">
<relation target="" sidePair="width-width,top-top"/>
</image>
<component id="n11_hyws" name="btn_close" src="xx1c7d7j" fileName="Component/btn_close.xml" xy="54,6" group="n17_hyws"/>
<image id="n13_hyws" name="n13" src="xx1c7d7l" fileName="Image/hall_club_common_tittle_icon1.png" xy="1003,24" group="n16_hyws">
<relation target="n14_hyws" sidePair="left-left"/>
</image>
<text id="n14_hyws" name="n14" xy="1120,27" size="292,94" group="n16_hyws" font="ui://27vd145bg2mo7ij0" fontSize="72" color="#ffffff" align="center" vAlign="middle" shadowColor="#4c5058" shadowOffset="3,3" text="房卡记录">
<relation target="" sidePair="center-center"/>
</text>
<image id="n15_hyws" name="n15" src="xx1c7d7l" fileName="Image/hall_club_common_tittle_icon1.png" xy="1466,24" group="n16_hyws" flip="hz">
<relation target="n14_hyws" sidePair="right-right"/>
</image>
<group id="n16_hyws" name="n16" xy="1003,24" size="526,99" group="n17_hyws" advanced="true"/>
<group id="n17_hyws" name="bg" xy="0,0" size="2532,1170"/>
<image id="n18_66fw" name="n18" src="xx1c7d7m" fileName="Image/bg_main1.png" xy="226,140" size="2080,1005">
<relation target="" sidePair="width-width%,height-height%"/>
</image>
<image id="n19_66fw" name="n19" src="xx1c7d7n" fileName="Image/bg_main2.png" xy="241,153" size="2050,978">
<relation target="n18_66fw" sidePair="rightext-right,topext-top,bottomext-bottom,leftext-left"/>
</image>
<list id="n4_k356" name="list_msg" xy="249,171" size="2034,956" layout="flow_hz" overflow="scroll" lineGap="16" defaultItem="ui://htcn7v3r66fw7d6z" align="center" autoClearItems="true">
<relation target="n19_66fw" sidePair="bottomext-bottom"/>
<relation target="" sidePair="width-width%,top-top"/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
</list>
</displayList>
</component>

View File

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="2532,1170">
<controller name="gameType" pages="0,,1,,2," selected="0"/>
<displayList>
<image id="n19_66fw" name="n19" src="66fw7d6t" fileName="component/Record/Image/CommonRes_8.png" xy="0,0" size="2532,1170">
<relation target="" sidePair="width-width,height-height"/>
</image>
<image id="n20_66fw" name="n20" src="66fw7d6q" fileName="component/Record/Image/title_bg.png" xy="0,0" size="2532,169">
<relation target="" sidePair="width-width%,height-height%,top-top"/>
</image>
<image id="n29_66fw" name="n29" src="66fw7d6r" fileName="component/Record/Image/CommonRes_2.png" xy="117,178" size="2298,978">
<relation target="" sidePair="width-width%,height-height%,left-center,right-center,top-top%"/>
</image>
<component id="n14_n2h8" name="btn_close" src="n2h87csv" fileName="component/Record/Component/btn_close.xml" xy="14,6" size="142,126" group="n16_n2h8">
<relation target="" sidePair="left-left,top-top"/>
</component>
<group id="n16_n2h8" name="top" xy="14,6" size="142,126"/>
<list id="n47_xx1c" name="list_gameName" xy="163,324" size="459,776" overflow="scroll" defaultItem="ui://2d9xdj6zxx1c7d88" autoClearItems="true">
<relation target="" sidePair="width-width%,height-height%,left-left%,top-top%"/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
</list>
<list id="n48_xx1c" name="list_gameType" xy="772,226" size="1436,100" layout="flow_hz" overflow="scroll" lineGap="17" colGap="74" defaultItem="ui://2d9xdj6zxx1c7d89" selectionController="gameType">
<relation target="n46_xx1c" sidePair="left-left%,bottom-top"/>
<item/>
<item url="ui://2d9xdj6zxx1c7d8c"/>
<item url="ui://2d9xdj6zxx1c7d8d"/>
</list>
<image id="n46_xx1c" name="n46" src="66fw7d6v" fileName="component/Record/Image/Recharge_2.png" xy="637,323" size="1748,799">
<relation target="" sidePair="width-width%,height-height%,left-left%,top-top%"/>
</image>
<loader id="n52_xx1c" name="gamePlayDetail" xy="664,334" size="1721,775" url="ui://2d9xdj6zxx1c7d8e" fill="scaleFree" clearOnPublish="true">
<relation target="n46_xx1c" sidePair="width-width%,height-height%,left-left,top-top"/>
</loader>
</displayList>
</component>

View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="459,130" extention="Button">
<controller name="button" pages="2,up,3,down" selected="0"/>
<displayList>
<loader id="n0_xx1c" name="icon0" xy="0,0" size="459,130" url="ui://Lobby/lichuan0" fill="scaleFree">
<gearDisplay controller="button" pages="2"/>
<relation target="" sidePair="width-width,height-height"/>
</loader>
<loader id="n1_xx1c" name="icon1" xy="0,0" size="459,130" fill="scaleFree">
<gearDisplay controller="button" pages="3"/>
<relation target="" sidePair="width-width,height-height"/>
</loader>
</displayList>
<Button mode="Radio"/>
</component>

View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="427,100" extention="Button">
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
<displayList>
<image id="n0_xx1c" name="n0" src="xx1c7d81" fileName="GamePlay/image/CreateRoom10a.png" xy="0,0" size="427,100">
<gearDisplay controller="button" pages="0,2"/>
<relation target="" sidePair="width-width,height-height"/>
</image>
<image id="n1_xx1c" name="n1" src="xx1c7d82" fileName="GamePlay/image/CreateRoom10b.png" xy="0,0" size="427,100">
<gearDisplay controller="button" pages="1,3"/>
<relation target="" sidePair="width-width,height-height"/>
</image>
</displayList>
<Button mode="Radio"/>
</component>

View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="427,100" extention="Button">
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="1"/>
<displayList>
<image id="n0_xx1c" name="n0" src="xx1c7d83" fileName="GamePlay/image/CreateRoom11a.png" xy="0,0" size="427,100">
<gearDisplay controller="button" pages="0,2"/>
<relation target="" sidePair="width-width,height-height"/>
</image>
<image id="n1_xx1c" name="n1" src="xx1c7d84" fileName="GamePlay/image/CreateRoom11b.png" xy="0,0" size="427,100">
<gearDisplay controller="button" pages="1,3"/>
<relation target="" sidePair="width-width,height-height"/>
</image>
</displayList>
<Button mode="Radio"/>
</component>

View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="427,100" extention="Button">
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
<displayList>
<image id="n0_xx1c" name="n0" src="xx1c7d85" fileName="GamePlay/image/CreateRoom12a.png" xy="0,0" size="427,100">
<gearDisplay controller="button" pages="0,2"/>
<relation target="" sidePair="width-width,height-height"/>
</image>
<image id="n1_xx1c" name="n1" src="xx1c7d86" fileName="GamePlay/image/CreateRoom12b.png" xy="0,0" size="427,100">
<gearDisplay controller="button" pages="1,3"/>
<relation target="" sidePair="width-width,height-height"/>
</image>
</displayList>
<Button mode="Radio"/>
</component>

View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="1750,800" overflow="scroll" extention="Label">
<displayList>
<image id="n5_xx1c" name="n5" src="xx1c7d8j" fileName="GamePlay/image/lichuanDetail1.png" xy="0,0"/>
<image id="n6_xx1c" name="n6" src="xx1c7d8k" fileName="GamePlay/image/lichuanDetail2.png" xy="0,758"/>
<image id="n7_xx1c" name="n7" src="xx1c7d8l" fileName="GamePlay/image/lichuanDetail3.png" xy="0,1503"/>
<image id="n8_xx1c" name="n8" src="xx1c7d8m" fileName="GamePlay/image/lichuanDetail4.png" xy="0,2263"/>
</displayList>
</component>

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 628 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 874 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 486 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 440 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 271 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 100 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 MiB

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="2532,1170">
<controller name="detail" pages="0,,1," selected="1"/>
<controller name="detail" pages="0,,1," selected="0"/>
<controller name="showLook" pages="0,,1," selected="0"/>
<displayList>
<image id="n19_66fw" name="n19" src="66fw7d6t" fileName="component/Record/Image/CommonRes_8.png" xy="0,0" size="2532,1170">
@ -10,7 +10,7 @@
<relation target="" sidePair="width-width%,height-height%,top-top"/>
</image>
<image id="n29_66fw" name="n29" src="66fw7d6r" fileName="component/Record/Image/CommonRes_2.png" xy="26,160" size="2480,991">
<relation target="" sidePair="width-width%,height-height%,left-center,right-center,top-top"/>
<relation target="" sidePair="width-width%,height-height%,left-center,right-center,top-top%"/>
</image>
<image id="n22_66fw" name="n22" src="66fw7d6u" fileName="component/Record/Image/Garde_2.png" xy="1141,22" size="245,87">
<relation target="" sidePair="left-center,right-center,top-top%"/>
@ -49,7 +49,7 @@
</text>
<group id="n13_n2h8" name="title" xy="164,189" size="2229,939" group="n25_66fw" advanced="true"/>
<list id="n18_jrro" name="list_numberRecordDetail" xy="68,260" size="2397,820" group="n25_66fw" overflow="scroll" lineGap="8" defaultItem="ui://2d9xdj6zjrro7cyp">
<relation target="" sidePair="width-width,height-height"/>
<relation target="" sidePair="width-width,height-height%"/>
<item/>
<item/>
<item/>
@ -57,6 +57,7 @@
</list>
<group id="n25_66fw" name="detail0" xy="68,189" size="2397,939" advanced="true">
<gearDisplay controller="detail" pages="0"/>
<relation target="" sidePair="top-top%"/>
</group>
<image id="n33_66fw" name="n33" src="66fw7d6v" fileName="component/Record/Image/Recharge_2.png" xy="61,265" size="2410,860" group="n30_66fw">
<relation target="" sidePair="width-width%,height-height%"/>

View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="126,114" pivot="0.5,0.5" extention="Button">
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
<displayList>
<image id="n4_in3i" name="n4" src="xx1c7d7k" fileName="Main/Image/btn_close.png" xy="-8,-8"/>
</displayList>
<Button downEffect="scale" downEffectValue="1.2"/>
</component>

View File

@ -632,6 +632,43 @@
<image id="xpru7d7d" name="hall_club_common_tittle_icon1.png" path="/mgr/Image/"/>
<image id="xpru7d7e" name="bg_main1.png" path="/mgr/Image/" atlas="alone"/>
<image id="xpru7d7f" name="bg_main2.png" path="/mgr/Image/" atlas="alone"/>
<component id="xx1c7d7g" name="DiamondRecord.xml" path="/" exported="true"/>
<image id="xx1c7d7h" name="loginBg.png" path="/Image/" atlas="alone"/>
<image id="xx1c7d7i" name="bt_top.png" path="/Image/" atlas="alone" disableTrim="true"/>
<component id="xx1c7d7j" name="btn_close.xml" path="/Component/"/>
<image id="xx1c7d7k" name="btn_close.png" path="/Image/"/>
<image id="xx1c7d7l" name="hall_club_common_tittle_icon1.png" path="/Image/"/>
<image id="xx1c7d7m" name="bg_main1.png" path="/Image/" atlas="alone"/>
<image id="xx1c7d7n" name="bg_main2.png" path="/Image/" atlas="alone"/>
<component id="xx1c7d7o" name="GamePlay.xml" path="/" exported="true"/>
<image id="xx1c7d7p" name="2b25837b-0405-4fab-80d1-c15388ad67c8.png" path="/"/>
<image id="xx1c7d7q" name="ruleHelp.png" path="/GamePlay/image/"/>
<image id="xx1c7d7r" name="nancheng0.png" path="/GamePlay/image/" exported="true"/>
<image id="xx1c7d7s" name="jinxi1.png" path="/GamePlay/image/" exported="true"/>
<image id="xx1c7d7t" name="nancheng1.png" path="/GamePlay/image/" exported="true"/>
<image id="xx1c7d7u" name="paodekuai1.png" path="/GamePlay/image/" exported="true"/>
<image id="xx1c7d7v" name="jinxi0.png" path="/GamePlay/image/" exported="true"/>
<image id="xx1c7d7w" name="lichuan0.png" path="/GamePlay/image/" exported="true"/>
<image id="xx1c7d7x" name="paodekuai0.png" path="/GamePlay/image/" exported="true"/>
<image id="xx1c7d7y" name="fuzhou1.png" path="/GamePlay/image/" exported="true"/>
<image id="xx1c7d7z" name="fuzhou0.png" path="/GamePlay/image/" exported="true"/>
<image id="xx1c7d80" name="lichuan1.png" path="/GamePlay/image/" exported="true"/>
<image id="xx1c7d81" name="CreateRoom10a.png" path="/GamePlay/image/"/>
<image id="xx1c7d82" name="CreateRoom10b.png" path="/GamePlay/image/"/>
<image id="xx1c7d83" name="CreateRoom11a.png" path="/GamePlay/image/"/>
<image id="xx1c7d84" name="CreateRoom11b.png" path="/GamePlay/image/"/>
<image id="xx1c7d85" name="CreateRoom12a.png" path="/GamePlay/image/"/>
<image id="xx1c7d86" name="CreateRoom12b.png" path="/GamePlay/image/"/>
<image id="xx1c7d87" name="bg.png" path="/GamePlay/image/" scale="9grid" scale9grid="16,16,32,32"/>
<component id="xx1c7d88" name="child_gameName.xml" path="/GamePlay/component/"/>
<component id="xx1c7d89" name="child_gameType1.xml" path="/GamePlay/component/"/>
<component id="xx1c7d8c" name="child_gameType2.xml" path="/GamePlay/component/"/>
<component id="xx1c7d8d" name="child_gameType3.xml" path="/GamePlay/component/"/>
<component id="xx1c7d8e" name="lichuanDetail.xml" path="/GamePlay/component/" exported="true"/>
<image id="xx1c7d8j" name="lichuanDetail1.png" path="/GamePlay/image/"/>
<image id="xx1c7d8k" name="lichuanDetail2.png" path="/GamePlay/image/"/>
<image id="xx1c7d8l" name="lichuanDetail3.png" path="/GamePlay/image/"/>
<image id="xx1c7d8m" name="lichuanDetail4.png" path="/GamePlay/image/"/>
</resources>
<publish name="Lobby" path="..\wb_unity_pro\Assets\ART\base\lobby\ui" packageCount="2">
<atlas name="默认" index="0"/>

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="81,83">
<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="81,83" url="ui://Main_Majiang/b202_101" fill="scale">
<loader id="n0_gi99" name="icon" xy="0,0" size="81,83" url="ui://Main_Majiang/b202_00" fill="scaleFree">
<relation target="" sidePair="width-width,height-height"/>
</loader>
<image id="n1_gi99" name="n1" src="ofwa1gm" fileName="Main_new/Main/Image/jing.png" xy="30,-3" size="46,49" aspect="true">

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 MiB

After

Width:  |  Height:  |  Size: 3.3 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 MiB

After

Width:  |  Height:  |  Size: 3.5 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 1.5 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 MiB

After

Width:  |  Height:  |  Size: 3.1 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 MiB

After

Width:  |  Height:  |  Size: 2.5 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 722 KiB

After

Width:  |  Height:  |  Size: 941 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 237 KiB

After

Width:  |  Height:  |  Size: 713 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 MiB

View File

@ -0,0 +1,92 @@
fileFormatVersion: 2
guid: 194d4c025bdac4e48a55ec6909abfe9a
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:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 MiB

View File

@ -0,0 +1,92 @@
fileFormatVersion: 2
guid: 549cf2e6dfca52547948c6fa9d9a8e4b
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:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 105 KiB

View File

@ -0,0 +1,92 @@
fileFormatVersion: 2
guid: 6d9ea41a55957bb4f867cbf7da9acfc5
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:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 59 KiB

View File

@ -0,0 +1,92 @@
fileFormatVersion: 2
guid: 4e948c5c3fbbb814d9ca0da632bfb9f4
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:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 212 KiB

View File

@ -0,0 +1,92 @@
fileFormatVersion: 2
guid: ba0d13f103c7aa640a28bac6a6fca350
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:
assetBundleVariant: