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

暴力合并other2

master
罗家炜 2025-06-25 22:49:44 +08:00
parent aef31e30f8
commit a7a53c2057
80 changed files with 2941 additions and 361 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.gitignore vendored Normal file
View File

@ -0,0 +1,14 @@
# 忽略所有文件和文件夹
*
# 上传两个文件夹
!lua_probject/
!wb_unity_pro/
wb_unity_pro/*
!wb_unity_pro/Assets/
wb_unity_pro/Assets/*
!wb_unity_pro/Assets/ART/
!lua_probject/**
!wb_unity_pro/Assets/ART/**
!.gitignore

2
lua_probject/base_project/Game/Controller/LoginController.lua
View File

@ -14,7 +14,7 @@ end
local _LocalConfigAllGame = {
-- 10, 33,
90,
-- 90,
66, 86, 87, 88, 89
}

74
lua_probject/base_project/Game/Controller/NewGroupController.lua
View File

@ -41,6 +41,7 @@ function M:FG_GroupList(callback)
group.room_num = tem.room_num
group.option = tem.option
group.show_num = tem.show_num
group.isShow = tem.isShow
l_groups:add(group)
end
end
@ -1264,6 +1265,27 @@ function M:FG_SetBanTable(group_id, member_id, list, del_list, callback)
end)
end
-- 设置添加&禁止同桌 2025.6.21
-- 添加同桌时 tableId = -1 table = {}
---@param id 亲友圈id
---@param tableId 同桌id
---@param table 同桌玩家
---@param tableName 同桌备注&名字
function M:FG_SetBanTable1(id, tableId, players, name, callback)
local _data = {}
_data.id = id
_data.tableId = tableId
_data.table = players
_data.tableName = name
print("发送同桌协议")
pt(_data)
local _client = ControllerManager.GroupClient
_client:send(Protocol.SET_BAN_TABLE, _data, function(res)
callback(res)
end)
end
function M:FG_GetBanTable(group_id, member_id, callback)
local _client = ControllerManager.GroupClient
local _data = {}
@ -1274,6 +1296,19 @@ function M:FG_GetBanTable(group_id, member_id, callback)
end)
end
-- 获取禁止同桌 2025.6.21
---@param group_id 亲友圈id
function M:FG_GetBanTable1(group_id, callback)
local _data = {}
_data.id = group_id
local _client = ControllerManager.GroupClient
_client:send(Protocol.GET_BAN_TABLE, _data, function(res)
callback(res)
end)
end
function M:GetAddMember(group_id, member_id, callback)
local _client = ControllerManager.GroupClient
local _data = {}
@ -1383,13 +1418,21 @@ function M:FG_DelAllMail(group_id, uid, callback)
end)
end
-- 设置成员备注
function M:FG_SetMemberTag(group_id, uid, score, callback)
-- 设置成员备注 2025.6.21 服务器有id信息不传score，tag = 备注
---@param group_id 亲友圈id
---@param uid 玩家
---@param tag 备注
function M:FG_SetMemberTag(group_id, uid, tag, callback)
local _client = ControllerManager.GroupClient
local _data = {}
--_data.id = group_id
--_data.tag = uid
--_data.score = 0
_data.id = group_id
_data.tag = uid
_data.score = score
_data.uid = uid
_data.tag = tag
_client:send(Protocol.WEB_FG_SET_MEMBER_TAG, _data, function(res)
callback(res)
end)
@ -1526,3 +1569,26 @@ function M:FG_SetFamilyHeartbeat(group_id, playerId, callback)
callback(res)
end)
end
--显示&隐藏成员
---@param isShow 1是显示 0是隐藏
function M:FG_SetGroupShow(isShow, groupId, callback)
local _client = ControllerManager.GroupClient
local _data = {}
_data.isShow = isShow
_data.groupId = groupId
_client:send(Protocol.SHOW_GROUP, _data, function(res)
callback(res)
end)
end
--聊天室
---@groupId 亲友圈id
function M:GetChatRoom(groupId, callback)
local _client = ControllerManager.GroupClient
local _data = {}
_data.id = groupId
_client:send(Protocol.WEB_FG_GETCHATROOM, _data, function(res)
callback(res)
end)
end

1
lua_probject/base_project/Game/Data/Room.lua
View File

@ -38,6 +38,7 @@ local Room = {
-- 观战玩家列表
witness_player_list = nil,
_flag_updateWitness = false,
-- 游戏中
playing = false,

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

@ -123,6 +123,12 @@ Protocol = {
WEB_FG_SET_GROUP_VIP = "group/set_group_vip",
-- 禁止同桌
WEB_FG_SET_BAN_TABLE = "group/set_ban_desk",
-- 设置禁止同桌 2025.6.21 新增
SET_BAN_TABLE = "group/set_ban_deskList",
-- 获取禁止同桌 2025.6.21 新增
GET_BAN_TABLE = "group/get_ban_desk_list2",
-- 显示%隐藏成员
SHOW_GROUP = "group/show_group",
-- 添加玩家
WEB_FG_INVITE_MEMBER = "group/invite_group_member",
--获取添加玩家
@ -265,6 +271,9 @@ Protocol = {
WEB_FG_SET_Family_Diamond = "group/add_group_diamo",
-- 亲友圈发送伪心跳
WEB_FG_SET_Family_Heartbeat = "group/set_group_heartbeat",
-- 亲友圈聊天室
WEB_FG_GETCHATROOM = 'group/get_chat_rooms',
-------------- group-log---------------------
-- 获取奖励日志
WEB_FG_GET_REWARDS_LOG = "group/log/get_reward_log",

7
lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua
View File

@ -64,6 +64,13 @@ function M:FillList(numbers)
obj:GetController('ban').selectedIndex = numbers[i].ban
obj:GetChild('name').text = numbers[i].nick
obj:GetChild('id').text = string.format("ID:%s", numbers[i].uid)
if numbers[i].tag == "" then
obj:GetChild("remark").text = "备注：无"
else
obj:GetChild("remark").text = numbers[i].tag
end
ImageLoad.Load(numbers[i].portrait, obj:GetChild('btn_head')._iconObject)
obj.onClick:Set(function()

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

@ -1,80 +1,286 @@
local FamilySelectNumber = import(".FamilySelectNumber")
--region LOCAL
local BanDesk = {}
local root = {}
local rootLastIndex = 0
local function HideMainView()
rootLastIndex = root.familyType.selectedIndex
root.familyType.selectedIndex = 0
local function HideMainView(self)
rootLastIndex = self.root.familyType.selectedIndex
self.root.familyType.selectedIndex = 0
end
local function ShowMainView()
root.familyType.selectedIndex = rootLastIndex or 1
local function ShowMainView(self)
self.root.familyType.selectedIndex = rootLastIndex or 1
end
local function LoadData(BanData)
end
local function GetIconFromGroupData(playerId, group)
local player = group.memberMap[playerId]
if player then
return player.portrait
end
print("玩家不在group中，无法找到头像 玩家id=",playerId)
return ""
end
local function AllUid(deskList)
local re = {}
pt(deskList)
for _, player in pairs(deskList) do
re[#re + 1] = player.uid
end
return re
end
local function AddPlayer(data, self)
-- 点击弹出选择成员界面
local view = FamilySelectNumber.New()
view:Show(self.root._group.id, function(number)
local players = AllUid(data.deskList)
players[#players + 1] = number.uid
local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_SetBanTable1(self.root._group.id, data.deskId, players, data.deskName, function() self:ReflashDesk() end)
end)
end
local function DelPalyer(data, uid, self)
local players = AllUid(data.deskList)
for _, id in pairs(players) do
if id == uid then
players[_] = nil
end
end
-- 修复下标的连续性，不然json.encode会吧空下标也解析出来
local fix = {}
for _, id in pairs(players) do
fix[#fix + 1] = id
end
players = fix
local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_SetBanTable1(self.root._group.id, data.deskId, players, data.deskName, function() self:ReflashDesk() end)
end
local function DelDesk(data, self)
local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_SetBanTable1(self.root._group.id, data.deskId, {}, data.deskName, function() self:Reflash() end)
end
local function ChangeName(deskData, name, self)
local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_SetBanTable1(self.root._group.id, deskData.deskId, AllUid(deskData.deskList), name, function()
self:ReflashDesk()
self:CloseRemaskWindow()
end)
end
local function Sort(BanData)
-- 把空的桌子放到下面
local emtpy = {}
for index, desk in pairs(BanData) do
if desk.deskList == nil or #desk.deskList == 0 then
emtpy[#emtpy + 1] = desk
BanData[index] = nil
end
end
local re = {}
for _, desk in pairs(BanData) do
re[#re + 1] = desk
end
for _, desk in pairs(emtpy) do
re[#re + 1] = desk
end
return re
end
--endregion
-- 禁止同桌数据
BanDesk.BanData = {}
function BanDesk:TryShow(r)
if not self._view then
self:Init()
local view = BanDesk.New()
self.root = r
HideMainView(self)
view:Show()
end
root = r
HideMainView()
self:Show()
function BanDesk:Show()
BaseWindow.Show(self)
self:Reflash()
end
function BanDesk:Close()
BaseView.Close(self)
ShowMainView()
ShowMainView(self)
end
function BanDesk.New()
setmetatable(BanDesk, {__index = BaseView})
local inst = setmetatable({}, {__index = BanDesk})
inst._close_destroy = true
inst._full = true
inst._animation = false
inst._full_offset = false
inst._anim_pop = 0
BaseWindow.init(inst, 'ui://Family/com_banDesk')
inst:Init()
inst._root_view:GetChild("win_mode").visible = false
return inst
end
function BanDesk:Init()
setmetatable(BanDesk, {__index = BaseView})
self:InitView("ui://Family/com_banDesk")
self.btn_close = self._view:GetChild("btn_close")
self.list_banItem = self._view:GetChild("list_banItem")
self.cSetName = self._view:GetController("cSetName")
self.btn_bgRemask = self._view:GetChild("btn_bgRemask")
self.btn_confirmRemask = self._view:GetChild("btn_confirmRemask")
self.btn_quitRemask = self._view:GetChild("btn_quitRemask")
self.input_name = self._view:GetChild("input_name")
self.btn_confirmRemask = self._view:GetChild("btn_confirmRemask")
self.input_name = self._view:GetChild('input_name')
self.btn_close.onClick:Set(function()
self:Close()
end)
self.btn_quitRemask.onClick:Set(function()
self:CloseRemaskWindow()
end)
self.btn_bgRemask.onClick:Set(function()
self:CloseRemaskWindow()
end)
self.btn_confirmRemask.onClick:Set(function()
local name = self.input_name.text
ChangeName(self.selectBanItem, name, self)
end)
self.list_banItem.itemRenderer = function(index, obj)
local data = self.BanData[index]
local data = self.BanData[index +1]
local tex_name = obj:GetChild("tex_name")
local list_BanedPlayers = obj:GetChild("list_BanedPlayers")
local btn_del = obj:GetChild("btn_del")
local btn_addBanItem = obj:GetChild("btn_addBanItem")
local btn_edit = obj:GetChild("btn_edit")
btn_addBanItem.onClick:Set(function()
local fgCtr = ControllerManager.GetController(NewGroupController)
local groupId = root._group
local userId = DataManager.SelfUser.account_id
local banList = {}
--fgCtr:FG_SetBanTable(groupId, userId, , {},function()
--end)
tex_name.text = data.deskName
obj:GetController("cStyle").selectedIndex = 0
btn_edit.onClick:Set(function()
-- 修改备注
self.changedIndex = index
self.selectBanItem = data
self:OpenRemaskWindow()
end)
list_BanedPlayers.itemRenderer = function(i, o)
btn_del.onClick:Set(function()
-- 删除整个桌子
DelDesk(data, self)
end)
end
list_BanedPlayers.itemRenderer = function(playerIndex, playerObj)
local loader_icon = playerObj:GetChild("loader_icon")
local tex_name = playerObj:GetChild("tex_name")
local player = data.deskList[playerIndex + 1]
playerObj:GetController("cStyle").selectedIndex = 0
tex_name.text = player.nick
local img = GetIconFromGroupData(player.uid, self.root._group)
ImageLoad.Load(img, loader_icon)
local btn_delPlayer = playerObj:GetChild("btn_delPlayer")
btn_delPlayer.onClick:Set(function()
-- 删除玩家按钮
self.changedIndex = index
DelPalyer(data, player.uid, self)
end)
end
list_BanedPlayers.numItems = #data.deskList
local add_play = list_BanedPlayers:AddItemFromPool()
add_play:GetController("cStyle").selectedIndex = 1
add_play:GetChild("btn_addPlayer").onClick:Set(function()
-- 添加玩家按钮
self.changedIndex = index
AddPlayer(data, self)
end)
end
end
function BanDesk:Reflash()
-- 最后一个添加ban按钮
local addBanItem = self.list_banItem:AddItemFromPool()
addBanItem:GetController("cStyle").selectedIndex = 1
--addBanItem
local fgCtr = ControllerManager.GetController(NewGroupController)
local groupId = self.root._group.id
fgCtr:FG_GetBanTable1(groupId,function(res)
self:GetBanTableCallback(res)
end)
end
function BanDesk:GetBanTableCallback(res)
print("BanDesk:GetBanTableCallback")
self.BanData = Sort(res.Data.ban_list)
self.list_banItem.numItems = #self.BanData
-- 最后一个添加ban按钮
local addBanItem = self.list_banItem:AddItemFromPool()
local btn_addBanItem = addBanItem:GetChild("btn_addBanItem")
addBanItem:GetController("cStyle").selectedIndex = 1
btn_addBanItem.onClick:Set(function()
local fgCtr = ControllerManager.GetController(NewGroupController)
local groupId = self.root._group.id
local banList = {}
fgCtr:FG_SetBanTable1(groupId, -1, banList, "新建关系", function()
self:Reflash()
end)
end)
end
function BanDesk:ReflashDesk()
-- 只刷新一个元素，暂时怎么处理，有时间优化
local data = self.BanData[self.changedIndex +1]
local obj = self.list_banItem:GetChildAt(self.changedIndex)
local tex_name = obj:GetChild("tex_name")
local list_BanedPlayers = obj:GetChild("list_BanedPlayers")
tex_name.text = data.deskName
obj:GetController("cStyle").selectedIndex = 0
list_BanedPlayers.numItems = #data.deskList
local add_play = list_BanedPlayers:AddItemFromPool()
add_play:GetController("cStyle").selectedIndex = 1
add_play:GetChild("btn_addPlayer").onClick:Set(function()
-- 添加玩家按钮
self.changedIndex = self.changedIndex
AddPlayer(data, self)
end)
end
-- 打开备注界面
function BanDesk:OpenRemaskWindow()
self.cSetName.selectedIndex = 1
end
function BanDesk:CloseRemaskWindow()
self.cSetName.selectedIndex = 0
end
return BanDesk

57
lua_probject/base_project/Game/View/Family/FamilyChatRoom.lua Normal file
View File

@ -0,0 +1,57 @@
require 'FairyGUI'
local FamilyChatRoom = {}
--[[
function FamilyChatRoom.New()
--转移进family界面
--setmetatable(FamilyChatRoom, { __index = BaseWindow })
--local inst = setmetatable({}, { __index = FamilyChatRoom})
inst:Init(com)
return inst
end
]]
function FamilyChatRoom:Init(com, root)
--转移进family界面
--self._full = true
--self._full_offset = false
--self._animation = false
--BaseWindow.init(self, "ui://Family/com_chatRoom")
self.root = root
self._view = com
self.list_chat = self._view:GetChild("list_chat")
self.btn_quit = self._view:GetChild("btn_quit")
self.btn_quit.onClick:Set(function()
self:Close()
end)
return self
end
function FamilyChatRoom:Close()
local cChatRoom = self.root._view:GetController("cIsChatRoom")
cChatRoom.selectedIndex = 0
end
function FamilyChatRoom:Show()
local cChatRoom = self.root._view:GetController("cIsChatRoom")
cChatRoom.selectedIndex = 1
local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:GetChatRoom(self.root._group.id, function(res)
self:GetChatCallBack(res)
end)
end
function FamilyChatRoom:GetChatCallBack(res)
print("收到聊天室协议")
pt(res)
end
return FamilyChatRoom

116
lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua
View File

@ -1,3 +1,5 @@
local FamilyRoomCardRecord = import(".FamilyRoomCardRecord")
--region LOCAL
local FamilyMyFamily = {}
@ -37,17 +39,27 @@ end
function FamilyMyFamily:Refalsh()
--local family = root._group
local family = DataManager.groups.groupMap[self.groupId]
self.family = DataManager.groups.groupMap[self.groupId]
self.tex_fName.text = family.name
self.tex_playerName.text = "亲友圈号:" .. family.id
self.tex_fNumber.text = family.member_num
self.tex_cradNum.text = family.diamo
self.tex_nocice.text = family.notice
ImageLoad.Load(family.o_portrait, self.loader_icon)
self.tex_fName.text = self.family.name
self.tex_playerName.text = "亲友圈号:" .. self.family.id
self.tex_fNumber.text = self.family.member_num
self.tex_cradNum.text = self.family.diamo
self.tex_nocice.text = self.family.notice
ImageLoad.Load(self.family.o_portrait, self.loader_icon)
self.cStyle.selectedIndex = family.lev -1
self.cStyle.selectedIndex = self.family.lev -1
-- index = 0 是显示隐藏按钮
self.showNumber = self.family.isShow
print("self.family.isShow",self.family.isShow)
pt(self.family)
if self.showNumber == 0 then
self.cDisplayNumber.selectedIndex = 1
self.tex_fNumber.text = "*"
elseif self.showNumber == 1 then
self.cDisplayNumber.selectedIndex = 0
end
end
function FamilyMyFamily:Init()
@ -57,6 +69,7 @@ function FamilyMyFamily:Init()
self._full = true
self._animation = false
self._full_offset = false
self._anim_pop = 0
BaseWindow.init(self, 'ui://Family/com_myFamily')
-- 隐藏背景图
self._root_view:GetChild("win_mode").visible = false
@ -84,11 +97,14 @@ function FamilyMyFamily:Init()
self.btn_quitNotice = self._view:GetChild("btn_quitNotice")
self.btn_bgNotice = self._view:GetChild("btn_bgNotice")
self.btn_confirmNotice = self._view:GetChild("btn_confirmNotice")
self.btn_hideNumber = self._view:GetChild("btn_hideNumber")
self.btn_showNumber = self._view:GetChild("btn_showNumber")
self.input_notice = self._view:GetChild("input_notice")
self.cStyle = self._view:GetController("cStyle")
self.cWindow = self._view:GetController("cWindow")
self.cDisplayNumber = self._view:GetController("cDisplayNumber")
self.btn_playSet.onClick:Set(function()
self:Close()
@ -105,10 +121,14 @@ function FamilyMyFamily:Init()
root:ShowShop()
end)
self.btn_czRecord.onClick:Set(function()
local view = FamilyRoomCardRecord.New()
view:Show()
end)
self.btn_checkNumber.onClick:Set(function()
self:Close()
local family = DataManager.groups.groupMap[self.groupId]
root:OpenAllNumber(family)
root:OpenAllNumber(self.family)
end)
self.btn_applyMsg.onClick:Set(function()
@ -118,8 +138,8 @@ function FamilyMyFamily:Init()
self.btn_quitFamily.onClick:Set(function()
local fgCtr = ControllerManager.GetController(NewGroupController)
print("发送了退出协议 familyid = ",root._group.id)
fgCtr:FG_ExitGroup(root._group.id, function(res)
print("发送了退出协议 familyid = ",self.family.id)
fgCtr:FG_ExitGroup(self.family.id, function(res)
pt(res)
end)
end)
@ -137,26 +157,25 @@ function FamilyMyFamily:Init()
end)
self.btn_confirmNotice.onClick:Set(function()
local family = root._group
local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_UpdateGroupInfo(
family.id,
family.name,
self.family.id,
self.family.name,
self.input_notice.text,
not family.ban,
family.dissolve_opt,
family.kick_opt,
family.apply,
family.ban_chat1,
family.ban_chat2,
family.option,
not self.family.ban,
self.family.dissolve_opt,
self.family.kick_opt,
self.family.apply,
self.family.ban_chat1,
self.family.ban_chat2,
self.family.option,
0,
function(res)
if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, "更改公告失败,请稍后再试")
else
ViewUtil.ErrorTip(res.ReturnCode, "修改成功！")
family.notice = self.input_notice.text
self.family.notice = self.input_notice.text
self:Refalsh()
self.cWindow.selectedIndex = 0
end
@ -164,6 +183,55 @@ function FamilyMyFamily:Init()
)
end)
self.btn_hideNumber.onClick:Set(function()
if self.isShowContenting == true then
ViewUtil.ShowBannerOnScreenCenter("设置中，请稍后再试。。")
return
end
print("点击了")
local fgCtr = ControllerManager.GetController(NewGroupController)
self.isShowContenting = true
fgCtr:FG_SetGroupShow(0, self.family.id, function (res)
print("收到协议M:FG_SetGroupShow")
pt(res)
self.isShowContenting = false
if res.ReturnCode ~= 0 then
ViewUtil.ShowBannerOnScreenCenter("设置失败，请稍后再试。。")
return
end
self.family.isShow = 0
self:Refalsh()
ViewUtil.ShowBannerOnScreenCenter("设置成功")
end)
end)
self.btn_showNumber.onClick:Set(function()
if self.isShowContenting == true then
ViewUtil.ShowBannerOnScreenCenter("设置中，请稍后再试。。")
return
end
print("点击了")
local fgCtr = ControllerManager.GetController(NewGroupController)
self.isShowContenting = true
fgCtr:FG_SetGroupShow(1, self.family.id, function (res)
print("收到协议M:FG_SetGroupShow")
pt(res)
self.isShowContenting = false
if res.ReturnCode ~= 0 then
ViewUtil.ShowBannerOnScreenCenter("设置失败，请稍后再试。。")
return
end
self.family.isShow = 1
self:Refalsh()
ViewUtil.ShowBannerOnScreenCenter("设置成功")
end)
end)
return self
end

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

@ -26,6 +26,8 @@ function FamilyMyfamilyList.New(root)
Instance._full = true
Instance._close_destroy = true
Instance._full_offset = false
Instance._anim_pop = 0
Instance._animation = false
BaseWindow.init(Instance, "ui://Family/com_myFamilyList")
-- 隐藏背景图

12
lua_probject/base_project/Game/View/Family/FamilyNumberDetail.lua
View File

@ -19,11 +19,15 @@ function M:init(url, lev, res)
local fgCtr = ControllerManager.GetController(NewGroupController)
BaseWindow.init(self, url)
print("res.Data.members[1]")
pt(res.Data.members[1])
local info = res.Data.members[1]
local flag_assistant = info.lev == 2 and 1 or 0
local flag_band = info.ban
local MJScore = info.mj_score
local PKScore = info.pk_score
local remark = info.tag
local icon_url = info.portrait
self._view:GetChild('name').text = string.format("%s(%s)", info.nick, info.uid)
self._view:GetChild('text_allRounds').text = info.total_round
@ -31,6 +35,14 @@ function M:init(url, lev, res)
self._view:GetChild('text_score_majiang').text = MJScore
self._view:GetChild('text_score_poker').text = PKScore
ImageLoad.Load(icon_url, self._view:GetChild('btn_head'):GetChild('icon'))
if remark == "" then
self._view:GetChild("tex_remark").text = "备注：无"
else
self._view:GetChild("tex_remark").text = remark
end
self._view:GetController('isAssistant').selectedIndex = info.lev == 1 and 0 or (lev == 2 and 1 or 2)
self._view:GetChild('btn_changeTag').onClick:Set(function()

143
lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua
View File

@ -30,6 +30,7 @@ function FamilyNumberRecord.New(root)
local text_score_poker = self._view:GetChild('text_score_poker')
local text_score_majiang = self._view:GetChild('text_score_majiang')
local box_type = self._view:GetChild('combBox_type')
local box_mumberTime = self._view:GetChild('box_mumberTime')
local ctr_day = self._view:GetController('day')
local ctr_sort = self._view:GetController('sort')
local ctr_limitDay = self._view:GetController('limitDay')
@ -39,6 +40,8 @@ function FamilyNumberRecord.New(root)
self._viewList_numberRankUnRead = self._view:GetChild('comp_numberRecordByGameType'):GetChild('n3')
self._viewList_numverRecord = self._view:GetChild('list_numverRecord')
self._viewlist_numberRecordDetail = self._view:GetChild('list_numberRecordDetail')
self._viewList_players = self._view:GetChild('list_players')
self._viewList_recordDetail = self._view:GetChild('list_record_detail')
self._viewText_titleRecord = self._view:GetChild('text_titleRecord')
self.ctr_numberRecord = self._view:GetController('page')
@ -48,6 +51,7 @@ function FamilyNumberRecord.New(root)
box_type.items, box_type.values = self:InitBoxType()
box_mumberTime.items, box_mumberTime.values = self:InitBoxTime()
text_score_majiang.text = 0 - MJScore
text_score_poker.text = 0 - PKScore
self._viewText_titleRecord.text = string.format("%s 成员记录", self._text_groupTitle)
@ -59,6 +63,11 @@ function FamilyNumberRecord.New(root)
self:NumverRankRenderer(group_id)
self:NumberRecordDetailRender()
box_mumberTime.onChanged:Set(function()
self._data_leftTime = tonumber(box_mumberTime.value)
self._data_rightTime = tonumber(box_mumberTime.value) + 86399
self:OnClickNumberRank(group_id, self.rankNumber.uid, 0)
end)
ctr_day.onChanged:Set(function(context)
local timeTable = os.date("*t", os.time())
timeTable.hour = 0
@ -70,7 +79,7 @@ function FamilyNumberRecord.New(root)
self:OnClickSortType()
end)
ctr_sort.onChanged:Set(function()
ctr_sort.onChanged:Set(function(context)
local index = context.sender.selectedIndex
self._data_sortType = index
self:OnClickSortType()
@ -201,6 +210,19 @@ function M:InitBoxType()
return items, values
end
function M:InitBoxTime()
local items = { "今天", "昨天" }
local values = {}
local timeTable = os.date("*t", os.time())
timeTable.hour = 0
timeTable.min = 0
timeTable.sec = 0
for i = 0, 1 do
table.insert(values, tostring(os.time(timeTable) - 86400 * i))
end
return items, values
end
function M:InitTimeAndSord()
local timeTable = os.date("*t", os.time())
timeTable.hour = 0
@ -259,7 +281,17 @@ function M:NumberRecordDetailRender()
obj:GetChild('text_roomID').text = info.room_id
obj:GetChild('text_userDiamond').text = 0
obj:GetChild('btn_lookRecord').onClick:Set(function()
print("lingmeng查看")
self._viewList_recordDetail:RemoveChildrenToPool()
for i = 1, tonumber(info.round) do
local obj = self._viewList_recordDetail:AddItemFromPool()
self:RecordItemDetailRender(i, info, info[string.format("round_%d", i)], obj)
end
self._viewList_players:RemoveChildrenToPool()
for j = 1, #info.totalScore do
local obj = self._viewList_players:AddItemFromPool()
self:RecordItemPlayersRender(json.decode(info.round_1), obj)
end
self.ctr_numberRecord.selectedIndex = 3
end)
obj:GetController('seleted').onChanged:Set(function(context)
pt(getmetatable(context.sender))
@ -298,6 +330,71 @@ function M:NumberRecordDetailRender()
end
end
function M:RecordItemDetailRender(round, allDate, rdata, obj)
obj:GetChild('text_round').text = round
obj:GetChild('text_time').text = os.date("%Y-%m-%d\n%H:%M:%S", tonumber(allDate.createTime))
local list = obj:GetChild('list_score')
rdata = json.decode(rdata)
list:RemoveChildrenToPool();
for i = 1, #rdata do
local obj2 = list:AddItemFromPool()
obj2:GetChild('title').text = rdata[i].score
end
local btn_play = obj:GetChild("n10")
btn_play.onClick:Set(function()
local group = DataManager.groups:get(self.group_id)
if DataManager.SelfUser.playback[allDate.military_id] ~= nil and DataManager.SelfUser.playback[allDate.military_id][round] ~= nil then
local room = ExtendManager.GetExtendConfig(allDate.game_info.game_id):NewRoom()
DataManager.CurrenRoom = room
room.lev = group.lev
room.game_id = allDate.game_info.game_id
local extend = ExtendManager.GetExtendConfig(allDate.game_info.game_id)
extend:FillPlayBackData(DataManager.SelfUser.playback[allDate.military_id][round])
if not room.self_player then
room.self_player = room:GetPlayerBySeat(1)
end
local main = self:GenaratePlayBack(ViewManager.View_PlayBack, allDate.game_info.game_id)
main._currentId = allDate.military_id
main._currentRound = round
main._totalRound = tonumber(rdata.round)
main:FillRoomData(DataManager.SelfUser.playback[allDate.military_id][round])
else
ViewUtil.ShowModalWait(self._view)
local _data = {}
_data["military_id"] = allDate.military_id
_data["round"] = tostring(round)
local loddyCtr1 = ControllerManager.GetController(LoddyController)
loddyCtr1:RequestPlayBack(_data, function(code, data)
ViewUtil.CloseModalWait()
if code == 0 then
if DataManager.SelfUser.playback[allDate.military_id] ~= nil then
DataManager.SelfUser.playback[allDate.military_id][round] = data
else
local playback_data = {}
playback_data[round] = data
DataManager.SelfUser.playback[allDate.military_id] = playback_data
end
local main = self:GenaratePlayBack(ViewManager.View_PlayBack, allDate.game_info.game_id)
main._currentId = allDate.military_id
main._currentRound = round
main._totalRound = tonumber(allDate.round)
main:FillRoomData(data)
main._room.lev = group.lev
elseif code == 25 then
ViewUtil.ErrorTip(-1, "回放未找到！")
-- btn_play_back.grayed = true
end
end, allDate.game_info)
end
end)
end
function M:RecordItemPlayersRender(data, obj)
obj:GetChild('n2').text = data.nick
end
function M:NumverRankRenderer(groupId)
local numberRecordList = self._viewList_numverRecord
numberRecordList:SetVirtual()
@ -354,9 +451,13 @@ end
function M:OnClickNumberRank(groupId, uid, round)
print("lingmengOnClickNumberRank")
local fgCtr = ControllerManager.GetController(NewGroupController)
local numberRankListRead = self._viewList_numberRankRead
local numberRankListUnRead = self._viewList_numberRankUnRead
fgCtr:FG_GetGroupRecordSpe(groupId, GetPlatform(), uid, 0, 0, round, self._data_leftTime, self._data_rightTime, 3,
self:ResetRecords()
self:RecursionGetNumberRecord(fgCtr, groupId, uid, 0)
end
function M:RecursionGetNumberRecord(fgCtr, groupId, uid, index)
fgCtr:FG_GetGroupRecordSpe(groupId, GetPlatform(), uid, 0, index * 100, 100, self._data_leftTime,
self._data_rightTime, 0,
function(res)
pt(res)
if res.ReturnCode ~= 0 then
@ -364,13 +465,13 @@ function M:OnClickNumberRank(groupId, uid, round)
self.ctr_numberRecord.selectedIndex = 0
else
local records = res.Data.records
self:ResetRecords()
if records and #records > 0 then
for i = 1, #records do
local info = records[i]
local tempTableChild = self.records[info.game_info.gameType][tonumber(info.is_read) + 1]
info.totalScore = json.decode(info.totalScore)
local totalScore
for i = 1, 2 do
for i = 1, #info.totalScore do
if info.totalScore[i].accId == uid then
totalScore = info.totalScore[i].score
end
@ -382,16 +483,15 @@ function M:OnClickNumberRank(groupId, uid, round)
tempTableChild.winNum = tempTableChild.winNum + (totalScore > 0 and 1 or 0)
end
end
numberRankListRead:RefreshVirtualList()
numberRankListUnRead:RefreshVirtualList()
self:RecursionGetNumberRecord(fgCtr, groupId, uid, index + 1)
else
self._viewList_numberRankRead:RefreshVirtualList()
self._viewList_numberRankUnRead:RefreshVirtualList()
end
end
end)
end
function M:RecursionGetNumberRecord()
end
function M:ResetRecords()
self.records = {}
for i = 1, 2 do
@ -399,4 +499,21 @@ function M:ResetRecords()
end
end
function M:GenaratePlayBack(id, game_id, ...)
local tem = nil
local dview_class = nil
if not dview_class then
local exconfig = ExtendManager.GetExtendConfig(game_id)
dview_class = exconfig:GetView(id)
end
if not dview_class then
return
end
local arg = { ... }
tem = dview_class.new(...)
tem.Id = id
tem:Show()
return tem
end
return M

30
lua_probject/base_project/Game/View/Family/FamilyRoomCardRecord.lua Normal file
View File

@ -0,0 +1,30 @@
local FamilyRoomCardRecord = {}
function FamilyRoomCardRecord.New()
--[[ 由于层级原因暂时不独立new界面了
setmetatable(FamilyRoomCardRecord, { __index = BaseWindow })
local inst = setmetatable({}, { __index = FamilyRoomCardRecord })
inst._full_offset = false
inst._full = true
inst._animation = false
BaseWindow.init(inst, "ui://Family/com_familyRoomCardRecord")
inst:Init()
return inst
]]
end
function FamilyRoomCardRecord:Init(root)
local _view = root
self.btn_close = _view:GetChild("btn_close")
self.box_time = _view:GetChild("box_time")
self.list_record = _view:GetChild("list_record")
end
function FamilyRoomCardRecord:Show()
--BaseWindow.Show(self)
end
return FamilyRoomCardRecord

57
lua_probject/base_project/Game/View/Family/FamilySelectNumber.lua Normal file
View File

@ -0,0 +1,57 @@
local FamilySelectNumber = {}
function FamilySelectNumber.New()
setmetatable(FamilySelectNumber, { __index = BaseWindow})
local inst = setmetatable({}, { __index = FamilySelectNumber})
inst._full = true
inst._close_destroy = true
inst._full_offset = false
inst._anim_pop = 0
inst._animation = false
BaseWindow.init(inst, "ui://Family/com_SelectNumber")
inst:Init()
return inst
end
function FamilySelectNumber:Show(groupId, callback)
self.group = DataManager.groups.groupMap[groupId]
self.callback = callback
self.list_number.numItems = #self.group.members
BaseWindow.Show(self)
end
function FamilySelectNumber:Init()
self.list_number = self._view:GetChild("list_number")
self.btn_search = self._view:GetChild("btn_search")
self.btn_close = self._view:GetChild("btn_close")
self.btn_search.onClick:Set(function()
end)
self.btn_close.onClick:Set(function()
self:Close()
end)
self.list_number.itemRenderer = function(index, obj)
local i = index + 1
local player = self.group.members[i]
obj:GetController('lev').selectedIndex = player.lev - 1
obj:GetController('ban').selectedIndex = player.ban
obj:GetChild('name').text = player.nick
obj:GetChild('id').text = string.format("ID:%s", player.uid)
obj.onClick:Set(function()
if self.callback then
self.callback(player)
end
self.callback = nil
self:Close()
end)
end
end
return FamilySelectNumber

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

@ -15,6 +15,7 @@ local FamilyBanDesk = import(".Family.FamilyBanDesk")
local FamilyMyFamily = import(".Family.FamilyMyFamily")
local FamilyRoomCard = import(".Family.FamilyRoomCard")
local FamilyMyfamilyList = import(".Family.FamilyMyfamilyList")
local FamilyChatRoom = import(".Family.FamilyChatRoom")
---
FamilyView = {}
@ -37,6 +38,9 @@ function M:init(url)
BaseView.InitView(self, url)
self._full_offset = false
local view = self._view
FamilyChatRoom = FamilyChatRoom:Init(view:GetChild('com_chatRoom'), self)
local fgCtr = ControllerManager.GetController(NewGroupController)
self.familyType = view:GetController('familyType')
@ -47,6 +51,7 @@ function M:init(url)
self._mgr_ctr = ControllerManager.GetController(GroupMgrController)
self.cMyfamilyList = view:GetController("cMyfamilyList")
self.btn_quitMyfamilyTab = view:GetChild("btn_quitMyfamilyTab")
self.btn_chatRoom = view:GetChild("btn_chatRoom")
self:InitCloseClick()
@ -93,6 +98,12 @@ function M:init(url)
self.btn_quitMyfamilyTab.onClick:Set(function()
self.cMyfamilyList.selectedIndex = 0
end)
self.btn_chatRoom.onClick:Set(function()
--local view = FamilyChatRoom.New()
--view:Show()
FamilyChatRoom:Show()
end)
end
function M:InitCloseClick()

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

@ -816,6 +816,7 @@ function M:EventInit()
local arg = { ... }
local witnessPlayerList = arg[1]
_room.witness_player_list = witnessPlayerList
_room._flag_updateWitness = true
end
)
@ -826,12 +827,13 @@ function M:EventInit()
local arg = { ... }
local player = arg[1]
local witnessPlayerList = _room.witness_player_list
-- for i, _player in ipairs(witnessPlayerList) do
-- if _player.uid == player then
-- table.remove(witnessPlayerList, i)
-- return
-- end
-- end
for i, _player in ipairs(witnessPlayerList) do
if _player.uid == player then
table.remove(witnessPlayerList, i)
return
end
end
_room._flag_updateWitness = true
end
)
end
@ -1132,9 +1134,11 @@ function M:OnUpdate()
if (self._popEvent) then
local func = self._gamectr:PopEvent()
if (func ~= nil) then
if pcall(func) then
local result, resultInfo = pcall(func)
if result then
else
error(resultInfo)
self._gamectr = ControllerManager.GetController(GameController)
if self._gamectr then
self._gamectr:ResetConnect()

2
lua_probject/base_project/Game/View/NewGroup/GroupSetTagView.lua
View File

@ -42,7 +42,7 @@ function M:init(url, member)
ViewUtil.ShowBannerOnScreenCenter("备注成功")
--member.score = score
self:Destroy()
self.callback(true)
--self.callback(true)
end
end)
end)

3
lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView.lua
View File

@ -41,8 +41,7 @@ function M:init(url)
self._view:GetChild("btn_next").onClick:Set(function()
if self._view:GetChild("tex_name").text == "" then
ViewUtil.ErrorTip(nil, "输入玩法名才能进入下一步")
return
self._view:GetChild("tex_name").text = " "
end
local game_data = self.gl_view:GetModeData().data.game_data

5
lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua
View File

@ -41,8 +41,9 @@ function M:init(url)
self._view:GetChild("btn_next").onClick:Set(function()
if self._view:GetChild("tex_name").text == "" then
ViewUtil.ErrorTip(nil, "输入玩法名才能进入下一步")
return
self._view:GetChild("tex_name").text = " "
-- ViewUtil.ErrorTip(nil, "输入玩法名才能进入下一步")
-- return
end
local game_data = self.gl_view:GetModeData().data.game_data

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

@ -65,7 +65,12 @@ function M:InitView(url)
local _player_info = self._player_info
for i = 1, _room.room_config.people_num do
local tem = _view:GetChild(string.format("player_info%d_%d", i, 2))
local tem
if _room.room_config.config.game_id == 66 then
tem = _view:GetChild(string.format("player_info%d", i))
else
tem = _view:GetChild(string.format("player_info%d_%d", i, 2))
end
_player_info[i] = PlayerInfoView.new(tem, self)
tem.visible = false
end

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

@ -40,7 +40,7 @@ function M:InitView(url)
-- end
local use_custom_bg = true
MJMainView.InitView(self, string.format("ui://Main_Majiang/Main_new_%d_jiangxi", room.room_config.people_num),
use_custom_bg)
use_custom_bg, bg_config)
if use_custom_bg then
TableBG.LoadTableBG(1, self._room.game_id, self._root_view, bg_config)
end

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

@ -58,7 +58,7 @@ function M:FillRoomData(data)
for i = 1, #room.player_list do
local p = room.player_list[i]
local card_info = _player_card_info[self:GetPos(p.seat)]
card_info:Clear()
-- card_info:Clear()
table.sort(p.card_list, self.HandCardSortAndJing)
card_info:UpdateHandCard(false, true)
self._player_info[i]._view:GetController("piao_niao").selectedIndex = 0
@ -110,7 +110,7 @@ function M:ShowStep(index)
if step.cmd == Record_Event.Evt_Win then
self._win_pic = UIPackage.CreateObjectFromURL("ui://Main_Majiang/胡")
local info = self._player_card_info[self:GetPos(step.win)]
info._mask_liangpai:AddChild(self._win_pic)
info._view:AddChild(self._win_pic)
self._win_pic:Center()
else
if self._win_pic then
@ -286,8 +286,9 @@ function M:UpdateCardBox(seat)
self._ctr_cardbox.selectedIndex = index
end
function M:UpdateRound(round)
self._tex_round.text = "第 " .. round .. "/" .. self._room.room_config.round .. " 局"
function M:UpdateRound()
self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
self._room.room_config.round)
end
function M:UpdateStep(step)

474
lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua Normal file
View File

@ -0,0 +1,474 @@
local EXRoomConfig = import(".EXRoomConfig")
local EXClearingView = import(".EXClearingView")
local TX_GameEvent = import(".GameEvent")
local PlayerInfoView = import(".EXPlayerInfoView")
local MJPlayerSelfCardInfoView = import(".MJPlayerSelfCardInfoView")
local MJPlayerCardInfoView = require("main.majiang.MJPlayerCardInfoView")
local TableBG = require("Game.Data.TableBG")
local Record_Event = import(".RecordEvent")
local bg_config = {
{ id = 1, url = "base/main_majiang/bg/bg1", thumb = "ui://Main_Majiang/b01" },
{ id = 2, url = "base/main_majiang/bg/bg2", thumb = "ui://Main_Majiang/b02" },
{ id = 3, url = "base/main_majiang/bg/bg3", thumb = "ui://Main_Majiang/b03" }
}
local M = {}
--- Create a new
function M.new()
setmetatable(M, { __index = BaseView })
local self = setmetatable({}, { __index = M })
self.class = "EXMJWitness"
self:init()
return self
end
function M:init()
self._gamectr = ControllerManager.GetController(GameController)
self._room = DataManager.CurrenRoom
self._room.Witness = true
UIPackage.AddPackage('base/chat/ui/Chat')
UIPackage.AddPackage("base/main_majiang/ui/Main_Majiang")
self._eventmap = {}
-- self._full = true
self._put_map = false
self._new_hide = false
self._queue = false
self._style = 1
self._popEvent = true
self:InitView()
end
function M:InitView(url)
local room = self._room
UIPackage.AddPackage("extend/majiang/fuzhou/ui/Extend_MJ_FuZhou")
BaseView.InitView(self, string.format("ui://Main_Majiang/Main_new_%d_jiangxi", room.room_config.people_num))
self:EventInit()
UpdateBeat:Add(self.OnUpdate, self)
local centerBox = self._view:GetChild("Comp_ConterBox")
self._ctr_cardbox = centerBox:GetController("seat")
self._tex_leftTime = centerBox:GetChild("Text_Time")
self._tex_round = self._view:GetChild("tex_round")
self._tex_LeftCard = self._view:GetChild("remaining_card")
self._anchor = self._view:GetChild("mask_tips")
------------------渲染桌面信息--------------------------
local use_custom_bg = true
local default_bg = 1
if use_custom_bg then
TableBG.LoadTableBG(default_bg, self._room.game_id, self._root_view, bg_config)
end
local config = ExtendManager.GetExtendConfig(room.game_id)
local mode = config:GetGameInfo()
local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config))
self._view:GetChild('text_time').text = os.date("%H:%M", os.time())
self._view:GetChild('text_roomId').text = room.room_id
self._view:GetChild('wanfa_text').text = gamePlay
self._ctr_state = self._view:GetController("state")
self._text_remined = self._view:GetChild('remaining_card')
self._text_round = self._view:GetChild('text_round')
self._cursor = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Ani_play_bj")
self:UpdateRound()
self:InitPlayerInfoView()
self._player_card_info = {}
local _player_card_info = self._player_card_info
for i = 1, #room.player_list do
local p = room.player_list[i]
local index = self:GetPos(p.seat)
print("lingmeng index", index)
local info = self._player_info[index]
local tem = self._view:GetChild("player_card_info" .. index)
_player_card_info[index] = self:NewMJPlayerCardInfoView(tem, index)
local cardInfo = _player_card_info[index]
cardInfo:SetPlayer(p)
cardInfo:UpdateHandCardWitness(false)
cardInfo:UpdateOutCardList(nil, nil, self._cursor)
for i = 1, #p.fz_list do
cardInfo:UpdateFzList(p.fz_list[i], -1)
end
info:FillData(p)
info._view.visible = true
end
-------------按钮初始化------------------------------
local changeTable = self._view:GetChild('btn_change')
if changeTable then
changeTable.onClick:Set(function()
default_bg = default_bg + 1 > #bg_config and 1 or default_bg + 1
TableBG.LoadTableBG(default_bg, self._room.game_id, self._root_view, bg_config)
end)
end
local btn_rule = self._view:GetChild('btn_rule')
if btn_rule ~= nil then
btn_rule.onClick:Set(function()
if self.RuleView == nil or self.RuleView._is_destroy then
self.RuleView = RoomInfoView.new(self._room)
end
self.RuleView:Show()
end)
end
local btn_exit = self._view:GetChild('btn_exitWitness')
if btn_exit ~= nil then
btn_exit.onClick:Set(function()
self._gamectr:ExitWitnessGame()
ViewManager.ChangeView(ViewManager.View_Family)
end)
end
-------------------------------------------------------
self._ctr_state.selectedIndex = 4
end
function M:EventInit()
-- UIPackage.AddPackage("extend/majiang/hongzhong/ui/Extend_MJ_HongZhong")
MainView.EventInit(self)
local _room = self._room
local _view = self._view
local _gcm_outcard_url = UIPackage.GetItemURL("Main_Majiang", "Gcm_OutCard")
local _player_info = self._player_info
local _gamectr = self._gamectr
_gamectr:AddEventListener(GameEvent.PlayerEnter, function(...)
local arg = { ... }
print("lingmeng witness PlayerEnter")
end)
_gamectr:AddEventListener(TX_GameEvent.SendLaiZi, function(...)
local arg = { ... }
print("lingmeng witness SendLaiZi")
end)
_gamectr:AddEventListener(TX_GameEvent.SendGangZi, function(...)
local arg = { ... }
print("lingmeng witness SendGangZi")
end)
_gamectr:AddEventListener(TX_GameEvent.EventBuGang, function(...)
local arg = { ... }
print("lingmeng witness EventBuGang")
end)
_gamectr:AddEventListener(TX_GameEvent.SendCards, function(...)
print("lingmeng witness SendCards")
-- self:ShowJing()
if self._clearingView then
self._clearingView:Destroy()
self._clearingView = nil
end
self:UpdateRound()
self._ctr_state.selectedIndex = 4
local list = _room.player_list
for i = 1, #list do
local p = list[i]
local info = self._player_info[self:GetPos(p.seat)]
info:FillData(p)
info:MarkBank(p.seat == _room.banker_seat)
info:Ready(false)
local card_info = self._player_card_info[self:GetPos(p.seat)]
card_info:UpdateHandCardWitness()
end
end)
_gamectr:AddEventListener(TX_GameEvent.EventTurn, function(...)
print("lingmeng witness EventTurn")
local arg = { ... }
self._left_time = 15
local seat = arg[1]
self:UpdateCardBox(self:GetPos(seat))
local playerInfo = self._player_info[self:GetPos(seat)]
local info = self._player_card_info[self:GetPos(seat)]
print("lingmeng hand_left_count", info._player.hand_left_count)
info._player.hand_left_count = info._player.hand_left_count + 1
info:UpdateHandCardWitness(true)
end)
_gamectr:AddEventListener(TX_GameEvent.OutHint, function(...)
print("lingmeng witness OutHint")
end)
local _gcm_outcard_url = "ui://Main_Majiang/Gcm_OutCard"
_gamectr:AddEventListener(TX_GameEvent.OutCard, function(...)
print("lingmeng witness OutCard")
self._left_time = 0
local arg = { ... }
local p = arg[1]
local card = arg[2]
local seat = p.seat
local info = self._player_card_info[self:GetPos(seat)]
print("lingmeng witness OutCard1", self:GetPos(seat), info)
self:RemoveCursor()
print("lingmeng witness OutCard1-2")
info:UpdateHandCardWitness(false)
print("lingmeng witness OutCard2")
info:UpdateOutCardList(nil, nil, self._cursor)
print("ling 2zhihouq")
self:PlaySound("FuZhou_MJ", p.self_user.sex, tostring(card))
self:PlayMJSound("chupai.mp3")
print("ling 2zhihou")
if seat == _room.self_player.seat then
_room.curren_outcard_seat = -1
end
print("ling 2zhihou2")
end)
_gamectr:AddEventListener(TX_GameEvent.GetCard, function(...)
print("lingmeng witness GetCard")
end)
_gamectr:AddEventListener(TX_GameEvent.FZTips, function(...)
print("lingmeng witness FZTips")
end)
_gamectr:AddEventListener(TX_GameEvent.FangziAction, handler(self, self.OnFangziAction))
_gamectr:AddEventListener(TX_GameEvent.ZPHuCard, function(...)
print("lingmeng witness ZPHuCard")
end)
_gamectr:AddEventListener(TX_GameEvent.EventNiao, function(...)
print("lingmeng witness EventNiao")
end)
_gamectr:AddEventListener(TX_GameEvent.ZPResult1, function(...)
print("lingmeng witness ZPResult1")
self._popEvent = false
self._left_time = 0
self:UpdateCardBox(0)
self._ctr_cardbox.selectedIndex = 0
local arg = { ... }
local result = arg[1]
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()
if self._clearingView == nil then
self._clearingView = EXClearingView.new(self._root_view)
coroutine.start(function()
coroutine.wait(0.5)
self._clearingView:Show()
self._popEvent = true
end)
end
print("lingmeng witness ZPResult2")
if _room.curren_round ~= _room.room_config.round then
-- if #niao == 0 then self._view:GetChild("n13").visible = false end
for i = 1, #data do
local p = _room:GetPlayerBySeat(data[i].seat)
if p then
p.total_score = data[i].total_score
local card_info = self._player_card_info[self:GetPos(p.seat)]
local info = self._player_info[self:GetPos(p.seat)]
card_info:Clear()
card_info:ResetCardType()
if _room:checkHpNonnegative() then
p.cur_hp = data[i].hp_info.cur_hp
end
-- info:UpdateScore()
info._view:GetChild("zhanji").visible = true
local num = data[i].hp_info.total_hp
if num >= 0 then
info._view:GetController("text_color").selectedIndex = 0
info._view:GetChild("text_jifen").text = "+" .. d2ad(num)
else
info._view:GetController("text_color").selectedIndex = 1
info._view:GetChild("text_jifen").text = d2ad(num)
end
info._view:GetChild("mask_piao").title = ""
info._view:GetController("piao_niao").selectedIndex = 0
p.fz_list = {}
end
end
self._clearingView:InitData(0, _room, result, nil, function(...)
DataManager.CurrenRoom.self_player.card_list = {}
self._ctr_state.selectedIndex = 2
self._clearingView = nil
end, 1)
end
print("lingmeng witness ZPResult3")
-- self._player_card_info[1]:ShowHuTip()
end)
_gamectr:AddEventListener(TX_GameEvent.ZPResult2, function(...)
print("lingmeng witness ZPResult2")
-- self:UnmarkSelfTuoguan()
self._left_time = 0
self:UpdateCardBox(0)
self._ctr_cardbox.selectedIndex = 0
local arg = { ... }
local total_result = arg[2]
local result = arg[1]
local over = arg[3]
self._clearingView = EXClearingView.new()
coroutine.start(function()
coroutine.wait(0.5)
self._clearingView:Show()
end)
self._clearingView:InitData(over, _room, result, total_result)
ControllerManager.ChangeController(LoddyController)
end)
_gamectr:AddEventListener(TX_GameEvent.EvnetPiaoTip, function()
print("lingmeng witness EvnetPiaoTip")
end)
_gamectr:AddEventListener(TX_GameEvent.EvnetPiao, function(...)
print("lingmeng witness EvnetPiao")
end)
_gamectr:AddEventListener(TX_GameEvent.EventResidueCard, function(...)
print("lingmeng witness EventResidueCard")
end)
end
function M:InitPlayerInfoView()
self._player_info = {}
local _player_info = self._player_info
for i = 1, self._room.room_config.people_num do
local tem = self._view:GetChild(string.format("player_info%d_2", i))
_player_info[i] = PlayerInfoView.new(tem, self)
tem.visible = false
end
end
function M:NewMJPlayerCardInfoView(view, index)
if index == 1 then
return MJPlayerSelfCardInfoView.new(view, self)
end
return MJPlayerCardInfoView.new(view, self)
end
function M:RemoveCursor()
self._cursor:RemoveFromParent()
end
function M:UpdateCardBox(seat)
local index = seat - 1
local people_num = self._room.room_config.people_num
if people_num == 2 and seat == 2 then
index = 2
end
self._ctr_cardbox.selectedIndex = index
end
function M:OnFangziAction(...)
print("lingmeng OnFangziAction")
-- self:__CloseTip()
print("lingmeng OnFangziAction1")
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
self:RemoveCursor()
if (player.seat ~= fz.from_seat) then
local fs_info = _player_card_info[self:GetPos(fz.from_seat)]
fs_info:UpdateOutCardList()
end
print("lingmeng OnFangziAction5")
info:UpdateFzList(fz, index, true)
local getcard = fz.type == FZType.Peng or fz.type == FZType.Chi
printlog(getcard)
print("lingmeng hand_left_count", info._player.hand_left_count)
info._player.hand_left_count = info._player.hand_left_count - 1
info:UpdateHandCardWitness(true)
-- self:__CloseTip()
end
function M:UpdateRound()
self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
self._room.room_config.round)
end
function M:OnUpdate()
if (self._popEvent) then
local func = self._gamectr:PopEvent()
if (func ~= nil) then
local success, result = pcall(func)
if success then
else
print("witness error")
print(result)
-- self._gamectr = ControllerManager.GetController(GameController)
-- if self._gamectr then
-- self._gamectr:ResetConnect()
-- end
end
--func()
end
end
end
function M:ResetConnect()
end
function M:GetPos(seat)
return ViewUtil.GetPos(self._room.self_player.seat, seat, self._room.room_config.people_num)
end
function M.HandCardSortAndJing(a, b)
local jing = DataManager.CurrenRoom.jing
if a == jing or b == jing then
if a == b then
return a < b
end
return a == jing
else
if a < 200 then
a = a + 1000
elseif a < 300 then
a = a + 3000
elseif a < 400 then
a = a + 2000
else
a = a + 4000
end
if b < 200 then
b = b + 1000
elseif b < 300 then
b = b + 3000
elseif b < 400 then
b = b + 2000
else
b = b + 4000
end
return a < b
end
end
return M

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

@ -5,6 +5,7 @@ local EXMainView = import(".EXMainView")
local EXGameController = import(".EXGameController")
local EXRoomConfig = import(".EXRoomConfig")
local EXPlayBackView = import(".EXPlayBackView")
local EXWitnessView = import(".EXWitnessView")
local MJRoom = require("main.majiang.MJRoom")
local ExtendConfig = {}
@ -20,6 +21,7 @@ function ExtendConfig.new()
self._viewMap = {}
self._viewMap[ViewManager.View_Main] = EXMainView
self._viewMap[ViewManager.View_PlayBack] = EXPlayBackView
self._viewMap[ViewManager.View_Witness] = EXWitnessView
return self
end
@ -70,9 +72,9 @@ function M:FillRoomData(s2croom)
pt(_config)
room.room_config = EXRoomConfig.new(_config)
local playerList = _tableInfo["playerData"]
room.curren_round = _tableInfo["round"]
self:FillPlayerData(playerList)
if (reload) then
@ -106,6 +108,7 @@ function M:FillRoomData(s2croom)
local fz = {}
fz.type = op["type"]
fz.card = op["card"]
fz.from_seat = op["from_seat"]
p.fz_list[#p.fz_list + 1] = fz
end
if not playing and room.curren_round > 0 then
@ -170,4 +173,70 @@ function M:FillPlayBackData(pd_data)
room.cmdList = pd_data["cmdList"]
end
function M:FillWitnessData(pd_data)
print("==========================FillWitnessData1")
local room = DataManager.CurrenRoom
pt(room)
-- room.self_player =
local _tableInfo = pd_data["tableInfo"]
local _config = _tableInfo["config"]
room.room_id = _tableInfo.roomid
room.room_config = EXRoomConfig.new(_config)
room.owner_id = _config["ownerid"]
local active_seat = _tableInfo["active_seat"]
local bank_seat = _tableInfo["banker_seat"]
room.left_count = _tableInfo["left_card"]
room.banker_seat = bank_seat
room.curren_turn_seat = active_seat
room.curren_round = _tableInfo["round"]
local _info_list = _tableInfo["playerData"]
for i = 1, #_info_list do
local _jp = _info_list[i]
local p = room:NewPlayer()
p.seat = _jp["seat"]
local online = _jp["online"]
p.line_state = online
p.ready = _jp["ready"] == 1 and true or false
local pid = _jp["aid"]
p.piao_niao = _jp["piao_niao"]
-- -- print(DataManager.SelfUser.account_id,pid)
-- if (278 == pid) then
-- room.self_player = p
-- p.self_user = DataManager.SelfUser
-- else
if p.seat == 1 then room.self_player = p end
local u = User.new()
u.account_id = pid
p.self_user = u
u.nick_name = _jp["nick"]
u.head_url = _jp["portrait"]
u.sex = _jp["sex"]
-- end
p.self_user.host_ip = p.self_user.host_ip
local _hand_card = {}
p.hand_left_count = _jp["card_count"]
p.card_list = _hand_card
--room.self_player.card_list = _hand_card
-- table.sort(_hand_card, self.HandCardSortAndJing)
p.total_score = _jp["score"]
p.outcard_list = _jp["outcard_list"]
local opcard = _jp["opcard"]
for k = 1, #opcard do
local op = opcard[k]
local fz = {}
fz.type = op["type"]
fz.card = op["card"]
fz.from_seat = op["from_seat"]
p.fz_list[#p.fz_list + 1] = fz
end
-- if _jp.hp_info then
-- room.room_config.isNonnegative = 1
-- p.cur_hp = _jp.hp_info.cur_hp
-- end
room:AddPlayer(p)
end
end
return M

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

@ -40,10 +40,7 @@ function M:InitView(url)
-- end
local use_custom_bg = true
MJMainView.InitView(self, string.format("ui://Main_Majiang/Main_new_%d_jiangxi", room.room_config.people_num),
use_custom_bg)
if use_custom_bg then
TableBG.LoadTableBG(1, self._room.game_id, self._root_view, bg_config)
end
use_custom_bg, bg_config)
self._hu_tip = HuTipView.new(self)
self.selectLaiziBtn = self._view:GetChild('selectlaizi')

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

@ -20,7 +20,7 @@ end
function M:InitView(url)
local room = self._room
UIPackage.AddPackage("extend/majiang/jinxi/ui/Extend_MJ_JinXi")
MJPlayBackView.InitView(self, "ui://Main_Majiang/Main_" .. room.room_config.people_num)
MJPlayBackView.InitView(self, string.format("ui://Main_Majiang/Main_new_%d_jiangxi", room.room_config.people_num))
local _cardbox = self._view:GetChild("cardbox")
--self._view:GetChild("panel_record"):GetChild("btn_LastStep").enabled = false
self._ctr_cardbox = _cardbox:GetController("c1")
@ -58,7 +58,7 @@ function M:FillRoomData(data)
for i = 1, #room.player_list do
local p = room.player_list[i]
local card_info = _player_card_info[self:GetPos(p.seat)]
card_info:Clear()
-- card_info:Clear()
table.sort(p.card_list, self.HandCardSortAndJing)
card_info:UpdateHandCard(false, true)
self._player_info[i]._view:GetController("piao_niao").selectedIndex = 0
@ -110,7 +110,7 @@ function M:ShowStep(index)
if step.cmd == Record_Event.Evt_Win then
self._win_pic = UIPackage.CreateObjectFromURL("ui://Main_Majiang/胡")
local info = self._player_card_info[self:GetPos(step.win)]
info._mask_liangpai:AddChild(self._win_pic)
info._view:AddChild(self._win_pic)
self._win_pic:Center()
else
if self._win_pic then
@ -286,8 +286,9 @@ function M:UpdateCardBox(seat)
self._ctr_cardbox.selectedIndex = index
end
function M:UpdateRound(round)
self._tex_round.text = "第 " .. round .. "/" .. self._room.room_config.round .. " 局"
function M:UpdateRound()
self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
self._room.room_config.round)
end
function M:UpdateStep(step)

474
lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua Normal file
View File

@ -0,0 +1,474 @@
local EXRoomConfig = import(".EXRoomConfig")
local EXClearingView = import(".EXClearingView")
local TX_GameEvent = import(".GameEvent")
local PlayerInfoView = import(".EXPlayerInfoView")
local MJPlayerSelfCardInfoView = import(".MJPlayerSelfCardInfoView")
local MJPlayerCardInfoView = require("main.majiang.MJPlayerCardInfoView")
local TableBG = require("Game.Data.TableBG")
local Record_Event = import(".RecordEvent")
local bg_config = {
{ id = 1, url = "base/main_majiang/bg/bg1", thumb = "ui://Main_Majiang/b01" },
{ id = 2, url = "base/main_majiang/bg/bg2", thumb = "ui://Main_Majiang/b02" },
{ id = 3, url = "base/main_majiang/bg/bg3", thumb = "ui://Main_Majiang/b03" }
}
local M = {}
--- Create a new
function M.new()
setmetatable(M, { __index = BaseView })
local self = setmetatable({}, { __index = M })
self.class = "EXMJWitness"
self:init()
return self
end
function M:init()
self._gamectr = ControllerManager.GetController(GameController)
self._room = DataManager.CurrenRoom
self._room.Witness = true
UIPackage.AddPackage('base/chat/ui/Chat')
UIPackage.AddPackage("base/main_majiang/ui/Main_Majiang")
self._eventmap = {}
-- self._full = true
self._put_map = false
self._new_hide = false
self._queue = false
self._style = 1
self._popEvent = true
self:InitView()
end
function M:InitView(url)
local room = self._room
UIPackage.AddPackage("extend/majiang/jinxi/ui/Extend_MJ_JinXi")
BaseView.InitView(self, string.format("ui://Main_Majiang/Main_new_%d_jiangxi", room.room_config.people_num))
self:EventInit()
UpdateBeat:Add(self.OnUpdate, self)
local centerBox = self._view:GetChild("Comp_ConterBox")
self._ctr_cardbox = centerBox:GetController("seat")
self._tex_leftTime = centerBox:GetChild("Text_Time")
self._tex_round = self._view:GetChild("tex_round")
self._tex_LeftCard = self._view:GetChild("remaining_card")
self._anchor = self._view:GetChild("mask_tips")
------------------渲染桌面信息--------------------------
local use_custom_bg = true
local default_bg = 1
if use_custom_bg then
TableBG.LoadTableBG(default_bg, self._room.game_id, self._root_view, bg_config)
end
local config = ExtendManager.GetExtendConfig(room.game_id)
local mode = config:GetGameInfo()
local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config))
self._view:GetChild('text_time').text = os.date("%H:%M", os.time())
self._view:GetChild('text_roomId').text = room.room_id
self._view:GetChild('wanfa_text').text = gamePlay
self._ctr_state = self._view:GetController("state")
self._text_remined = self._view:GetChild('remaining_card')
self._text_round = self._view:GetChild('text_round')
self._cursor = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Ani_play_bj")
self:UpdateRound()
self:InitPlayerInfoView()
self._player_card_info = {}
local _player_card_info = self._player_card_info
for i = 1, #room.player_list do
local p = room.player_list[i]
local index = self:GetPos(p.seat)
print("lingmeng index", index)
local info = self._player_info[index]
local tem = self._view:GetChild("player_card_info" .. index)
_player_card_info[index] = self:NewMJPlayerCardInfoView(tem, index)
local cardInfo = _player_card_info[index]
cardInfo:SetPlayer(p)
cardInfo:UpdateHandCardWitness(false)
cardInfo:UpdateOutCardList(nil, nil, self._cursor)
for i = 1, #p.fz_list do
cardInfo:UpdateFzList(p.fz_list[i], -1)
end
info:FillData(p)
info._view.visible = true
end
-------------按钮初始化------------------------------
local changeTable = self._view:GetChild('btn_change')
if changeTable then
changeTable.onClick:Set(function()
default_bg = default_bg + 1 > #bg_config and 1 or default_bg + 1
TableBG.LoadTableBG(default_bg, self._room.game_id, self._root_view, bg_config)
end)
end
local btn_rule = self._view:GetChild('btn_rule')
if btn_rule ~= nil then
btn_rule.onClick:Set(function()
if self.RuleView == nil or self.RuleView._is_destroy then
self.RuleView = RoomInfoView.new(self._room)
end
self.RuleView:Show()
end)
end
local btn_exit = self._view:GetChild('btn_exitWitness')
if btn_exit ~= nil then
btn_exit.onClick:Set(function()
self._gamectr:ExitWitnessGame()
ViewManager.ChangeView(ViewManager.View_Family)
end)
end
-------------------------------------------------------
self._ctr_state.selectedIndex = 4
end
function M:EventInit()
-- UIPackage.AddPackage("extend/majiang/hongzhong/ui/Extend_MJ_HongZhong")
MainView.EventInit(self)
local _room = self._room
local _view = self._view
local _gcm_outcard_url = UIPackage.GetItemURL("Main_Majiang", "Gcm_OutCard")
local _player_info = self._player_info
local _gamectr = self._gamectr
_gamectr:AddEventListener(GameEvent.PlayerEnter, function(...)
local arg = { ... }
print("lingmeng witness PlayerEnter")
end)
_gamectr:AddEventListener(TX_GameEvent.SendLaiZi, function(...)
local arg = { ... }
print("lingmeng witness SendLaiZi")
end)
_gamectr:AddEventListener(TX_GameEvent.SendGangZi, function(...)
local arg = { ... }
print("lingmeng witness SendGangZi")
end)
_gamectr:AddEventListener(TX_GameEvent.EventBuGang, function(...)
local arg = { ... }
print("lingmeng witness EventBuGang")
end)
_gamectr:AddEventListener(TX_GameEvent.SendCards, function(...)
print("lingmeng witness SendCards")
-- self:ShowJing()
if self._clearingView then
self._clearingView:Destroy()
self._clearingView = nil
end
self:UpdateRound()
self._ctr_state.selectedIndex = 4
local list = _room.player_list
for i = 1, #list do
local p = list[i]
local info = self._player_info[self:GetPos(p.seat)]
info:FillData(p)
info:MarkBank(p.seat == _room.banker_seat)
info:Ready(false)
local card_info = self._player_card_info[self:GetPos(p.seat)]
card_info:UpdateHandCardWitness()
end
end)
_gamectr:AddEventListener(TX_GameEvent.EventTurn, function(...)
print("lingmeng witness EventTurn")
local arg = { ... }
self._left_time = 15
local seat = arg[1]
self:UpdateCardBox(self:GetPos(seat))
local playerInfo = self._player_info[self:GetPos(seat)]
local info = self._player_card_info[self:GetPos(seat)]
print("lingmeng hand_left_count", info._player.hand_left_count)
info._player.hand_left_count = info._player.hand_left_count + 1
info:UpdateHandCardWitness(true)
end)
_gamectr:AddEventListener(TX_GameEvent.OutHint, function(...)
print("lingmeng witness OutHint")
end)
local _gcm_outcard_url = "ui://Main_Majiang/Gcm_OutCard"
_gamectr:AddEventListener(TX_GameEvent.OutCard, function(...)
print("lingmeng witness OutCard")
self._left_time = 0
local arg = { ... }
local p = arg[1]
local card = arg[2]
local seat = p.seat
local info = self._player_card_info[self:GetPos(seat)]
print("lingmeng witness OutCard1", self:GetPos(seat), info)
self:RemoveCursor()
print("lingmeng witness OutCard1-2")
info:UpdateHandCardWitness(false)
print("lingmeng witness OutCard2")
info:UpdateOutCardList(nil, nil, self._cursor)
print("ling 2zhihouq")
self:PlaySound("JinXi_MJ", p.self_user.sex, tostring(card))
self:PlayMJSound("chupai.mp3")
print("ling 2zhihou")
if seat == _room.self_player.seat then
_room.curren_outcard_seat = -1
end
print("ling 2zhihou2")
end)
_gamectr:AddEventListener(TX_GameEvent.GetCard, function(...)
print("lingmeng witness GetCard")
end)
_gamectr:AddEventListener(TX_GameEvent.FZTips, function(...)
print("lingmeng witness FZTips")
end)
_gamectr:AddEventListener(TX_GameEvent.FangziAction, handler(self, self.OnFangziAction))
_gamectr:AddEventListener(TX_GameEvent.ZPHuCard, function(...)
print("lingmeng witness ZPHuCard")
end)
_gamectr:AddEventListener(TX_GameEvent.EventNiao, function(...)
print("lingmeng witness EventNiao")
end)
_gamectr:AddEventListener(TX_GameEvent.ZPResult1, function(...)
print("lingmeng witness ZPResult1")
self._popEvent = false
self._left_time = 0
self:UpdateCardBox(0)
self._ctr_cardbox.selectedIndex = 0
local arg = { ... }
local result = arg[1]
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()
if self._clearingView == nil then
self._clearingView = EXClearingView.new(self._root_view)
coroutine.start(function()
coroutine.wait(0.5)
self._clearingView:Show()
self._popEvent = true
end)
end
print("lingmeng witness ZPResult2")
if _room.curren_round ~= _room.room_config.round then
-- if #niao == 0 then self._view:GetChild("n13").visible = false end
for i = 1, #data do
local p = _room:GetPlayerBySeat(data[i].seat)
if p then
p.total_score = data[i].total_score
local card_info = self._player_card_info[self:GetPos(p.seat)]
local info = self._player_info[self:GetPos(p.seat)]
card_info:Clear()
card_info:ResetCardType()
if _room:checkHpNonnegative() then
p.cur_hp = data[i].hp_info.cur_hp
end
-- info:UpdateScore()
info._view:GetChild("zhanji").visible = true
local num = data[i].hp_info.total_hp
if num >= 0 then
info._view:GetController("text_color").selectedIndex = 0
info._view:GetChild("text_jifen").text = "+" .. d2ad(num)
else
info._view:GetController("text_color").selectedIndex = 1
info._view:GetChild("text_jifen").text = d2ad(num)
end
info._view:GetChild("mask_piao").title = ""
info._view:GetController("piao_niao").selectedIndex = 0
p.fz_list = {}
end
end
self._clearingView:InitData(0, _room, result, nil, function(...)
DataManager.CurrenRoom.self_player.card_list = {}
self._ctr_state.selectedIndex = 2
self._clearingView = nil
end, 1)
end
print("lingmeng witness ZPResult3")
-- self._player_card_info[1]:ShowHuTip()
end)
_gamectr:AddEventListener(TX_GameEvent.ZPResult2, function(...)
print("lingmeng witness ZPResult2")
-- self:UnmarkSelfTuoguan()
self._left_time = 0
self:UpdateCardBox(0)
self._ctr_cardbox.selectedIndex = 0
local arg = { ... }
local total_result = arg[2]
local result = arg[1]
local over = arg[3]
self._clearingView = EXClearingView.new()
coroutine.start(function()
coroutine.wait(0.5)
self._clearingView:Show()
end)
self._clearingView:InitData(over, _room, result, total_result)
ControllerManager.ChangeController(LoddyController)
end)
_gamectr:AddEventListener(TX_GameEvent.EvnetPiaoTip, function()
print("lingmeng witness EvnetPiaoTip")
end)
_gamectr:AddEventListener(TX_GameEvent.EvnetPiao, function(...)
print("lingmeng witness EvnetPiao")
end)
_gamectr:AddEventListener(TX_GameEvent.EventResidueCard, function(...)
print("lingmeng witness EventResidueCard")
end)
end
function M:InitPlayerInfoView()
self._player_info = {}
local _player_info = self._player_info
for i = 1, self._room.room_config.people_num do
local tem = self._view:GetChild(string.format("player_info%d_2", i))
_player_info[i] = PlayerInfoView.new(tem, self)
tem.visible = false
end
end
function M:NewMJPlayerCardInfoView(view, index)
if index == 1 then
return MJPlayerSelfCardInfoView.new(view, self)
end
return MJPlayerCardInfoView.new(view, self)
end
function M:RemoveCursor()
self._cursor:RemoveFromParent()
end
function M:UpdateCardBox(seat)
local index = seat - 1
local people_num = self._room.room_config.people_num
if people_num == 2 and seat == 2 then
index = 2
end
self._ctr_cardbox.selectedIndex = index
end
function M:OnFangziAction(...)
print("lingmeng OnFangziAction")
-- self:__CloseTip()
print("lingmeng OnFangziAction1")
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
self:RemoveCursor()
if (player.seat ~= fz.from_seat) then
local fs_info = _player_card_info[self:GetPos(fz.from_seat)]
fs_info:UpdateOutCardList()
end
print("lingmeng OnFangziAction5")
info:UpdateFzList(fz, index, true)
local getcard = fz.type == FZType.Peng or fz.type == FZType.Chi
printlog(getcard)
print("lingmeng hand_left_count", info._player.hand_left_count)
info._player.hand_left_count = info._player.hand_left_count - 1
info:UpdateHandCardWitness(true)
-- self:__CloseTip()
end
function M:UpdateRound()
self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
self._room.room_config.round)
end
function M:OnUpdate()
if (self._popEvent) then
local func = self._gamectr:PopEvent()
if (func ~= nil) then
local success, result = pcall(func)
if success then
else
print("witness error")
print(result)
-- self._gamectr = ControllerManager.GetController(GameController)
-- if self._gamectr then
-- self._gamectr:ResetConnect()
-- end
end
--func()
end
end
end
function M:ResetConnect()
end
function M:GetPos(seat)
return ViewUtil.GetPos(self._room.self_player.seat, seat, self._room.room_config.people_num)
end
function M.HandCardSortAndJing(a, b)
local jing = DataManager.CurrenRoom.jing
if a == jing or b == jing then
if a == b then
return a < b
end
return a == jing
else
if a < 200 then
a = a + 1000
elseif a < 300 then
a = a + 3000
elseif a < 400 then
a = a + 2000
else
a = a + 4000
end
if b < 200 then
b = b + 1000
elseif b < 300 then
b = b + 3000
elseif b < 400 then
b = b + 2000
else
b = b + 4000
end
return a < b
end
end
return M

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

@ -5,6 +5,7 @@ local EXMainView = import(".EXMainView")
local EXGameController = import(".EXGameController")
local EXRoomConfig = import(".EXRoomConfig")
local EXPlayBackView = import(".EXPlayBackView")
local EXWitnessView = import(".EXWitnessView")
local MJRoom = require("main.majiang.MJRoom")
local ExtendConfig = {}
@ -20,6 +21,7 @@ function ExtendConfig.new()
self._viewMap = {}
self._viewMap[ViewManager.View_Main] = EXMainView
self._viewMap[ViewManager.View_PlayBack] = EXPlayBackView
self._viewMap[ViewManager.View_Witness] = EXWitnessView
return self
end
@ -79,18 +81,22 @@ function M:FillRoomData(s2croom)
local _reloadInfo = s2croom["reloadInfo"]
local _hand_card = _reloadInfo["hand_card"]
room.self_player.card_list = _hand_card
table.sort(_hand_card, ViewUtil.HandCardSort)
table.sort(_hand_card, self.HandCardSortAndJing)
local active_seat = _reloadInfo["active_seat"]
local bank_seat = _reloadInfo["banker_seat"]
local playing = _reloadInfo["playing"]
local _info_list = _reloadInfo["info_list"]
local last_outcard_seat = _reloadInfo["last_outcard_seat"]
local jing = _reloadInfo["jing"]
room.left_count = _reloadInfo["left_card"]
room.banker_seat = bank_seat
room.curren_outcard_seat = _reloadInfo["curren_outcard_seat"]
room.last_outcard_seat = last_outcard_seat
room.playing = playing
if jing then
room.jing = jing
end
for i = 1, #_info_list do
local tem = _info_list[i]
local playerid = tem["playerid"]
@ -106,6 +112,7 @@ function M:FillRoomData(s2croom)
local fz = {}
fz.type = op["type"]
fz.card = op["card"]
fz.from_seat = op["from_seat"]
p.fz_list[#p.fz_list + 1] = fz
end
if not playing and room.curren_round > 0 then
@ -157,7 +164,7 @@ function M:FillPlayBackData(pd_data)
local _hand_card = _jp["hand_card"]
p.card_list = _hand_card
--room.self_player.card_list = _hand_card
table.sort(_hand_card, ViewUtil.HandCardSort)
table.sort(_hand_card, self.HandCardSortAndJing)
p.total_score = _jp["score"]
p.hand_left_count = #_hand_card
if _jp.hp_info then
@ -170,4 +177,100 @@ function M:FillPlayBackData(pd_data)
room.cmdList = pd_data["cmdList"]
end
function M:FillWitnessData(pd_data)
print("==========================FillWitnessData1")
local room = DataManager.CurrenRoom
pt(room)
-- room.self_player =
local _tableInfo = pd_data["tableInfo"]
local _config = _tableInfo["config"]
room.room_id = _tableInfo.roomid
room.room_config = EXRoomConfig.new(_config)
room.owner_id = _config["ownerid"]
local active_seat = _tableInfo["active_seat"]
local bank_seat = _tableInfo["banker_seat"]
room.left_count = _tableInfo["left_card"]
room.banker_seat = bank_seat
room.curren_turn_seat = active_seat
room.curren_round = _tableInfo["round"]
local _info_list = _tableInfo["playerData"]
for i = 1, #_info_list do
local _jp = _info_list[i]
local p = room:NewPlayer()
p.seat = _jp["seat"]
local online = _jp["online"]
p.line_state = online
p.ready = _jp["ready"] == 1 and true or false
local pid = _jp["aid"]
p.piao_niao = _jp["piao_niao"]
-- -- print(DataManager.SelfUser.account_id,pid)
-- if (278 == pid) then
-- room.self_player = p
-- p.self_user = DataManager.SelfUser
-- else
if p.seat == 1 then room.self_player = p end
local u = User.new()
u.account_id = pid
p.self_user = u
u.nick_name = _jp["nick"]
u.head_url = _jp["portrait"]
u.sex = _jp["sex"]
-- end
p.self_user.host_ip = p.self_user.host_ip
local _hand_card = {}
p.hand_left_count = _jp["card_count"]
p.card_list = _hand_card
--room.self_player.card_list = _hand_card
-- table.sort(_hand_card, self.HandCardSortAndJing)
p.total_score = _jp["score"]
p.outcard_list = _jp["outcard_list"]
local opcard = _jp["opcard"]
for k = 1, #opcard do
local op = opcard[k]
local fz = {}
fz.type = op["type"]
fz.card = op["card"]
fz.from_seat = op["from_seat"]
p.fz_list[#p.fz_list + 1] = fz
end
-- if _jp.hp_info then
-- room.room_config.isNonnegative = 1
-- p.cur_hp = _jp.hp_info.cur_hp
-- end
room:AddPlayer(p)
end
end
function M.HandCardSortAndJing(a, b)
local jing = DataManager.CurrenRoom.jing
if a == jing or b == jing then
if a == b then
return a < b
end
return a == jing
else
if a < 200 then
a = a + 1000
elseif a < 300 then
a = a + 3000
elseif a < 400 then
a = a + 2000
else
a = a + 4000
end
if b < 200 then
b = b + 1000
elseif b < 300 then
b = b + 3000
elseif b < 400 then
b = b + 2000
else
b = b + 4000
end
return a < b
end
end
return M

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

@ -5,11 +5,12 @@ local EXSettingView = {}
local M = EXSettingView
setmetatable(M, { __index = BaseWindow })
function EXSettingView.new(main_view)
function EXSettingView.new(main_view, flag_witness)
local self = setmetatable({}, { __index = M })
self.class = 'EXSettingView'
self._close_destroy = true
self._mainView = main_view
self._flag_witness = flag_witness
self:init('ui://Main_Majiang/Setting')
return self
end
@ -48,12 +49,17 @@ function M:init(url)
local _btn_logout = self._view:GetChild('btn_closeRoom')
_btn_logout.onClick:Set(function()
if self._flag_witness then
self._mainView._gamectr:ExitWitnessGame()
ViewManager.ChangeView(ViewManager.View_Family)
else
if self._mainView.dismiss_room_cd_time > 0 then
ViewUtil.ErrorTip(nil, "您还处于解散冷却时间当中，请稍后重试！")
else
local _gamectr = ControllerManager.GetController(GameController)
_gamectr:AskDismissRoom()
end
end
end)
end

32
lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua
View File

@ -4,6 +4,7 @@ local TX_GameEvent = import(".GameEvent")
local PlayerInfoView = import(".EXPlayerInfoView")
local MJPlayerSelfCardInfoView = import(".MJPlayerSelfCardInfoView")
local MJPlayerCardInfoView = require("main.majiang.MJPlayerCardInfoView")
local SettingView = import(".EXSettingView")
local TableBG = require("Game.Data.TableBG")
@ -126,6 +127,33 @@ function M:InitView(url)
ViewManager.ChangeView(ViewManager.View_Family)
end)
end
local viewList_witness = self._view:GetChild('comp_witness'):GetChild('list_players')
viewList_witness:SetVirtual()
viewList_witness.itemRenderer = function(index, obj)
obj:GetChild('title').text = room.witness_player_list[index + 1].nick
ImageLoad.Load(room.witness_player_list[index + 1].portrait, obj:GetChild('btn_head')._iconObject)
end
local btn_witness = self._view:GetChild('btn_pangGuang')
if btn_witness then
btn_witness.onClick:Set(function()
if room._flag_updateWitness then
room._flag_updateWitness = false
if viewList_witness.numItems == #room.witness_player_list then
viewList_witness:RefreshVirtualList()
else
viewList_witness.numItems = #room.witness_player_list
end
end
self._view:GetController('witness').selectedIndex = 1
end)
end
self._view:GetChild('btn_setting').onClick:Add(handler(self, function()
local settingView = SettingView.new(self, 1)
settingView:Show()
end))
-------------------------------------------------------
self._ctr_state.selectedIndex = 4
@ -216,8 +244,8 @@ function M:EventInit()
info:UpdateOutCardList(nil, nil, self._cursor)
print("ling 2zhihouq")
self:PlaySound("LiChuan_MJ", p.self_user.sex, tostring(card))
self:PlayMJSound("chupai.mp3")
-- self:PlaySound("LiChuan_MJ", p.self_user.sex, tostring(card))
-- self:PlayMJSound("chupai.mp3")
print("ling 2zhihou")
if seat == _room.self_player.seat then
_room.curren_outcard_seat = -1

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

@ -77,6 +77,8 @@ function M:FillRoomData(s2croom)
local playerList = _tableInfo["playerData"]
room.curren_round = _tableInfo["round"]
room.witness_player_list = _tableInfo["playerSpectatorData"]
room._flag_updateWitness = true
self:FillPlayerData(playerList)
if (reload) then

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

@ -40,7 +40,7 @@ function M:InitView(url)
-- end
local use_custom_bg = true
MJMainView.InitView(self, string.format("ui://Main_Majiang/Main_new_%d_jiangxi", room.room_config.people_num),
use_custom_bg)
use_custom_bg, bg_config)
if use_custom_bg then
TableBG.LoadTableBG(1, self._room.game_id, self._root_view, bg_config)
end

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

@ -58,7 +58,7 @@ function M:FillRoomData(data)
for i = 1, #room.player_list do
local p = room.player_list[i]
local card_info = _player_card_info[self:GetPos(p.seat)]
card_info:Clear()
-- card_info:Clear()
table.sort(p.card_list, self.HandCardSortAndJing)
card_info:UpdateHandCard(false, true)
self._player_info[i]._view:GetController("piao_niao").selectedIndex = 0
@ -110,7 +110,7 @@ function M:ShowStep(index)
if step.cmd == Record_Event.Evt_Win then
self._win_pic = UIPackage.CreateObjectFromURL("ui://Main_Majiang/胡")
local info = self._player_card_info[self:GetPos(step.win)]
info._mask_liangpai:AddChild(self._win_pic)
info._view:AddChild(self._win_pic)
self._win_pic:Center()
else
if self._win_pic then
@ -286,8 +286,9 @@ function M:UpdateCardBox(seat)
self._ctr_cardbox.selectedIndex = index
end
function M:UpdateRound(round)
self._tex_round.text = "第 " .. round .. "/" .. self._room.room_config.round .. " 局"
function M:UpdateRound()
self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
self._room.room_config.round)
end
function M:UpdateStep(step)

474
lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua Normal file
View File

@ -0,0 +1,474 @@
local EXRoomConfig = import(".EXRoomConfig")
local EXClearingView = import(".EXClearingView")
local TX_GameEvent = import(".GameEvent")
local PlayerInfoView = import(".EXPlayerInfoView")
local MJPlayerSelfCardInfoView = import(".MJPlayerSelfCardInfoView")
local MJPlayerCardInfoView = require("main.majiang.MJPlayerCardInfoView")
local TableBG = require("Game.Data.TableBG")
local Record_Event = import(".RecordEvent")
local bg_config = {
{ id = 1, url = "base/main_majiang/bg/bg1", thumb = "ui://Main_Majiang/b01" },
{ id = 2, url = "base/main_majiang/bg/bg2", thumb = "ui://Main_Majiang/b02" },
{ id = 3, url = "base/main_majiang/bg/bg3", thumb = "ui://Main_Majiang/b03" }
}
local M = {}
--- Create a new
function M.new()
setmetatable(M, { __index = BaseView })
local self = setmetatable({}, { __index = M })
self.class = "EXMJWitness"
self:init()
return self
end
function M:init()
self._gamectr = ControllerManager.GetController(GameController)
self._room = DataManager.CurrenRoom
self._room.Witness = true
UIPackage.AddPackage('base/chat/ui/Chat')
UIPackage.AddPackage("base/main_majiang/ui/Main_Majiang")
self._eventmap = {}
-- self._full = true
self._put_map = false
self._new_hide = false
self._queue = false
self._style = 1
self._popEvent = true
self:InitView()
end
function M:InitView(url)
local room = self._room
UIPackage.AddPackage("extend/majiang/nancheng/ui/Extend_MJ_NanCheng")
BaseView.InitView(self, string.format("ui://Main_Majiang/Main_new_%d_jiangxi", room.room_config.people_num))
self:EventInit()
UpdateBeat:Add(self.OnUpdate, self)
local centerBox = self._view:GetChild("Comp_ConterBox")
self._ctr_cardbox = centerBox:GetController("seat")
self._tex_leftTime = centerBox:GetChild("Text_Time")
self._tex_round = self._view:GetChild("tex_round")
self._tex_LeftCard = self._view:GetChild("remaining_card")
self._anchor = self._view:GetChild("mask_tips")
------------------渲染桌面信息--------------------------
local use_custom_bg = true
local default_bg = 1
if use_custom_bg then
TableBG.LoadTableBG(default_bg, self._room.game_id, self._root_view, bg_config)
end
local config = ExtendManager.GetExtendConfig(room.game_id)
local mode = config:GetGameInfo()
local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config))
self._view:GetChild('text_time').text = os.date("%H:%M", os.time())
self._view:GetChild('text_roomId').text = room.room_id
self._view:GetChild('wanfa_text').text = gamePlay
self._ctr_state = self._view:GetController("state")
self._text_remined = self._view:GetChild('remaining_card')
self._text_round = self._view:GetChild('text_round')
self._cursor = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Ani_play_bj")
self:UpdateRound()
self:InitPlayerInfoView()
self._player_card_info = {}
local _player_card_info = self._player_card_info
for i = 1, #room.player_list do
local p = room.player_list[i]
local index = self:GetPos(p.seat)
print("lingmeng index", index)
local info = self._player_info[index]
local tem = self._view:GetChild("player_card_info" .. index)
_player_card_info[index] = self:NewMJPlayerCardInfoView(tem, index)
local cardInfo = _player_card_info[index]
cardInfo:SetPlayer(p)
cardInfo:UpdateHandCardWitness(false)
cardInfo:UpdateOutCardList(nil, nil, self._cursor)
for i = 1, #p.fz_list do
cardInfo:UpdateFzList(p.fz_list[i], -1)
end
info:FillData(p)
info._view.visible = true
end
-------------按钮初始化------------------------------
local changeTable = self._view:GetChild('btn_change')
if changeTable then
changeTable.onClick:Set(function()
default_bg = default_bg + 1 > #bg_config and 1 or default_bg + 1
TableBG.LoadTableBG(default_bg, self._room.game_id, self._root_view, bg_config)
end)
end
local btn_rule = self._view:GetChild('btn_rule')
if btn_rule ~= nil then
btn_rule.onClick:Set(function()
if self.RuleView == nil or self.RuleView._is_destroy then
self.RuleView = RoomInfoView.new(self._room)
end
self.RuleView:Show()
end)
end
local btn_exit = self._view:GetChild('btn_exitWitness')
if btn_exit ~= nil then
btn_exit.onClick:Set(function()
self._gamectr:ExitWitnessGame()
ViewManager.ChangeView(ViewManager.View_Family)
end)
end
-------------------------------------------------------
self._ctr_state.selectedIndex = 4
end
function M:EventInit()
-- UIPackage.AddPackage("extend/majiang/hongzhong/ui/Extend_MJ_HongZhong")
MainView.EventInit(self)
local _room = self._room
local _view = self._view
local _gcm_outcard_url = UIPackage.GetItemURL("Main_Majiang", "Gcm_OutCard")
local _player_info = self._player_info
local _gamectr = self._gamectr
_gamectr:AddEventListener(GameEvent.PlayerEnter, function(...)
local arg = { ... }
print("lingmeng witness PlayerEnter")
end)
_gamectr:AddEventListener(TX_GameEvent.SendLaiZi, function(...)
local arg = { ... }
print("lingmeng witness SendLaiZi")
end)
_gamectr:AddEventListener(TX_GameEvent.SendGangZi, function(...)
local arg = { ... }
print("lingmeng witness SendGangZi")
end)
_gamectr:AddEventListener(TX_GameEvent.EventBuGang, function(...)
local arg = { ... }
print("lingmeng witness EventBuGang")
end)
_gamectr:AddEventListener(TX_GameEvent.SendCards, function(...)
print("lingmeng witness SendCards")
-- self:ShowJing()
if self._clearingView then
self._clearingView:Destroy()
self._clearingView = nil
end
self:UpdateRound()
self._ctr_state.selectedIndex = 4
local list = _room.player_list
for i = 1, #list do
local p = list[i]
local info = self._player_info[self:GetPos(p.seat)]
info:FillData(p)
info:MarkBank(p.seat == _room.banker_seat)
info:Ready(false)
local card_info = self._player_card_info[self:GetPos(p.seat)]
card_info:UpdateHandCardWitness()
end
end)
_gamectr:AddEventListener(TX_GameEvent.EventTurn, function(...)
print("lingmeng witness EventTurn")
local arg = { ... }
self._left_time = 15
local seat = arg[1]
self:UpdateCardBox(self:GetPos(seat))
local playerInfo = self._player_info[self:GetPos(seat)]
local info = self._player_card_info[self:GetPos(seat)]
print("lingmeng hand_left_count", info._player.hand_left_count)
info._player.hand_left_count = info._player.hand_left_count + 1
info:UpdateHandCardWitness(true)
end)
_gamectr:AddEventListener(TX_GameEvent.OutHint, function(...)
print("lingmeng witness OutHint")
end)
local _gcm_outcard_url = "ui://Main_Majiang/Gcm_OutCard"
_gamectr:AddEventListener(TX_GameEvent.OutCard, function(...)
print("lingmeng witness OutCard")
self._left_time = 0
local arg = { ... }
local p = arg[1]
local card = arg[2]
local seat = p.seat
local info = self._player_card_info[self:GetPos(seat)]
print("lingmeng witness OutCard1", self:GetPos(seat), info)
self:RemoveCursor()
print("lingmeng witness OutCard1-2")
info:UpdateHandCardWitness(false)
print("lingmeng witness OutCard2")
info:UpdateOutCardList(nil, nil, self._cursor)
print("ling 2zhihouq")
self:PlaySound("NanCheng_MJ", p.self_user.sex, tostring(card))
self:PlayMJSound("chupai.mp3")
print("ling 2zhihou")
if seat == _room.self_player.seat then
_room.curren_outcard_seat = -1
end
print("ling 2zhihou2")
end)
_gamectr:AddEventListener(TX_GameEvent.GetCard, function(...)
print("lingmeng witness GetCard")
end)
_gamectr:AddEventListener(TX_GameEvent.FZTips, function(...)
print("lingmeng witness FZTips")
end)
_gamectr:AddEventListener(TX_GameEvent.FangziAction, handler(self, self.OnFangziAction))
_gamectr:AddEventListener(TX_GameEvent.ZPHuCard, function(...)
print("lingmeng witness ZPHuCard")
end)
_gamectr:AddEventListener(TX_GameEvent.EventNiao, function(...)
print("lingmeng witness EventNiao")
end)
_gamectr:AddEventListener(TX_GameEvent.ZPResult1, function(...)
print("lingmeng witness ZPResult1")
self._popEvent = false
self._left_time = 0
self:UpdateCardBox(0)
self._ctr_cardbox.selectedIndex = 0
local arg = { ... }
local result = arg[1]
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()
if self._clearingView == nil then
self._clearingView = EXClearingView.new(self._root_view)
coroutine.start(function()
coroutine.wait(0.5)
self._clearingView:Show()
self._popEvent = true
end)
end
print("lingmeng witness ZPResult2")
if _room.curren_round ~= _room.room_config.round then
-- if #niao == 0 then self._view:GetChild("n13").visible = false end
for i = 1, #data do
local p = _room:GetPlayerBySeat(data[i].seat)
if p then
p.total_score = data[i].total_score
local card_info = self._player_card_info[self:GetPos(p.seat)]
local info = self._player_info[self:GetPos(p.seat)]
card_info:Clear()
card_info:ResetCardType()
if _room:checkHpNonnegative() then
p.cur_hp = data[i].hp_info.cur_hp
end
-- info:UpdateScore()
info._view:GetChild("zhanji").visible = true
local num = data[i].hp_info.total_hp
if num >= 0 then
info._view:GetController("text_color").selectedIndex = 0
info._view:GetChild("text_jifen").text = "+" .. d2ad(num)
else
info._view:GetController("text_color").selectedIndex = 1
info._view:GetChild("text_jifen").text = d2ad(num)
end
info._view:GetChild("mask_piao").title = ""
info._view:GetController("piao_niao").selectedIndex = 0
p.fz_list = {}
end
end
self._clearingView:InitData(0, _room, result, nil, function(...)
DataManager.CurrenRoom.self_player.card_list = {}
self._ctr_state.selectedIndex = 2
self._clearingView = nil
end, 1)
end
print("lingmeng witness ZPResult3")
-- self._player_card_info[1]:ShowHuTip()
end)
_gamectr:AddEventListener(TX_GameEvent.ZPResult2, function(...)
print("lingmeng witness ZPResult2")
-- self:UnmarkSelfTuoguan()
self._left_time = 0
self:UpdateCardBox(0)
self._ctr_cardbox.selectedIndex = 0
local arg = { ... }
local total_result = arg[2]
local result = arg[1]
local over = arg[3]
self._clearingView = EXClearingView.new()
coroutine.start(function()
coroutine.wait(0.5)
self._clearingView:Show()
end)
self._clearingView:InitData(over, _room, result, total_result)
ControllerManager.ChangeController(LoddyController)
end)
_gamectr:AddEventListener(TX_GameEvent.EvnetPiaoTip, function()
print("lingmeng witness EvnetPiaoTip")
end)
_gamectr:AddEventListener(TX_GameEvent.EvnetPiao, function(...)
print("lingmeng witness EvnetPiao")
end)
_gamectr:AddEventListener(TX_GameEvent.EventResidueCard, function(...)
print("lingmeng witness EventResidueCard")
end)
end
function M:InitPlayerInfoView()
self._player_info = {}
local _player_info = self._player_info
for i = 1, self._room.room_config.people_num do
local tem = self._view:GetChild(string.format("player_info%d_2", i))
_player_info[i] = PlayerInfoView.new(tem, self)
tem.visible = false
end
end
function M:NewMJPlayerCardInfoView(view, index)
if index == 1 then
return MJPlayerSelfCardInfoView.new(view, self)
end
return MJPlayerCardInfoView.new(view, self)
end
function M:RemoveCursor()
self._cursor:RemoveFromParent()
end
function M:UpdateCardBox(seat)
local index = seat - 1
local people_num = self._room.room_config.people_num
if people_num == 2 and seat == 2 then
index = 2
end
self._ctr_cardbox.selectedIndex = index
end
function M:OnFangziAction(...)
print("lingmeng OnFangziAction")
-- self:__CloseTip()
print("lingmeng OnFangziAction1")
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
self:RemoveCursor()
if (player.seat ~= fz.from_seat) then
local fs_info = _player_card_info[self:GetPos(fz.from_seat)]
fs_info:UpdateOutCardList()
end
print("lingmeng OnFangziAction5")
info:UpdateFzList(fz, index, true)
local getcard = fz.type == FZType.Peng or fz.type == FZType.Chi
printlog(getcard)
print("lingmeng hand_left_count", info._player.hand_left_count)
info._player.hand_left_count = info._player.hand_left_count - 1
info:UpdateHandCardWitness(true)
-- self:__CloseTip()
end
function M:UpdateRound()
self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
self._room.room_config.round)
end
function M:OnUpdate()
if (self._popEvent) then
local func = self._gamectr:PopEvent()
if (func ~= nil) then
local success, result = pcall(func)
if success then
else
print("witness error")
print(result)
-- self._gamectr = ControllerManager.GetController(GameController)
-- if self._gamectr then
-- self._gamectr:ResetConnect()
-- end
end
--func()
end
end
end
function M:ResetConnect()
end
function M:GetPos(seat)
return ViewUtil.GetPos(self._room.self_player.seat, seat, self._room.room_config.people_num)
end
function M.HandCardSortAndJing(a, b)
local jing = DataManager.CurrenRoom.jing
if a == jing or b == jing then
if a == b then
return a < b
end
return a == jing
else
if a < 200 then
a = a + 1000
elseif a < 300 then
a = a + 3000
elseif a < 400 then
a = a + 2000
else
a = a + 4000
end
if b < 200 then
b = b + 1000
elseif b < 300 then
b = b + 3000
elseif b < 400 then
b = b + 2000
else
b = b + 4000
end
return a < b
end
end
return M

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

@ -5,6 +5,7 @@ local EXMainView = import(".EXMainView")
local EXGameController = import(".EXGameController")
local EXRoomConfig = import(".EXRoomConfig")
local EXPlayBackView = import(".EXPlayBackView")
local EXWitnessView = import(".EXWitnessView")
local MJRoom = require("main.majiang.MJRoom")
local ExtendConfig = {}
@ -20,6 +21,7 @@ function ExtendConfig.new()
self._viewMap = {}
self._viewMap[ViewManager.View_Main] = EXMainView
self._viewMap[ViewManager.View_PlayBack] = EXPlayBackView
self._viewMap[ViewManager.View_Witness] = EXWitnessView
return self
end
@ -106,6 +108,7 @@ function M:FillRoomData(s2croom)
local fz = {}
fz.type = op["type"]
fz.card = op["card"]
fz.from_seat = op["from_seat"]
p.fz_list[#p.fz_list + 1] = fz
end
if not playing and room.curren_round > 0 then
@ -170,4 +173,69 @@ function M:FillPlayBackData(pd_data)
room.cmdList = pd_data["cmdList"]
end
function M:FillWitnessData(pd_data)
print("==========================FillWitnessData1")
local room = DataManager.CurrenRoom
pt(room)
-- room.self_player =
local _tableInfo = pd_data["tableInfo"]
local _config = _tableInfo["config"]
room.room_id = _tableInfo.roomid
room.room_config = EXRoomConfig.new(_config)
room.owner_id = _config["ownerid"]
local active_seat = _tableInfo["active_seat"]
local bank_seat = _tableInfo["banker_seat"]
room.left_count = _tableInfo["left_card"]
room.banker_seat = bank_seat
room.curren_turn_seat = active_seat
room.curren_round = _tableInfo["round"]
local _info_list = _tableInfo["playerData"]
for i = 1, #_info_list do
local _jp = _info_list[i]
local p = room:NewPlayer()
p.seat = _jp["seat"]
local online = _jp["online"]
p.line_state = online
p.ready = _jp["ready"] == 1 and true or false
local pid = _jp["aid"]
p.piao_niao = _jp["piao_niao"]
-- -- print(DataManager.SelfUser.account_id,pid)
-- if (278 == pid) then
-- room.self_player = p
-- p.self_user = DataManager.SelfUser
-- else
if p.seat == 1 then room.self_player = p end
local u = User.new()
u.account_id = pid
p.self_user = u
u.nick_name = _jp["nick"]
u.head_url = _jp["portrait"]
u.sex = _jp["sex"]
-- end
p.self_user.host_ip = p.self_user.host_ip
local _hand_card = {}
p.hand_left_count = _jp["card_count"]
p.card_list = _hand_card
--room.self_player.card_list = _hand_card
-- table.sort(_hand_card, self.HandCardSortAndJing)
p.total_score = _jp["score"]
p.outcard_list = _jp["outcard_list"]
local opcard = _jp["opcard"]
for k = 1, #opcard do
local op = opcard[k]
local fz = {}
fz.type = op["type"]
fz.card = op["card"]
fz.from_seat = op["from_seat"]
p.fz_list[#p.fz_list + 1] = fz
end
-- if _jp.hp_info then
-- room.room_config.isNonnegative = 1
-- p.cur_hp = _jp.hp_info.cur_hp
-- end
room:AddPlayer(p)
end
end
return M

2
lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerBackView.lua
View File

@ -42,7 +42,7 @@ function M:InitView(url)
end
self._gamectr = ControllerManager.GetController(GameController)
UIPackage.AddPackage('extend/poker/runfast/ui/Extend_Poker_RunFastNew')
PKPlayBackView.InitView(self, 'ui://Extend_Poker_RunFastNew/RunFast_Main_' .. self._room.room_config.people_num,
PKPlayBackView.InitView(self, "ui://Extend_Poker_RunFastNew/RunFast_Main_New_" .. room.room_config.people_num,
default_bg, bg_config)
self._tex_round = self._view:GetChild('round')
self._player_card_info = {}

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

@ -151,6 +151,29 @@ function M:InitView(url, use_custom_bg, custom_bg_config)
end)
end
local viewList_witness = self._view:GetChild('comp_witness'):GetChild('list_players')
viewList_witness:SetVirtual()
viewList_witness.itemRenderer = function(index, obj)
obj:GetChild('title').text = _room.witness_player_list[index + 1].nick
ImageLoad.Load(_room.witness_player_list[index + 1].portrait, obj:GetChild('btn_head')._iconObject)
end
local btn_witness = self._view:GetChild('btn_pangGuang')
if btn_witness then
btn_witness.onClick:Set(function()
if _room._flag_updateWitness then
print("linemng", _room._flag_updateWitness, #_room.witness_player_list, viewList_witness.numItems)
_room._flag_updateWitness = false
if viewList_witness.numItems == #_room.witness_player_list then
viewList_witness:RefreshVirtualList()
else
viewList_witness.numItems = #_room.witness_player_list
end
end
self._view:GetController('witness').selectedIndex = 1
end)
end
self:InitXiPai()
self:InitXiPai1()
end

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

@ -61,7 +61,7 @@ function M:SetCardBoxPosition()
end
function M:NewMJPlayerCardInfoView(view, index)
return MJPlayerCardInfoView.new(view, self)
return MJPlayerCardInfoView.new(view, self, 1)
end
function M:NextRecordPlay()

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

@ -36,11 +36,12 @@ end
local M = PlayerCardInfoView
--- Create a new PlayerCardInfoView
function M.new(view, mainView)
function M.new(view, mainView, record)
local self = {}
setmetatable(self, { __index = M })
self._view = view
self._mainView = mainView
self._flag_record = record
self:init()
return self
end
@ -54,8 +55,14 @@ function M:init()
self._view_outCardList = self._view:GetChild('List_OutCard')
self._view_getCard = self._view:GetChild('Btn_HandCard')
self._ctr_getCard = self._view:GetController('getCard')
self._ctr_record = self._view:GetController('record')
if self._flag_record and self._flag_record == 1 and self._ctr_record then
self._ctr_record.selectedIndex = self._flag_record or 0
self._view_handCardList = self._view:GetChild('List_HandCard2')
self._view_getCard = self._view:GetChild('Btn_HandCard2')
end
end
function M:SetPlayer(p)

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

@ -1211,6 +1211,31 @@
<image id="jydr7in3" name="bt_cancel1.png" path="/images/btn_choose/"/>
<image id="jydr7in4" name="queren_btn1.png" path="/images/btn_choose/"/>
<component id="tgj67in5" name="btn_oneChoose.xml" path="/component/oneChoose/"/>
<component id="lj2n7inp" name="Record_New.xml" path="/component/record/" exported="true"/>
<component id="lj2n7inq" name="Btn_record_speed(1).xml" path="/component/record/"/>
<image id="lj2n7inr" name="button02.png" path="/component/record/record/"/>
<image id="lj2n7ins" name="mahj_previous_btn.png" path="/component/record/"/>
<image id="lj2n7int" name="mahj_record_speed_bg.png" path="/component/record/"/>
<image id="lj2n7inu" name="mahj_next_one_btn.png" path="/component/record/"/>
<component id="lj2n7inv" name="Btn_record_play(1).xml" path="/component/record/"/>
<image id="lj2n7inw" name="mahj_start_btn.png" path="/component/record/"/>
<image id="lj2n7inx" name="mahj_pause_btn.png" path="/component/record/"/>
<component id="lj2n7iny" name="Btn_record_return(1).xml" path="/component/record/"/>
<image id="lj2n7inz" name="stop.png" path="/component/record/"/>
<component id="lj2n7io0" name="btn_mul.xml" path="/component/record/Component/" exported="true"/>
<image id="lj2n7io1" name="mahj_restart_btn.png" path="/component/record/"/>
<image id="lj2n181" name="4919.png" path="/component/record/Component/font/"/>
<image id="lj2n182" name="4920.png" path="/component/record/Component/font/"/>
<image id="lj2n183" name="4921.png" path="/component/record/Component/font/"/>
<image id="lj2n184" name="4922.png" path="/component/record/Component/font/"/>
<image id="lj2n185" name="4923.png" path="/component/record/Component/font/"/>
<image id="lj2n186" name="4924.png" path="/component/record/Component/font/"/>
<image id="lj2n187" name="4925.png" path="/component/record/Component/font/"/>
<image id="lj2n188" name="4926.png" path="/component/record/Component/font/"/>
<image id="lj2n189" name="4927.png" path="/component/record/Component/font/"/>
<image id="lj2n18a" name="4928.png" path="/component/record/Component/font/"/>
<image id="lj2n18b" name="x.png" path="/component/record/Component/font/" exported="true"/>
<font id="lj2n18c" name="MJ_recordSpeed.fnt" path="/component/record/Component/font/" exported="true"/>
</resources>
<publish name="Common" path="..\wb_unity_pro\Assets\ART\base\common\ui" packageCount="2" maxAtlasSize="2048">
<atlas name="默认" index="0"/>

69
wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="2532,1170" designImageAlpha="100" designImageLayer="1">
<controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放" selected="0"/>
<controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放" selected="3"/>
<controller name="sdk" pages="0,,1," selected="0"/>
<controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
<controller name="time" pages="0,,1,,2,,3," selected="0"/>
<controller name="card_eff" pages="0,,1," selected="0"/>
<controller name="zidongtishi" pages="0,,1," selected="0"/>
<controller name="voice" pages="0,,1," selected="1"/>
<controller name="voice" pages="0,,1," selected="0"/>
<displayList>
<graph id="n141_ckvb" name="bg_mask" xy="6,7" size="2532,751" type="rect" lineSize="0" fillColor="#00ffffff"/>
<component id="n76_rqeb" name="mask" src="prgzeq" fileName="component/mask.xml" xy="14,1956" alpha="0">
@ -57,30 +57,31 @@
<gearDisplay controller="state" pages="0"/>
<relation target="" sidePair="bottom-bottom,center-center"/>
</group>
<component id="n68_pwv4" name="panel_record" src="rayb5j" fileName="component/record/Record.xml" pkg="27vd145b" xy="379,240">
<gearDisplay controller="state" pages="3"/>
</component>
<text id="n61_agtp" name="tex_version" xy="1225,2164" size="130,38" scale="1.5,1.5" fontSize="30" color="#ffffff" align="center" autoSize="none" text="V2.0.2">
<gearDisplay controller="state" pages="0,1,2"/>
</text>
<component id="n77_ij2y" name="gcm_chat" src="h1uu2p" fileName="Gcm_chat.xml" pkg="l0ds4ys6" xy="2294,1604" visible="false"/>
<component id="n79_roef" name="btn_distance" src="kxwjhyc" fileName="component/gps/btn_distance_new.xml" pkg="27vd145b" xy="655,1848" visible="false" touchable="false">
<component id="n79_roef" name="btn_distance" src="kxwjhyc" fileName="component/gps/btn_distance_new.xml" pkg="27vd145b" xy="625,1848" visible="false" touchable="false">
<gearDisplay controller="state" pages="0,1,2"/>
<relation target="n86_q50p" sidePair="right-right"/>
</component>
<component id="n82_q50p" name="right_panel" src="prgzet" fileName="component/RightPanel.xml" xy="124,2441" size="1334,108" group="n86_q50p" scale="1.5,1.5">
<component id="n82_q50p" name="right_panel" src="prgzet" fileName="component/RightPanel.xml" xy="94,2441" size="1334,108" group="n86_q50p" scale="1.5,1.5">
<gearDisplay controller="state" pages="0,1,2,3"/>
</component>
<component id="n83_q50p" name="roominfo_panel1" src="prgzev" fileName="component/RoomInfoPanel1.xml" xy="974,1930" size="274,41" group="n86_q50p" scale="1.5,1.5" touchable="false"/>
<component id="n84_q50p" name="btn_back_lobby" src="prgzds" fileName="component/poker/Btn_back_lobby.xml" xy="510,1878" size="58,75" group="n86_q50p" scale="1.5,1.5">
<component id="n83_q50p" name="roominfo_panel1" src="prgzev" fileName="component/RoomInfoPanel1.xml" xy="944,1930" size="274,41" group="n86_q50p" scale="1.5,1.5" touchable="false"/>
<component id="n84_q50p" name="btn_back_lobby" src="prgzds" fileName="component/poker/Btn_back_lobby.xml" xy="35,23" size="58,75" group="n86_q50p" scale="1.5,1.5">
<gearDisplay controller="state" pages="3"/>
</component>
<component id="n85_q50p" name="btn_rule--" src="prgzdu" fileName="component/poker/Btn_log.xml" xy="302,1878" group="n86_q50p" scale="1.5,1.5"/>
<component id="n87_q50p" name="roominfo_panel" src="prgzev" fileName="component/RoomInfoPanel1.xml" xy="702,1734" size="150,77" group="n86_q50p" scale="1.5,1.5" touchable="false"/>
<component id="n120_r1z9" name="btn_leave_lobby" src="vijocih" fileName="component/poker/Btn_leave_lobby.xml" xy="601,1878" group="n86_q50p" scale="1.5,1.5">
<gearDisplay controller="state" pages="0,3"/>
</component>
<component id="n85_q50p" name="btn_rule--" src="prgzdu" fileName="component/poker/Btn_log.xml" xy="332,1878" group="n86_q50p" scale="1.5,1.5"/>
<component id="n87_q50p" name="roominfo_panel" src="prgzev" fileName="component/RoomInfoPanel1.xml" xy="732,1734" size="150,77" group="n86_q50p" scale="1.5,1.5" touchable="false"/>
<component id="n120_r1z9" name="btn_leave_lobby" src="vijocih" fileName="component/poker/Btn_leave_lobby.xml" xy="631,1878" group="n86_q50p" scale="1.5,1.5">
<gearDisplay controller="state" pages="0,3"/>
<component id="n148_lj2n" name="btn_rule_back" src="lj2n7io0" fileName="component/record/Component/btn_mul.xml" pkg="27vd145b" xy="191,40" size="115,111" group="n86_q50p" visible="false">
<gearDisplay controller="state" pages="3"/>
<Button icon="ui://9n9stu2elj2nckv"/>
</component>
<group id="n86_q50p" name="n86" xy="124,1734" size="1334,815" advanced="true">
<group id="n86_q50p" name="n86" xy="35,23" size="1393,2526" advanced="true">
<relation target="" sidePair="center-center"/>
</group>
<component id="n75_jmab" name="poker_eff" src="prgz9k" fileName="component/effect/poker/poker_eff.xml" xy="618,10" touchable="false">
@ -121,25 +122,25 @@
</component>
<graph id="n102_t2e2" name="n109" xy="342,-1343" size="1670,834" visible="false" type="rect" lineSize="0" fillColor="#80000000"/>
<component id="n101_t2e2" name="tuoguanzhong" src="prgzew" fileName="component/tuoguanzhong.xml" xy="996,2338" visible="false"/>
<component id="n18" name="player_info2" src="ckvbcje" fileName="Main_New/PlayerHead_2.xml" xy="2336,32" group="n121_ckvb">
<component id="n18" name="player_info2" src="ckvbcje" fileName="Main_New/PlayerHead_2.xml" xy="2372,294" group="n121_ckvb">
<gearXY controller="state" pages="0,1,2,3" values="2336,32|2336,32|2336,32|2372,294"/>
<relation target="" sidePair="right-right,middle-middle"/>
</component>
<component id="n7" name="player_info1" src="ckvbcim" fileName="Main_New/PlayerHead_1.xml" xy="80,495" size="183,187" group="n121_ckvb" aspect="true">
<component id="n7" name="player_info1" src="ckvbcim" fileName="Main_New/PlayerHead_1.xml" xy="9,721" size="183,187" group="n121_ckvb" aspect="true">
<gearXY controller="state" pages="0,1,2,3" values="80,495|80,495|80,495|9,721"/>
<relation target="" sidePair="left-left,bottom-bottom"/>
</component>
<group id="n121_ckvb" name="playiinfo" xy="80,32" size="2400,650"/>
<group id="n121_ckvb" name="playiinfo" xy="9,294" size="2507,614"/>
<component id="n69_sdax" name="player_card_info_1" src="ckvbcjl" fileName="Main_New/Player_card_info_1.xml" xy="126,841" group="n122_ckvb">
<gearDisplay controller="state" pages="1,3"/>
<gearLook controller="state" pages="3" values="1,0,0,1" default="1,0,0,1"/>
<relation target="" sidePair="bottom-bottom"/>
</component>
<component id="n71_sdax" name="player_card_info_2" src="ckvbcjo" fileName="Main_New/Player_card_info_2.xml" xy="424,202" group="n122_ckvb" touchable="false">
<component id="n71_sdax" name="player_card_info_2" src="ckvbcjo" fileName="Main_New/Player_card_info_2.xml" xy="460,464" group="n122_ckvb" touchable="false">
<gearDisplay controller="state" pages="1,3"/>
<relation target="n18" sidePair="right-left,middle-middle"/>
</component>
<group id="n122_ckvb" name="playCardInfo" xy="126,202" size="2280,967"/>
<group id="n122_ckvb" name="playCardInfo" xy="126,464" size="2280,705"/>
<component id="n123_ckvb" name="btn_back_lobby" src="ckvbcjd" fileName="Main_New/Component/Btn_CloseRoom.xml" xy="1300,479" group="n126_ckvb">
<relation target="" sidePair="right-right,top-middle"/>
</component>
@ -157,47 +158,53 @@
<relation target="" sidePair="right-right,top-top"/>
</component>
<component id="n142_eqmd" name="btn_sendTalk" src="eqmdckh" fileName="Main_New/Component/Btn_MessageTalk.xml" xy="2328,567" group="n129_ckvb"/>
<group id="n129_ckvb" name="left" xy="2328,409" size="120,278"/>
<group id="n129_ckvb" name="left" xy="2328,409" size="120,278" advanced="true">
<gearDisplay controller="state" pages="0,1,2"/>
</group>
<component id="n140_ckvb" name="Comp_Clock" src="ckvbcis" fileName="Main_New/Component/Comp_Clock.xml" xy="388,492">
<gearDisplay controller="time" pages="1,2,3"/>
<gearXY controller="time" pages="1,2" values="729,667|2133,159" default="388,492"/>
</component>
<component id="n130_ckvb" name="Btn_Spectator" src="ckvbcjf" fileName="Main_New/Component/Btn_Spectator.xml" xy="684,14" group="n131_ckvb">
<component id="n130_ckvb" name="Btn_Spectator" src="ckvbcjf" fileName="Main_New/Component/Btn_Spectator.xml" xy="682,12" group="n131_ckvb">
<relation target="" sidePair="right-center,top-top"/>
</component>
<component id="n132_ckvb" name="PB_Battery" src="ckvbcjg" fileName="Main_New/Component/PB_Battery.xml" xy="768,36" group="n131_ckvb">
<component id="n132_ckvb" name="PB_Battery" src="ckvbcjg" fileName="Main_New/Component/PB_Battery.xml" xy="766,34" group="n131_ckvb">
<relation target="" sidePair="right-center,top-top"/>
<ProgressBar value="50" max="100"/>
</component>
<text id="n133_ckvb" name="Text_Time" xy="882,36" size="94,49" group="n131_ckvb" font="ui://27vd145bh35o7ik0" fontSize="36" color="#ffffff" bold="true" singleLine="true" text="15:52">
<text id="n133_ckvb" name="Text_Time" xy="880,34" size="94,49" group="n131_ckvb" font="ui://27vd145bh35o7ik0" fontSize="36" color="#ffffff" bold="true" singleLine="true" text="15:52">
<relation target="" sidePair="right-center,top-top"/>
</text>
<component id="n128_ckvb" name="Btn_Setting" src="ckvbcj6" fileName="Main_New/Component/Btn_Setting.xml" xy="1776,22" group="n131_ckvb">
<component id="n128_ckvb" name="Btn_Setting" src="ckvbcj6" fileName="Main_New/Component/Btn_Setting.xml" xy="1774,20" group="n131_ckvb">
<gearDisplay controller="state" pages="0,1,2"/>
<relation target="" sidePair="right-right,top-top"/>
</component>
<image id="n134_ckvb" name="n134" src="ckvbcji" fileName="Main_New/Image/Group 272.png" xy="999,28" group="n131_ckvb"/>
<text id="n135_ckvb" name="Text_CurrenRound" xy="1039,32" size="25,49" group="n131_ckvb" font="ui://27vd145bh35o7ik0" fontSize="36" color="#ffe26d" bold="true" singleLine="true" text="8">
<image id="n134_ckvb" name="n134" src="ckvbcji" fileName="Main_New/Image/Group 272.png" xy="997,26" group="n131_ckvb"/>
<text id="n135_ckvb" name="Text_CurrenRound" xy="1037,30" size="25,49" group="n131_ckvb" font="ui://27vd145bh35o7ik0" fontSize="36" color="#ffe26d" bold="true" singleLine="true" text="8">
<relation target="" sidePair="top-top"/>
<relation target="n134_ckvb" sidePair="right-right"/>
</text>
<text id="n136_ckvb" name="Text_MaxMaxRound" xy="1060,32" size="82,49" group="n131_ckvb" font="ui://27vd145bh35o7ik0" fontSize="36" color="#ffffff" bold="true" singleLine="true" text="/9局">
<text id="n136_ckvb" name="Text_MaxMaxRound" xy="1058,30" size="82,49" group="n131_ckvb" font="ui://27vd145bh35o7ik0" fontSize="36" color="#ffffff" bold="true" singleLine="true" text="/9局">
<relation target="" sidePair="top-top"/>
<relation target="n134_ckvb" sidePair="left-left"/>
</text>
<text id="n137_ckvb" name="text_roomId" xy="1203,36" size="210,49" group="n131_ckvb" font="ui://27vd145bh35o7ik0" fontSize="36" color="#ffffff" bold="true" singleLine="true" text="房间:123456&#xA;">
<text id="n137_ckvb" name="text_roomId" xy="1201,34" size="210,49" group="n131_ckvb" font="ui://27vd145bh35o7ik0" fontSize="36" color="#ffffff" bold="true" singleLine="true" text="房间:123456&#xA;">
<relation target="" sidePair="left-center,top-top"/>
</text>
<component id="n138_ckvb" name="btn_rule" src="ckvbcjj" fileName="Main_New/Component/Btn_GamePlay.xml" xy="1428,24" group="n131_ckvb">
<component id="n138_ckvb" name="btn_rule" src="ckvbcjj" fileName="Main_New/Component/Btn_GamePlay.xml" xy="1426,22" group="n131_ckvb">
<relation target="" sidePair="left-center,top-top"/>
</component>
<component id="n139_ckvb" name="Btn_Check" src="ckvbcjk" fileName="Main_New/Component/Btn_Check.xml" xy="1560,23" group="n131_ckvb"/>
<group id="n131_ckvb" name="top" xy="684,14" size="1173,86"/>
<component id="n139_ckvb" name="Btn_Check" src="ckvbcjk" fileName="Main_New/Component/Btn_Check.xml" xy="1558,21" group="n131_ckvb"/>
<group id="n131_ckvb" name="top" xy="682,12" size="1173,86"/>
<graph id="n143_cksh" name="n143" xy="0,0" size="2532,1170" group="n144_cksh" type="rect" lineSize="0" fillColor="#73000000"/>
<image id="n146_cksh" name="n146" src="ckvbcj2" fileName="Main_New/Image/Group 205.png" xy="1203,522" group="n144_cksh"/>
<text id="n147_cksh" name="n147" xy="1024,667" size="484,79" group="n144_cksh" fontSize="60" color="#ffffff" text="松开按钮发送语音"/>
<group id="n144_cksh" name="chatTalk" xy="0,0" size="2532,1170" advanced="true">
<gearDisplay controller="voice" pages="1"/>
</group>
<component id="n68_pwv4" name="panel_record" src="lj2n7inp" fileName="component/record/Record_New.xml" pkg="27vd145b" xy="2,729">
<gearDisplay controller="state" pages="3"/>
</component>
</displayList>
<transition name="t1">
<item time="0" type="Alpha" target="n75_jmab" tween="true" startValue="1" endValue="1" duration="18"/>

4
wb_new_ui/assets/Extend_Poker_RunFastNew/component/poker/Btn_back_lobby.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="57,77" extention="Button" initName="btn_back_lobby">
<component size="85,85" extention="Button" initName="btn_back_lobby">
<controller name="button" pages="0,up,1,down" selected="0"/>
<displayList>
<image id="n3_hp0b" name="n3" src="prgzdt" fileName="images/lk.png" xy="0,0" pivot="0.5,0.5" aspect="true" visible="false"/>
<image id="n4_qf80" name="n4" src="qf80che" fileName="images/fh_img.png" xy="0,0" size="57,76"/>
<image id="n4_qf80" name="n4" src="qf80che" fileName="images/fh_img.png" xy="0,0" size="85,85"/>
</displayList>
<Button downEffect="dark" downEffectValue=".8"/>
</component>

BIN
wb_new_ui/assets/Extend_Poker_RunFastNew/images/fh_img.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB

2
wb_new_ui/assets/Extend_Poker_RunFastNew/package.xml
View File

@ -504,6 +504,8 @@
<image id="eqmdckr" name="8.png" path="/bmtFont_shengyuNum/"/>
<image id="eqmdcks" name="9.png" path="/bmtFont_shengyuNum/"/>
<font id="eqmdckt" name="RunFastShengYu.fnt" path="/bmtFont_shengyuNum/" exported="true"/>
<component id="lj2ncku" name="btn_mul.xml" path="/Main_new/Main/Component/"/>
<image id="lj2nckv" name="Record2_08.png" path="/Main_new/Main/Image/"/>
</resources>
<publish name="Extend_Poker_RunFastNew" path="..\wb_unity_pro\Assets\ART\extend\poker\runfast\ui" packageCount="2"/>
</packageDescription>

8
wb_new_ui/assets/Family/BanDesk/Component/btn_addBanItem.xml
View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="249,249" extention="Button">
<Button/>
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
<displayList>
<image id="n0_jw05" src="jw057d2z" name="n0" xy="0,0">
<relation target="" sidePair="width,height"/>
<image id="n0_jw05" name="n0" src="jw057d2z" fileName="BanDesk/Image/hall_club_filter_delete_add_big.png" xy="0,0">
<relation target="" sidePair="width-width,height-height"/>
</image>
</displayList>
<Button downEffect="dark" downEffectValue="0.9"/>
</component>

10
wb_new_ui/assets/Family/BanDesk/Component/btn_addPlayer.xml
View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="137,138" extention="Button">
<Button/>
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
<component size="137,138" pivot="0.5,0.5" extention="Button">
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
<displayList>
<image id="n0_jw05" src="jw057d2x" name="n0" xy="0,0">
<relation target="" sidePair="width,height"/>
<image id="n0_jw05" name="n0" src="jw057d2x" fileName="BanDesk/Image/hall_club_filter_delete_add.png" xy="0,0">
<relation target="" sidePair="width-width,height-height"/>
</image>
</displayList>
<Button downEffect="dark" downEffectValue="0.9"/>
</component>

8
wb_new_ui/assets/Family/BanDesk/Component/btn_delItem.xml
View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="218,108" extention="Button">
<Button/>
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
<displayList>
<image id="n0_jw05" src="jw057d2v" name="n0" xy="0,0">
<relation target="" sidePair="width,height"/>
<image id="n0_jw05" name="n0" src="jw057d2v" fileName="BanDesk/Image/hall_club_filter_delete_button.png" xy="0,0">
<relation target="" sidePair="width-width,height-height"/>
</image>
</displayList>
<Button downEffect="dark" downEffectValue="0.9"/>
</component>

8
wb_new_ui/assets/Family/BanDesk/Component/btn_delPlayer.xml
View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="27,33" extention="Button">
<Button/>
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
<displayList>
<image id="n0_jw05" src="jw057d2t" name="n0" xy="0,0">
<relation target="" sidePair="width,height"/>
<image id="n0_jw05" name="n0" src="jw057d2t" fileName="BanDesk/Image/hall_club_filter_delete.png" xy="0,0">
<relation target="" sidePair="width-width,height-height"/>
</image>
</displayList>
<Button downEffect="dark" downEffectValue="0.8"/>
</component>

8
wb_new_ui/assets/Family/BanDesk/Component/btn_edit.xml
View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="48,48" extention="Button">
<Button/>
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
<displayList>
<image id="n0_jw05" src="jw057d2p" name="n0" xy="0,0">
<relation target="" sidePair="width,height"/>
<image id="n0_jw05" name="n0" src="jw057d2p" fileName="BanDesk/Image/hall_club_filter_deskma_revise.png" xy="0,0">
<relation target="" sidePair="width-width,height-height"/>
</image>
</displayList>
<Button downEffect="dark" downEffectValue="0.8"/>
</component>

3
wb_new_ui/assets/Family/BanDesk/Component/item_banItem.xml
View File

@ -9,8 +9,7 @@
<image id="n3_jw05" name="n3" src="jw057d2o" fileName="BanDesk/Image/Rectangle 257.png" xy="0,0" size="558,114" group="n10_jw05"/>
<text id="n4_jw05" name="tex_name" xy="0,26" size="558,64" group="n10_jw05" font="ui://27vd145bg2mo7ij0" fontSize="48" color="#8b6914" align="center" vAlign="middle" autoSize="none" text="名称备注名称备注"/>
<component id="n5_jw05" name="btn_edit" src="jw057d2q" fileName="BanDesk/Component/btn_edit.xml" xy="474,30" group="n10_jw05"/>
<list id="n7_jw05" name="list_BanedPlayers" xy="0,150" size="558,415" group="n10_jw05" layout="flow_hz" overflow="hidden" lineGap="18" colGap="30" defaultItem="ui://htcn7v3rjw057d2r" align="center" autoClearItems="true">
<item/>
<list id="n7_jw05" name="list_BanedPlayers" xy="28,150" size="501,311" group="n10_jw05" layout="flow_hz" overflow="hidden" lineGap="18" colGap="30" defaultItem="ui://htcn7v3rjw057d2r" renderOrder="descent" autoClearItems="true">
<item/>
<item/>
<item/>

10
wb_new_ui/assets/Family/BanDesk/Component/item_player.xml
View File

@ -1,21 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="147,144">
<controller name="cStyle" pages="0,,1," selected="1">
<controller name="cStyle" pages="0,,1," selected="0">
<remark page="0" value="正常元素"/>
<remark page="1" value="添加"/>
</controller>
<displayList>
<graph id="n4_jw05" name="n4" xy="0,0" size="147,144" group="n6_jw05" type="rect" lineColor="#00000000" corner="6"/>
<loader id="n0_jw05" name="n0" xy="0,0" size="147,144" group="n6_jw05" align="center" vAlign="middle" fill="scale">
<loader id="n0_jw05" name="loader_icon" xy="0,0" size="147,144" group="n6_jw05" align="center" vAlign="middle" fill="scale">
<relation target="" sidePair="width-width,height-height"/>
</loader>
<image id="n2_jw05" name="n2" src="jw057d2s" fileName="BanDesk/Image/hall_club_filter_headname.png" xy="0,0" group="n6_jw05"/>
<text id="n1_jw05" name="n1" xy="0,0" size="147,38" group="n6_jw05" font="Microsoft YaHei" fontSize="27" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="9999999999"/>
<component id="n3_jw05" name="n3" src="jw057d2u" fileName="BanDesk/Component/btn_delPlayer.xml" xy="108,102" group="n6_jw05"/>
<text id="n1_jw05" name="tex_name" xy="0,0" size="147,38" group="n6_jw05" font="Microsoft YaHei" fontSize="27" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="9999999999"/>
<component id="n3_jw05" name="btn_delPlayer" src="jw057d2u" fileName="BanDesk/Component/btn_delPlayer.xml" xy="108,102" group="n6_jw05"/>
<group id="n6_jw05" name="n6" xy="0,0" size="149,144" advanced="true">
<gearDisplay controller="cStyle" pages="0"/>
</group>
<component id="n5_jw05" name="n5" src="jw057d2y" fileName="BanDesk/Component/btn_addPlayer.xml" xy="5,3">
<component id="n5_jw05" name="btn_addPlayer" src="jw057d2y" fileName="BanDesk/Component/btn_addPlayer.xml" xy="5,3">
<gearDisplay controller="cStyle" pages="1"/>
</component>
</displayList>

15
wb_new_ui/assets/Family/BanDesk/com_banDesk.xml
View File

@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="2532,1170">
<controller name="cSetName" pages="0,,1," selected="0">
<remark page="1" value="显示修改备注"/>
</controller>
<displayList>
<image id="n0_jw05" name="n0" src="mc627d05" fileName="Main/Image/Rectangle 91.png" xy="225,165" size="2082,993"/>
<image id="n1_jw05" name="n1" src="jw057d2l" fileName="BanDesk/Image/Rectangle 286.png" xy="243,183" size="2046,957"/>
@ -14,5 +17,17 @@
<text id="n4_jw05" name="n4" xy="327,1069" size="1050,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#8b6914" text="2.管理员可以设置最多100个关系，每个关系最多6个玩家"/>
<image id="n5_jw05" name="n5" src="jw057d31" fileName="BanDesk/Image/9 拷贝.png" xy="1100,30"/>
<component id="n6_jw05" name="btn_close" src="in3i7cu9" fileName="Main/Component/btn_close.xml" xy="54,6"/>
<component id="n8_mwyl" name="btn_bgRemask" src="sfjv7d3g" fileName="MyFamily/Component/btn_bg.xml" xy="0,0" size="2532,1170" group="n17_mwyl"/>
<image id="n9_mwyl" name="n9" src="sfjv7d3l" fileName="MyFamily/Image/Rectangle 40.png" xy="648,309" size="1236,771" group="n17_mwyl"/>
<image id="n10_mwyl" name="n10" src="sfjv7d3h" fileName="MyFamily/Image/Rectangle 39.png" xy="622,285" size="1287,828" group="n17_mwyl"/>
<image id="n11_mwyl" name="n11" src="c8pn7czw" fileName="RoomCrad/Image/title_top.png" xy="630,193" size="1272,254" group="n17_mwyl"/>
<image id="n12_mwyl" name="n12" src="mwyl7d4w" fileName="ChatRoom/Image/Rectangle 291.png" xy="720,604" size="1092,79" group="n17_mwyl"/>
<text id="n13_mwyl" name="n13" xy="1000,203" size="531,175" group="n17_mwyl" font="ui://27vd145bh35o7ili" fontSize="66" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="备注修改"/>
<component id="n14_mwyl" name="btn_confirmRemask" src="sfjv7d3n" fileName="MyFamily/Component/btn_confirmNotice.xml" xy="1095,887" size="342,129" group="n17_mwyl"/>
<text id="n15_mwyl" name="input_name" xy="740,600" size="1052,86" group="n17_mwyl" font="ui://27vd145bh35o7im7" fontSize="42" color="#222222" vAlign="middle" autoSize="none" text="" input="true" prompt="请输入备注"/>
<component id="n16_mwyl" name="btn_quitRemask" src="sfjv7d3k" fileName="MyFamily/Component/btn_quitNotice.xml" xy="1771,163" group="n17_mwyl"/>
<group id="n17_mwyl" name="n17" xy="0,0" size="2532,1170" advanced="true">
<gearDisplay controller="cSetName" pages="1"/>
</group>
</displayList>
</component>

9
wb_new_ui/assets/Family/ChatRoom/Component/item_player.xml
View File

@ -4,10 +4,11 @@
<remark page="1" value="大赢家"/>
</controller>
<displayList>
<loader id="n0_ieus" name="n0" xy="30,15" size="96,96" url="ui://27vd145bnlvy7iab" align="center" vAlign="middle" fill="scaleMatchHeight"/>
<text id="n1_ieus" name="tex_name" xy="148,15" size="148,49" font="Alimama FangYuanTi VF" fontSize="36" color="#8e0305" align="center" vAlign="middle" leading="-2" autoSize="none" text="用户名称"/>
<text id="n2_ieus" name="tex_id" xy="148,57" size="94,38" font="Alimama FangYuanTi VF" fontSize="27" color="#666666" align="center" vAlign="middle" leading="-2" text="999999"/>
<text id="n3_ieus" name="tex_score" xy="50,106" size="59,64" font="Alimama FangYuanTi VF" fontSize="48" color="#ff0d11" align="center" vAlign="middle" leading="-2" text="+0"/>
<image id="n6_j0cy" name="n6" src="j0cy7d4s" fileName="ChatRoom/Image/Rectangle 266.png" xy="-15,0" size="333,168"/>
<loader id="n0_ieus" name="loader_icon" xy="30,15" size="96,96" url="ui://27vd145bnlvy7iab" align="center" vAlign="middle" fill="scaleMatchHeight"/>
<text id="n1_ieus" name="tex_name" xy="135,15" size="164,49" font="Alimama FangYuanTi VF" fontSize="36" color="#8e0305" vAlign="middle" leading="-2" autoSize="none" text="用户名称"/>
<text id="n2_ieus" name="tex_id" xy="135,57" size="164,38" font="Alimama FangYuanTi VF" fontSize="27" color="#666666" vAlign="middle" leading="-2" autoSize="none" text="999999"/>
<text id="n3_ieus" name="tex_score" xy="21,106" size="113,64" font="Alimama FangYuanTi VF" fontSize="48" color="#ff0d11" align="center" vAlign="middle" leading="-2" autoSize="none" text="+99"/>
<image id="n4_ieus" name="n4" src="ieus7d1k" fileName="Main/Image/Rectangle 264.png" xy="0,0" size="6,168"/>
<image id="n5_ieus" name="n5" src="ieus7d1m" fileName="ChatRoom/Image/dayingjia.png" xy="153,81">
<gearDisplay controller="cWiner" pages="1"/>

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

@ -1,13 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="1510,168">
<component size="1510,241">
<displayList>
<image id="n9_ieus" name="n9" src="ieus7d1j" fileName="Main/Image/Group 343.png" xy="0,0" size="215,169">
<relation target="" sidePair="width-width,height-height"/>
</image>
<text id="n2_ieus" name="n2" xy="36,-64" size="562,56" font="ui://27vd145bg2mo7ij0" fontSize="42" autoSize="none" text="游戏结算：10月29号 03:42:36"/>
<text id="n3_ieus" name="n3" xy="36,21" size="148,49" font="Alimama FangYuanTi VF" fontSize="36" color="#8e0305" align="center" vAlign="middle" autoSize="none" bold="true" text="利川麻将"/>
<text id="n4_ieus" name="n4" xy="56,69" size="107,97" font="ui://27vd145bg2mo7ij0" fontSize="36" color="#333333" align="center" leading="-2" autoSize="none" text="99999&#xA;99"/>
<list id="n12_ieus" name="n12" xy="216,0" size="1293,168" layout="row" selectionMode="none" overflow="hidden" defaultItem="ui://htcn7v3rieus7d1l" vAlign="middle">
<image id="n9_ieus" name="n9" src="j0cy7d4s" fileName="ChatRoom/Image/Rectangle 266.png" xy="0,73" size="217,168" flip="hz"/>
<text id="n2_ieus" name="tex_time" xy="36,9" size="562,56" font="ui://27vd145bg2mo7ij0" fontSize="42" autoSize="none" text="游戏结算：10月29号 03:42:36"/>
<text id="n3_ieus" name="tex_name" xy="36,94" size="148,49" font="Alimama FangYuanTi VF" fontSize="36" color="#8e0305" align="center" vAlign="middle" autoSize="none" bold="true" text="利川麻将"/>
<text id="n4_ieus" name="n4" xy="56,142" size="107,97" font="ui://27vd145bg2mo7ij0" fontSize="36" color="#333333" align="center" leading="-2" autoSize="none" text="99999&#xA;99"/>
<list id="n12_ieus" name="list_players" xy="216,73" size="1293,168" layout="row" selectionMode="none" overflow="hidden" defaultItem="ui://htcn7v3rieus7d1l" vAlign="middle">
<item/>
<item/>
</list>

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

@ -1,13 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="2532,1170" opaque="false">
<displayList>
<image id="n0_ieus" name="n0" src="mc627d05" fileName="Main/Image/Rectangle 91.png" xy="456,144" size="2070,1011"/>
<image id="n1_ieus" name="n1" src="ieus7d1e" fileName="Main/Image/Rectangle 121.png" xy="474,162" size="2034,978"/>
<image id="n2_ieus" name="n2" src="ieus7d1f" fileName="Main/Image/Rectangle 123.png" xy="474,162" size="2034,834"/>
<list id="n3_ieus" name="n3" xy="474,162" size="2034,834" overflow="scroll" lineGap="122" defaultItem="ui://htcn7v3rieus7d1g">
<image id="n0_ieus" name="n0" src="mc627d05" fileName="Main/Image/Rectangle 91.png" xy="456,144" size="2070,1011">
<relation target="" sidePair="width-width,height-height"/>
</image>
<image id="n1_ieus" name="n1" src="ieus7d1e" fileName="Main/Image/Rectangle 121.png" xy="474,162" size="2034,978">
<relation target="" sidePair="width-width,height-height"/>
</image>
<image id="n2_ieus" name="n2" src="ieus7d1f" fileName="Main/Image/Rectangle 123.png" xy="474,162" size="2034,834">
<relation target="" sidePair="width-width,height-height"/>
</image>
<list id="n3_ieus" name="list_chat" xy="543,189" size="1901,780" overflow="scroll" lineGap="65" defaultItem="ui://htcn7v3rieus7d1g">
<relation target="" sidePair="width-width,height-height"/>
<item/>
<item/>
<item/>
</list>
<component id="n4_j0cy" name="btn_quit" src="in3i7cu9" fileName="Main/Component/btn_close.xml" xy="54,6"/>
</displayList>
</component>

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

@ -1,15 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="2532,1170">
<controller name="familyType" exported="true" homePageType="specific" homePage="6" pages="6,空,0,main,1,playEdit,4,createAndJoin,5,numberList,7,numberRecord,8,auditNumber" selected="5"/>
<controller name="familyType" exported="true" homePageType="specific" homePage="6" pages="6,空,0,main,1,playEdit,4,createAndJoin,5,numberList,7,numberRecord,8,auditNumber" selected="1"/>
<controller name="createOrJoin" pages="0,create,1,join" selected="0"/>
<controller name="listFamily" pages="0,,1,,10,,11,,12,,13,,14,,15," selected="0"/>
<controller name="numberRecordRank" pages="0,,1,,3," selected="0"/>
<controller name="numberRecord" pages="0,,1,,3," selected="1"/>
<controller name="numberRecord" pages="0,,1,,3," selected="0"/>
<controller name="showChooseTime" pages="0,,1," selected="0"/>
<controller name="lev" pages="0,1,1,2,2,3" selected="0"/>
<controller name="moreBtn" pages="0,,1," selected="0"/>
<controller name="familyBan" pages="0,,1," selected="0"/>
<controller name="cMyfamilyList" pages="0,,1," selected="0"/>
<controller name="cIsChatRoom" pages="0,,1," selected="0">
<remark page="0" value="关闭聊天室"/>
<remark page="1" value="打开聊天室"/>
</controller>
<displayList>
<image id="n33_86ct" name="n33" src="jrro7cyp" fileName="Main/Image/loginBg.png" xy="1,0" size="2531,1170" group="n17_in3i">
<relation target="" sidePair="width-width,height-height"/>
@ -107,7 +111,11 @@
<gearDisplay controller="familyBan" pages="1"/>
</text>
<component id="n381_ieus" name="btn_chatRoom" src="ieus7d1c" fileName="Main/Component/btn_chatRoom.xml" xy="584,1020" group="n34_86ct"/>
<group id="n34_86ct" name="main" xy="28,14" size="2502,1140" advanced="true">
<component id="n391_j0cy" name="com_chatRoom" src="ieus7d1d" fileName="ChatRoom/com_chatRoom.xml" xy="0,0" group="n34_86ct">
<gearDisplay controller="cIsChatRoom" pages="1"/>
<relation target="" sidePair="width-width,height-height"/>
</component>
<group id="n34_86ct" name="main" xy="0,0" size="2532,1170" advanced="true">
<gearDisplay controller="familyType" pages="0"/>
</group>
<image id="n35_86ct" name="n35" src="86ct7cvc" fileName="GamePlay/Image/Rectangle 91.png" xy="297,171" size="2034,981" group="n39_86ct"/>

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

@ -2,7 +2,7 @@
<component size="1980,234">
<displayList>
<image id="n0_yk1o" name="n0" src="yk1o7d3r" fileName="MyFamily/Image/Rectangle 259.png" xy="0,0" size="1980,249"/>
<loader id="n1_yk1o" name="loader_icon" xy="30,24" size="186,186"/>
<loader id="n1_yk1o" name="loader_icon" xy="30,24" size="186,186" align="center" vAlign="middle" fill="scaleMatchHeight"/>
<image id="n2_yk1o" name="n2" src="yk1o7d3s" fileName="MyFamily/Image/Rectangle 260.png" xy="246,24" size="1710,186"/>
<component id="n3_yk1o" name="btn_rank" src="yk1o7d3x" fileName="MyFamily/Component/btn_familyRank.xml" xy="912,57"/>
<component id="n4_yk1o" name="btn_record" src="yk1o7d3y" fileName="MyFamily/Component/btn_familyRecord.xml" xy="1299,57"/>

10
wb_new_ui/assets/Family/MyFamily/com_myFamily.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="2532,1170">
<controller name="cStyle" pages="0,,1,,2," selected="1">
<controller name="cStyle" pages="0,,1,,2," selected="0">
<remark page="0" value="群主"/>
<remark page="1" value="助理"/>
<remark page="2" value="普通"/>
@ -8,6 +8,10 @@
<controller name="cWindow" pages="0,,1," selected="0">
<remark page="1" value="修改公告界面"/>
</controller>
<controller name="cDisplayNumber" pages="0,,1," selected="0">
<remark page="0" value="隐藏成员"/>
<remark page="1" value="显示成员"/>
</controller>
<displayList>
<image id="n0_ieus" name="n0" src="mc627d05" fileName="Main/Image/Rectangle 91.png" xy="228,165" size="2076,993"/>
<image id="n1_ieus" name="n1" src="ieus7d1e" fileName="Main/Image/Rectangle 121.png" xy="246,183" size="2040,957"/>
@ -18,6 +22,7 @@
<relation target="" sidePair="top-top"/>
</image>
<loader id="n3_ieus" name="loader_icon" xy="378,288" size="300,300" url="ui://27vd145bnlvy7iaa" align="center" vAlign="middle" fill="scaleMatchHeight"/>
<graph id="n48_j0cy" name="n48" xy="378,288" size="300,300" type="rect" lineSize="2" lineColor="#ff804b2e" fillColor="#00ffffff" corner="6"/>
<image id="n4_ieus" name="n4" src="ieus7d1p" fileName="MyFamily/Image/Rectangle 267.png" xy="1212,249" size="1008,84"/>
<image id="n5_ieus" name="n5" src="ieus7d1p" fileName="MyFamily/Image/Rectangle 267.png" xy="1212,357" size="1008,84"/>
<image id="n7_ieus" name="n7" src="ieus7d1p" fileName="MyFamily/Image/Rectangle 267.png" xy="1212,465" size="378,84"/>
@ -46,6 +51,9 @@
<component id="n30_ieus" name="btn_hideNumber" src="ieus7d27" fileName="MyFamily/Component/btn_hideNumber.xml" xy="1632,468">
<gearDisplay controller="cStyle" pages="0,1"/>
</component>
<component id="n49_j0cy" name="btn_showNumber" src="j0cy7d4u" fileName="MyFamily/Component/btn_showNumber.xml" xy="1623,468">
<gearDisplay controller="cDisplayNumber" pages="1"/>
</component>
<component id="n31_ieus" name="btn_checkNumber" src="ieus7d24" fileName="MyFamily/Component/btn_checkNumber.xml" xy="1944,465">
<gearDisplay controller="cStyle" pages="0,1"/>
</component>

4
wb_new_ui/assets/Family/NumberDetail.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="1038,538">
<controller name="isAssistant" pages="0,,1,,2," selected="2"/>
<controller name="isAssistant" pages="0,,1,,2," selected="0"/>
<displayList>
<image id="n0_qz7i" name="n0" src="86ct7cvc" fileName="GamePlay/Image/Rectangle 91.png" xy="0,5" size="1038,528"/>
<image id="n29_c8pn" name="n29" src="c8pn7cz0" fileName="GamePlay/Image/Rectangle 275.png" xy="12,17"/>
@ -11,7 +11,7 @@
<relation target="" sidePair="left-left"/>
</text>
<component id="n21_qz7i" name="btn_changeTag" src="qz7i7cws" fileName="NumberDetail/Component/btn_change.xml" xy="576,153"/>
<text id="n3_qz7i" name="n3" xy="216,150" size="327,56" font="ui://27vd145bh35o7im7" fontSize="42" color="#9a5f34" autoSize="none" text="备注：无">
<text id="n3_qz7i" name="tex_remark" xy="216,150" size="327,56" font="ui://27vd145bh35o7im7" fontSize="42" color="#9a5f34" autoSize="none" text="备注：无">
<relation target="" sidePair="left-left"/>
</text>
<text id="n16_qz7i" name="text_allRounds" xy="150,271" size="108,44" font="ui://27vd145bg2mo7ij0" fontSize="32" vAlign="middle" text="总局数:">

33
wb_new_ui/assets/Family/NumberRecord/comp_numberRecord.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="2532,1170">
<controller name="page" pages="0,,1,,2," selected="2"/>
<controller name="page" pages="0,,1,,2,,3," selected="3"/>
<controller name="day" pages="0,,1," selected="0"/>
<controller name="sort" pages="0,,1," selected="0"/>
<controller name="limitDay" pages="0,,1," selected="0"/>
@ -13,7 +13,7 @@
<image id="n2_lgoh" name="n2" src="mc627d04" fileName="NumberRecord/Image/Rectangle 112.png" xy="38,211" size="2454,924" group="n4_lgoh"/>
<image id="n3_lgoh" name="n3" src="mc627d07" fileName="NumberRecord/Image/image(1).png" xy="59,445" size="2412,678" group="n4_lgoh"/>
<group id="n4_lgoh" name="bg_numberRecord" xy="23,193" size="2484,960" group="n17_lgoh"/>
<component id="n5_lgoh" name="n5" src="v5m57d0f" fileName="NumberRecord/Component/box_time.xml" xy="68,238" size="435,66" group="n11_lgoh">
<component id="n5_lgoh" name="box_mumberTime" src="ghku7d4d" fileName="Record/Component/combBox_time.xml" xy="68,232" size="435,72" group="n11_lgoh">
<ComboBox visibleItemCount="10"/>
</component>
<text id="n6_lgoh" name="text_numberRecordTime" xy="65,323" size="440,56" group="n11_lgoh" font="ui://27vd145bh35o7im7" fontSize="42" color="#444444" align="center" vAlign="middle" autoSize="none" text="2025-03-21 14:30:23"/>
@ -113,7 +113,7 @@
<text id="n61_lgoh" name="text_noPlayer" xy="1322,625" size="1152,154" group="n62_lgoh" font="ui://27vd145bg2mo7ij0" fontSize="120" color="#a8312f" align="center" vAlign="middle" autoSize="none" text="暂时没有玩家上榜">
<gearDisplay controller="noPeople" pages="1"/>
</text>
<component id="n151_lgoh" name="combBox_time" src="lgoh7d45" fileName="NumberRecord/Component/combBox_sort.xml" xy="1363,168" group="n62_lgoh">
<component id="n151_lgoh" name="combBox_time" src="lgoh7d45" fileName="NumberRecord/Component/combBox_sort.xml" xy="1362,169" group="n62_lgoh">
<ComboBox title="今天" visibleItemCount="10" selectionController="day">
<item title="今天"/>
<item title="昨天"/>
@ -148,7 +148,32 @@
<group id="n72_lgoh" name="numberRecordDetail" xy="23,182" size="2484,960" group="n73_lgoh" advanced="true">
<gearDisplay controller="page" pages="2"/>
</group>
<image id="n168_lj2n" name="n168" src="86ct7cvc" fileName="GamePlay/Image/Rectangle 91.png" xy="39,182" size="2484,960" group="n170_lj2n"/>
<image id="n169_lj2n" name="n169" src="86ct7cvb" fileName="GamePlay/Image/Rectangle 112.png" xy="75,214" size="2412,900" group="n170_lj2n"/>
<group id="n170_lj2n" name="bg_numberRecordRoundDetail" xy="39,182" size="2484,960" group="n167_lj2n"/>
<image id="n156_lj2n" name="n156" src="jw057d2h" fileName="Record/Image/Group 544.png" xy="108,232" size="2328,72" group="n167_lj2n"/>
<graph id="n157_lj2n" name="n157" xy="271,232" size="6,72" group="n167_lj2n" type="rect" lineColor="#ffffffff"/>
<graph id="n158_lj2n" name="n158" xy="481,232" size="6,72" group="n167_lj2n" type="rect" lineColor="#ffffffff"/>
<graph id="n159_lj2n" name="n159" xy="1987,232" size="6,72" group="n167_lj2n" type="rect" lineColor="#ffffffff"/>
<graph id="n160_lj2n" name="n160" xy="2206,232" size="6,72" group="n167_lj2n" type="rect" lineColor="#ffffffff"/>
<text id="n161_lj2n" name="n161" xy="151,239" size="88,56" group="n167_lj2n" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" text="序号"/>
<text id="n162_lj2n" name="n162" xy="337,239" size="88,56" group="n167_lj2n" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" text="序号"/>
<text id="n163_lj2n" name="n163" xy="2059,239" size="88,56" group="n167_lj2n" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" text="序号"/>
<text id="n164_lj2n" name="n164" xy="2278,239" size="88,56" group="n167_lj2n" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" text="序号"/>
<list id="n165_lj2n" name="list_players" xy="482,232" size="1506,72" group="n167_lj2n" layout="flow_hz" selectionMode="none" scroll="horizontal" lineItemCount="5" defaultItem="ui://htcn7v3rslrk7d32" autoItemSize="true" scrollItemToViewOnClick="false">
<item/>
<item/>
<item/>
</list>
<list id="n166_lj2n" name="list_record_detail" xy="89,313" size="2354,702" group="n167_lj2n" layout="flow_hz" overflow="scroll" lineGap="24" defaultItem="ui://htcn7v3rslrk7d33" align="center">
<item/>
<item/>
<item/>
</list>
<group id="n167_lj2n" name="numberRecordRoundDetail" xy="39,182" size="2484,960" group="n73_lgoh" advanced="true">
<gearDisplay controller="page" pages="3"/>
</group>
<component id="n148_lgoh" name="btn_close" src="in3i7cu9" fileName="Main/Component/btn_close.xml" xy="54,6" group="n73_lgoh"/>
<group id="n73_lgoh" name="numberRecord" xy="21,6" size="2486,1150" advanced="true"/>
<group id="n73_lgoh" name="numberRecord" xy="21,6" size="2502,1150" advanced="true"/>
</displayList>
</component>

17
wb_new_ui/assets/Family/package.xml
View File

@ -199,7 +199,7 @@
<image id="n74n7d1a" name="hall_club_createclub_btntext_chuangjian.png" path="/CreateAndJoin/Image/"/>
<image id="ieus7d1b" name="Group 108.png" path="/Main/Image/"/>
<component id="ieus7d1c" name="btn_chatRoom.xml" path="/Main/Component/"/>
<component id="ieus7d1d" name="com_chatRoom.xml" path="/ChatRoom/"/>
<component id="ieus7d1d" name="com_chatRoom.xml" path="/ChatRoom/" exported="true"/>
<image id="ieus7d1e" name="Rectangle 121.png" path="/Main/Image/" scale="9grid" scale9grid="15,15,30,30"/>
<image id="ieus7d1f" name="Rectangle 123.png" path="/Main/Image/" scale="9grid" scale9grid="18,17,36,34"/>
<component id="ieus7d1g" name="item_record.xml" path="/ChatRoom/Component/" exported="true"/>
@ -320,6 +320,21 @@
<image id="yk1o7d41" name="Group 556.png" path="/MyFamily/Image/"/>
<component id="yk1o7d42" name="btn_myFamilylist.xml" path="/MyFamily/Component/"/>
<component id="yk1o7d43" name="com_numberRemark.xml" path="/NumberRemark/" exported="true"/>
<component id="95rc7d4d" name="com_familyRoomCardRecord.xml" path="/FamilyRoomCardRecord/"/>
<image id="95rc7d4e" name="Group 557.png" path="/Main/Image/" scale="9grid" scale9grid="59,36,39,0"/>
<image id="95rc7d4f" name="Group 365.png" path="/Main/Image/" scale="9grid" scale9grid="33,32,96,95"/>
<component id="95rc7d4g" name="item_record.xml" path="/FamilyRoomCardRecord/Component/"/>
<image id="95rc7d4h" name="Rectangle 186.png" path="/FamilyRoomCardRecord/Image/"/>
<component id="95rc7d4l" name="box_time_item.xml" path="/FamilyRoomCardRecord/Component/"/>
<component id="95rc7d4m" name="box_time_popup.xml" path="/FamilyRoomCardRecord/Component/"/>
<component id="95rc7d4n" name="box_time.xml" path="/FamilyRoomCardRecord/Component/" exported="true"/>
<image id="95rc7d4o" name="Group 558.png" path="/FamilyRoomCardRecord/Image/"/>
<image id="95rc7d4p" name="Rectangle 165(2).png" path="/FamilyRoomCardRecord/Image/" scale="9grid" scale9grid="20,16,40,32"/>
<image id="j0cy7d4s" name="Rectangle 266.png" path="/ChatRoom/Image/" scale="9grid" scale9grid="7,20,39,13"/>
<image id="j0cy7d4t" name="Component 1.png" path="/MyFamily/Image/"/>
<component id="j0cy7d4u" name="btn_showNumber.xml" path="/MyFamily/Component/"/>
<component id="txni7d4v" name="com_SelectNumber.xml" path="/SelectNumber/" exported="true"/>
<image id="mwyl7d4w" name="Rectangle 291.png" path="/ChatRoom/Image/" scale="9grid" scale9grid="31,29,22,36"/>
<image id="ghku7d4c" name="Group 327.png" path="/Record/Image/"/>
<component id="ghku7d4d" name="combBox_time.xml" path="/Record/Component/" exported="true"/>
<component id="ghku7d4e" name="combBox_time_item.xml" path="/Record/Component/"/>

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

@ -3,7 +3,7 @@
<controller name="lev" pages="0,,1," selected="0"/>
<displayList>
<component id="n0_kzuz" name="btn_head" src="pkx5sz" fileName="Main_new/Main/Component/btn_head.xml" xy="24,24" size="96,96" aspect="true"/>
<text id="n1_kzuz" name="text_name" xy="144,27" size="265,42" fontSize="30" color="#444444" autoSize="shrink" text="微型姓名"/>
<text id="n1_kzuz" name="title" xy="144,27" size="265,42" fontSize="30" color="#444444" autoSize="shrink" text="微型姓名"/>
<component id="n2_kzuz" name="btn_tick" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="144,77" size="117,47">
<gearDisplay controller="lev" pages="1"/>
<Button icon="ui://v0j9abjykzuz14c"/>

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

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="2532,1170">
<controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="3"/>
<controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="4"/>
<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"/>
<controller name="showNext" pages="0,不展示,1,展示" selected="0"/>
<controller name="showNextConfrim" pages="0,不展示,1,展示" selected="0"/>
<controller name="more" pages="0,,1," selected="0"/>
<controller name="more" pages="0,,1," selected="1"/>
<controller name="witness" pages="0,,1," selected="0"/>
<controller name="voice" pages="0,,1," selected="0"/>
<displayList>
@ -99,6 +99,7 @@
<gearDisplay controller="state" pages="3"/>
</component>
<component id="n192_lj2n" name="btn_rule_back" src="lj2n17s" fileName="Main_new/Main/Component/btn_mul.xml" xy="215,36" size="115,111">
<gearDisplay controller="state" pages="3"/>
<Button icon="ui://v0j9abjylj2n17t"/>
</component>
<component id="n155_gi99" name="player_card_info2" src="inqx13x" fileName="Main_new/Main_new_2/Player_card_info_2_2.xml" xy="515,33">
@ -129,7 +130,7 @@
<gearSize controller="state" default="144,144,1,1"/>
<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="73,784" size="144,144">
<component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="71,774" size="144,144">
<gearDisplay controller="state" pages="1,3,4"/>
<gearXY controller="state" pages="1,3,4" values="73,784|73,784|71,774" default="739,916"/>
<relation target="n118_pkx5" sidePair="right-left,top-top"/>
@ -139,7 +140,7 @@
<gearXY controller="state" pages="0,1,2" values="1188,274|1867,27|1188,274" default="1188,909"/>
<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="1885,27" size="108,108">
<component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="1897,43" size="108,108">
<gearDisplay controller="state" pages="1,3,4"/>
<gearXY controller="state" pages="0,1,3,4" values="2031,519|1885,27|1885,27|1897,43" default="1337,909"/>
<relation target="n155_gi99" sidePair="left-right,top-top"/>
@ -150,11 +151,11 @@
</component>
<group id="n169_gmbn" name="conter_box" xy="1136,375" size="258,258"/>
<component id="n137_lu84" name="btn_setting" src="t6zvw5" fileName="Main_new/Main/Component/btn_setting.xml" xy="2232,36" group="n138_lu84">
<gearDisplay controller="state" pages="0,1,2,3"/>
<gearDisplay controller="state" pages="0,1,2,3,4"/>
</component>
<component id="n170_gmbn" name="btn_more" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2412,60" pivot="0.5,0.5" size="72,72" group="n138_lu84">
<component id="n170_gmbn" name="btn_more" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2412,60" pivot="0.5,0.5" size="72,72" group="n138_lu84" rotation="180">
<gearLook controller="more" pages="1" values="1,180,0,1" default="1,0,0,1"/>
<Button icon="ui://v0j9abjygmbn13t" controller="more" page="1"/>
<Button checked="true" icon="ui://v0j9abjygmbn13t" controller="more" page="1"/>
</component>
<component id="n171_gmbn" name="btn_change" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2031,33" pivot="0.5,0.5" size="102,119" group="n138_lu84">
<gearDisplay controller="more" pages="1"/>
@ -172,9 +173,6 @@
<gearDisplay controller="more" pages="1"/>
<Button icon="ui://v0j9abjygmbn13r"/>
</component>
<component id="n180_vum1" name="btn_exitWitness" src="t6zvw5" fileName="Main_new/Main/Component/btn_setting.xml" xy="2275,42" group="n138_lu84">
<gearDisplay controller="state" pages="4"/>
</component>
<group id="n138_lu84" name="top_right" xy="2031,33" size="468,453"/>
<graph id="n146_l15a" name="btn_showNext" xy="1121,424" size="208,165" type="rect" lineSize="0" fillColor="#00ffffff">
<gearDisplay controller="state" pages="1"/>

2
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3/Component/Comp_3_HandCard2.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="67,122">
<displayList>
<loader id="n0_gi99" name="n0" xy="67,0" size="67,122" skew="0,180" url="ui://v0j9abjygq7ma8" fill="scale">
<loader id="n0_gi99" name="icon" xy="67,0" size="67,122" skew="0,180" url="ui://v0j9abjygq7ma8" fill="scale">
<relation target="" sidePair="width-width,height-height"/>
</loader>
</displayList>

2
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3/Component/Comp_3_HandCard3.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="91,114">
<displayList>
<loader id="n0_gi99" name="n0" xy="0,1" size="91,114" url="ui://v0j9abjygq7ma6" align="center" vAlign="middle" fill="scaleFree">
<loader id="n0_gi99" name="icon" xy="0,1" size="91,114" url="ui://v0j9abjygq7ma6" align="center" vAlign="middle" fill="scaleFree">
<relation target="" sidePair="width-width,height-height"/>
</loader>
</displayList>

8
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3/Component/Comp_3_OutCard2.xml
View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="74,105">
<component size="117,117">
<controller name="jing" pages="0,,1," selected="0"/>
<displayList>
<loader id="n0_gi99" name="icon" xy="74,105" size="74,105" skew="180,180" url="ui://Main_Majiang/202_101" fill="scaleFree">
<loader id="n0_gi99" name="icon" xy="0,0" pivot="0.5,0.5" size="117,117" skew="180,180" url="ui://Main_Majiang/b202_101" fill="scaleFree">
<relation target="" sidePair="width-width,height-height"/>
</loader>
<image id="n1_gi99" name="n1" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="74,105" size="34,34" aspect="true" skew="180,180">
<image id="n1_gi99" name="n1" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="56,82" pivot="0.5,0.5" size="58,34" aspect="true" skew="180,180">
<gearDisplay controller="jing" pages="1"/>
<relation target="" sidePair="width-width,height-height"/>
<relation target="" sidePair="width-width%,height-height%,left-left%,top-top%"/>
</image>
</displayList>
</component>

6
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3/Component/Comp_3_OutCard3.xml
View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="78,111">
<component size="117,117">
<controller name="jing" pages="0,,1," selected="0"/>
<displayList>
<loader id="n0_gi99" name="icon" xy="78,0" size="78,111" skew="0,180" url="ui://Main_Majiang/202_101" fill="scaleFree">
<loader id="n0_gi99" name="icon" xy="0,0" pivot="0.5,0.5" size="117,117" skew="0,180" url="ui://Main_Majiang/b202_101" fill="scale">
<relation target="" sidePair="width-width,height-height"/>
</loader>
<image id="n1_gi99" name="n1" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="78,0" size="38,40" aspect="true" skew="0,180">
<image id="n1_gi99" name="n1" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="114,1" size="58,34" aspect="true" skew="0,180">
<gearDisplay controller="jing" pages="1"/>
<relation target="" sidePair="width-width,height-height,left-left,top-top"/>
</image>

13
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3/Player_card_info_3_1.xml
View File

@ -6,15 +6,16 @@
<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"/>
<displayList>
<component id="n24" name="mask_liangpai" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="666,-1180" size="1,1"/>
<text id="n36_gi99" name="Text_CardInfo" xy="984,322" size="813,973" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;FZ_Card&quot;:&quot;202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;a201_&quot;,&#xA;&quot;Get_Card&quot;:&quot;202_&quot;,&#xA;&quot;Order&quot;:&quot;desc&quot;,&#xA;&quot;Pos_X&quot;:57&#xA;}"/>
<text id="n36_gi99" name="Text_CardInfo" xy="984,322" 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;b201_&quot;,&#xA;&quot;Get_Card&quot;:&quot;b201_&quot;,&#xA;&quot;Order&quot;:&quot;desc&quot;,&#xA;&quot;Pos_X&quot;:57&#xA;}"/>
<list id="n33_gi99" name="List_FZ" xy="0,34" size="2400,211" touchable="false" layout="row" selectionMode="none" colGap="40" defaultItem="ui://v0j9abjygi9910f" autoClearItems="true">
<relation target="" sidePair="width-width,height-height"/>
<item/>
<item/>
</list>
<list id="n32_kxhm" name="List_HandCard" xy="0,0" size="2197,248" layout="row" colGap="-10" defaultItem="ui://v0j9abjyshqd110" align="right" autoClearItems="true">
<list id="n32_kxhm" name="List_HandCard" xy="2,0" size="2197,248" layout="row" colGap="-10" defaultItem="ui://v0j9abjyshqd110" align="right" autoClearItems="true">
<relation target="" sidePair="width-width,height-height,left-left"/>
<item/>
<item/>
@ -31,7 +32,7 @@
<item/>
<item/>
</list>
<list id="n35_gi99" name="List_OutCard" xy="252,-846" pivot="1,1" size="1302,408" skew="180,0" pageController="ting" layout="flow_hz" selectionMode="none" lineGap="-11" colGap="-6" defaultItem="ui://v0j9abjygi9910j" renderOrder="descent" autoClearItems="true">
<list id="n35_gi99" name="List_OutCard" xy="252,-846" pivot="1,1" size="1319,408" skew="180,0" pageController="ting" layout="flow_hz" selectionMode="none" lineGap="-20" colGap="-8" defaultItem="ui://v0j9abjygi9910j" renderOrder="descent" autoClearItems="true">
<item/>
<item/>
<item/>
@ -80,5 +81,11 @@
<component id="n40_nee3" name="Comp_FZTips" src="nee311b" fileName="Main_new/FZTips/Comp_FZTips.xml" xy="100,-170">
<gearDisplay controller="tip" pages="1"/>
</component>
<image id="n42_lj2n" name="n42" src="kzuz142" fileName="Main_new/Main/Image/opt_hu_tips.png" xy="204,-114" size="1314,208" group="n45_lj2n" aspect="true"/>
<component id="n43_lj2n" name="btn_guohu" src="kzuz148" fileName="Main_new/Main/Component/btn_guohu.xml" xy="1995,-64" size="200,107" group="n45_lj2n" aspect="true"/>
<component id="n44_lj2n" name="btn_buguohu" src="kzuz149" fileName="Main_new/Main/Component/btn_buguohu.xml" xy="1674,-66" size="200,107" group="n45_lj2n" aspect="true"/>
<group id="n45_lj2n" name="showGuoHu" xy="204,-114" size="1991,208" advanced="true">
<gearDisplay controller="showGuoHu" pages="1"/>
</group>
</displayList>
</component>

29
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3/Player_card_info_3_2.xml
View File

@ -3,7 +3,8 @@
<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="record" pages="0,,1," selected="0"/>
<displayList>
<component id="n27" name="area_outcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-152,-1357" size="2022,111">
<gearXY controller="3d" pages="0,1" values="-152,-1357|517,-145"/>
@ -20,8 +21,9 @@
<gearDisplay controller="ting" pages="1"/>
<gearXY controller="3d" pages="0" values="616,-1303" default="616,100"/>
</image>
<text id="n36_gi99" name="Text_CardInfo" xy="71,658" size="813,973" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;FZ_Card&quot;:&quot;202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;100&quot;,&#xA;&quot;Pos_Y&quot;:28,&#xA;&quot;Order&quot;:&quot;desc&quot;&#xA;}"/>
<text id="n36_gi99" name="Text_CardInfo" xy="71,658" 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;}"/>
<list id="n37_gi99" name="List_HandCard" xy="0,0" size="67,672" selectionMode="none" lineGap="-81" defaultItem="ui://v0j9abjynee311g" autoClearItems="true">
<gearDisplay controller="record" pages="0"/>
<relation target="" sidePair="width-width,height-height"/>
<item/>
<item/>
@ -41,7 +43,7 @@
<relation target="" sidePair="width-width,height-height"/>
<item/>
</list>
<list id="n41_gi99" name="List_OutCard" xy="-881,-671" pivot="1,1" size="420,668" skew="180,180" pageController="ting" layout="flow_vt" selectionMode="none" lineGap="-12" colGap="-6" defaultItem="ui://v0j9abjynee311f" renderOrder="descent" autoClearItems="true">
<list id="n41_gi99" name="List_OutCard" xy="-961,-24" pivot="0.5,0.5" size="935,699" skew="180,180" pageController="ting" layout="flow_vt" selectionMode="none" lineGap="-20" colGap="-8" defaultItem="ui://v0j9abjylj2n19f" renderOrder="descent" autoClearItems="true">
<item/>
<item/>
<item/>
@ -67,9 +69,28 @@
<item/>
<item/>
</list>
<list id="n43_nee3" name="Comp_HandCard" xy="0,551" size="67,121" overflow="scroll" defaultItem="ui://v0j9abjynee311g" autoClearItems="true">
<list id="n43_nee3" name="Btn_HandCard" xy="0,551" size="67,121" overflow="scroll" defaultItem="ui://v0j9abjynee311g" autoClearItems="true">
<gearDisplay controller="getCard" pages="1"/>
<item/>
</list>
<list id="n44_lj2n" name="List_HandCard2" xy="0,-80" size="94,752" touchable="false" selectionMode="none" lineGap="-20" defaultItem="ui://v0j9abjylj2n19e" autoClearItems="true">
<gearDisplay controller="record" pages="1"/>
<relation target="" sidePair="width-width,height-height"/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
</list>
<list id="n45_lj2n" name="Btn_HandCard2" xy="0,-157" size="94,77" touchable="false" selectionMode="none" defaultItem="ui://v0j9abjylj2n19e" autoClearItems="true">
<gearDisplay controller="record" pages="1"/>
<item/>
</list>
</displayList>
</component>

8
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3/Player_card_info_3_3.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"/>
<displayList>
<component id="n27" name="area_outcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-152,-1357" size="2022,111">
<gearXY controller="3d" pages="0,1" values="-152,-1357|517,-145"/>
@ -20,7 +20,7 @@
<gearDisplay controller="ting" pages="1"/>
<gearXY controller="3d" pages="0" values="616,-1303" default="616,100"/>
</image>
<text id="n36_gi99" name="Text_CardInfo" xy="5,-1188" size="813,973" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;FZ_Card&quot;:&quot;202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;202_&quot;,&#xA;&quot;Order&quot;:&quot;asc&quot;&#xA;}"/>
<text id="n36_gi99" name="Text_CardInfo" xy="5,-1188" 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;Order&quot;:&quot;asc&quot;&#xA;}"/>
<list id="n37_gi99" name="List_HandCard" xy="127,0" size="1025,115" layout="row" selectionMode="none" colGap="-13" defaultItem="ui://v0j9abjynee311i" autoClearItems="true">
<relation target="" sidePair="width-width,height-height"/>
<item/>
@ -42,7 +42,7 @@
<item/>
<item/>
</list>
<list id="n41_gi99" name="List_OutCard" xy="-1563,181" pivot="1,1" size="1302,408" skew="0,180" pageController="ting" layout="flow_hz" selectionMode="none" lineGap="-11" colGap="-6" defaultItem="ui://v0j9abjynee311k" autoClearItems="true">
<list id="n41_gi99" name="List_OutCard" xy="-1580,181" pivot="1,1" size="1319,408" skew="0,180" pageController="ting" layout="flow_hz" selectionMode="none" lineGap="-20" colGap="-8" defaultItem="ui://v0j9abjylj2n19g" autoClearItems="true">
<item/>
<item/>
<item/>
@ -70,7 +70,7 @@
<item/>
<item/>
</list>
<list id="n43_nee3" name="Comp_HandCard" xy="0,0" size="91,114" overflow="scroll" defaultItem="ui://v0j9abjynee311i" autoClearItems="true">
<list id="n43_nee3" name="Btn_HandCard" xy="0,0" size="91,114" overflow="scroll" defaultItem="ui://v0j9abjynee311i" autoClearItems="true">
<gearDisplay controller="getCard" pages="1"/>
<item/>
</list>

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

@ -1,23 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="2532,1170">
<controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="0"/>
<controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="3"/>
<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"/>
<controller name="showNext" pages="0,不展示,1,展示" selected="0"/>
<controller name="showNextConfrim" pages="0,不展示,1,展示" selected="0"/>
<displayList>
<component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1200,909">
<component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1194,909">
<gearDisplay controller="state" pages="0"/>
<gearXY controller="state" pages="0,1" values="1200,909|80,654" default="1194,909"/>
<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="1194,909" size="183,183">
<component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1195,909" size="183,183">
<gearDisplay controller="state" pages="1"/>
<gearXY controller="state" pages="1" values="108,660" default="1194,909"/>
<gearXY controller="state" pages="1" values="109,660" default="1195,909"/>
<relation target="n118_pkx5" sidePair="left-left,bottom-top"/>
</component>
<component id="n116_pkx5" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1888,519" scale="1.2,1.2">
<component id="n116_pkx5" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1194,274" scale="1.2,1.2">
<gearDisplay controller="state" pages="0"/>
<gearXY controller="state" pages="0,1" values="1888,519|2004,77" default="1194,274"/>
<relation target="" sidePair="middle-middle"/>
@ -26,12 +26,12 @@
<gearDisplay controller="state" pages="1"/>
<relation target="n154_gi99" sidePair="left-right,top-top"/>
</component>
<component id="n150_kxhm" name="player_info3_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1200,274">
<component id="n150_kxhm" name="player_info3_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1194,909">
<gearDisplay controller="state" pages="0"/>
<gearXY controller="state" pages="0,1" values="1200,274|80,654" default="1194,909"/>
<relation target="" sidePair="center-center,top-top"/>
</component>
<component id="n152_kxhm" name="player_info3_2" src="lu84tz" fileName="Main_new/Main/PlayerHead_2.xml" xy="1888,519" size="144,144">
<component id="n152_kxhm" name="player_info3_2" src="lu84tz" fileName="Main_new/Main/PlayerHead_2.xml" xy="1194,909" size="144,144">
<gearDisplay controller="state" pages="1"/>
<gearXY controller="state" pages="0,1" values="1888,519|1767,33" default="1194,909"/>
<relation target="n155_gi99" sidePair="left-right,top-top"/>
@ -40,9 +40,9 @@
<gearDisplay controller="state" pages="1,3"/>
<gearXY controller="3d" pages="0,1" values="1278,-294|603,254"/>
</component>
<component id="n71_l2u4" name="com_roominfo" src="gq7m2z" fileName="Main_style_2/component/room_info/RightPanel(1).xml" xy="357,-1170" size="1329,102" group="n90_8sat" scale="1.5,1.5"/>
<component id="n88_8sat" name="btn_rule" src="gq7m4l" fileName="Main_style_2/poker/Btn_log.xml" xy="-383,-885" group="n90_8sat"/>
<component id="n89_8sat" name="btn_back_jiesan" src="gq7m4n" fileName="Main_style_2/poker/Btn_back_jiesan.xml" xy="2099,-382" size="110,75" group="n90_8sat" scale="2,2">
<component id="n71_l2u4" name="com_roominfo" src="gq7m2z" fileName="Main_style_2/component/room_info/RightPanel(1).xml" xy="744,-1170" size="1329,102" group="n90_8sat" scale="1.5,1.5"/>
<component id="n88_8sat" name="btn_rule" src="gq7m4l" fileName="Main_style_2/poker/Btn_log.xml" xy="4,-885" group="n90_8sat"/>
<component id="n89_8sat" name="btn_back_jiesan" src="gq7m4n" fileName="Main_style_2/poker/Btn_back_jiesan.xml" xy="2486,-382" size="110,75" group="n90_8sat" scale="2,2">
<gearDisplay controller="state" pages="1,2"/>
</component>
<text id="n156_ckvb" name="remaining_card" xy="897,469" size="215,74" group="n160_ckvb" font="ui://27vd145bh35o7ik0" fontSize="56" color="#cccccc" align="center" vAlign="middle" bold="true" text="余999张">
@ -63,16 +63,20 @@
<group id="n160_ckvb" name="center" xy="418,375" size="1696,280" advanced="true">
<relation target="" sidePair="middle-middle,right-right"/>
</group>
<component id="n87_8sat" name="btn_back_lobby" src="gq7m4p" fileName="Main_style_2/poker/Btn_back_lobby.xml" xy="2926,-501" size="58,75" group="n90_8sat" scale="2,2">
<component id="n87_8sat" name="btn_back_lobby" src="gq7m4p" fileName="Main_style_2/poker/Btn_back_lobby.xml" xy="23,17" size="58,75" group="n90_8sat" scale="2,2">
<gearDisplay controller="state" pages="3"/>
</component>
<component id="n105_r1z9" name="btn_leave_lobby" src="gq7m4s" fileName="Main_style_2/poker/Btn_leave_lobby.xml" xy="266,-887" group="n90_8sat">
<gearDisplay controller="state" pages="0,3"/>
</component>
<component id="n105_r1z9" name="btn_leave_lobby" src="gq7m4s" fileName="Main_style_2/poker/Btn_leave_lobby.xml" xy="-121,-887" group="n90_8sat">
<gearDisplay controller="state" pages="0,3"/>
<component id="n168_lj2n" name="btn_rule_back" src="lj2n17s" fileName="Main_new/Main/Component/btn_mul.xml" xy="206,32" size="115,111" group="n90_8sat">
<gearDisplay controller="state" pages="3"/>
<Button icon="ui://v0j9abjylj2n17t"/>
</component>
<group id="n90_8sat" name="n90" xy="-383,-1170" size="3367,863" advanced="true">
<group id="n90_8sat" name="n90" xy="4,-1170" size="2592,1313" advanced="true">
<relation target="" sidePair="center-center,top-top"/>
</group>
<component id="n91_8sat" name="btn_distance" src="gq7m40" fileName="Main_style_2/gps/btn_distance_new.xml" xy="1985,-344" visible="false" touchable="false">
<component id="n91_8sat" name="btn_distance" src="gq7m40" fileName="Main_style_2/gps/btn_distance_new.xml" xy="1597,-344" visible="false" touchable="false">
<gearDisplay controller="state" pages="0,1,2"/>
<relation target="n90_8sat" sidePair="right-right"/>
</component>
@ -92,14 +96,6 @@
<group id="n36_k3io" name="n36" xy="4810,-2522" size="848,1940" visible="false" advanced="true">
<relation target="" sidePair="bottom-bottom,center-center"/>
</group>
<component id="n57_rayb" name="panel_record" src="gq7m4t" fileName="Main_style_2/record/Record.xml" xy="978,435" group="n59_v38k" alpha="0.5">
<gearDisplay controller="state" pages="3"/>
<relation target="" sidePair="center-center"/>
</component>
<component id="n56_cnxs" name="mask_tips" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="1261,480" group="n59_v38k">
<relation target="" sidePair="center-center"/>
</component>
<group id="n59_v38k" name="huifang" xy="978,435" size="575,165"/>
<component id="n69_l2u4" name="gcm_chat" src="gq7m8z" fileName="Main_style_2/Gcm_chat.xml" xy="1933,-505">
<gearDisplay controller="state" pages="0,1,2"/>
<relation target="" sidePair="right-right,bottom-bottom"/>
@ -155,7 +151,7 @@
<component id="n155_gi99" name="player_card_info3" src="nee311h" fileName="Main_new/Main_new_3/Player_card_info_3_3.xml" xy="579,33">
<gearDisplay controller="state" pages="1,3"/>
</component>
<component id="n118_pkx5" name="player_card_info1" src="nee311d" fileName="Main_new/Main_new_3/Player_card_info_3_1.xml" xy="66,915">
<component id="n118_pkx5" name="player_card_info1" src="nee311d" fileName="Main_new/Main_new_3/Player_card_info_3_1.xml" xy="67,915">
<gearDisplay controller="state" pages="1,3"/>
<relation target="" sidePair="center-center,bottom-bottom"/>
</component>
@ -210,5 +206,13 @@
<group id="n167_qz7i" name="showNext" xy="-125,-102" size="2832,1436" advanced="true">
<gearDisplay controller="showNext" pages="1"/>
</group>
<component id="n57_rayb" name="panel_record" src="gq7m4t" fileName="Main_style_2/record/Record.xml" xy="2,876" group="n59_v38k">
<gearDisplay controller="state" pages="3"/>
<relation target="" sidePair="center-center"/>
</component>
<component id="n56_cnxs" name="mask_tips" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-34,1452" group="n59_v38k">
<relation target="" sidePair="center-center"/>
</component>
<group id="n59_v38k" name="huifang" xy="-34,876" size="2568,584" advanced="true"/>
</displayList>
</component>

2
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard2.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="63,117">
<displayList>
<loader id="n0_gi99" name="n0" xy="0,0" pivot="0.5,0.5" size="63,117" skew="0,180" url="ui://v0j9abjyk0pa13k" fill="scale">
<loader id="n0_gi99" name="icon" xy="0,0" pivot="0.5,0.5" size="63,117" skew="0,180" url="ui://v0j9abjyk0pa13k" fill="scale">
<relation target="" sidePair="width-width,height-height"/>
</loader>
</displayList>

2
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard4.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="63,117">
<displayList>
<loader id="n0_gi99" name="n0" xy="0,0" size="63,117" url="ui://v0j9abjyk0pa13k" fill="scale">
<loader id="n0_gi99" name="icon" xy="0,0" pivot="0.5,0.5" size="63,117" url="ui://v0j9abjyk0pa13k" fill="scale">
<relation target="" sidePair="width-width,height-height"/>
</loader>
</displayList>

7
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Player_card_info_1.xml
View File

@ -6,6 +6,7 @@
<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"/>
<displayList>
<component id="n27" name="area_outcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-152,-1357" size="2022,111">
<gearXY controller="3d" pages="0,1" values="-152,-1357|517,-145"/>
@ -86,5 +87,11 @@
<component id="n39_nee3" name="Comp_FZTips" src="nee311b" fileName="Main_new/FZTips/Comp_FZTips.xml" xy="-325,-170">
<gearDisplay controller="tip" pages="1"/>
</component>
<image id="n41_lj2n" name="n41" src="kzuz142" fileName="Main_new/Main/Image/opt_hu_tips.png" xy="282,-153" size="1314,208" group="n44_lj2n" aspect="true"/>
<component id="n42_lj2n" name="btn_guohu" src="kzuz148" fileName="Main_new/Main/Component/btn_guohu.xml" xy="2073,-103" size="200,107" group="n44_lj2n" aspect="true"/>
<component id="n43_lj2n" name="btn_buguohu" src="kzuz149" fileName="Main_new/Main/Component/btn_buguohu.xml" xy="1752,-105" size="200,107" group="n44_lj2n" aspect="true"/>
<group id="n44_lj2n" name="showGuoHu" xy="282,-153" size="1991,208" advanced="true">
<gearDisplay controller="showGuoHu" pages="1"/>
</group>
</displayList>
</component>

28
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Player_card_info_2.xml
View File

@ -3,7 +3,8 @@
<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="0"/>
<controller name="getCard" pages="0,,1," selected="1"/>
<controller name="record" pages="0,,1," selected="0"/>
<displayList>
<component id="n27" name="area_outcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-152,-1357" size="2022,111">
<gearXY controller="3d" pages="0,1" values="-152,-1357|517,-145"/>
@ -20,7 +21,7 @@
<gearDisplay controller="ting" pages="1"/>
<gearXY controller="3d" pages="0" values="616,-1303" default="616,100"/>
</image>
<text id="n36_gi99" name="Text_CardInfo" xy="66,861" 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;desc&quot;&#xA;}"/>
<text id="n36_gi99" name="Text_CardInfo" xy="66,861" 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;}"/>
<list id="n38_gi99" name="List_FZ" xy="110,283" size="237,503" touchable="false" selectionMode="none" lineGap="-9" defaultItem="ui://v0j9abjygi9910m" vAlign="bottom" autoClearItems="true">
<relation target="" sidePair="width-width,height-height"/>
<item/>
@ -49,10 +50,12 @@
<item/>
<item/>
</list>
<list id="n44_ckvb" name="Comp_HandCard" xy="0,1" size="63,117" touchable="false" selectionMode="none" defaultItem="ui://v0j9abjygi9910l" autoClearItems="true">
<list id="n44_ckvb" name="Btn_HandCard" xy="0,1" size="63,117" touchable="false" selectionMode="none" defaultItem="ui://v0j9abjygi9910l" autoClearItems="true">
<gearDisplay controller="getCard" pages="1"/>
<item/>
</list>
<list id="n37_gi99" name="List_HandCard" xy="0,117" size="63,597" touchable="false" selectionMode="none" lineGap="-77" defaultItem="ui://v0j9abjygi9910l" autoClearItems="true">
<gearDisplay controller="record" pages="0"/>
<relation target="" sidePair="width-width,height-height"/>
<item/>
<item/>
@ -68,5 +71,24 @@
<item/>
<item/>
</list>
<list id="n45_lj2n" name="List_HandCard2" xy="0,-38" size="94,752" touchable="false" selectionMode="none" lineGap="-20" defaultItem="ui://v0j9abjylj2n19b" autoClearItems="true">
<gearDisplay controller="record" pages="1"/>
<relation target="" sidePair="width-width,height-height"/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
</list>
<list id="n46_lj2n" name="Btn_HandCard2" xy="1,-116" size="94,77" touchable="false" selectionMode="none" defaultItem="ui://v0j9abjylj2n19b" autoClearItems="true">
<gearDisplay controller="record" pages="1"/>
<item/>
</list>
</displayList>
</component>

2
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Player_card_info_3.xml
View File

@ -70,7 +70,7 @@
<item/>
<item/>
</list>
<list id="n43_nee3" name="Comp_HandCard" xy="0,0" size="91,99" touchable="false" overflow="scroll" defaultItem="ui://v0j9abjygi9910q" autoClearItems="true">
<list id="n43_nee3" name="Btn_HandCard" xy="0,0" size="91,99" touchable="false" overflow="scroll" defaultItem="ui://v0j9abjygi9910q" autoClearItems="true">
<gearDisplay controller="getCard" pages="1"/>
<item/>
</list>

33
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Player_card_info_4.xml
View File

@ -3,7 +3,8 @@
<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="0"/>
<controller name="getCard" pages="0,,1," selected="1"/>
<controller name="record" pages="0,,1," selected="1"/>
<displayList>
<component id="n27" name="area_outcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-152,-1357" size="2022,111">
<gearXY controller="3d" pages="0,1" values="-152,-1357|517,-145"/>
@ -20,8 +21,9 @@
<gearDisplay controller="ting" pages="1"/>
<gearXY controller="3d" pages="0" values="616,-1303" default="616,100"/>
</image>
<text id="n36_gi99" name="Text_CardInfo" xy="71,658" 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;}"/>
<list id="n37_gi99" name="List_HandCard" xy="0,0" pivot="1,1" size="63,597" touchable="false" selectionMode="none" lineGap="-77" defaultItem="ui://v0j9abjygi9910w" vAlign="bottom" autoClearItems="true">
<text id="n36_gi99" name="Text_CardInfo" xy="71,658" 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;}"/>
<list id="n37_gi99" name="List_HandCard" xy="2,0" pivot="1,1" size="63,597" touchable="false" selectionMode="none" lineGap="-77" defaultItem="ui://v0j9abjygi9910w" vAlign="bottom" autoClearItems="true">
<gearDisplay controller="record" pages="0"/>
<item/>
<item/>
<item/>
@ -33,14 +35,14 @@
<item/>
<item/>
</list>
<list id="n38_gi99" name="List_FZ" xy="-263,27" size="237,503" touchable="false" selectionMode="none" lineGap="-9" defaultItem="ui://v0j9abjygi9910m" autoClearItems="true">
<list id="n38_gi99" name="List_FZ" xy="-261,27" size="237,503" touchable="false" selectionMode="none" lineGap="-9" defaultItem="ui://v0j9abjygi9910m" autoClearItems="true">
<relation target="n37_gi99" sidePair="right-left,top-top"/>
<item/>
<item/>
<item/>
<item/>
</list>
<list id="n41_gi99" name="List_OutCard" xy="91,0" pivot="0.5,0.5" size="935,699" touchable="false" pageController="ting" layout="flow_vt" selectionMode="none" lineGap="-20" colGap="-8" defaultItem="ui://v0j9abjygi9910x" autoClearItems="true">
<list id="n41_gi99" name="List_OutCard" xy="93,0" pivot="0.5,0.5" size="935,699" touchable="false" pageController="ting" layout="flow_vt" selectionMode="none" lineGap="-20" colGap="-8" defaultItem="ui://v0j9abjygi9910x" autoClearItems="true">
<relation target="n37_gi99" sidePair="left-right,top-top"/>
<item/>
<item/>
@ -64,9 +66,28 @@
<item/>
<item/>
</list>
<list id="n43_nee3" name="Comp_HandCard" xy="0,597" size="63,117" touchable="false" overflow="scroll" defaultItem="ui://v0j9abjygi9910w" autoClearItems="true">
<list id="n43_nee3" name="Btn_HandCard" xy="0,597" size="63,117" touchable="false" overflow="scroll" defaultItem="ui://v0j9abjygi9910w" autoClearItems="true">
<gearDisplay controller="getCard" pages="1"/>
<item/>
</list>
<list id="n46_lj2n" name="List_HandCard2" xy="-10,-116" size="94,752" touchable="false" selectionMode="none" lineGap="-20" defaultItem="ui://v0j9abjylj2n19d" vAlign="bottom" autoClearItems="true">
<gearDisplay controller="record" pages="1"/>
<relation target="" sidePair="width-width,height-height"/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
</list>
<list id="n47_lj2n" name="Btn_HandCard2" xy="-10,637" size="94,77" touchable="false" selectionMode="none" defaultItem="ui://v0j9abjylj2n19d" autoClearItems="true">
<gearDisplay controller="record" pages="1"/>
<item/>
</list>
</displayList>
</component>

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

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="2532,1170">
<controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="0"/>
<controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="3"/>
<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"/>
<controller name="showNext" pages="0,不展示,1,展示" selected="0"/>
<controller name="showNextConfrim" pages="0,不展示,1,展示" selected="0"/>
<controller name="more" pages="0,,1," selected="1"/>
<controller name="more" pages="0,,1," selected="0"/>
<displayList>
<component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1188,897" size="144,144">
<gearDisplay controller="state" pages="0,2"/>
@ -14,12 +14,12 @@
<gearSize controller="state" default="144,144,1,1"/>
<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="737,916" size="144,144">
<component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="72,784" size="144,144">
<gearDisplay controller="state" pages="1,3"/>
<gearXY controller="state" pages="1,3" values="71,784|71,784" default="737,916"/>
<gearXY controller="state" pages="1,3" values="72,784|72,784" default="738,916"/>
<relation target="n118_pkx5" sidePair="right-left,top-top"/>
</component>
<component id="n116_pkx5" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1888,513" size="144,144">
<component id="n116_pkx5" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1194,268" size="144,144">
<gearDisplay controller="state" pages="0,2"/>
<gearXY controller="state" pages="0,1,2" values="1888,513|2334,267|1888,513" default="1194,268"/>
<relation target="" sidePair="middle-middle"/>
@ -28,22 +28,22 @@
<gearDisplay controller="state" pages="1,3"/>
<relation target="n154_gi99" sidePair="left-right,top-top"/>
</component>
<component id="n150_kxhm" name="player_info3_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1188,274" size="144,144">
<component id="n150_kxhm" name="player_info3_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1188,909" size="144,144">
<gearDisplay controller="state" pages="0,2"/>
<gearXY controller="state" pages="0,1,2" values="1188,274|1867,27|1188,274" default="1188,909"/>
<relation target="" sidePair="center-center,top-top"/>
</component>
<component id="n152_kxhm" name="player_info3_2" src="lu84tz" fileName="Main_new/Main/PlayerHead_2.xml" xy="2031,519" size="108,108">
<component id="n152_kxhm" name="player_info3_2" src="lu84tz" fileName="Main_new/Main/PlayerHead_2.xml" xy="1885,24" size="108,108">
<gearDisplay controller="state" pages="1,3"/>
<gearXY controller="state" pages="0,1,3" values="2031,519|1885,27|1885,27" default="1337,909"/>
<gearXY controller="state" pages="0,1,3" values="2031,516|1885,24|1885,24" default="1337,906"/>
<relation target="n155_gi99" sidePair="left-right,top-top"/>
</component>
<component id="n151_kxhm" name="player_info4_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="500,513" size="144,144">
<component id="n151_kxhm" name="player_info4_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1182,903" size="144,144">
<gearDisplay controller="state" pages="0,2"/>
<gearXY controller="state" pages="0,1,2" values="500,513|53,551|500,513" default="1182,903"/>
<relation target="" sidePair="middle-middle,right-left"/>
</component>
<component id="n153_kxhm" name="player_info4_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="510,583" size="108,108">
<component id="n153_kxhm" name="player_info4_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="89,569" size="108,108">
<gearDisplay controller="state" pages="1,3"/>
<gearXY controller="state" pages="0,1,3" values="510,583|89,569|89,569" default="1192,973"/>
<relation target="n156_gi99" sidePair="right-left,bottom-bottom"/>
@ -52,21 +52,21 @@
<gearDisplay controller="state" pages="1,3"/>
<gearXY controller="3d" pages="0,1" values="1278,-294|603,254"/>
</component>
<component id="n71_l2u4" name="com_roominfo" src="gq7m2z" fileName="Main_style_2/component/room_info/RightPanel(1).xml" xy="357,-1170" size="1329,102" group="n90_8sat" scale="1.5,1.5"/>
<component id="n88_8sat" name="btn_rule--" src="gq7m4l" fileName="Main_style_2/poker/Btn_log.xml" xy="-383,-885" group="n90_8sat"/>
<component id="n89_8sat" name="btn_back_jiesan" src="gq7m4n" fileName="Main_style_2/poker/Btn_back_jiesan.xml" xy="2099,-382" size="110,75" group="n90_8sat" scale="2,2">
<component id="n71_l2u4" name="com_roominfo" src="gq7m2z" fileName="Main_style_2/component/room_info/RightPanel(1).xml" xy="747,-1170" size="1329,102" group="n90_8sat" scale="1.5,1.5"/>
<component id="n88_8sat" name="btn_rule--" src="gq7m4l" fileName="Main_style_2/poker/Btn_log.xml" xy="7,-885" group="n90_8sat"/>
<component id="n89_8sat" name="btn_back_jiesan" src="gq7m4n" fileName="Main_style_2/poker/Btn_back_jiesan.xml" xy="2489,-382" size="110,75" group="n90_8sat" scale="2,2">
<gearDisplay controller="state" pages="1,2"/>
</component>
<component id="n87_8sat" name="btn_back_lobby" src="gq7m4p" fileName="Main_style_2/poker/Btn_back_lobby.xml" xy="2926,-501" size="58,75" group="n90_8sat" scale="2,2">
<component id="n87_8sat" name="btn_back_lobby" src="gq7m4p" fileName="Main_style_2/poker/Btn_back_lobby.xml" xy="25,21" size="58,75" group="n90_8sat" scale="2,2">
<gearDisplay controller="state" pages="0,3"/>
</component>
<component id="n105_r1z9" name="btn_leave_lobby" src="gq7m4s" fileName="Main_style_2/poker/Btn_leave_lobby.xml" xy="-121,-887" group="n90_8sat">
<component id="n105_r1z9" name="btn_leave_lobby" src="gq7m4s" fileName="Main_style_2/poker/Btn_leave_lobby.xml" xy="269,-887" group="n90_8sat">
<gearDisplay controller="state" pages="0,3"/>
</component>
<group id="n90_8sat" name="n90" xy="-383,-1170" size="3367,863" advanced="true">
<group id="n90_8sat" name="n90" xy="7,-1170" size="2592,1266" advanced="true">
<relation target="" sidePair="center-center,top-top"/>
</group>
<component id="n91_8sat" name="btn_distance" src="gq7m40" fileName="Main_style_2/gps/btn_distance_new.xml" xy="1985,-344" visible="false" touchable="false">
<component id="n91_8sat" name="btn_distance" src="gq7m40" fileName="Main_style_2/gps/btn_distance_new.xml" xy="1600,-344" visible="false" touchable="false">
<gearDisplay controller="state" pages="0,1,2"/>
<relation target="n90_8sat" sidePair="right-right"/>
</component>
@ -86,14 +86,6 @@
<group id="n36_k3io" name="n36" xy="2794,-240" size="736,1138" visible="false" advanced="true">
<relation target="" sidePair="bottom-bottom,center-center"/>
</group>
<component id="n57_rayb" name="panel_record" src="gq7m4t" fileName="Main_style_2/record/Record.xml" xy="978,435" group="n59_v38k" alpha="0.5">
<gearDisplay controller="state" pages="3"/>
<relation target="" sidePair="center-center"/>
</component>
<component id="n56_cnxs" name="mask_tips" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="1261,480" group="n59_v38k">
<relation target="" sidePair="center-center"/>
</component>
<group id="n59_v38k" name="huifang" xy="978,435" size="575,165"/>
<component id="n69_l2u4" name="gcm_chat" src="gq7m8z" fileName="Main_style_2/Gcm_chat.xml" xy="1933,-505">
<gearDisplay controller="state" pages="0,1,2"/>
<relation target="" sidePair="right-right,bottom-bottom"/>
@ -136,9 +128,9 @@
</group>
<component id="n132_swus" name="jing" src="ckvb11l" fileName="Main_new/Main/Component/Comp_jing.xml" xy="550,33" size="64,90" visible="false" touchable="false"/>
<component id="n137_lu84" name="btn_setting" src="t6zvw5" fileName="Main_new/Main/Component/btn_setting.xml" xy="2232,34" group="n138_lu84"/>
<component id="n170_gmbn" name="btn_more" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2412,58" pivot="0.5,0.5" size="72,72" group="n138_lu84" rotation="180">
<component id="n170_gmbn" name="btn_more" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2412,58" pivot="0.5,0.5" size="72,72" group="n138_lu84">
<gearLook controller="more" pages="1" values="1,180,0,1" default="1,0,0,1"/>
<Button checked="true" icon="ui://v0j9abjygmbn13t" controller="more" page="1"/>
<Button icon="ui://v0j9abjygmbn13t" controller="more" page="1"/>
</component>
<component id="n171_gmbn" name="btn_change" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2031,31" pivot="0.5,0.5" size="102,119" group="n138_lu84">
<gearDisplay controller="more" pages="1"/>
@ -184,13 +176,13 @@
<component id="n154_gi99" name="player_card_info2" src="gi9910k" fileName="Main_new/Main_new_4/Player_card_info_2.xml" xy="2130,153">
<gearDisplay controller="state" pages="1,3"/>
</component>
<component id="n155_gi99" name="player_card_info3" src="gi9910p" fileName="Main_new/Main_new_4/Player_card_info_3.xml" xy="515,33">
<component id="n155_gi99" name="player_card_info3" src="gi9910p" fileName="Main_new/Main_new_4/Player_card_info_3.xml" xy="515,30">
<gearDisplay controller="state" pages="1,3"/>
</component>
<component id="n156_gi99" name="player_card_info4" src="gi9910v" fileName="Main_new/Main_new_4/Player_card_info_4.xml" xy="310,204">
<gearDisplay controller="state" pages="1,3"/>
</component>
<component id="n118_pkx5" name="player_card_info1" src="kxhm10e" fileName="Main_new/Main_new_4/Player_card_info_1.xml" xy="7,975">
<component id="n118_pkx5" name="player_card_info1" src="kxhm10e" fileName="Main_new/Main_new_4/Player_card_info_1.xml" xy="8,975">
<gearDisplay controller="state" pages="1,3"/>
<relation target="" sidePair="center-center,bottom-bottom"/>
</component>
@ -249,5 +241,17 @@
<group id="n168_qz7i" name="showNext" xy="-125,-102" size="2832,1436" advanced="true">
<gearDisplay controller="showNext" pages="1"/>
</group>
<component id="n57_rayb" name="panel_record" src="gq7m4t" fileName="Main_style_2/record/Record.xml" xy="3,874" group="n59_v38k">
<gearDisplay controller="state" pages="3"/>
<relation target="" sidePair="center-center"/>
</component>
<component id="n56_cnxs" name="mask_tips" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="1261,480" group="n59_v38k">
<relation target="" sidePair="center-center"/>
</component>
<group id="n59_v38k" name="huifang" xy="3,480" size="2532,559"/>
<component id="n176_lj2n" name="btn_rule_back" src="lj2n17s" fileName="Main_new/Main/Component/btn_mul.xml" xy="212,36" size="115,111">
<gearDisplay controller="state" pages="3"/>
<Button icon="ui://v0j9abjylj2n17t"/>
</component>
</displayList>
</component>

4
wb_new_ui/assets/Main_Majiang/Main_style_2/record/Record.xml
View File

@ -26,7 +26,7 @@
<relation target="" sidePair="height-height%,left-left%"/>
<Button icon="ui://v0j9abjylj2n17v"/>
</component>
<text id="n12_tjv8" name="tex_speed" xy="299,43" size="64,78" font="ui://v0j9abjylj2n18c" fontSize="30" color="#ffffff" text="1">
<text id="n12_tjv8" name="tex_speed" xy="299,43" size="64,78" font="ui://27vd145blj2n18c" fontSize="30" color="#ffffff" text="1">
<gearDisplay controller="type" pages="0"/>
<relation target="" sidePair="height-height%,left-left%"/>
</text>
@ -47,7 +47,7 @@
<relation target="" sidePair="height-height%,left-left%"/>
<Button icon="ui://v0j9abjylj2n17y"/>
</component>
<image id="n17_lj2n" name="n17" src="lj2n18b" fileName="Main_new/record/font/x.png" xy="227,45" size="60,74">
<image id="n17_lj2n" name="n17" src="lj2n18b" fileName="Main_new/record/font/x.png" xy="227,45" size="60,74" pkg="27vd145b">
<relation target="" sidePair="height-height%,left-left%"/>
</image>
</displayList>

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

@ -1116,11 +1116,9 @@
<component id="nee311c" name="Main_new_3_jiangxi.xml" path="/Main_new/" exported="true"/>
<component id="nee311d" name="Player_card_info_3_1.xml" path="/Main_new/Main_new_3/"/>
<component id="nee311e" name="Player_card_info_3_2.xml" path="/Main_new/Main_new_3/"/>
<component id="nee311f" name="Comp_3_OutCard2.xml" path="/Main_new/Main_new_3/Component/"/>
<component id="nee311g" name="Comp_3_HandCard2.xml" path="/Main_new/Main_new_3/Component/"/>
<component id="nee311h" name="Player_card_info_3_3.xml" path="/Main_new/Main_new_3/"/>
<component id="nee311i" name="Comp_3_HandCard3.xml" path="/Main_new/Main_new_3/Component/"/>
<component id="nee311k" name="Comp_3_OutCard3.xml" path="/Main_new/Main_new_3/Component/"/>
<component id="ckvb11l" name="Comp_jing.xml" path="/Main_new/Main/Component/"/>
<component id="qz7i11m" name="Btn_Card_jiangxi_show.xml" path="/Main_new/Main/Component/allCardsToShow/"/>
<image id="qz7i11n" name="Polygon 7.png" path="/Main_new/Main/Image/"/>
@ -1350,18 +1348,6 @@
<image id="lj2n17y" name="mahj_restart_btn.png" path="/Main_new/record/"/>
<image id="lj2n17z" name="mahj_start_btn.png" path="/Main_new/record/"/>
<image id="lj2n180" name="stop.png" path="/Main_new/record/"/>
<image id="lj2n181" name="4919.png" path="/Main_new/record/font/"/>
<image id="lj2n182" name="4920.png" path="/Main_new/record/font/"/>
<image id="lj2n183" name="4921.png" path="/Main_new/record/font/"/>
<image id="lj2n184" name="4922.png" path="/Main_new/record/font/"/>
<image id="lj2n185" name="4923.png" path="/Main_new/record/font/"/>
<image id="lj2n186" name="4924.png" path="/Main_new/record/font/"/>
<image id="lj2n187" name="4925.png" path="/Main_new/record/font/"/>
<image id="lj2n188" name="4926.png" path="/Main_new/record/font/"/>
<image id="lj2n189" name="4927.png" path="/Main_new/record/font/"/>
<image id="lj2n18a" name="4928.png" path="/Main_new/record/font/"/>
<image id="lj2n18b" name="x.png" path="/Main_new/record/font/"/>
<font id="lj2n18c" name="MJ_recordSpeed.fnt" path="/Main_new/record/font/" exported="true"/>
<image id="lj2n18d" name="b203_101.png" path="/images/cards3/3/" exported="true"/>
<image id="lj2n18e" name="b203_501.png" path="/images/cards3/3/" exported="true"/>
<image id="lj2n18f" name="b203_404.png" path="/images/cards3/3/" exported="true"/>
@ -1396,6 +1382,11 @@
<image id="lj2n198" name="b203_206.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"/>
<component id="lj2n19d" name="Comp_HandCard4_Record.xml" path="/Main_new/Main_new_4/Component/" exported="true"/>
<component id="lj2n19e" name="Comp_3_HandCard2_Record.xml" path="/Main_new/Main_new_3/Component/"/>
<component id="lj2n19f" name="Comp_3_OutCard2.xml" path="/Main_new/Main_new_3/Component/"/>
<component id="lj2n19g" name="Comp_3_OutCard3.xml" path="/Main_new/Main_new_3/Component/"/>
</resources>
<publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/>
</packageDescription>