好友

FGUIProject/assets/Friend/FriendUI.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
+    <loader id="n21_nb1u" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
+      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
+    </loader>
     <component id="n0_jdju" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
     <image id="n8_z73e" name="n8" src="z73el" fileName="images/hy_dikuang_2.png" xy="705,101" group="n9_z73e"/>
     <text id="n2_pdeo" name="txtCount" xy="734,100" pivot="0.5,0" size="259,49" group="n9_z73e" fontSize="36" color="#e4dbcf" align="center" text="好友数：10/50"/>
@@ -8,13 +11,13 @@
     <image id="n17_z73e" name="n17" src="q08xs" fileName="imagesExport/hz_xzkuang.png" pkg="eg2y0ldp" xy="200,93" group="n13_z73e"/>
     <text id="n12_z73e" name="txtName" xy="370,98" pivot="0.5,0" size="71,46" group="n13_z73e" fontSize="34" color="#fff0db" text="套装"/>
     <group id="n13_z73e" name="grpName" xy="200,93" size="412,62" advanced="true"/>
-    <image id="n18_z73e" name="n18" src="z73e1c" fileName="images/dz_hz_rwdh_1.png" xy="89,1265" group="n20_z73e">
+    <image id="n18_z73e" name="n18" src="z73e1c" fileName="images/dz_hz_rwdh_1.png" xy="89,1243" size="409,153" group="n20_z73e">
       <relation target="" sidePair="bottom-bottom"/>
     </image>
-    <text id="n19_z73e" name="txtSlogan" xy="105,1267" size="364,96" group="n20_z73e" fontSize="30" color="#997350" vAlign="middle" ubb="true" autoSize="none" autoClearText="true" text="采菊东篱下，悠然见南山。山气日夕佳，飞鸟相与还。此中有真意，欲辨已忘言。">
+    <text id="n19_z73e" name="txtSlogan" xy="105,1247" size="378,116" group="n20_z73e" fontSize="28" color="#997350" ubb="true" autoSize="none" autoClearText="true" text="采菊东篱下，悠然见南山。山气日夕佳，飞鸟相与还。此中有真意，欲辨已忘言。">
       <relation target="" sidePair="bottom-bottom"/>
     </text>
-    <group id="n20_z73e" name="grpSlogan" xy="89,1265" size="394,131" advanced="true"/>
+    <group id="n20_z73e" name="grpSlogan" xy="89,1243" size="409,153" advanced="true"/>
     <component id="n15_z73e" name="btnSolgan" src="jdju1" fileName="components/BtnModel1.xml" xy="40,1393" group="n16_z73e">
       <Button icon="ui://wez2ujnnz73et"/>
     </component>

FGUIProject/assets/Main/RoleInfoUI.xml

@@ -34,6 +34,6 @@
       <relation target="" sidePair="left-left,top-top"/>
     </text>
     <image id="n25_mhyh" name="n25" src="mhyhd6" fileName="images/grxx_txtx.png" xy="247,86" visible="false"/>
-    <text id="n26_pdeo" name="txtSlogan" xy="55,370" size="612,89" fontSize="34" color="#aa794d" autoSize="none" autoClearText="true" text="采菊东篱下，悠然见南山。山气日夕佳，飞鸟相与还。此中有真意，欲辨已忘言。" input="true" prompt="[color=#BDA893]输入个性签名[/color]" maxLength="30"/>
+    <text id="n26_pdeo" name="txtSlogan" xy="55,370" size="612,89" fontSize="34" color="#aa794d" autoSize="none" autoClearText="true" text="采菊东篱下，悠然见南山。山气日夕佳，飞鸟相与还。此中有真意，欲辨已忘言。" input="true" prompt="[color=#BDA893]输入个人简介[/color]" maxLength="30"/>
   </displayList>
 </component>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_FriendUI.cs

