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

新合并冲突

master
罗家炜 2025-06-20 19:40:01 +08:00
parent 98f1cc124a
commit fdef007d61
8 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lua_probject/base_project/Game/View/Family/FamilyRecord.lua
View File

@ -22,4 +22,38 @@ function M:init()
self._view = com_Record
end
function M:ShowNumberRecord()
local fgCtr = ControllerManager.GetController(NewGroupController)
self.records = {}
local uid = DataManager
local timeTable = os.date("*t", os.time())
timeTable.hour = 0
timeTable.min = 0
timeTable.sec = 0
local leftTime = os.time(timeTable)
local rightTime = os.time(timeTable) + 86399
self:RecursionRecord(fgCtr, 0, uid, leftTime, rightTime)
end
function M:RecursionRecord(fgCtr, index, uid, leftTime, rightTime)
fgCtr:FG_GetGroupRecordSpe(self.group_id, GetPlatform(), uid, 0, index * 60, 60, leftTime, rightTime, 3,
function(res)
if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, "查看个人战绩失败")
self.visible = false
return
else
local records = res.Data.records
if records and #records > 0 then
for i = 1, #records do
table.insert(self.records, records[i])
end
self:RecursionRecord(fgCtr, index + 1, uid, leftTime, rightTime)
else
end
end
end)
end
return M

10
wb_new_ui/assets/Family/Record/Component/Item_familyRecord.xml
View File

@ -8,12 +8,12 @@
<image id="n4_slrk" name="n4" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="804,11"/>
<image id="n6_slrk" name="n6" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="1886,11"/>
<image id="n7_slrk" name="n7" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="2100,11"/>
<text id="n8_slrk" name="n8" xy="42,47" size="76,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#a62812" align="center" vAlign="middle" autoSize="none" text="999"/>
<text id="n9_slrk" name="n9" xy="183,27" size="204,96" font="ui://27vd145bg2mo7ij0" fontSize="36" color="#444444" align="center" vAlign="middle" autoSize="none" text="2025-03-21&#xA;14:30:23"/>
<text id="n10_slrk" name="n10" xy="1960,47" size="76,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" align="center" vAlign="middle" autoSize="none" text="999"/>
<text id="n11_slrk" name="n11" xy="662,47" size="76,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" align="center" vAlign="middle" autoSize="none" text="999"/>
<text id="n8_slrk" name="text_id" xy="42,47" size="76,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#a62812" align="center" vAlign="middle" autoSize="none" text="999"/>
<text id="n9_slrk" name="text_time" xy="183,27" size="204,96" font="ui://27vd145bg2mo7ij0" fontSize="36" color="#444444" align="center" vAlign="middle" autoSize="none" text="2025-03-21&#xA;14:30:23"/>
<text id="n10_slrk" name="text_roomId" xy="1960,47" size="76,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" align="center" vAlign="middle" autoSize="none" text="999"/>
<text id="n11_slrk" name="text_useDiamond" xy="662,47" size="76,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" align="center" vAlign="middle" autoSize="none" text="999"/>
<text id="n12_slrk" name="n12" xy="462,47" size="76,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" align="center" vAlign="middle" autoSize="none" text="999"/>
<list id="n13_slrk" name="list_familyPlayer" xy="804,0" size="1082,150" layout="flow_vt" selectionMode="none" overflow="hidden" colGap="101" defaultItem="ui://htcn7v3rslrk7d3c" align="center" vAlign="middle">
<list id="n13_slrk" name="list_familyPlayer" xy="804,0" size="1082,150" layout="flow_vt" selectionMode="none" overflow="hidden" colGap="101" defaultItem="ui://htcn7v3rjrro7cxo" align="center" vAlign="middle">
<item/>
<item/>
<item/>

4
wb_new_ui/assets/Family/Record/com_Record.xml
View File

@ -46,12 +46,12 @@
<text id="n55_slrk" name="n55" xy="2268,266" size="88,56" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" autoSize="none" text="回放"/>
<text id="n56_slrk" name="n56" xy="1410,266" size="88,56" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" autoSize="none" text="结算"/>
<text id="n58_slrk" name="n58" xy="762,266" size="88,56" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" autoSize="none" text="房卡"/>
<list id="n59_slrk" name="n59" xy="63,406" size="2405,636" group="n57_slrk" layout="flow_hz" overflow="scroll" defaultItem="ui://htcn7v3rslrk7d3b" align="center">
<list id="n59_slrk" name="n59" xy="63,356" size="2405,636" group="n57_slrk" layout="flow_hz" overflow="scroll" lineGap="15" defaultItem="ui://htcn7v3rslrk7d3b" align="center">
<item/>
<item/>
<item/>
</list>
<group id="n57_slrk" name="n57" xy="63,258" size="2405,784"/>
<group id="n57_slrk" name="n57" xy="63,258" size="2405,734"/>
<component id="n61_o2rw" name="btn_close" src="in3i7cu9" fileName="Main/Component/btn_close.xml" xy="54,6"/>
</displayList>
</component>

3
wb_new_ui/assets/Family/package.xml
View File

@ -292,13 +292,11 @@
<image id="jydr7d42" name="Group 363.png" path="/Rank/Image/"/>
<component id="jydr7d43" name="comp_listChild.xml" path="/Rank/Component/"/>
<image id="o2rw7d3e" name="hall_club_button_aremovassi.png" path="/NumberDetail/Image/"/>
<<<<<<< HEAD
<component id="lgoh7d44" name="comp_numberRecord.xml" path="/NumberRecord/" exported="true"/>
<component id="lgoh7d45" name="combBox_sort.xml" path="/NumberRecord/Component/" exported="true"/>
<component id="lgoh7d46" name="combBox_sort_item.xml" path="/NumberRecord/Component/"/>
<component id="lgoh7d47" name="combBox_sort_popup.xml" path="/NumberRecord/Component/"/>
<image id="lgoh7d4b" name="createRoom_6.png" path="/NumberRecord/Image/"/>
=======
<component id="sfjv7d3f" name="btn_editNotice.xml" path="/MyFamily/Component/"/>
<component id="sfjv7d3g" name="btn_bg.xml" path="/MyFamily/Component/"/>
<image id="sfjv7d3h" name="Rectangle 39.png" path="/MyFamily/Image/" scale="9grid" scale9grid="59,53,51,62"/>
@ -322,7 +320,6 @@
<image id="yk1o7d41" name="Group 556.png" path="/MyFamily/Image/"/>
<component id="yk1o7d42" name="btn_myFamilylist.xml" path="/MyFamily/Component/"/>
<component id="yk1o7d43" name="com_numberRemark.xml" path="/NumberRemark/" exported="true"/>
>>>>>>> fa6b4bed7bcee64adb3ac8c11539d49a166a56db
</resources>
<publish name="Family" path="..\wb_unity_pro\Assets\ART\base\Family\ui" packageCount="2"/>
</packageDescription>

BIN
wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 MiB

After

Width:  |  Height:  |  Size: 3.1 MiB

BIN
wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 MiB

After

Width:  |  Height:  |  Size: 1.7 MiB

BIN
wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 592 KiB

After

Width:  |  Height:  |  Size: 361 KiB

BIN
wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes
View File

Binary file not shown.