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

0902

master
罗家炜 2025-09-02 16:23:32 +08:00
parent 8548edac62
commit 27e0a96520
62 changed files with 246 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lua_probject/base_project/Game/Controller/GameController.lua
View File

@ -163,10 +163,9 @@ function M:ExitWitnessGame(pid, gid, rid)
end end
local _data = {} local _data = {}
_data["pid"] = pid _data["pid"] = pid
_data["gid"] = gid
_data["room_id"] = rid _data["room_id"] = rid
_client:send(Protocol.GAME_Exit_WITNESS_ROOM, _data) _client:send(Protocol.GAME_Exit_WITNESS_ROOM, _data)
_client:destroy() -- _client:destroy()
end end
--聊天 --聊天
@ -181,8 +180,8 @@ function M:SendInteraction(playid, type, parm, callback)
local _data = {} local _data = {}
_data['playerid'] = playid _data['playerid'] = playid
_data['type'] = type _data['type'] = type
_data['parm'] = parm _data['parm'] = tonumber(parm)
_data['gid'] = 1 -- _data['gid'] = 1
_client:send(Protocol.GAME_INTERACTION, _data, function(res) _client:send(Protocol.GAME_INTERACTION, _data, function(res)
if callback then if callback then
callback(res) callback(res)

10
lua_probject/base_project/Game/View/Family/FamilyRecord.lua
View File

@ -194,6 +194,16 @@ function M:RecordItemRenderer(data, obj)
obj:GetChild('text_score').text = resultInfo.score obj:GetChild('text_score').text = resultInfo.score
obj:GetController('colour').selectedIndex = resultInfo.score >= 0 and 1 or 0 obj:GetController('colour').selectedIndex = resultInfo.score >= 0 and 1 or 0
end end
for i = 1, #data.totalScore do
if data.totalScore[i].accId == DataManager.SelfUser.account_id then
if i ~= 1 then
local tem = data.totalScore[1]
data.totalScore[1] = data.totalScore[i]
data.totalScore[i] = tem
end
break;
end
end
resultDetailList.numItems = #data.totalScore resultDetailList.numItems = #data.totalScore
end end

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

@ -912,16 +912,8 @@ function M:EventInit()
end end
) )
_gamectr:AddEventListener( _gamectr:AddEventListener(GameEvent.WitnessPlayerEnter, handler(self, self.OnPlayerWitnessEnter))
GameEvent.WitnessPlayerEnter,
function(...)
---- print("刷新托管数据=====")
local arg = { ... }
local witnessPlayerList = arg[1]
_room.witness_player_list = witnessPlayerList
_room._flag_updateWitness = true
end
)
_gamectr:AddEventListener( _gamectr:AddEventListener(
GameEvent.WitnessPlayerLeave, GameEvent.WitnessPlayerLeave,
@ -1038,6 +1030,13 @@ function M:GetReadyNum()
return readyNum return readyNum
end end
function M:OnPlayerWitnessEnter(...)
---- print("刷新托管数据=====")
local arg = { ... }
local witnessPlayerList = arg[1]
self._room.witness_player_list = witnessPlayerList
end
function M:OnPlayerEnter(...) function M:OnPlayerEnter(...)
printlog("进入房间222222222222222222++++++++++++++++++++++++++++") printlog("进入房间222222222222222222++++++++++++++++++++++++++++")
local arg = { ... } local arg = { ... }

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

@ -64,6 +64,7 @@ end
function M:SendOutCard(card, callback) function M:SendOutCard(card, callback)
local _data = {} local _data = {}
_data["card"] = card _data["card"] = card
_data["isTip"] = false
local _room = self._room local _room = self._room
local _client = ControllerManager.GameNetClinet local _client = ControllerManager.GameNetClinet
_client:send(TX_Protocol.GAME_DIS_CARD, _data) _client:send(TX_Protocol.GAME_DIS_CARD, _data)

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

@ -120,18 +120,20 @@ function M:InitView(url)
local btn_witness = self._view:GetChild('btn_pangGuang') local btn_witness = self._view:GetChild('btn_pangGuang')
if btn_witness then if btn_witness then
btn_witness.onClick:Set(function() 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 self._view:GetController('witness').selectedIndex = 1
end) end)
end end
--直接渲染观战人员
if viewList_witness.numItems == #room.witness_player_list then
viewList_witness:RefreshVirtualList()
else
viewList_witness.numItems = #room.witness_player_list
end
--展示精牌
self.jing = self._view:GetChild('jing')
self:ShowJing()
------------------------------------------------------- -------------------------------------------------------
self._ctr_state.selectedIndex = 4 self._ctr_state.selectedIndex = 4
@ -152,6 +154,22 @@ function M:EventInit()
print("lingmeng witness PlayerEnter") print("lingmeng witness PlayerEnter")
end) end)
_gamectr:AddEventListener(GameEvent.WitnessPlayerEnter, function(...)
self:PlayMJSound("user_enter.mp3")
local arg = { ... }
local witnessPlayerList = arg[1]
self._room.witness_player_list = witnessPlayerList
local _room = DataManager.CurrenRoom
local viewList_witness = self._view:GetChild('comp_witness'):GetChild('list_players')
print("linemng tcp", _room._flag_updateWitness, #_room.witness_player_list, viewList_witness.numItems)
if viewList_witness.numItems == #_room.witness_player_list then
viewList_witness:RefreshVirtualList()
else
viewList_witness.numItems = #_room.witness_player_list
end
end)
_gamectr:AddEventListener(TX_GameEvent.SendLaiZi, function(...) _gamectr:AddEventListener(TX_GameEvent.SendLaiZi, function(...)
local arg = { ... } local arg = { ... }
print("lingmeng witness SendLaiZi") print("lingmeng witness SendLaiZi")
@ -169,7 +187,7 @@ function M:EventInit()
_gamectr:AddEventListener(TX_GameEvent.SendCards, function(...) _gamectr:AddEventListener(TX_GameEvent.SendCards, function(...)
print("lingmeng witness SendCards") print("lingmeng witness SendCards")
-- self:ShowJing() self:ShowJing()
if self._clearingView then if self._clearingView then
self._clearingView:Destroy() self._clearingView:Destroy()
self._clearingView = nil self._clearingView = nil
@ -333,6 +351,11 @@ function M:InitPlayerInfoView()
end end
end end
local majiang_asset_path = "base/main_majiang/sound/"
function M:PlayMJSound(path)
ViewUtil.PlaySound(self.asset_group, majiang_asset_path .. path)
end
function M:NewMJPlayerCardInfoView(view, index) function M:NewMJPlayerCardInfoView(view, index)
return MJMainView.NewMJPlayerCardInfoView(self, view, index) return MJMainView.NewMJPlayerCardInfoView(self, view, index)
--[[ --[[
@ -385,6 +408,15 @@ function M:UpdateRound()
self._room.room_config.round) self._room.room_config.round)
end end
function M:ShowJing()
if self._room.jing then
self.jing.visible = true
MJPlayerCardInfoView.fillCard2(self, self.jing, "202_", self._room.jing)
else
self.jing.visible = false
end
end
function M:OnUpdate() function M:OnUpdate()
if (self._popEvent) then if (self._popEvent) then
local func = self._gamectr:PopEvent() local func = self._gamectr:PopEvent()

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

@ -141,6 +141,10 @@ function M:FillPlayBackData(pd_data)
room.curren_round = _tableInfo["round"] room.curren_round = _tableInfo["round"]
local _info_list = _tableInfo["playerData"] local _info_list = _tableInfo["playerData"]
local jing = _tableInfo["jing"]
if jing then
room.jing = jing
end
for i = 1, #_info_list do for i = 1, #_info_list do
local _jp = _info_list[i] local _jp = _info_list[i]
local p = room:NewPlayer() local p = room:NewPlayer()
@ -197,6 +201,11 @@ function M:FillWitnessData(pd_data)
room.banker_seat = bank_seat room.banker_seat = bank_seat
room.curren_turn_seat = active_seat room.curren_turn_seat = active_seat
room.curren_round = _tableInfo["round"] room.curren_round = _tableInfo["round"]
room.witness_player_list = _tableInfo["playerSpectatorData"]
local jing = _tableInfo["jing"]
if jing then
room.jing = jing
end
local _info_list = _tableInfo["playerData"] local _info_list = _tableInfo["playerData"]
for i = 1, #_info_list do for i = 1, #_info_list do
local _jp = _info_list[i] local _jp = _info_list[i]

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

@ -72,14 +72,14 @@ function M:SendOutCard(data, callback)
-- 进行预删牌处理 -- 进行预删牌处理
local p = _room.self_player local p = _room.self_player
_room.curren_outcard_seat = -1 _room.curren_outcard_seat = -1
list_remove(p.card_list, card) list_remove(p.card_list, data.card)
table.sort(p.card_list, self.HandCardSortAndJing) table.sort(p.card_list, self.HandCardSortAndJing)
p.hand_left_count = p.hand_left_count - 1 p.hand_left_count = p.hand_left_count - 1
if not p.outcard_list then p.outcard_list = {} end if not p.outcard_list then p.outcard_list = {} end
p.outcard_list[#p.outcard_list + 1] = card p.outcard_list[#p.outcard_list + 1] = data.card
__pre_delete_card = true __pre_delete_card = true
callback() callback()
end end

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

@ -170,7 +170,7 @@ function M:EventInit()
_gamectr:AddEventListener(TX_GameEvent.SendCards, function(...) _gamectr:AddEventListener(TX_GameEvent.SendCards, function(...)
print("lingmeng witness SendCards") print("lingmeng witness SendCards")
-- self:ShowJing() self:ShowJing()
if self._clearingView then if self._clearingView then
self._clearingView:Destroy() self._clearingView:Destroy()
self._clearingView = nil self._clearingView = nil
@ -274,12 +274,12 @@ function M:EventInit()
-- end -- end
self:RemoveCursor() self:RemoveCursor()
if self._clearingView == nil then 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 end
if _room.curren_round ~= _room.room_config.round then if _room.curren_round ~= _room.room_config.round then
@ -382,6 +382,11 @@ function M:OnFangziAction(...)
-- self:__CloseTip() -- self:__CloseTip()
end end
local majiang_asset_path = "base/main_majiang/sound/"
function M:PlayMJSound(path)
ViewUtil.PlaySound(self.asset_group, majiang_asset_path .. path)
end
function M:UpdateRound() function M:UpdateRound()
self._view:GetChild("text_round").text = string.format("局数：%d /%d", self._room.curren_round, self._view:GetChild("text_round").text = string.format("局数：%d /%d", self._room.curren_round,
self._room.room_config.round) self._room.room_config.round)

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

@ -197,6 +197,10 @@ function M:FillWitnessData(pd_data)
room.banker_seat = bank_seat room.banker_seat = bank_seat
room.curren_turn_seat = active_seat room.curren_turn_seat = active_seat
room.curren_round = _tableInfo["round"] room.curren_round = _tableInfo["round"]
local jing = _tableInfo["jing"]
if jing then
room.jing = jing
end
local _info_list = _tableInfo["playerData"] local _info_list = _tableInfo["playerData"]
for i = 1, #_info_list do for i = 1, #_info_list do
local _jp = _info_list[i] local _jp = _info_list[i]

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

@ -187,15 +187,6 @@ function M:InitView(url, use_custom_bg, custom_bg_config)
local btn_witness = self._view:GetChild('btn_pangGuang') local btn_witness = self._view:GetChild('btn_pangGuang')
if btn_witness then if btn_witness then
btn_witness.onClick:Set(function() 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 self._view:GetController('witness').selectedIndex = 1
end) end)
end end
@ -520,6 +511,22 @@ function M:OnPlayerReady(...)
end end
end end
function M:OnPlayerWitnessEnter(...)
self:PlayMJSound("user_enter.mp3")
local arg = { ... }
local witnessPlayerList = arg[1]
self._room.witness_player_list = witnessPlayerList
local _room = DataManager.CurrenRoom
local viewList_witness = self._view:GetChild('comp_witness'):GetChild('list_players')
print("linemng", _room._flag_updateWitness, #_room.witness_player_list, viewList_witness.numItems)
if viewList_witness.numItems == #_room.witness_player_list then
viewList_witness:RefreshVirtualList()
else
viewList_witness.numItems = #_room.witness_player_list
end
end
function M:CountCardLeftNum(card) function M:CountCardLeftNum(card)
local player_list = DataManager.CurrenRoom.player_list local player_list = DataManager.CurrenRoom.player_list
local count = 4 local count = 4
@ -661,6 +668,7 @@ function M:ShowHand(msg)
if infoView.class ~= "PlayerSelfCardInfoView" then if infoView.class ~= "PlayerSelfCardInfoView" then
printlog("ShowHand", player.seat) printlog("ShowHand", player.seat)
table.sort(player.hand_card, self.HandCardSortAndJing)
infoView:ShowHand(player.hand_card) infoView:ShowHand(player.hand_card)
end end
end end
@ -890,4 +898,34 @@ function M:DoNoticeAnimation()
end end
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 return M

4
wb_new_ui/assets/Family/NumberRecord/Component/comp_numberRecordDetailChild.xml
View File

@ -19,9 +19,7 @@
<relation target="" sidePair="center-center,middle-middle"/> <relation target="" sidePair="center-center,middle-middle"/>
</text> </text>
<component id="n12_jrro" name="btn_lookRecord" src="qz7i7cx1" fileName="NumberRecord/Component/btn_lookRecord.xml" xy="2177,48"/> <component id="n12_jrro" name="btn_lookRecord" src="qz7i7cx1" fileName="NumberRecord/Component/btn_lookRecord.xml" xy="2177,48"/>
<list id="n13_jrro" name="list" xy="1213,15" size="865,120" layout="row" overflow="scroll" scroll="horizontal" colGap="76" defaultItem="ui://htcn7v3rjrro7cxo" autoClearItems="true"> <list id="n13_jrro" name="list" xy="1212,15" size="865,120" layout="row" overflow="scroll" scroll="horizontal" colGap="76" defaultItem="ui://htcn7v3rjrro7cxo" autoClearItems="true">
<item/>
<item/>
<item/> <item/>
<item/> <item/>
</list> </list>

6
wb_new_ui/assets/Family/NumberRecord/Component/comp_numberRecordDetailResultChild.xml
View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="152,108"> <component size="152,108">
<controller name="colour" pages="0,,1," selected="0"/> <controller name="colour" pages="0,,1," selected="0"/>
<controller name="c1" pages="2,红,3,蓝" selected="1"/> <controller name="c1" pages="2,红,3,蓝" selected="0"/>
<displayList> <displayList>
<component id="n0_jrro" name="btn_head" src="86ct7cwk" fileName="Main/Component/btn_head.xml" xy="0,42" size="66,66"/> <component id="n0_jrro" name="btn_head" src="86ct7cwk" fileName="Main/Component/btn_head.xml" xy="0,42" size="66,66"/>
<text id="n1_jrro" name="text_score" xy="73,47" size="79,56" fontSize="42" color="#4636bd" align="center" vAlign="middle" autoSize="shrink" text="+999"> <text id="n1_jrro" name="text_score" xy="73,47" size="79,56" fontSize="42" color="#0000ff" align="center" vAlign="middle" autoSize="shrink" text="+999">
<gearColor controller="colour" pages="0,1" values="#4636bd,#000000|#ff0000,#000000"/> <gearColor controller="colour" pages="0,1" values="#0000ff,#000000|#ff0000,#000000"/>
<relation target="n0_jrro" sidePair="left-left"/> <relation target="n0_jrro" sidePair="left-left"/>
</text> </text>
<text id="n2_jrro" name="text_name" xy="0,0" size="152,42" font="Alimama FangYuanTi VF" fontSize="24" align="center" vAlign="middle" autoSize="ellipsis" text="超级长长长长长"/> <text id="n2_jrro" name="text_name" xy="0,0" size="152,42" font="Alimama FangYuanTi VF" fontSize="24" align="center" vAlign="middle" autoSize="ellipsis" text="超级长长长长长"/>

4
wb_new_ui/assets/Family/Record/Component/Item_familyRecord.xml
View File

@ -13,9 +13,7 @@
<text id="n10_slrk" name="text_playName" xy="1873,10" size="279,124" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" align="center" vAlign="middle" autoSize="shrink" autoClearText="true" text="999"/> <text id="n10_slrk" name="text_playName" xy="1873,10" size="279,124" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" align="center" vAlign="middle" autoSize="shrink" autoClearText="true" text="999"/>
<text id="n11_slrk" name="text_useDiamond" xy="692,47" size="76,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="999"/> <text id="n11_slrk" name="text_useDiamond" xy="692,47" size="76,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="999"/>
<text id="n12_slrk" name="text_roomId" xy="523,47" size="148,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" align="center" vAlign="middle" autoClearText="true" text="999999"/> <text id="n12_slrk" name="text_roomId" xy="523,47" size="148,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" align="center" vAlign="middle" autoClearText="true" text="999999"/>
<list id="n13_slrk" name="list_familyPlayer" xy="784,0" size="1082,150" layout="flow_vt" selectionMode="none" overflow="scroll" scroll="horizontal" colGap="101" defaultItem="ui://htcn7v3rjrro7cxo" align="center" vAlign="middle" autoClearItems="true"> <list id="n13_slrk" name="list_familyPlayer" xy="784,0" size="1082,150" layout="flow_vt" selectionMode="none" overflow="scroll" scroll="horizontal" colGap="101" defaultItem="ui://htcn7v3rjrro7cxo" vAlign="middle" autoClearItems="true">
<item/>
<item/>
<item/> <item/>
<item/> <item/>
</list> </list>

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

@ -107,6 +107,6 @@
<item/> <item/>
<item/> <item/>
</list> </list>
<loader id="n68_jzul" name="loader_selfHuCardEffect" xy="2052,584" pivot="0.5,0.5" anchor="true" size="220,150" align="center" vAlign="middle"/> <loader id="n68_jzul" name="loader_selfHuCardEffect" xy="2052,584" pivot="0.5,0.5" anchor="true" size="280,200" align="center" vAlign="middle"/>
</displayList> </displayList>
</component> </component>

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

@ -86,6 +86,6 @@
<item/> <item/>
<item/> <item/>
</list> </list>
<loader id="n55_jzul" name="loader_selfHuCardEffect" xy="1266,243" pivot="0.5,0.5" anchor="true" size="220,150" align="center" vAlign="middle"/> <loader id="n55_jzul" name="loader_selfHuCardEffect" xy="1266,243" pivot="0.5,0.5" anchor="true" size="280,200" align="center" vAlign="middle"/>
</displayList> </displayList>
</component> </component>

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

@ -5,7 +5,7 @@
<controller name="site" pages="0,2-1,1,2-2" 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="0"/>
<controller name="seletedGetCard" pages="0,,1," selected="0"/> <controller name="seletedGetCard" pages="0,,1," selected="0"/>
<controller name="tip" pages="0,,1," selected="1"/> <controller name="tip" pages="0,,1," selected="0"/>
<controller name="showGuoHu" pages="0,,1," selected="0"/> <controller name="showGuoHu" pages="0,,1," selected="0"/>
<controller name="cStie" exported="true" pages="0,,1,,2," selected="0"> <controller name="cStie" exported="true" pages="0,,1,,2," selected="0">
<remark page="0" value="2人"/> <remark page="0" value="2人"/>
@ -97,7 +97,7 @@
<component id="n50_ogwn" name="area_handcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-3616,-1525" pivot="0.5,0.5" size="2124,249" aspect="true"> <component id="n50_ogwn" name="area_handcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-3616,-1525" pivot="0.5,0.5" size="2124,249" aspect="true">
<relation target="n51_ogwn" sidePair="leftext-right"/> <relation target="n51_ogwn" sidePair="leftext-right"/>
</component> </component>
<loader id="n59_jzul" name="loader_selfHuCardEffect" xy="1266,778" pivot="0.5,0.5" anchor="true" size="220,150" align="center" vAlign="middle"/> <loader id="n59_jzul" name="loader_selfHuCardEffect" xy="1266,778" pivot="0.5,0.5" anchor="true" size="280,200" align="center" vAlign="middle" fill="scale"/>
<list id="n58_jzul" name="list_HuEffect" xy="0,568" size="2532,420" layout="row" overflow="scroll" defaultItem="ui://v0j9abjyxqxr1eq" autoItemSize="false" align="center" vAlign="middle" autoClearItems="true"> <list id="n58_jzul" name="list_HuEffect" xy="0,568" size="2532,420" layout="row" overflow="scroll" defaultItem="ui://v0j9abjyxqxr1eq" autoItemSize="false" align="center" vAlign="middle" autoClearItems="true">
<item/> <item/>
<item/> <item/>
@ -113,6 +113,6 @@
<gearDisplay controller="ting" pages="1"/> <gearDisplay controller="ting" pages="1"/>
<gearXY controller="3d" pages="0" values="-2193,-1423" default="616,100"/> <gearXY controller="3d" pages="0" values="-2193,-1423" default="616,100"/>
</image> </image>
<text id="n57_ogwn" name="Text_CardInfo" xy="-2587,110" size="813,973" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;FZ_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;b201_&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;}"/> <text id="n57_ogwn" name="Text_CardInfo" xy="-2587,110" 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;}"/>
</displayList> </displayList>
</component> </component>

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

@ -90,6 +90,6 @@
<item/> <item/>
<item/> <item/>
</list> </list>
<loader id="n67_jzul" name="loader_selfHuCardEffect" xy="511,584" pivot="0.5,0.5" anchor="true" size="220,150" align="center" vAlign="middle"/> <loader id="n67_jzul" name="loader_selfHuCardEffect" xy="511,584" pivot="0.5,0.5" anchor="true" size="280,220" align="center" vAlign="middle"/>
</displayList> </displayList>
</component> </component>

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

@ -1,8 +1,8 @@
<?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="1"/>
<controller name="3d" pages="0,,1," selected="0"/> <controller name="3d" pages="0,,1," selected="0"/>
<controller name="showNext" pages="0,不展示,1,展示" selected="0"/> <controller name="showNext" pages="0,不展示,1,展示" selected="0"/>
<controller name="showNextConfrim" pages="0,不展示,1,展示" selected="0"/> <controller name="showNextConfrim" pages="0,不展示,1,展示" selected="0"/>
@ -18,27 +18,27 @@
<relation target="" sidePair="center-center"/> <relation target="" sidePair="center-center"/>
<relation target="n169_gmbn" sidePair="bottom-top"/> <relation target="n169_gmbn" sidePair="bottom-top"/>
</component> </component>
<component id="n206_kikc" name="com_notice" src="kikc1g4" fileName="Main_new/com_notice.xml" xy="689,125" size="1169,63"/> <component id="n206_kikc" name="com_notice" src="kikc1g4" fileName="Main_new/com_notice.xml" xy="689,129" size="1169,62"/>
<component id="n81_l2u4" name="cardbox" src="gq7m5e" fileName="Main_style_2/turn/Gcm_box_4.xml" xy="1281,-296" pivot="0.5,0.5"> <component id="n81_l2u4" name="cardbox" src="gq7m5e" fileName="Main_style_2/turn/Gcm_box_4.xml" xy="1281,-296" pivot="0.5,0.5">
<gearDisplay controller="state" pages="1,3"/> <gearDisplay controller="state" pages="1,3"/>
<gearXY controller="3d" pages="0,1" values="1281,-296|603,254"/> <gearXY controller="3d" pages="0,1" values="1281,-296|603,254"/>
</component> </component>
<component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,909" size="153,132"> <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="89,789" size="153,132">
<gearDisplay controller="state" pages="0,2"/> <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="84,778" 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|84,778|85,786" default="730,-60"/>
<relation target="n118_pkx5" sidePair="right-left,top-top"/> <relation target="n118_pkx5" sidePair="right-left,top-top"/>
</component> </component>
<component id="n150_kxhm" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,223" size="153,132"> <component id="n150_kxhm" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1869,33" size="153,132">
<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="1867,24" 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|1867,24|1868,21" default="2007,876"/>
<relation target="n155_gi99" sidePair="left-right,top-top"/> <relation target="n155_gi99" sidePair="left-right,top-top"/>
</component> </component>
<component id="n71_l2u4" name="com_roominfo" src="gq7m2z" fileName="Main_style_2/component/room_info/RightPanel(1).xml" xy="741,-1172" size="1329,102" group="n90_8sat" scale="1.5,1.5"/> <component id="n71_l2u4" name="com_roominfo" src="gq7m2z" fileName="Main_style_2/component/room_info/RightPanel(1).xml" xy="741,-1172" size="1329,102" group="n90_8sat" scale="1.5,1.5"/>
@ -57,19 +57,19 @@
<relation target="n90_8sat" sidePair="right-right"/> <relation target="n90_8sat" sidePair="right-right"/>
</component> </component>
<component id="n86_8sat" name="roominfo_panel1" src="gq7m8g" fileName="Main_style_2/RoomInfoPanel1.xml" xy="118,-382" size="274,41" scale="2,2" touchable="false"/> <component id="n86_8sat" name="roominfo_panel1" src="gq7m8g" fileName="Main_style_2/RoomInfoPanel1.xml" xy="118,-382" size="274,41" scale="2,2" touchable="false"/>
<component id="n34_k3io" name="btn_ready--" src="gq7m8w" fileName="Main_style_2/btn_ready.xml" xy="5709,794" group="n36_k3io"> <component id="n34_k3io" name="btn_ready--" src="gq7m8w" fileName="Main_style_2/btn_ready.xml" xy="-12724,794" group="n36_k3io">
<gearDisplay controller="action" pages="0,1"/> <gearDisplay controller="action" pages="0,1"/>
<gearXY controller="action" pages="2,0,1" values="5709,794|-10043,798|5853,170"/> <gearXY controller="action" pages="2,0,1" values="5709,794|-12724,794|5853,170"/>
<Button icon="ui://v0j9abjygq7m48"/> <Button icon="ui://v0j9abjygq7m48"/>
</component> </component>
<component id="n35_k3io" name="btn_start" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="350,484" group="n36_k3io" visible="false"> <component id="n35_k3io" name="btn_start" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-2331,480" group="n36_k3io" visible="false">
<Button icon="ui://v0j9abjygq7m49"/> <Button icon="ui://v0j9abjygq7m49"/>
</component> </component>
<component id="n104_mncc" name="btn_xipai--" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="760,491" group="n36_k3io" scale="0.9,1"> <component id="n104_mncc" name="btn_xipai--" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-1921,487" group="n36_k3io" scale="0.9,1">
<gearDisplay controller="action" pages="1"/> <gearDisplay controller="action" pages="1"/>
<Button icon="ui://v0j9abjygq7m4i"/> <Button icon="ui://v0j9abjygq7m4i"/>
</component> </component>
<group id="n36_k3io" name="n36" xy="350,484" size="5625,410" visible="false" advanced="true"> <group id="n36_k3io" name="n36" xy="-12724,480" size="10987,414" visible="false" advanced="true">
<relation target="" sidePair="bottom-bottom,center-center"/> <relation target="" sidePair="bottom-bottom,center-center"/>
</group> </group>
<component id="n69_l2u4" name="gcm_chat" src="gq7m8z" fileName="Main_style_2/Gcm_chat.xml" xy="1933,-505"> <component id="n69_l2u4" name="gcm_chat" src="gq7m8z" fileName="Main_style_2/Gcm_chat.xml" xy="1933,-505">
@ -230,11 +230,13 @@
<group id="n168_qz7i" name="showNext" xy="-125,-102" size="2832,1436" advanced="true"> <group id="n168_qz7i" name="showNext" xy="-125,-102" size="2832,1436" advanced="true">
<gearDisplay controller="showNext" pages="1"/> <gearDisplay controller="showNext" pages="1"/>
</group> </group>
<graph id="n182_kw9h" name="n182" xy="874,1024" size="784,100" type="rect" lineSize="0" fillColor="#4c000000"> <graph id="n182_kw9h" name="n182" xy="874,1036" size="784,100" type="rect" lineSize="0" fillColor="#4c000000">
<gearDisplay controller="state" pages="4"/> <gearDisplay controller="state" pages="4"/>
<relation target="" sidePair="center-center,bottom-bottom"/>
</graph> </graph>
<text id="n181_kw9h" name="n181" xy="1114,1035" size="304,79" fontSize="60" color="#ffffff" text="正在旁观中"> <text id="n181_kw9h" name="n181" xy="1114,1047" size="304,79" fontSize="60" color="#ffffff" text="正在旁观中">
<gearDisplay controller="state" pages="4"/> <gearDisplay controller="state" pages="4"/>
<relation target="" sidePair="center-center,bottom-bottom"/>
</text> </text>
<component id="n186_sx7x" name="n186" src="sx7x14f" fileName="Main_new/Main/Component/btn_bg.xml" xy="0,0" size="2532,1170"> <component id="n186_sx7x" name="n186" src="sx7x14f" fileName="Main_new/Main/Component/btn_bg.xml" xy="0,0" size="2532,1170">
<gearDisplay controller="witness" pages="1"/> <gearDisplay controller="witness" pages="1"/>

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

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="2532,1170" designImage="ui://v0j9abjyj6yy1ft" designImageAlpha="0"> <component size="2532,1170" designImage="ui://v0j9abjyj6yy1ft" designImageAlpha="0">
<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="1"/>
<controller name="3d" pages="0,,1," selected="0"/> <controller name="3d" pages="0,,1," selected="0"/>
<controller name="showNext" pages="0,不展示,1,展示" selected="0"/> <controller name="showNext" pages="0,不展示,1,展示" selected="0"/>
<controller name="showNextConfrim" pages="0,不展示,1,展示" selected="0"/> <controller name="showNextConfrim" pages="0,不展示,1,展示" selected="0"/>
@ -15,25 +15,26 @@
<relation target="" sidePair="center-center"/> <relation target="" sidePair="center-center"/>
<relation target="n261_ogwn" sidePair="bottom-top"/> <relation target="n261_ogwn" sidePair="bottom-top"/>
</component> </component>
<component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,909" size="153,132"> <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="89,789" size="153,132">
<gearDisplay controller="state" pages="0,2"/> <gearDisplay controller="state" pages="0,2"/>
<gearXY controller="state" pages="0" values="1189,849" default="89,789"/>
<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,788" size="153,132"> <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="87,788" size="153,132">
<gearDisplay controller="state" pages="1,3,4"/> <gearDisplay controller="state" pages="1,3,4"/>
</component> </component>
<component id="n116_pkx5" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="2004,77" size="153,132"> <component id="n116_pkx5" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="2314,294" size="153,132">
<gearDisplay controller="state" pages="0,2"/> <gearDisplay controller="state" pages="0,2"/>
<gearXY controller="state" pages="0,1,2" values="1888,519|2004,77|1888,519" default="1194,274"/> <gearXY controller="state" pages="0,1,2,3" values="1888,519|2004,77|2311,292|2314,294" default="1194,274"/>
<relation target="" sidePair="middle-middle"/> <relation target="" sidePair="middle-middle"/>
</component> </component>
<component id="n150_kxhm" name="player_info3_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1865,29" size="153,132">
<gearDisplay controller="state" pages="0,2"/>
<relation target="" sidePair="center-center,top-top"/>
</component>
<component id="n140_lu84" name="player_info2_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="2311,292" size="153,132"> <component id="n140_lu84" name="player_info2_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="2311,292" size="153,132">
<gearDisplay controller="state" pages="1,3,4"/> <gearDisplay controller="state" pages="1,3,4"/>
</component> </component>
<component id="n150_kxhm" name="player_info3_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,223" size="153,132">
<gearDisplay controller="state" pages="0,2"/>
<relation target="" sidePair="center-center,top-top"/>
</component>
<component id="n152_kxhm" name="player_info3_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1865,29" size="153,132"> <component id="n152_kxhm" name="player_info3_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1865,29" size="153,132">
<gearDisplay controller="state" pages="1,3,4"/> <gearDisplay controller="state" pages="1,3,4"/>
</component> </component>
@ -57,19 +58,19 @@
<relation target="n224_ogwn" sidePair="right-right"/> <relation target="n224_ogwn" sidePair="right-right"/>
</component> </component>
<component id="n226_ogwn" name="roominfo_panel1" src="gq7m8g" fileName="Main_style_2/RoomInfoPanel1.xml" xy="118,-382" size="274,41" scale="2,2" touchable="false"/> <component id="n226_ogwn" name="roominfo_panel1" src="gq7m8g" fileName="Main_style_2/RoomInfoPanel1.xml" xy="118,-382" size="274,41" scale="2,2" touchable="false"/>
<component id="n227_ogwn" name="btn_ready--" src="gq7m8w" fileName="Main_style_2/btn_ready.xml" xy="5709,794" group="n230_ogwn"> <component id="n227_ogwn" name="btn_ready--" src="gq7m8w" fileName="Main_style_2/btn_ready.xml" xy="-12724,794" group="n230_ogwn">
<gearDisplay controller="action" pages="0,1"/> <gearDisplay controller="action" pages="0,1"/>
<gearXY controller="action" pages="2,0,1" values="5709,794|-10043,798|5853,170"/> <gearXY controller="action" pages="2,0,1" values="5709,794|-12724,794|5853,170"/>
<Button icon="ui://v0j9abjygq7m48"/> <Button icon="ui://v0j9abjygq7m48"/>
</component> </component>
<component id="n228_ogwn" name="btn_start" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="350,484" group="n230_ogwn" visible="false"> <component id="n228_ogwn" name="btn_start" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-2331,480" group="n230_ogwn" visible="false">
<Button icon="ui://v0j9abjygq7m49"/> <Button icon="ui://v0j9abjygq7m49"/>
</component> </component>
<component id="n229_ogwn" name="btn_xipai--" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="760,491" group="n230_ogwn" scale="0.9,1"> <component id="n229_ogwn" name="btn_xipai--" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-1921,487" group="n230_ogwn" scale="0.9,1">
<gearDisplay controller="action" pages="1"/> <gearDisplay controller="action" pages="1"/>
<Button icon="ui://v0j9abjygq7m4i"/> <Button icon="ui://v0j9abjygq7m4i"/>
</component> </component>
<group id="n230_ogwn" name="n230" xy="350,484" size="5625,410" visible="false" advanced="true"> <group id="n230_ogwn" name="n230" xy="-12724,480" size="10987,414" visible="false" advanced="true">
<relation target="" sidePair="bottom-bottom,center-center"/> <relation target="" sidePair="bottom-bottom,center-center"/>
</group> </group>
<component id="n231_ogwn" name="gcm_chat" src="gq7m8z" fileName="Main_style_2/Gcm_chat.xml" xy="1933,-505"> <component id="n231_ogwn" name="gcm_chat" src="gq7m8z" fileName="Main_style_2/Gcm_chat.xml" xy="1933,-505">
@ -239,11 +240,13 @@
<group id="n276_ogwn" name="showNext" xy="-125,-102" size="2832,1436" advanced="true"> <group id="n276_ogwn" name="showNext" xy="-125,-102" size="2832,1436" advanced="true">
<gearDisplay controller="showNext" pages="1"/> <gearDisplay controller="showNext" pages="1"/>
</group> </group>
<graph id="n277_ogwn" name="n277" xy="874,1024" size="784,100" type="rect" lineSize="0" fillColor="#4c000000"> <graph id="n277_ogwn" name="n277" xy="874,1036" size="784,100" type="rect" lineSize="0" fillColor="#4c000000">
<gearDisplay controller="state" pages="4"/> <gearDisplay controller="state" pages="4"/>
<relation target="" sidePair="center-center,bottom-bottom"/>
</graph> </graph>
<text id="n278_ogwn" name="n278" xy="1114,1035" size="304,79" fontSize="60" color="#ffffff" text="正在旁观中"> <text id="n278_ogwn" name="n278" xy="1114,1046" size="304,79" fontSize="60" color="#ffffff" text="正在旁观中">
<gearDisplay controller="state" pages="4"/> <gearDisplay controller="state" pages="4"/>
<relation target="" sidePair="center-center,bottom-bottom"/>
</text> </text>
<component id="n279_ogwn" name="n279" src="sx7x14f" fileName="Main_new/Main/Component/btn_bg.xml" xy="0,0" size="2532,1170"> <component id="n279_ogwn" name="n279" src="sx7x14f" fileName="Main_new/Main/Component/btn_bg.xml" xy="0,0" size="2532,1170">
<gearDisplay controller="witness" pages="1"/> <gearDisplay controller="witness" pages="1"/>

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="2532,1170" designImage="ui://v0j9abjyj6yy1fw" designImageAlpha="0"> <component size="2532,1170" designImage="ui://v0j9abjyj6yy1fw" designImageAlpha="0">
<controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,5,观战状态" selected="1"/> <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,5,观战状态" selected="2"/>
<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"/>
@ -14,39 +14,43 @@
<component id="n213_hyws" name="com_logo" src="o4nh1ei" fileName="Main_new/Component/com_logo.xml" xy="1209,328" size="435,73"> <component id="n213_hyws" name="com_logo" src="o4nh1ei" fileName="Main_new/Component/com_logo.xml" xy="1209,328" size="435,73">
<relation target="" sidePair="center-center,middle-middle"/> <relation target="" sidePair="center-center,middle-middle"/>
</component> </component>
<component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,909" size="153,132"> <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="87,788" size="153,132">
<gearDisplay controller="state" pages="0,2"/> <gearDisplay controller="state" pages="0,2"/>
<gearXY controller="state" pages="2" values="87,788" default="1189,909"/>
<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,788" size="153,132"> <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="87,788" size="153,132">
<gearDisplay controller="state" pages="1,3,5"/> <gearDisplay controller="state" pages="1,3,5"/>
<relation target="" sidePair="left-left,bottom-bottom"/> <relation target="" sidePair="left-left,bottom-bottom"/>
</component> </component>
<component id="n116_pkx5" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1888,519" size="153,132"> <component id="n116_pkx5" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="2311,292" size="153,132">
<gearDisplay controller="state" pages="0,2"/> <gearDisplay controller="state" pages="0,2"/>
<gearXY controller="state" pages="2" values="2311,292" default="1888,519"/>
<relation target="" sidePair="middle-middle"/> <relation target="" sidePair="middle-middle"/>
</component> </component>
<component id="n140_lu84" name="player_info2_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="2311,292" size="153,132"> <component id="n140_lu84" name="player_info2_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="2311,292" size="153,132">
<gearDisplay controller="state" pages="1,3,5"/> <gearDisplay controller="state" pages="1,3,5"/>
<relation target="" sidePair="left-right,bottom-middle"/> <relation target="" sidePair="left-right,bottom-middle"/>
</component> </component>
<component id="n150_kxhm" name="player_info3_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,223" size="153,132"> <component id="n150_kxhm" name="player_info3_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1865,29" size="153,132">
<gearDisplay controller="state" pages="0,2"/> <gearDisplay controller="state" pages="0,2"/>
<gearXY controller="state" pages="2" values="1865,29" default="1189,223"/>
<relation target="" sidePair="center-center,top-top"/> <relation target="" sidePair="center-center,top-top"/>
</component> </component>
<component id="n152_kxhm" name="player_info3_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1865,29" size="153,132"> <component id="n152_kxhm" name="player_info3_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1865,29" size="153,132">
<gearDisplay controller="state" pages="1,3,5"/> <gearDisplay controller="state" pages="1,3,5"/>
<relation target="" sidePair="top-top"/> <relation target="" sidePair="top-top"/>
</component> </component>
<component id="n151_kxhm" name="player_info4_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="491,519" size="153,132"> <component id="n151_kxhm" name="player_info4_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="91,521" size="153,132">
<gearDisplay controller="state" pages="0,2"/> <gearDisplay controller="state" pages="0,2"/>
<gearXY controller="state" pages="2" values="91,521" default="491,519"/>
<relation target="" sidePair="middle-middle,right-left"/> <relation target="" sidePair="middle-middle,right-left"/>
</component> </component>
<component id="n153_kxhm" name="player_info4_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="91,521" size="153,132"> <component id="n153_kxhm" name="player_info4_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="91,521" size="153,132">
<gearDisplay controller="state" pages="1,3,5"/> <gearDisplay controller="state" pages="1,3,5"/>
<relation target="" sidePair="left-left,top-middle"/> <relation target="" sidePair="left-left,top-middle"/>
</component> </component>
<component id="n371_kikc" name="com_notice" src="kikc1g4" fileName="Main_new/com_notice.xml" xy="567,124" size="1291,63"/> <component id="n371_kikc" name="com_notice" src="kikc1g4" fileName="Main_new/com_notice.xml" xy="567,129" size="1291,60"/>
<component id="n81_l2u4" name="cardbox" src="gq7m5e" fileName="Main_style_2/turn/Gcm_box_4.xml" xy="1278,-294" pivot="0.5,0.5"> <component id="n81_l2u4" name="cardbox" src="gq7m5e" fileName="Main_style_2/turn/Gcm_box_4.xml" xy="1278,-294" pivot="0.5,0.5">
<gearDisplay controller="state" pages="1,3"/> <gearDisplay controller="state" pages="1,3"/>
<gearXY controller="3d" pages="0,1" values="1278,-294|603,254"/> <gearXY controller="3d" pages="0,1" values="1278,-294|603,254"/>
@ -162,7 +166,7 @@
<gearDisplay controller="state" pages="1,3,5"/> <gearDisplay controller="state" pages="1,3,5"/>
<relation target="" sidePair="width-width,height-height"/> <relation target="" sidePair="width-width,height-height"/>
</component> </component>
<component id="n226_ogwn" name="player_card_info1" src="inqx13w" fileName="Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml" xy="0,0" size="2532,1170" controller="cStie,2"> <component id="n226_ogwn" name="player_card_info1" src="inqx13w" fileName="Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml" xy="0,-2" size="2532,1170" controller="cStie,2">
<gearDisplay controller="state" pages="1,3,5"/> <gearDisplay controller="state" pages="1,3,5"/>
<relation target="" sidePair="width-width,height-height"/> <relation target="" sidePair="width-width,height-height"/>
</component> </component>
@ -240,11 +244,13 @@
<group id="n348_ogwn" name="showNext" xy="-125,-102" size="2832,1436" advanced="true"> <group id="n348_ogwn" name="showNext" xy="-125,-102" size="2832,1436" advanced="true">
<gearDisplay controller="showNext" pages="1"/> <gearDisplay controller="showNext" pages="1"/>
</group> </group>
<graph id="n349_ogwn" name="n349" xy="874,1024" size="784,100" type="rect" lineSize="0" fillColor="#4c000000"> <graph id="n349_ogwn" name="n349" xy="874,1034" size="784,100" type="rect" lineSize="0" fillColor="#4c000000">
<gearDisplay controller="state" pages="5"/> <gearDisplay controller="state" pages="5"/>
<relation target="" sidePair="center-center,bottom-bottom"/>
</graph> </graph>
<text id="n350_ogwn" name="n350" xy="1114,1035" size="304,79" fontSize="60" color="#ffffff" text="正在旁观中"> <text id="n350_ogwn" name="n350" xy="1114,1044" size="304,79" fontSize="60" color="#ffffff" text="正在旁观中">
<gearDisplay controller="state" pages="5"/> <gearDisplay controller="state" pages="5"/>
<relation target="" sidePair="center-center,bottom-bottom"/>
</text> </text>
<component id="n351_ogwn" name="n351" src="sx7x14f" fileName="Main_new/Main/Component/btn_bg.xml" xy="0,0" size="2532,1170"> <component id="n351_ogwn" name="n351" src="sx7x14f" fileName="Main_new/Main/Component/btn_bg.xml" xy="0,0" size="2532,1170">
<gearDisplay controller="witness" pages="1"/> <gearDisplay controller="witness" pages="1"/>

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

@ -7,6 +7,6 @@
<image id="n0_kikc" name="n0" src="kikc1g5" fileName="component/notice_old/result_tips_bg.png" xy="0,0" size="1398,63" aspect="true"> <image id="n0_kikc" name="n0" src="kikc1g5" fileName="component/notice_old/result_tips_bg.png" xy="0,0" size="1398,63" aspect="true">
<relation target="" sidePair="width-width,height-height"/> <relation target="" sidePair="width-width,height-height"/>
</image> </image>
<text id="n1_kikc" name="text_notice" xy="0,4" size="4343,56" font="ui://27vd145bh35o7ilb" fontSize="42" color="#ffffff" vAlign="bottom" text="公告公告公告公告公告公告公告公告公告公告公告公告公告公公告公告公告公告公告公告公告公告公告公告公告公告公告公公告公告公告公告公告公告公告公告公告公告公告公告公告公公告公告公告公告公告公告公告公告公告公告公告公告"/> <text id="n1_kikc" name="text_notice" xy="0,0" size="4757,62" font="ui://27vd145bh35o7ilb" fontSize="46" color="#ffffff" vAlign="bottom" text="公告公告公告公告公告公告公告公告公告公告公告公告公告公公告公告公告公告公告公告公告公告公告公告公告公告公告公公告公告公告公告公告公告公告公告公告公告公告公告公告公公告公告公告公告公告公告公告公告公告公告公告公告"/>
</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/main_majiang/ui/Main_Majiang_fui.bytes
View File

Binary file not shown.

2
wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he16.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: extend/majiang/lichuan/6a56e0667191866d24612ce5fafd415f
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he17.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: extend/majiang/lichuan/c1bcaed15d8752d05e4a98b5df4ed064
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/woman/he16.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: extend/majiang/lichuan/58757f935d94e522082a90da88eaff65
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/woman/he17.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: extend/majiang/lichuan/d2947897060e6290e9e66e057fd09441
assetBundleVariant: assetBundleVariant:

4
wb_unity_pro/Assets/Scripts/Core/LuaNetClient.cs
View File

@ -90,8 +90,8 @@ namespace taurus.unity
_netClient.sendText(cmd, data, null); _netClient.sendText(cmd, data, null);
return; return;
} }
//UnityEngine.Debug.LogError("2222222222222333333"); UnityEngine.Debug.LogError("tcp send 2222222222222333333");
// UnityEngine.Debug.LogError(data); UnityEngine.Debug.LogError(data);
var msg = _netClient.sendText(cmd, data, __OnNetData); var msg = _netClient.sendText(cmd, data, __OnNetData);
msg.data = callback; msg.data = callback;
} }

16
wb_unity_pro/Assets/StreamingAssets/init1_1.json
View File

@ -24,34 +24,34 @@
"bundle": "extend/poker2/suoha" "bundle": "extend/poker2/suoha"
}, },
{ {
"ver": "1.0.34", "ver": "1.0.35",
"name": "南城麻将", "name": "南城麻将",
"check": true, "check": true,
"version": "1.0.34", "version": "1.0.35",
"game_id": "86", "game_id": "86",
"bundle": "extend/majiang/nancheng" "bundle": "extend/majiang/nancheng"
}, },
{ {
"ver": "1.0.36", "ver": "1.0.38",
"name": "黎川麻将", "name": "黎川麻将",
"check": true, "check": true,
"version": "1.0.36", "version": "1.0.38",
"game_id": "87", "game_id": "87",
"bundle": "extend/majiang/lichuan" "bundle": "extend/majiang/lichuan"
}, },
{ {
"ver": "1.0.21", "ver": "1.0.22",
"name": "金溪麻将", "name": "金溪麻将",
"check": true, "check": true,
"version": "1.0.21", "version": "1.0.22",
"game_id": "88", "game_id": "88",
"bundle": "extend/majiang/jinxi" "bundle": "extend/majiang/jinxi"
}, },
{ {
"ver": "1.0.20", "ver": "1.0.21",
"name": "抚州麻将", "name": "抚州麻将",
"check": true, "check": true,
"version": "1.0.20", "version": "1.0.21",
"game_id": "89", "game_id": "89",
"bundle": "extend/majiang/fuzhou" "bundle": "extend/majiang/fuzhou"
} }

60
wb_unity_pro/Assets/StreamingAssets/init2_1.json
View File

@ -1,109 +1,109 @@
[ [
{ {
"lua_path": "/tolua_project,/base_project,/main_project", "lua_path": "/tolua_project,/base_project,/main_project",
"ver": "1.0.13", "ver": "1.0.6",
"name": "base_script", "name": "base_script",
"check": true, "check": true,
"bundle": "base/base_script", "bundle": "base/base_script",
"version": "1.0.13" "version": "1.0.6"
}, },
{ {
"ver": "1.0.13", "ver": "1.0.6",
"name": "common", "name": "common",
"check": true, "check": true,
"bundle": "base/common", "bundle": "base/common",
"version": "1.0.13" "version": "1.0.6"
}, },
{ {
"ver": "1.0.13", "ver": "1.0.6",
"name": "login", "name": "login",
"check": true, "check": true,
"bundle": "base/login", "bundle": "base/login",
"version": "1.0.13" "version": "1.0.6"
}, },
{ {
"ver": "1.0.13", "ver": "1.0.6",
"name": "lobby", "name": "lobby",
"check": true, "check": true,
"bundle": "base/lobby", "bundle": "base/lobby",
"version": "1.0.13" "version": "1.0.6"
}, },
{ {
"ver": "1.0.13", "ver": "1.0.6",
"name": "Family", "name": "Family",
"check": true, "check": true,
"bundle": "base/Family", "bundle": "base/Family",
"version": "1.0.13" "version": "1.0.6"
}, },
{ {
"ver": "1.0.13", "ver": "1.0.6",
"name": "chat", "name": "chat",
"check": true, "check": true,
"bundle": "base/chat", "bundle": "base/chat",
"version": "1.0.13" "version": "1.0.6"
}, },
{ {
"ver": "1.0.13", "ver": "1.0.6",
"name": "newgroup", "name": "newgroup",
"check": true, "check": true,
"bundle": "base/newgroup", "bundle": "base/newgroup",
"version": "1.0.13" "version": "1.0.6"
}, },
{ {
"ver": "1.0.13", "ver": "1.0.6",
"name": "rank", "name": "rank",
"check": true, "check": true,
"version": "1.0.13", "version": "1.0.6",
"bundle": "base/rank" "bundle": "base/rank"
}, },
{ {
"ver": "1.0.13", "ver": "1.0.6",
"name": "main_majiang", "name": "main_majiang",
"check": true, "check": true,
"version": "1.0.13", "version": "1.0.6",
"bundle": "base/main_majiang" "bundle": "base/main_majiang"
}, },
{ {
"ver": "1.0.13", "ver": "1.0.6",
"name": "main_poker", "name": "main_poker",
"check": true, "check": true,
"version": "1.0.13", "version": "1.0.6",
"bundle": "base/main_poker" "bundle": "base/main_poker"
}, },
{ {
"ver": "1.0.13", "ver": "1.0.6",
"name": "main_zipai", "name": "main_zipai",
"check": true, "check": true,
"version": "1.0.13", "version": "1.0.6",
"bundle": "base/main_zipai" "bundle": "base/main_zipai"
}, },
{ {
"ver": "1.0.13", "ver": "1.0.6",
"name": "static", "name": "static",
"check": true, "check": true,
"bundle": "base/static", "bundle": "base/static",
"version": "1.0.13" "version": "1.0.6"
}, },
{ {
"ver": "1.0.13", "ver": "1.0.6",
"is_res": true, "is_res": true,
"name": "embed", "name": "embed",
"check": true, "check": true,
"bundle": "base/embed", "bundle": "base/embed",
"version": "1.0.13" "version": "1.0.6"
}, },
{ {
"ver": "1.0.13", "ver": "1.0.6",
"name": "main_pokemajiang", "name": "main_pokemajiang",
"check": true, "check": true,
"version": "1.0.13", "version": "1.0.6",
"bundle": "base/main_pokemajiang" "bundle": "base/main_pokemajiang"
}, },
{ {
"ver": "1.0.13", "ver": "1.0.6",
"name": "main_zipaimajiang", "name": "main_zipaimajiang",
"check": true, "check": true,
"version": "1.0.13", "version": "1.0.6",
"bundle": "base/main_zipaimajiang" "bundle": "base/main_zipaimajiang"
} }
] ]

BIN
wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.11.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.13.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.12.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.13.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.11.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.13.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.11.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.13.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.11.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.13.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.11.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.13.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.11.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.13.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.11.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.13.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.11.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.13.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.11.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.13.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.11.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.13.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.11.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.13.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.11.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.13.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.11.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.13.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.11.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.13.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.38.bytes Normal file
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.24.bytes
View File

Binary file not shown.