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

解决冲突

master
罗家炜 2025-07-02 20:22:26 +08:00
parent b6a28f0987 7570ba54c8
commit cdef6dcb91
20 changed files with 740 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,7 +49,7 @@ function GroupMgrController.new()
self._eventmap[Protocol.FGMGR_EVT_UPDATE_GROUP] = self.OnEvtUpdateGroup
self._eventmap[Protocol.FGMGR_EVT_NEW_MAIL] = self.OnEvtNewMailTip
self._eventmap[Protocol.FGMGR_RESPONSE_INVITE] = self.FG_ResponseInvited
self._eventmap[Protocol.WEB_FG_ISOPEN_CHATROOM] = self.FG_Isopen_ChatRoom
self._eventmap[Protocol.FGMGR_EVT_ISOPEN_CHATROOM] = self.FG_Isopen_ChatRoom
-- self:connect(callback)
return self
end
@ -297,7 +297,7 @@ function M:FG_OPEN_ISOPEN_CHATROOM(groupId, callback)
local _data = {}
_data.groupId = groupId
_data.uid = DataManager.SelfUser.account_id
self._mgr_client:send(Protocol.WEB_FG_OPEN_ISOPEN_CHATROOM, _data, function(res)
self._mgr_client:send(Protocol.FGMGR_EVT_OPEN_ISOPEN_CHATROOM, _data, function(res)
callback(res)
end)
end
@ -307,7 +307,7 @@ function M:FG_CLOSE_ISOPEN_CHATROOM(groupId, callback)
local _data = {}
_data.groupId = groupId
_data.uid = DataManager.SelfUser.account_id
self._mgr_client:send(Protocol.WEB_FG_CLOSE_ISOPEN_CHATROOM, _data, function(res)
self._mgr_client:send(Protocol.FGMGR_EVT_CLOSE_ISOPEN_CHATROOM, _data, function(res)
callback(res)
end)
end
@ -395,7 +395,7 @@ function M:OnExit()
end
function M:__OnNetEvent(msg)
---- print("消息ID===>>"..msg.Command)
print("消息ID===>>"..msg.Command)
local func = self._eventmap[msg.Command]
if (func ~= nil) then func(self, msg.Data) end
end

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

@ -382,12 +382,12 @@ Protocol = {
-- 未读邮件提示事件
FGMGR_EVT_NEW_MAIL = "update_mail_tip",
-- 设置允许成员查看聊天室
WEB_FG_OPEN_ISOPEN_CHATROOM = "13001",
FGMGR_EVT_OPEN_ISOPEN_CHATROOM = "13001",
-- 设置不允许成员查看聊天室
WEB_FG_CLOSE_ISOPEN_CHATROOM = "13002",
FGMGR_EVT_CLOSE_ISOPEN_CHATROOM = "13002",
-- 监听聊天室是否开启
WEB_FG_ISOPEN_CHATROOM = "12011",
FGMGR_EVT_ISOPEN_CHATROOM = "12011",
-- 设置是否允许观战
WEB_FG_SET_CANWATCH = "set_group_guest",

87
lua_probject/base_project/Game/View/Family/FamilyBanDesk.lua
View File

@ -15,15 +15,15 @@ local function ShowMainView(self)
end
local function RemoveItem(table, condition)
for _,item in pairs(table) do
if condition(item) then
for _, item in pairs(table) do
if condition(item) then
table[_] = nil
end
end
--修复下标
local re = {}
for _,item in pairs(table) do
for _, item in pairs(table) do
re[#re + 1] = item
end
@ -32,26 +32,33 @@ end
local function GetPlayerFromGroupData(playerId, group)
local player = group.memberMap[playerId]
if player then
if player then
return player
end
print("玩家不在group中， 玩家id=",playerId)
print("玩家不在group中， 玩家id=", playerId)
return nil
end
local function AllUid(deskList)
local re = {}
for _, player in pairs(deskList) do
for _, player in pairs(deskList) do
re[#re + 1] = player.uid
end
return re
end
local function AddPlayer(data, self)
local function Exists(id, deskList)
for _, player in pairs(deskList) do
if id == player.uid then
return true
end
end
return false
end
if self.sending then
local function AddPlayer(data, self)
if self.sending then
ViewUtil.ShowBannerOnScreenCenter("正在操作中。。")
return
end
@ -59,17 +66,23 @@ local function AddPlayer(data, self)
-- 点击弹出选择成员界面
local view = FamilySelectNumber.New()
view:Show(self.root._group.id, function(number)
if Exists(number.uid, data.deskList) then
ViewUtil.ShowBannerOnScreenCenter("设置失败,成员已经在关系中")
return
end
local players = AllUid(data.deskList)
players[#players + 1] = number.uid
self.sending = true
local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_SetBanTable1(self.root._group.id, data.deskId, players, data.deskName, function(res)
self.sending = false
if res.ReturnCode ~= 0 then
if res.ReturnCode ~= 0 then
ViewUtil.ShowBannerOnScreenCenter("设置失败")
return
end
data.deskList[#data.deskList + 1] = {uid = number.uid}
data.deskList[#data.deskList + 1] = { uid = number.uid }
self:ReflashDesk()
end)
end)
@ -78,61 +91,60 @@ end
local function DelPalyer(data, uid, self)
--print("删除玩家", uid)
if self.sending then
if self.sending then
ViewUtil.ShowBannerOnScreenCenter("正在操作中。。")
return
end
local players = AllUid(data.deskList)
for _, id in pairs(players) do
if id == uid then
for _, id in pairs(players) do
if id == uid then
players[_] = nil
end
end
-- 修复下标的连续性，不然json.encode会吧空下标也解析出来
local fix = {}
for _, id in pairs(players) do
for _, id in pairs(players) do
fix[#fix + 1] = id
end
players = fix
self.sending = true
local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_SetBanTable1(self.root._group.id, data.deskId, players, data.deskName, function(res)
fgCtr:FG_SetBanTable1(self.root._group.id, data.deskId, players, data.deskName, function(res)
self.sending = false
if res.ReturnCode ~= 0 then
if res.ReturnCode ~= 0 then
ViewUtil.ShowBannerOnScreenCenter("删除失败")
return
end
data.deskList = RemoveItem(data.deskList, function(item)
if item.uid == uid then
if item.uid == uid then
return true
end
end)
self:ReflashDesk()
self:ReflashDesk()
end)
end
local function DelDesk(data, self)
if self.sending then
if self.sending then
ViewUtil.ShowBannerOnScreenCenter("正在操作中。。")
return
end
self.sending = true
local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_SetBanTable1(self.root._group.id, data.deskId, {}, data.deskName, function()
fgCtr:FG_SetBanTable1(self.root._group.id, data.deskId, {}, data.deskName, function()
self.sending = false
self:Reflash()
self:Reflash()
end)
end
local function ChangeName(deskData, name, self)
local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_SetBanTable1(self.root._group.id, deskData.deskId, AllUid(deskData.deskList), name, function(res)
if res.ReturnCode ~= 0 then
if res.ReturnCode ~= 0 then
ViewUtil.ShowBannerOnScreenCenter("删除失败")
return
end
@ -145,19 +157,19 @@ end
local function Sort(BanData)
-- 把空的桌子放到下面
local emtpy = {}
for index, desk in pairs(BanData) do
if desk.deskList == nil or #desk.deskList == 0 then
for index, desk in pairs(BanData) do
if desk.deskList == nil or #desk.deskList == 0 then
emtpy[#emtpy + 1] = desk
BanData[index] = nil
end
end
local re = {}
for _, desk in pairs(BanData) do
for _, desk in pairs(BanData) do
re[#re + 1] = desk
end
for _, desk in pairs(emtpy) do
for _, desk in pairs(emtpy) do
re[#re + 1] = desk
end
@ -184,7 +196,7 @@ local function list_BanedPlayersRenderer(index, obj, data, self, fatherIndex)
end
local function list_banItemRenderer(index, obj, self)
local data = self.BanData[index +1]
local data = self.BanData[index + 1]
--print("刷新关系")
--pt(data)
local tex_name = obj:GetChild("tex_name")
@ -196,7 +208,7 @@ local function list_banItemRenderer(index, obj, self)
obj:GetController("cStyle").selectedIndex = 0
btn_edit.onClick:Set(function()
-- 修改备注
-- 修改备注
self.changedIndex = index
self.selectBanItem = data
self:OpenRemaskWindow()
@ -225,7 +237,6 @@ end
function BanDesk:TryShow(r)
local view = BanDesk.New()
self.root = r
@ -258,7 +269,6 @@ function BanDesk.New()
end
function BanDesk:Init()
self.sending = false
self.btn_close = self._view:GetChild("btn_close")
@ -291,21 +301,18 @@ function BanDesk:Init()
self.list_banItem.itemRenderer = function(index, obj)
list_banItemRenderer(index, obj, self)
end
end
function BanDesk:Reflash()
local fgCtr = ControllerManager.GetController(NewGroupController)
local groupId = self.root._group.id
fgCtr:FG_GetBanTable1(groupId,function(res)
fgCtr:FG_GetBanTable1(groupId, function(res)
self:GetBanTableCallback(res)
end)
end
function BanDesk:GetBanTableCallback(res)
self.BanData = Sort(res.Data.ban_list)
self.list_banItem.numItems = #self.BanData
@ -314,8 +321,7 @@ function BanDesk:GetBanTableCallback(res)
local btn_addBanItem = addBanItem:GetChild("btn_addBanItem")
addBanItem:GetController("cStyle").selectedIndex = 1
btn_addBanItem.onClick:Set(function()
if self.sending then
if self.sending then
ViewUtil.ShowBannerOnScreenCenter("正在操作中。。")
return
end
@ -345,5 +351,4 @@ function BanDesk:CloseRemaskWindow()
self.cSetName.selectedIndex = 0
end
return BanDesk
return BanDesk

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

@ -21,7 +21,7 @@ function FamilyEventView.new(root)
mgr_ctr:AddEventListener(GroupMgrEvent.UpdateGroup, handler(self, self._evtUpdateGroup))
mgr_ctr:AddEventListener(GroupMgrEvent.NewMailTip, handler(self, self._evtNewMailTip))
mgr_ctr:AddEventListener(GroupMgrEvent.InviteResponse, handler(self, self._evtInviteResponse))
mgr_ctr:AddEventListener(GroupMgrEvent.IsOpenChatRoom, handler(self, self._evtInviteResponse))
mgr_ctr:AddEventListener(GroupMgrEvent.IsOpenChatRoom, handler(self, self._evtIsOpenChatRoom))
return self
end
@ -123,7 +123,7 @@ end
function M:_evtIsOpenChatRoom(...)
local arg = { ... }
print("_evtIsOpenChatRoom")
pt(arg)
end

5
lua_probject/base_project/Game/View/Family/FamilyRoomCard.lua
View File

@ -25,10 +25,15 @@ function FamilyRoomCard.New()
BaseWindow.init(Instance, "ui://Family/com_roomCard")
Instance._close_destroy = true
Instance.btn_close = Instance._view:GetChild("btn_close")
Instance.list_bayCrad = Instance._view:GetChild("list_bayCrad")
Instance.tex_curCard = Instance._view:GetChild('tex_curCard')
Instance.tex_famliyCard = Instance._view:GetChild("tex_famliyCard")
Instance.btn_close.onClick:Set(function()
Instance:Close()
end)
Instance.list_bayCrad.itemRenderer = function(index, obj)
local _idx = index +1
local num = data[_idx].num

2
lua_probject/base_project/Main.lua
View File

@ -59,7 +59,7 @@ function Main()
FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("SIYUAN", "base/static/fonts/SIYUAN.TTF"), null)
FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("方正胖娃_GBK", "base/static/fonts/方正胖娃_GBK.TTF"), null)
FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("方正粗圆_GBK", "base/static/fonts/方正粗圆_GBK.TTF"), null)
--FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("FZCuYuan-M03","base/static/fonts/FZCuYuan-M03.TTF"),null)
FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("FZCuYuan-M03","base/static/fonts/FZCuYuan-M03.TTF"),null)
--FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("HYFangLiJ","base/static/fonts/HYFangLiJ.ttf"),null)
_game_info = json.decode(GameApplication.Instance.GameInfo)
--_game_info["login_url"]="http://8.134.59.224:8101/"

4
wb_new_ui/assets/Family/ChatRoom/Component/item_record.xml
View File

@ -5,11 +5,7 @@
<text id="n2_ieus" name="tex_time" xy="36,9" size="562,56" font="ui://27vd145bg2mo7ij0" fontSize="42" autoSize="none" text="游戏结算：10月29号 03:42:36"/>
<text id="n3_ieus" name="tex_name" xy="36,94" size="148,49" font="Alimama FangYuanTi VF" fontSize="36" color="#8e0305" align="center" vAlign="middle" autoSize="none" bold="true" text="利川麻将"/>
<text id="n4_ieus" name="n4" xy="56,142" size="107,97" font="ui://27vd145bg2mo7ij0" fontSize="36" color="#333333" align="center" leading="-2" autoSize="none" text="99999&#xA;99"/>
<<<<<<< HEAD
<list id="n12_ieus" name="list_players" xy="216,73" size="1293,168" layout="row" selectionMode="none" overflow="hidden" defaultItem="ui://htcn7v3rieus7d1l" vAlign="middle">
=======
<list id="n12_ieus" name="list_players" xy="216,73" size="1293,168" layout="row" selectionMode="none" overflow="hidden" defaultItem="ui://htcn7v3rieus7d1l" vAlign="middle" autoClearItems="true">
>>>>>>> 9cc8415a0cfae87c6dc49e927ee054dfac98e95a
<item/>
<item/>
</list>

4
wb_new_ui/assets/Family/ChatRoom/com_chatRoom.xml
View File

@ -10,11 +10,7 @@
<image id="n2_ieus" name="n2" src="ieus7d1f" fileName="Main/Image/Rectangle 123.png" xy="474,162" size="2034,834">
<relation target="" sidePair="width-width,height-height"/>
</image>
<<<<<<< HEAD
<list id="n3_ieus" name="list_chat" xy="543,189" size="1901,780" overflow="scroll" lineGap="65" defaultItem="ui://htcn7v3rieus7d1g">
=======
<list id="n3_ieus" name="list_chat" xy="543,189" size="1901,780" overflow="scroll" lineGap="65" defaultItem="ui://htcn7v3rieus7d1g" autoClearItems="true">
>>>>>>> 9cc8415a0cfae87c6dc49e927ee054dfac98e95a
<relation target="" sidePair="width-width,height-height"/>
<item/>
<item/>

4
wb_new_ui/assets/Family/InviteFamily/Component/btn_close.xml
View File

@ -2,7 +2,9 @@
<component size="111,111" extention="Button">
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
<displayList>
<image id="n3_86ct" name="n3" src="86ct7cve" fileName="InviteFamily/Image/Group 26.png" xy="0,0"/>
<image id="n3_86ct" name="n3" src="sfjv7d3j" fileName="MyFamily/Image/CommonRes_3.png" xy="0,0" size="111,111">
<relation target="" sidePair="width-width,height-height"/>
</image>
</displayList>
<Button/>
</component>

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="2532,1170">
<controller name="familyType" exported="true" homePageType="specific" homePage="6" pages="6,空,0,main,1,playEdit,4,createAndJoin,5,numberList,7,numberRecord,8,auditNumber" selected="1"/>
<controller name="familyType" exported="true" homePageType="specific" homePage="6" pages="6,空,0,main,1,playEdit,4,createAndJoin,5,numberList,7,numberRecord,8,auditNumber" selected="4"/>
<controller name="createOrJoin" pages="0,create,1,join" selected="0"/>
<controller name="listFamily" pages="0,,1,,10,,11,,12,,13,,14,,15," selected="0"/>
<controller name="numberRecordRank" pages="0,,1,,3," selected="0"/>
@ -8,7 +8,7 @@
<controller name="showChooseTime" pages="0,,1," selected="0"/>
<controller name="lev" pages="0,1,1,2,2,3" selected="0"/>
<controller name="moreBtn" pages="0,,1," selected="0"/>
<controller name="familyBan" pages="0,,1," selected="1"/>
<controller name="familyBan" pages="0,,1," selected="0"/>
<controller name="cMyfamilyList" pages="0,,1," selected="0"/>
<controller name="cIsChatRoom" pages="0,,1," selected="0">
<remark page="0" value="关闭聊天室"/>
@ -120,7 +120,16 @@
<group id="n34_86ct" name="main" xy="0,0" size="2530,1154" advanced="true">
<gearDisplay controller="familyType" pages="0"/>
</group>
<image id="n74_86ct" name="n74" src="86ct7cwm" fileName="NumberList/Image/numberListTitle.png" xy="1014,18" group="n81_86ct"/>
<image id="n392_f1fu" name="n392" src="yk1o7d3p" fileName="Main/Image/hall_club_common_tittle_icon1.png" xy="967,24" group="n395_f1fu">
<relation target="n393_f1fu" sidePair="left-left"/>
</image>
<text id="n393_f1fu" name="n393" xy="1084,27" size="364,94" group="n395_f1fu" font="ui://27vd145bg2mo7ij0" fontSize="72" color="#ffffff" align="center" vAlign="middle" text="亲友圈成员">
<relation target="" sidePair="center-center"/>
</text>
<image id="n394_f1fu" name="n394" src="yk1o7d3p" fileName="Main/Image/hall_club_common_tittle_icon1.png" xy="1502,24" group="n395_f1fu" flip="hz">
<relation target="n393_f1fu" sidePair="right-right"/>
</image>
<group id="n395_f1fu" name="n395" xy="967,24" size="598,99" group="n81_86ct"/>
<image id="n75_86ct" name="n75" src="86ct7cvc" fileName="GamePlay/Image/Rectangle 91.png" xy="387,165" size="1758,984" group="n81_86ct"/>
<image id="n76_86ct" name="n76" src="86ct7cvb" fileName="GamePlay/Image/Rectangle 112.png" xy="402,183" size="1728,948" group="n81_86ct"/>
<image id="n373_c8pn" name="n373" src="c8pn7cyw" fileName="NumberList/Image/Rectangle 113.png" xy="408,189" group="n81_86ct"/>
@ -136,8 +145,8 @@
<item/>
</list>
<component id="n79_86ct" name="btn_search" src="86ct7cwi" fileName="NumberList/Component/btn_search.xml" xy="1863,195" size="204,72" group="n81_86ct"/>
<group id="n81_86ct" name="bg_numberList" xy="387,18" size="1758,1131" group="n82_86ct"/>
<group id="n82_86ct" name="numberList" xy="387,18" size="1758,1131" advanced="true">
<group id="n81_86ct" name="bg_numberList" xy="387,24" size="1758,1125" group="n82_86ct"/>
<group id="n82_86ct" name="numberList" xy="387,24" size="1758,1125" advanced="true">
<gearDisplay controller="familyType" pages="5"/>
</group>
<component id="n380_n74n" name="com_createAndJoin" src="n74n7d11" fileName="CreateAndJoin/com_createAndJoin.xml" xy="0,0" size="2532,1170">

11
wb_new_ui/assets/Family/SelectNumber/com_SelectNumber.xml
View File

@ -1,7 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="2532,1170">
<displayList>
<image id="n0_txni" name="n0" src="86ct7cwm" fileName="NumberList/Image/numberListTitle.png" xy="1014,19"/>
<image id="n10_f1fu" name="n10" src="yk1o7d3p" fileName="Main/Image/hall_club_common_tittle_icon1.png" xy="967,24" group="n13_f1fu">
<relation target="n11_f1fu" sidePair="left-left"/>
</image>
<text id="n11_f1fu" name="n11" xy="1084,27" size="364,94" group="n13_f1fu" font="ui://27vd145bg2mo7ij0" fontSize="72" color="#ffffff" align="center" vAlign="middle" text="亲友圈成员">
<relation target="" sidePair="center-center"/>
</text>
<image id="n12_f1fu" name="n12" src="yk1o7d3p" fileName="Main/Image/hall_club_common_tittle_icon1.png" xy="1502,24" group="n13_f1fu" flip="hz">
<relation target="n11_f1fu" sidePair="right-right"/>
</image>
<group id="n13_f1fu" name="n13" xy="967,24" size="598,99"/>
<image id="n1_txni" name="n1" src="86ct7cvc" fileName="GamePlay/Image/Rectangle 91.png" xy="387,166" size="1758,984"/>
<image id="n2_txni" name="n2" src="86ct7cvb" fileName="GamePlay/Image/Rectangle 112.png" xy="402,184" size="1728,948"/>
<image id="n3_txni" name="n3" src="c8pn7cyw" fileName="NumberList/Image/Rectangle 113.png" xy="408,190"/>

1
wb_new_ui/assets/Family/com_roomCard.xml
View File

@ -12,5 +12,6 @@
<item/>
<item/>
</list>
<component id="n9_f1fu" name="btn_close" src="sfjv7d3k" fileName="MyFamily/Component/btn_quitNotice.xml" xy="1135,-28"/>
</displayList>
</component>

92
wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png.meta Normal file
View File

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

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

@ -0,0 +1,92 @@
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/abf0e2af8fb6daf78fa8ebcdd8acc4f0
assetBundleVariant:

92
wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_yry6yx.png.meta Normal file
View File

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

92
wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0.png.meta Normal file
View File

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

92
wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_1.png.meta Normal file
View File

@ -0,0 +1,92 @@
fileFormatVersion: 2
guid: 431f7e2d464ddc942ad915022cabcefd
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/abf0e2af8fb6daf78fa8ebcdd8acc4f0
assetBundleVariant:

92
wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_2.png.meta Normal file
View File

@ -0,0 +1,92 @@
fileFormatVersion: 2
guid: 7055831bde7c93045aa6190395e4773b
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/abf0e2af8fb6daf78fa8ebcdd8acc4f0
assetBundleVariant:

92
wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_3.png.meta Normal file
View File

@ -0,0 +1,92 @@
fileFormatVersion: 2
guid: 24ee6d91cbcc3b342a2ef13543161f2b
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/abf0e2af8fb6daf78fa8ebcdd8acc4f0
assetBundleVariant:

7
wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 326fa64ee0dd8b94aa86fa1978e56fa5
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName: base/main_majiang/abf0e2af8fb6daf78fa8ebcdd8acc4f0
assetBundleVariant: