fpgajie
/
changhong
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fangpaofa

master
FPGA 2025-06-06 22:25:52 +08:00
parent 7e7d08027e
commit 05a40194c3
14 changed files with 52 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua
View File

@ -20,11 +20,11 @@ function FanPaoFa_ResultView.new(blur_view, index)
end
function M:init(url)
printlog("init view fanpaofa")
ResultView.init(self, url)
printlog("init view fanpaofa2")
local btn_share = self._view:GetChild('btn_share')
printlog("init view fanpaofa3")
btn_share.onClick:Set(
function()
ShareScreenShot()
@ -33,7 +33,6 @@ function M:init(url)
end
function M:InitData(over, room, result, total_result, callback)
printlog("result1")
local _overCtr = self._view:GetController('over')
local btn_confirm = self._view:GetChild('btn_confirm')
local btn_result = self._view:GetChild('btn_showResult')
@ -71,8 +70,6 @@ function M:InitData(over, room, result, total_result, callback)
xipai.text="洗牌 积分x"..result.xipai_score
end
printlog("resultsss")
if result ~= nil and result.liuju == true then
_icon.icon = 'ui://Main_RunBeard/liuju'
_btnCtr.selectedIndex = 0
@ -112,9 +109,7 @@ function M:InitData(over, room, result, total_result, callback)
self:AddClearItem(room, result, total_result.info_list, over)
end
end
printlog("result2")
if over == 0 and result.liuju == false then
printlog("result3")
_icon.icon = 'ui://Main_RunBeard/jiesuan'
_btnCtr.selectedIndex = 0
_sdkCtr.selectedIndex = 1
@ -130,10 +125,10 @@ function M:InitData(over, room, result, total_result, callback)
end
end
)
printlog("result31")
self:AddClearItem(room, result, nil, over)
elseif over == 1 and result.liuju == false then
printlog("result4")
_icon.icon = 'ui://Main_RunBeard/jiesuan'
_btnCtr.selectedIndex = 1
_sdkCtr.selectedIndex = 1
@ -152,7 +147,7 @@ function M:InitData(over, room, result, total_result, callback)
)
self:AddClearItem(room, result, total_result.info_list, over)
else
printlog("result5")
if result ~= nil then
if result.liuju == false then
_icon.icon = 'ui://Main_RunBeard/jiesuan'
@ -178,15 +173,13 @@ function M:InitData(over, room, result, total_result, callback)
self:AddClearItem(room, nil, total_result.info_list, over)
end
end
printlog("resultend")
end
function M:AddClearItem(room, data, total_data, over)
local n = over + 1
local list_view1 = self._view:GetChild('player_list')
local list_view2 = self._view:GetChild('player_list_2')
printlog("result32")
if data ~= nil and data.liuju == true then
self:FillLiuJuItemData(room, data,list_view1)
if over == 1 then
@ -194,7 +187,7 @@ function M:AddClearItem(room, data, total_data, over)
self:FillItemData2(room, total_data, list_view2)
end
else
printlog("result34")
if 0 == over or 1 == over and data.liuju == false then
self:FillItemData(room, data, list_view1)
if 1 == over then
@ -203,7 +196,7 @@ function M:AddClearItem(room, data, total_data, over)
elseif 2 == over then
self:FillItemData2(room, total_data, list_view2)
end
printlog("result35")
end
end
@ -211,15 +204,12 @@ function M:GetPos(room, seat)
return ViewUtil.GetPos(room.self_player.seat, seat, room.room_config.people_num)
end
function M:FillLiuJuItemData(room, data,item)
printlog("FillLiuJuItemData")
local qipai_list = self._view:GetChild('qipai_listl')
local _dipaiC = self._view:GetController('qipai')
pt(data)
qipai_list:RemoveChildrenToPool()
printlog("FillLiuJuItemData1")
if data.throw_card ~= nil and #data.throw_card > 0 then
_dipaiC.selectedIndex = 1
local hand_card = PendulumRule.GetHandCard(data.throw_card, 3)
@ -232,7 +222,7 @@ function M:FillLiuJuItemData(room, data,item)
else
_dipaiC.selectedIndex = 0
end
printlog("FillLiuJuItemData2")
for i = 1, #data.info_list do
if data.info_list[i].seat == room.banker_seat then
local p = room:GetPlayerBySeat(data.info_list[i].seat)
@ -244,7 +234,7 @@ function M:FillLiuJuItemData(room, data,item)
if data.info_list[i].seat ~= room.self_player.seat and #data.info_list[i].hand_card > 0 then
if data.info_list[i].seat == room.banker_seat and #data.info_list[i].hand_card > 0 then
local card_list
--[[if #data.info_list == 2 then
card_list = self._view:GetChild('card_list_2')
@ -256,9 +246,9 @@ function M:FillLiuJuItemData(room, data,item)
end
end]]
card_list = self._view:GetChild('card_list_2')
printlog("FillLiuJuItemData3")
card_list:RemoveChildrenToPool()
pt(data.info_list[i].opCardList)
for k = 1, #data.info_list[i].opCardList do
local fztype = data.info_list[i].opCardList[k].type
@ -269,7 +259,7 @@ function M:FillLiuJuItemData(room, data,item)
end
end
end
printlog("FillLiuJuItemData4")
local hand_card = PendulumRule.GetHandCard(data.info_list[i].hand_card, 3)
for k = 1, #hand_card do
local item = card_list:AddItemFromPool()
@ -278,14 +268,13 @@ function M:FillLiuJuItemData(room, data,item)
end
end
printlog("FillLiuJuItemData5")
end
end
item:RemoveChildrenToPool()
local info_list = data.info_list
for i = 1, #info_list do
if info_list[i].is_win == false then
if info_list[i].is_win == false and info_list[i].seat ~= room.banker_seat then
local player = item:AddItemFromPool()
local p = room:GetPlayerBySeat(info_list[i].seat)
if p.self_user.account_id == room.owner_id then
@ -373,7 +362,7 @@ function M:FillLiuJuItemData(room, data,item)
end
function M:FillItemData(room, data, item)
printlog("FillItemData")
local dipai_list = self._view:GetChild('dipai_list')
dipai_list:RemoveChildren(0, -1, true)
if data.left_card ~= nil and #data.left_card > 0 then

