fangpaofa

master
FPGA 2025-06-10 14:22:06 +08:00
parent 6a8de73fe1
commit 0ba87157ef
15 changed files with 100 additions and 54 deletions

View File

@ -343,6 +343,17 @@ function M:InitView(url, isHideIpAdds)
)
end--]]
local btn_leave_lobby = _view:GetChild('btn_leave_lobby')
if btn_leave_lobby ~= nil then
btn_leave_lobby.onClick:Set(
function()
self._gamectr.tmpRoomID = self._room.room_id
self._gamectr.tmpGroupID = self._room.group_id
ViewManager.ChangeView(ViewManager.View_Lobby)
end
)
end
UpdateBeat:Add(self.OnUpdate, self)
if self._room.room_config.people_num <= 4 and self._room.room_config.people_num >= 3 and self._gamectr:CheckGPS() then
self._show_distance = true

View File

@ -64,12 +64,12 @@ MngPageConfig.Config = {
{
-- 盟主
--{19, 16, 7, 3, 8, 9, 13, 17},
{ 9, 17, 16, 7 },
{ 9, 14, 17, 16, 7 },
-- 管理员
--{19, 16, 7, 3, 8, 9, 13, 17},
{ 9, 17, 16, 7 },
{ 9, 14, 17, 16, 7 },
-- 合伙人
{ 17, 16, 7 },
{ 14,17, 16, 7 },
--{19,16,7, 8,17,22},
-- 普通玩家
--{9, 17},

View File

@ -159,6 +159,11 @@ function M:SelectedConfigData()
if _config:GetChild("btn_wuhongzhongzimo") then
wuguijiabei = _config:GetChild("btn_wuhongzhongzimo").selected
end
local dianpaohu = false
if _config:GetChild("btn_dianpaohu") then
dianpaohu = _config:GetChild("btn_dianpaohu").selected
end
local di_fen=false
if _config:GetController('difen') then
@ -234,7 +239,7 @@ function M:SelectedConfigData()
_data["fengding_score"] = fengding_score
_data["wuguizhuopaojiabei"] = wuguizhuopaojiabei
_data["dianpaohu"] = dianpaohu
return _data
end
@ -262,6 +267,7 @@ function M:LoadConfigData(data)
end
_config:GetController("jiangma").selectedIndex = data.jiangma
_config:GetChild("btn_dianpaohu").selected = data.dianpaohu
if _config:GetController("piao") then
_config:GetController("piao").selectedIndex=data.piao_niao

View File

@ -860,16 +860,16 @@ function M:EventInit()
if DataManager.CurrenRoom.pai == 0 then
if card_n == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- body
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. card_n ..
"_1")
-- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. card_n .."_1")
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. card_n)
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. card_n)
end
else
if card_n == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- body
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. card_n ..
"_2")
--card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. card_n .."_2")
card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. card_n .. "_2")
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. card_n .. "_2")
end
@ -1256,10 +1256,10 @@ function M:ReconnectForClearing()
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. card_n .. "_2")
end
if card_n == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- if card_n == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- body
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. card_n .. "_1")
end
-- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. card_n .. "_1")
-- end
card_code_obj:SetScale(0.6, 0.6)
poker_item:AddChild(card_code_obj)
otherpoker_list:AddChild(poker_item)

View File

@ -72,14 +72,16 @@ function M:SetOutCardInfo(cardlist, isPass, isAnim)
if DataManager.CurrenRoom.pai == 0 then
if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- body
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_1")
-- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_1")
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code)
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code)
end
else
if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- body
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_2")
-- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_2")
card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. code .. "_2")
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. code .. "_2")
end
@ -113,14 +115,16 @@ function M:SetOutCardInfo(cardlist, isPass, isAnim)
if DataManager.CurrenRoom.pai == 0 then
if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- body
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_1")
-- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_1")
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code)
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code)
end
else
if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- body
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_2")
-- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_2")
card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. code .. "_2")
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. code .. "_2")
end
@ -295,14 +299,16 @@ function M:CreatPoker1(poker, scale, bank)
if DataManager.CurrenRoom.pai == 0 then
if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- body
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_1")
-- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_1")
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code)
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code)
end
else
if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- body
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_2")
--card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_2")
card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. code .. "_2")
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. code .. "_2")
end
@ -325,14 +331,16 @@ function M:CreatPoker(poker, scale, bank)
if DataManager.CurrenRoom.pai == 0 then
if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- body
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_1")
-- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_1")
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code)
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code)
end
else
if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- body
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_2")
-- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_2")
card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. code .. "_2")
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. code .. "_2")
end

