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

显示剩余牌补充，修复bug

master
罗家炜 2025-07-18 19:26:03 +08:00
parent fd751af1fe
commit ff9dad5e8c
16 changed files with 62 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,8 +47,10 @@ 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 result then
result.cardList = json.decode(result.cardList) result.cardList = json.decode(result.cardList)
table.sort(result.cardList) table.sort(result.cardList)
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()
@ -127,6 +129,8 @@ function M:fillResult0(room, peopleNum, result)
local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config)) local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config))
self._view:GetChild("Label_GamePlay").title = string.format("第%s/%s局,%s", room.curren_round, self._view:GetChild("Label_GamePlay").title = string.format("第%s/%s局,%s", room.curren_round,
room.room_config.round, gamePlay) room.room_config.round, gamePlay)
self.list_lastCard.numItems = #result.cardList
self._view:GetChild('n147').text = string.format("剩余%d张未显示", #result.cardList)
for i = 1, peopleNum do for i = 1, peopleNum do
local playerInfoComp = self._view:GetChild(string.format("Comp_Player%d", i)) local playerInfoComp = self._view:GetChild(string.format("Comp_Player%d", i))
@ -151,7 +155,6 @@ function M:fillResult0(room, peopleNum, result)
infoList.gang_score = infoList.gang_score or 0 infoList.gang_score = infoList.gang_score or 0
infoList.hu_score = infoList.hu_score or 0 infoList.hu_score = infoList.hu_score or 0
infoList.round_score = infoList.round_score or 0 infoList.round_score = infoList.round_score or 0
self.list_lastCard.numItems = #result.cardList
playerInfoComp:GetChild("text_name").text = playInfo.self_user.nick_name playerInfoComp:GetChild("text_name").text = playInfo.self_user.nick_name
playerInfoComp:GetChild("Text_BoJing").text = infoList.jing_score >= 0 and playerInfoComp:GetChild("Text_BoJing").text = infoList.jing_score >= 0 and

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

@ -332,7 +332,9 @@ function M:OneventResult1(evt_data)
--0：小结算 1：小大结算 2：大结算 --0：小结算 1：小大结算 2：大结算
self._room._reload_flag = false self._room._reload_flag = false
self._room.playing = false self._room.playing = false
if evt_data.result then
evt_data.result.cardList = evt_data.cardList evt_data.result.cardList = evt_data.cardList
end
if 0 == over then if 0 == over then
local result = evt_data.result local result = evt_data.result
self._cacheEvent:Enqueue(function() self._cacheEvent:Enqueue(function()

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

@ -47,8 +47,10 @@ 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 result then
result.cardList = json.decode(result.cardList) result.cardList = json.decode(result.cardList)
table.sort(result.cardList) table.sort(result.cardList)
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()
@ -127,6 +129,8 @@ function M:fillResult0(room, peopleNum, result)
local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config)) local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config))
self._view:GetChild("Label_GamePlay").title = string.format("第%s/%s局,%s", room.curren_round, self._view:GetChild("Label_GamePlay").title = string.format("第%s/%s局,%s", room.curren_round,
room.room_config.round, gamePlay) room.room_config.round, gamePlay)
self.list_lastCard.numItems = #result.cardList
self._view:GetChild('n147').text = string.format("剩余%d张未显示", #result.cardList)
for i = 1, peopleNum do for i = 1, peopleNum do
local playerInfoComp = self._view:GetChild(string.format("Comp_Player%d", i)) local playerInfoComp = self._view:GetChild(string.format("Comp_Player%d", i))
@ -151,7 +155,6 @@ function M:fillResult0(room, peopleNum, result)
infoList.gang_score = infoList.gang_score or 0 infoList.gang_score = infoList.gang_score or 0
infoList.hu_score = infoList.hu_score or 0 infoList.hu_score = infoList.hu_score or 0
infoList.round_score = infoList.round_score or 0 infoList.round_score = infoList.round_score or 0
self.list_lastCard.numItems = #result.cardList
playerInfoComp:GetChild("text_name").text = playInfo.self_user.nick_name playerInfoComp:GetChild("text_name").text = playInfo.self_user.nick_name
playerInfoComp:GetChild("Text_BoJing").text = infoList.jing_score >= 0 and playerInfoComp:GetChild("Text_BoJing").text = infoList.jing_score >= 0 and

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

@ -332,7 +332,9 @@ function M:OneventResult1(evt_data)
--0：小结算 1：小大结算 2：大结算 --0：小结算 1：小大结算 2：大结算
self._room._reload_flag = false self._room._reload_flag = false
self._room.playing = false self._room.playing = false
if evt_data.result then
evt_data.result.cardList = evt_data.cardList evt_data.result.cardList = evt_data.cardList
end
if 0 == over then if 0 == over then
local result = evt_data.result local result = evt_data.result
self._cacheEvent:Enqueue(function() self._cacheEvent:Enqueue(function()

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

@ -47,8 +47,10 @@ 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 result then
result.cardList = json.decode(result.cardList) result.cardList = json.decode(result.cardList)
table.sort(result.cardList) table.sort(result.cardList)
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()
@ -125,6 +127,8 @@ function M:fillResult0(room, peopleNum, result)
local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config)) local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config))
self._view:GetChild("Label_GamePlay").title = string.format("第%s/%s局,%s", room.curren_round, self._view:GetChild("Label_GamePlay").title = string.format("第%s/%s局,%s", room.curren_round,
room.room_config.round, gamePlay) room.room_config.round, gamePlay)
self.list_lastCard.numItems = #result.cardList
self._view:GetChild('n147').text = string.format("剩余%d张未显示", #result.cardList)
for i = 1, peopleNum do for i = 1, peopleNum do
local playerInfoComp = self._view:GetChild(string.format("Comp_Player%d", i)) local playerInfoComp = self._view:GetChild(string.format("Comp_Player%d", i))
@ -149,7 +153,6 @@ function M:fillResult0(room, peopleNum, result)
infoList.gang_score = infoList.gang_score or 0 infoList.gang_score = infoList.gang_score or 0
infoList.hu_score = infoList.hu_score or 0 infoList.hu_score = infoList.hu_score or 0
infoList.round_score = infoList.round_score or 0 infoList.round_score = infoList.round_score or 0
self.list_lastCard.numItems = #result.cardList
playerInfoComp:GetChild("text_name").text = playInfo.self_user.nick_name playerInfoComp:GetChild("text_name").text = playInfo.self_user.nick_name
playerInfoComp:GetChild("Text_BoJing").text = infoList.jing_score >= 0 and playerInfoComp:GetChild("Text_BoJing").text = infoList.jing_score >= 0 and

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

@ -333,7 +333,9 @@ function M:OneventResult1(evt_data)
--0：小结算 1：小大结算 2：大结算 --0：小结算 1：小大结算 2：大结算
self._room._reload_flag = false self._room._reload_flag = false
self._room.playing = false self._room.playing = false
if evt_data.result then
evt_data.result.cardList = evt_data.cardList evt_data.result.cardList = evt_data.cardList
end
if 0 == over then if 0 == over then
local result = evt_data.result local result = evt_data.result
self._cacheEvent:Enqueue(function() self._cacheEvent:Enqueue(function()

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

@ -47,8 +47,10 @@ 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 result then
result.cardList = json.decode(result.cardList) result.cardList = json.decode(result.cardList)
table.sort(result.cardList) table.sort(result.cardList)
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()
@ -125,6 +127,8 @@ function M:fillResult0(room, peopleNum, result)
local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config)) local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config))
self._view:GetChild("Label_GamePlay").title = string.format("第%s/%s局,%s", room.curren_round, self._view:GetChild("Label_GamePlay").title = string.format("第%s/%s局,%s", room.curren_round,
room.room_config.round, gamePlay) room.room_config.round, gamePlay)
self.list_lastCard.numItems = #result.cardList
self._view:GetChild('n147').text = string.format("剩余%d张未显示", #result.cardList)
for i = 1, peopleNum do for i = 1, peopleNum do
local playerInfoComp = self._view:GetChild(string.format("Comp_Player%d", i)) local playerInfoComp = self._view:GetChild(string.format("Comp_Player%d", i))
@ -149,7 +153,6 @@ function M:fillResult0(room, peopleNum, result)
infoList.gang_score = infoList.gang_score or 0 infoList.gang_score = infoList.gang_score or 0
infoList.hu_score = infoList.hu_score or 0 infoList.hu_score = infoList.hu_score or 0
infoList.round_score = infoList.round_score or 0 infoList.round_score = infoList.round_score or 0
self.list_lastCard.numItems = #result.cardList
playerInfoComp:GetChild("text_name").text = playInfo.self_user.nick_name playerInfoComp:GetChild("text_name").text = playInfo.self_user.nick_name
playerInfoComp:GetChild("Text_BoJing").text = infoList.jing_score >= 0 and playerInfoComp:GetChild("Text_BoJing").text = infoList.jing_score >= 0 and

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

@ -332,7 +332,9 @@ function M:OneventResult1(evt_data)
--0：小结算 1：小大结算 2：大结算 --0：小结算 1：小大结算 2：大结算
self._room._reload_flag = false self._room._reload_flag = false
self._room.playing = false self._room.playing = false
if evt_data.result then
evt_data.result.cardList = evt_data.cardList evt_data.result.cardList = evt_data.cardList
end
if 0 == over then if 0 == over then
local result = evt_data.result local result = evt_data.result
self._cacheEvent:Enqueue(function() self._cacheEvent:Enqueue(function()

18
wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/btn_gameDismissRoom.xml Normal file
View File

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="210,73" pivot="0.5,0.5" extention="Button">
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
<controller name="cStyle" pages="0,,1," selected="0">
<remark page="0" value="解散"/>
<remark page="1" value="退出"/>
</controller>
<displayList>
<image id="n0_xblm" name="n0" src="mwqzckx" fileName="Main_new/Main/Image/dismiss_room.png" xy="0,0">
<relation target="" sidePair="width-width,height-height"/>
</image>
<image id="n1_qncf" name="n1" src="mwqzcky" fileName="Main_new/Main/Image/exit_room.png" xy="0,0" size="210,73">
<gearDisplay controller="cStyle" pages="1"/>
<relation target="" sidePair="width-width,height-height"/>
</image>
</displayList>
<Button mode="Radio" downEffect="scale" downEffectValue="0.9"/>
</component>

BIN
wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/dismiss_room.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/exit_room.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 50 KiB

9
wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.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" designImageAlpha="100" designImageLayer="1"> <component size="2532,1170" designImageAlpha="100" designImageLayer="1">
<controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放" selected="3"/> <controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放" selected="0"/>
<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="time" pages="0,,1,,2,,3," selected="0"/> <controller name="time" pages="0,,1,,2,,3," selected="0"/>
@ -122,11 +122,11 @@
</component> </component>
<graph id="n102_t2e2" name="n109" xy="342,-1343" size="1670,834" visible="false" type="rect" lineSize="0" fillColor="#80000000"/> <graph id="n102_t2e2" name="n109" xy="342,-1343" size="1670,834" visible="false" type="rect" lineSize="0" fillColor="#80000000"/>
<component id="n101_t2e2" name="tuoguanzhong" src="prgzew" fileName="component/tuoguanzhong.xml" xy="996,2338" visible="false"/> <component id="n101_t2e2" name="tuoguanzhong" src="prgzew" fileName="component/tuoguanzhong.xml" xy="996,2338" visible="false"/>
<component id="n18" name="player_info2" src="ckvbcje" fileName="Main_New/PlayerHead_2.xml" xy="2372,294" group="n121_ckvb"> <component id="n18" name="player_info2" src="ckvbcje" fileName="Main_New/PlayerHead_2.xml" xy="2336,32" group="n121_ckvb">
<gearXY controller="state" pages="0,1,2,3" values="2336,32|2336,32|2336,32|2372,294"/> <gearXY controller="state" pages="0,1,2,3" values="2336,32|2336,32|2336,32|2372,294"/>
<relation target="" sidePair="right-right,middle-middle"/> <relation target="" sidePair="right-right,middle-middle"/>
</component> </component>
<component id="n7" name="player_info1" src="ckvbcim" fileName="Main_New/PlayerHead_1.xml" xy="9,721" size="183,187" group="n121_ckvb" aspect="true"> <component id="n7" name="player_info1" src="ckvbcim" fileName="Main_New/PlayerHead_1.xml" xy="80,495" size="183,187" group="n121_ckvb" aspect="true">
<gearXY controller="state" pages="0,1,2,3" values="80,495|80,495|80,495|9,721"/> <gearXY controller="state" pages="0,1,2,3" values="80,495|80,495|80,495|9,721"/>
<relation target="" sidePair="left-left,bottom-bottom"/> <relation target="" sidePair="left-left,bottom-bottom"/>
</component> </component>
@ -136,7 +136,7 @@
<gearLook controller="state" pages="3" values="1,0,0,1" default="1,0,0,1"/> <gearLook controller="state" pages="3" values="1,0,0,1" default="1,0,0,1"/>
<relation target="" sidePair="bottom-bottom"/> <relation target="" sidePair="bottom-bottom"/>
</component> </component>
<component id="n71_sdax" name="player_card_info_2" src="ckvbcjo" fileName="Main_New/Player_card_info_2.xml" xy="460,464" group="n122_ckvb" touchable="false"> <component id="n71_sdax" name="player_card_info_2" src="ckvbcjo" fileName="Main_New/Player_card_info_2.xml" xy="424,202" group="n122_ckvb" touchable="false">
<gearDisplay controller="state" pages="1,3"/> <gearDisplay controller="state" pages="1,3"/>
<relation target="n18" sidePair="right-left,middle-middle"/> <relation target="n18" sidePair="right-left,middle-middle"/>
</component> </component>
@ -151,6 +151,7 @@
<gearDisplay controller="action" pages="0,1"/> <gearDisplay controller="action" pages="0,1"/>
<relation target="" sidePair="bottom-middle"/> <relation target="" sidePair="bottom-middle"/>
</component> </component>
<component id="n149_mwqz" name="btn_closeRoom" src="mwqzckw" fileName="Main_New/Component/btn_gameDismissRoom.xml" xy="1300,479" size="360,126" group="n126_ckvb" visible="false"/>
<group id="n126_ckvb" name="readyBtn" xy="871,479" size="789,332" advanced="true"> <group id="n126_ckvb" name="readyBtn" xy="871,479" size="789,332" advanced="true">
<gearDisplay controller="state" pages="0,2"/> <gearDisplay controller="state" pages="0,2"/>
</group> </group>

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

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

BIN
wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 MiB

After

Width:  |  Height:  |  Size: 1.7 MiB

BIN
wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 MiB

After

Width:  |  Height:  |  Size: 1.9 MiB

BIN
wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes
View File

Binary file not shown.