修改词牌界面UI适配

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

@@ -8,6 +8,7 @@ namespace UI.Card
     {
         public GComponent target;
         public Controller m_c1;
+        public GLoader m_Top_img;
         public GButton m_btnback;
         public GComponent m_comValueBar;
         public GButton m_btnStory;
@@ -61,6 +62,7 @@ namespace UI.Card
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_Top_img = (GLoader)comp.GetChild("Top_img");
             m_btnback = (GButton)comp.GetChild("btnback");
             m_comValueBar = (GComponent)comp.GetChild("comValueBar");
             m_btnStory = (GButton)comp.GetChild("btnStory");
@@ -70,6 +72,7 @@ namespace UI.Card
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_Top_img = null;
             m_btnback = null;
             m_comValueBar = null;
             m_btnStory = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxStarUI.cs

@@ -9,7 +9,7 @@ namespace UI.LuckyBox
         public GComponent target;
         public Controller m_ctrlBuyType;
         public Controller m_ctrlRewardsType;
-        public GLoader m_bg;
+        public GLoader m_loaBg;
         public GMovieClip m_effEnd;
         public GGraph m_holder_star;
         public GGraph m_holder_star_sky;
@@ -103,7 +103,7 @@ namespace UI.LuckyBox
         {
             m_ctrlBuyType = comp.GetController("ctrlBuyType");
             m_ctrlRewardsType = comp.GetController("ctrlRewardsType");
-            m_bg = (GLoader)comp.GetChild("bg");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_effEnd = (GMovieClip)comp.GetChild("effEnd");
             m_holder_star = (GGraph)comp.GetChild("holder_star");
             m_holder_star_sky = (GGraph)comp.GetChild("holder_star_sky");
@@ -153,7 +153,7 @@ namespace UI.LuckyBox
         {
             m_ctrlBuyType = null;
             m_ctrlRewardsType = null;
-            m_bg = null;
+            m_loaBg = null;
             m_effEnd = null;
             m_holder_star = null;
             m_holder_star_sky = null;

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -149,6 +149,8 @@ namespace GFGGame
             _effectUI4 = EffectUIPool.CreateEffectUI(_ui.m_ComFosterBottom.m_holderfBgEff, "ui_Activity", "SX_Down_TX");
 
             _valueBarController = new ValueBarController(_ui.m_ComFosterTop.m_comValueBar, 5);
+
+            AdaptScreen();
         }
 
         private void RefLeftAndRight()
@@ -158,7 +160,8 @@ namespace GFGGame
                 _ui.m_btnLeft.grayed = true;
                 _ui.m_btnLeft.touchable = false;
             }
-            else {
+            else
+            {
                 _ui.m_btnLeft.grayed = false;
                 _ui.m_btnLeft.touchable = true;
             }
@@ -250,7 +253,8 @@ namespace GFGGame
                     _selectTab = 2; // 默认选中技能tab
 
                     var listGuideCard = CardDataManager.GetAllCardIdListByRoleType(_cardData.pageIndex);
-                    for (int i = 0; i<listGuideCard.Count; i++) {
+                    for (int i = 0; i < listGuideCard.Count; i++)
+                    {
                         var cardInfo = CardDataManager.GetCardDataById(listGuideCard[i]);
                         if (cardInfo != null)
                             _cardList.Add(cardInfo);
@@ -359,8 +363,8 @@ namespace GFGGame
             float imgIniWidth = CardDataManager.CardResInitWidth * imgInitHight / CardDataManager.CardResInitHight;//UI界面上小图时的宽度
             _cardScale = imgIniWidth < _ui.target.width ? _ui.target.width / CardDataManager.CardResInitWidth : imgInitHight / CardDataManager.CardResInitHight;
 
-            if (_cardData.itemCfg.animationCardStar > 0 
-                && _cardData.star >= _cardData.itemCfg.animationCardStar 
+            if (_cardData.itemCfg.animationCardStar > 0
+                && _cardData.star >= _cardData.itemCfg.animationCardStar
                 && YooAssets.CheckResExist(resPath))
             {
                 await LoadManager.Instance.CheckResExsitedOrDownload(resPath);
@@ -386,7 +390,7 @@ namespace GFGGame
                     GLoader loaCard = _ui.m_comImgCard.m_ComCardImgRes.m_loaCard;
                     loaCard.url = ResPathUtil.GetCardPath(_cardData.resources[_cardData.resIndex]);
 
-                    comCardImgResTargetSize = new Vector2(_ui.target.height * CardDataManager.CardResInitWidth / CardDataManager.CardResInitHight, _ui.target.height);
+                    comCardImgResTargetSize = new Vector2(Screen.height * CardDataManager.CardResInitWidth / CardDataManager.CardResInitHight, Screen.height);
 
                     comCardImgResInitSize = new Vector2(CardDataManager.CardResInitWidth * _cardScale, CardDataManager.CardResInitHight * _cardScale);
                     _ui.m_comImgCard.m_ComCardImgRes.target.size = comCardImgResInitSize;
@@ -418,7 +422,8 @@ namespace GFGGame
             _comFosterBottom.m_barLv.max = cardLvCfg.needExp;
             _comFosterBottom.m_barLv.value = _showExp;
 
-            if (effLight) { 
+            if (effLight)
+            {
                 EffectUIPool.Recycle(_effectUI6);
                 _effectUI6 = EffectUIPool.CreateEffectUI(_comFosterBottom.m_holderbarLv, "ui_Activity", "SX_JinDuTiao");
             }
@@ -450,7 +455,7 @@ namespace GFGGame
             listItem.target.data = index;
 
             _listEffectHolder.Add(listItem.m_holderTouch);
-            
+
             if (listItem.m_btnMinus.data == null)
             {
                 listItem.m_btnMinus.onTouchBegin.Add(OnClickItemConsumsBegin);
@@ -584,7 +589,7 @@ namespace GFGGame
         {
             UI_ComConsume listItem = UI_ComConsume.Proxy(obj);
             int index = (int)listItem.target.data;
-            if (index >= itemsCount.Count|| itemsCount[index] == 0)
+            if (index >= itemsCount.Count || itemsCount[index] == 0)
             {
                 Timers.inst.Remove(OnTimedEvent);
                 return;
@@ -701,7 +706,7 @@ namespace GFGGame
                     if (_showLv - lv >= 1)
                     {
                         // this._selectTab = _comFosterBottom.m_ctrlTab.selectedIndex;
-                        ViewManager.Show<CardUpView>(new object[] { _cardData.scores, "lv", lv, _showLv , _cardData.id });
+                        ViewManager.Show<CardUpView>(new object[] { _cardData.scores, "lv", lv, _showLv, _cardData.id });
                     }
                     ReferInfo();
                     LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CI_PAI, 2);
@@ -709,7 +714,8 @@ namespace GFGGame
             }
         }
 
-        private void ReferInfo() {
+        private void ReferInfo()
+        {
             this.UpdateCommon();
             this.UpdateUpLvView(false, 0, 0, true);
             this.ClearItemsCountList();
@@ -722,12 +728,12 @@ namespace GFGGame
             int maxLv = CardRarityCfgArray.Instance.GetCfg(_cardData.itemCfg.rarity).maxCardLvl;
             lvLimit = Mathf.Min(lvLimit, maxLv);
             int needExp = CardLvlCfgArray.Instance.GetCfgByrarityAndcardLvl(_cardData.itemCfg.rarity, lvLimit).needExp;
-            
+
             if (_showLv >= lvLimit && _comFosterBottom.m_barLv.value + itemCfg.cardUpLvExp > needExp)
             {
                 if (!showTips) return true;
 
-                if(_showLv < maxLv)
+                if (_showLv < maxLv)
                     PromptController.Instance.ShowFloatTextPrompt(string.Format("角色等级达到{0}级可继续升级词牌", CardDataManager.GetNextUpCardNeedRoleLv(_showLv)));
 
                 return true;
@@ -748,7 +754,8 @@ namespace GFGGame
             _comFosterBottom.m_btnCheckAuto.selected = _isAutoSelect == 1;
 
             //升星后星数正5才不进入
-            if (_refDodgeStar || _cardData.star % 5 != 0) { 
+            if (_refDodgeStar || _cardData.star % 5 != 0)
+            {
                 UpdateUpStarOfStarAndText();
             }
             _refDodgeStar = true;
@@ -835,8 +842,9 @@ namespace GFGGame
             listItem.m_QualityType.selectedIndex = 4;
             int needCount = cardStarCfg.materiarsArr[index][1];
             long hasCount = ItemDataManager.GetItemNum(cardStarCfg.materiarsArr[index][0]);
-            if (_isAutoSelect == 1) { 
-                if(index == 0)
+            if (_isAutoSelect == 1)
+            {
+                if (index == 0)
                     hasCount += ItemDataManager.GetItemNum(6003001);
                 else
                     hasCount += ItemDataManager.GetItemNum(6003002);
@@ -906,7 +914,7 @@ namespace GFGGame
             }
             //按钮点击特效
             _effectUI7 = EffectUIPool.CreateEffectUI(_ui.m_ComFosterBottom.m_holderTouchFlower, "ui_Activity", "SX_DJ");
-            
+
             CardStarCfg cardStarCfg = CardStarCfgArray.Instance.GetCfgBycardIdAndstarLvl(_cardData.id, _cardData.star);
 
             if (_cardData.lv < cardStarCfg.needLv)
@@ -942,7 +950,8 @@ namespace GFGGame
 
                 LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CI_PAI, 2);
                 UpdateRedDot();
-                if (_cardData.star % 5 == 0) {
+                if (_cardData.star % 5 == 0)
+                {
                     int starLevelDodge = _cardData.star / _wordNumber;
                     int starLevel = _cardData.star / _wordNumber - 1;
                     UI_ComStarItem comStarItem = UI_ComStarItem.Proxy(_comFosterBottom.target.GetChild("comStarItem"));
@@ -1025,7 +1034,7 @@ namespace GFGGame
 
         private void OpenCardUp(string strType)
         {
-            ViewManager.Show<CardUpView>(new object[] { _cardData.scores, strType, _cardData.star - 1, _cardData.star, _cardData.id , _fromUIType });
+            ViewManager.Show<CardUpView>(new object[] { _cardData.scores, strType, _cardData.star - 1, _cardData.star, _cardData.id, _fromUIType });
         }
         /***********************************************************升技能***************************************************/
 
@@ -1129,7 +1138,7 @@ namespace GFGGame
             }
             else if (diffValueX <= 20 && diffValueX >= -20)
             {
-                if(_ui.m_c1.selectedIndex == 1)
+                if (_ui.m_c1.selectedIndex == 1)
                     OnClickComCard();
                 else
                     OnClickLoaCard();
@@ -1292,7 +1301,7 @@ namespace GFGGame
             _effectUI9 = null;
             EffectUIPool.Recycle(_effectUI10);
             _effectUI10 = null;
-            
+
             Timers.inst.Remove(CheckGuide);
             Timers.inst.Remove(OnTimedEvent);
             UI_ComCostCurrency.ProxyEnd();
@@ -1345,5 +1354,11 @@ namespace GFGGame
             GuideController.TryCompleteGuideIndex(ConstGuideId.UP_CARD_LV, 7);
             GuideController.TryCompleteGuide(ConstGuideId.UP_CARD_LV, 7);
         }
+
+        private void AdaptScreen()
+        {
+            _ui.m_comImgCard.target.SetXY(_ui.m_comImgCard.target.x, _ui.m_comImgCard.target.y - ViewGlobal.GetRealTopOffset());
+            _ui.m_comImgCard.target.SetSize(_ui.m_comImgCard.target.width, Screen.height);
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxStarView.cs

@@ -125,7 +125,7 @@ namespace GFGGame
             _isLuckyBox = LuckyBoxDataManager.Instance.luckyBoxIds.IndexOf(LuckyBoxDataManager.Instance.currentBoxId) >= 0;
             _ui.m_ctrlRewardsType.selectedIndex = LuckyBoxDataManager.Instance.luckyBoxIndex;// _isLuckyBox ? (LuckyBoxDataManager.Instance.currentBoxId - 1) : 0;
             // string resPath = string.Format("cj_tp_{0}", _isLuckyBox ? LuckyBoxDataManager.Instance.currentBoxId : 1);
-            _ui.m_bg.url = ResPathUtil.GetBgImgPath("zx_bg");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zx_bg");
 
             ResetStartView();
             Timers.inst.AddUpdate(CheckGuide);

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -88,6 +88,7 @@ namespace GFGGame
             _ui.m_listBg.SetVirtualAndLoop();  //虚拟循环列表
             _ui.m_listBg.scrollPane.onScrollEnd.Add(OnScrollEnd);
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zx_bg");
+            AdaptScreen();
         }
         protected override void AddEventListener()
         {
@@ -102,7 +103,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            AdaptScreen();
+            
             Debug.Log("OnShown：LuckyBoxView");
             //防止引导检测之前触发点击事件
             GRoot.inst.touchable = false;

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

@@ -38,8 +38,12 @@ namespace GFGGame
         /// <returns></returns>
         static float GetTopOffset()
         {
+#if UNITY_EDITOR
+            return 0;
+#else
             int designOffset = ((Screen.safeArea.height + Screen.safeArea.y) == Screen.height ? 0 : 80);
             return Screen.height - Screen.safeArea.height - Screen.safeArea.y - designOffset;
+#endif
         }
 
         /// <summary>