提交小细节

master
罗家炜 2025-06-07 17:28:22 +08:00
commit cf183003bb
20 changed files with 89 additions and 32 deletions

View File

@ -196,7 +196,12 @@ local function __fillRoomItem(self, index, item, room)
--printlog("wwwwwwwwwww1111111111111111 ",room.round," ",room.times)
if room.times == 100 then
room_item.tex_round.text = '百息结算'
else
room_item.tex_round.text = room.status >= -1 and string.format('%s/%s', room.round, room.times) or ""
end
local name = __getLayerName(self, room.pid)
room_item.tex_gamename.text = name
room_item.tex_limit.text = str
@ -651,7 +656,7 @@ function M:InitRoomInfoView()
local room = self.roominfo.room
if not room.default then
printlog("wwwwwwwwwww22222222222222222 ", room.round, " ", room.times)
self.roominfo.view:GetChild('tex_round').text = string.format('(%s/%s)', room.round, room.times)
self.roominfo.view:GetChild('tex_round').text = string.format('(%s====%s)', room.round, room.times)
local lst_player = self.roominfo.view:GetChild('lst_player')
lst_player:RemoveChildrenToPool()
if room.plist and #room.plist > 0 then

View File

@ -94,6 +94,7 @@ function M:InitData(over, room, result, total_result, callback)
self.xiPaiCtr.selectedIndex=0
_btnCtr.selectedIndex = 1
_sdkCtr.selectedIndex = 1
printlog("btn_result00000")
btn_result.onClick:Add(
function()
_overCtr.selectedIndex = 3
@ -145,6 +146,17 @@ function M:InitData(over, room, result, total_result, callback)
ViewManager.ChangeView(ViewManager.View_Lobby)
end
)
-- 自动跳转
coroutine.start(
function()
coroutine.wait(3)
_overCtr.selectedIndex = 3
_btnCtr.selectedIndex = 0
_sdkCtr.selectedIndex = 0
end
)
self:AddClearItem(room, result, total_result.info_list, over)
else
@ -432,6 +444,8 @@ function M:FillItemData(room, data, item)
self._view:GetChild("fangpaoscore").text = "放炮扣息:-"..win_data.fangpaoscore
if (hp_info ~= nil and room.hpOnOff == 1 or room:checkHpNonnegative()) then
local isupper_limit = hp_info.upper_limit -- // 输赢是否已达上限
if (isupper_limit) then
@ -621,6 +635,11 @@ function M:FillItemData(room, data, item)
end
end
end
else
end
printlog("输了:")
item:RemoveChildrenToPool()
@ -708,6 +727,10 @@ function M:FillItemData(room, data, item)
end
end
end
self._view:GetChild('score_shu').text = '总胡息:' .. info_list[i].total_score
end
end
end

View File

@ -165,9 +165,9 @@ function M:ShowHuTip(card)
if card ~= nil then
list_remove(player.handcard_list, card)
end
printlog("jefe ting pai")
local tingList = CardCheck.tingPai(player, DataManager.CurrenRoom)
pt(tingList)
if self._mainView._hu_tip ~= nil then
self._mainView._hu_tip:FillData(tingList)
end

View File

@ -3,6 +3,9 @@
"n51_fmkv": {
"collapsed": true
},
"n92_uw33": {
"hidden": true
},
"n33_n1ry": {
"hidden": true
}

