lingmeng
/
jx_client_neibu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

成员战绩调用接口

master
罗家炜 2025-08-28 19:15:06 +08:00
parent 1d938cdbac
commit 452ee62fe4
27 changed files with 337 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,7 +87,9 @@ end
--@function [parent=#BaseView] Destroy --@function [parent=#BaseView] Destroy
--@param self --@param self
function M:Destroy() function M:Destroy()
if self.Close then
self:Close() self:Close()
end
self._is_destroy = true self._is_destroy = true
self._root_view:Dispose() self._root_view:Dispose()
_views[self.class] = nil _views[self.class] = nil

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

@ -216,18 +216,16 @@ function FamilyNumberRecord.New(root, page)
self.rankNumber.round = 0 self.rankNumber.round = 0
end end
-- fgCtr:FG_GetConsumeStat(group_id, self.familyChooseTimeView:GetBeginTime(), self.familyChooseTimeView:GetEndTime(), fgCtr:FG_GetConsumeStat(group_id, self._data_leftTime, self._data_rightTime, function(res)
-- function(res) if res.ReturnCode ~= 0 then
-- pt(res) ViewUtil.ErrorTip(res.ReturnCode, "获取总信息失败")
-- if res.ReturnCode ~= 0 then else
-- ViewUtil.ShowOneChooose("获取总信息失败" .. res.ReturnCode)
-- else
-- MJScore = tonumber(res.Data.mj_score) -- MJScore = tonumber(res.Data.mj_score)
-- PKScore = tonumber(res.Data.pk_score) -- PKScore = tonumber(res.Data.pk_score)
-- text_score_majiang.text = 0 - MJScore -- text_score_majiang.text = 0 - MJScore
-- text_score_poker.text = 0 - PKScore -- text_score_poker.text = 0 - PKScore
-- end end
-- end) end)
return self return self
end end
@ -438,7 +436,7 @@ function M:NumverRankRenderer(groupId)
ImageLoad.Load(info.portrait, obj:GetChild('btn_head')._iconObject) ImageLoad.Load(info.portrait, obj:GetChild('btn_head')._iconObject)
obj:GetChild('text_ID').text = info.uid obj:GetChild('text_ID').text = info.uid
obj:GetChild('text_nick').text = info.nick obj:GetChild('text_nick').text = info.nick
obj:GetChild('text_score').text = tonumber(info.score) / 1000 obj:GetChild('text_score').text = tonumber(info.score)
obj:GetChild('btn_lookRecord').onClick:Set(function() obj:GetChild('btn_lookRecord').onClick:Set(function()
self.ctr_numberRecord.selectedIndex = 1 self.ctr_numberRecord.selectedIndex = 1
self:OnClickNumberRank(groupId, info.uid, info.round) self:OnClickNumberRank(groupId, info.uid, info.round)

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

@ -4,8 +4,10 @@ local TX_GameEvent = import(".GameEvent")
local PlayerInfoView = import(".EXPlayerInfoView") local PlayerInfoView = import(".EXPlayerInfoView")
local MJPlayerSelfCardInfoView = import(".MJPlayerSelfCardInfoView") local MJPlayerSelfCardInfoView = import(".MJPlayerSelfCardInfoView")
local MJPlayerCardInfoView = require("main.majiang.MJPlayerCardInfoView") local MJPlayerCardInfoView = require("main.majiang.MJPlayerCardInfoView")
local SettingView = import(".EXSettingView")
local TableBG = require("Game.Data.TableBG") local TableBG = require("Game.Data.TableBG")
local WitnessView = require("Game.View.WitnessView") local WitnessView = require("Game.View.WitnessView")
local MJMainView = require("main.majiang.MJMainView")
local Record_Event = import(".RecordEvent") local Record_Event = import(".RecordEvent")
@ -108,6 +110,29 @@ function M:InitView(url)
ViewManager.ChangeView(ViewManager.View_Family) ViewManager.ChangeView(ViewManager.View_Family)
end) end)
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._ctr_state.selectedIndex = 4 self._ctr_state.selectedIndex = 4
@ -167,7 +192,7 @@ function M:EventInit()
_gamectr:AddEventListener(TX_GameEvent.EventTurn, function(...) _gamectr:AddEventListener(TX_GameEvent.EventTurn, function(...)
print("lingmeng witness EventTurn") print("lingmeng witness EventTurn")
local arg = { ... } local arg = { ... }
self._left_time = 15 -- self._left_time = 15
local seat = arg[1] local seat = arg[1]
self:UpdateCardBox(self:GetPos(seat)) self:UpdateCardBox(self:GetPos(seat))
local playerInfo = self._player_info[self:GetPos(seat)] local playerInfo = self._player_info[self:GetPos(seat)]
@ -200,8 +225,8 @@ function M:EventInit()
info:UpdateOutCardList(nil, nil, self._cursor) info:UpdateOutCardList(nil, nil, self._cursor)
print("ling 2zhihouq") print("ling 2zhihouq")
self:PlaySound("FuZhou_MJ", p.self_user.sex, tostring(card)) -- self:PlaySound("FuZhou_MJ", p.self_user.sex, tostring(card))
self:PlayMJSound("chupai.mp3") -- self:PlayMJSound("chupai.mp3")
print("ling 2zhihou") print("ling 2zhihou")
if seat == _room.self_player.seat then if seat == _room.self_player.seat then
_room.curren_outcard_seat = -1 _room.curren_outcard_seat = -1
@ -227,13 +252,12 @@ function M:EventInit()
end) end)
_gamectr:AddEventListener(TX_GameEvent.ZPResult1, function(...) _gamectr:AddEventListener(TX_GameEvent.ZPResult1, function(...)
print("lingmeng witness ZPResult1") local _room = self._room
self._popEvent = false
self._left_time = 0 self._left_time = 0
self:UpdateCardBox(0) self:UpdateCardBox(0)
self._ctr_cardbox.selectedIndex = 0 self._ctr_cardbox.selectedIndex = 0
local arg = { ... } local arg = { ... }
self:ShowHand(arg) MJMainView.ShowHand(self, arg)
local result = arg[1] local result = arg[1]
local liuju = result.liuju local liuju = result.liuju
local data = result.info_list local data = result.info_list
@ -257,47 +281,15 @@ function M:EventInit()
self._popEvent = true self._popEvent = true
end) end)
end end
print("lingmeng witness ZPResult2")
if _room.curren_round ~= _room.room_config.round then if _room.curren_round ~= _room.room_config.round then
-- if #niao == 0 then self._view:GetChild("n13").visible = false end -- 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_score
if num >= 0 then
info._view:GetController("text_color").selectedIndex = 0
info._view:GetChild("text_jifen").text = "+" .. num --d2ad(num)
else
info._view:GetController("text_color").selectedIndex = 1
info._view:GetChild("text_jifen").text = num --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(...) self._clearingView:InitData(0, _room, result, nil, function(...)
DataManager.CurrenRoom.self_player.card_list = {} DataManager.CurrenRoom.self_player.card_list = {}
self._ctr_state.selectedIndex = 2 self._ctr_state.selectedIndex = 2
self._clearingView = nil self._clearingView = nil
end, 1) end)
end end
print("lingmeng witness ZPResult3")
-- self._player_card_info[1]:ShowHuTip()
end) end)
_gamectr:AddEventListener(TX_GameEvent.ZPResult2, function(...) _gamectr:AddEventListener(TX_GameEvent.ZPResult2, function(...)
@ -404,6 +396,7 @@ function M:OnUpdate()
else else
print("witness error") print("witness error")
print(result) print(result)
error(result)
-- self._gamectr = ControllerManager.GetController(GameController) -- self._gamectr = ControllerManager.GetController(GameController)
-- if self._gamectr then -- if self._gamectr then
-- self._gamectr:ResetConnect() -- self._gamectr:ResetConnect()

2
lua_probject/extend_project/extend/majiang/jinxi/CardCheck.lua
View File

@ -314,7 +314,7 @@ local function init(self,cardInhand,addCard,isZhong,qidui,eightLaizi)
return self:checkQidui() or self:tryWin() return self:checkQidui() or self:tryWin()
end end
local specialCardList={400,403,406,409,412,415,418} local specialCardList = { 401, 402, 403, 404, 405, 406, 407 }
function M.tingPai(cardInhand, isZhong, qidui, eightLaizi) function M.tingPai(cardInhand, isZhong, qidui, eightLaizi)
-- printlog("isZhong", isZhong) -- printlog("isZhong", isZhong)
-- printlog("qidui", qidui) -- printlog("qidui", qidui)

4
lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua
View File

@ -218,7 +218,6 @@ function M:fillResult0(room, peopleNum, result)
handCardList:SetVirtual() handCardList:SetVirtual()
handCardList.itemRenderer = function(index, obj) handCardList.itemRenderer = function(index, obj)
obj.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), infoList.hand_card[index + 1]) obj.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), infoList.hand_card[index + 1])
print("obj.icon")
if room.jing == infoList.hand_card[index + 1] then if room.jing == infoList.hand_card[index + 1] then
obj:GetController('jing').selectedIndex = 1 obj:GetController('jing').selectedIndex = 1
end end
@ -247,6 +246,9 @@ function M:fillResult0(room, peopleNum, result)
end end
huCardBtn.icon = string.format("ui://Main_Majiang/b202_%d", infoList.win_card) huCardBtn.icon = string.format("ui://Main_Majiang/b202_%d", infoList.win_card)
if room.jing == infoList.win_card then
huCardBtn:GetController('jing').selectedIndex = 1
end
huCardBtn.visible = true huCardBtn.visible = true
jiangMaList.visible = true jiangMaList.visible = true

