同步

lua_probject/base_project/Game/Controller/LoddyController.lua

@@ -525,7 +525,7 @@ end
 function M:FG_Get_Diamond_Msg(callback)
 	local _data = {}
 	_data.id = DataManager.SelfUser.account_id
-	local _client = ControllerManager.GroupClient
+	local _client = ControllerManager.WebClient
 	_client:send(Protocol.WEB_Get_Diamond_Mssages, _data, function(res)
 		callback(res)
 	end)

lua_probject/base_project/Game/Protocol.lua

@@ -56,7 +56,7 @@ Protocol = {
     ---手机号码登录
     WEB_LOGIN_Phone          = "acc/phone_login",
     -- 获取自己房卡记录
-    WEB_Get_Diamond_Mssages  = "acc/get_diamo_messages",
+    WEB_Get_Diamond_Mssages  = "acc/get_messages",
     ----index----
     -- 获取公告
     WEB_UPDATE_NOTICE        = "index/get_notice",

lua_probject/base_project/Game/View/Lobby/DiamondRecord.lua

@@ -27,7 +27,9 @@ function M:Init()
 
     --大厅的请求
     local lobbyCtr = ControllerManager.GetController(LoddyController)
+    ViewUtil.ShowModalWait2()
     lobbyCtr:FG_Get_Diamond_Msg(function(res)
+        ViewUtil.CloseModalWait2()
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(res.ReturnCode, "获取房卡记录失败")
         else

wb_new_ui/assets/Lobby/DiamondRecord.xml

@@ -25,7 +25,7 @@
     <image id="n19_66fw" name="n19" src="xx1c7d7n" fileName="Image/bg_main2.png" xy="241,153" size="2050,978">
       <relation target="n18_66fw" sidePair="rightext-right,topext-top,bottomext-bottom,leftext-left"/>
     </image>
-    <list id="n4_k356" name="list_msg" xy="249,171" size="2034,956" layout="flow_hz" overflow="scroll" lineGap="16" defaultItem="ui://htcn7v3r66fw7d6z" align="center" autoClearItems="true">
+    <list id="n4_k356" name="list_msg" xy="249,171" size="2034,956" layout="flow_hz" overflow="scroll" lineGap="16" defaultItem="ui://2d9xdj6zxpp2b7jhw" align="center" autoClearItems="true">
       <relation target="n19_66fw" sidePair="bottomext-bottom"/>
       <relation target="" sidePair="width-width%,top-top"/>
       <item/>

wb_new_ui/assets/Lobby/component/FamilyMsgRecord/Component/item_msg(1).xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1992,102">
+  <displayList>
+    <image id="n0_k356" name="n0" src="xpp2b7jhu" fileName="FamilyMsgRecord/Iamge/Group 650.png" xy="-3,0" size="1998,113"/>
+    <text id="n1_k356" name="tex_msg" xy="120,0" size="1332,102" font="ui://27vd145bh35o7ik0" fontSize="42" color="#444444" vAlign="middle" autoSize="none" bold="true" text="{微信用户1}被{用户121}加入亲友圈"/>
+    <text id="n4_k356" name="tex_time" xy="1474,0" size="487,102" font="ui://27vd145bh35o7ik0" fontSize="42" align="right" vAlign="middle" autoSize="none" bold="true" text="2025-03-08 11:40:28"/>
+    <graph id="n5_k356" name="n5" xy="18,16" size="70,70" type="rect" lineSize="2" lineColor="#ff804b2e" corner="12"/>
+    <loader id="n2_k356" name="loader_icon" xy="18,16" size="70,70" url="ui://2d9xdj6zxpp2b7jhv" align="center" vAlign="middle" fill="scale"/>
+  </displayList>
+</component>

wb_new_ui/assets/Lobby/component/FamilyMsgRecord/Component/item_msg.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1992,102">
+  <displayList>
+    <image id="n0_k356" name="n0" src="xpp2b7jhr" fileName="FamilyMsgRecord/Iamge/Group 650.png" xy="-3,0" size="1998,113"/>
+    <text id="n1_k356" name="tex_msg" xy="120,0" size="1332,102" font="ui://27vd145bh35o7ik0" fontSize="42" color="#444444" vAlign="middle" autoSize="none" bold="true" text="{微信用户1}被{用户121}加入亲友圈"/>
+    <text id="n4_k356" name="tex_time" xy="1474,0" size="487,102" font="ui://27vd145bh35o7ik0" fontSize="42" align="right" vAlign="middle" autoSize="none" bold="true" text="2025-03-08 11:40:28"/>
+    <graph id="n5_k356" name="n5" xy="18,16" size="70,70" type="rect" lineSize="2" lineColor="#ff804b2e" corner="12"/>
+    <loader id="n2_k356" name="loader_icon" xy="18,16" size="70,70" url="ui://2d9xdj6zxpp2b7jhs" align="center" vAlign="middle" fill="scale"/>
+  </displayList>
+</component>

wb_new_ui/assets/Lobby/component/FamilyMsgRecord/Component/item_msg_diamond.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1992,102">
+  <displayList>
+    <image id="n0_k356" name="n0" src="xpp2b7jhr" fileName="FamilyMsgRecord/Iamge/Group 650.png" xy="-3,0" size="1998,113">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_k356" name="tex_msg" xy="21,0" size="1563,102" font="Arial" fontSize="42" color="#444444" vAlign="middle" autoSize="none" bold="true" text="{微信用户1}被{用户121}加入亲友圈">
+      <relation target="" sidePair="left-left"/>
+    </text>
+    <text id="n4_k356" name="tex_time" xy="1587,23" size="394,56" font="Arial" fontSize="42" align="right" vAlign="middle" bold="true" text="2025-03-08 11:40:28">
+      <relation target="" sidePair="right-right"/>
+      <relation target="n0_k356" sidePair="middle-middle"/>
+    </text>
+  </displayList>
+</component>

wb_new_ui/assets/Lobby/component/Main/Component/btn_close.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="126,114" pivot="0.5,0.5" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n4_in3i" name="n4" src="xpp2b7ji3" fileName="Main/Image/btn_close.png" xy="-8,-8"/>
+  </displayList>
+  <Button downEffect="scale" downEffectValue="1.2"/>
+</component>

wb_new_ui/assets/Lobby/package.xml

@@ -733,6 +733,22 @@
     <component id="n6kub7jhn" name="btn_login.xml" path="/component/phone_login/component/"/>
     <image id="n6kub7jho" name="Group 25@3x.png" path="/component/phone_login/image/"/>
     <image id="qlvwb7jhp" name="Frame 46.png" path="/component/phone_login/image/"/>
+    <component id="xpp2b7jhq" name="item_msg.xml" path="/component/FamilyMsgRecord/Component/" exported="true"/>
+    <image id="xpp2b7jhr" name="Group 650.png" path="/component/FamilyMsgRecord/Iamge/" scale="9grid" scale9grid="25,22,54,59"/>
+    <image id="xpp2b7jhs" name="Rectangle 290.png" path="/component/FamilyMsgRecord/Iamge/" scale="9grid" scale9grid="20,21,40,42"/>
+    <component id="xpp2b7jht" name="item_msg(1).xml" path="/component/FamilyMsgRecord/Component/" exported="true"/>
+    <image id="xpp2b7jhu" name="Group 650(1).png" path="/component/FamilyMsgRecord/Iamge/" scale="9grid" scale9grid="25,22,54,59"/>
+    <image id="xpp2b7jhv" name="Rectangle 290(1).png" path="/component/FamilyMsgRecord/Iamge/" scale="9grid" scale9grid="20,21,40,42"/>
+    <component id="xpp2b7jhw" name="item_msg_diamond.xml" path="/component/FamilyMsgRecord/Component/" exported="true"/>
+    <image id="xpp2b7jhx" name="Rectangle 291.png" path="/component/FamilyMsgRecord/Iamge/" scale="9grid" scale9grid="21,22,42,44"/>
+    <image id="xpp2b7jhy" name="Rectangle 291(1).png" path="/component/FamilyMsgRecord/Iamge/" scale="9grid" scale9grid="21,22,42,44"/>
+    <image id="xpp2b7ji0" name="loginBg.png" path="/component/Main/Image/" atlas="alone"/>
+    <image id="xpp2b7ji1" name="bt_top.png" path="/component/Main/Image/" atlas="alone" disableTrim="true"/>
+    <component id="xpp2b7ji2" name="btn_close.xml" path="/component/Main/Component/"/>
+    <image id="xpp2b7ji3" name="btn_close.png" path="/component/Main/Image/"/>
+    <image id="xpp2b7ji4" name="hall_club_common_tittle_icon1.png" path="/component/Main/Image/"/>
+    <image id="xpp2b7ji5" name="bg_main1.png" path="/component/Main/Image/" atlas="alone"/>
+    <image id="xpp2b7ji6" name="bg_main2.png" path="/component/Main/Image/" atlas="alone"/>
   </resources>
   <publish name="Lobby" path="..\wb_unity_pro\Assets\ART\base\lobby\ui" packageCount="2">
     <atlas name="默认" index="0"/>