View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="1334,750">
<controller name="over" pages="0,,1,,2,,3," selected="1"/>
<controller name="over" pages="0,,1,,2,,3," selected="0"/>
<controller name="button" pages="0,,1," selected="0"/>
<controller name="sdk" pages="0,,1," selected="0"/>
<controller name="owner" pages="0,,1," selected="0"/>
<controller name="bank" pages="0,,1," selected="0"/>
<controller name="qipai" pages="0,,1," selected="1"/>
<controller name="xipai" pages="0,,1," selected="0"/>
<controller name="hudianpao" pages="0,,1,,2," selected="0"/>
<controller name="hudianpao" pages="0,,1,,2," selected="2"/>
<displayList>
<component id="n20_pt1r" name="win_base" pkg="27vd145b" src="e6awcd0" fileName="Win_Frame_Old.xml" xy="-5,860" size="1334,750" group="n70_dunj"/>
<image id="n72_p9qe" name="n72" src="o49p1d3" fileName="component/Main/component/new_ui/di_kuang.png" pkg="v6yvqp7w" xy="23,55" size="1296,687" group="n70_dunj">
@ -139,7 +139,9 @@
<image id="n87_rbpg" name="n87" src="rbpga3" fileName="component/clearing/images/dianpao.png" xy="1057,464" size="157,97" group="n70_dunj">
<gearDisplay controller="hudianpao" pages="2"/>
</image>
<text id="n90_dbve" name="fangpaoscore" xy="973,577" size="310,72" group="n70_dunj" font="Microsoft YaHei" fontSize="36" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="放炮扣息:-30">
<text id="n92_uw33" name="huxi_shu" xy="989,574" size="257,41" group="n70_dunj" visible="false" font="Microsoft YaHei" fontSize="28" color="#ffffff" vAlign="middle" autoSize="none" bold="true" singleLine="true" text=""/>
<text id="n93_uw33" name="score_shu" xy="954,610" size="256,57" group="n70_dunj" font="Microsoft YaHei" fontSize="30" color="#ffffff" vAlign="middle" autoSize="none" bold="true" singleLine="true" text=""/>
<text id="n90_dbve" name="fangpaoscore" xy="960,545" size="310,72" group="n70_dunj" font="Microsoft YaHei" fontSize="30" color="#ffffff" vAlign="middle" autoSize="none" text="放炮扣息:-30">
<gearDisplay controller="hudianpao" pages="2"/>
</text>
<list id="n52_rx2e" name="card_list_3" xy="137,179" size="261,177" group="n55_rx2e" layout="row" colGap="1" defaultItem="ui://ppu1wv76j4mf9e" vAlign="middle">

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="1334,750" designImage="ui://3vytbifonu0l2f" designImageOffsetX="-200" designImageOffsetY="-100">
<controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="1"/>
<controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="0"/>
<controller name="sdk" pages="0,,1," selected="0"/>
<controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
<controller name="jushu" pages="0,,1," selected="0"/>
@ -27,7 +27,7 @@
<component id="n147_nu0l" name="player_info2" src="f55qw7" fileName="component/Main/component/PlayerHead_2.xml" xy="11,71">
<relation target="" sidePair="left-left,leftext-left"/>
</component>
<component id="n7" name="player_info1" src="f55qw4" fileName="component/Main/component/PlayerHead_1.xml" xy="22,548" size="189,67">
<component id="n7" name="player_info1" src="f55qw4" fileName="component/Main/component/PlayerHead_1.xml" xy="20,524" size="189,67">
<gearXY controller="state" pages="0,1,2,3" values="20,524|22,548|8,570|8,570"/>
<relation target="" sidePair="left-left,leftext-left"/>
</component>
@ -69,14 +69,14 @@
<gearDisplay controller="state" pages="1,2"/>
<relation target="" sidePair="left-left"/>
</component>
<component id="n24" name="right_panel" src="f55qvt" fileName="component/Main/component/Folder/RightPanel.xml" xy="0,-19" size="862,82" group="n150_8th3">
<component id="n24" name="right_panel" src="f55qvt" fileName="component/Main/component/Folder/RightPanel.xml" xy="0,-17" size="920,82" group="n150_8th3">
<gearDisplay controller="state" pages="0,1,2,3"/>
<relation target="" sidePair="left-left"/>
</component>
<component id="n37_kba2" name="roominfo_panel1" src="f55qwb" fileName="component/Main/RoomInfoPanel1.xml" xy="819,-76" size="221,43" group="n150_8th3" visible="false" touchable="false"/>
<component id="n31_h1uu" name="roominfo_panel" src="f55qwb" fileName="component/Main/RoomInfoPanel1.xml" xy="437,-73" size="403,92" group="n150_8th3" visible="false" touchable="false"/>
<component id="n46_u4l2" name="btn_rule1" src="f55qvn" fileName="component/Main/component/Folder/component/phone_info/Btn_log.xml" xy="537,-97" size="99,4" group="n150_8th3" visible="false"/>
<group id="n150_8th3" name="n150" xy="0,-97" size="1040,160" advanced="true">
<component id="n37_kba2" name="roominfo_panel1" src="f55qwb" fileName="component/Main/RoomInfoPanel1.xml" xy="820,-35" size="279,43" group="n150_8th3" visible="false" touchable="false"/>
<component id="n31_h1uu" name="roominfo_panel" src="f55qwb" fileName="component/Main/RoomInfoPanel1.xml" xy="874,-29" size="461,92" group="n150_8th3" touchable="false"/>
<component id="n46_u4l2" name="btn_rule1" src="f55qvn" fileName="component/Main/component/Folder/component/phone_info/Btn_log.xml" xy="537,-95" size="157,4" group="n150_8th3" visible="false"/>
<group id="n150_8th3" name="n150" xy="0,-95" size="1335,160" advanced="true">
<relation target="" sidePair="left-left"/>
</group>
<image id="n152_8th3" name="n152" src="f55qvu" fileName="component/Main/images/di00.png" xy="377,-91" size="580,86" visible="false">