4
lua_probject/extend_project/extend/majiang/jinxi/EXGameController.lua
View File

@ -245,6 +245,10 @@ function M:OnEventFzTips(evt_data)
-- end -- end
tiplist:AddTip(tip) tiplist:AddTip(tip)
end end
--排序规则，胡杠碰
tiplist:SortList(function(a, b)
return a.type < b.type
end)
DispatchEvent(self._dispatcher, TX_GameEvent.FZTips, tiplist, weight) DispatchEvent(self._dispatcher, TX_GameEvent.FZTips, tiplist, weight)
end) end)
end end

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

@ -177,9 +177,11 @@ function M:UpdatePlayerInfoView()
local list = self._room.player_list local list = self._room.player_list
for i = 1, self._room.room_config.people_num do for i = 1, self._room.room_config.people_num do
local tem = self._view:GetChild(string.format("player_info%d_%d", i, (self._state.selectedIndex % 2) + 1)) local seat = self:GetPos(list[i].seat)
_player_info[i] = PlayerInfoView.new(tem, self) local tem = self._view:GetChild(string.format("player_info%d_%d", seat, (self._state.selectedIndex % 2) + 1))
_player_info[i]:FillData(list[i]) _player_info[seat] = PlayerInfoView.new(tem, self)
_player_info[seat]:FillData(list[i])
printlog("lingmeng _player_info", tem, seat, list[i].self_user.nick_name)
end end
end end
@ -247,7 +249,7 @@ function M:EventInit()
end) end)
_gamectr:AddEventListener(TX_GameEvent.EventTurn, function(...) _gamectr:AddEventListener(TX_GameEvent.EventTurn, function(...)
local arg = { ... } local arg = { ... }
self._left_time = 15 -- self._left_time = 15
local seat = arg[1] local seat = arg[1]
self:UpdateCardBox(self:GetPos(seat)) self:UpdateCardBox(self:GetPos(seat))
-- if seat == self._room.self_player.seat then -- if seat == self._room.self_player.seat then
@ -264,7 +266,6 @@ function M:EventInit()
local _gcm_outcard_url = "ui://Main_Majiang/Gcm_OutCard" local _gcm_outcard_url = "ui://Main_Majiang/Gcm_OutCard"
_gamectr:AddEventListener(TX_GameEvent.OutCard, function(...) _gamectr:AddEventListener(TX_GameEvent.OutCard, function(...)
self:__CloseTip() self:__CloseTip()
self._left_time = 0
local arg = { ... } local arg = { ... }
local p = arg[1] local p = arg[1]
local card = arg[2] local card = arg[2]
@ -451,6 +452,7 @@ function M:EventInit()
self._clearingView:InitData(0, _room, result, nil, function(...) self._clearingView:InitData(0, _room, result, nil, function(...)
for i = 1, #data do for i = 1, #data do
local p = _room:GetPlayerBySeat(data[i].seat) local p = _room:GetPlayerBySeat(data[i].seat)
if p then
p.total_score = data[i].total_score p.total_score = data[i].total_score
local card_info = self._player_card_info[self:GetPos(p.seat)] local card_info = self._player_card_info[self:GetPos(p.seat)]
local info = self._player_info[self:GetPos(p.seat)] local info = self._player_info[self:GetPos(p.seat)]
@ -474,16 +476,17 @@ function M:EventInit()
info._view:GetController("piao_niao").selectedIndex = 0 info._view:GetController("piao_niao").selectedIndex = 0
p.fz_list = {} p.fz_list = {}
end end
end
DataManager.CurrenRoom.self_player.card_list = {} DataManager.CurrenRoom.self_player.card_list = {}
self._state.selectedIndex = 2 self._state.selectedIndex = 2
self._clearingView = nil self._clearingView = nil
end) end)
end end
-- self._player_card_info[1]:ShowHuTip() -- self._player_card_info[1]:ShowHuTip()]]
]]
end) end)
_gamectr:AddEventListener(TX_GameEvent.ZPResult2, function(...) _gamectr:AddEventListener(TX_GameEvent.ZPResult2, function(...)
self:PlayMJSound("end_music.mp3")
self:UnmarkSelfTuoguan() self:UnmarkSelfTuoguan()
self._left_time = 0 self._left_time = 0
self:UpdateCardBox(0) self:UpdateCardBox(0)
@ -550,6 +553,18 @@ function M:EventInit()
end end
self.showNextList.numItems = #cardSet self.showNextList.numItems = #cardSet
end) end)
--替换mianview的事件
_gamectr:AddEventListener(
GameEvent.PlayerState,
function(...)
printlog("lingmeng OnEventOnlineState")
local arg = { ... }
local p = arg[1]
local info = self._player_info[self:GetPos(p.seat)]
info._ctr_offline.selectedIndex = p.line_state == 0 and 1 or 0
end
)
end end
function M:OutCard(card) function M:OutCard(card)
@ -563,6 +578,7 @@ function M:OutCard(card)
info:UpdateHandCard() info:UpdateHandCard()
info:UpdateOutCardList(nil, card, self._cursor) info:UpdateOutCardList(nil, card, self._cursor)
info._ctr_tip.selectedIndex = 0
self:PlaySound("JinXi_MJ", self._room.self_player.self_user.sex, tostring(card)) self:PlaySound("JinXi_MJ", self._room.self_player.self_user.sex, tostring(card))
self:PlayMJSound("chupai.mp3") self:PlayMJSound("chupai.mp3")
-- self:ShowHuTip() -- self:ShowHuTip()
@ -636,21 +652,21 @@ function M:__FangziTip(tip, weight)
local _lit_fanzi = _chipeng_tip:GetChild("list") local _lit_fanzi = _chipeng_tip:GetChild("list")
--_lit_fanzi:SetVirtual() --_lit_fanzi:SetVirtual()
local _tlist = tip.tip_map_id local _tlist = tip.tip_sortList
_lit_fanzi.itemRenderer = function(index, obj) _lit_fanzi.itemRenderer = function(index, obj)
local type = obj:GetController('type') local type = obj:GetController('type')
if index == tip.tip_num then if index == tip.tip_num then
type.selectedIndex = 0 type.selectedIndex = 0
obj.onClick:Set(function() obj.onClick:Set(function()
--测试暂时取消过提示
-- local guo_msg = MsgWindow.new(self._root_view, "确定要点过吗？", MsgWindow.MsgMode.OkAndCancel)
-- guo_msg.onOk:Add(function()
_gamectr:SendAction(0)
_ctr_tips.selectedIndex = 0 _ctr_tips.selectedIndex = 0
-- guo_msg:Close() if tip.is_hu then
-- end) info._ctr_showGuoHu.selectedIndex = 1
-- guo_msg:Show() info._viewBtn_guoHu.onClick:Set(function()
_gamectr:SendAction(0)
end)
else
_gamectr:SendAction(0)
end
end) end)
else else
index = index + 1 index = index + 1
@ -893,7 +909,7 @@ function M:ReloadRoom(bskip)
end end
end end
self:ShowJing()
for i = 1, #room.player_list do for i = 1, #room.player_list do
local p = room.player_list[i] local p = room.player_list[i]
local info = self._player_card_info[self:GetPos(p.seat)] local info = self._player_card_info[self:GetPos(p.seat)]

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

