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

tongbu"

master
罗家炜 2025-09-16 21:35:09 +08:00
parent 1a8080ae85
commit 9d9506ea80
157 changed files with 1448 additions and 656 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lua_probject/base_project/Game/View/ChatView.lua
View File

@ -1,4 +1,3 @@
---聊天View对象
local ChatView = {}
@ -6,25 +5,26 @@ local M = ChatView
function ChatView.new(main_view)
UIPackage.AddPackage("base/chat/ui/Chat")
setmetatable(M, {__index = BaseWindow})
local self = setmetatable({}, {__index = M})
setmetatable(M, { __index = BaseWindow })
local self = setmetatable({}, { __index = M })
self.class = "ChatView"
-- self._animation = false
self._main_view = main_view
self._blur_view = main_view._root_view
self:init("ui://Chat/Main")
return self
end
end
function M:init(url)
BaseWindow.init(self,url)
BaseWindow.init(self, url)
local lit_biaoqing1 = self._view:GetChild("lit_biaoqing1")
lit_biaoqing1.onClickItem:Set(function (context)
lit_biaoqing1.onClickItem:Set(function(context)
local _gamectr = ControllerManager.GetController(GameController)
_gamectr:SendInteraction(DataManager.SelfUser.account_id, 1, context.data.name )
_gamectr:SendInteraction(DataManager.SelfUser.account_id, 1, context.data.name)
self:Close()
end)
-- local lit_biaoqing2 = self._view:GetChild("lit_biaoqing2")
-- lit_biaoqing2.onClickItem:Set(function (context)
@ -46,15 +46,14 @@ function M:init(url)
local tex_chat = self._view:GetChild("tex_chat")
local btn_send = self._view:GetChild("btn_send")
btn_send.onClick:Set(function( ... )
btn_send.onClick:Set(function(...)
local chat_text = tex_chat.text
if string.utf8len(chat_text) >0 then
if string.utf8len(chat_text) > 0 then
local _gamectr = ControllerManager.GetController(GameController)
_gamectr:SendInteraction(DataManager.SelfUser.account_id, 4,chat_text)
_gamectr:SendInteraction(DataManager.SelfUser.account_id, 4, chat_text)
self:Close()
end
end)
end
function M:FillChatMsg()
@ -63,18 +62,18 @@ function M:FillChatMsg()
if language == 1 then
chat_msg = self._main_view.Fix_Msg_Chat2
else
chat_msg = self._main_view.Fix_Msg_Chat
chat_msg = self._main_view.Fix_Msg_Chat
end
local lit_yuyin = self._view:GetChild("lit_yuyin")
lit_yuyin:RemoveChildrenToPool()
for i = 1 , #chat_msg do
for i = 1, #chat_msg do
local btn = lit_yuyin:AddItemFromPool()
btn.data = tostring(i)
btn.text = chat_msg[i]
btn.onClick:Set(function(context)
btn.onClick:Set(function(context)
local g = context.sender
local _gamectr = ControllerManager.GetController(GameController)
local msg = g.data + language * 100
local msg = g.data + language * 100
_gamectr:SendInteraction(DataManager.SelfUser.account_id, 2, msg)
self:Close()
end)

2
lua_probject/base_project/Game/View/Common/BaseWindow.lua
View File

@ -12,7 +12,7 @@ BaseWindow = {
--弹出动画，0关闭，1左边，2右边
_anim_pop = 0,
--关闭摧毁
_close_destroy = true,
_close_destroy = false,
--点击窗口以外关闭
_close_zone = true,

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

@ -668,7 +668,7 @@ function M:UpdateFamilyRoom(fgCtr, id)
end
obj:GetChild('Label_joinPlayers').text = insertName
obj:GetChild('text_playerNum').text = string.format("%s/%s", playInfo.maxPlayers, playInfo.maxPlayers)
obj:GetChild('text_roundNum').text = string.format("%s/%s", startRoom[newIndex].round,
obj:GetChild('text_roundNum').text = string.format("局数:%s/%s", startRoom[newIndex].round,
startRoom[newIndex].times)
obj:GetChild('btn_joinGame').onClick:Clear()
obj:GetChild('btn_watch').onClick:Set(function()

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

@ -181,6 +181,7 @@ function M:InitView(url, isHideIpAdds)
local btn_rule = self._view:GetChild('btn_rule')
if btn_rule ~= nil then
btn_rule.onClick:Set(function()
self._ctr_more.selectedIndex = 0
if self.RuleView == nil or self.RuleView._is_destroy then
self.RuleView = RoomInfoView.new(self._room)
end
@ -281,6 +282,7 @@ function M:InitView(url, isHideIpAdds)
local chatText = _view:GetChild('btn_sendText')
if chatText then
chatText.onClick:Add(function()
self._ctr_more.selectedIndex = 0
if self._room.room_config.config.hpData.BanChat == 1 then
ViewUtil.ShowBannerOnScreenCenter("本房间禁止快捷聊天")
return
@ -563,6 +565,7 @@ function M:InitView(url, isHideIpAdds)
if self._viewBtn_pangGuang and self._view_WitnessPlayer and self._ctr_showWitness then
self._viewBtn_pangGuang.onClick:Set(function()
self._ctr_more.selectedIndex = 0
self._ctr_showWitness.selectedIndex = 1
self:ShowWitnessPlayer()
end)
@ -1182,7 +1185,8 @@ function M:MarkSelfTuoguan()
self._com_tuoguan = UIPackage.CreateObjectFromURL('ui://Common/com_tuoguan_self')
local com_tuoguan = self._com_tuoguan
GRoot.inst:AddChild(com_tuoguan)
--com_tuoguan:Center()
com_tuoguan:MakeFullScreen()
com_tuoguan:Center()
--com_tuoguan.y = GRoot.inst.height - com_tuoguan.height
--com_tuoguan.x = (GRoot.inst.width - com_tuoguan.width) * 0.5
local _msg_view = nil
@ -1219,9 +1223,10 @@ function M:MarkSelfTuoguan()
num = 250
end
com_tuoguan:AddChild(_msg_view)
_msg_view:Center()
_msg_view:GetChild('tex_message').text = '确定要取消托管吗？'
_msg_view.x = (com_tuoguan.width - _msg_view.width) * 0.5 - num
_msg_view.y = (com_tuoguan.height - com_tuoguan.y - _msg_view.height) * 0.5
-- _msg_view.x = (com_tuoguan.width - _msg_view.width) * 0.5 - num
-- _msg_view.y = (com_tuoguan.height - com_tuoguan.y - _msg_view.height) * 0.5
end
)
end

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

@ -60,6 +60,7 @@ function M:InitView(url)
btn_restart.onClick:Add(handler(self, self.RestartRecordPlay))
btn_play.onClick:Add(handler(self, self.Play))
self.com_logocType = self._view:GetChild("com_logo"):GetController("cType")
local _view = self._view
local _room = self._room
self._player_info = {}

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

@ -208,7 +208,8 @@ function M:MarkSelfTuoguan()
self._com_tuoguan = UIPackage.CreateObjectFromURL('ui://Common/com_tuoguan_self')
local com_tuoguan = self._com_tuoguan
GRoot.inst:AddChild(com_tuoguan)
--com_tuoguan:Center()
com_tuoguan:MakeFullScreen()
com_tuoguan:Center()
--com_tuoguan.y = GRoot.inst.height - com_tuoguan.height
--com_tuoguan.x = (GRoot.inst.width - com_tuoguan.width) * 0.5
-- local _msg_view = nil

46
lua_probject/base_project/table/Table_Error_code.lua
View File

@ -19,15 +19,15 @@ Table_Error_code_Map = {
[4]={id=4,note=""},
[5]={id=5,note="玩法不可用"},
[6]={id=6,note="游戏已停用"},
[7]={id=7,note="钻石不足"},
[8]={id=8,note="已经在公会中"},
[7]={id=7,note="房卡不足"},
[8]={id=8,note="已经在亲友圈中"},
[9]={id=9,note="邀请码无效"},
[10]={id=10,note="房间已满"},
[11]={id=11,note="房间号不存在"},
[12]={id=12,note="此邮件不存在"},
[13]={id=13,note="邮件已经领取"},
[14]={id=14,note="此任务不存在"},
[15]={id=15,note="没有公会"},
[15]={id=15,note="没有亲友圈"},
[16]={id=16,note="任务奖励已领取"},
[18]={id=18,note="牛牛有玩家未重连成功"},
[20]={id=20,note="排行&战绩数据获取失败"},
@ -38,19 +38,19 @@ Table_Error_code_Map = {
[28]={id=28,note="多次登录失败，禁止登录,请过段时间再次尝试"},
[101]={id=101,note="请检查您的网络设置"},
[102]={id=102,note="网络连接超时"},
[500]={id=500,note="服务器内部错误"},
[500]={id=500,note=""},
[999]={id=999,note="未知错误"},
[17]={id=17,note="奖券不足"},
[53]={id=53,note="与桌上玩家IP相同，进入房间失败"},
[54]={id=54,note="与桌上玩家距离过近，进入房间失败"},
[55]={id=55,note="GPS服务未开启，请开启GPS服务！"},
[56]={id=56,note="不是大联盟"},
[57]={id=57,note="大联盟不能退出"},
[56]={id=56,note="不是亲友圈"},
[57]={id=57,note="亲友圈不能退出"},
[59]={id=59,note="无效的验证码"},
[61]={id=61,note="手机号码已绑定玩家"},
[80]={id=80,note="房间已删除"},
[81]={id=81,note="是大联盟房间"},
[83]={id=83,note="积分不足,无法坐下"},
[81]={id=81,note="是亲友圈房间"},
[83]={id=83,note="分数已被限制，请联系管理员"},
[1000]={id=1000,note="已申请加入"},
[1001]={id=1001,note="成员已存在"},
[1002]={id=1002,note="成员不存在"},
@ -63,35 +63,35 @@ Table_Error_code_Map = {
[1010]={id=1010,note="目标是管理员"},
[1011]={id=1011,note="目标是合伙人"},
[1012]={id=1012,note="目标积分不足"},
[1013]={id=1013,note="积分不足!"},
[1013]={id=1013,note="房卡不足"},
[1014]={id=1014,note="没有权限"},
[1015]={id=1015,note="积分不为0"},
[1016]={id=1016,note="成员在房间内"},
[1017]={id=1017,note="成员积分事件正在执行"},
[1018]={id=1018,note="大联盟不存在"},
[1019]={id=1019,note="大联盟已满"},
[1020]={id=1020,note="大联盟还有房间"},
[1021]={id=1021,note="大联盟禁止娱乐"},
[1022]={id=1022,note="不是盟主"},
[1018]={id=1018,note="亲友圈不存在"},
[1019]={id=1019,note="亲友圈已满"},
[1020]={id=1020,note="亲友圈还有房间"},
[1021]={id=1021,note="亲友圈禁止娱乐"},
[1022]={id=1022,note="不是群主"},
[1023]={id=1023,note="目標玩家是合伙人"},
[1024]={id=1024,note="目標玩家不是合伙人"},
[1025]={id=1025,note="已被管理员禁止娱乐"},
[1026]={id=1026,note="积分不足，无法进入房间"},
[1027]={id=1027,note="只能创建一个大联盟"},
[1028]={id=1028,note="大联盟玩法必须开启积分"},
[1026]={id=1026,note="房卡不足，无法进入房间"},
[1027]={id=1027,note="只能创建一个亲友圈"},
[1028]={id=1028,note="亲友圈玩法必须开启积分"},
[1029]={id=1029,note="还存在该玩法的房间，操作失败"},
[1030]={id=1030,note="不在此大联盟的房间中"},
[1030]={id=1030,note="不在此亲友圈的房间中"},
[1031]={id=1031,note="玩家关闭被邀请"},
[1032]={id=1032,note="创建大联盟数达到上限"},
[1033]={id=1033,note="大联盟人数已满"},
[1032]={id=1032,note="创建亲友圈数达到上限"},
[1033]={id=1033,note="亲友圈人数已满"},
[1034]={id=1034,note="玩家在游戏中，不能下分"},
[1035]={id=1035,note="奖励池积分不足"},
[1036]={id=1036,note=" 奖励池没提取"},
[1037]={id=1037,note="禁止同桌"},
[1038]={id=1038,note="玩法禁止娱乐"},
[1039]={id=1039,note="大联盟已关闭申请"},
[1040]={id=1040,note="大联盟已停止服务"},
[1041]={id=1041,note="不能退出大联盟"},
[1039]={id=1039,note="亲友圈已关闭申请"},
[1040]={id=1040,note="亲友圈已停止服务"},
[1041]={id=1041,note="不能退出亲友圈"},
[1047]={id=1047,note="携带值超越上线, 请保存到保险箱里"},
[1048]={id=1048,note="玩家携带值值超越上线, 请提醒保险箱里"},
[1049]={id=1049,note="本房间禁止扔表情"},

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

@ -164,7 +164,7 @@ function M:UpdatePlayerInfoView()
local _player_info = self._player_info
local list = self._room.player_list
for i = 1, self._room.room_config.people_num do
for i = 1, #list do
local seat = self:GetPos(list[i].seat)
local tem = self._view:GetChild(string.format("player_info%d_%d", seat, (self._state.selectedIndex % 2) + 1))
_player_info[seat] = PlayerInfoView.new(tem, self)
@ -404,7 +404,6 @@ function M:EventInit()
end)
_gamectr:AddEventListener(TX_GameEvent.ZPResult1, function(...)
self:PlayMJSound("end_music.mp3")
MJMainView.OnResult1(self, ...)
--[[
self._popEvent = false
@ -571,6 +570,8 @@ function M:OutCard(card)
info:UpdateOutCardList(nil, card, self._cursor)
info._ctr_tip.selectedIndex = 0
info._ctr_showGuoHu.selectedIndex = 0
self:markOutCards(false, card)
self:PlaySound("FuZhou_MJ", self._room.self_player.self_user.sex, tostring(card))
self:PlayMJSound("chupai.mp3")
-- self:ShowHuTip()
@ -773,57 +774,6 @@ function M:_ChiView(tiplist, callback)
self._pop_tip_choice = _pop_tip_choice
end
function M:OnFangziAction(...)
self:__CloseTip()
local arg = { ... }
local _player_card_info = self._player_card_info
local fz = arg[1]
local player = arg[2]
local index = arg[3]
printlog("OnFangziAction")
local info = _player_card_info[self:GetPos(player.seat)]
-- local pNode = info._mask_liangpai
local effect = UIPackage.CreateObject("Extend_MJ_FuZhou", "FzEffect")
if fz.type == FZType.Peng then
self:PlaySound("FuZhou_MJ", player.self_user.sex, "peng")
effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "碰")
effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "碰")
-- effect:GetChild("kuang").icon = UIPackage.GetItemURL("Main_Majiang", "碰框")
elseif fz.type == FZType.Chi then
self:PlaySound("FuZhou_MJ", player.self_user.sex, "chi")
effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "吃")
effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "吃")
else
self:PlaySound("FuZhou_MJ", player.self_user.sex, "gang")
effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "杠")
effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "杠")
-- effect:GetChild("kuang").icon = UIPackage.GetItemURL("Main_Majiang", "杠框")
end
effect.touchable = false
effect:GetTransition("t2"):Play()
-- pNode:AddChild(effect)
coroutine.start(function()
coroutine.wait(0.3)
self._popEvent = true
end)
coroutine.start(function()
coroutine.wait(2)
effect:Dispose()
end)
self:RemoveCursor()
if (player.seat ~= fz.from_seat) then
local fs_info = _player_card_info[self:GetPos(fz.from_seat)]
fs_info:UpdateOutCardList()
end
local seat = (self._room.room_config.people_num == 2 and fz.from_seat == 2) and 2 or fz.from_seat - 1
info:UpdateFzList(fz, index, true, seat)
local getcard = fz.type == FZType.Peng or fz.type == FZType.Chi
printlog(getcard)
info:UpdateHandCard(getcard)
self:__CloseTip()
end
function M:RunNiao(list, start_seat)
local _room = self._room
--local _niao_View = self._niao_View
@ -941,6 +891,9 @@ function M:ReloadRoom(bskip)
if bskip == nil or bskip == false then
if p.ready and room.playing == false then
self._player_info[self:GetPos(p.seat)]:Ready(true)
if room.self_player.seat == p.seat then
self._ctr_action.selectedIndex = 0
end
end
end
if p.piao_niao ~= nil and p.piao_niao > 0 then

5
lua_probject/extend_project/extend/majiang/fuzhou/EXPlayBackView.lua
View File

@ -27,6 +27,10 @@ function M:InitView(url)
self._tex_round = self._view:GetChild("tex_round")
self._tex_LeftCard = self._view:GetChild("remaining_card")
self._anchor = self._view:GetChild("mask_tips")
local config = ExtendManager.GetExtendConfig(room.game_id)
local mode = config:GetGameInfo()
local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config), json.encode(room.room_config.hpData))
self._view:GetChild('wanfa_text').text = gamePlay
self._eventmap = {}
self._cmdmap = {}
@ -37,6 +41,7 @@ function M:InitView(url)
self._cmdmap[Record_Event.Evt_Niao] = self.CmdNiao
self._cmdmap[Record_Event.Evt_Piao] = self.CmdPiao
self._cmdmap[Record_Event.Evt_Result] = self.CmdResult
self.com_logocType.selectedIndex = 0
end
function M:FillRoomData(data)

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

@ -190,8 +190,6 @@ function M:EventInit()
print("lingmeng witness FZTips")
end)
_gamectr:AddEventListener(TX_GameEvent.FangziAction, handler(self, self.OnFangziAction))
_gamectr:AddEventListener(TX_GameEvent.ZPHuCard, function(...)
self._popEvent = false
self._left_time = 0
@ -445,67 +443,6 @@ function M:UpdateCardBox(seat)
self._ctr_cardbox.selectedIndex = index
end
function M:OnFangziAction(...)
local arg = { ... }
local _player_card_info = self._player_card_info
local fz = arg[1]
local player = arg[2]
local index = arg[3]
local info = _player_card_info[self:GetPos(player.seat)]
-- local pNode = info._mask_liangpai
local arg = { ... }
local _player_card_info = self._player_card_info
local fz = arg[1]
local player = arg[2]
local index = arg[3]
local info = _player_card_info[self:GetPos(player.seat)]
-- local pNode = info._mask_liangpai
local effect = UIPackage.CreateObject("Extend_MJ_JinXi", "FzEffect")
if fz.type == FZType.Peng then
self:PlaySound("JinXi_MJ", player.self_user.sex, "peng")
effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "碰")
effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "碰")
-- effect:GetChild("kuang").icon = UIPackage.GetItemURL("Main_Majiang", "碰框")
elseif fz.type == FZType.Chi then
self:PlaySound("JinXi_MJ", player.self_user.sex, "chi")
effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "吃")
effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "吃")
else
self:PlaySound("JinXi_MJ", player.self_user.sex, "gang")
effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "杠")
effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "杠")
-- effect:GetChild("kuang").icon = UIPackage.GetItemURL("Main_Majiang", "杠框")
end
effect.touchable = false
effect:GetTransition("t2"):Play()
-- pNode:AddChild(effect)
coroutine.start(function()
coroutine.wait(0.3)
self._popEvent = true
end)
coroutine.start(function()
coroutine.wait(2)
effect:Dispose()
end)
self:RemoveCursor()
if (player.seat ~= fz.from_seat) then
local fs_info = _player_card_info[self:GetPos(fz.from_seat)]
fs_info:UpdateOutCardList()
end
local seat = (self._room.room_config.people_num == 2 and fz.from_seat == 2) and 2 or fz.from_seat - 1
info:UpdateFzList(fz, index, true, seat)
--因为观战没有手牌，等预处理完扣牌数之后矫正一次(最粗暴的修正方式，手牌数等于13-3*吃碰数)
info._player.hand_left_count = 14 - 3 * #info._player.fz_list
info:UpdateHandCardWitness(true)
-- self:__CloseTip()
end
local majiang_asset_path = "base/main_majiang/sound/"
function M:PlayMJSound(path)
ViewUtil.PlaySound(self.asset_group, majiang_asset_path .. path)