View File

@ -2,19 +2,32 @@
<component size="270,240" extention="Button">
<controller name="state" pages="0,,1," selected="0"/>
<displayList>
<<<<<<< HEAD
<component id="n42_10snh" name="desk" src="ilon7i9m" fileName="component/Lst_room/Gcm_Play_desk1.xml" xy="8,13" size="250,221"/>
<component id="n55_vena" name="btn_detail" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="100,131" size="104,126" scale="0.7,0.7" visible="false">
<relation target="" sidePair="center-center%"/>
<Button title=" " icon="ui://m7iejg46h60mhyq"/>
</component>
<text id="n53_n96g" name="tex_round" xy="116,91" size="44,32" font="Microsoft YaHei" fontSize="22" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" bold="true" autoClearText="true" text="8/1">
=======
<component id="n42_10snh" name="desk" src="ilon7i9m" fileName="component/Lst_room/Gcm_Play_desk1.xml" xy="-6,27"/>
<component id="n55_vena" name="btn_detail" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="101,131" size="104,126" scale="0.7,0.7" visible="false">
<relation target="" sidePair="center-center%"/>
<Button title=" " icon="ui://m7iejg46h60mhyq"/>
</component>
<text id="n53_n96g" name="tex_round" xy="116,91" size="43,31" font="Microsoft YaHei" fontSize="22" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" bold="true" autoClearText="true" text="8/1">
>>>>>>> 65128f05d0c0b1dfb1cbad90a1d1ef8eb1f8f281
<relation target="" sidePair="center-center,middle-middle"/>
<relation target="n52_n96g" sidePair="top-bottom"/>
</text>
<text id="n52_n96g" name="tex_gamename" xy="72,61" size="129,34" font="Microsoft YaHei" fontSize="24" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" autoSize="height" bold="true" strokeColor="#053691" autoClearText="true" text="红中麻将">
<relation target="" sidePair="center-center,top-top%"/>
</text>
<<<<<<< HEAD
<text id="n54_hugj" name="tex_limit" xy="123,131" size="27,26" font="Microsoft YaHei" fontSize="18" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" bold="true" autoClearText="true" text="33">
=======
<text id="n54_hugj" name="tex_limit" xy="123,132" size="28,27" font="Microsoft YaHei" fontSize="18" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" bold="true" autoClearText="true" text="33">
>>>>>>> 65128f05d0c0b1dfb1cbad90a1d1ef8eb1f8f281
<relation target="" sidePair="center-center,middle-middle"/>
<relation target="n56_ilon" sidePair="center-center,middle-middle"/>
</text>

