调整部分UI适配方式

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityDay7/UI_ActivityDay7UI.cs

@@ -8,6 +8,8 @@ namespace UI.ActivityDay7
     {
         public GComponent target;
         public GLoader m_loaBg;
+        public GLoader m_Top_img;
+        public GLoader m_Top_img2;
         public GButton m_btnBack;
         public GTextField m_TimeStr;
         public GButton m_tip;
@@ -66,6 +68,8 @@ namespace UI.ActivityDay7
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_Top_img = (GLoader)comp.GetChild("Top_img");
+            m_Top_img2 = (GLoader)comp.GetChild("Top_img2");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_TimeStr = (GTextField)comp.GetChild("TimeStr");
             m_tip = (GButton)comp.GetChild("tip");
@@ -80,6 +84,8 @@ namespace UI.ActivityDay7
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
+            m_Top_img = null;
+            m_Top_img2 = null;
             m_btnBack = null;
             m_TimeStr = null;
             m_tip = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Bag/UI_BagUI.cs

@@ -8,6 +8,7 @@ namespace UI.Bag
     {
         public GComponent target;
         public GLoader m_loaBg;
+        public GLoader m_Top_img;
         public GComponent m_comValueBar;
         public GList m_list;
         public GButton m_btnBack;
@@ -60,6 +61,7 @@ namespace UI.Bag
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_Top_img = (GLoader)comp.GetChild("Top_img");
             m_comValueBar = (GComponent)comp.GetChild("comValueBar");
             m_list = (GList)comp.GetChild("list");
             m_btnBack = (GButton)comp.GetChild("btnBack");
@@ -68,6 +70,7 @@ namespace UI.Bag
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
+            m_Top_img = null;
             m_comValueBar = null;
             m_list = null;
             m_btnBack = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_CardDetailUI.cs

@@ -8,6 +8,7 @@ namespace UI.Card
     {
         public GComponent target;
         public GLoader m_loaBg;
+        public GLoader m_Top_img;
         public GButton m_btnBack;
         public GButton m_btnFilter;
         public GList m_listRole;
@@ -63,6 +64,7 @@ namespace UI.Card
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_Top_img = (GLoader)comp.GetChild("Top_img");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnFilter = (GButton)comp.GetChild("btnFilter");
             m_listRole = (GList)comp.GetChild("listRole");
@@ -74,6 +76,7 @@ namespace UI.Card
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
+            m_Top_img = null;
             m_btnBack = null;
             m_btnFilter = null;
             m_listRole = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingDecompose/UI_ClothingDecomposeUI.cs

@@ -11,6 +11,7 @@ namespace UI.ClothingDecompose
         public Controller m_TouchSelect;
         public Controller m_clothesType;
         public GLoader m_bg;
+        public GLoader m_Top_img;
         public UI_Button6 m_btnClothing;
         public UI_Button6 m_btnSkillBook;
         public GComponent m_valueBar;
@@ -77,6 +78,7 @@ namespace UI.ClothingDecompose
             m_TouchSelect = comp.GetController("TouchSelect");
             m_clothesType = comp.GetController("clothesType");
             m_bg = (GLoader)comp.GetChild("bg");
+            m_Top_img = (GLoader)comp.GetChild("Top_img");
             m_btnClothing = (UI_Button6)UI_Button6.Create(comp.GetChild("btnClothing"));
             m_btnSkillBook = (UI_Button6)UI_Button6.Create(comp.GetChild("btnSkillBook"));
             m_valueBar = (GComponent)comp.GetChild("valueBar");
@@ -99,6 +101,7 @@ namespace UI.ClothingDecompose
             m_TouchSelect = null;
             m_clothesType = null;
             m_bg = null;
+            m_Top_img = null;
             m_btnClothing.Dispose();
             m_btnClothing = null;
             m_btnSkillBook.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CreateRole/UI_CreateRoleUI.cs

@@ -10,6 +10,7 @@ namespace UI.CreateRole
         public GLoader m_loaBg;
         public UI_EnvelopeModel m_envelopeModel;
         public GGraph m_BgEffectHolder;
+        public GGraph m_mask;
         public Transition m_t_Open;
         public Transition m_t_In;
         public Transition m_t_AfterOpen;
@@ -63,6 +64,7 @@ namespace UI.CreateRole
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_envelopeModel = (UI_EnvelopeModel)UI_EnvelopeModel.Create(comp.GetChild("envelopeModel"));
             m_BgEffectHolder = (GGraph)comp.GetChild("BgEffectHolder");
+            m_mask = (GGraph)comp.GetChild("mask");
             m_t_Open = comp.GetTransition("t_Open");
             m_t_In = comp.GetTransition("t_In");
             m_t_AfterOpen = comp.GetTransition("t_AfterOpen");
@@ -73,6 +75,7 @@ namespace UI.CreateRole
             m_envelopeModel.Dispose();
             m_envelopeModel = null;
             m_BgEffectHolder = null;
+            m_mask = null;
             m_t_Open = null;
             m_t_In = null;
             m_t_AfterOpen = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_CardGuideUI.cs

@@ -8,6 +8,7 @@ namespace UI.FieldGuide
     {
         public GComponent target;
         public GLoader m_loaBg;
+        public GLoader m_Top_img;
         public GButton m_btnBack;
         public GList m_listCard;
         public GList m_listRole;
@@ -62,6 +63,7 @@ namespace UI.FieldGuide
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_Top_img = (GLoader)comp.GetChild("Top_img");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_listCard = (GList)comp.GetChild("listCard");
             m_listRole = (GList)comp.GetChild("listRole");
@@ -72,6 +74,7 @@ namespace UI.FieldGuide
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
+            m_Top_img = null;
             m_btnBack = null;
             m_listCard = null;
             m_listRole = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_DressUpGuideUI.cs

@@ -9,6 +9,7 @@ namespace UI.FieldGuide
         public GComponent target;
         public Controller m_c1;
         public GLoader m_loaBg;
+        public GLoader m_Top_img;
         public GButton m_btnBack;
         public GList m_listType1;
         public GList m_listType2;
@@ -68,6 +69,7 @@ namespace UI.FieldGuide
         {
             m_c1 = comp.GetController("c1");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_Top_img = (GLoader)comp.GetChild("Top_img");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_listType1 = (GList)comp.GetChild("listType1");
             m_listType2 = (GList)comp.GetChild("listType2");
@@ -83,6 +85,7 @@ namespace UI.FieldGuide
         {
             m_c1 = null;
             m_loaBg = null;
+            m_Top_img = null;
             m_btnBack = null;
             m_listType1 = null;
             m_listType2 = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Guide/UI_Component2.cs

@@ -7,6 +7,7 @@ namespace UI.Guide
     public partial class UI_Component2
     {
         public GComponent target;
+        public GGraph m_mask;
         public GGraph m_guideArea;
         public const string URL = "ui://vxxz0ya7tu96e";
         public const string PACKAGE_NAME = "Guide";
@@ -55,10 +56,12 @@ namespace UI.Guide
 
         private void Init(GComponent comp)
         {
+            m_mask = (GGraph)comp.GetChild("mask");
             m_guideArea = (GGraph)comp.GetChild("guideArea");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_mask = null;
             m_guideArea = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Guide/UI_GuideUI.cs

@@ -7,8 +7,8 @@ namespace UI.Guide
     public partial class UI_GuideUI
     {
         public GComponent target;
-        public GGraph m_grhMask;
-        public UI_Component2 m_mask;
+        public GGraph m_mask;
+        public UI_Component2 m_maskCom;
         public GLoader m_loaMask;
         public UI_ComHolder m_comHolder;
         public UI_Component1 m_compTxt;
@@ -59,17 +59,17 @@ namespace UI.Guide
 
         private void Init(GComponent comp)
         {
-            m_grhMask = (GGraph)comp.GetChild("grhMask");
-            m_mask = (UI_Component2)UI_Component2.Create(comp.GetChild("mask"));
+            m_mask = (GGraph)comp.GetChild("mask");
+            m_maskCom = (UI_Component2)UI_Component2.Create(comp.GetChild("maskCom"));
             m_loaMask = (GLoader)comp.GetChild("loaMask");
             m_comHolder = (UI_ComHolder)UI_ComHolder.Create(comp.GetChild("comHolder"));
             m_compTxt = (UI_Component1)UI_Component1.Create(comp.GetChild("compTxt"));
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_grhMask = null;
-            m_mask.Dispose();
             m_mask = null;
+            m_maskCom.Dispose();
+            m_maskCom = null;
             m_loaMask = null;
             m_comHolder.Dispose();
             m_comHolder = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryDialogUI.cs

@@ -24,6 +24,7 @@ namespace UI.Main
         public GButton m_btnSpeedUp;
         public GTextField m_txtPlayName;
         public GGroup m_comPlayName;
+        public GGraph m_mask;
         public Transition m_t0;
         public Transition m_showMask;
         public Transition m_hideMask;
@@ -94,6 +95,7 @@ namespace UI.Main
             m_btnSpeedUp = (GButton)comp.GetChild("btnSpeedUp");
             m_txtPlayName = (GTextField)comp.GetChild("txtPlayName");
             m_comPlayName = (GGroup)comp.GetChild("comPlayName");
+            m_mask = (GGraph)comp.GetChild("mask");
             m_t0 = comp.GetTransition("t0");
             m_showMask = comp.GetTransition("showMask");
             m_hideMask = comp.GetTransition("hideMask");
@@ -124,6 +126,7 @@ namespace UI.Main
             m_btnSpeedUp = null;
             m_txtPlayName = null;
             m_comPlayName = null;
+            m_mask = null;
             m_t0 = null;
             m_showMask = null;
             m_hideMask = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryFightTargetScoreUI.cs

@@ -7,7 +7,7 @@ namespace UI.Main
     public partial class UI_StoryFightTargetScoreUI
     {
         public GComponent target;
-        public GLoader m_bg;
+        public GLoader m_loaBg;
         public GGraph m_bgEffect;
         public GGraph m_holder;
         public UI_ComClick m_comClick;
@@ -70,7 +70,7 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_bg = (GLoader)comp.GetChild("bg");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_bgEffect = (GGraph)comp.GetChild("bgEffect");
             m_holder = (GGraph)comp.GetChild("holder");
             m_comClick = (UI_ComClick)UI_ComClick.Create(comp.GetChild("comClick"));
@@ -89,7 +89,7 @@ namespace UI.Main
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_bg = null;
+            m_loaBg = null;
             m_bgEffect = null;
             m_holder = null;
             m_comClick.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_RoleInfoUI.cs

@@ -9,6 +9,7 @@ namespace UI.RoleInfo
         public GComponent target;
         public Controller m_type;
         public GLoader m_loaBg;
+        public GLoader m_Top_img;
         public GTextField m_txtVersion;
         public GButton m_btnHelp;
         public GButton m_btnBack;
@@ -82,6 +83,7 @@ namespace UI.RoleInfo
         {
             m_type = comp.GetController("type");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_Top_img = (GLoader)comp.GetChild("Top_img");
             m_txtVersion = (GTextField)comp.GetChild("txtVersion");
             m_btnHelp = (GButton)comp.GetChild("btnHelp");
             m_btnBack = (GButton)comp.GetChild("btnBack");
@@ -111,6 +113,7 @@ namespace UI.RoleInfo
         {
             m_type = null;
             m_loaBg = null;
+            m_Top_img = null;
             m_txtVersion = null;
             m_btnHelp = null;
             m_btnBack = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ComProperty.cs

@@ -8,7 +8,7 @@ namespace UI.Studio
     {
         public GComponent target;
         public Controller m_c1;
-        public GLoader m_bg0;
+        public GLoader m_loaBg;
         public GList m_list;
         public GTextField m_txtNum;
         public GButton m_btnBuy;
@@ -66,7 +66,7 @@ namespace UI.Studio
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_bg0 = (GLoader)comp.GetChild("bg0");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_list = (GList)comp.GetChild("list");
             m_txtNum = (GTextField)comp.GetChild("txtNum");
             m_btnBuy = (GButton)comp.GetChild("btnBuy");
@@ -80,7 +80,7 @@ namespace UI.Studio
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_bg0 = null;
+            m_loaBg = null;
             m_list = null;
             m_txtNum = null;
             m_btnBuy = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_TaskUI.cs

@@ -9,6 +9,7 @@ namespace UI.Task
         public GComponent target;
         public Controller m_c1;
         public GLoader m_loaBg;
+        public GLoader m_Top_img;
         public GButton m_btnBack;
         public GButton m_btnTask;
         public GButton m_btnWeekly;
@@ -63,6 +64,7 @@ namespace UI.Task
         {
             m_c1 = comp.GetController("c1");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_Top_img = (GLoader)comp.GetChild("Top_img");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnTask = (GButton)comp.GetChild("btnTask");
             m_btnWeekly = (GButton)comp.GetChild("btnWeekly");
@@ -73,6 +75,7 @@ namespace UI.Task
         {
             m_c1 = null;
             m_loaBg = null;
+            m_Top_img = null;
             m_btnBack = null;
             m_btnTask = null;
             m_btnWeekly = null;

GameClient/Assets/Game/HotUpdate/Views/ActivityDay7/ActivityDay7View.cs

@@ -45,7 +45,7 @@ namespace GFGGame
 
             bringToFontOnClick = false;
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
-            //_ui.m_loaBg.url = ResPathUtil.GetBgImgPath("qrhd_banner_yxzy");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("cp_beijing");
             _ui.m_DayList.itemRenderer = DayListRenderer;
             _ui.m_comTaskList.m_TaskList.itemRenderer = TaskListRenderer;
             _ui.m_tip.onClick.Add(RuleController.ShowRuleView);
@@ -350,6 +350,7 @@ namespace GFGGame
 
         private void SetTime()
         {
+            UpdateTime(null);
             Timers.inst.Add(1, 0, UpdateTime);
         }
 

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -514,7 +514,7 @@ namespace GFGGame
             _ui.m_loaBg2.material = copyM;
             _ui.m_loaBg2.position = _ui.m_loaBg.position;
             float startY = _ui.m_loaBg2Pos.position.y;
-            float endY = _ui.m_posHelper.position.y;
+            float endY = _ui.m_posHelper.position.y + ViewGlobal.GetRealTopOffset();
             float rate = 1 - ((Mathf.Abs(startY - endY)) / _ui.m_loaBg2.height);
             _ui.m_loaBg2.material.SetFloat("_MinHeight", rate - 0.01f);
             _ui.m_loaBg2.material.SetFloat("_MaxHeight", rate - 0.03f);

GameClient/Assets/Game/HotUpdate/Views/Guide/GuideView.cs

@@ -72,12 +72,12 @@ namespace GFGGame
 
             UpdateComTxt(txtContent);
 
-            _ui.m_mask.target.visible = false;
+            _ui.m_maskCom.target.visible = false;
             _ui.m_loaMask.visible = false;
-            _ui.m_grhMask.visible = false;
+            _ui.m_mask.visible = false;
             if (guideTarget != null)
             {
-                _ui.m_grhMask.visible = true;
+                _ui.m_mask.visible = true;
                 _ui.m_comHolder.target.visible = false;
                 Timers.inst.Add(0.3f, 1, UpdateTime);
                 // _ui.m_mask.target.visible = true;
@@ -98,12 +98,12 @@ namespace GFGGame
 
             if (justHint)
             {
-                _ui.m_mask.target.visible = false;
+                _ui.m_maskCom.target.visible = false;
                 _ui.m_loaMask.visible = true;
             }
             if (NoTips)
             {
-                _ui.m_mask.target.visible = false;
+                _ui.m_maskCom.target.visible = false;
                 _ui.m_comHolder.target.visible = false;
             }
 
@@ -122,7 +122,7 @@ namespace GFGGame
             GuideCfg cfg3 = GuideCfgArray.Instance.GetCfg(ConstGuideId.LUCKY_BOX_LINE); // 引导抽奖连线
             if (guideId == cfg3.id && guideIndex == 1)
             {
-                _ui.m_mask.target.visible = false;
+                _ui.m_maskCom.target.visible = false;
                 _ui.m_loaMask.visible = false;
             }
         }
@@ -135,7 +135,7 @@ namespace GFGGame
 
             _ui.m_comHolder.target.visible = false;
             _ui.m_compTxt.target.visible = false;
-            _ui.m_grhMask.visible = true;
+            _ui.m_mask.visible = true;
             guideTarget = null;
 
             base.OnHide();
@@ -186,10 +186,10 @@ namespace GFGGame
                 // pos = _ui.m_mask.target.GlobalToLocal(pos);
                 logicScreenPos.x = logicScreenPos.x + guideTarget.width / 2;
                 logicScreenPos.y = logicScreenPos.y + guideTarget.height / 2;
-                if (_ui.m_mask.m_guideArea.xy == logicScreenPos)
+                if (_ui.m_maskCom.m_guideArea.xy == logicScreenPos)
                 {
                     //Timers.inst.Remove(UpdateGuideRect);
-                    _ui.m_comHolder.target.xy = _ui.m_mask.m_guideArea.xy;
+                    _ui.m_comHolder.target.xy = _ui.m_maskCom.m_guideArea.xy;
 
                     if (logicScreenPos.x > GRoot.inst.width / 2)
                     {
@@ -200,8 +200,8 @@ namespace GFGGame
                         _ui.m_comHolder.m_c1.selectedIndex = 1;//手在右边
                     }
                     _ui.m_comHolder.target.visible = !NoTips;
-                    _ui.m_mask.target.visible = !NoTips;
-                    _ui.m_grhMask.visible = false;
+                    _ui.m_maskCom.target.visible = !NoTips;
+                    _ui.m_mask.visible = false;
                     _ui.m_compTxt.target.visible = !String.IsNullOrEmpty(txtContent);
 
 
@@ -220,7 +220,7 @@ namespace GFGGame
                     }
                     return;
                 }
-                _ui.m_mask.m_guideArea.SetXY(logicScreenPos.x, logicScreenPos.y);
+                _ui.m_maskCom.m_guideArea.SetXY(logicScreenPos.x, logicScreenPos.y);
             }
             else {
                 _countGuideRect += 1;

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryDialogView.cs

@@ -96,8 +96,8 @@ namespace GFGGame
             _ui.m_btnNext.height = GRoot.inst.height;
             _ui.m_mask1.height = (GRoot.inst.height - 1920) / 2;
             _ui.m_mask2.height = (GRoot.inst.height - 1920) / 2;
-            _ui.m_mask1.y = 0;
-            _ui.m_mask2.y = GRoot.inst.height - _ui.m_mask2.height;
+            _ui.m_mask1.y = -ViewGlobal.GetRealTopOffset();
+            _ui.m_mask2.y = GRoot.inst.height - _ui.m_mask2.height - ViewGlobal.GetRealTopOffset();
             _ui.m_btnNext.AddRelation(GRoot.inst, RelationType.Size);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnNext.onClick.Add(OnClickBtnNext);

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs

@@ -192,7 +192,7 @@ namespace GFGGame
             dressUpObjUI.ResetSceneObj(100, false, true, null, false);
             dressUpObjUI.dressUpObj.PutOnItemList(roleData.itemList);
             dressUpObjUI.UpdateWrapper(_ui.m_holder);
-            _ui.m_bg.url = ResPathUtil.GetBgImgPath("zd_g_bg");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zd_g_bg");
 
 
             _ui.m_btnBack.visible = true;

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioPropertyView.cs

@@ -38,7 +38,7 @@ namespace GFGGame
             AddChildCom(com);
             _croProperty = com.GetController("c1");
 
-            _bg0 = com.GetChild("bg0").asLoader;
+            _bg0 = com.GetChild("loaBg").asLoader;
             _btnChageLine = com.GetChild("btnChageLine").asLoader;
 
             list.itemRenderer = ListItemRender;

GameClient/Assets/Game/HotUpdate/Views/UIView.cs

@@ -1,6 +1,7 @@
 using ET;
 using FairyGUI;
 using System.Collections;
+using System.Collections.Generic;
 using UnityEngine;
 
 namespace GFGGame
@@ -232,10 +233,83 @@ namespace GFGGame
 
         private void MakeFullScreen(GObject ui)
         {
-            ui.MakeFullScreen();
+            MakeUIFullScreen(ui);
             ui.AddRelation(GRoot.inst, RelationType.Size);
         }
 
+        private bool _adaptFinished = false;
+        public void MakeUIFullScreen(GObject ui)
+        {
+            if (_adaptFinished)
+            {
+                return;
+            }
+
+            //这里做了最大宽度适配
+            float targetWidth;
+            float maxAspectRatio = 1080 * 1.0f / 1920;
+            if (Screen.width * 1.0f / Screen.height > maxAspectRatio)
+            {
+                targetWidth = GRoot.inst.height * maxAspectRatio;
+                ui.Center();
+            }
+            else
+            {
+                targetWidth = GRoot.inst.width;
+            }
+
+            GameObject uiObj = viewCom.displayObject.gameObject;
+
+            List<GObject> listTopImg = new List<GObject>();
+            float offsetY = ViewGlobal.GetRealTopOffset();
+
+            // 处理全屏显示的背景图/遮罩
+            List<Transform> list = ViewGlobal.FindAllGLoaderInTrans(uiObj.transform);
+            for (int i = 0; i < list.Count; i++)
+            {
+                GameObject bg = list[i].gameObject;
+                DisplayObjectInfo bgInfo = bg.GetComponent<DisplayObjectInfo>();
+                GObject obj = GRoot.inst.DisplayObjectToGObject(bgInfo.displayObject);
+
+                if (obj != null)
+                {
+                    if (ViewGlobal.IsFullScreenPic(obj.name) && obj.height >= 1920)
+                    {
+                        obj.AddRelation(ui, RelationType.Center_Center);
+                        obj.SetSize(1080, 2400);
+                        obj.SetXY(obj.x, obj.y - offsetY / 2);
+                    }
+                    else if (obj.name.Contains("Top_img"))
+                    {
+                        listTopImg.Add(obj);
+                    }
+                }
+            }
+
+            // 保存未适配时，不需要改变位置的UI的信息（适配部分存在拉伸效果的UI）
+            ui.SetSize(targetWidth, GRoot.inst.height);
+            List<float> heightList = new List<float>();
+            for (int i = 0; i < listTopImg.Count; i++)
+            {
+                listTopImg[i].RemoveRelation(ui, RelationType.Center_Center);
+                heightList.Add(listTopImg[i].height);
+            }
+
+            // UI整体高度缩放
+            ui.SetSize(targetWidth, ViewGlobal.GetUIHeight());
+            // UI整体下移动
+            ui.SetXY(ui.x, offsetY);
+
+            // 还原不需要适配的UI
+            for (int i = 0; i < listTopImg.Count; i++)
+            {
+                listTopImg[i].SetSize(listTopImg[i].width, heightList[i] + offsetY * 2);
+                listTopImg[i].SetXY(listTopImg[i].x, listTopImg[i].y - offsetY);
+            }
+
+            _adaptFinished = true;
+        }
+
         void __addedToStage()
         {
             DoShowAnimation();

GameClient/Assets/Game/HotUpdate/Views/ViewGlobal.cs

@@ -1,4 +1,5 @@
 using FairyGUI;
+using System.Collections.Generic;
 using UI.Common;
 using UnityEngine;
 
@@ -29,5 +30,79 @@ namespace GFGGame
             comHolder.m_holder.visible = true;
             comHolder.target.SetPosition(pos.x, pos.y, 0);
         }
+
+
+        /// <summary>
+        /// 获取顶部摄像头的高度，减去一定的位移是因为设计图本身为顶部留出了一定的间隙
+        /// </summary>
+        /// <returns></returns>
+        static float GetTopOffset()
+        {
+            int designOffset = ((Screen.safeArea.height + Screen.safeArea.y) == Screen.height ? 0 : 80);
+            return Screen.height - Screen.safeArea.height - Screen.safeArea.y - designOffset;
+        }
+
+        /// <summary>
+        /// 获取画布根据分辨率适配后的，顶部的实际高度
+        /// </summary>
+        /// <returns></returns>
+        public static float GetRealTopOffset()
+        {
+            return Screen.height / UIContentScaler.scaleFactor - GetUIHeight();
+        }
+
+        /// <summary>
+        /// 获取画布根据分辨率适配后的UI高度
+        /// </summary>
+        /// <returns></returns>
+        public static float GetUIHeight()
+        {
+            return (Screen.height - GetTopOffset()) / UIContentScaler.scaleFactor;
+        }
+
+        public static List<Transform> FindAllGLoaderInTrans(Transform parent)
+        {
+            List<Transform> foundChildren = new List<Transform>();
+
+            // 遍历当前父节点的所有子节点
+            foreach (Transform child in parent)
+            {
+                // 检查子节点的名称是否匹配
+                if (child.name == "GLoader" || child.name == "Shape")
+                {
+                    // 将匹配的子节点添加到列表中
+                    foundChildren.Add(child);
+                }
+
+                // 递归调用，查找孙子节点
+                foundChildren.AddRange(FindAllGLoaderInTrans(child));
+            }
+
+            return foundChildren;
+        }
+
+        private static List<string> fullScreenPicNames = new List<string>() { "loaBg", "mask" };
+        private static List<string> notMoveUI = new List<string>() { "Top_img" };
+
+
+        public static bool IsFullScreenPic(string name)
+        {
+            foreach (string s in fullScreenPicNames)
+            {
+                if (name == s)
+                    return true;
+            }
+            return false;
+        }
+
+        public static bool IsNotMoveUI(string name)
+        {
+            foreach (string s in notMoveUI)
+            {
+                if (s.Contains(name))
+                    return true;
+            }
+            return false;
+        }
     }
 }