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

麻将结算界面换牌

master
罗家炜 2025-07-18 20:13:46 +08:00
parent ff9dad5e8c
commit c325906c13
13 changed files with 60 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,7 +199,7 @@ function get_majiang_prefix(game_id)
end end
ct = ct_data[tostring(game_id)] or 0 ct = ct_data[tostring(game_id)] or 0
end end
local prefix = ct == 0 and "" or "a" local prefix = ct == 0 and "" or "b"
--printlog("get_majiang_prefix===>>>",prefix,ct) --printlog("get_majiang_prefix===>>>",prefix,ct)
return prefix return prefix
end end

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

@ -219,7 +219,7 @@ function M:fillResult0(room, peopleNum, result)
end end
end end
handCardList.numItems = handInfoNum handCardList.numItems = handInfoNum
allCardsList.width = 172 * fzInfoNum + 60 + (handInfoNum - 1) * 56 + 36 * (fzInfoNum) allCardsList.width = 234 * fzInfoNum + 78 + (handInfoNum - 1) * 74 + 36 * (fzInfoNum)
if infoList.seat == room.self_player.seat then if infoList.seat == room.self_player.seat then
isMeCtr.selectedIndex = 1 isMeCtr.selectedIndex = 1
@ -320,7 +320,8 @@ end
function M:RemindCardRender(data, obj) function M:RemindCardRender(data, obj)
local room = DataManager.CurrenRoom local room = DataManager.CurrenRoom
obj.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), data) obj.icon = string.format("ui://Main_Majiang/b202_%d", data)
print("lingmeng icon", obj.icon)
if room.jing == data then if room.jing == data then
obj:GetController('jing').selectedIndex = 1 obj:GetController('jing').selectedIndex = 1
end end

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

@ -214,12 +214,13 @@ 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
end end
handCardList.numItems = handInfoNum handCardList.numItems = handInfoNum
allCardsList.width = 172 * fzInfoNum + 60 + (handInfoNum - 1) * 56 + 36 * (fzInfoNum) allCardsList.width = 234 * fzInfoNum + 78 + (handInfoNum - 1) * 74 + 36 * (fzInfoNum)
if infoList.seat == room.self_player.seat then if infoList.seat == room.self_player.seat then
isMeCtr.selectedIndex = 1 isMeCtr.selectedIndex = 1

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

@ -328,7 +328,7 @@ end
function M:OneventResult1(evt_data) function M:OneventResult1(evt_data)
local over = evt_data.type local over = evt_data.type
print("OneventResult1") printlog("OneventResult1")
pt(evt_data) pt(evt_data)
--0：小结算 1：小大结算 2：大结算 --0：小结算 1：小大结算 2：大结算
self._room._reload_flag = false self._room._reload_flag = false

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

@ -218,7 +218,7 @@ function M:fillResult0(room, peopleNum, result)
end end
end end
handCardList.numItems = handInfoNum handCardList.numItems = handInfoNum
allCardsList.width = 172 * fzInfoNum + 60 + (handInfoNum - 1) * 56 + 36 * (fzInfoNum) allCardsList.width = 234 * fzInfoNum + 78 + (handInfoNum - 1) * 74 + 36 * (fzInfoNum)
if infoList.seat == room.self_player.seat then if infoList.seat == room.self_player.seat then
isMeCtr.selectedIndex = 1 isMeCtr.selectedIndex = 1

20
wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Btn_RemindCard.xml Normal file
View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="78,84" extention="Button">
<controller name="button" pages="0,up,1,down" selected="0"/>
<controller name="jing" pages="0,,1," selected="0"/>
<controller name="move" pages="0,,1," selected="0"/>
<displayList>
<loader id="n3_hp0b" name="icon" xy="0,0" size="78,84" aspect="true" url="ui://Main_Majiang/b201_101" fill="scaleFree">
<gearXY controller="button" pages="0,1" values="0,0|0,-35"/>
<gearLook controller="move" pages="1" values="0.3,0,0,1" default="1,0,0,1"/>
<relation target="" sidePair="width-width,height-height"/>
</loader>
<image id="n12_k1od" name="jing" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="3,-1" size="5,0" aspect="true">
<gearDisplay controller="jing" pages="1"/>
<gearXY controller="button" pages="0,1" values="3,-1|0,-22" duration=".1"/>
<gearLook controller="move" pages="1" values="0.3,0,0,0" default="1,0,0,0"/>
<relation target="" sidePair="width-width,height-height"/>
</image>
</displayList>
<Button mode="Check"/>
</component>