View File

@ -2,19 +2,32 @@
<component size="270,240" extention="Button">
<controller name="state" pages="0,,1," selected="0"/>
<displayList>
<<<<<<< HEAD
<component id="n42_10snh" name="desk" src="iaes7idj" fileName="component/Lst_room/Gcm_Play_desk2.xml" xy="8,13" size="250,221"/>
<component id="n55_vena" name="btn_detail" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="101,131" size="104,126" scale="0.7,0.7" visible="false">
<relation target="" sidePair="center-center%"/>
<Button title=" " icon="ui://m7iejg46h60mhyq"/>
</component>
<text id="n57_ufim" name="tex_round" xy="116,91" size="44,32" font="Microsoft YaHei" fontSize="22" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" bold="true" autoClearText="true" text="8/1">
=======
<component id="n42_10snh" name="desk" src="iaes7idj" fileName="component/Lst_room/Gcm_Play_desk2.xml" xy="-1,34" size="270,240"/>
<component id="n55_vena" name="btn_detail" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="101,149" size="104,126" scale="0.7,0.7" visible="false">
<relation target="" sidePair="center-center%"/>
<Button title=" " icon="ui://m7iejg46h60mhyq"/>
</component>
<text id="n53_n96g" name="tex_round" xy="116,91" size="43,31" font="Microsoft YaHei" fontSize="22" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" bold="true" autoClearText="true" text="8/1">
>>>>>>> 65128f05d0c0b1dfb1cbad90a1d1ef8eb1f8f281
<relation target="" sidePair="center-center,middle-middle"/>
<relation target="n58_ufim" sidePair="top-bottom"/>
</text>
<text id="n58_ufim" name="tex_gamename" xy="72,62" size="129,34" font="Microsoft YaHei" fontSize="24" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" autoSize="height" bold="true" strokeColor="#053691" autoClearText="true" text="红中麻将">
<relation target="" sidePair="center-center,top-top%"/>
</text>
<<<<<<< HEAD
<text id="n59_ufim" name="tex_limit" xy="123,132" size="27,26" font="Microsoft YaHei" fontSize="18" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" bold="true" autoClearText="true" text="33">
=======
<text id="n54_hugj" name="tex_limit" xy="123,132" size="28,27" font="Microsoft YaHei" fontSize="18" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" bold="true" autoClearText="true" text="33">
>>>>>>> 65128f05d0c0b1dfb1cbad90a1d1ef8eb1f8f281
<relation target="" sidePair="center-center,middle-middle"/>
<relation target="n60_ufim" sidePair="center-center,middle-middle"/>
</text>

Binary file not shown.

View File