10
lua_probject/extend_project/extend/majiang/fuzhou/ExtendConfig.lua
View File

@ -92,9 +92,17 @@ function M:FillRoomData(s2croom)
room.curren_outcard_seat = _reloadInfo["curren_outcard_seat"]
room.last_outcard_seat = last_outcard_seat
room.playing = playing
--将排序放在精牌后面，并把自己的拿牌放在最后
local _hand_card = _reloadInfo["hand_card"]
room.self_player.card_list = _hand_card
table.sort(_hand_card, self.HandCardSortAndJing)
if room.self_player.seat == room.curren_outcard_seat then
local getCard = _hand_card[#_hand_card]
table.remove(_hand_card, #_hand_card)
table.sort(_hand_card, ViewUtil.HandCardSort)
table.insert(_hand_card, getCard)
else
table.sort(_hand_card, ViewUtil.HandCardSort)
end
for i = 1, #_info_list do
local tem = _info_list[i]
local playerid = tem["playerid"]

24
lua_probject/extend_project/extend/majiang/fuzhou/HuCardImg.lua
View File

@ -15,7 +15,7 @@ HuCardImg[11] = { "tile_cs_qingyisezhenhu" }
HuCardImg[12] = { "tile_cs_qingyisejiahu" }
HuCardImg[13] = { "tile_cs_ziyisezhenhu" }
HuCardImg[14] = { "tile_cs_ziyisejiahu" }
HuCardImg[15] = { "缺失" }
HuCardImg[15] = { "tile_cs_tianhu" }
HuCardImg[16] = { "tile_cs_dihu" }
HuCardImg[17] = { "tile_cs_pinghu" }
HuCardImg[18] = { "tile_cs_qiangganghu" }
@ -24,5 +24,27 @@ HuCardImg[20] = { "缺失" }
HuCardImg[21] = { "tile_cs_siguiyi" }
HuCardImg[22] = { "tile_cs_baguiyi" }
HuCardImg[23] = { "tile_cs_seguiyi" }
HuCardImg[24] = { "tile_cs_qingyisejiahu","tile_cs_siguiyi" }
HuCardImg[25] = { "tile_cs_qingyisezhenhu","tile_cs_siguiyi" }
HuCardImg[26] = { "tile_cs_qingyisejiahu","tile_cs_baguiyi" }
HuCardImg[27] = { "tile_cs_qingyisezhenhu","tile_cs_baguiyi" }
HuCardImg[28] = { "tile_cs_qingyisejiahu","tile_cs_seguiyi" }
HuCardImg[29] = { "tile_cs_qingyisezhenhu","tile_cs_seguiyi" }
HuCardImg[30] = { "tile_cs_ziyisejiahu","tile_cs_siguiyi" }
HuCardImg[31] = { "tile_cs_ziyisezhenhu","tile_cs_siguiyi" }
HuCardImg[32] = { "tile_cs_ziyisejiahu","tile_cs_baguiyi" }
HuCardImg[33] = { "tile_cs_ziyisezhenhu","tile_cs_baguiyi" }
HuCardImg[34] = { "tile_cs_ziyisejiahu","tile_cs_seguiyi" }
HuCardImg[35] = { "tile_cs_ziyisezhenhu","tile_cs_seguiyi" }
HuCardImg[36] = { "tile_cs_qingyise","tile_cs_qidui","tile_cs_siguiyi" }
HuCardImg[37] = { "tile_cs_qingyise","tile_cs_qidui","tile_cs_baguiyi" }
HuCardImg[38] = { "tile_cs_qingyise","tile_cs_qidui","tile_cs_seguiyi" }
HuCardImg[39] = { "tile_cs_ziyise","tile_cs_qidui","tile_cs_siguiyi" }
HuCardImg[40] = { "tile_cs_ziyise","tile_cs_qidui","tile_cs_baguiyi" }
HuCardImg[41] = { "tile_cs_ziyise","tile_cs_qidui","tile_cs_seguiyi" }
HuCardImg[42] = { "tile_cs_qidui","tile_cs_siguiyi" }
HuCardImg[43] = { "tile_cs_qidui","tile_cs_baguiyi" }
HuCardImg[44] = { "tile_cs_qidui","tile_cs_seguiyi" }
return HuCardImg

12
lua_probject/extend_project/extend/majiang/jinxi/CS_Win_Type.lua
View File

@ -10,11 +10,13 @@ local CS_Win_Type = {
"七小对清一色",
"七小对字一色",
"清一色真胡",
"清一色假胡",
"字一色真胡",
"字一色假胡",
"天胡",
"地胡",
"杠上花",
"",
"",
"",
"",
"平胡",
"抢杠胡",
"烧庄",
}
return CS_Win_Type

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

@ -163,7 +163,7 @@ function M:UpdatePlayerInfoView()
local _player_info = self._player_info
local list = self._room.player_list
for i = 1, self._room.room_config.people_num do
for i = 1, #list do
local seat = self:GetPos(list[i].seat)
local tem = self._view:GetChild(string.format("player_info%d_%d", seat, (self._state.selectedIndex % 2) + 1))
_player_info[seat] = PlayerInfoView.new(tem, self)
@ -572,6 +572,8 @@ function M:OutCard(card)
info:UpdateOutCardList(nil, card, self._cursor)
info._ctr_tip.selectedIndex = 0
info._ctr_showGuoHu.selectedIndex = 0
self:markOutCards(false, card)
self:PlaySound("JinXi_MJ", self._room.self_player.self_user.sex, tostring(card))
self:PlayMJSound("chupai.mp3")
-- self:ShowHuTip()
@ -774,57 +776,6 @@ function M:_ChiView(tiplist, callback)
self._pop_tip_choice = _pop_tip_choice
end
function M:OnFangziAction(...)
self:__CloseTip()
local arg = { ... }
local _player_card_info = self._player_card_info
local fz = arg[1]
local player = arg[2]
local index = arg[3]
printlog("OnFangziAction")
local info = _player_card_info[self:GetPos(player.seat)]
-- local pNode = info._mask_liangpai
local effect = UIPackage.CreateObject("Extend_MJ_JinXi", "FzEffect")
if fz.type == FZType.Peng then
self:PlaySound("FuZhou_MJ", player.self_user.sex, "peng")
effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "碰")
effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "碰")
-- effect:GetChild("kuang").icon = UIPackage.GetItemURL("Main_Majiang", "碰框")
elseif fz.type == FZType.Chi then
self:PlaySound("JinXi_MJ", player.self_user.sex, "chi")
effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "吃")
effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "吃")
else
self:PlaySound("JinXi_MJ", player.self_user.sex, "gang")
effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "杠")
effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "杠")
-- effect:GetChild("kuang").icon = UIPackage.GetItemURL("Main_Majiang", "杠框")
end
effect.touchable = false
effect:GetTransition("t2"):Play()
-- pNode:AddChild(effect)
coroutine.start(function()
coroutine.wait(0.3)
self._popEvent = true
end)
coroutine.start(function()
coroutine.wait(2)
effect:Dispose()
end)
self:RemoveCursor()
if (player.seat ~= fz.from_seat) then
local fs_info = _player_card_info[self:GetPos(fz.from_seat)]
fs_info:UpdateOutCardList()
end
local seat = (self._room.room_config.people_num == 2 and fz.from_seat == 2) and 2 or fz.from_seat - 1
info:UpdateFzList(fz, index, true, seat)
local getcard = fz.type == FZType.Peng or fz.type == FZType.Chi
printlog(getcard)
info:UpdateHandCard(getcard)
self:__CloseTip()
end
function M:RunNiao(list, start_seat)
local _room = self._room
--local _niao_View = self._niao_View
@ -942,6 +893,9 @@ function M:ReloadRoom(bskip)
if bskip == nil or bskip == false then
if p.ready and room.playing == false then
self._player_info[self:GetPos(p.seat)]:Ready(true)
if room.self_player.seat == p.seat then
self._ctr_action.selectedIndex = 0
end
end
end
if p.piao_niao ~= nil and p.piao_niao > 0 then

5
lua_probject/extend_project/extend/majiang/jinxi/EXPlayBackView.lua
View File

@ -27,6 +27,10 @@ function M:InitView(url)
self._tex_round = self._view:GetChild("tex_round")
self._tex_LeftCard = self._view:GetChild("remaining_card")
self._anchor = self._view:GetChild("mask_tips")
local config = ExtendManager.GetExtendConfig(room.game_id)
local mode = config:GetGameInfo()
local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config), json.encode(room.room_config.hpData))
self._view:GetChild('wanfa_text').text = gamePlay
self._eventmap = {}
self._cmdmap = {}
@ -37,6 +41,7 @@ function M:InitView(url)
self._cmdmap[Record_Event.Evt_Niao] = self.CmdNiao
self._cmdmap[Record_Event.Evt_Piao] = self.CmdPiao
self._cmdmap[Record_Event.Evt_Result] = self.CmdResult
self.com_logocType.selectedIndex = 3
end
function M:FillRoomData(data)

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

@ -190,8 +190,6 @@ function M:EventInit()
print("lingmeng witness FZTips")
end)
_gamectr:AddEventListener(TX_GameEvent.FangziAction, handler(self, self.OnFangziAction))
_gamectr:AddEventListener(TX_GameEvent.ZPHuCard, function(...)
self._popEvent = false
self._left_time = 0
@ -445,67 +443,6 @@ function M:UpdateCardBox(seat)
self._ctr_cardbox.selectedIndex = index
end
function M:OnFangziAction(...)
local arg = { ... }
local _player_card_info = self._player_card_info
local fz = arg[1]
local player = arg[2]
local index = arg[3]
local info = _player_card_info[self:GetPos(player.seat)]
-- local pNode = info._mask_liangpai
local arg = { ... }
local _player_card_info = self._player_card_info
local fz = arg[1]
local player = arg[2]
local index = arg[3]
local info = _player_card_info[self:GetPos(player.seat)]
-- local pNode = info._mask_liangpai
local effect = UIPackage.CreateObject("Extend_MJ_JinXi", "FzEffect")
if fz.type == FZType.Peng then
self:PlaySound("JinXi_MJ", player.self_user.sex, "peng")
effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "碰")
effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "碰")
-- effect:GetChild("kuang").icon = UIPackage.GetItemURL("Main_Majiang", "碰框")
elseif fz.type == FZType.Chi then
self:PlaySound("JinXi_MJ", player.self_user.sex, "chi")
effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "吃")
effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "吃")
else
self:PlaySound("JinXi_MJ", player.self_user.sex, "gang")
effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "杠")
effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "杠")
-- effect:GetChild("kuang").icon = UIPackage.GetItemURL("Main_Majiang", "杠框")
end
effect.touchable = false
effect:GetTransition("t2"):Play()
-- pNode:AddChild(effect)
coroutine.start(function()
coroutine.wait(0.3)
self._popEvent = true
end)
coroutine.start(function()
coroutine.wait(2)
effect:Dispose()
end)
self:RemoveCursor()
if (player.seat ~= fz.from_seat) then
local fs_info = _player_card_info[self:GetPos(fz.from_seat)]
fs_info:UpdateOutCardList()
end
local seat = (self._room.room_config.people_num == 2 and fz.from_seat == 2) and 2 or fz.from_seat - 1
info:UpdateFzList(fz, index, true, seat)
--因为观战没有手牌，等预处理完扣牌数之后矫正一次(最粗暴的修正方式，手牌数等于13-3*吃碰数)
info._player.hand_left_count = 14 - 3 * #info._player.fz_list
info:UpdateHandCardWitness(true)
-- self:__CloseTip()
end
local majiang_asset_path = "base/main_majiang/sound/"
function M:PlayMJSound(path)
ViewUtil.PlaySound(self.asset_group, majiang_asset_path .. path)

11
lua_probject/extend_project/extend/majiang/jinxi/ExtendConfig.lua
View File