8
wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_Clearing_FZ_3.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="172,84"> <component size="234,84">
<displayList> <displayList>
<component id="n0_yry6" name="Btn_Card1" src="yry6z3" fileName="Main_new_2/Clearing/Component/Btn_Card_Hu.xml" xy="0,0"/> <component id="n0_yry6" name="Btn_Card1" src="mwqz1bk" fileName="Main_new/Clearing/Component/Btn_RemindCard.xml" xy="0,0"/>
<component id="n1_yry6" name="Btn_Card2" src="yry6z3" fileName="Main_new_2/Clearing/Component/Btn_Card_Hu.xml" xy="56,0"/> <component id="n1_yry6" name="Btn_Card2" src="mwqz1bk" fileName="Main_new/Clearing/Component/Btn_RemindCard.xml" xy="78,0"/>
<component id="n2_yry6" name="Btn_Card3" src="yry6z3" fileName="Main_new_2/Clearing/Component/Btn_Card_Hu.xml" xy="112,0"/> <component id="n2_yry6" name="Btn_Card3" src="mwqz1bk" fileName="Main_new/Clearing/Component/Btn_RemindCard.xml" xy="156,0"/>
</displayList> </displayList>
</component> </component>

10
wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_Clearing_FZ_4.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="172,84"> <component size="234,84">
<displayList> <displayList>
<component id="n0_yry6" name="Btn_Card1" src="yry6z3" fileName="Main_new_2/Clearing/Component/Btn_Card_Hu.xml" xy="0,0"/> <component id="n0_yry6" name="Btn_Card1" src="mwqz1bk" fileName="Main_new/Clearing/Component/Btn_RemindCard.xml" xy="0,0"/>
<component id="n1_yry6" name="Btn_Card2" src="yry6z3" fileName="Main_new_2/Clearing/Component/Btn_Card_Hu.xml" xy="56,0"/> <component id="n1_yry6" name="Btn_Card2" src="mwqz1bk" fileName="Main_new/Clearing/Component/Btn_RemindCard.xml" xy="78,0"/>
<component id="n2_yry6" name="Btn_Card3" src="yry6z3" fileName="Main_new_2/Clearing/Component/Btn_Card_Hu.xml" xy="112,0"/> <component id="n2_yry6" name="Btn_Card3" src="mwqz1bk" fileName="Main_new/Clearing/Component/Btn_RemindCard.xml" xy="156,0"/>
<component id="n3_yry6" name="Btn_Card4" src="yry6z3" fileName="Main_new_2/Clearing/Component/Btn_Card_Hu.xml" xy="56,-12"/> <component id="n3_yry6" name="Btn_Card4" src="mwqz1bk" fileName="Main_new/Clearing/Component/Btn_RemindCard.xml" xy="78,-12"/>
</displayList> </displayList>
</component> </component>

4
wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_HandCard.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="732,84"> <component size="967,84">
<displayList> <displayList>
<list id="n0_yry6" name="list" xy="0,0" size="732,84" layout="row" overflow="scroll" colGap="-4" defaultItem="ui://v0j9abjyyry6z3" autoClearItems="true"> <list id="n0_yry6" name="list" xy="0,0" size="969,84" layout="row" overflow="scroll" colGap="-4" defaultItem="ui://v0j9abjymwqz1bk" autoClearItems="true">
<relation target="" sidePair="width-width,height-height"/> <relation target="" sidePair="width-width,height-height"/>
<item/> <item/>
<item/> <item/>

6
wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_PlayInfo.xml
View File

@ -17,14 +17,14 @@
<text id="n5_yry6" name="text_huShow" xy="503,4" size="522,76" font="ui://27vd145bh35o7ik0" fontSize="58" color="#fcd696" leading="0" bold="true" text="平胡dsad 实打实收"> <text id="n5_yry6" name="text_huShow" xy="503,4" size="522,76" font="ui://27vd145bh35o7ik0" fontSize="58" color="#fcd696" leading="0" bold="true" text="平胡dsad 实打实收">
<relation target="n2_yry6" sidePair="left-right"/> <relation target="n2_yry6" sidePair="left-right"/>
</text> </text>
<list id="n6_yry6" name="list_allCards" xy="252,90" size="732,84" layout="row" scroll="horizontal" colGap="36" vAlign="middle" autoClearItems="true"> <list id="n6_yry6" name="list_allCards" xy="253,91" size="967,84" layout="row" scroll="horizontal" colGap="36" vAlign="middle" autoClearItems="true">
<relation target="" sidePair="left-left"/> <relation target="" sidePair="left-left"/>
<item url="ui://v0j9abjyyry6zj"/> <item url="ui://v0j9abjyyry6zj"/>
</list> </list>
<component id="n7_yry6" name="Btn_Card_Hu" src="yry6z3" fileName="Main_new/Clearing/Component/Btn_Card_Hu.xml" xy="1022,90"> <component id="n7_yry6" name="Btn_Card_Hu" src="mwqz1bk" fileName="Main_new/Clearing/Component/Btn_RemindCard.xml" xy="1258,89">
<relation target="n6_yry6" sidePair="left-right"/> <relation target="n6_yry6" sidePair="left-right"/>
</component> </component>
<list id="n8_yry6" name="list_JiangMa" xy="1314,36" size="206,138" layout="flow_hz" overflow="scroll" lineGap="18" colGap="-3" defaultItem="ui://v0j9abjyyry6zk"> <list id="n8_yry6" name="list_JiangMa" xy="1424,36" size="206,138" layout="flow_hz" overflow="scroll" lineGap="18" colGap="-3" defaultItem="ui://v0j9abjyyry6zk">
<item/> <item/>
<item/> <item/>
<item/> <item/>