1
wb_new_ui/.objs/metas/ppu1wv76/j4mf9f.info Normal file
View File

@ -0,0 +1 @@
{}

6
wb_new_ui/.objs/metas/ppu1wv76/j4mf9j.info
View File

@ -3,12 +3,6 @@
"n51_fmkv": {
"collapsed": true
},
"n58_fnpw": {
"collapsed": true
},
"n19_pt1r": {
"collapsed": true
},
"n33_n1ry": {
"hidden": true
}

6
wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml
View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="1334,750">
<controller name="over" pages="0,,1,,2,,3," selected="3"/>
<controller name="over" pages="0,,1,,2,,3," selected="1"/>
<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="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"/>
<displayList>
@ -61,7 +61,7 @@
<gearDisplay controller="over" pages="0"/>
<relation target="" sidePair="center-center"/>
</image>
<image id="n85_rbpg" name="n85" src="rbpg9u" fileName="component/clearing/images/banner2.png" xy="41,438" size="1247,230" group="n70_dunj"/>
<image id="n85_rbpg" name="n85" src="rbpg9u" fileName="component/clearing/images/banner2.png" xy="41,427" size="1247,270" group="n70_dunj"/>
<image id="n76_p9qe" name="show_low" src="isix1gi" fileName="component/clearing/image/zjzlbt.png" pkg="v6yvqp7w" xy="530,1" size="273,63" group="n70_dunj" aspect="true" visible="false">
<gearDisplay controller="over" pages="0"/>
<relation target="" sidePair="center-center"/>

2
wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing_1_item.xml
View File