@ -97,10 +97,17 @@ function M:FillRoomData(s2croom)
if jing then
room.jing = jing
end
--将排序放在精牌后面
--将排序放在精牌后面，并把自己的拿牌放在最后
local _hand_card = _reloadInfo["hand_card"]
room.self_player.card_list = _hand_card
table.sort(_hand_card, self.HandCardSortAndJing)
if room.self_player.seat == room.curren_outcard_seat then
local getCard = _hand_card[#_hand_card]
table.remove(_hand_card, #_hand_card)
table.sort(_hand_card, self.HandCardSortAndJing)
table.insert(_hand_card, getCard)
else
table.sort(_hand_card, self.HandCardSortAndJing)
end
for i = 1, #_info_list do
local tem = _info_list[i]
local playerid = tem["playerid"]

1
lua_probject/extend_project/extend/majiang/jinxi/HuCardImg.lua
View File

@ -1,5 +1,6 @@
local HuCardImg = {}
HuCardImg[12] = { "tile_cs_gangshanghua" }
HuCardImg[14] = { "tile_cs_shisanlan", "tile_cs_deguo" }
HuCardImg[15] = { "tile_cs_qxshisanlan", "tile_cs_deguo" }
HuCardImg[16] = { "tile_cs_dihu" }

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

@ -402,7 +402,6 @@ function M:EventInit()
end)
_gamectr:AddEventListener(TX_GameEvent.ZPResult1, function(...)
self:PlayMJSound("end_music.mp3")
MJMainView.OnResult1(self, ...)
--[[
self._popEvent = false
@ -562,13 +561,17 @@ function M:OutCard(card)
printlog("当前出牌为===>>>" .. card)
local _gamectr = ControllerManager.GetController(GameController)
self._room.curren_outcard_seat = -1
_gamectr:SendOutCard({ card = card, isTip = self._player_card_info[1]._ctr_tip.selectedIndex == 1 }, function()
_gamectr:SendOutCard(
{ card = card, isTip = self._player_card_info[1]._ctr_tip.selectedIndex == 1 or
self._player_card_info[1]._ctr_showGuoHu.selectedIndex == 1 }, function()
local info = self._player_card_info[1]
self:RemoveCursor()
info:UpdateHandCard()
info:UpdateOutCardList(nil, card, self._cursor)
info._ctr_tip.selectedIndex = 0
info._ctr_showGuoHu.selectedIndex = 0
self:markOutCards(false, card)
self:PlaySound("LiChuan_MJ", self._room.self_player.self_user.sex, tostring(card))
self:PlayMJSound("chupai.mp3")
-- self:ShowHuTip()

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

@ -27,6 +27,10 @@ function M:InitView(url)
self._tex_round = self._view:GetChild("tex_round")
self._tex_LeftCard = self._view:GetChild("remaining_card")
self._anchor = self._view:GetChild("mask_tips")
local config = ExtendManager.GetExtendConfig(room.game_id)
local mode = config:GetGameInfo()
local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config), json.encode(room.room_config.hpData))
self._view:GetChild('wanfa_text').text = gamePlay
self._eventmap = {}
self._cmdmap = {}
@ -37,6 +41,8 @@ function M:InitView(url)
self._cmdmap[Record_Event.Evt_Niao] = self.CmdNiao
self._cmdmap[Record_Event.Evt_Piao] = self.CmdPiao
self._cmdmap[Record_Event.Evt_Result] = self.CmdResult
self.com_logocType.selectedIndex = 2
end
function M:FillRoomData(data)

11
lua_probject/extend_project/extend/majiang/lichuan/ExtendConfig.lua
View File

@ -98,10 +98,17 @@ function M:FillRoomData(s2croom)
if jing then
room.jing = jing
end
--将排序放在精牌后面
--将排序放在精牌后面，并把自己的拿牌放在最后
local _hand_card = _reloadInfo["hand_card"]
room.self_player.card_list = _hand_card
table.sort(_hand_card, self.HandCardSortAndJing)
if room.self_player.seat == room.curren_outcard_seat then
local getCard = _hand_card[#_hand_card]
table.remove(_hand_card, #_hand_card)
table.sort(_hand_card, self.HandCardSortAndJing)
table.insert(_hand_card, getCard)
else
table.sort(_hand_card, self.HandCardSortAndJing)
end
for i = 1, #_info_list do
local tem = _info_list[i]
local playerid = tem["playerid"]

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

@ -161,7 +161,7 @@ function M:UpdatePlayerInfoView()
local _player_info = self._player_info
local list = self._room.player_list
for i = 1, self._room.room_config.people_num do
for i = 1, #list do
local seat = self:GetPos(list[i].seat)
local tem = self._view:GetChild(string.format("player_info%d_%d", seat, (self._state.selectedIndex % 2) + 1))
_player_info[seat] = PlayerInfoView.new(tem, self)
@ -403,7 +403,6 @@ function M:EventInit()
end)
_gamectr:AddEventListener(TX_GameEvent.ZPResult1, function(...)
self:PlayMJSound("end_music.mp3")
MJMainView.OnResult1(self, ...)
--[[
self._popEvent = false
@ -571,6 +570,8 @@ function M:OutCard(card)
info:UpdateOutCardList(nil, card, self._cursor)
info._ctr_tip.selectedIndex = 0
info._ctr_showGuoHu.selectedIndex = 0
self:markOutCards(false, card)
self:PlaySound("NanCheng_MJ", self._room.self_player.self_user.sex, tostring(card))
self:PlayMJSound("chupai.mp3")
-- self:ShowHuTip()
@ -773,57 +774,6 @@ function M:_ChiView(tiplist, callback)
self._pop_tip_choice = _pop_tip_choice
end
function M:OnFangziAction(...)
self:__CloseTip()
local arg = { ... }
local _player_card_info = self._player_card_info
local fz = arg[1]
local player = arg[2]
local index = arg[3]
printlog("OnFangziAction")
local info = _player_card_info[self:GetPos(player.seat)]
-- local pNode = info._mask_liangpai
local effect = UIPackage.CreateObject("Extend_MJ_NanCheng", "FzEffect")
if fz.type == FZType.Peng then
self:PlaySound("FuZhou_MJ", player.self_user.sex, "peng")
effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "碰")
effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "碰")
-- effect:GetChild("kuang").icon = UIPackage.GetItemURL("Main_Majiang", "碰框")
elseif fz.type == FZType.Chi then
self:PlaySound("NanCheng_MJ", player.self_user.sex, "chi")
effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "吃")
effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "吃")
else
self:PlaySound("NanCheng_MJ", player.self_user.sex, "gang")
effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "杠")
effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "杠")
-- effect:GetChild("kuang").icon = UIPackage.GetItemURL("Main_Majiang", "杠框")
end
effect.touchable = false
effect:GetTransition("t2"):Play()
-- pNode:AddChild(effect)
coroutine.start(function()
coroutine.wait(0.3)
self._popEvent = true
end)
coroutine.start(function()
coroutine.wait(2)
effect:Dispose()
end)
self:RemoveCursor()
if (player.seat ~= fz.from_seat) then
local fs_info = _player_card_info[self:GetPos(fz.from_seat)]
fs_info:UpdateOutCardList()
end
local seat = (self._room.room_config.people_num == 2 and fz.from_seat == 2) and 2 or fz.from_seat - 1
info:UpdateFzList(fz, index, true, seat)
local getcard = fz.type == FZType.Peng or fz.type == FZType.Chi
printlog(getcard)
info:UpdateHandCard(getcard)
self:__CloseTip()
end
function M:RunNiao(list, start_seat)
local _room = self._room
--local _niao_View = self._niao_View
@ -893,13 +843,13 @@ function M:ReloadRoom(bskip)
-- self._room._reload_flag = true
-- end
local flag_action = 0
if bskip == nil or bskip == false then
if not room.playing then
self._state.selectedIndex = 2
self._ctr_action.selectedIndex = 1
else
self._state.selectedIndex = 1
self._ctr_action.selectedIndex = 0
self._room._reload_flag = true
end
end

1
lua_probject/extend_project/extend/majiang/nancheng/EXPlayBackView.lua
View File

@ -42,6 +42,7 @@ function M:InitView(url)
self._cmdmap[Record_Event.Evt_Niao] = self.CmdNiao
self._cmdmap[Record_Event.Evt_Piao] = self.CmdPiao
self._cmdmap[Record_Event.Evt_Result] = self.CmdResult
self.com_logocType.selectedIndex = 1
end
function M:FillRoomData(data)

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

@ -190,8 +190,6 @@ function M:EventInit()
print("lingmeng witness FZTips")
end)
_gamectr:AddEventListener(TX_GameEvent.FangziAction, handler(self, self.OnFangziAction))
_gamectr:AddEventListener(TX_GameEvent.ZPHuCard, function(...)
self._popEvent = false
self._left_time = 0
@ -445,67 +443,6 @@ function M:UpdateCardBox(seat)
self._ctr_cardbox.selectedIndex = index
end
function M:OnFangziAction(...)
local arg = { ... }
local _player_card_info = self._player_card_info
local fz = arg[1]
local player = arg[2]
local index = arg[3]
local info = _player_card_info[self:GetPos(player.seat)]
-- local pNode = info._mask_liangpai
local arg = { ... }
local _player_card_info = self._player_card_info
local fz = arg[1]
local player = arg[2]
local index = arg[3]
local info = _player_card_info[self:GetPos(player.seat)]
-- local pNode = info._mask_liangpai
local effect = UIPackage.CreateObject("Extend_MJ_NanCheng", "FzEffect")
if fz.type == FZType.Peng then
self:PlaySound("NanCheng_MJ", player.self_user.sex, "peng")
effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "碰")
effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "碰")
-- effect:GetChild("kuang").icon = UIPackage.GetItemURL("Main_Majiang", "碰框")
elseif fz.type == FZType.Chi then
self:PlaySound("NanCheng_MJ", player.self_user.sex, "chi")
effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "吃")
effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "吃")
else
self:PlaySound("NanCheng_MJ", player.self_user.sex, "gang")
effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "杠")
effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "杠")
-- effect:GetChild("kuang").icon = UIPackage.GetItemURL("Main_Majiang", "杠框")
end
effect.touchable = false
effect:GetTransition("t2"):Play()
-- pNode:AddChild(effect)
coroutine.start(function()
coroutine.wait(0.3)
self._popEvent = true
end)
coroutine.start(function()
coroutine.wait(2)
effect:Dispose()
end)
self:RemoveCursor()
if (player.seat ~= fz.from_seat) then
local fs_info = _player_card_info[self:GetPos(fz.from_seat)]
fs_info:UpdateOutCardList()
end
local seat = (self._room.room_config.people_num == 2 and fz.from_seat == 2) and 2 or fz.from_seat - 1
info:UpdateFzList(fz, index, true, seat)
--因为观战没有手牌，等预处理完扣牌数之后矫正一次(最粗暴的修正方式，手牌数等于13-3*吃碰数)
info._player.hand_left_count = 14 - 3 * #info._player.fz_list
info:UpdateHandCardWitness(true)
-- self:__CloseTip()
end
local majiang_asset_path = "base/main_majiang/sound/"
function M:PlayMJSound(path)
ViewUtil.PlaySound(self.asset_group, majiang_asset_path .. path)

9
lua_probject/extend_project/extend/majiang/nancheng/ExtendConfig.lua
View File