34
wb_new_ui/assets/Main_Majiang/Main_new/Clearing/clearing.xml
View File

@ -19,36 +19,36 @@
<image id="n115_yry6" name="n115" src="yry6yw" fileName="Main_new/Clearing/Image/final_result_title 1.png" xy="540,-15" group="n116_yry6"> <image id="n115_yry6" name="n115" src="yry6yw" fileName="Main_new/Clearing/Image/final_result_title 1.png" xy="540,-15" group="n116_yry6">
<gearDisplay controller="over" pages="0"/> <gearDisplay controller="over" pages="0"/>
</image> </image>
<component id="n118_yry6" name="Label_GamePlay" src="yry6yy" fileName="Main_new/Clearing/Component/Label_GamePlayInfo.xml" xy="186,117" group="n121_yry6"/> <component id="n118_yry6" name="Label_GamePlay" src="yry6yy" fileName="Main_new/Clearing/Component/Label_GamePlayInfo.xml" xy="185,116" group="n121_yry6"/>
<component id="n120_yry6" name="Btn_NextRound2" src="yry6yz" fileName="Main_new/Clearing/Component/Btn_NextRound.xml" xy="2032,1020" group="n121_yry6"/> <component id="n120_yry6" name="Btn_NextRound2" src="yry6yz" fileName="Main_new/Clearing/Component/Btn_NextRound.xml" xy="2031,1019" group="n121_yry6"/>
<component id="n122_yry6" name="Comp_Player1" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="96,219" group="n121_yry6"> <component id="n122_yry6" name="Comp_Player1" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="95,218" group="n121_yry6">
<gearDisplay controller="playerNum" pages="0,1,2"/> <gearDisplay controller="playerNum" pages="0,1,2"/>
</component> </component>
<component id="n123_yry6" name="Comp_Player2" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="96,591" group="n121_yry6"> <component id="n123_yry6" name="Comp_Player2" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="95,590" group="n121_yry6">
<gearDisplay controller="playerNum" pages="0,1,2"/> <gearDisplay controller="playerNum" pages="0,1,2"/>
<gearXY controller="playerNum" pages="0,1" values="96,591|96,516" default="96,417"/> <gearXY controller="playerNum" pages="0,1" values="95,590|96,516" default="96,417"/>
</component> </component>
<component id="n124_yry6" name="Comp_Player3" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="96,615" group="n121_yry6"> <component id="n124_yry6" name="Comp_Player3" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="95,614" group="n121_yry6">
<gearDisplay controller="playerNum" pages="1,2"/> <gearDisplay controller="playerNum" pages="1,2"/>
<gearXY controller="playerNum" pages="1" values="96,813" default="96,615"/> <gearXY controller="playerNum" pages="0,1" values="95,614|96,813" default="96,615"/>
</component> </component>
<text id="n141_kxhm" name="Text_BoJing" xy="1942,150" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#fbbb46" align="center" vAlign="middle" leading="0" bold="true" text="精分"> <text id="n141_kxhm" name="Text_BoJing" xy="1941,149" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#fbbb46" align="center" vAlign="middle" leading="0" bold="true" text="精分">
<relation target="" sidePair=""/> <relation target="" sidePair=""/>
</text> </text>
<text id="n142_kxhm" name="Text_Gang" xy="2052,150" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#fbbb46" align="center" vAlign="middle" leading="0" bold="true" text="杠分"> <text id="n142_kxhm" name="Text_Gang" xy="2051,149" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#fbbb46" align="center" vAlign="middle" leading="0" bold="true" text="杠分">
<relation target="" sidePair=""/> <relation target="" sidePair=""/>
</text> </text>
<text id="n143_kxhm" name="Text_Hu" xy="2166,150" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#5dbd24" align="center" vAlign="middle" leading="0" bold="true" text="胡分"> <text id="n143_kxhm" name="Text_Hu" xy="2165,149" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#5dbd24" align="center" vAlign="middle" leading="0" bold="true" text="胡分">
<relation target="" sidePair="top-top"/> <relation target="" sidePair="top-top"/>
</text> </text>
<text id="n144_kxhm" name="Text_Tatal" xy="2287,150" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#c9372e" align="center" vAlign="middle" leading="0" bold="true" text="总分"> <text id="n144_kxhm" name="Text_Tatal" xy="2286,149" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#c9372e" align="center" vAlign="middle" leading="0" bold="true" text="总分">
<relation target="" sidePair="top-top"/> <relation target="" sidePair="top-top"/>
</text> </text>
<component id="n125_yry6" name="Comp_Player4" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="96,813" group="n121_yry6"> <component id="n125_yry6" name="Comp_Player4" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="95,812" group="n121_yry6">
<gearDisplay controller="playerNum" pages="2"/> <gearDisplay controller="playerNum" pages="2"/>
<gearXY controller="playerNum" default="96,813"/> <gearXY controller="playerNum" pages="0" values="95,812" default="96,813"/>
</component> </component>
<list id="n145_uans" name="list_lastCard" xy="303,1038" size="1256,84" group="n121_yry6" layout="row" overflow="scroll" scroll="horizontal" defaultItem="ui://v0j9abjyyry6z3" vAlign="middle" autoClearItems="true"> <list id="n145_uans" name="list_lastCard" xy="302,1037" size="1256,84" group="n121_yry6" layout="row" overflow="scroll" scroll="horizontal" defaultItem="ui://v0j9abjymwqz1bk" vAlign="middle" autoClearItems="true">
<item/> <item/>
<item/> <item/>
<item/> <item/>
@ -82,9 +82,9 @@
<item/> <item/>
<item/> <item/>
</list> </list>
<text id="n146_uans" name="n146" xy="192,1056" size="88,56" group="n121_yry6" font="Alimama FangYuanTi VF" fontSize="42" color="#c06a2d" text="剩牌"/> <text id="n146_uans" name="n146" xy="191,1055" size="88,56" group="n121_yry6" font="Alimama FangYuanTi VF" fontSize="42" color="#c06a2d" text="剩牌"/>
<text id="n147_uans" name="n147" xy="1638,1056" size="302,56" group="n121_yry6" fontSize="42" color="#c06a2d" text="剩余50张未显示"/> <text id="n147_uans" name="n147" xy="1637,1055" size="302,56" group="n121_yry6" fontSize="42" color="#c06a2d" text="剩余50张未显示"/>
<group id="n121_yry6" name="over0" xy="96,117" size="2340,1017" group="n116_yry6" advanced="true"> <group id="n121_yry6" name="over0" xy="95,116" size="2340,1017" group="n116_yry6" advanced="true">
<gearDisplay controller="over" pages="0"/> <gearDisplay controller="over" pages="0"/>
</group> </group>
<graph id="n126_yry6" name="Bg_over1" xy="185,183" size="2160,864" group="n140_yry6" type="rect" lineSize="0" fillColor="#ff9c8f70" corner="54"/> <graph id="n126_yry6" name="Bg_over1" xy="185,183" size="2160,864" group="n140_yry6" type="rect" lineSize="0" fillColor="#ff9c8f70" corner="54"/>

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

@ -1454,6 +1454,7 @@
<movieclip id="otcu1bh" name="Missile_egg.jta" path="/Missile/" exported="true" atlas="10"/> <movieclip id="otcu1bh" name="Missile_egg.jta" path="/Missile/" exported="true" atlas="10"/>
<movieclip id="otcu1bi" name="Missile_flower.jta" path="/Missile/" exported="true" atlas="10"/> <movieclip id="otcu1bi" name="Missile_flower.jta" path="/Missile/" exported="true" atlas="10"/>
<image id="qncf1bj" name="exit_room.png" path="/Main_new/Main/Image/"/> <image id="qncf1bj" name="exit_room.png" path="/Main_new/Main/Image/"/>
<component id="mwqz1bk" name="Btn_RemindCard.xml" path="/Main_new/Clearing/Component/" exported="true"/>
</resources> </resources>
<publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/> <publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/>
</packageDescription> </packageDescription>

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

Binary file not shown.