@ -14,14 +14,14 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_PixelRect:
serializedVersion: 2
x: 7.3333335
y: 50
x: 66
y: 58
width: 906
height: 854.6667
m_ShowMode: 4
m_Title:
m_RootView: {fileID: 4}
m_MinSize: {x: 875, y: 392}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
m_Maximized: 0
--- !u!114 &2
@ -76,7 +76,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 342}
m_MaxSize: {x: 4000, y: 8042}
vertical: 1
controlID: 55
controlID: 35
--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
@ -99,7 +99,7 @@ MonoBehaviour:
y: 0
width: 906
height: 855
m_MinSize: {x: 875, y: 392}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
--- !u!114 &5
MonoBehaviour:
@ -146,7 +146,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 342}
m_MaxSize: {x: 4000, y: 8042}
vertical: 0
controlID: 54
controlID: 34
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@ -216,8 +216,8 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 7.3333335
y: 463.33334
x: 66
y: 471.33334
width: 906
height: 401
m_ViewDataDictionary: {fileID: 0}
@ -327,7 +327,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: f03b0000
m_LastClickedID: 15344
m_ExpandedIDs: 00000000e82c0000ac360000f03b0000f23b0000f43b0000f63b0000f83b0000fa3b0000fc3b0000fe3b0000003c0000023c0000043c0000063c0000083c00000a3c00000c3c00000e3c0000103c0000123c0000143c0000163c0000183c00001a3c00001c3c00001e3c0000203c0000223c0000243c0000263c0000283c00002a3c00002c3c00002e3c0000303c0000323c0000343c0000363c0000383c00003a3c00003c3c00003e3c0000403c0000423c0000443c0000463c0000483c00004a3c00004c3c00004e3c0000503c0000523c0000543c0000
m_ExpandedIDs: 00000000e82c0000ac360000f03b0000f23b0000f43b0000f63b0000f83b0000fa3b0000fc3b0000fe3b0000003c0000023c0000043c0000063c0000083c00000a3c00000c3c00000e3c0000103c0000123c0000143c0000163c0000183c00001a3c00001c3c00001e3c0000203c0000223c0000243c0000263c0000283c00002a3c00002c3c00002e3c0000303c0000323c0000343c0000363c0000383c00003a3c00003c3c00003e3c0000403c0000423c0000443c0000463c0000483c00004a3c00004c3c00004e3c0000503c0000523c0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -355,7 +355,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: ffffffff00000000e82c0000ac360000f03b0000f43b0000f63b0000f83b0000fa3b0000fc3b0000fe3b0000003c0000023c0000043c0000063c0000083c00000a3c00000c3c00000e3c0000103c0000123c0000143c0000163c0000183c00001a3c00001c3c00001e3c0000203c0000223c0000243c0000263c0000283c00002a3c00002c3c00002e3c0000303c0000323c0000343c0000363c0000383c00003a3c00003c3c00003e3c0000403c0000423c0000443c0000463c0000483c00004a3c00004c3c00004e3c0000503c0000523c0000543c0000
m_ExpandedIDs: 00000000e82c0000ac360000f03b0000f23b0000f43b0000f63b0000f83b0000fa3b0000fc3b0000fe3b0000003c0000023c0000043c0000063c0000083c00000a3c00000c3c00000e3c0000103c0000123c0000143c0000163c0000183c00001a3c00001c3c00001e3c0000203c0000223c0000243c0000263c0000283c00002a3c00002c3c00002e3c0000303c0000323c0000343c0000363c0000383c00003a3c00003c3c00003e3c0000403c0000423c0000443c0000463c0000483c00004a3c00004c3c00004e3c0000503c0000523c0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -432,8 +432,8 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 7.3333335
y: 80
x: 66
y: 88
width: 906
height: 362
m_ViewDataDictionary: {fileID: 0}

Binary file not shown.

View File

@ -1 +1 @@
{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-1184],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-3828052,-3828028,-3827126,-3827108,-3827094,-3775214,-3775012,-3774994,-1413332,-1412246,-1412228,-1412214,-1404920,-1404916,-541026,-540824,-540806,-1184,-12],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}

View File

@ -1 +1 @@
{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":4.090795516967773,"y":-1.5935472249984742,"z":-0.6036038398742676},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":5.594338893890381,"orthographic":true}
{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":-1.7464380264282227,"y":-1.1915894746780396,"z":-1.0382763147354127},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":9.469741821289063,"orthographic":true}

View File

@ -0,0 +1,2 @@
Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.10f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.10f1/Editor/Data/PlaybackEngines'
Cmd: initializeCompiler

View File

@ -1,2 +0,0 @@
Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.10f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.10f1/Editor/Data/PlaybackEngines'
Cmd: initializeCompiler

View File

@ -1,2 +0,0 @@
Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.10f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.10f1/Editor/Data/PlaybackEngines'
Cmd: initializeCompiler