View File

@ -650,14 +650,16 @@ function M:SetOutCardList(cardlist, isAnim)
if DataManager.CurrenRoom.pai == 0 then
if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- body
card_code_obj = UIPackage.CreateObjectFromURL('ui://Extend_Poker_RunFastNew/' .. code .. '_1')
-- card_code_obj = UIPackage.CreateObjectFromURL('ui://Extend_Poker_RunFastNew/' .. code .. '_1')
card_code_obj = UIPackage.CreateObjectFromURL('ui://Extend_Poker_RunFastNew/' .. code)
else
card_code_obj = UIPackage.CreateObjectFromURL('ui://Extend_Poker_RunFastNew/' .. code)
end
else
if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- body
card_code_obj = UIPackage.CreateObjectFromURL('ui://Extend_Poker_RunFastNew/' .. code .. '_2')
--card_code_obj = UIPackage.CreateObjectFromURL('ui://Extend_Poker_RunFastNew/' .. code .. '_2')
card_code_obj = UIPackage.CreateObjectFromURL('ui://Main_Poker/' .. code .. '_2')
else
card_code_obj = UIPackage.CreateObjectFromURL('ui://Main_Poker/' .. code .. '_2')
end

View File

@ -1,12 +1,21 @@
{
"objectStatus": {
"n146_piwz": {
"n158_ug6y": {
"hidden": true
},
"n106_t038": {
"hidden": true
},
"n154_j47e": {
"collapsed": true
},
"n122_c4r1": {
"collapsed": true
},
"n154_j47e": {
"n103_t038": {
"hidden": true
},
"n146_piwz": {
"collapsed": true
},
"n136_c4r1": {
@ -17,6 +26,9 @@
},
"n74_nip5": {
"hidden": true
},
"n160_ozsy": {
"hidden": true
}
}
}

View File

@ -20,31 +20,31 @@
<component id="n98_t038" name="n98" src="amco5z" fileName="component/create_room/di01.xml" pkg="27vd145b" xy="0,1" group="n107_t038" controller="type,0">
<Button title="局数"/>
</component>
<component id="n158_ug6y" name="btn_round1" src="h1uu3f" fileName="component/create_room/Btn_cr_checkbox.xml" pkg="27vd145b" xy="130,11" group="n107_t038">
<Button checked="true" title="1局" controller="round" page="0"/>
<component id="n158_ug6y" name="btn_round1" src="h1uu3f" fileName="component/create_room/Btn_cr_checkbox.xml" pkg="27vd145b" xy="559,9" group="n107_t038" visible="false">
<Button title="1局" controller="round" page="0"/>
</component>
<component id="n160_ozsy" name="btn_round4" src="h1uu3f" fileName="component/create_room/Btn_cr_checkbox.xml" pkg="27vd145b" xy="362,11" group="n107_t038">
<component id="n160_ozsy" name="btn_round4" src="h1uu3f" fileName="component/create_room/Btn_cr_checkbox.xml" pkg="27vd145b" xy="362,9" group="n107_t038" visible="false">
<Button title="4局" controller="round" page="1"/>
</component>
<component id="n99_t038" name="btn_round8" src="h1uu3f" fileName="component/create_room/Btn_cr_checkbox.xml" pkg="27vd145b" xy="549,11" group="n107_t038">
<Button title="8局" controller="round" page="4"/>
<component id="n99_t038" name="btn_round8" src="h1uu3f" fileName="component/create_room/Btn_cr_checkbox.xml" pkg="27vd145b" xy="131,9" group="n107_t038">
<Button checked="true" title="8局" controller="round" page="4"/>
</component>
<component id="n100_t038" name="btn_round16" src="h1uu3f" fileName="component/create_room/Btn_cr_checkbox.xml" pkg="27vd145b" xy="774,11" group="n107_t038">
<component id="n100_t038" name="btn_round16" src="h1uu3f" fileName="component/create_room/Btn_cr_checkbox.xml" pkg="27vd145b" xy="526,14" group="n107_t038">
<Button title="16局" controller="round" page="7"/>
</component>
<image id="n101_t038" name="n101" src="voh67hzc" fileName="component/create_room/image/pic07.png" pkg="27vd145b" xy="240,19" group="n103_t038"/>
<text id="n102_t038" name="tex_price1" xy="278,17" size="27,29" group="n103_t038" fontSize="20" color="#ffffff" text="10"/>
<group id="n103_t038" name="n103" xy="240,17" size="68,29" group="n107_t038" advanced="true"/>
<image id="n104_t038" name="n104" src="voh67hzc" fileName="component/create_room/image/pic07.png" pkg="27vd145b" xy="450,21" group="n106_t038"/>
<text id="n105_t038" name="tex_price2" xy="489,19" size="15,29" group="n106_t038" fontSize="20" color="#ffffff" text="2"/>
<group id="n106_t038" name="n106" xy="450,19" size="68,29" group="n107_t038" advanced="true"/>
<image id="n155_ug6y" name="n155" src="voh67hzc" fileName="component/create_room/image/pic07.png" pkg="27vd145b" xy="645,21" group="n157_ug6y"/>
<text id="n156_ug6y" name="tex_price3" xy="684,19" size="15,29" group="n157_ug6y" fontSize="20" color="#ffffff" text="2"/>
<group id="n157_ug6y" name="n157" xy="645,19" size="68,29" group="n107_t038" advanced="true"/>
<image id="n161_ozsy" name="n161" src="voh67hzc" fileName="component/create_room/image/pic07.png" pkg="27vd145b" xy="884,21" group="n163_ozsy"/>
<text id="n162_ozsy" name="tex_price4" xy="923,19" size="15,29" group="n163_ozsy" fontSize="20" color="#ffffff" text="2"/>
<group id="n163_ozsy" name="n163" xy="884,19" size="68,29" group="n107_t038" advanced="true"/>
<group id="n107_t038" name="round" xy="0,1" size="1001,60"/>
<image id="n101_t038" name="n101" src="voh67hzc" fileName="component/create_room/image/pic07.png" pkg="27vd145b" xy="671,20" group="n103_t038"/>
<text id="n102_t038" name="tex_price1" xy="709,18" size="27,29" group="n103_t038" fontSize="20" color="#ffffff" text="10"/>
<group id="n103_t038" name="n103" xy="671,18" size="68,29" group="n107_t038" visible="false" advanced="true"/>
<image id="n104_t038" name="n104" src="voh67hzc" fileName="component/create_room/image/pic07.png" pkg="27vd145b" xy="454,18" group="n106_t038"/>
<text id="n105_t038" name="tex_price2" xy="493,16" size="15,29" group="n106_t038" fontSize="20" color="#ffffff" text="2"/>
<group id="n106_t038" name="n106" xy="454,16" size="68,29" group="n107_t038" visible="false" advanced="true"/>
<image id="n155_ug6y" name="n155" src="voh67hzc" fileName="component/create_room/image/pic07.png" pkg="27vd145b" xy="236,19" group="n157_ug6y"/>
<text id="n156_ug6y" name="tex_price3" xy="275,17" size="15,29" group="n157_ug6y" fontSize="20" color="#ffffff" text="2"/>
<group id="n157_ug6y" name="n157" xy="236,17" size="68,29" group="n107_t038" advanced="true"/>
<image id="n161_ozsy" name="n161" src="voh67hzc" fileName="component/create_room/image/pic07.png" pkg="27vd145b" xy="636,26" group="n163_ozsy"/>
<text id="n162_ozsy" name="tex_price4" xy="675,24" size="15,29" group="n163_ozsy" fontSize="20" color="#ffffff" text="2"/>
<group id="n163_ozsy" name="n163" xy="636,24" size="68,29" group="n107_t038" advanced="true"/>
<group id="n107_t038" name="round" xy="0,1" size="786,60"/>
<component id="n108_i9b1" name="n108" src="amco5z" fileName="component/create_room/di01.xml" pkg="27vd145b" xy="0,61" group="n112_i9b1" controller="type,0">
<Button title="人数"/>
</component>
@ -89,6 +89,9 @@
<component id="n159_kuo7" name="btn_wuhongzhongzuobaofanbei" src="h1uu3i" fileName="component/create_room/Btn_cr_checkbox2.xml" pkg="27vd145b" xy="375,224" size="223,47" group="n9_mw5l">
<Button title="无红中捉炮翻倍" titleFontSize="28"/>
</component>
<component id="n170_x9it" name="btn_dianpaohu" src="h1uu3i" fileName="component/create_room/Btn_cr_checkbox2.xml" pkg="27vd145b" xy="621,224" size="224,47" group="n9_mw5l">
<Button title="点炮胡" titleFontSize="28"/>
</component>
<group id="n9_mw5l" name="option" xy="0,122" size="846,149"/>
<component id="n39_6cpq" name="n39" src="amco5z" fileName="component/create_room/di01.xml" pkg="27vd145b" xy="0,286" group="n46_6cpq" controller="type,0">
<Button title="可选"/>

Binary file not shown.

View File

@ -14,8 +14,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_PixelRect:
serializedVersion: 2
x: -8.666667
y: 58
x: -15.333334
y: 50
width: 906
height: 854.6667
m_ShowMode: 4
@ -76,7 +76,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 342}
m_MaxSize: {x: 4000, y: 8042}
vertical: 1
controlID: 35
controlID: 54
--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
@ -146,7 +146,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 342}
m_MaxSize: {x: 4000, y: 8042}
vertical: 0
controlID: 34
controlID: 53
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@ -216,8 +216,8 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: -8.666667
y: 471.33334
x: -15.333334
y: 463.33334
width: 906
height: 401
m_ViewDataDictionary: {fileID: 0}
@ -252,7 +252,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: ac96c5ffc496c5ff4a9ac5ff5c9ac5ff6a9ac5ff1265c6ffdc65c6ffee65c6ff2c6feaff6a73eaff7c73eaff8a73eaff0890eaff0c90eaff9ebef7ff68bff7ff7abff7ff60fbfffff4ffffff
m_ExpandedIDs: 52fbffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -327,7 +327,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: f03b0000
m_LastClickedID: 15344
m_ExpandedIDs: 00000000e82c0000ac360000f03b0000f23b0000f43b0000f63b0000f83b0000fa3b0000fc3b0000fe3b0000003c0000023c0000043c0000063c0000083c00000a3c00000c3c00000e3c0000103c0000123c0000143c0000163c0000183c00001a3c00001c3c00001e3c0000203c0000223c0000243c0000263c0000283c00002a3c00002c3c00002e3c0000303c0000323c0000343c0000363c0000383c00003a3c00003c3c00003e3c0000403c0000423c0000443c0000463c0000483c00004a3c00004c3c00004e3c0000503c0000523c0000
m_ExpandedIDs: 00000000ea2c0000ae360000003c0000023c0000043c0000063c0000083c00000a3c00000c3c00000e3c0000103c0000123c0000143c0000163c0000183c00001a3c00001c3c00001e3c0000203c0000223c0000243c0000263c0000283c00002a3c00002c3c00002e3c0000303c0000323c0000343c0000363c0000383c00003a3c00003c3c00003e3c0000403c0000423c0000443c0000463c0000483c00004a3c00004c3c00004e3c0000503c0000523c0000543c0000563c0000583c00005a3c00005c3c00005e3c0000603c0000623c0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -355,7 +355,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 00000000e82c0000ac360000f03b0000f23b0000f43b0000f63b0000f83b0000fa3b0000fc3b0000fe3b0000003c0000023c0000043c0000063c0000083c00000a3c00000c3c00000e3c0000103c0000123c0000143c0000163c0000183c00001a3c00001c3c00001e3c0000203c0000223c0000243c0000263c0000283c00002a3c00002c3c00002e3c0000303c0000323c0000343c0000363c0000383c00003a3c00003c3c00003e3c0000403c0000423c0000443c0000463c0000483c00004a3c00004c3c00004e3c0000503c0000523c0000
m_ExpandedIDs: 00000000ea2c0000ae360000003c0000023c0000043c0000063c0000083c00000a3c00000c3c00000e3c0000103c0000123c0000143c0000163c0000183c00001a3c00001c3c00001e3c0000203c0000223c0000243c0000263c0000283c00002a3c00002c3c00002e3c0000303c0000323c0000343c0000363c0000383c00003a3c00003c3c00003e3c0000403c0000423c0000443c0000463c0000483c00004a3c00004c3c00004e3c0000503c0000523c0000543c0000563c0000583c00005a3c00005c3c00005e3c0000603c0000623c0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -432,8 +432,8 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: -8.666667
y: 88
x: -15.333334
y: 80
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":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}

View File

@ -0,0 +1,4 @@
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
Quitting shader compiler process