@ -13,20 +13,19 @@ function EXSettingView:Show(room)
if roomOwner == DataManager.SelfUser.account_id then if roomOwner == DataManager.SelfUser.account_id then
self.cBtn.selectedIndex = 1 self.cBtn.selectedIndex = 1
--self.btn_closeRoom_cStyle = 1
else else
self.cBtn.selectedIndex = 0 self.cBtn.selectedIndex = 0
--self.btn_closeRoom_cStyle = 0
end end
BaseWindow.Show(self) BaseWindow.Show(self)
end end
function EXSettingView.new(main_view) function EXSettingView.new(main_view, flag_witness)
local self = setmetatable({}, { __index = M }) local self = setmetatable({}, { __index = M })
self.class = 'EXSettingView' self.class = 'EXSettingView'
self._close_destroy = true self._close_destroy = true
self._mainView = main_view self._mainView = main_view
self._flag_witness = flag_witness
self:init('ui://Main_Majiang/Setting') self:init('ui://Main_Majiang/Setting')
return self return self
end end
@ -39,12 +38,9 @@ function M:init(url)
local slider_music = view:GetChild('slider_vedio_music') local slider_music = view:GetChild('slider_vedio_music')
local btn_music = view:GetChild('btn_vedio_music') local btn_music = view:GetChild('btn_vedio_music')
local btn_sound = view:GetChild('btn_vedio_sound') local btn_sound = view:GetChild('btn_vedio_sound')
local btn_closeRoom = view:GetChild("btn_closeRoom")
--self.btn_closeRoom_cStyle = btn_closeRoom:GetController("cStyle")
self.cBtn = self._view:GetController('cBtn') self.cBtn = self._view:GetController('cBtn')
-- slider_sound.value = GameApplication.Instance.SoundValue -- slider_sound.value = GameApplication.Instance.SoundValue
-- slider_music.value = GameApplication.Instance.MusicValue -- slider_music.value = GameApplication.Instance.MusicValue
@ -70,15 +66,23 @@ function M:init(url)
local _btn_logout = self._view:GetChild('btn_cancelRoom') local _btn_logout = self._view:GetChild('btn_cancelRoom')
_btn_logout.onClick:Set(function() _btn_logout.onClick:Set(function()
if self._flag_witness then
local _room = DataManager.CurrenRoom
pt(_room)
self._mainView._gamectr:ExitWitnessGame(_room.play_id, _room.game_id,
_room.room_id)
ViewManager.ChangeView(ViewManager.View_Family)
else
if self._mainView.dismiss_room_cd_time > 0 then if self._mainView.dismiss_room_cd_time > 0 then
ViewUtil.ErrorTip(nil, "您还处于解散冷却时间当中，请稍后重试！") ViewUtil.ErrorTip(nil, "您还处于解散冷却时间当中，请稍后重试！")
else else
local _gamectr = ControllerManager.GetController(GameController) local _gamectr = ControllerManager.GetController(GameController)
_gamectr:AskDismissRoom() _gamectr:AskDismissRoom()
end end
end
end) end)
btn_closeRoom.onClick:Set(function() self._view:GetChild("btn_closeRoom").onClick:Set(function()
local _gamectr = ControllerManager.GetController(GameController) local _gamectr = ControllerManager.GetController(GameController)
_gamectr:LevelRoom(function(res) _gamectr:LevelRoom(function(res)
print("退出房间") print("退出房间")

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

@ -4,8 +4,10 @@ local TX_GameEvent = import(".GameEvent")
local PlayerInfoView = import(".EXPlayerInfoView") local PlayerInfoView = import(".EXPlayerInfoView")
local MJPlayerSelfCardInfoView = import(".MJPlayerSelfCardInfoView") local MJPlayerSelfCardInfoView = import(".MJPlayerSelfCardInfoView")
local MJPlayerCardInfoView = require("main.majiang.MJPlayerCardInfoView") local MJPlayerCardInfoView = require("main.majiang.MJPlayerCardInfoView")
local SettingView = import(".EXSettingView")
local TableBG = require("Game.Data.TableBG") local TableBG = require("Game.Data.TableBG")
local WitnessView = require("Game.View.WitnessView") local WitnessView = require("Game.View.WitnessView")
local MJMainView = require("main.majiang.MJMainView")
local Record_Event = import(".RecordEvent") local Record_Event = import(".RecordEvent")
@ -107,6 +109,29 @@ function M:InitView(url)
ViewManager.ChangeView(ViewManager.View_Family) ViewManager.ChangeView(ViewManager.View_Family)
end) end)
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._ctr_state.selectedIndex = 4 self._ctr_state.selectedIndex = 4
@ -166,7 +191,7 @@ function M:EventInit()
_gamectr:AddEventListener(TX_GameEvent.EventTurn, function(...) _gamectr:AddEventListener(TX_GameEvent.EventTurn, function(...)
print("lingmeng witness EventTurn") print("lingmeng witness EventTurn")
local arg = { ... } local arg = { ... }
self._left_time = 15 -- self._left_time = 15
local seat = arg[1] local seat = arg[1]
self:UpdateCardBox(self:GetPos(seat)) self:UpdateCardBox(self:GetPos(seat))
local playerInfo = self._player_info[self:GetPos(seat)] local playerInfo = self._player_info[self:GetPos(seat)]
@ -199,8 +224,8 @@ function M:EventInit()
info:UpdateOutCardList(nil, nil, self._cursor) info:UpdateOutCardList(nil, nil, self._cursor)
print("ling 2zhihouq") print("ling 2zhihouq")
self:PlaySound("JinXi_MJ", p.self_user.sex, tostring(card)) --self:PlaySound("JinXi_MJ", p.self_user.sex, tostring(card))
self:PlayMJSound("chupai.mp3") -- self:PlayMJSound("chupai.mp3")
print("ling 2zhihou") print("ling 2zhihou")
if seat == _room.self_player.seat then if seat == _room.self_player.seat then
_room.curren_outcard_seat = -1 _room.curren_outcard_seat = -1
@ -226,13 +251,12 @@ function M:EventInit()
end) end)
_gamectr:AddEventListener(TX_GameEvent.ZPResult1, function(...) _gamectr:AddEventListener(TX_GameEvent.ZPResult1, function(...)
print("lingmeng witness ZPResult1") local _room = self._room
self._popEvent = false
self._left_time = 0 self._left_time = 0
self:UpdateCardBox(0) self:UpdateCardBox(0)
self._ctr_cardbox.selectedIndex = 0 self._ctr_cardbox.selectedIndex = 0
local arg = { ... } local arg = { ... }
self:ShowHand(arg) MJMainView.ShowHand(self, arg)
local result = arg[1] local result = arg[1]
local liuju = result.liuju local liuju = result.liuju
local data = result.info_list local data = result.info_list
@ -256,47 +280,15 @@ function M:EventInit()
self._popEvent = true self._popEvent = true
end) end)
end end
print("lingmeng witness ZPResult2")
if _room.curren_round ~= _room.room_config.round then if _room.curren_round ~= _room.room_config.round then
-- if #niao == 0 then self._view:GetChild("n13").visible = false end -- 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_score
if num >= 0 then
info._view:GetController("text_color").selectedIndex = 0
info._view:GetChild("text_jifen").text = "+" .. num --d2ad(num)
else
info._view:GetController("text_color").selectedIndex = 1
info._view:GetChild("text_jifen").text = num --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(...) self._clearingView:InitData(0, _room, result, nil, function(...)
DataManager.CurrenRoom.self_player.card_list = {} DataManager.CurrenRoom.self_player.card_list = {}
self._ctr_state.selectedIndex = 2 self._ctr_state.selectedIndex = 2
self._clearingView = nil self._clearingView = nil
end, 1) end)
end end
print("lingmeng witness ZPResult3")
-- self._player_card_info[1]:ShowHuTip()
end) end)
_gamectr:AddEventListener(TX_GameEvent.ZPResult2, function(...) _gamectr:AddEventListener(TX_GameEvent.ZPResult2, function(...)
@ -365,16 +357,11 @@ function M:UpdateCardBox(seat)
end end
function M:OnFangziAction(...) function M:OnFangziAction(...)
print("lingmeng OnFangziAction")
-- self:__CloseTip()
print("lingmeng OnFangziAction1")
local arg = { ... } local arg = { ... }
local _player_card_info = self._player_card_info local _player_card_info = self._player_card_info
local fz = arg[1] local fz = arg[1]
local player = arg[2] local player = arg[2]
local index = arg[3] local index = arg[3]
printlog("OnFangziAction")
local info = _player_card_info[self:GetPos(player.seat)] local info = _player_card_info[self:GetPos(player.seat)]
-- local pNode = info._mask_liangpai -- local pNode = info._mask_liangpai
@ -383,13 +370,11 @@ function M:OnFangziAction(...)
local fs_info = _player_card_info[self:GetPos(fz.from_seat)] local fs_info = _player_card_info[self:GetPos(fz.from_seat)]
fs_info:UpdateOutCardList() fs_info:UpdateOutCardList()
end end
print("lingmeng OnFangziAction5")
info:UpdateFzList(fz, index, true) info:UpdateFzList(fz, index, true)
local getcard = fz.type == FZType.Peng or fz.type == FZType.Chi local getcard = fz.type == FZType.Peng or fz.type == FZType.Chi
printlog(getcard) --printlog(getcard)
print("lingmeng hand_left_count", info._player.hand_left_count)
info._player.hand_left_count = info._player.hand_left_count - 1 info._player.hand_left_count = info._player.hand_left_count - 1
info:UpdateHandCardWitness(true) info:UpdateHandCardWitness(true)
-- self:__CloseTip() -- self:__CloseTip()
@ -410,6 +395,7 @@ function M:OnUpdate()
else else
print("witness error") print("witness error")
print(result) print(result)
error(result)
-- self._gamectr = ControllerManager.GetController(GameController) -- self._gamectr = ControllerManager.GetController(GameController)
-- if self._gamectr then -- if self._gamectr then
-- self._gamectr:ResetConnect() -- self._gamectr:ResetConnect()

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

@ -75,6 +75,8 @@ function M:FillRoomData(s2croom)
local playerList = _tableInfo["playerData"] local playerList = _tableInfo["playerData"]
room.curren_round = _tableInfo["round"] room.curren_round = _tableInfo["round"]
room.witness_player_list = _tableInfo["playerSpectatorData"]
room._flag_updateWitness = true
self:FillPlayerData(playerList) self:FillPlayerData(playerList)
if (reload) then if (reload) then
@ -94,6 +96,7 @@ function M:FillRoomData(s2croom)
room.curren_outcard_seat = _reloadInfo["curren_outcard_seat"] room.curren_outcard_seat = _reloadInfo["curren_outcard_seat"]
room.last_outcard_seat = last_outcard_seat room.last_outcard_seat = last_outcard_seat
room.playing = playing room.playing = playing
room.reload = reload
if jing then if jing then
room.jing = jing room.jing = jing
end end

16
lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua
View File

@ -5,7 +5,7 @@ local EXClearingView = {}
local M = EXClearingView local M = EXClearingView
function EXClearingView.new(blur_view) function EXClearingView.new(blur_view, data)
setmetatable(M, { __index = ResultView }) setmetatable(M, { __index = ResultView })
local self = setmetatable({}, { __index = M }) local self = setmetatable({}, { __index = M })
self._full = true self._full = true
@ -16,6 +16,9 @@ function EXClearingView.new(blur_view)
self._currenIndex = 0 self._currenIndex = 0
self._blur_view = blur_view self._blur_view = blur_view
self._close_zone = false self._close_zone = false
if data then
self.flag_back = data.flag_back
end
-- self:InitMaPai() -- self:InitMaPai()
return self return self
@ -49,10 +52,19 @@ function M:InitData(over, room, result, total_result, callback, isWitness, witne
local playerNum = self._view:GetController("playerNum") local playerNum = self._view:GetController("playerNum")
local showBtnTypeCtr = self._view:GetController("showType") local showBtnTypeCtr = self._view:GetController("showType")
--回放不需要显示还剩下多少牌
if self.flag_back then
result.cardList = {}
mainCtr.selectedIndex = 1
nextRoundBtn2.touchable = false
else
if result then if result then
if result.cardList then
result.cardList = json.decode(result.cardList) result.cardList = json.decode(result.cardList)
--table.sort(result.cardList)
end end
end
end
self.list_lastCard = self._view:GetChild('list_lastCard') self.list_lastCard = self._view:GetChild('list_lastCard')
self.list_lastCard:SetVirtual() self.list_lastCard:SetVirtual()

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

@ -139,12 +139,12 @@ function M:ShowStep(index)
end end
if step.cmd == Record_Event.Evt_Result then if step.cmd == Record_Event.Evt_Result then
if not self.result then if not self.result then
self.result = EXClearingView.new(self._root_view, true) self.result = EXClearingView.new(self._root_view, { flag_back = true })
self.result:InitData(0, self._room, step.result_data) self.result:InitData(0, self._room, step.result_data)
self.result._view.x = (GRoot.inst.width - self.result._view.width) * -0.5 self.result._view.x = (GRoot.inst.width - self.result._view.width) * -0.5
self.result._view.width = GRoot.inst.width self.result._view.width = GRoot.inst.width
self.result._view.height = GRoot.inst.height self.result._view.height = GRoot.inst.height
self.result._view:GetChild("btn_confirm").visible = false -- self.result._view:GetChild("btn_confirm").visible = false
self._anchor:AddChild(self.result._view) self._anchor:AddChild(self.result._view)
self.result._view.x = self._anchor.x * -1 self.result._view.x = self._anchor.x * -1
self.result._view.y = self._anchor.y * -1 self.result._view.y = self._anchor.y * -1
@ -152,10 +152,10 @@ function M:ShowStep(index)
self.result._view.visible = true self.result._view.visible = true
end end
-- self.result._view:Center() -- self.result._view:Center()
else -- else
if self.result then -- if self.result then
self.result._view.visible = false -- self.result._view.visible = false
end -- end
end end
end end

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

@ -273,12 +273,14 @@ function M:EventInit()
-- end) -- end)
-- end -- end
self:RemoveCursor() self:RemoveCursor()
if self._clearingView == nil then
self._clearingView = EXClearingView.new(self._root_view) self._clearingView = EXClearingView.new(self._root_view)
coroutine.start(function() coroutine.start(function()
coroutine.wait(0.5) coroutine.wait(0.5)
self._clearingView:Show() self._clearingView:Show()
self._popEvent = true self._popEvent = true
end) end)
end
if _room.curren_round ~= _room.room_config.round then if _room.curren_round ~= _room.room_config.round then
-- if #niao == 0 then self._view:GetChild("n13").visible = false end -- if #niao == 0 then self._view:GetChild("n13").visible = false end
@ -357,16 +359,11 @@ function M:UpdateCardBox(seat)
end end
function M:OnFangziAction(...) function M:OnFangziAction(...)
print("lingmeng OnFangziAction")
-- self:__CloseTip()
print("lingmeng OnFangziAction1")
local arg = { ... } local arg = { ... }
local _player_card_info = self._player_card_info local _player_card_info = self._player_card_info
local fz = arg[1] local fz = arg[1]
local player = arg[2] local player = arg[2]
local index = arg[3] local index = arg[3]
printlog("OnFangziAction")
local info = _player_card_info[self:GetPos(player.seat)] local info = _player_card_info[self:GetPos(player.seat)]
-- local pNode = info._mask_liangpai -- local pNode = info._mask_liangpai
@ -375,13 +372,11 @@ function M:OnFangziAction(...)
local fs_info = _player_card_info[self:GetPos(fz.from_seat)] local fs_info = _player_card_info[self:GetPos(fz.from_seat)]
fs_info:UpdateOutCardList() fs_info:UpdateOutCardList()
end end
print("lingmeng OnFangziAction5")
info:UpdateFzList(fz, index, true) info:UpdateFzList(fz, index, true)
local getcard = fz.type == FZType.Peng or fz.type == FZType.Chi local getcard = fz.type == FZType.Peng or fz.type == FZType.Chi
printlog(getcard) --printlog(getcard)
print("lingmeng hand_left_count", info._player.hand_left_count)
info._player.hand_left_count = info._player.hand_left_count - 1 info._player.hand_left_count = info._player.hand_left_count - 1
info:UpdateHandCardWitness(true) info:UpdateHandCardWitness(true)
-- self:__CloseTip() -- self:__CloseTip()

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

@ -62,9 +62,7 @@ function M:FillRoomConfig(room, _config)
end end
function M:FillRoomData(s2croom) function M:FillRoomData(s2croom)
print("==========================FillRoomData1")
local room = DataManager.CurrenRoom local room = DataManager.CurrenRoom
pt(room)
local reload = s2croom["reload"] local reload = s2croom["reload"]

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

@ -314,7 +314,7 @@ local function init(self,cardInhand,addCard,isZhong,qidui,eightLaizi)
return self:checkQidui() or self:tryWin() return self:checkQidui() or self:tryWin()
end end
local specialCardList={400,403,406,409,412,415,418} local specialCardList = { 401, 402, 403, 404, 405, 406, 407 }
function M.tingPai(cardInhand, isZhong, qidui, eightLaizi) function M.tingPai(cardInhand, isZhong, qidui, eightLaizi)
-- printlog("isZhong", isZhong) -- printlog("isZhong", isZhong)
-- printlog("qidui", qidui) -- printlog("qidui", qidui)

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

@ -86,7 +86,6 @@ function M:InitData(over, room, result, total_result, callback, isWitness, witne
end) end)
if over == 0 then if over == 0 then
mainCtr.selectedIndex = 1
showBtnTypeCtr.selectedIndex = 0 showBtnTypeCtr.selectedIndex = 0
_overCtr.selectedIndex = 0 _overCtr.selectedIndex = 0
self:fillResult0(room, peopleNum, result) self:fillResult0(room, peopleNum, result)
@ -103,6 +102,7 @@ function M:InitData(over, room, result, total_result, callback, isWitness, witne
end end
end) end)
elseif over == 1 then elseif over == 1 then
mainCtr.selectedIndex = 1
showBtnTypeCtr.selectedIndex = 1 showBtnTypeCtr.selectedIndex = 1
self:fillResult1(room, peopleNum, total_result) self:fillResult1(room, peopleNum, total_result)
if result then if result then