@ -20,7 +20,7 @@
<text id="n30_rbpg" name="txt_userid" xy="55,144" size="125,39" group="n20_n1ry" fontSize="28" color="#b25116" vAlign="middle" autoSize="none" text="1235656"/>
<text id="n31_rbpg" name="tili_id" xy="1,143" size="56,37" group="n20_n1ry" fontSize="26" color="#b25116" text="ID："/>
<group id="n20_n1ry" name="n20" xy="0,0" size="267,220"/>
<list id="n22_ey1o" name="card_list" xy="316,1" pivot="0.5,0.5" size="261,177" rotation="180" layout="row" colGap="1" defaultItem="ui://ppu1wv76j4mf9e" align="right">
<list id="n22_ey1o" name="card_list" xy="384,2" pivot="0.5,0.5" size="261,177" rotation="180" layout="row" colGap="1" defaultItem="ui://ppu1wv76j4mf9e" align="right">
<item/>
<item/>
<item/>

4
wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing_2_item.xml
View File

@ -13,13 +13,13 @@
<gearColor controller="color" pages="0,1" values="#f16bc0,#000000|#5df2a3,#000000"/>
</text>
<component id="n18_nrno" name="btn_head" src="kio210" fileName="component/head/Head.xml" pkg="27vd145b" xy="65,20" size="80,80"/>
<image id="n19_pt1r" name="n19" src="e54q3y" fileName="images/head/owner.png" pkg="27vd145b" xy="144,82">
<image id="n19_pt1r" name="n19" src="e54q3y" fileName="font/images/head/owner.png" pkg="27vd145b" xy="144,82">
<gearDisplay controller="owner" pages="1"/>
</image>
<image id="n21_vpff" name="n21" src="j4mf9h" fileName="component/clearing/zan.png" xy="112,1">
<gearDisplay controller="zan" pages="1"/>
</image>
<component id="n20_vpff" name="btn_zan" src="aj7d6e" fileName="component/result/btn_zan.xml" pkg="27vd145b" xy="-1,-1" size="211,481" alpha="0"/>
<component id="n20_vpff" name="btn_zan" pkg="27vd145b" src="aj7d6e" fileName="component/result/btn_zan.xml" xy="-1,-1" size="211,481" alpha="0"/>
<image id="n24_j5c2" name="n24" src="j4mf9i" fileName="component/clearing/renshengyingjia.png" xy="27,401">
<gearDisplay controller="winer" pages="1"/>
</image>

6
wb_new_ui/assets/NewGroup/component/Lst_room/Play_room3.xml
View File

@ -2,18 +2,18 @@
<component size="270,240" extention="Button">
<controller name="state" pages="0,,1," selected="0"/>
<displayList>
<component id="n42_10snh" name="desk" src="iaes7idk" fileName="component/Lst_room/Gcm_Play_desk3.xml" xy="0,0" size="250,221"/>
<component id="n42_10snh" name="desk" src="iaes7idk" fileName="component/Lst_room/Gcm_Play_desk3.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="n53_n96g" name="tex_round" xy="116,91" size="41,32" font="Microsoft YaHei" fontSize="22" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" bold="true" autoClearText="true" text="8/1">
<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">
<relation target="" sidePair="center-center,middle-middle"/>
</text>
<text id="n52_n96g" name="tex_gamename" xy="72,61" size="129,35" font="Microsoft YaHei" fontSize="24" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" autoSize="shrink" bold="true" strokeColor="#053691" autoClearText="true" text="红中麻将">
<relation target="" sidePair="center-center,middle-middle"/>
</text>
<text id="n54_hugj" 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">
<relation target="" sidePair="center-center,middle-middle"/>
</text>
<image id="n56_ilon" name="n56" src="ilon7i9w" fileName="images/room/Ellipse 13.png" xy="119,127">

BIN
wb_new_ui/assets/NewGroup/images/room/zuoziZipai.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 448 KiB

BIN
wb_unity_pro_2/Library/ArtifactDB
View File

Binary file not shown.

46
wb_unity_pro_2/Library/CurrentLayout-default.dwlt
View File

