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

6.4提交

master
罗家炜 2025-06-04 17:50:55 +08:00
parent 9202ebd056
commit 77078da5d6
13 changed files with 120 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua
View File

@ -1821,9 +1821,9 @@ function M:__loadGroupData()
local btn_msg = self._view:GetChild('btn_msg')
btn_msg.onClick:Set(
function()
if not self.mng_view1 then
-- if not self.mng_view1 then
self.mng_view1 = GroupManagerView.new(self._root_view, self.curGroup.id, 1)
end
-- end
self.mng_view1:Show(5)
-- self:SetRoomListVisible(false)
end
@ -1833,10 +1833,9 @@ function M:__loadGroupData()
---[[
btn_invite.onClick:Set(function()
--print("成员..........................................")
if not self.mng_view_invite then
-- if not self.mng_view_invite then
self.mng_view_invite = GroupMngMemberInviteView.new(self.curGroup.id)
end
print("lingmeng-self.mng_view_invite", self.mng_view_invite)
-- end
self.mng_view_invite:Show()
-- self:SetRoomListVisible(false)
end)
@ -1844,9 +1843,9 @@ function M:__loadGroupData()
--查看成员hp值，带分配
local btn_hp = self._view:GetChild('btn_hp')
btn_hp.onClick:Set(function()
if not self.mng_view_hp then
-- if not self.mng_view_hp then
self.mng_view_hp = GroupMngMemberHpListView.new(self.curGroup.id)
end
-- end
self.mng_view_hp:Show()
end)
--]]
@ -2088,10 +2087,10 @@ function M:Destroy()
self.mng_view4:Destroy()
end
if self.mng_view_invite then
self.mng_view_invite:Destroy()
self.mng_view_invite:Dispose()
end
if self.mng_view_hp then
self.mng_view_hp:Destroy()
self.mng_view_hp:Dispose()
end
DataManager.SelfUser.cur_group = nil
if self._tw_notice then

12
lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua
View File

@ -639,4 +639,16 @@ function M:GetChildNumForPage()
return self.pageNum
end
function M:Destroy()
-- for i = 1, #self.page_config do
-- if self._view_map[i] then
-- self._view_map[i]._view:Dispose()
-- if self._view_map[i].clear_image then
-- ImageLoad.Clear(self._view_map[i].class)
-- end
-- end
-- end
BaseWindow.Destroy(self)
end
return M

10
lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerBackView.lua
View File

@ -42,7 +42,8 @@ function M:InitView(url)
end
self._gamectr = ControllerManager.GetController(GameController)
UIPackage.AddPackage('extend/poker/runfast/ui/Extend_Poker_RunFastNew')
PKPlayBackView.InitView(self, 'ui://Extend_Poker_RunFastNew/RunFast_Main_' .. self._room.room_config.people_num, default_bg, bg_config)
PKPlayBackView.InitView(self, 'ui://Extend_Poker_RunFastNew/RunFast_Main_' .. self._room.room_config.people_num,
default_bg, bg_config)
self._tex_round = self._view:GetChild('round')
self._player_card_info = {}
local _player_card_info = self._player_card_info
@ -96,6 +97,7 @@ end
function M:FillRoomData(data)
print("hidezhanji 1111")
self._currentStep = 1
DataManager.CurrenRoom.pai = 0
local room = DataManager.CurrenRoom
local _player_card_info = self._player_card_info
local roominfo_panel = self._view:GetChild('roominfo_panel1')
@ -125,7 +127,6 @@ function M:FillRoomData(data)
card_info:UpdateHandPoker(p.hand_list, false, true)
end
head_info:UpdatePiao(p.piao)
end
self:UpdateRound()
@ -152,7 +153,6 @@ function M:ShowStep(index)
else
info:InitPoker(p.hand_list, false)
end
end
if step.cmd == RunFast_Record_Event.Evt_OutCard then
@ -194,7 +194,8 @@ function M:ShowStep(index)
end
if step.cmd == RunFast_Record_Event.Evt_Result then
local Result = step.Result
self.result_view = RunFast_ResultView.new(self._root_view, Result.info, self._room.room_id, Result.type, Result.winseat, 0, Result.remaincards)
self.result_view = RunFast_ResultView.new(self._root_view, Result.info, self._room.room_id, Result.type,
Result.winseat, 0, Result.remaincards)
local num = self._view:GetChildIndex(self._view:GetChild("panel_record"))
self._view:AddChildAt(self.result_view._view, num)
else
@ -257,6 +258,7 @@ function M:CmdPass(cmd, index)
data.cmd = cmd.cmd
data.current_out_seat = cmd.seat
end
function M:Cmdresult(cmd, index)
local data = self:CopyLastStep(index)
data.cmd = cmd.cmd

7
wb_new_ui/.objs/metas/9n9stu2e/prgzev.info Normal file
View File

@ -0,0 +1,7 @@
{
"objectStatus": {
"n7_f2pr": {
"hidden": true
}
}
}

6
wb_new_ui/.objs/metas/m7iejg46/l679hws.info
View File

@ -3,6 +3,12 @@
"n86_kwi0": {
"hidden": true
},
"n121_l679": {
"collapsed": true
},
"n112_kwi0": {
"collapsed": true
},
"n122_j120": {
"hidden": true
}

10
wb_new_ui/assets/Extend_Poker_RunFastNew/component/RoomInfoPanel1.xml
View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="275,41" initName="roominfo_panel">
<displayList>
<text id="n1_h1uu" name="n1" xy="89,0" size="69,41" group="n5_qpk6" fontSize="28" color="#ffffff" vAlign="middle" autoSize="none" text="房号:"/>
<text id="n2_h1uu" name="tex_roomid" xy="166,0" size="103,41" group="n5_qpk6" fontSize="28" color="#ffffff" vAlign="middle" autoSize="none" text="2345672"/>
<text id="n3_h1uu" name="tex_gametype" xy="89,28" size="134,33" group="n5_qpk6" hideByEditor="true" visible="false" fontSize="25" color="#ffffff" autoSize="none" text="湘乡告胡子 "/>
<text id="n1_h1uu" name="n1" xy="49,0" size="69,41" group="n5_qpk6" fontSize="28" color="#ffffff" vAlign="middle" autoSize="none" text="房号:"/>
<text id="n2_h1uu" name="tex_roomid" xy="126,0" size="103,41" group="n5_qpk6" fontSize="28" color="#ffffff" vAlign="middle" autoSize="none" text="2345672"/>
<text id="n3_h1uu" name="tex_gametype" xy="49,28" size="134,33" group="n5_qpk6" visible="false" fontSize="25" color="#ffffff" autoSize="none" text="湘乡告胡子 "/>
<text id="n4_h1uu" name="tex_roomconfig" xy="204,6" size="10,9" group="n5_qpk6" visible="false" fontSize="1" color="#ffffff" autoSize="none" text=" "/>
<text id="n7_f2pr" name="tex_beishu" xy="0,0" size="65,41" group="n5_qpk6" fontSize="28" color="#b93f05" vAlign="middle" autoSize="shrink" text="500倍"/>
<group id="n5_qpk6" name="n5" xy="0,0" size="269,61"/>
<text id="n7_f2pr" name="tex_beishu" xy="0,0" size="65,41" group="n5_qpk6" visible="false" fontSize="28" color="#b93f05" vAlign="middle" autoSize="shrink" text="500倍"/>
<group id="n5_qpk6" name="n5" xy="0,0" size="229,61"/>
</displayList>
</component>

24
wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml
View File

@ -3,10 +3,10 @@
<controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放" selected="1"/>
<controller name="sdk" pages="0,,1," selected="0"/>
<controller name="action" pages="2,空,0,准备,1,开始,3,打鸟" selected="0"/>
<controller name="time" pages="0,,1,,2,,3," selected="2"/>
<controller name="time" pages="0,,1,,2,,3," selected="0"/>
<controller name="card_eff" pages="0,,1," selected="0"/>
<controller name="zidongtishi" pages="0,,1," selected="0"/>
<controller name="showBtn" pages="0,,1," selected="0"/>
<controller name="showBtn" pages="0,,1," selected="1"/>
<displayList>
<component id="n76_rqeb" name="mask" src="prgzeq" fileName="component/mask.xml" xy="-208,2" alpha="0">
<gearDisplay controller="state" pages="1"/>
@ -50,7 +50,7 @@
<gearDisplay controller="state" pages="1,3"/>
<relation target="n18" sidePair="right-left,middle-middle"/>
</component>
<component id="n67_qfrg" name="time" src="prgzer" fileName="component/Clock.xml" xy="1107,76" size="82,88" scale="0.8,0.8" touchable="false">
<component id="n67_qfrg" name="time" src="prgzer" fileName="component/Clock.xml" xy="625,198" size="82,88" scale="0.8,0.8" touchable="false">
<gearDisplay controller="time" pages="1,2,3"/>
<gearXY controller="time" pages="1,2" values="171,315|1107,76" default="625,198"/>
<relation target="" sidePair="left-left%,top-top%"/>
@ -94,7 +94,7 @@
<gearDisplay controller="state" pages="0,1,2,3"/>
<relation target="" sidePair="width-width%"/>
</component>
<component id="n83_q50p" name="roominfo_panel1" src="prgzev" fileName="component/RoomInfoPanel1.xml" xy="839,-1" size="274,41" group="n86_q50p" touchable="false">
<component id="n83_q50p" name="roominfo_panel1" src="prgzev" fileName="component/RoomInfoPanel1.xml" xy="493,-1" size="274,41" group="n86_q50p" touchable="false">
<relation target="" sidePair="right-right%"/>
</component>
<component id="n85_q50p" name="btn_rule" src="prgzdu" fileName="component/poker/Btn_log.xml" xy="140,12" group="n86_q50p"/>
@ -142,24 +142,22 @@
<relation target="" sidePair="left-right%"/>
<Button controller="showBtn" page="1"/>
</component>
<image id="n122_thxk" name="n122" src="thxkcim" fileName="images/Rectangle 397.png" xy="1239,64" size="80,169" group="n123_thxk">
<gearSize controller="state" pages="1" values="80,169,1,1" default="80,258,1,1"/>
<image id="n122_thxk" name="n122" src="thxkcim" fileName="images/Rectangle 397.png" xy="1239,63" size="80,78" group="n123_thxk">
<gearSize controller="state" pages="0,1" values="80,163,1,1|80,78,1,1" default="80,258,1,1"/>
</image>
<component id="n84_q50p" name="btn_back_lobby" src="prgzds" fileName="component/poker/Btn_back_lobby.xml" xy="1258,160" size="44,65" group="n123_thxk">
<component id="n84_q50p" name="btn_back_lobby" src="prgzds" fileName="component/poker/Btn_back_lobby.xml" xy="1258,70" size="44,65" group="n123_thxk">
<gearDisplay controller="state" pages="0,3"/>
</component>
<component id="n120_r1z9" name="btn_leave_lobby" src="vijocih" fileName="component/poker/Btn_leave_lobby.xml" xy="1258,250" group="n123_thxk">
<component id="n120_r1z9" name="btn_leave_lobby" src="vijocih" fileName="component/poker/Btn_leave_lobby.xml" xy="1258,160" group="n123_thxk">
<gearDisplay controller="state" pages="0,3"/>
</component>
<image id="n124_thxk" name="n124" src="thxkcip" fileName="images/Line 23.png" xy="1251,147" group="n123_thxk"/>
<image id="n125_thxk" name="n125" src="thxkcip" fileName="images/Line 23.png" xy="1250,236" group="n123_thxk">
<image id="n125_thxk" name="n125" src="thxkcip" fileName="images/Line 23.png" xy="1250,146" group="n123_thxk">
<gearDisplay controller="state" pages="0"/>
</image>
<component id="n126_thxk" name="Btn_setting" src="prgzdi" fileName="component/phone_info/Btn_setting.xml" xy="1258,72" group="n123_thxk"/>
<component id="n100_n6fs" name="btn_back_jiesan" src="prgzdw" fileName="component/poker/Btn_back_jiesan.xml" xy="1258,159" group="n123_thxk">
<component id="n100_n6fs" name="btn_back_jiesan" src="prgzdw" fileName="component/poker/Btn_back_jiesan.xml" xy="1258,69" group="n123_thxk">
<gearDisplay controller="state" pages="1"/>
</component>
<group id="n123_thxk" name="ShowMore" xy="1239,64" size="80,248" advanced="true">
<group id="n123_thxk" name="ShowMore" xy="1239,63" size="80,159" advanced="true">
<gearDisplay controller="showBtn" pages="1"/>
<relation target="" sidePair="left-right%"/>
</group>

18
wb_new_ui/assets/Extend_Poker_RunFastNew/component/card_info/Btn_SelfCard.xml Normal file
View File

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="146,220" pivot="0.5,0.5" extention="Button">
<controller name="button" pages="0,up,1,down" selected="0"/>
<controller name="choose" pages="0,,1," selected="0"/>
<displayList>
<loader id="n4_ckvb" name="icon" xy="0,0" pivot="0.5,0.5" size="146,220" group="n6_ckvb" aspect="true" url="ui://9n9stu2eprgzb4" align="center" vAlign="middle" fill="scaleFree">
<relation target="" sidePair="width-width,height-height"/>
</loader>
<graph id="n5_ckvb" name="bg_choose" xy="0,0" size="146,220" group="n6_ckvb" type="rect" lineSize="0" fillColor="#99000000" corner="12">
<gearDisplay controller="choose" pages="1"/>
<relation target="" sidePair="width-width,height-height"/>
</graph>
<group id="n6_ckvb" name="body" xy="0,0" size="146,220" advanced="true">
<gearXY controller="button" pages="0,1" values="0,0|0,-65"/>
</group>
</displayList>
<Button mode="Check"/>
</component>

8
wb_new_ui/assets/Extend_Poker_RunFastNew/component/card_info/Comp_OutCard.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="110,157">
<displayList>
<loader id="n0_ckvb" name="icon" xy="0,0" size="110,157" url="ui://9n9stu2eprgzb4" align="center" vAlign="middle" fill="scale">
<relation target="" sidePair="width-width,height-height"/>
</loader>
</displayList>
</component>

6
wb_new_ui/assets/Extend_Poker_RunFastNew/component/card_info/newcard/di(1).xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="129,191">
<displayList>
<image id="n1_fwfg" name="n0" src="imp5cjn" xy="-5,0"/>
</displayList>
</component>

4
wb_new_ui/assets/NewGroup/component/Btn/date_set/btn_date.xml
View File

@ -2,8 +2,8 @@
<component size="290,58" extention="Button">
<controller name="button" pages="0,up,1,down" selected="0"/>
<displayList>
<image id="n4_b8zx" name="n4" src="m16m7ig7" fileName="component/Btn/date_set/Group 511.png" xy="0,0" size="290,58"/>
<text id="n2_n5sx" name="title" xy="22,3" size="207,53" font="Microsoft YaHei" fontSize="24" color="#ffedcf" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" text="2021-07-21日">
<image id="n4_b8zx" name="n4" src="m16m7ig7" fileName="component/Btn/date_set/Group 511.png" xy="0,0" size="239,58"/>
<text id="n2_n5sx" name="title" xy="22,2" size="207,53" font="Microsoft YaHei" fontSize="24" color="#ffedcf" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" text="2021-07-21日">
<relation target="" sidePair="width-width,height-height"/>
</text>
</displayList>

4
wb_new_ui/assets/NewGroup/mgr/View_GroupMemberInviteAlone.xml
View File

@ -5,10 +5,10 @@
<controller name="mng" pages="0,,1," selected="0"/>
<displayList>
<image id="n130_ilon" name="n130" src="ilon7ia3" fileName="mgr/imgs/addMenberAlone/Group 515.png" xy="0,0"/>
<component id="n61_jd7v" name="btn_del" src="ilon7iaq" fileName="mgr/component/addMenberAlone/btn_del.xml" xy="621,545" group="n64_jd7v">
<component id="n61_jd7v" name="btn_del" src="ilon7iaq" fileName="mgr/component/addMenberAlone/btn_del.xml" xy="131,545" group="n64_jd7v">
<Button title="删除" titleFontSize="1" icon="ui://27vd145bl7wn7iiq"/>
</component>
<component id="n63_jd7v" name="btn_ok" src="ilon7iar" fileName="mgr/component/addMenberAlone/btn_ok.xml" xy="131,545" group="n64_jd7v">
<component id="n63_jd7v" name="btn_ok" src="ilon7iar" fileName="mgr/component/addMenberAlone/btn_ok.xml" xy="621,545" group="n64_jd7v">
<Button title="确认" titleFontSize="1" icon="ui://27vd145bl7wn7iip"/>
</component>
<component id="n100_ovii" name="btn_1" src="ilon7iag" fileName="mgr/component/addMenberAlone/btn_1.xml" xy="131,234" group="n64_jd7v">

26
wb_new_ui/assets/NewGroup/mgr/View_GroupPersonStat.xml
View File

@ -11,14 +11,14 @@
<item url="ui://m7iejg46eany7ie2" title="昨天"/>
<item url="ui://m7iejg46eany7ie3" title="前天"/>
</list>
<component id="n117_l679" name="btn_date1" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="305,487" size="232,51" group="n104_kwi0"/>
<text id="n123_omkm" name="n123" xy="600,503" size="24,29" group="n104_kwi0" font="Microsoft YaHei" fontSize="20" color="#367256" align="center" vAlign="middle" text="至"/>
<component id="n119_l679" name="btn_date2" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="630,487" size="232,51" group="n104_kwi0"/>
<component id="n86_kwi0" name="btn_search" src="dzx8hbb" fileName="component/Btn/btn_req.xml" xy="941,484" size="129,67" group="n104_kwi0" visible="false"/>
<group id="n104_kwi0" name="panel_search" xy="305,484" size="765,67" group="n83_kwi0" advanced="true">
<component id="n117_l679" name="btn_date1" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="28,484" size="256,59" group="n104_kwi0"/>
<text id="n123_omkm" name="n123" xy="271,500" size="24,29" group="n104_kwi0" font="Microsoft YaHei" fontSize="20" color="#367256" align="center" vAlign="middle" text="至"/>
<component id="n119_l679" name="btn_date2" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="298,484" size="261,57" group="n104_kwi0"/>
<component id="n86_kwi0" name="btn_search" src="dzx8hbb" fileName="component/Btn/btn_req.xml" xy="664,481" size="129,67" group="n104_kwi0" visible="false"/>
<group id="n104_kwi0" name="panel_search" xy="28,481" size="765,67" group="n83_kwi0" advanced="true">
<relation target="" sidePair="right-right"/>
</group>
<group id="n83_kwi0" name="index2" xy="-17,-89" size="1087,640" advanced="true">
<group id="n83_kwi0" name="index2" xy="-17,-89" size="810,637" advanced="true">
<gearDisplay controller="record" pages="0"/>
</group>
<list id="n82_kwi0" name="lst_record" xy="24,8" size="1079,466" group="n121_l679" overflow="scroll" lineGap="5" defaultItem="ui://m7iejg46kwi0hmc" autoClearItems="true">
@ -49,24 +49,24 @@
<gearDisplay controller="record" pages="1"/>
</group>
<image id="n122_j120" name="n122" pkg="m7iejg46" src="j1207i2s" fileName="个人战绩统计_PxCook.png" xy="-545,-210" visible="false" alpha="0.5"/>
<text id="n133_k5m9" name="n133" xy="627,-70" size="100,34" group="n141_k5m9" font="Microsoft YaHei" fontSize="24" color="#aa3300" vAlign="middle" text="总场次：">
<text id="n133_k5m9" name="n133" xy="768,497" size="100,34" group="n141_k5m9" font="Microsoft YaHei" fontSize="24" color="#aa3300" vAlign="middle" text="总场次：">
<relation target="" sidePair="center-center%"/>
</text>
<text id="n134_k5m9" name="tex_winner_count" xy="738,-69" size="107,34" group="n141_k5m9" font="Microsoft YaHei" fontSize="24" color="#aa3300" autoSize="shrink" autoClearText="true" text="0">
<text id="n134_k5m9" name="tex_winner_count" xy="849,499" size="107,34" group="n141_k5m9" font="Microsoft YaHei" fontSize="24" color="#aa3300" autoSize="shrink" autoClearText="true" text="0">
<relation target="" sidePair="center-center%"/>
</text>
<text id="n137_k5m9" name="n137" xy="16,499" size="100,34" group="n141_k5m9" font="Microsoft YaHei" fontSize="24" color="#aa3300" vAlign="middle" text="总输赢：">
<text id="n137_k5m9" name="n137" xy="539,496" size="100,34" group="n141_k5m9" font="Microsoft YaHei" fontSize="24" color="#aa3300" vAlign="middle" text="总输赢：">
<relation target="" sidePair="center-center%"/>
</text>
<text id="n138_k5m9" name="tex_total_proportion" xy="123,499" size="148,34" group="n141_k5m9" font="Microsoft YaHei" fontSize="24" color="#aa3300" autoSize="shrink" autoClearText="true" text="0">
<text id="n138_k5m9" name="tex_total_proportion" xy="620,498" size="148,34" group="n141_k5m9" font="Microsoft YaHei" fontSize="24" color="#aa3300" autoSize="shrink" autoClearText="true" text="0">
<relation target="" sidePair="center-center%"/>
</text>
<text id="n139_k5m9" name="n139" xy="867,-70" size="100,34" group="n141_k5m9" font="Microsoft YaHei" fontSize="24" color="#aa3300" vAlign="middle" text="有效场：">
<text id="n139_k5m9" name="n139" xy="956,498" size="100,34" group="n141_k5m9" font="Microsoft YaHei" fontSize="24" color="#aa3300" vAlign="middle" text="有效场：">
<relation target="" sidePair="center-center%"/>
</text>
<text id="n140_k5m9" name="tex_valid_count" xy="977,-69" size="88,34" group="n141_k5m9" font="Microsoft YaHei" fontSize="24" color="#aa3300" autoSize="shrink" autoClearText="true" text="0">
<text id="n140_k5m9" name="tex_valid_count" xy="1038,500" size="88,34" group="n141_k5m9" font="Microsoft YaHei" fontSize="24" color="#aa3300" autoSize="shrink" autoClearText="true" text="0">
<relation target="" sidePair="center-center%"/>
</text>
<group id="n141_k5m9" name="n141" xy="16,-70" size="1049,603" advanced="true"/>
<group id="n141_k5m9" name="n141" xy="539,496" size="587,38" advanced="true"/>
</displayList>
</component>