4
lua_probject/extend_project/extend/majiang/nancheng/EXGameController.lua
View File

@ -245,6 +245,10 @@ function M:OnEventFzTips(evt_data)
-- end -- end
tiplist:AddTip(tip) tiplist:AddTip(tip)
end end
--排序规则，胡杠碰
tiplist:SortList(function(a, b)
return a.type < b.type
end)
DispatchEvent(self._dispatcher, TX_GameEvent.FZTips, tiplist, weight) DispatchEvent(self._dispatcher, TX_GameEvent.FZTips, tiplist, weight)
end) end)
end end

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

@ -175,9 +175,11 @@ function M:UpdatePlayerInfoView()
local list = self._room.player_list local list = self._room.player_list
for i = 1, self._room.room_config.people_num do for i = 1, self._room.room_config.people_num do
local tem = self._view:GetChild(string.format("player_info%d_%d", i, (self._state.selectedIndex % 2) + 1)) local seat = self:GetPos(list[i].seat)
_player_info[i] = PlayerInfoView.new(tem, self) local tem = self._view:GetChild(string.format("player_info%d_%d", seat, (self._state.selectedIndex % 2) + 1))
_player_info[i]:FillData(list[i]) _player_info[seat] = PlayerInfoView.new(tem, self)
_player_info[seat]:FillData(list[i])
printlog("lingmeng _player_info", tem, seat, list[i].self_user.nick_name)
end end
end end
@ -227,6 +229,7 @@ function M:EventInit()
_gamectr:AddEventListener(TX_GameEvent.SendCards, function(...) _gamectr:AddEventListener(TX_GameEvent.SendCards, function(...)
-- self:ShowHuTip() -- self:ShowHuTip()
--测试用记录出牌权次数
--self._viewText_testName.text = 0 --self._viewText_testName.text = 0
self:UpdateRound() self:UpdateRound()
self._state.selectedIndex = 1 self._state.selectedIndex = 1
@ -245,7 +248,7 @@ function M:EventInit()
end) end)
_gamectr:AddEventListener(TX_GameEvent.EventTurn, function(...) _gamectr:AddEventListener(TX_GameEvent.EventTurn, function(...)
local arg = { ... } local arg = { ... }
self._left_time = 15 -- self._left_time = 15
local seat = arg[1] local seat = arg[1]
self:UpdateCardBox(self:GetPos(seat)) self:UpdateCardBox(self:GetPos(seat))
-- if seat == self._room.self_player.seat then -- if seat == self._room.self_player.seat then
@ -402,17 +405,16 @@ function M:EventInit()
end) end)
_gamectr:AddEventListener(TX_GameEvent.EventNiao, function(...) _gamectr:AddEventListener(TX_GameEvent.EventNiao, function(...)
print("lingmengniaoadd")
local arg = { ... } local arg = { ... }
self._popEvent = false self._popEvent = false
local list = arg[1] local list = arg[1]
local start_seat = arg[2] local start_seat = arg[2]
-- ViewUtil.PlaySound("NanCheng_MJ", "extend/majiang/chaozhou/sound/zhuaniao.mp3") -- ViewUtil.PlaySound("NanCheng_MJ", "extend/majiang/chaozhou/sound/zhuaniao.mp3")
print("lingmengniaoadd2")
coroutine.start(self.RunNiao, self, list, start_seat) coroutine.start(self.RunNiao, self, list, start_seat)
end) end)
_gamectr:AddEventListener(TX_GameEvent.ZPResult1, function(...) _gamectr:AddEventListener(TX_GameEvent.ZPResult1, function(...)
self:PlayMJSound("end_music.mp3")
MJMainView.OnResult1(self, ...) MJMainView.OnResult1(self, ...)
--[[ --[[
self._popEvent = false self._popEvent = false
@ -451,6 +453,7 @@ function M:EventInit()
self._clearingView:InitData(0, _room, result, nil, function(...) self._clearingView:InitData(0, _room, result, nil, function(...)
for i = 1, #data do for i = 1, #data do
local p = _room:GetPlayerBySeat(data[i].seat) local p = _room:GetPlayerBySeat(data[i].seat)
if p then
p.total_score = data[i].total_score p.total_score = data[i].total_score
local card_info = self._player_card_info[self:GetPos(p.seat)] local card_info = self._player_card_info[self:GetPos(p.seat)]
local info = self._player_info[self:GetPos(p.seat)] local info = self._player_info[self:GetPos(p.seat)]
@ -474,6 +477,7 @@ function M:EventInit()
info._view:GetController("piao_niao").selectedIndex = 0 info._view:GetController("piao_niao").selectedIndex = 0
p.fz_list = {} p.fz_list = {}
end end
end
DataManager.CurrenRoom.self_player.card_list = {} DataManager.CurrenRoom.self_player.card_list = {}
self._state.selectedIndex = 2 self._state.selectedIndex = 2
self._clearingView = nil self._clearingView = nil
@ -550,6 +554,18 @@ function M:EventInit()
end end
self.showNextList.numItems = #cardSet self.showNextList.numItems = #cardSet
end) end)
--替换mianview的事件
_gamectr:AddEventListener(
GameEvent.PlayerState,
function(...)
printlog("lingmeng OnEventOnlineState")
local arg = { ... }
local p = arg[1]
local info = self._player_info[self:GetPos(p.seat)]
info._ctr_offline.selectedIndex = p.line_state == 0 and 1 or 0
end
)
end end
function M:OutCard(card) function M:OutCard(card)
@ -563,6 +579,7 @@ function M:OutCard(card)
info:UpdateHandCard() info:UpdateHandCard()
info:UpdateOutCardList(nil, card, self._cursor) info:UpdateOutCardList(nil, card, self._cursor)
info._ctr_tip.selectedIndex = 0
self:PlaySound("NanCheng_MJ", self._room.self_player.self_user.sex, tostring(card)) self:PlaySound("NanCheng_MJ", self._room.self_player.self_user.sex, tostring(card))
self:PlayMJSound("chupai.mp3") self:PlayMJSound("chupai.mp3")
-- self:ShowHuTip() -- self:ShowHuTip()
@ -636,21 +653,21 @@ function M:__FangziTip(tip, weight)
local _lit_fanzi = _chipeng_tip:GetChild("list") local _lit_fanzi = _chipeng_tip:GetChild("list")
--_lit_fanzi:SetVirtual() --_lit_fanzi:SetVirtual()
local _tlist = tip.tip_map_id local _tlist = tip.tip_sortList
_lit_fanzi.itemRenderer = function(index, obj) _lit_fanzi.itemRenderer = function(index, obj)
local type = obj:GetController('type') local type = obj:GetController('type')
if index == tip.tip_num then if index == tip.tip_num then
type.selectedIndex = 0 type.selectedIndex = 0
obj.onClick:Set(function() obj.onClick:Set(function()
--测试暂时取消过提示
-- local guo_msg = MsgWindow.new(self._root_view, "确定要点过吗？", MsgWindow.MsgMode.OkAndCancel)
-- guo_msg.onOk:Add(function()
_gamectr:SendAction(0)
_ctr_tips.selectedIndex = 0 _ctr_tips.selectedIndex = 0
-- guo_msg:Close() if tip.is_hu then
-- end) info._ctr_showGuoHu.selectedIndex = 1
-- guo_msg:Show() info._viewBtn_guoHu.onClick:Set(function()
_gamectr:SendAction(0)
end)
else
_gamectr:SendAction(0)
end
end) end)
else else
index = index + 1 index = index + 1
@ -894,7 +911,7 @@ function M:ReloadRoom(bskip)
end end
end end
self:ShowJing()
for i = 1, #room.player_list do for i = 1, #room.player_list do
local p = room.player_list[i] local p = room.player_list[i]
local info = self._player_card_info[self:GetPos(p.seat)] local info = self._player_card_info[self:GetPos(p.seat)]

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

@ -20,7 +20,7 @@ end
function M:InitView(url) function M:InitView(url)
local room = self._room local room = self._room
UIPackage.AddPackage("extend/majiang/nancheng/ui/Extend_MJ_NanCheng") UIPackage.AddPackage("extend/majiang/nancheng/ui/Extend_MJ_NanCheng")
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") local _cardbox = self._view:GetChild("cardbox")
--self._view:GetChild("panel_record"):GetChild("btn_LastStep").enabled = false --self._view:GetChild("panel_record"):GetChild("btn_LastStep").enabled = false
self._ctr_cardbox = _cardbox:GetController("c1") self._ctr_cardbox = _cardbox:GetController("c1")

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

@ -4,8 +4,10 @@ local TX_GameEvent = import(".GameEvent")
local PlayerInfoView = import(".EXPlayerInfoView") local PlayerInfoView = import(".EXPlayerInfoView")
local MJPlayerSelfCardInfoView = import(".MJPlayerSelfCardInfoView") local MJPlayerSelfCardInfoView = import(".MJPlayerSelfCardInfoView")
local MJPlayerCardInfoView = require("main.majiang.MJPlayerCardInfoView") local MJPlayerCardInfoView = require("main.majiang.MJPlayerCardInfoView")
local SettingView = import(".EXSettingView")
local TableBG = require("Game.Data.TableBG") local TableBG = require("Game.Data.TableBG")
local WitnessView = require("Game.View.WitnessView") local WitnessView = require("Game.View.WitnessView")
local MJMainView = require("main.majiang.MJMainView")
local Record_Event = import(".RecordEvent") local Record_Event = import(".RecordEvent")
@ -107,6 +109,29 @@ function M:InitView(url)
ViewManager.ChangeView(ViewManager.View_Family) ViewManager.ChangeView(ViewManager.View_Family)
end) end)
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._ctr_state.selectedIndex = 4 self._ctr_state.selectedIndex = 4
@ -166,7 +191,7 @@ function M:EventInit()
_gamectr:AddEventListener(TX_GameEvent.EventTurn, function(...) _gamectr:AddEventListener(TX_GameEvent.EventTurn, function(...)
print("lingmeng witness EventTurn") print("lingmeng witness EventTurn")
local arg = { ... } local arg = { ... }
self._left_time = 15 -- self._left_time = 15
local seat = arg[1] local seat = arg[1]
self:UpdateCardBox(self:GetPos(seat)) self:UpdateCardBox(self:GetPos(seat))
local playerInfo = self._player_info[self:GetPos(seat)] local playerInfo = self._player_info[self:GetPos(seat)]
@ -199,8 +224,8 @@ function M:EventInit()
info:UpdateOutCardList(nil, nil, self._cursor) info:UpdateOutCardList(nil, nil, self._cursor)
print("ling 2zhihouq") print("ling 2zhihouq")
self:PlaySound("NanCheng_MJ", p.self_user.sex, tostring(card)) --self:PlaySound("NanCheng_MJ", p.self_user.sex, tostring(card))
self:PlayMJSound("chupai.mp3") -- self:PlayMJSound("chupai.mp3")
print("ling 2zhihou") print("ling 2zhihou")
if seat == _room.self_player.seat then if seat == _room.self_player.seat then
_room.curren_outcard_seat = -1 _room.curren_outcard_seat = -1
@ -226,13 +251,12 @@ function M:EventInit()
end) end)
_gamectr:AddEventListener(TX_GameEvent.ZPResult1, function(...) _gamectr:AddEventListener(TX_GameEvent.ZPResult1, function(...)
print("lingmeng witness ZPResult1") local _room = self._room
self._popEvent = false
self._left_time = 0 self._left_time = 0
self:UpdateCardBox(0) self:UpdateCardBox(0)
self._ctr_cardbox.selectedIndex = 0 self._ctr_cardbox.selectedIndex = 0
local arg = { ... } local arg = { ... }
self:ShowHand(arg) MJMainView.ShowHand(self, arg)
local result = arg[1] local result = arg[1]
local liuju = result.liuju local liuju = result.liuju
local data = result.info_list local data = result.info_list
@ -256,47 +280,15 @@ function M:EventInit()
self._popEvent = true self._popEvent = true
end) end)
end end
print("lingmeng witness ZPResult2")
if _room.curren_round ~= _room.room_config.round then if _room.curren_round ~= _room.room_config.round then
-- if #niao == 0 then self._view:GetChild("n13").visible = false end -- 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_score
if num >= 0 then
info._view:GetController("text_color").selectedIndex = 0
info._view:GetChild("text_jifen").text = "+" .. num --d2ad(num)
else
info._view:GetController("text_color").selectedIndex = 1
info._view:GetChild("text_jifen").text = num --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(...) self._clearingView:InitData(0, _room, result, nil, function(...)
DataManager.CurrenRoom.self_player.card_list = {} DataManager.CurrenRoom.self_player.card_list = {}
self._ctr_state.selectedIndex = 2 self._ctr_state.selectedIndex = 2
self._clearingView = nil self._clearingView = nil
end, 1) end)
end end
print("lingmeng witness ZPResult3")
-- self._player_card_info[1]:ShowHuTip()
end) end)
_gamectr:AddEventListener(TX_GameEvent.ZPResult2, function(...) _gamectr:AddEventListener(TX_GameEvent.ZPResult2, function(...)
@ -365,16 +357,11 @@ function M:UpdateCardBox(seat)
end end
function M:OnFangziAction(...) function M:OnFangziAction(...)
print("lingmeng OnFangziAction")
-- self:__CloseTip()
print("lingmeng OnFangziAction1")
local arg = { ... } local arg = { ... }
local _player_card_info = self._player_card_info local _player_card_info = self._player_card_info
local fz = arg[1] local fz = arg[1]
local player = arg[2] local player = arg[2]
local index = arg[3] local index = arg[3]
printlog("OnFangziAction")
local info = _player_card_info[self:GetPos(player.seat)] local info = _player_card_info[self:GetPos(player.seat)]
-- local pNode = info._mask_liangpai -- local pNode = info._mask_liangpai
@ -383,13 +370,11 @@ function M:OnFangziAction(...)
local fs_info = _player_card_info[self:GetPos(fz.from_seat)] local fs_info = _player_card_info[self:GetPos(fz.from_seat)]
fs_info:UpdateOutCardList() fs_info:UpdateOutCardList()
end end
print("lingmeng OnFangziAction5")
info:UpdateFzList(fz, index, true) info:UpdateFzList(fz, index, true)
local getcard = fz.type == FZType.Peng or fz.type == FZType.Chi local getcard = fz.type == FZType.Peng or fz.type == FZType.Chi
printlog(getcard) --printlog(getcard)
print("lingmeng hand_left_count", info._player.hand_left_count)
info._player.hand_left_count = info._player.hand_left_count - 1 info._player.hand_left_count = info._player.hand_left_count - 1
info:UpdateHandCardWitness(true) info:UpdateHandCardWitness(true)
-- self:__CloseTip() -- self:__CloseTip()
@ -410,6 +395,7 @@ function M:OnUpdate()
else else
print("witness error") print("witness error")
print(result) print(result)
error(result)
-- self._gamectr = ControllerManager.GetController(GameController) -- self._gamectr = ControllerManager.GetController(GameController)
-- if self._gamectr then -- if self._gamectr then
-- self._gamectr:ResetConnect() -- self._gamectr:ResetConnect()

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

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

2
wb_new_ui/assets/Family/NumberRecord/Component/combBox_sort_item.xml
View File

@ -2,7 +2,7 @@
<component size="306,72" extention="Button"> <component size="306,72" extention="Button">
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/> <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
<displayList> <displayList>
<text id="n2_jydr" name="title" xy="0,0" size="306,72" font="ui://27vd145bh35o7im8" fontSize="54" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" singleLine="true" text="2025-07-07"> <text id="n2_jydr" name="title" xy="0,0" size="306,72" font="ui://27vd145bh35o7il1" fontSize="54" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" singleLine="true" text="2025-07-07">
<relation target="" sidePair="width-width,height-height"/> <relation target="" sidePair="width-width,height-height"/>
</text> </text>
</displayList> </displayList>

48
wb_new_ui/assets/Lobby/component/CreatePlay/Component/com_editSetting.xml
View File

@ -1,106 +1,106 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="1906,600"> <component size="1906,600">
<controller name="cGps" homePageType="specific" homePage="1" pages="2,,0,,1," selected="0"/> <controller name="cGps" homePageType="specific" homePage="1" pages="2,,0,,1," selected="2"/>
<controller name="cTuoguan" pages="0,,1,,2,,3," selected="0"/> <controller name="cTuoguan" pages="0,,1,,2,,3," selected="0"/>
<controller name="cJiesan" pages="0,,1,,2,,3," selected="0"/> <controller name="cJiesan" pages="0,,1,,2,,3," selected="0"/>
<controller name="cGongneng" pages="0,,1," selected="0"/> <controller name="cGongneng" pages="0,,1," selected="0"/>
<controller name="cChat" pages="0,,1," selected="0"/> <controller name="cChat" pages="0,,1," selected="0"/>
<controller name="cMisslie" pages="0,,1," selected="0"/> <controller name="cMisslie" pages="0,,1," selected="0"/>
<displayList> <displayList>
<text id="n0_f8c3" name="n0" xy="220,0" size="134,87" group="n6_f8c3" font="ui://27vd145bh35o7im7" fontSize="66" color="#450f05" text="定位"> <text id="n0_f8c3" name="n0" xy="220,0" size="134,86" group="n6_f8c3" font="ui://27vd145bh35o7im7" fontSize="66" color="#450f05" text="定位">
<relation target="" sidePair="right-right"/> <relation target="" sidePair="right-right"/>
</text> </text>
<component id="n1_f8c3" name="n1" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" xy="857,9" size="66,66" group="n6_f8c3"> <component id="n1_f8c3" name="n1" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" xy="854,9" size="66,66" group="n6_f8c3">
<Button controller="cGps" page="0"/> <Button controller="cGps" page="0"/>
</component> </component>
<text id="n2_f8c3" name="n2" xy="947,7" size="363,71" group="n6_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="限制距离100米"> <text id="n2_f8c3" name="n2" xy="944,7" size="363,72" group="n6_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="限制距离500米">
<gearColor controller="cGps" pages="2,1" values="#450f05,#000000|#450f05,#000000" default="#51933c,#000000"/> <gearColor controller="cGps" pages="2,1" values="#450f05,#000000|#450f05,#000000" default="#51933c,#000000"/>
</text> </text>
<component id="n3_f8c3" name="n3" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" xy="1330,10" size="66,66" group="n6_f8c3"> <component id="n3_f8c3" name="n3" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" xy="383,10" size="66,66" group="n6_f8c3">
<Button controller="cGps" page="1"/> <Button checked="true" controller="cGps" page="1"/>
</component> </component>
<text id="n4_f8c3" name="n4" xy="1420,7" size="363,71" group="n6_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="限制距离500米"> <text id="n4_f8c3" name="n4" xy="473,7" size="270,72" group="n6_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#51933c" text="限制不距离">
<gearColor controller="cGps" pages="1" values="#51933c,#000000" default="#450f05,#000000"/> <gearColor controller="cGps" pages="1" values="#51933c,#000000" default="#450f05,#000000"/>
</text> </text>
<component id="n7_f8c3" name="n7" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" xy="383,10" size="66,66" group="n6_f8c3"> <component id="n7_f8c3" name="n7" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" xy="1326,10" size="66,66" group="n6_f8c3">
<Button checked="true" controller="cGps" page="2"/> <Button controller="cGps" page="2"/>
</component> </component>
<text id="n8_f8c3" name="n8" xy="473,7" size="270,71" group="n6_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#51933c" text="距离不限制"> <text id="n8_f8c3" name="n8" xy="1416,7" size="363,72" group="n6_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="限制距离100米">
<gearColor controller="cGps" pages="2" values="#51933c,#000000" default="#450f05,#000000"/> <gearColor controller="cGps" pages="2" values="#51933c,#000000" default="#450f05,#000000"/>
</text> </text>
<image id="n5_f8c3" name="n5" src="pzuc7cx6" fileName="component/CreatePlay/Image/Line 2.png" xy="195,90" size="1515,3" group="n6_f8c3"/> <image id="n5_f8c3" name="n5" src="pzuc7cx6" fileName="component/CreatePlay/Image/Line 2.png" xy="195,90" size="1515,3" group="n6_f8c3"/>
<group id="n6_f8c3" name="gps" xy="195,0" size="1588,93" advanced="true"/> <group id="n6_f8c3" name="gps" xy="195,0" size="1584,93" advanced="true"/>
<text id="n16_f8c3" name="n16" xy="220,93" size="134,87" group="n24_f8c3" font="ui://27vd145bh35o7im7" fontSize="66" color="#450f05" text="托管"> <text id="n16_f8c3" name="n16" xy="220,93" size="134,86" group="n24_f8c3" font="ui://27vd145bh35o7im7" fontSize="66" color="#450f05" text="托管">
<relation target="" sidePair="right-right"/> <relation target="" sidePair="right-right"/>
</text> </text>
<component id="n17_f8c3" name="n17" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" xy="384,103" size="66,66" group="n24_f8c3"> <component id="n17_f8c3" name="n17" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" xy="384,103" size="66,66" group="n24_f8c3">
<Button checked="true" controller="cTuoguan" page="0"/> <Button checked="true" controller="cTuoguan" page="0"/>
</component> </component>
<text id="n18_f8c3" name="n18" xy="474,100" size="270,71" group="n24_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#51933c" text="不自动托管"> <text id="n18_f8c3" name="n18" xy="474,100" size="270,72" group="n24_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#51933c" text="不自动托管">
<gearColor controller="cTuoguan" pages="1,2,3" values="#450f05,#000000|#450f05,#000000|#450f05,#000000" default="#51933c,#000000"/> <gearColor controller="cTuoguan" pages="1,2,3" values="#450f05,#000000|#450f05,#000000|#450f05,#000000" default="#51933c,#000000"/>
</text> </text>
<component id="n19_f8c3" name="n19" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" xy="857,103" size="66,66" group="n24_f8c3"> <component id="n19_f8c3" name="n19" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" xy="857,103" size="66,66" group="n24_f8c3">
<Button controller="cTuoguan" page="1"/> <Button controller="cTuoguan" page="1"/>
</component> </component>
<text id="n20_f8c3" name="n20" xy="947,100" size="226,71" group="n24_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="30秒托管"> <text id="n20_f8c3" name="n20" xy="947,100" size="226,72" group="n24_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="30秒托管">
<gearColor controller="cTuoguan" pages="1" values="#51933c,#000000" default="#450f05,#000000"/> <gearColor controller="cTuoguan" pages="1" values="#51933c,#000000" default="#450f05,#000000"/>
</text> </text>
<component id="n21_f8c3" name="n21" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" xy="1330,103" size="66,66" group="n24_f8c3"> <component id="n21_f8c3" name="n21" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" xy="1330,103" size="66,66" group="n24_f8c3">
<Button controller="cTuoguan" page="2"/> <Button controller="cTuoguan" page="2"/>
</component> </component>
<text id="n22_f8c3" name="n22" xy="1420,100" size="226,71" group="n24_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="60秒托管"> <text id="n22_f8c3" name="n22" xy="1420,100" size="226,72" group="n24_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="60秒托管">
<gearColor controller="cTuoguan" pages="2,3" values="#51933c,#000000|#450f05,#000000" default="#450f05,#000000"/> <gearColor controller="cTuoguan" pages="2,3" values="#51933c,#000000|#450f05,#000000" default="#450f05,#000000"/>
</text> </text>
<component id="n25_f8c3" name="n25" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" xy="384,190" size="66,66" group="n24_f8c3"> <component id="n25_f8c3" name="n25" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" xy="384,190" size="66,66" group="n24_f8c3">
<Button controller="cTuoguan" page="3"/> <Button controller="cTuoguan" page="3"/>
</component> </component>
<text id="n26_f8c3" name="n26" xy="474,187" size="257,71" group="n24_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="120秒托管"> <text id="n26_f8c3" name="n26" xy="474,187" size="257,72" group="n24_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="120秒托管">
<gearColor controller="cTuoguan" pages="3" values="#51933c,#000000" default="#450f05,#000000"/> <gearColor controller="cTuoguan" pages="3" values="#51933c,#000000" default="#450f05,#000000"/>
</text> </text>
<image id="n23_f8c3" name="n23" src="pzuc7cx6" fileName="component/CreatePlay/Image/Line 2.png" xy="195,276" size="1515,3" group="n24_f8c3"/> <image id="n23_f8c3" name="n23" src="pzuc7cx6" fileName="component/CreatePlay/Image/Line 2.png" xy="195,276" size="1515,3" group="n24_f8c3"/>
<group id="n24_f8c3" name="tuoguan" xy="195,93" size="1515,186" advanced="true"/> <group id="n24_f8c3" name="tuoguan" xy="195,93" size="1515,186" advanced="true"/>
<text id="n9_f8c3" name="n9" xy="219,279" size="134,87" group="n15_f8c3" font="ui://27vd145bh35o7im7" fontSize="66" color="#450f05" text="解散"> <text id="n9_f8c3" name="n9" xy="219,279" size="134,86" group="n15_f8c3" font="ui://27vd145bh35o7im7" fontSize="66" color="#450f05" text="解散">
<relation target="" sidePair="right-right"/> <relation target="" sidePair="right-right"/>
</text> </text>
<component id="n10_f8c3" name="n10" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" xy="383,289" size="66,66" group="n15_f8c3"> <component id="n10_f8c3" name="n10" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" xy="383,289" size="66,66" group="n15_f8c3">
<Button checked="true" controller="cJiesan" page="0"/> <Button checked="true" controller="cJiesan" page="0"/>
</component> </component>
<text id="n11_f8c3" name="n11" xy="473,286" size="429,71" group="n15_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#51933c" text="托管结束后不解散"> <text id="n11_f8c3" name="n11" xy="473,286" size="429,72" group="n15_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#51933c" text="托管结束后不解散">
<gearColor controller="cJiesan" pages="0" values="#51933c,#000000" default="#450f05,#000000"/> <gearColor controller="cJiesan" pages="0" values="#51933c,#000000" default="#450f05,#000000"/>
</text> </text>
<component id="n12_f8c3" name="n12" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" xy="1237,289" size="66,66" group="n15_f8c3"> <component id="n12_f8c3" name="n12" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" xy="1237,289" size="66,66" group="n15_f8c3">
<Button controller="cJiesan" page="1"/> <Button controller="cJiesan" page="1"/>
</component> </component>
<text id="n13_f8c3" name="n13" xy="1327,286" size="588,71" group="n15_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="托管当局结束后强制解散"> <text id="n13_f8c3" name="n13" xy="1327,286" size="589,72" group="n15_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="托管当局结束后强制解散">
<gearColor controller="cJiesan" pages="1" values="#51933c,#000000" default="#450f05,#000000"/> <gearColor controller="cJiesan" pages="1" values="#51933c,#000000" default="#450f05,#000000"/>
</text> </text>
<component id="n27_f8c3" name="n27" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" xy="383,397" size="66,66" group="n15_f8c3"> <component id="n27_f8c3" name="n27" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" xy="383,397" size="66,66" group="n15_f8c3">
<Button controller="cJiesan" page="2"/> <Button controller="cJiesan" page="2"/>
</component> </component>
<text id="n28_f8c3" name="n28" xy="473,394" size="566,71" group="n15_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="托管2局结束后强制解散"> <text id="n28_f8c3" name="n28" xy="473,394" size="566,72" group="n15_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="托管2局结束后强制解散">
<gearColor controller="cJiesan" pages="2" values="#51933c,#000000" default="#450f05,#000000"/> <gearColor controller="cJiesan" pages="2" values="#51933c,#000000" default="#450f05,#000000"/>
</text> </text>
<component id="n29_f8c3" name="n29" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" xy="1237,399" size="66,66" group="n15_f8c3"> <component id="n29_f8c3" name="n29" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" xy="1237,399" size="66,66" group="n15_f8c3">
<Button controller="cJiesan" page="3"/> <Button controller="cJiesan" page="3"/>
</component> </component>
<text id="n30_f8c3" name="n30" xy="1327,396" size="566,71" group="n15_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="托管3局结束后强制解散"> <text id="n30_f8c3" name="n30" xy="1327,396" size="566,72" group="n15_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="托管3局结束后强制解散">
<gearColor controller="cJiesan" pages="3" values="#51933c,#000000" default="#450f05,#000000"/> <gearColor controller="cJiesan" pages="3" values="#51933c,#000000" default="#450f05,#000000"/>
</text> </text>
<image id="n14_f8c3" name="n14" src="pzuc7cx6" fileName="component/CreatePlay/Image/Line 2.png" xy="195,472" size="1515,3" group="n15_f8c3"/> <image id="n14_f8c3" name="n14" src="pzuc7cx6" fileName="component/CreatePlay/Image/Line 2.png" xy="195,472" size="1515,3" group="n15_f8c3"/>
<group id="n15_f8c3" name="jiesan" xy="195,279" size="1721,196" advanced="true"/> <group id="n15_f8c3" name="jiesan" xy="195,279" size="1721,196" advanced="true"/>
<text id="n31_f8c3" name="n31" xy="220,475" size="134,87" group="n37_f8c3" font="ui://27vd145bh35o7im7" fontSize="66" color="#450f05" text="功能"> <text id="n31_f8c3" name="n31" xy="220,475" size="134,86" group="n37_f8c3" font="ui://27vd145bh35o7im7" fontSize="66" color="#450f05" text="功能">
<relation target="" sidePair="right-right"/> <relation target="" sidePair="right-right"/>
</text> </text>
<component id="n38_f8c3" name="n38" src="kxhm7cx8" fileName="component/CreatePlay/Component/Multiple_choose.xml" xy="384,485" group="n37_f8c3"> <component id="n38_f8c3" name="n38" src="kxhm7cx8" fileName="component/CreatePlay/Component/Multiple_choose.xml" xy="384,485" group="n37_f8c3">
<Button controller="cChat" page="1"/> <Button controller="cChat" page="1"/>
</component> </component>
<text id="n33_f8c3" name="n33" xy="474,482" size="376,71" group="n37_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="不允许快捷聊天"> <text id="n33_f8c3" name="n33" xy="474,482" size="376,72" group="n37_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="不允许快捷聊天">
<gearColor controller="cChat" pages="0" values="#450f05,#000000" default="#51933c,#000000"/> <gearColor controller="cChat" pages="0" values="#450f05,#000000" default="#51933c,#000000"/>
</text> </text>
<component id="n39_f8c3" name="n39" src="kxhm7cx8" fileName="component/CreatePlay/Component/Multiple_choose.xml" xy="1238,485" group="n37_f8c3"> <component id="n39_f8c3" name="n39" src="kxhm7cx8" fileName="component/CreatePlay/Component/Multiple_choose.xml" xy="1238,485" group="n37_f8c3">
<Button controller="cMisslie" page="1"/> <Button controller="cMisslie" page="1"/>
</component> </component>
<text id="n35_f8c3" name="n35" xy="1328,482" size="323,71" group="n37_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="关闭互动表情"> <text id="n35_f8c3" name="n35" xy="1328,482" size="323,72" group="n37_f8c3" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="关闭互动表情">
<gearColor controller="cMisslie" pages="1" values="#51933c,#000000" default="#450f05,#000000"/> <gearColor controller="cMisslie" pages="1" values="#51933c,#000000" default="#450f05,#000000"/>
</text> </text>
<image id="n36_f8c3" name="n36" src="pzuc7cx6" fileName="component/CreatePlay/Image/Line 2.png" xy="195,565" size="1515,3" group="n37_f8c3"/> <image id="n36_f8c3" name="n36" src="pzuc7cx6" fileName="component/CreatePlay/Image/Line 2.png" xy="195,565" size="1515,3" group="n37_f8c3"/>

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="2532,1170" pivot="0.5,0.5" designImage="ui://v0j9abjyj6yy1fr" designImageAlpha="35"> <component size="2532,1170" pivot="0.5,0.5" designImage="ui://v0j9abjyj6yy1fr" designImageAlpha="35">
<controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="1"/> <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="3"/>
<controller name="sdk" pages="0,,1," selected="0"/> <controller name="sdk" pages="0,,1," selected="0"/>
<controller name="action" pages="2,空,0,准备,1,开始" selected="0"/> <controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
<controller name="3d" pages="0,,1," selected="0"/> <controller name="3d" pages="0,,1," selected="0"/>
@ -8,7 +8,7 @@
<controller name="showNextConfrim" 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="0"/>
<controller name="witness" pages="0,,1," selected="0"/> <controller name="witness" pages="0,,1," selected="0"/>
<controller name="voice" pages="0,,1," selected="1"/> <controller name="voice" pages="0,,1," selected="0"/>
<controller name="cHuCardEffect" pages="0,,1," selected="0"> <controller name="cHuCardEffect" pages="0,,1," selected="0">
<remark page="0" value="关"/> <remark page="0" value="关"/>
<remark page="1" value="开"/> <remark page="1" value="开"/>
@ -34,7 +34,7 @@
<gearDisplay controller="state" pages="0,2"/> <gearDisplay controller="state" pages="0,2"/>
<relation target="" sidePair="center-center,bottom-bottom"/> <relation target="" sidePair="center-center,bottom-bottom"/>
</component> </component>
<component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="87,787" size="153,132"> <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="64,-192" size="153,132">
<gearDisplay controller="state" pages="1,3,4"/> <gearDisplay controller="state" pages="1,3,4"/>
<gearXY controller="state" pages="1,3,4" values="87,787|64,-192|62,-202" default="730,-60"/> <gearXY controller="state" pages="1,3,4" values="87,787|64,-192|62,-202" default="730,-60"/>
<relation target="n118_pkx5" sidePair="right-left,top-top"/> <relation target="n118_pkx5" sidePair="right-left,top-top"/>
@ -43,7 +43,7 @@
<gearDisplay controller="state" pages="0,2"/> <gearDisplay controller="state" pages="0,2"/>
<relation target="" sidePair="center-center,top-top"/> <relation target="" sidePair="center-center,top-top"/>
</component> </component>
<component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="1866,28" size="153,132"> <component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="2555,-6" size="153,132">
<gearDisplay controller="state" pages="1,3,4"/> <gearDisplay controller="state" pages="1,3,4"/>
<gearXY controller="state" pages="0,1,3,4" values="2701,486|1866,28|2555,-6|2567,10" default="2007,876"/> <gearXY controller="state" pages="0,1,3,4" values="2701,486|1866,28|2555,-6|2567,10" default="2007,876"/>
<relation target="n155_gi99" sidePair="left-right,top-top"/> <relation target="n155_gi99" sidePair="left-right,top-top"/>
@ -131,13 +131,6 @@
</component> </component>
<text id="n136_lu84" name="text_roomId" xy="15,67" size="264,54" group="n135_lu84" font="ui://27vd145bh35o7ika" fontSize="40" color="#ffffff" letterSpacing="4" text="房间:588568"/> <text id="n136_lu84" name="text_roomId" xy="15,67" size="264,54" group="n135_lu84" font="ui://27vd145bh35o7ika" fontSize="40" color="#ffffff" letterSpacing="4" text="房间:588568"/>
<group id="n135_lu84" name="top_left" xy="15,15" size="276,164"/> <group id="n135_lu84" name="top_left" xy="15,15" size="276,164"/>
<component id="n87_8sat" name="btn_back_lobby" src="gq7m4p" fileName="Main_style_2/poker/Btn_back_lobby.xml" xy="25,25" size="58,75" scale="2,2">
<gearDisplay controller="state" pages="3"/>
</component>
<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>
<text id="n176_eqmd" name="remaining_card" xy="769,516" size="358,74" group="n179_eqmd" font="ui://27vd145bg2mo7ij0" fontSize="55" color="#ffffff" align="right" vAlign="middle" letterSpacing="5" autoSize="none" text="余98张"> <text id="n176_eqmd" name="remaining_card" xy="769,516" size="358,74" group="n179_eqmd" font="ui://27vd145bg2mo7ij0" fontSize="55" color="#ffffff" align="right" vAlign="middle" letterSpacing="5" autoSize="none" text="余98张">
<gearDisplay controller="state" pages="1,3"/> <gearDisplay controller="state" pages="1,3"/>
</text> </text>
@ -254,13 +247,6 @@
<component id="n187_pbp6" name="btn_sendTalk" src="pbp614i" fileName="Main_new/Chat/Component/Btn_MessageTalk.xml" xy="2322,523" size="144,123"> <component id="n187_pbp6" name="btn_sendTalk" src="pbp614i" fileName="Main_new/Chat/Component/Btn_MessageTalk.xml" xy="2322,523" size="144,123">
<relation target="" sidePair="right-right"/> <relation target="" sidePair="right-right"/>
</component> </component>
<component id="n57_rayb" name="panel_record" src="gq7m4t" fileName="Main_style_2/record/Record.xml" xy="120,855" group="n59_v38k">
<gearDisplay controller="state" pages="3"/>
</component>
<component id="n56_cnxs" name="mask_tips" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="1260,911" group="n59_v38k">
<relation target="" sidePair="center-center"/>
</component>
<group id="n59_v38k" name="huifang" xy="120,855" size="2532,165"/>
<list id="n196_xqxr" name="list_otherHuEffect" xy="1531,144" size="1005,814" layout="flow_vt" overflow="scroll" defaultItem="ui://v0j9abjyxqxr1eq" align="center" autoClearItems="true"> <list id="n196_xqxr" name="list_otherHuEffect" xy="1531,144" size="1005,814" layout="flow_vt" overflow="scroll" defaultItem="ui://v0j9abjyxqxr1eq" align="center" autoClearItems="true">
<gearDisplay controller="cHuCardEffect" pages="1"/> <gearDisplay controller="cHuCardEffect" pages="1"/>
<item/> <item/>
@ -284,5 +270,20 @@
<gearDisplay controller="voice" pages="1"/> <gearDisplay controller="voice" pages="1"/>
<relation target="" sidePair="width-width,height-height"/> <relation target="" sidePair="width-width,height-height"/>
</component> </component>
<component id="n56_cnxs" name="mask_tips" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="1260,911" group="n209_lvks">
<relation target="" sidePair="center-center"/>
</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" group="n209_lvks">
<gearDisplay controller="state" pages="3"/>
<Button icon="ui://v0j9abjylj2n17t"/>
</component>
<component id="n87_8sat" name="btn_back_lobby" src="gq7m4p" fileName="Main_style_2/poker/Btn_back_lobby.xml" xy="25,25" size="81,75" group="n209_lvks" scale="2,2">
<gearDisplay controller="state" pages="3"/>
</component>
<component id="n57_rayb" name="panel_record" src="gq7m4t" fileName="Main_style_2/record/Record.xml" xy="120,855" group="n59_v38k">
<gearDisplay controller="state" pages="3"/>
</component>
<group id="n59_v38k" name="huifang" xy="120,855" size="2532,165" group="n209_lvks"/>
<group id="n209_lvks" name="playback" xy="25,25" size="2627,995"/>
</displayList> </displayList>
</component> </component>

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

Binary file not shown.

BIN
wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes
View File

Binary file not shown.

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

Binary file not shown.