@ -14,14 +14,14 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_PixelRect:
serializedVersion: 2
x: -44
y: 64
x: 7.3333335
y: 50
width: 906
height: 854.6667
m_ShowMode: 4
m_Title:
m_RootView: {fileID: 4}
m_MinSize: {x: 875, y: 300}
m_MinSize: {x: 875, y: 392}
m_MaxSize: {x: 10000, y: 10000}
m_Maximized: 0
--- !u!114 &2
@ -34,7 +34,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: ProjectBrowser
m_Name: ConsoleWindow
m_EditorClassIdentifier:
m_Children: []
m_Position:
@ -43,15 +43,15 @@ MonoBehaviour:
y: 383
width: 906
height: 422
m_MinSize: {x: 230, y: 271}
m_MaxSize: {x: 10000, y: 10021}
m_ActualView: {fileID: 11}
m_MinSize: {x: 100, y: 121}
m_MaxSize: {x: 4000, y: 4021}
m_ActualView: {fileID: 9}
m_Panes:
- {fileID: 9}
- {fileID: 10}
- {fileID: 11}
m_Selected: 2
m_LastSelected: 0
m_Selected: 0
m_LastSelected: 2
--- !u!114 &3
MonoBehaviour:
m_ObjectHideFlags: 52
@ -73,10 +73,10 @@ MonoBehaviour:
y: 0
width: 906
height: 805
m_MinSize: {x: 230, y: 492}
m_MaxSize: {x: 10000, y: 14042}
m_MinSize: {x: 200, y: 342}
m_MaxSize: {x: 4000, y: 8042}
vertical: 1
controlID: 35
controlID: 55
--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
@ -99,7 +99,7 @@ MonoBehaviour:
y: 0
width: 906
height: 855
m_MinSize: {x: 875, y: 300}
m_MinSize: {x: 875, y: 392}
m_MaxSize: {x: 10000, y: 10000}
--- !u!114 &5
MonoBehaviour:
@ -143,10 +143,10 @@ MonoBehaviour:
y: 30
width: 906
height: 805
m_MinSize: {x: 230, y: 492}
m_MaxSize: {x: 10000, y: 14042}
m_MinSize: {x: 200, y: 342}
m_MaxSize: {x: 4000, y: 8042}
vertical: 0
controlID: 34
controlID: 54
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@ -216,8 +216,8 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 48.666668
y: 473.33334
x: 7.3333335
y: 463.33334
width: 906
height: 401
m_ViewDataDictionary: {fileID: 0}
@ -297,8 +297,8 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: -44
y: 477.33334
x: 7.3333335
y: 463.33334
width: 906
height: 401
m_ViewDataDictionary: {fileID: 0}
@ -355,7 +355,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: ffffffff00000000e82c0000ac360000f03b0000f23b0000f43b0000f63b0000f83b0000fa3b0000fc3b0000fe3b0000003c0000023c0000043c0000063c0000083c00000a3c00000c3c00000e3c0000103c0000123c0000143c0000163c0000183c00001a3c00001c3c00001e3c0000203c0000223c0000243c0000263c0000283c00002a3c00002c3c00002e3c0000303c0000323c0000343c0000363c0000383c00003a3c00003c3c00003e3c0000403c0000423c0000443c0000463c0000483c00004a3c00004c3c00004e3c0000503c0000523c0000543c0000
m_ExpandedIDs: ffffffff00000000e82c0000ac360000f03b0000f43b0000f63b0000f83b0000fa3b0000fc3b0000fe3b0000003c0000023c0000043c0000063c0000083c00000a3c00000c3c00000e3c0000103c0000123c0000143c0000163c0000183c00001a3c00001c3c00001e3c0000203c0000223c0000243c0000263c0000283c00002a3c00002c3c00002e3c0000303c0000323c0000343c0000363c0000383c00003a3c00003c3c00003e3c0000403c0000423c0000443c0000463c0000483c00004a3c00004c3c00004e3c0000503c0000523c0000543c0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -432,8 +432,8 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: -44
y: 94
x: 7.3333335
y: 80
width: 906
height: 362
m_ViewDataDictionary: {fileID: 0}

BIN
wb_unity_pro_2/Library/SourceAssetDB
View File

Binary file not shown.

2
wb_unity_pro_2/Library/StateCache/Hierarchy/bfa95a-mainStage.json
View File

@ -1 +1 @@
{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-1184],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}

BIN
wb_unity_pro_2/Library/expandedItems
View File

Binary file not shown.

4
wb_unity_pro_2/Library/shadercompiler-UnityShaderCompiler.exe0.log
View File

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