@ -96,7 +96,14 @@ function M:FillRoomData(s2croom)
room.reload = reload
local _hand_card = _reloadInfo["hand_card"]
room.self_player.card_list = _hand_card
table.sort(_hand_card, self.HandCardSortAndJing)
if room.self_player.seat == room.curren_outcard_seat then
local getCard = _hand_card[#_hand_card]
table.remove(_hand_card, #_hand_card)
table.sort(_hand_card, ViewUtil.HandCardSort)
table.insert(_hand_card, getCard)
else
table.sort(_hand_card, ViewUtil.HandCardSort)
end
for i = 1, #_info_list do
local tem = _info_list[i]
local playerid = tem["playerid"]

52
lua_probject/main_project/main/majiang/MJMainView.lua
View File

@ -50,6 +50,7 @@ function M:InitView(url, use_custom_bg, custom_bg_config)
self.loader_selfHuCardEffect = self._view:GetChild("loader_selfHuCardEffect")
self.cHuCardEffect = self._view:GetController("cHuCardEffect")
-- self.effect_ZiMo = self._view:GetChild("effect_ZiMo")
self._ctr_more = self._view:GetController("more")
self.com_notice = self._view:GetChild("com_notice")
@ -433,10 +434,21 @@ function M:markOutCards(showTip, data)
for i = 1, #self._room.player_list do
local p = self._room.player_list[i]
local info = self._player_card_info[self:GetPos(p.seat)]
for j = 1, #p.outcard_list do
-- for j = 1, #p.outcard_list do
-- local card = p.outcard_list[j]
-- if card == data then
-- for k = 1, #p.outcard_list do
-- local obj = info:GetOutCardByIndex(k)
-- if obj.data == card then
-- obj:GetController("gray").selectedIndex = showTip and 1 or 0
-- end
-- end
-- end
-- end
for j = 1, info._view_outCardList.numItems do
local card = p.outcard_list[j]
if card == data then
for k = 1, #p.outcard_list do
for k = 1, info._view_outCardList.numItems do
local obj = info:GetOutCardByIndex(k)
if obj.data == card then
obj:GetController("gray").selectedIndex = showTip and 1 or 0
@ -711,20 +723,17 @@ function M:OnResult1(...)
local liuju = result.liuju
local data = result.info_list
local niao = result.niao
-- if liuju then
-- local le = UIPackage.CreateObjectFromURL("ui://Main_Majiang/LiuJu")
-- self._view:AddChild(le)
-- le:Center()
-- le:GetTransition("t0"):Play()
-- coroutine.start(function()
-- coroutine.wait(1)
-- le:Dispose()
-- end)
-- end
-- self:RemoveCursor()
self._clearingView = self.EXClearingViewClass.new(self._root_view)
self._clearingView._view:GetChild('btn_setting').onClick:Set(handler(self, self.ClickSetting))
coroutine.start(function()
if liuju then
self:PlayMJSound("liuju.mp3")
coroutine.wait(2.7)
self:PlayMJSound("end_music.mp3")
else
self:PlayMJSound("end_music.mp3")
end
coroutine.wait(0.5)
self._clearingView:Show()
self._popEvent = true
@ -825,6 +834,23 @@ function M:OnHuCard(...)
loader_HuEffect.visible = false
local Effects = {}
--先循环一遍把杠上开花放在最前面
for i = 1, #win_list do
local HuMsg = win_list[i]
if HuMsg.type > 2 and HuMsg.type < 32 then
if self.HuCardImg[HuMsg.type][1] == "tile_cs_gangshanghua" then
local imgPath = "ui://Main_Majiang/tile_cs_gangshanghua"
local imgObj = list_HuCardEffect:AddItemFromPool()
local imgLoader = imgObj:GetChild("loader_img")
imgLoader.url = imgPath
imgObj.visible = false
Effects[#Effects + 1] = imgObj
table.remove(win_list, i)
break
end
end
end
for i = 1, #win_list do
local HuMsg = win_list[i]
@ -891,10 +917,12 @@ function M:OnFangziAction(...)
local loader_HuEffect = info._viewClip_Peng_Gang
local effects = ""
if fz.type == FZType.Peng then
self:PlaySound("Main_Majiang", player.self_user.sex, "peng")
effects = "clip_peng"
elseif fz.type == FZType.Chi then
else
self:PlaySound("Main_Majiang", player.self_user.sex, "gang")
effects = "clip_gang"
end
local clip = UIPackage.CreateObjectFromURL(string.format("ui://Main_Majiang/%s", effects))

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

@ -294,6 +294,7 @@ function M:UpdateOutCardList(outcard, card_item, cursor)
for i = 0, #outlist - 1 do
local outcard = self._view_outCardList:AddItemFromPool()
outcard.data = outlist[i + 1]
self:fillCard2(outcard, outCardName, outlist[i + 1])
if cursor and i == #outlist - 1 then
Timer.New(function()
@ -387,18 +388,19 @@ function M:UpdateFzList(fz, index, show_card)
end
function M:GetOutCardByIndex(index)
local outcard_list = self._mask_data['outcard_list']
local oder = outcard_list['oder']
local multi_draw_oder = 0
if (outcard_list['multi_draw_oder']) then
multi_draw_oder = outcard_list['multi_draw_oder']
end
-- local outcard_list = self._mask_data['outcard_list']
-- local oder = outcard_list['oder']
-- local multi_draw_oder = 0
-- if (outcard_list['multi_draw_oder']) then
-- multi_draw_oder = outcard_list['multi_draw_oder']
-- end
if (oder == AreaOderType.down_up or (multi_draw_oder == 1)) then
return self._area_outcard_list:GetChildAt(self._area_outcard_list.numChildren - index)
else
return self._area_outcard_list:GetChildAt(index - 1)
end
-- if (oder == AreaOderType.down_up or (multi_draw_oder == 1)) then
-- return self._area_outcard_list:GetChildAt(self._area_outcard_list.numChildren - index)
-- else
-- return self._area_outcard_list:GetChildAt(index - 1)
-- end
return self._view_outCardList:GetChildAt(index - 1)
end
function M:ResetFzList()

22
lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView.lua
View File

@ -80,6 +80,7 @@ function M:UpdateHandCard(getcard, mp)
if getcard and i == (#card_list) - 1 then
btn_card = self._view_getCard:AddItemFromPool()
btn_card.onClick:Add(function(context)
self:ChangeMarkOutCards(context.sender.data.card_item)
self:__OnClickGetCard(context)
end)
else
@ -97,9 +98,9 @@ function M:UpdateHandCard(getcard, mp)
end
self._view_handCardList.onClickItem:Set(function(context)
self._mainView:PlayMJSound("clickCard.mp3")
self:ChangeMarkOutCards(context.data.data.card_item)
self:__OnClickHandCard(context)
end)
self:ClearMove()
end
@ -246,6 +247,20 @@ function M:outCardMove(context)
self._outCardMove.xy = xy - card.touch_pos
end
function M:ChangeMarkOutCards(card)
local lastCard
if self._click_index == -1 and self._flag_seletedGet == 0 then
self._mainView:markOutCards(true, card)
return
elseif self._click_index ~= -1 then
lastCard = self._view_handCardList:GetChildAt(self._click_index).data.card_item
elseif self._flag_seletedGet ~= 0 then
lastCard = self._view_getCard:GetChildAt(0).data.card_item
end
self._mainView:markOutCards(false, lastCard)
self._mainView:markOutCards(true, card)
end
function M:__OnClickHandCard(context)
self._ctr_seletedGet.selectedIndex = 1
self._flag_seletedGet = 0
@ -299,6 +314,7 @@ function M:__OnClickGetCard(context, flag)
end
function M:ChooseHand(index)
self:ChangeMarkOutCards(self._view_handCardList:GetChildAt(index).data.card_item)
self._click_index = index
self._view_handCardList.selectedIndex = index
self._ctr_seletedGet.selectedIndex = 1
@ -306,6 +322,7 @@ function M:ChooseHand(index)
end
function M:ChooseOut()
self:ChangeMarkOutCards(self._view_getCard:GetChildAt(0).data.card_item)
self._click_index = -1
self._view_handCardList.selectedIndex = -1
self._ctr_seletedGet.selectedIndex = 0
@ -313,6 +330,9 @@ function M:ChooseOut()
end
function M:ClearChoose()
if self._click_index and self._click_index ~= -1 then
self:ChangeMarkOutCards("")
end
self._click_index = -1
self._view_handCardList.selectedIndex = -1
self._ctr_seletedGet.selectedIndex = 1

2
lua_probject/main_project/main/majiang/MJWitnessView.lua
View File

@ -165,10 +165,12 @@ function M:OnFangziAction(...)
local loader_HuEffect = info._viewClip_Peng_Gang
local effects = ""
if fz.type == FZType.Peng then
self:PlaySound("Main_Majiang", player.self_user.sex, "peng")
effects = "clip_peng"
elseif fz.type == FZType.Chi then
else
self:PlaySound("Main_Majiang", player.self_user.sex, "gang")
effects = "clip_gang"
end
local clip = UIPackage.CreateObjectFromURL(string.format("ui://Main_Majiang/%s", effects))

30
wb_new_ui/assets/Chat/Main.xml
View File

@ -1,17 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="1500,876" opaque="false">
<controller name="tab" pages="0,,1,,2," selected="1"/>
<controller name="tab" pages="0,,1,,2," selected="0"/>
<controller name="sdk" pages="0,,1," selected="0"/>
<displayList>
<component id="n58_h1uu" name="n58" src="eeqmcgu" fileName="Win_Frame_full.xml" pkg="27vd145b" xy="0,0" size="1500,876" controller="show_line,1,show_di,1,style,1">
<gearXY controller="sdk" pages="1" values="268,0" default="0,0"/>
<gearSize controller="sdk" pages="0,1" values="1500,876,1,1|963,876,1,1"/>
<relation target="" sidePair="width-width,height-height"/>
<Button icon="ui://l0ds4ys6h1uu2"/>
</component>
<image id="n72_hr0l" name="n72" src="o8k8am" fileName="images/jiangxi/Group 542.png" xy="0,0"/>
<image id="n74_o8k8" name="n74" src="o8k8ar" fileName="images/jiangxi/Frame 27.png" xy="30,30"/>
<image id="n73_hr0l" name="n73" src="o8k8ao" fileName="images/jiangxi/Rectangle 232.png" xy="78,243" size="1344,579"/>
<image id="n79_xpru" name="n79" src="xprubv" fileName="images/jiangxi/bg.png" xy="0,0" size="1500,876"/>
<list id="n52" name="lit_biaoqing1" xy="81,304" size="1339,522" layout="flow_hz" lineGap="5" colGap="10" lineItemCount="4" defaultItem="ui://l0ds4ys6h1uu1v" renderOrder="descent">
<gearDisplay controller="tab" pages="1"/>
<gearXY controller="sdk" pages="0,1" values="81,304|302,58"/>
@ -24,7 +16,7 @@
<item icon="ui://l0ds4ys6o8k8br" name="7"/>
<item icon="ui://l0ds4ys6o8k8bs" name="8"/>
</list>
<list id="n53" name="lit_yuyin" xy="81,306" size="1341,516" overflow="scroll" lineGap="10" defaultItem="ui://l0ds4ys6h1uu1t" autoItemSize="false">
<list id="n53" name="lit_yuyin" xy="81,298" size="1341,524" overflow="scroll" lineGap="3" defaultItem="ui://l0ds4ys6h1uu1t" autoItemSize="false">
<gearDisplay controller="tab" pages="0"/>
<item/>
<item/>
@ -38,26 +30,26 @@
<item/>
<item/>
</list>
<component id="n59_h1uu" name="btn_close" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="1443,-24" controller="style,1">
<gearXY controller="sdk" pages="0,1" values="1443,-24|815,5"/>
<Button icon="ui://27vd145bi2p67hzf"/>
<component id="n59_h1uu" name="btn_close" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="1422,-27" size="101,112" controller="style,1">
<gearXY controller="sdk" pages="0,1" values="1422,-27|815,5"/>
<Button icon="ui://27vd145bm0eibv"/>
</component>
<image id="n68_zgd9" name="n68" src="o8k8an" fileName="images/jiangxi/Rectangle 230.png" xy="78,66" group="n70_zgd9"/>
<image id="n68_zgd9" name="n68" src="xprubx" fileName="images/jiangxi/editBox.png" xy="78,66" size="1068,117" group="n70_zgd9"/>
<text id="n71_zgd9" name="tex_chat" xy="78,66" size="1068,112" group="n70_zgd9" font="ui://27vd145bh35o7ilo" fontSize="54" color="#444444" vAlign="middle" autoSize="shrink" singleLine="true" autoClearText="true" text="你好啊" input="true" prompt="[color=#888888]请输入聊天内容[/color]" maxLength="20"/>
<component id="n69_zgd9" name="btn_send" src="o8k8as" fileName="component/btn_normol.xml" xy="1176,73" size="240,102" group="n70_zgd9">
<Button icon="ui://l0ds4ys6o8k8ak"/>
<Button icon="ui://l0ds4ys6xprubw"/>
</component>
<group id="n70_zgd9" name="n70" xy="78,66" size="1338,114" advanced="true">
<group id="n70_zgd9" name="n70" xy="78,66" size="1338,117" advanced="true">
<gearDisplay controller="sdk" pages="0"/>
</group>
<component id="n76_o8k8" name="text" src="o8k8at" fileName="images/jiangxi/btn_textMul.xml" xy="78,204">
<Button title="常用语" icon="ui://l0ds4ys6o8k8aq" selectedIcon="ui://l0ds4ys6o8k8ap" controller="tab" page="0"/>
<Button checked="true" title="常用语" icon="ui://l0ds4ys6o8k8aq" selectedIcon="ui://l0ds4ys6o8k8ap" controller="tab" page="0"/>
</component>
<component id="n77_o8k8" name="image" src="o8k8at" fileName="images/jiangxi/btn_textMul.xml" xy="972,204">
<Button title="聊天记录" icon="ui://l0ds4ys6o8k8aq" selectedIcon="ui://l0ds4ys6o8k8ap" controller="tab" page="2"/>
</component>
<component id="n78_o8k8" name="history" src="o8k8at" fileName="images/jiangxi/btn_textMul.xml" xy="526,204">
<Button checked="true" title="表情" icon="ui://l0ds4ys6o8k8aq" selectedIcon="ui://l0ds4ys6o8k8ap" controller="tab" page="1"/>
<Button title="表情" icon="ui://l0ds4ys6o8k8aq" selectedIcon="ui://l0ds4ys6o8k8ap" controller="tab" page="1"/>
</component>
</displayList>
<customProperty target="text2" propertyId="0" label="111"/>

6
wb_new_ui/assets/Chat/component/Btn_YYItem.xml
View File

@ -2,9 +2,15 @@
<component size="1334,95" pivot="0.5,0.5" extention="Button">
<controller name="button" pages="0,up,1,down" selected="0"/>
<displayList>
<image id="n2_xpru" name="n2" src="xprubu" fileName="images/jiangxi/quickChatBg.png" xy="0,0" size="1334,95">
<relation target="" sidePair="width-width,height-height"/>
</image>
<text id="n1" name="title" xy="36,0" size="1299,95" font="ui://27vd145bh35o7il1" fontSize="60" color="#4d2605" vAlign="middle" letterSpacing="-1" autoSize="shrink" singleLine="true" text="你太牛了">
<relation target="" sidePair="width-width,height-height"/>
</text>
<image id="n3_xpru" name="n3" src="xprubt" fileName="images/jiangxi/line.png" xy="0,92" size="1334,3">
<relation target="" sidePair="width-width"/>
</image>
</displayList>
<Button downEffect="scale" downEffectValue="1.05"/>
</component>

BIN
wb_new_ui/assets/Chat/images/jiangxi/bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 356 KiB

BIN
wb_new_ui/assets/Chat/images/jiangxi/btn_send.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
wb_new_ui/assets/Chat/images/jiangxi/editBox.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
wb_new_ui/assets/Chat/images/jiangxi/line.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
wb_new_ui/assets/Chat/images/jiangxi/quickChatBg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

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

@ -218,6 +218,11 @@
<movieclip id="o8k8bq" name="6.jta" path="/images/jiangxi/face/" exported="true"/>
<movieclip id="o8k8br" name="7.jta" path="/images/jiangxi/face/" exported="true"/>
<movieclip id="o8k8bs" name="8.jta" path="/images/jiangxi/face/" exported="true"/>
<image id="xprubt" name="line.png" path="/images/jiangxi/"/>
<image id="xprubu" name="quickChatBg.png" path="/images/jiangxi/"/>
<image id="xprubv" name="bg.png" path="/images/jiangxi/"/>
<image id="xprubw" name="btn_send.png" path="/images/jiangxi/"/>
<image id="xprubx" name="editBox.png" path="/images/jiangxi/"/>
</resources>
<publish name="Chat" path="..\wb_unity_pro\Assets\ART\base\chat\ui" packageCount="2">
<atlas name="默认" index="0"/>

11
wb_new_ui/assets/Common/GlobalModalWaiting_jiangxi.xml Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="1751,1001" extention="Button">
<displayList>
<graph id="n1_lwcl" name="n1" xy="0,0" size="1751,1001" visible="false" type="rect" lineSize="0" fillColor="#0d000000"/>
<component id="n8_xx1c" name="n8" src="xx1c7jct" fileName="component/loading2.xml" xy="684,273" size="387,406" group="n7_f86r" aspect="true"/>
<group id="n7_f86r" name="n7" xy="684,273" size="387,406" advanced="true">
<relation target="" sidePair="center-center,middle-middle"/>
</group>
</displayList>
<Button/>
</component>

19
wb_new_ui/assets/Common/component/loading2.xml Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="99,104">
<displayList>
<image id="n6_jd84" name="n6" src="f86rhxl" fileName="font/images/加载圈(1).png" xy="17,23" pivot="0.5,0.5">
<relation target="" sidePair="width-width,height-height"/>
</image>
<image id="n5_jd84" name="n5" src="f86rhxk" fileName="font/images/光.png" xy="0,0" pivot="0.5,0.5" blend="add">
<relation target="" sidePair="width-width,height-height"/>
</image>
</displayList>
<transition name="t0" autoPlay="true" autoPlayRepeat="-1">
<item time="0" type="Alpha" target="n5_jd84" tween="true" startValue="0" endValue="0.94" duration="35"/>
<item time="0" type="Alpha" target="n6_jd84" tween="true" startValue="1" endValue="1" duration="18"/>
<item time="0" type="Rotation" target="n5_jd84" tween="true" startValue="0" endValue="720" duration="78"/>
<item time="0" type="Rotation" target="n6_jd84" tween="true" startValue="0" endValue="720" duration="78"/>
<item time="35" type="Alpha" target="n5_jd84" tween="true" startValue="0.94" endValue="0" duration="43"/>
<item time="54" type="Alpha" target="n6_jd84" tween="true" startValue="1" endValue="1" duration="24"/>
</transition>
</component>

BIN
wb_new_ui/assets/Common/component/tuoguan/9a9bf3ec-435b-46e7-9195-565c08984117.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 441 KiB

BIN
wb_new_ui/assets/Common/component/tuoguan/Rectangle 446.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 112 KiB

2
wb_new_ui/assets/Common/component/tuoguan/com_tuoguan.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="88,57" pivot="0.5,0" anchor="true">
<displayList>
<image id="n0_g8mh" name="n0" src="g8mhce3" fileName="component/tuoguan/tgz.png" xy="0,0"/>
<image id="n0_g8mh" name="n0" src="g8mhce3" fileName="component/tuoguan/tgz.png" xy="-13,7" size="115,41" aspect="true"/>
</displayList>
</component>

18
wb_new_ui/assets/Common/component/tuoguan/com_tuoguan_self.xml
View File

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="3038,1404" initName="com_tuoguan">
<component size="2532,1170" initName="com_tuoguan">
<displayList>
<graph id="n0_g8mh" name="n0" xy="0,0" size="3038,1404" alpha="0.5" type="rect" lineSize="0" fillColor="#ff000000">
<relation target="" sidePair="center-center,middle-middle"/>
<graph id="n0_g8mh" name="n0" xy="-253,-117" size="3038,1404" alpha="0" type="rect" lineSize="0" fillColor="#ff000000">
<relation target="" sidePair="width-width,height-height"/>
</graph>
<component id="n2_g8mh" name="btn_cancel_tuoguan" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="1253,915" size="179,64" touchable="false">
<relation target="" sidePair="center-center,middle-middle"/>
<Button title=" " icon="ui://27vd145bg8mhce6"/>
</component>
<image id="n3_g8mh" name="n3" src="g8mhce7" fileName="component/tuoguan/jqr.png" xy="1284,819">
<relation target="" sidePair="center-center,middle-middle"/>
<image id="n6_xx1c" name="n6" src="xx1c7jcr" fileName="component/tuoguan/Rectangle 446.png" xy="-43,795" size="2612,421">
<relation target="" sidePair="width-width%,height-height%,center-center,bottom-bottom%"/>
</image>
<component id="n2_g8mh" name="btn_cancel_tuoguan" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="1064,964" size="401,115" touchable="false">
<relation target="" sidePair="width-width%,height-height%,center-center,bottom-bottom%"/>
<Button title=" " icon="ui://27vd145bxx1c7jcp"/>
</component>
</displayList>
</component>

BIN
wb_new_ui/assets/Common/component/tuoguan/guoguan.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.1 KiB

BIN
wb_new_ui/assets/Common/component/tuoguan/tgz.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

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

@ -2123,6 +2123,11 @@
<image id="l9ll7jcm" name="hall_club_common_btntext_queding.png" path="/images/pop_oneInput/"/>
<image id="l9ll7jcn" name="btn_2.png" path="/images/btn_choose/" exported="true"/>
<font id="l9ll7jco" name="FZY4JW.TTF" path="/font/" renderMode="" samplePointSize="16"/>
<image id="xx1c7jcp" name="guoguan.png" path="/component/tuoguan/"/>
<image id="xx1c7jcq" name="9a9bf3ec-435b-46e7-9195-565c08984117.png" path="/component/tuoguan/"/>
<image id="xx1c7jcr" name="Rectangle 446.png" path="/component/tuoguan/"/>
<component id="xx1c7jcs" name="GlobalModalWaiting_jiangxi.xml" path="/" exported="true"/>
<component id="xx1c7jct" name="loading2.xml" path="/component/"/>
</resources>
<publish name="Common" path="..\wb_unity_pro\Assets\ART\base\common\ui" packageCount="2" maxAtlasSize="2048">
<atlas name="默认" index="0"/>

2
wb_new_ui/assets/Family/FamilyMsgRecord/com_FamilyMsgDiamond.xml
View File

@ -11,7 +11,7 @@
<image id="n13_hyws" name="n13" src="yk1o7d3p" fileName="Main/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="申请消息">
<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="yk1o7d3p" fileName="Main/Image/hall_club_common_tittle_icon1.png" xy="1466,24" group="n16_hyws" flip="hz">

53
wb_new_ui/assets/Lobby/NumberRecord/Component/comp_numberRecordDetailChild.xml
View File

@ -3,29 +3,45 @@
<controller name="seleted" pages="0,,1," selected="0"/>
<controller name="win" pages="0,,1," selected="0"/>
<displayList>
<image id="n14_66fw" name="n14" src="66fw7d6v" fileName="component/Record/Image/Recharge_2.png" xy="0,0" size="2395,203"/>
<image id="n16_66fw" name="n16" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="277,18" size="4,166"/>
<image id="n17_66fw" name="n17" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="497,18" size="4,166"/>
<image id="n18_66fw" name="n18" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="1888,18" size="4,166"/>
<image id="n19_66fw" name="n19" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="951,18" size="4,166"/>
<image id="n20_66fw" name="n20" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="719,18" size="4,166"/>
<image id="n21_66fw" name="n21" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="2179,18" size="4,166"/>
<text id="n2_jrro" name="text_gameName" xy="46,71" size="187,56" font="Arial" fontSize="42" color="#ff6f06" letterSpacing="5" autoClearText="true" text="黎川麻将">
<relation target="" sidePair="center-center,left-left%"/>
<image id="n14_66fw" name="n14" src="66fw7d6v" fileName="component/Record/Image/Recharge_2.png" xy="0,0" size="2395,203">
<relation target="" sidePair="width-width,height-height"/>
</image>
<image id="n16_66fw" name="n16" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="277,18" size="4,166">
<relation target="" sidePair="left-left%"/>
</image>
<image id="n17_66fw" name="n17" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="497,18" size="4,166">
<relation target="" sidePair="left-left%"/>
</image>
<image id="n18_66fw" name="n18" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="1888,18" size="4,166">
<relation target="" sidePair="left-left%"/>
</image>
<image id="n19_66fw" name="n19" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="951,18" size="4,166">
<relation target="" sidePair="left-left%"/>
</image>
<image id="n20_66fw" name="n20" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="719,18" size="4,166">
<relation target="" sidePair="left-left%"/>
</image>
<image id="n21_66fw" name="n21" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="2179,18" size="4,166">
<relation target="" sidePair="left-left%"/>
</image>
<text id="n2_jrro" name="text_gameName" xy="7,71" size="270,56" font="Arial" fontSize="42" color="#ff6f06" align="center" letterSpacing="5" autoSize="none" autoClearText="true" text="黎川麻将">
<relation target="" sidePair="width-width%,left-left%"/>
</text>
<text id="n6_jrro" name="text_roomID" xy="746,67" size="181,64" font="Arial" fontSize="48" color="#6d2f00" letterSpacing="3" autoClearText="true" text="804850">
<relation target="" sidePair="center-center,left-left%"/>
<text id="n6_jrro" name="text_roomID" xy="724,67" size="228,64" font="Arial" fontSize="48" color="#6d2f00" align="center" letterSpacing="3" autoSize="none" autoClearText="true" text="804850">
<relation target="" sidePair="width-width%,left-left%"/>
</text>
<text id="n25_66fw" name="text_score" xy="576,65" size="71,72" font="Arial" fontSize="54" color="#0908fd" letterSpacing="5" autoClearText="true" text="+4">
<text id="n25_66fw" name="text_score" xy="502,65" size="217,72" font="Arial" fontSize="54" color="#0908fd" align="center" vAlign="middle" letterSpacing="5" autoSize="none" autoClearText="true" text="+4">
<gearColor controller="win" pages="0" values="#0908fd,#000000" default="#ff0000,#000000"/>
<relation target="" sidePair="center-center,left-left%"/>
<relation target="" sidePair="width-width%,left-left%"/>
</text>
<text id="n24_66fw" name="text_time1" xy="1947,53" size="206,93" font="Arial" fontSize="40" color="#6d2f00" align="center" vAlign="middle" leading="-10" autoClearText="true" text="2025-09-08&#xA;14:34:22">
<relation target="" sidePair="center-center,left-left%"/>
<text id="n24_66fw" name="text_time1" xy="1892,53" size="287,93" font="Arial" fontSize="40" color="#6d2f00" align="center" vAlign="middle" leading="-10" autoSize="none" autoClearText="true" text="2025-09-08&#xA;14:34:22">
<relation target="" sidePair="width-width%,left-left%"/>
</text>
<component id="n12_jrro" name="btn_lookRecord" src="jrro7cys" fileName="NumberRecord/Component/btn_lookRecord.xml" xy="2239,69" size="92,65"/>
<component id="n12_jrro" name="btn_lookRecord" src="jrro7cys" fileName="NumberRecord/Component/btn_lookRecord.xml" xy="2239,69" size="92,65">
<relation target="" sidePair="left-left%"/>
</component>
<list id="n13_jrro" name="list" xy="957,9" size="931,182" layout="flow_hz" lineGap="32" colGap="3" defaultItem="ui://2d9xdj6zjrro7cyt" align="center" vAlign="middle" autoClearItems="true">
<relation target="" sidePair="center-center,left-left%"/>
<relation target="" sidePair="width-width%,left-left%"/>
<item/>
<item/>
<item/>
@ -33,10 +49,11 @@
</list>
<image id="n22_66fw" name="n22" src="66fw7d6o" fileName="component/Record/Image/Record13.png" xy="298,42" size="175,120">
<gearDisplay controller="win" pages="1"/>
<relation target="" sidePair="left-left%"/>
</image>
<image id="n23_66fw" name="n23" src="66fw7d6n" fileName="component/Record/Image/Record12.png" xy="298,42" size="175,120">
<gearDisplay controller="win" pages="0"/>
<relation target="" sidePair="center-center,left-left%"/>
<relation target="" sidePair="left-left%"/>
</image>
</displayList>
</component>

29
wb_new_ui/assets/Lobby/Record.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="2532,1170">
<controller name="detail" pages="0,,1," selected="0"/>
<controller name="detail" pages="0,,1," selected="1"/>
<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">
@ -24,32 +24,32 @@
</component>
<group id="n16_n2h8" name="top" xy="14,6" size="2485,126"/>
<text id="n5_n2h8" name="game" xy="164,189" size="105,64" group="n13_n2h8" font="Arial" fontSize="48" color="#a16115" letterSpacing="5" text="游戏">
<relation target="" sidePair="center-center,left-left%"/>
<relation target="" sidePair="left-left%"/>
</text>
<text id="n6_n2h8" name="result" xy="397,189" size="105,64" group="n13_n2h8" font="Arial" fontSize="48" color="#a16115" letterSpacing="5" text="结果">
<relation target="" sidePair="center-center,left-left%"/>
<relation target="" sidePair="left-left%"/>
</text>
<text id="n7_n2h8" name="score" xy="616,189" size="105,64" group="n13_n2h8" font="Arial" fontSize="48" color="#a16115" letterSpacing="5" text="分数">
<relation target="" sidePair="center-center,left-left%"/>
<relation target="" sidePair="left-left%"/>
</text>
<text id="n8_n2h8" name="room_id" xy="815,189" size="158,64" group="n13_n2h8" font="Arial" fontSize="48" color="#a16115" letterSpacing="5" text="房间号">
<relation target="" sidePair="center-center,left-left%"/>
<relation target="" sidePair="left-left%"/>
</text>
<text id="n9_n2h8" name="result" xy="1410,189" size="105,64" group="n13_n2h8" font="Arial" fontSize="48" color="#a16115" letterSpacing="5" text="结算">
<relation target="" sidePair="center-center,left-left%"/>
<relation target="" sidePair="left-left%"/>
</text>
<text id="n10_n2h8" name="time" xy="2044,189" size="105,64" group="n13_n2h8" font="Arial" fontSize="48" color="#a16115" letterSpacing="5" text="时间">
<relation target="" sidePair="center-center,left-left%"/>
<relation target="" sidePair="left-left%"/>
</text>
<text id="n11_n2h8" name="re" xy="2288,189" size="105,64" group="n13_n2h8" font="Arial" fontSize="48" color="#a16115" letterSpacing="5" text="回放">
<relation target="" sidePair="center-center,left-left%"/>
<relation target="" sidePair="left-left%"/>
</text>
<text id="n24_66fw" name="n24" xy="1139,1082" size="251,46" group="n13_n2h8" font="Arial" fontSize="34" letterSpacing="4" text="录像会保存5天">
<relation target="" sidePair="bottom-bottom"/>
</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/>
@ -58,21 +58,24 @@
<group id="n25_66fw" name="detail0" xy="68,189" size="2397,939" advanced="true">
<gearDisplay controller="detail" pages="0"/>
</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"/>
<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%"/>
</image>
<text id="n28_66fw" name="n28" xy="92,199" size="89,54" group="n32_66fw" font="Arial" fontSize="40" color="#a16115" letterSpacing="5" text="序号">
<relation target="" sidePair="center-center,left-left%"/>
<relation target="" sidePair="left-left%"/>
</text>
<text id="n31_66fw" name="n31" xy="219,198" size="179,54" group="n32_66fw" font="Arial" fontSize="40" color="#a16115" letterSpacing="5" text="对战时间">
<relation target="" sidePair="center-center,left-left%"/>
<relation target="" sidePair="left-left%"/>
</text>
<group id="n32_66fw" name="detail1_title" xy="92,198" size="306,55" group="n30_66fw"/>
<list id="n34_66fw" name="detail1_list_playerName" xy="416,185" size="1502,80" group="n30_66fw" layout="flow_hz" lineItemCount="4" defaultItem="ui://2d9xdj6z66fw7d72" autoItemSize="true" autoClearItems="true">
<relation target="" sidePair="center-center,left-left%"/>
<relation target="" sidePair="width-width%,left-left%"/>
<item title="jefe"/>
<item title="奥利奥生活号"/>
<item title="你好~凌梦"/>
</list>
<list id="n36_66fw" name="detail1_list_main" xy="61,265" size="2410,860" group="n30_66fw" overflow="scroll" defaultItem="ui://2d9xdj6z66fw7d73">
<relation target="" sidePair="width-width,height-height"/>
<item/>
<item/>
<item/>

28
wb_new_ui/assets/Lobby/component/Record/Component/listChild_detailMain.xml
View File

@ -2,25 +2,31 @@
<component size="2410,148" extention="Button">
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
<displayList>
<image id="n4_66fw" name="n4" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="137,12" size="4,124"/>
<image id="n5_66fw" name="n5" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="1851,12" size="4,124"/>
<image id="n6_66fw" name="n6" src="66fw7d6x" fileName="component/Record/Image/Record03.png" xy="9,142" size="2374,6"/>
<text id="n7_66fw" name="text_index" xy="58,45" size="30,62" font="Arial" fontSize="46" color="#6d2f00" text="2">
<relation target="" sidePair="center-center,left-left%"/>
<image id="n4_66fw" name="n4" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="137,12" size="4,124">
<relation target="" sidePair="left-left%"/>
</image>
<image id="n5_66fw" name="n5" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="1851,12" size="4,124">
<relation target="" sidePair="left-left%"/>
</image>
<image id="n6_66fw" name="n6" src="66fw7d6x" fileName="component/Record/Image/Record03.png" xy="9,142" size="2374,6">
<relation target="" sidePair="width-width"/>
</image>
<text id="n7_66fw" name="text_index" xy="6,45" size="130,62" font="Arial" fontSize="46" color="#6d2f00" align="center" autoSize="none" text="2">
<relation target="" sidePair="width-width%,left-left%"/>
</text>
<text id="n8_66fw" name="text_time" xy="167,30" size="173,94" font="Arial" fontSize="38" color="#6d2f00" align="center" vAlign="middle" leading="-5" letterSpacing="3" text="09-08&#xA;17:04:33">
<relation target="" sidePair="center-center,left-left%"/>
<text id="n8_66fw" name="text_time" xy="141,30" size="209,94" font="Arial" fontSize="38" color="#6d2f00" align="center" vAlign="middle" leading="-5" letterSpacing="3" autoSize="none" text="09-08&#xA;17:04:33">
<relation target="" sidePair="width-width%,left-left%"/>
</text>
<component id="n9_66fw" name="btn_share" src="66fw7d75" fileName="component/Record/Component/btn_normol.xml" xy="1870,22" size="255,111">
<relation target="" sidePair="center-center,left-left%"/>
<relation target="" sidePair="left-left%"/>
<Button icon="ui://2d9xdj6z66fw7d6m"/>
</component>
<component id="n10_66fw" name="btn_lookBack" src="66fw7d75" fileName="component/Record/Component/btn_normol.xml" xy="2136,22" size="255,111">
<relation target="" sidePair="center-center,left-left%"/>
<relation target="" sidePair="left-left%"/>
<Button icon="ui://2d9xdj6z66fw7d6l"/>
</component>
<list id="n11_66fw" name="list_playerScore" xy="352,-2" size="1497,148" layout="flow_hz" lineItemCount="4" defaultItem="ui://2d9xdj6z66fw7d77" autoItemSize="true">
<relation target="" sidePair="center-center,left-left%"/>
<list id="n11_66fw" name="list_playerScore" xy="352,-3" size="1497,148" layout="flow_hz" lineItemCount="4" defaultItem="ui://2d9xdj6z66fw7d77" autoItemSize="true">
<relation target="" sidePair="width-width%,left-left%"/>
<item title="-1"/>
<item title="-7"/>
<item title="+8"/>

8
wb_new_ui/assets/Lobby/mgr/Component/btn_close.xml Normal file
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="xpru7d7c" fileName="Main/Image/btn_close.png" xy="-8,-8"/>
</displayList>
<Button downEffect="scale" downEffectValue="1.2"/>
</component>

BIN
wb_new_ui/assets/Lobby/mgr/Image/bg_main1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
wb_new_ui/assets/Lobby/mgr/Image/bg_main2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 271 KiB

BIN
wb_new_ui/assets/Lobby/mgr/Image/bt_top.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 100 KiB

BIN
wb_new_ui/assets/Lobby/mgr/Image/btn_close.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
wb_new_ui/assets/Lobby/mgr/Image/hall_club_common_tittle_icon1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
wb_new_ui/assets/Lobby/mgr/Image/loginBg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 MiB

39
wb_new_ui/assets/Lobby/mgr/com_MsgDiamond.xml Normal file
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="xpru7d79" fileName="mgr/Image/loginBg.png" xy="1,0" size="2531,1170" group="n17_hyws">
<relation target="" sidePair="width-width,height-height"/>
</image>
<image id="n10_hyws" name="n10" src="xpru7d7a" fileName="mgr/Image/bt_top.png" xy="0,0" group="n17_hyws">
<relation target="" sidePair="right-left,top-top,rightext-right"/>
</image>
<component id="n11_hyws" name="btn_close" src="xpru7d7b" fileName="mgr/Component/btn_close.xml" xy="54,6" group="n17_hyws"/>
<image id="n13_hyws" name="n13" src="xpru7d7d" fileName="mgr/Image/hall_club_common_tittle_icon1.png" xy="1075,24" group="n16_hyws">
<relation target="n14_hyws" sidePair="left-left"/>
</image>
<text id="n14_hyws" name="n14" xy="1192,27" size="148,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="xpru7d7d" fileName="mgr/Image/hall_club_common_tittle_icon1.png" xy="1394,24" group="n16_hyws" flip="hz">
<relation target="n14_hyws" sidePair="right-right"/>
</image>
<group id="n16_hyws" name="n16" xy="1075,24" size="382,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="xpru7d7e" fileName="mgr/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="xpru7d7f" fileName="mgr/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>

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

@ -624,6 +624,14 @@
<image id="66fw7d74" name="Slice 4.png" path="/component/Record/Component/"/>
<component id="66fw7d75" name="btn_normol.xml" path="/component/Record/Component/"/>
<component id="66fw7d77" name="listChild_playerScore.xml" path="/component/Record/Component/"/>
<component id="xpru7d78" name="com_MsgDiamond.xml" path="/mgr/" exported="true"/>
<image id="xpru7d79" name="loginBg.png" path="/mgr/Image/" atlas="alone"/>
<image id="xpru7d7a" name="bt_top.png" path="/mgr/Image/" atlas="alone" disableTrim="true"/>
<component id="xpru7d7b" name="btn_close.xml" path="/mgr/Component/"/>
<image id="xpru7d7c" name="btn_close.png" path="/mgr/Image/"/>
<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"/>
</resources>
<publish name="Lobby" path="..\wb_unity_pro\Assets\ART\base\lobby\ui" packageCount="2">
<atlas name="默认" index="0"/>

8
wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/com_huType.xml
View File

@ -1,7 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="960,372" pivot="0.5,0.5" opaque="false">
<displayList>
<loader id="n1_m21r" name="loader_img" xy="144,112" pivot="0.5,0.5" size="671,146" aspect="true" url="ui://v0j9abjywhhc1f7" align="center" vAlign="middle" fill="scale"/>
<movieclip id="n2_m21r" name="effect_xingxing" src="xqxr1er" fileName="Main_new/Main/Component/xingxing.jta" xy="240,6" size="480,360" aspect="true"/>
<loader id="n1_m21r" name="loader_img" xy="144,111" pivot="0.5,0.5" size="671,146" aspect="true" url="ui://v0j9abjywhhc1f7" align="center" vAlign="middle" fill="scale">
<relation target="" sidePair="width-width,center-center,middle-middle"/>
</loader>
<movieclip id="n2_m21r" name="effect_xingxing" src="xqxr1er" fileName="Main_new/Main/Component/xingxing.jta" xy="240,6" size="480,360" aspect="true">
<relation target="n1_m21r" sidePair="center-center,middle-middle"/>
</movieclip>
</displayList>
</component>

BIN
wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/Polygon 7.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/gamexzmj_48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 786 B

BIN
wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/outMask.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 718 B

10
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Component/com_OutCard_Vertical.xml
View File

@ -1,13 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="117,117">
<controller name="jing" pages="0,,1," selected="1"/>
<controller name="jing" pages="0,,1," selected="0"/>
<controller name="gray" pages="0,,1," selected="1"/>
<displayList>
<loader id="n3_wcy5" name="icon" xy="0,0" size="117,117" url="ui://v0j9abjyk0pa12m" fill="scaleFree">
<loader id="n3_wcy5" name="icon" xy="0,0" size="117,117" url="ui://Main_Majiang/b202_303" fill="scaleFree">
<relation target="" sidePair="width-width,height-height"/>
</loader>
<image id="n4_wcy5" name="n4" src="ofwa1gm" fileName="Main_new/Main/Image/jing 1.png" xy="43,-10" size="70,101" aspect="true">
<image id="n4_wcy5" name="n4" src="ofwa1gm" fileName="Main_new/Main/Image/jing.png" xy="43,-10" size="70,101" aspect="true">
<gearDisplay controller="jing" pages="1"/>
<relation target="" sidePair="width-width,height-height"/>
</image>
<graph id="n10_xx1c" name="n10" xy="3,0" size="111,116" blend="multiply" type="rect" lineSize="0" fillColor="#73ff9900" corner="12">
<gearDisplay controller="gray" pages="1"/>
</graph>
</displayList>
</component>

8
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_E.xml
View File

@ -14,7 +14,7 @@
<item/>
<item/>
</list>
<list id="n53_j6yy" name="List_OutCard" xy="1599,192" size="556,699" touchable="false" pageController="ting" layout="flow_vt" selectionMode="none" lineGap="-20" colGap="-7" defaultItem="ui://v0j9abjywcy51g8" autoItemSize="true" align="right" renderOrder="descent" autoClearItems="true">
<list id="n53_j6yy" name="List_OutCard" xy="1599,205" size="556,699" touchable="false" pageController="ting" layout="flow_vt" selectionMode="none" lineGap="-20" colGap="-7" defaultItem="ui://v0j9abjywcy51g8" autoItemSize="true" align="right" renderOrder="descent" autoClearItems="true">
<relation target="" sidePair="width-width%,height-height%,right-right"/>
<item/>
<item/>
@ -100,12 +100,12 @@
<gearXY controller="3d" pages="0" values="-1945,-1060" default="616,100"/>
</image>
<text id="n66_ogwn" name="Text_CardInfo" xy="-2053,594" size="813,973" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;FZ_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;b203_&quot;,&#xA;&quot;Get_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;100&quot;,&#xA;&quot;Pos_Y&quot;:28,&#xA;&quot;Order&quot;:&quot;desc&quot;,&#xA;&quot;IS_SIDE&quot;:&quot;true&quot;&#xA;}"/>
<list id="n67_jzul" name="list_HuEffect" xy="1572,50" size="960,1069" overflow="scroll" defaultItem="ui://v0j9abjyxqxr1eq" autoItemSize="false" align="center" vAlign="middle" autoClearItems="true">
<list id="n67_jzul" name="list_HuEffect" xy="1572,6" size="960,1170" layout="flow_vt" selectionMode="none" lineItemCount="4" defaultItem="ui://v0j9abjyxqxr1eq" autoItemSize="true" align="center" vAlign="middle" autoClearItems="true">
<item/>
<item/>
</list>
<loader id="n68_jzul" name="loader_selfHuCardEffect" xy="2052,584" pivot="0.5,0.5" anchor="true" size="280,200" align="center" vAlign="middle"/>
<movieclip id="n69_66fw" name="effect_ZiMo" src="whhc1fo" fileName="Main_new/Main/Effect_ZiMo.jta" xy="2052,584" pivot="0.5,0.5" anchor="true" size="530,353" aspect="true" visible="false" playing="false">
<loader id="n68_jzul" name="loader_selfHuCardEffect" xy="2052,514" pivot="0.5,0.5" anchor="true" size="280,200" align="center" vAlign="middle"/>
<movieclip id="n69_66fw" name="effect_ZiMo" src="whhc1fo" fileName="Main_new/Main/Effect_ZiMo.jta" xy="2052,514" pivot="0.5,0.5" anchor="true" size="530,353" aspect="true" visible="false" playing="false">
<relation target="n68_jzul" sidePair="center-center,middle-middle"/>
</movieclip>
<component id="n71_r8cy" name="area_clip_pg" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="1884,439" pivot="0.5,0.5" size="336,290" touchable="false">

10
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_N.xml
View File

@ -4,7 +4,7 @@
<controller name="ting" pages="0,,1," selected="0"/>
<controller name="site" pages="0,2-1,1,2-2" selected="0"/>
<controller name="getCard" pages="0,,1," selected="0"/>
<controller name="cStie" exported="true" pages="0,,1,,2," selected="0">
<controller name="cStie" exported="true" pages="0,,1,,2," selected="2">
<remark page="0" value="2人"/>
<remark page="1" value="3人"/>
<remark page="2" value="4人"/>
@ -33,8 +33,8 @@
<item/>
<item/>
</list>
<list id="n41_gi99" name="List_OutCard" xy="265,150" size="2097,502" touchable="false" pageController="ting" layout="flow_hz" selectionMode="none" margin="40,0,0,0" lineGap="-20" colGap="-7" defaultItem="ui://v0j9abjywcy51g8" autoItemSize="true" align="right" autoClearItems="true">
<gearXY controller="cStie" pages="0,1,2" values="265,150|324,103|833,148"/>
<list id="n41_gi99" name="List_OutCard" xy="833,160" size="887,502" touchable="false" pageController="ting" layout="flow_hz" selectionMode="none" margin="40,0,0,0" lineGap="-20" colGap="-7" defaultItem="ui://v0j9abjywcy51g8" autoItemSize="true" align="right" autoClearItems="true">
<gearXY controller="cStie" pages="0,1,2" values="265,165|324,103|833,160"/>
<gearSize controller="cStie" pages="1,2" values="1217,502,1,1|887,502,1,1" default="2097,502,1,1"/>
<relation target="" sidePair="width-width%,height-height%,top-top"/>
<item/>
@ -81,10 +81,10 @@
<gearDisplay controller="ting" pages="1"/>
<gearXY controller="3d" pages="0" values="-1732,-1096" default="616,100"/>
</image>
<text id="n53_ogwn" name="Text_CardInfo" xy="-1881,281" size="813,973" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;FZ_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;100&quot;,&#xA;&quot;Pos_Y&quot;:-28,&#xA;&quot;Order&quot;:&quot;asc&quot;,&#xA;&quot;back_columnGap&quot;:&quot;-9&quot;,&#xA;&quot;show_columnGap&quot;:&quot;-3&quot;&#xA;}">
<text id="n53_ogwn" name="Text_CardInfo" xy="-1881,281" size="813,973" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;FZ_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;100&quot;,&#xA;&quot;Pos_Y&quot;:-28,&#xA;&quot;Order&quot;:&quot;asc&quot;,&#xA;&quot;back_columnGap&quot;:&quot;-9&quot;,&#xA;&quot;show_columnGap&quot;:&quot;-6 &quot;&#xA;}">
<gearText controller="cStie" pages="0,1,2" values="{&#xA;&quot;FZ_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;100&quot;,&#xA;&quot;Pos_Y&quot;:-28,&#xA;&quot;Order&quot;:&quot;asc&quot;,&#xA;&quot;back_columnGap&quot;:&quot;-9&quot;,&#xA;&quot;show_columnGap&quot;:&quot;-3&quot;&#xA;}|{&#xA;&quot;FZ_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;100&quot;,&#xA;&quot;Pos_Y&quot;:-28,&#xA;&quot;Order&quot;:&quot;asc&quot;,&#xA;&quot;back_columnGap&quot;:&quot;-9&quot;,&#xA;&quot;show_columnGap&quot;:&quot;-3&quot;&#xA;}|{&#xA;&quot;FZ_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;100&quot;,&#xA;&quot;Pos_Y&quot;:-28,&#xA;&quot;Order&quot;:&quot;asc&quot;,&#xA;&quot;back_columnGap&quot;:&quot;-9&quot;,&#xA;&quot;show_columnGap&quot;:&quot;-6 &quot;&#xA;}"/>
</text>
<list id="n54_jzul" name="list_HuEffect" xy="-1,32" size="2532,420" touchable="false" layout="row" selectionMode="none" overflow="scroll" defaultItem="ui://v0j9abjyxqxr1eq" autoItemSize="false" align="center" vAlign="middle" autoClearItems="true">
<list id="n54_jzul" name="list_HuEffect" xy="-1,32" size="2532,420" touchable="false" layout="flow_hz" selectionMode="none" lineItemCount="4" defaultItem="ui://v0j9abjyxqxr1eq" autoItemSize="true" align="center" vAlign="middle" autoClearItems="true">
<item/>
<item/>
</list>

39
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml
View File

@ -3,7 +3,7 @@
<controller name="3d" pages="0,,1," selected="0"/>
<controller name="ting" pages="0,,1," selected="0"/>
<controller name="site" pages="0,2-1,1,2-2" selected="0"/>
<controller name="getCard" pages="0,,1," selected="1"/>
<controller name="getCard" pages="0,,1," selected="0"/>
<controller name="seletedGetCard" pages="0,,1," selected="0"/>
<controller name="tip" pages="0,,1," selected="0"/>
<controller name="showGuoHu" pages="0,,1," selected="0"/>
@ -13,7 +13,6 @@
<remark page="2" value="4人"/>
</controller>
<displayList>
<graph id="n40_ckvb" name="area_allDown" xy="0,0" size="2532,1170" type="rect" lineSize="0" fillColor="#00ffffff"/>
<list id="n33_gi99" name="List_FZ" xy="58,949" size="2468,214" touchable="false" layout="row" selectionMode="none" colGap="-4" defaultItem="ui://v0j9abjygi9910f" autoItemSize="false" vAlign="bottom" autoClearItems="true">
<relation target="" sidePair="width-width%,height-height%,bottom-bottom"/>
<item/>
@ -21,22 +20,6 @@
<item/>
<item/>
</list>
<list id="n32_kxhm" name="List_HandCard" xy="37,973" size="2234,191" layout="row" colGap="-4" defaultItem="ui://v0j9abjygi9910i" align="right" autoClearItems="true">
<relation target="" sidePair="width-width%,height-height%,bottom-bottom"/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
</list>
<list id="n35_gi99" name="List_OutCard" xy="283,606" size="2097,312" pageController="ting" layout="flow_hz" selectionMode="none" scroll="horizontal" lineGap="-20" colGap="-7" defaultItem="ui://v0j9abjywcy51g8" autoItemSize="true" renderOrder="descent" autoClearItems="true">
<gearXY controller="cStie" pages="0,1,2" values="283,606|324,612|832,608"/>
<gearSize controller="cStie" pages="0,1,2" values="2097,312,1,1|1217,312,1,1|887,312,1,1"/>
@ -75,6 +58,23 @@
<item/>
<item/>
</list>
<graph id="n40_ckvb" name="area_allDown" xy="0,0" size="2532,1170" type="rect" lineSize="0" fillColor="#00ffffff"/>
<list id="n32_kxhm" name="List_HandCard" xy="37,973" size="2234,191" layout="row" colGap="-4" defaultItem="ui://v0j9abjygi9910i" align="right" autoClearItems="true">
<relation target="" sidePair="width-width%,height-height%,bottom-bottom"/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
</list>
<list id="n38_shqd" name="Btn_HandCard" xy="2295,973" size="175,191" aspect="true" defaultItem="ui://v0j9abjygi9910i" selectionController="seletedGetCard" autoClearItems="true">
<gearDisplay controller="getCard" pages="1"/>
<relation target="" sidePair="width-width%,height-height%,bottom-bottom"/>
@ -96,10 +96,9 @@
<component id="n61_r8cy" name="area_clip_pg" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="1098,617" pivot="0.5,0.5" size="336,290" touchable="false">
<relation target="" sidePair="width-width%,height-height%"/>
</component>
<list id="n58_jzul" name="list_HuEffect" xy="0,568" size="2532,420" layout="row" overflow="scroll" defaultItem="ui://v0j9abjyxqxr1eq" autoItemSize="false" align="center" vAlign="middle" autoClearItems="true">
<list id="n58_jzul" name="list_HuEffect" xy="0,568" size="2532,420" touchable="false" layout="flow_hz" selectionMode="none" lineItemCount="4" defaultItem="ui://v0j9abjyxqxr1eq" autoItemSize="true" align="center" vAlign="middle" autoClearItems="true">
<relation target="" sidePair="width-width,height-height,bottom-bottom"/>
<item/>
<item/>
</list>
<component id="n51_ogwn" name="area_fz_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-2533,-1563" size="11,249"/>
<component id="n53_ogwn" name="mask_liangpai" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-2143,-1300" size="1,1"/>

12
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_W.xml
View File

@ -25,7 +25,7 @@
<item/>
<item/>
</list>
<list id="n54_j6yy" name="List_OutCard" xy="406,192" size="935,699" touchable="false" pageController="ting" layout="flow_vt" selectionMode="none" lineGap="-20" colGap="-7" defaultItem="ui://v0j9abjywcy51g8" autoItemSize="true" autoClearItems="true">
<list id="n54_j6yy" name="List_OutCard" xy="406,205" size="935,699" touchable="false" pageController="ting" layout="flow_vt" selectionMode="none" lineGap="-20" colGap="-7" defaultItem="ui://v0j9abjywcy51g8" autoItemSize="true" autoClearItems="true">
<relation target="" sidePair="width-width%,height-height%,left-left"/>
<item/>
<item/>
@ -83,14 +83,14 @@
<gearXY controller="3d" pages="0" values="-2501,-1505" default="616,100"/>
</image>
<text id="n65_ogwn" name="Text_CardInfo" xy="-3046,456" size="813,973" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;FZ_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;b203_&quot;,&#xA;&quot;Get_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;100&quot;,&#xA;&quot;Pos_Y&quot;:-28,&#xA;&quot;Order&quot;:&quot;asc&quot;,&#xA;&quot;IS_SIDE&quot;:&quot;true&quot;&#xA;}"/>
<list id="n66_jzul" name="list_HuEffect" xy="31,50" size="960,1069" overflow="scroll" defaultItem="ui://v0j9abjyxqxr1eq" autoItemSize="false" align="center" vAlign="middle" autoClearItems="true">
<loader id="n67_jzul" name="loader_selfHuCardEffect" xy="511,504" pivot="0.5,0.5" anchor="true" size="280,220" align="center" vAlign="middle"/>
<movieclip id="n68_66fw" name="effect_ZiMo" src="whhc1fo" fileName="Main_new/Main/Effect_ZiMo.jta" xy="511,503" pivot="0.5,0.5" anchor="true" size="530,353" aspect="true" visible="false" playing="false">
<relation target="n67_jzul" sidePair="center-center,middle-middle"/>
</movieclip>
<list id="n66_jzul" name="list_HuEffect" xy="31,-2" size="960,1170" layout="flow_vt" selectionMode="none" lineItemCount="4" defaultItem="ui://v0j9abjyxqxr1eq" autoItemSize="true" align="center" vAlign="middle" autoClearItems="true">
<item/>
<item/>
</list>
<loader id="n67_jzul" name="loader_selfHuCardEffect" xy="511,584" pivot="0.5,0.5" anchor="true" size="280,220" align="center" vAlign="middle"/>
<movieclip id="n68_66fw" name="effect_ZiMo" src="whhc1fo" fileName="Main_new/Main/Effect_ZiMo.jta" xy="511,583" pivot="0.5,0.5" anchor="true" size="530,353" aspect="true" visible="false" playing="false">
<relation target="n67_jzul" sidePair="center-center,middle-middle"/>
</movieclip>
<component id="n69_r8cy" name="area_clip_pg" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="343,439" pivot="0.5,0.5" size="336,290" touchable="false">
<relation target="" sidePair="width-width%,height-height%"/>
</component>

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="2532,1170" pivot="0.5,0.5" designImage="ui://v0j9abjyj6yy1fr" designImageAlpha="35">
<controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="4"/>
<controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="1"/>
<controller name="sdk" pages="0,,1," selected="0"/>
<controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
<controller name="3d" pages="0,,1," selected="0"/>
@ -18,7 +18,9 @@
<relation target="" sidePair="center-center"/>
<relation target="n169_gmbn" sidePair="bottom-top"/>
</component>
<component id="n206_kikc" name="com_notice" src="kikc1g4" fileName="Main_new/com_notice.xml" xy="689,129" size="1169,62"/>
<component id="n206_kikc" name="com_notice" src="kikc1g4" fileName="Main_new/com_notice.xml" xy="689,135" size="1169,62">
<relation target="" sidePair="top-top"/>
</component>
<component id="n81_l2u4" name="cardbox" src="gq7m5e" fileName="Main_style_2/turn/Gcm_box_4.xml" xy="1281,-296" pivot="0.5,0.5">
<gearDisplay controller="state" pages="1,3"/>
<gearXY controller="3d" pages="0,1" values="1281,-296|603,254"/>
@ -44,14 +46,14 @@
<gearXY controller="action" pages="2,0,1" values="8808,794|-16242,794|5853,170"/>
<Button icon="ui://v0j9abjygq7m48"/>
</component>
<component id="n35_k3io" name="btn_start" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-2741,480" group="n36_k3io" visible="false">
<component id="n35_k3io" name="btn_start" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-2738,480" group="n36_k3io" visible="false">
<Button icon="ui://v0j9abjygq7m49"/>
</component>
<component id="n104_mncc" name="btn_xipai--" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-2331,487" group="n36_k3io" scale="0.9,1">
<component id="n104_mncc" name="btn_xipai--" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-2328,487" group="n36_k3io" scale="0.9,1">
<gearDisplay controller="action" pages="1"/>
<Button icon="ui://v0j9abjygq7m4i"/>
</component>
<group id="n36_k3io" name="n36" xy="-2741,480" size="11816,414" visible="false" advanced="true">
<group id="n36_k3io" name="n36" xy="-2738,480" size="11813,414" visible="false" advanced="true">
<relation target="" sidePair="bottom-bottom,center-center"/>
</group>
<component id="n69_l2u4" name="gcm_chat" src="gq7m8z" fileName="Main_style_2/Gcm_chat.xml" xy="1933,-505">
@ -98,16 +100,7 @@
<component id="n132_swus" name="jing" src="ckvb11l" fileName="Main_new/Main/Component/Comp_jing.xml" xy="405,25" size="115,121" visible="false" touchable="false">
<relation target="n155_gi99" sidePair="left-left"/>
</component>
<text id="n134_lu84" name="text_time" xy="132,15" size="159,56" group="n135_lu84" font="ui://27vd145bh35o7ika" fontSize="42" color="#ffffff" align="center" letterSpacing="3" autoSize="none" text="14:13"/>
<component id="n133_lu84" name="ProgressBar_jiangxi" src="lu84tv" fileName="Main_new/Main/ProgressBar_jiangxi.xml" xy="27,21" size="101,43" group="n135_lu84">
<ProgressBar value="50" max="100"/>
</component>
<component id="n175_gmbn" name="btn_check" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="21,121" size="205,63" group="n135_lu84">
<Button icon="ui://v0j9abjygmbn13u"/>
</component>
<text id="n136_lu84" name="text_roomId" xy="15,67" size="264,54" group="n135_lu84" font="ui://27vd145bh35o7ika" fontSize="40" color="#ffffff" letterSpacing="4" text="房间:588568"/>
<group id="n135_lu84" name="top_left" xy="15,15" size="276,169"/>
<text id="n176_eqmd" name="remaining_card" xy="766,516" size="358,74" group="n179_eqmd" font="ui://27vd145bg2mo7ij0" fontSize="55" color="#f5f5dd" align="right" vAlign="middle" letterSpacing="5" autoSize="none" text="余98张">
<text id="n176_eqmd" name="remaining_card" xy="748,516" size="383,73" group="n179_eqmd" font="ui://27vd145bg2mo7ij0" fontSize="55" color="#f5f5dd" align="right" vAlign="middle" letterSpacing="5" autoSize="none" text="余98张">
<gearDisplay controller="state" pages="1,3"/>
</text>
<text id="n177_eqmd" name="wanfa_text" xy="281,639" pivot="0.5,0" size="1963,143" group="n179_eqmd" font="FZCuYuan-M03" fontSize="44" color="#f5f5dd" align="center" letterSpacing="3" autoSize="none" text="1倍,可点炮，可自摸，有精必糊1倍,可点炮，可自摸，有精必糊1倍,可点炮，可自摸，有精必糊1倍,可点炮，可自摸，有精必糊1倍,可点炮，可自摸，有精必糊1倍,可点炮，可自摸，有精必糊">
@ -115,7 +108,7 @@
<relation target="n159_ckvb" sidePair="center-center,top-bottom"/>
<relation target="" sidePair="width-width%"/>
</text>
<text id="n178_eqmd" name="text_round" xy="1401,516" size="364,74" group="n179_eqmd" font="ui://27vd145bg2mo7ij0" fontSize="55" color="#f5f5dd" vAlign="middle" letterSpacing="5" autoSize="none" text="局数:1\81">
<text id="n178_eqmd" name="text_round" xy="1401,516" size="483,73" group="n179_eqmd" font="ui://27vd145bg2mo7ij0" fontSize="55" color="#f5f5dd" vAlign="middle" letterSpacing="5" autoSize="none" text="局数:99\99">
<gearDisplay controller="state" pages="1,3,4"/>
</text>
<group id="n179_eqmd" name="center_text" xy="281,516" size="1963,266" advanced="true">
@ -138,11 +131,20 @@
<gearDisplay controller="state" pages="1,3,4"/>
<relation target="" sidePair="width-width,bottom-bottom"/>
</component>
<text id="n134_lu84" name="text_time" xy="132,15" size="159,56" group="n135_lu84" font="ui://27vd145bh35o7ika" fontSize="42" color="#ffffff" align="center" letterSpacing="3" autoSize="none" text="14:13"/>
<component id="n133_lu84" name="ProgressBar_jiangxi" src="lu84tv" fileName="Main_new/Main/ProgressBar_jiangxi.xml" xy="27,21" size="101,43" group="n135_lu84">
<ProgressBar value="50" max="100"/>
</component>
<component id="n175_gmbn" name="btn_check" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="21,121" size="205,63" group="n135_lu84">
<Button icon="ui://v0j9abjygmbn13u"/>
</component>
<text id="n136_lu84" name="text_roomId" xy="15,67" size="264,54" group="n135_lu84" font="ui://27vd145bh35o7ika" fontSize="40" color="#ffffff" letterSpacing="4" text="房间:588568"/>
<group id="n135_lu84" name="top_left" xy="15,15" size="276,169"/>
<component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="89,789" size="153,132">
<gearDisplay controller="state" pages="0,2"/>
<relation target="" sidePair="center-center,bottom-bottom"/>
</component>
<component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="85,786" size="153,132">
<component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="87,787" size="153,132">
<gearDisplay controller="state" pages="1,3,4"/>
<gearXY controller="state" pages="1,3,4" values="87,787|84,778|85,786" default="730,-60"/>
<relation target="n118_pkx5" sidePair="right-left,top-top"/>
@ -151,7 +153,7 @@
<gearDisplay controller="state" pages="0,2"/>
<relation target="" sidePair="center-center,top-top"/>
</component>
<component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="1868,34" size="153,132">
<component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="1866,33" size="153,132">
<gearDisplay controller="state" pages="1,3,4"/>
<gearXY controller="state" pages="0,1,3,4" values="2701,486|1866,33|1867,35|1868,34" default="2007,876"/>
<relation target="n155_gi99" sidePair="left-right,top-top"/>
@ -252,7 +254,7 @@
<movieclip id="n203_whhc" name="effect_ZiMo" src="whhc1fo" fileName="Main_new/Main/Effect_ZiMo.jta" xy="1266,-574" pivot="0.5,0.5" anchor="true">
<gearDisplay controller="cHuCardEffect" pages="1"/>
</movieclip>
<component id="n208_fwqx" name="comp_voice" src="dlc41ga" fileName="Main_new/Chat/Component/Comp_VoiceBegin.xml" xy="0,0">
<component id="n208_fwqx" name="comp_voice" src="dlc41ga" fileName="Main_new/Chat/Component/Comp_VoiceBegin.xml" xy="0,-1">
<gearDisplay controller="voice" pages="1"/>
<relation target="" sidePair="width-width,height-height"/>
</component>

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="2532,1170" designImage="ui://v0j9abjyj6yy1ft" designImageAlpha="0">
<controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="0"/>
<controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="1"/>
<controller name="sdk" pages="0,,1," selected="0"/>
<controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
<controller name="3d" pages="0,,1," selected="0"/>
@ -40,14 +40,14 @@
<gearXY controller="action" pages="2,0,1" values="8810,794|-16246,794|5853,170"/>
<Button icon="ui://v0j9abjygq7m48"/>
</component>
<component id="n228_ogwn" name="btn_start" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-2746,480" group="n230_ogwn" visible="false">
<component id="n228_ogwn" name="btn_start" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-2743,480" group="n230_ogwn" visible="false">
<Button icon="ui://v0j9abjygq7m49"/>
</component>
<component id="n229_ogwn" name="btn_xipai--" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-2336,487" group="n230_ogwn" scale="0.9,1">
<component id="n229_ogwn" name="btn_xipai--" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-2333,487" group="n230_ogwn" scale="0.9,1">
<gearDisplay controller="action" pages="1"/>
<Button icon="ui://v0j9abjygq7m4i"/>
</component>
<group id="n230_ogwn" name="n230" xy="-2746,480" size="11823,414" visible="false" advanced="true">
<group id="n230_ogwn" name="n230" xy="-2743,480" size="11820,414" visible="false" advanced="true">
<relation target="" sidePair="bottom-bottom,center-center"/>
</group>
<component id="n231_ogwn" name="gcm_chat" src="gq7m8z" fileName="Main_style_2/Gcm_chat.xml" xy="1933,-505">
@ -92,15 +92,6 @@
<relation target="n247_ogwn" sidePair="top-bottom"/>
</component>
<component id="n248_ogwn" name="jing" src="ckvb11l" fileName="Main_new/Main/Component/Comp_jing.xml" xy="405,25" size="115,121" visible="false" touchable="false"/>
<text id="n249_ogwn" name="text_time" xy="132,15" size="159,56" group="n253_ogwn" font="ui://27vd145bh35o7ika" fontSize="42" color="#ffffff" align="center" letterSpacing="3" autoSize="none" text="14:13"/>
<component id="n250_ogwn" name="ProgressBar_jiangxi" src="lu84tv" fileName="Main_new/Main/ProgressBar_jiangxi.xml" xy="27,21" size="101,43" group="n253_ogwn">
<ProgressBar value="50" max="100"/>
</component>
<component id="n251_ogwn" name="btn_check" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="21,116" size="205,63" group="n253_ogwn">
<Button icon="ui://v0j9abjygmbn13u"/>
</component>
<text id="n252_ogwn" name="text_roomId" xy="15,67" size="264,54" group="n253_ogwn" font="ui://27vd145bh35o7ika" fontSize="40" color="#ffffff" letterSpacing="4" text="房间:588568"/>
<group id="n253_ogwn" name="top_left" xy="15,15" size="276,164"/>
<component id="n254_ogwn" name="btn_back_lobby" src="gq7m4p" fileName="Main_style_2/poker/Btn_back_lobby.xml" xy="25,25" size="58,75" scale="2,2">
<gearDisplay controller="state" pages="3"/>
</component>
@ -115,7 +106,7 @@
<gearDisplay controller="state" pages="1,3,4"/>
<relation target="" sidePair="width-width%"/>
</text>
<text id="n298_jzul" name="text_round" xy="1404,501" size="364,74" group="n299_jzul" font="ui://27vd145bg2mo7ij0" fontSize="55" color="#f5f5dd" vAlign="middle" letterSpacing="5" autoSize="none" text="局数:1\81">
<text id="n298_jzul" name="text_round" xy="1404,501" size="547,74" group="n299_jzul" font="ui://27vd145bg2mo7ij0" fontSize="55" color="#f5f5dd" vAlign="middle" letterSpacing="5" autoSize="none" text="局数:1\81">
<gearDisplay controller="state" pages="1,3,4"/>
</text>
<group id="n299_jzul" name="center_text" xy="287,501" size="1958,281" advanced="true">
@ -138,8 +129,19 @@
<gearDisplay controller="state" pages="1,3,4"/>
<relation target="" sidePair="width-width,height-height"/>
</component>
<component id="n294_kikc" name="com_notice" src="kikc1g4" fileName="Main_new/com_notice.xml" xy="567,124" size="1290,63"/>
<component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,891" size="153,132">
<component id="n294_kikc" name="com_notice" src="kikc1g4" fileName="Main_new/com_notice.xml" xy="567,135" size="1290,63">
<relation target="" sidePair="top-top"/>
</component>
<text id="n249_ogwn" name="text_time" xy="132,15" size="159,56" group="n253_ogwn" font="ui://27vd145bh35o7ika" fontSize="42" color="#ffffff" align="center" letterSpacing="3" autoSize="none" text="14:13"/>
<component id="n250_ogwn" name="ProgressBar_jiangxi" src="lu84tv" fileName="Main_new/Main/ProgressBar_jiangxi.xml" xy="27,21" size="101,43" group="n253_ogwn">
<ProgressBar value="50" max="100"/>
</component>
<component id="n251_ogwn" name="btn_check" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="21,116" size="205,63" group="n253_ogwn">
<Button icon="ui://v0j9abjygmbn13u"/>
</component>
<text id="n252_ogwn" name="text_roomId" xy="15,67" size="264,54" group="n253_ogwn" font="ui://27vd145bh35o7ika" fontSize="40" color="#ffffff" letterSpacing="4" text="房间:588568"/>
<group id="n253_ogwn" name="top_left" xy="15,15" size="276,164"/>
<component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="89,789" size="153,132">
<gearDisplay controller="state" pages="0,2"/>
<gearXY controller="state" pages="0" values="1189,891" default="89,789"/>
<relation target="" sidePair="center-center,bottom-bottom"/>
@ -147,7 +149,7 @@
<component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="87,788" size="153,132">
<gearDisplay controller="state" pages="1,3,4"/>
</component>
<component id="n116_pkx5" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1888,519" size="153,132">
<component id="n116_pkx5" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="2004,77" size="153,132">
<gearDisplay controller="state" pages="0,2"/>
<gearXY controller="state" pages="0,1,2,3" values="1888,519|2004,77|2311,292|2314,294" default="1194,274"/>
<relation target="" sidePair="middle-middle"/>
@ -156,10 +158,10 @@
<gearDisplay controller="state" pages="0,2"/>
<relation target="" sidePair="center-center,top-top"/>
</component>
<component id="n140_lu84" name="player_info2_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="2311,292" size="153,132">
<component id="n140_lu84" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="2311,292" size="153,132">
<gearDisplay controller="state" pages="1,3,4"/>
</component>
<component id="n152_kxhm" name="player_info3_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1865,38" size="153,132">
<component id="n152_kxhm" name="player_info3_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="1865,38" size="153,132">
<gearDisplay controller="state" pages="1,3,4"/>
</component>
<component id="n262_ogwn" name="btn_inviteFamily" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2415,264" size="117,249">

8
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_1_FZ.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="456,199">
<controller name="isFour" pages="0,,1," selected="0"/>
<controller name="seat" pages="0,,1,,2,,3," selected="3"/>
<controller name="seat" pages="0,,1,,2,,3," selected="2"/>
<controller name="not_arrow" pages="0,,1," selected="0"/>
<displayList>
<component id="n0_gi99" name="Comp_Card1" src="gi9910g" fileName="Main_new/Main_new_4/Component/Comp_4_1_FZ_Card.xml" xy="0,40" size="151,155">
@ -17,11 +17,11 @@
<gearDisplay controller="isFour" pages="1"/>
<relation target="" sidePair="width-width%,center-center"/>
</component>
<image id="n4_qz7i" name="n4" src="qz7i11n" fileName="Main_new/Main/Image/Polygon 7.png" xy="215,14" pivot="0.5,0.5" size="30,32" rotation="-90">
<image id="n4_qz7i" name="n4" src="qz7i11n" fileName="Main_new/Main/Image/Polygon 7.png" xy="204,59" pivot="0.5,0.5" size="47,60" aspect="true">
<gearDisplay controller="not_arrow" pages="0"/>
<gearXY controller="seat" pages="0,1,2,3" values="215,14|215,14|206,54|215,14"/>
<gearXY controller="seat" pages="0,1,2,3" values="204,59|204,59|204,59|204,59"/>
<gearLook controller="seat" pages="0,1,3" values="1,180,0,0|1,90,0,0|1,-90,0,0" default="1,0,0,0"/>
<relation target="" sidePair="center-center"/>
<relation target="" sidePair="center-center,middle-middle"/>
</image>
</displayList>
</component>

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="2532,1170" designImage="ui://v0j9abjyj6yy1fw" designImageAlpha="0">
<controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,5,观战状态" selected="4"/>
<controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,5,观战状态" selected="1"/>
<controller name="sdk" pages="0,,1," selected="0"/>
<controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
<controller name="3d" pages="0,,1," selected="0"/>
@ -14,7 +14,7 @@
<component id="n213_hyws" name="com_logo" src="o4nh1ei" fileName="Main_new/Component/com_logo.xml" xy="1209,328" size="435,73">
<relation target="" sidePair="center-center,middle-middle"/>
</component>
<component id="n371_kikc" name="com_notice" src="kikc1g4" fileName="Main_new/com_notice.xml" xy="567,129" size="1291,60"/>
<component id="n371_kikc" name="com_notice" src="kikc1g4" fileName="Main_new/com_notice.xml" xy="567,135" size="1291,60"/>
<component id="n81_l2u4" name="cardbox" src="gq7m5e" fileName="Main_style_2/turn/Gcm_box_4.xml" xy="1278,-294" pivot="0.5,0.5">
<gearDisplay controller="state" pages="1,3"/>
<gearXY controller="3d" pages="0,1" values="1278,-294|603,254"/>
@ -80,15 +80,6 @@
<relation target="n319_ogwn" sidePair="top-bottom"/>
</component>
<component id="n320_ogwn" name="jing" src="ckvb11l" fileName="Main_new/Main/Component/Comp_jing.xml" xy="405,25" size="115,121" visible="false" touchable="false"/>
<text id="n321_ogwn" name="text_time" xy="132,15" size="159,56" group="n325_ogwn" font="ui://27vd145bh35o7ika" fontSize="42" color="#ffffff" align="center" letterSpacing="3" autoSize="none" text="14:13"/>
<component id="n322_ogwn" name="ProgressBar_jiangxi" src="lu84tv" fileName="Main_new/Main/ProgressBar_jiangxi.xml" xy="27,21" size="101,43" group="n325_ogwn">
<ProgressBar value="50" max="100"/>
</component>
<component id="n323_ogwn" name="btn_check" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="21,116" size="205,63" group="n325_ogwn">
<Button icon="ui://v0j9abjygmbn13u"/>
</component>
<text id="n324_ogwn" name="text_roomId" xy="15,67" size="264,54" group="n325_ogwn" font="ui://27vd145bh35o7ika" fontSize="40" color="#ffffff" letterSpacing="4" text="房间:588568"/>
<group id="n325_ogwn" name="top_left" xy="15,15" size="276,164"/>
<component id="n326_ogwn" name="btn_back_lobby" src="gq7m4p" fileName="Main_style_2/poker/Btn_back_lobby.xml" xy="25,25" size="58,75" scale="2,2">
<gearDisplay controller="state" pages="3"/>
</component>
@ -97,20 +88,20 @@
<Button icon="ui://v0j9abjylj2n17t"/>
</component>
<text id="n373_jzul" name="remaining_card" xy="769,514" size="358,74" group="n376_jzul" font="ui://27vd145bg2mo7ij0" fontSize="55" color="#f5f5dd" align="right" vAlign="middle" letterSpacing="5" autoSize="none" text="余98张">
<gearDisplay controller="state" pages="1,3"/>
<gearDisplay controller="state" pages="1,3,5"/>
</text>
<text id="n374_jzul" name="wanfa_text" xy="287,643" pivot="0.5,0" size="1958,152" group="n376_jzul" font="ui://27vd145bg2mo7ij0" fontSize="44" color="#f5f5dd" align="center" vAlign="middle" autoSize="none" text="玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍&#xA;">
<gearDisplay controller="state" pages="1,3,4"/>
<gearDisplay controller="state" pages="1,3,5"/>
<relation target="" sidePair="width-width%"/>
</text>
<text id="n375_jzul" name="text_round" xy="1404,514" size="364,74" group="n376_jzul" font="ui://27vd145bg2mo7ij0" fontSize="55" color="#f5f5dd" vAlign="middle" letterSpacing="5" autoSize="none" text="局数:1\81">
<gearDisplay controller="state" pages="1,3,4"/>
<text id="n375_jzul" name="text_round" xy="1404,514" size="667,74" group="n376_jzul" font="ui://27vd145bg2mo7ij0" fontSize="55" color="#f5f5dd" vAlign="middle" letterSpacing="5" autoSize="none" text="局数:1\81">
<gearDisplay controller="state" pages="1,3,5"/>
</text>
<group id="n376_jzul" name="center_text" xy="287,514" size="1958,281" advanced="true">
<relation target="" sidePair="center-center"/>
</group>
<component id="n332_ogwn" name="Comp_ConterBox" src="gjnb107" fileName="Main_new/Main/Comp_ConterBox.xml" xy="1102,406" size="335,270" group="n333_ogwn">
<gearDisplay controller="state" pages="1,3,4"/>
<gearDisplay controller="state" pages="1,3,5"/>
<relation target="" sidePair="center-center"/>
</component>
<group id="n333_ogwn" name="conter_box" xy="1102,406" size="335,270"/>
@ -135,6 +126,15 @@
<gearDisplay controller="state" pages="1,3,5"/>
<relation target="" sidePair="width-width,height-height"/>
</component>
<text id="n321_ogwn" name="text_time" xy="132,15" size="159,56" group="n325_ogwn" font="ui://27vd145bh35o7ika" fontSize="42" color="#ffffff" align="center" letterSpacing="3" autoSize="none" text="14:13"/>
<component id="n322_ogwn" name="ProgressBar_jiangxi" src="lu84tv" fileName="Main_new/Main/ProgressBar_jiangxi.xml" xy="27,21" size="101,43" group="n325_ogwn">
<ProgressBar value="50" max="100"/>
</component>
<component id="n323_ogwn" name="btn_check" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="21,116" size="205,63" group="n325_ogwn">
<Button icon="ui://v0j9abjygmbn13u"/>
</component>
<text id="n324_ogwn" name="text_roomId" xy="15,67" size="264,54" group="n325_ogwn" font="ui://27vd145bh35o7ika" fontSize="40" color="#ffffff" letterSpacing="4" text="房间:588568"/>
<group id="n325_ogwn" name="top_left" xy="15,15" size="276,164"/>
<component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,909" size="153,132">
<gearDisplay controller="state" pages="0,2"/>
<gearXY controller="state" pages="2" values="87,788" default="1189,909"/>
@ -149,7 +149,7 @@
<gearXY controller="state" pages="2" values="2311,292" default="1888,519"/>
<relation target="" sidePair="middle-middle"/>
</component>
<component id="n140_lu84" name="player_info2_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="2311,292" size="153,132">
<component id="n140_lu84" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="2311,292" size="153,132">
<gearDisplay controller="state" pages="1,3,5"/>
<relation target="" sidePair="left-right,bottom-middle"/>
</component>
@ -158,7 +158,7 @@
<gearXY controller="state" pages="2" values="1865,38" default="1189,223"/>
<relation target="" sidePair="center-center,top-top"/>
</component>
<component id="n152_kxhm" name="player_info3_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1865,37" size="153,132">
<component id="n152_kxhm" name="player_info3_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="1865,37" size="153,132">
<gearDisplay controller="state" pages="1,3,5"/>
<relation target="" sidePair="top-top"/>
</component>

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

@ -4,7 +4,7 @@
<graph id="n2_kikc" name="n2" xy="0,0" size="1398,63" type="rect">
<relation target="" sidePair="width-width,height-height"/>
</graph>
<image id="n0_kikc" name="n0" src="kikc1g5" fileName="component/notice_old/result_tips_bg.png" xy="0,0" size="1398,63" aspect="true">
<image id="n0_kikc" name="n0" src="kikc1g5" fileName="component/notice_old/result_tips_bg.png" xy="0,-5" size="1619,73" aspect="true">
<relation target="" sidePair="width-width,height-height"/>
</image>
<text id="n1_kikc" name="text_notice" xy="0,0" size="4757,62" font="ui://27vd145bh35o7ilb" fontSize="46" color="#ffffff" vAlign="bottom" text="公告公告公告公告公告公告公告公告公告公告公告公告公告公公告公告公告公告公告公告公告公告公告公告公告公告公告公公告公告公告公告公告公告公告公告公告公告公告公告公告公公告公告公告公告公告公告公告公告公告公告公告公告"/>

BIN
wb_new_ui/assets/Main_Majiang/component/notice_old/result_tips_bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_206.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 10 KiB

BIN
wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_207.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 12 KiB

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

@ -970,7 +970,7 @@
<image id="lj2n18r" name="b203_301.png" path="/images/cards3/3/" exported="true"/>
<image id="lj2n18s" name="b203_209.png" path="/images/cards3/3/" exported="true"/>
<image id="lj2n18t" name="b203_208.png" path="/images/cards3/3/" exported="true"/>
<image id="lj2n18u" name="b203_207.png" path="/images/cards3/3/" exported="true"/>
<image id="lj2n18u" name="b203_206.png" path="/images/cards3/3/" exported="true"/>
<image id="lj2n18v" name="b203_102.png" path="/images/cards3/3/" exported="true"/>
<image id="lj2n18w" name="b203_103.png" path="/images/cards3/3/" exported="true"/>
<image id="lj2n18x" name="b203_104.png" path="/images/cards3/3/" exported="true"/>
@ -984,7 +984,7 @@
<image id="lj2n195" name="b203_203.png" path="/images/cards3/3/" exported="true"/>
<image id="lj2n196" name="b203_204.png" path="/images/cards3/3/" exported="true"/>
<image id="lj2n197" name="b203_205.png" path="/images/cards3/3/" exported="true"/>
<image id="lj2n198" name="b203_206.png" path="/images/cards3/3/" exported="true"/>
<image id="lj2n198" name="b203_207.png" path="/images/cards3/3/" exported="true"/>
<image id="lj2n199" name="b203_109.png" path="/images/cards3/3/" exported="true"/>
<image id="lj2n19a" name="b203_503.png" path="/images/cards3/3/" exported="true"/>
<component id="lj2n19b" name="Comp_HandCard2_Record.xml" path="/Main_new/Main_new_4/Component/" exported="true"/>
@ -1150,7 +1150,7 @@
<component id="kikc1g2" name="Cgm_message_text.xml" path="/component/notice_old/"/>
<image id="kikc1g3" name="Rectangle 54(1).png" path="/component/notice_old/"/>
<component id="kikc1g4" name="com_notice.xml" path="/Main_new/"/>
<image id="kikc1g5" name="result_tips_bg.png" path="/component/notice_old/"/>
<image id="kikc1g5" name="result_tips_bg.png" path="/component/notice_old/" scale9grid="284,16,215,32"/>
<image id="smbw1g6" name="4918b5270e436c54b44d48f0bb79114 3(1).png" path="/Main_new/Image/"/>
<component id="wcy51g7" name="Btn_Card.xml" path="/Main_new/Main_new_2/Component/NewHandCard/Component/" exported="true"/>
<component id="wcy51g8" name="com_OutCard_Vertical.xml" path="/Main_new/Main_new_2/Component/NewHandCard/Component/"/>
@ -1282,6 +1282,8 @@
<image id="r8cy1k3" name="chi_ani_05.png" path="/Main_new/Main/Image/gang/"/>
<movieclip id="r8cy1k5" name="clip_gang.jta" path="/Main_new/Main/Image/gang/" exported="true" atlas="1"/>
<sound id="r8cy1k6" name="click.mp3" path="/Main_new/Image/" exported="true"/>
<image id="xpru1kh" name="gamexzmj_48.png" path="/Main_new/Main/Image/"/>
<image id="xx1c1ki" name="outMask.png" path="/Main_new/Main/Image/"/>
</resources>
<publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/>
</packageDescription>

BIN
wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Assets/ART/base/chat/ui/Chat_atlas0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 847 KiB

After

Width:  |  Height:  |  Size: 1.3 MiB

BIN
wb_unity_pro/Assets/ART/base/chat/ui/Chat_atlas0_1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 335 KiB

BIN
wb_unity_pro/Assets/ART/base/chat/ui/Chat_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.3 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: 3.0 MiB

After

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

After

Width:  |  Height:  |  Size: 3.6 MiB

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: 2.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.5 MiB

After

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

After

Width:  |  Height:  |  Size: 1.7 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: 1.8 MiB

After

Width:  |  Height:  |  Size: 1.7 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: 889 KiB

After

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

After

Width:  |  Height:  |  Size: 1.1 MiB

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/lobby/ui/Lobby_atlas0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 MiB

After

Width:  |  Height:  |  Size: 2.1 MiB

BIN
wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_xpru7d79.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 MiB

4
wb_unity_pro/Assets/ART/base/chat/ui/Chat_atlas0_1.png.meta → wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_xpru7d79.png.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: c3ae9fff9ffd74b4eaba06864d076838
guid: eb83a261cbd3f6f4ebd2931e9c096c35
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: base/chat/c690b7c4ecc0dd8501b1a391699eb710
assetBundleName: base/lobby/4a425335ab0e1c246f741e6da62b244f
assetBundleVariant:

BIN
wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_xpru7d7a.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 105 KiB

92
wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_xpru7d7a.png.meta Normal file
View File

@ -0,0 +1,92 @@
fileFormatVersion: 2
guid: 046d2063f5205084ba7f26300131f0c2
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/lobby/4a425335ab0e1c246f741e6da62b244f
assetBundleVariant:

BIN
wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_xpru7d7e.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 59 KiB

92
wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_xpru7d7e.png.meta Normal file
View File

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

BIN
wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_xpru7d7f.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 212 KiB

92
wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_xpru7d7f.png.meta Normal file
View File

@ -0,0 +1,92 @@
fileFormatVersion: 2
guid: 34174d9166629374999f4634e823b62f
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/lobby/4a425335ab0e1c246f741e6da62b244f
assetBundleVariant:

Some files were not shown because too many files have changed in this diff Show More