@@ -7,6 +7,7 @@ namespace UI.Friend
     public partial class UI_FriendUI
     {
         public GComponent target;
+        public GLoader m_loaBg;
         public GButton m_btnBack;
         public GTextField m_txtCount;
         public GTextField m_txtName;
@@ -65,6 +66,7 @@ namespace UI.Friend
 
         private void Init(GComponent comp)
         {
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_txtName = (GTextField)comp.GetChild("txtName");
@@ -79,6 +81,7 @@ namespace UI.Friend
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_loaBg = null;
             m_btnBack = null;
             m_txtCount = null;
             m_txtName = null;

GameClient/Assets/Game/HotUpdate/ServerProxy/FriendSProxy.cs

@@ -260,7 +260,7 @@ namespace GFGGame
                     roleInfoDetail.slogan = response.Signature;
                     if (response.CustomSuit != null)
                     {
-                        roleInfoDetail.customSuitData.pos = response.CustomSuit.Pos;
+                        roleInfoDetail.customSuitData = new CustomSuitData(response.CustomSuit.Pos);
                         roleInfoDetail.customSuitData.bg = response.CustomSuit.BgId;
                         roleInfoDetail.customSuitData.suitId = response.CustomSuit.SuitId;
                         roleInfoDetail.customSuitData.equipDatas = response.CustomSuit.EquipIds;

GameClient/Assets/Game/HotUpdate/Views/Friend/FriendAddView.cs

@@ -63,6 +63,7 @@ namespace GFGGame
             _ui.m_btnClear.visible = false;
             OnBtnRefreshClick();
             UpdateApplyList();
+            UpdaterRed();
         }
 
         protected override void OnHide()
@@ -200,8 +201,8 @@ namespace GFGGame
         //拒绝好友申请
         private async void OnBtnRefuseClick(EventContext context)
         {
-            GObject obj = context.data as GObject;
-            int roleId = (int)obj.data;
+            GObject obj = context.sender as GObject;
+            long roleId = (long)obj.data;
             bool result = await FriendSProxy.ReqRefuseApplyForFriend(roleId);
             if (result)
             {

GameClient/Assets/Game/HotUpdate/Views/Friend/FriendView.cs

@@ -52,6 +52,7 @@ namespace GFGGame
         {
             base.OnInit();
             _ui.m_btnBack.onClick.Add(OnHide);
+
         }
         protected override void AddEventListener()
         {
@@ -64,8 +65,12 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            if (_sceneObject == null)
+            {
+                _sceneObject = GameObject.Instantiate(_scenePrefab);
+                EquipDataCache.cacher.setSceneObj(_sceneObject);
+            }
             _ui.m_grpSlogan.visible = false;
-
             _ui.m_list.numItems = FriendDataManager.Instance.FriendDatas.Count;
 
             if (_ui.m_list.numItems > 0)
@@ -228,23 +233,19 @@ namespace GFGGame
                 if (roleInfoDetail != null)
                 {
                     UpdateScene(roleInfoDetail.customSuitData);
-                    _ui.m_txtSlogan.text = roleInfoDetail.slogan;
+                    _ui.m_txtSlogan.text = string.IsNullOrEmpty(roleInfoDetail.slogan) ? "暂无简介" : roleInfoDetail.slogan;
                 }
             }
             else
             {
                 CustomSuitData customSuit = CustomSuitDataManager.GetSuitList(CustomSuitDataManager.currentIndex);
                 UpdateScene(customSuit);
-                _ui.m_txtSlogan.text = RoleDataManager.slogan;
+                _ui.m_txtSlogan.text = string.IsNullOrEmpty(RoleDataManager.slogan) ? "暂无简介" : RoleDataManager.slogan;
             }
         }
         private void UpdateScene(CustomSuitData suitSavedData)
         {
-            if (_sceneObject == null)
-            {
-                _sceneObject = GameObject.Instantiate(_scenePrefab);
-                EquipDataCache.cacher.setSceneObj(_sceneObject);
-            }
+
             if (suitSavedData != null)
             {
                 EquipDataCache.cacher.PutOnSuitMemory(suitSavedData);

GameClient/Assets/ResIn/Prefab/SceneFriend.prefab

@@ -1,5 +1,87 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2115913152885540865
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1268710838397074702}
+  - component: {fileID: 7615497066193449679}
+  m_Layer: 0
+  m_Name: jingzhongh_bg
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1268710838397074702
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2115913152885540865}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 6637869762293697741}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &7615497066193449679
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2115913152885540865}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: -9999
+  m_Sprite: {fileID: 21300000, guid: a00cb8300f7735847bc4b0f00dcb00aa, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 23.005371, y: 27}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
 --- !u!1 &6637869762293697740
 GameObject:
   m_ObjectHideFlags: 0
@@ -27,6 +109,7 @@ Transform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 1268710838397074702}
   - {fileID: 6637869762496596875}
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -40,7 +123,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_RootOrder
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalPosition.x
@@ -90,7 +173,8 @@ PrefabInstance:
       propertyPath: m_LocalPosition.x
       value: 0
       objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    m_RemovedComponents:
+    - {fileID: 8605298645814931756, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
 --- !u!4 &6637869762496596875 stripped
 Transform: