Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_ActivityHuaRongDaoEntryUI.cs

@@ -7,14 +7,16 @@ namespace UI.ActivityHuaRongDao
     public partial class UI_ActivityHuaRongDaoEntryUI
     {
         public GComponent target;
+        public Controller m_activityID;
         public GLoader m_loaBg;
+        public GButton m_btnClose;
         public GButton m_btnRule;
+        public GButton m_btnBack;
         public UI_scrollPane m_scrollPane;
-        public GTextField m_challengeTimes;
         public GTextField m_curLevel;
         public GTextField m_txtTime;
         public GButton m_btnStart;
-        public GButton m_btnBack;
+        public GTextField m_challengeTimes;
         public Transition m_hide;
         public Transition m_show;
         public const string URL = "ui://wf8geywtltoy4";
@@ -64,28 +66,32 @@ namespace UI.ActivityHuaRongDao
 
         private void Init(GComponent comp)
         {
+            m_activityID = comp.GetController("activityID");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_btnClose = (GButton)comp.GetChild("btnClose");
             m_btnRule = (GButton)comp.GetChild("btnRule");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
             m_scrollPane = (UI_scrollPane)UI_scrollPane.Create(comp.GetChild("scrollPane"));
-            m_challengeTimes = (GTextField)comp.GetChild("challengeTimes");
             m_curLevel = (GTextField)comp.GetChild("curLevel");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_btnStart = (GButton)comp.GetChild("btnStart");
-            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_challengeTimes = (GTextField)comp.GetChild("challengeTimes");
             m_hide = comp.GetTransition("hide");
             m_show = comp.GetTransition("show");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_activityID = null;
             m_loaBg = null;
+            m_btnClose = null;
             m_btnRule = null;
+            m_btnBack = null;
             m_scrollPane.Dispose();
             m_scrollPane = null;
-            m_challengeTimes = null;
             m_curLevel = null;
             m_txtTime = null;
             m_btnStart = null;
-            m_btnBack = null;
+            m_challengeTimes = null;
             m_hide = null;
             m_show = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_ActivityHuaRongDaoUI.cs

@@ -8,6 +8,7 @@ namespace UI.ActivityHuaRongDao
     {
         public GComponent target;
         public Controller m_state;
+        public Controller m_activityID;
         public GLoader m_loaBg;
         public UI_item m_item;
         public GTextField m_seconds;
@@ -71,6 +72,7 @@ namespace UI.ActivityHuaRongDao
         private void Init(GComponent comp)
         {
             m_state = comp.GetController("state");
+            m_activityID = comp.GetController("activityID");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_item = (UI_item)UI_item.Create(comp.GetChild("item"));
             m_seconds = (GTextField)comp.GetChild("seconds");
@@ -90,6 +92,7 @@ namespace UI.ActivityHuaRongDao
         public void Dispose(bool disposeTarget = false)
         {
             m_state = null;
+            m_activityID = null;
             m_loaBg = null;
             m_item.Dispose();
             m_item = null;

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/ClothingDecompose/UI_ClothingDecomposeUI.cs

@@ -10,7 +10,7 @@ namespace UI.ClothingDecompose
         public Controller m_c1;
         public Controller m_TouchSelect;
         public Controller m_clothesType;
-        public GLoader m_bg;
+        public GLoader m_loaBg;
         public GLoader m_Top_img;
         public UI_Button6 m_btnClothing;
         public UI_Button6 m_btnSkillBook;
@@ -77,7 +77,7 @@ namespace UI.ClothingDecompose
             m_c1 = comp.GetController("c1");
             m_TouchSelect = comp.GetController("TouchSelect");
             m_clothesType = comp.GetController("clothesType");
-            m_bg = (GLoader)comp.GetChild("bg");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             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"));
@@ -100,7 +100,7 @@ namespace UI.ClothingDecompose
             m_c1 = null;
             m_TouchSelect = null;
             m_clothesType = null;
-            m_bg = null;
+            m_loaBg = null;
             m_Top_img = null;
             m_btnClothing.Dispose();
             m_btnClothing = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ClothingShopUI.cs

@@ -11,6 +11,7 @@ namespace UI.ClothingShop
         public GLoader m_loaBg;
         public UI_ComClothingRole m_compHolder;
         public UI_ComClothingShopItemInfo m_compItemInfo;
+        public GLoader m_Top_img;
         public GComponent m_valueBar;
         public GButton m_btnBack;
         public GTextField m_txtTitle;
@@ -74,6 +75,7 @@ namespace UI.ClothingShop
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_compHolder = (UI_ComClothingRole)UI_ComClothingRole.Create(comp.GetChild("compHolder"));
             m_compItemInfo = (UI_ComClothingShopItemInfo)UI_ComClothingShopItemInfo.Create(comp.GetChild("compItemInfo"));
+            m_Top_img = (GLoader)comp.GetChild("Top_img");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
@@ -95,6 +97,7 @@ namespace UI.ClothingShop
             m_compHolder = null;
             m_compItemInfo.Dispose();
             m_compItemInfo = null;
+            m_Top_img = null;
             m_valueBar = null;
             m_btnBack = null;
             m_txtTitle = 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/FairyGUI/GenCode/Main/UI_ComAllPerfect.cs

@@ -8,6 +8,7 @@ namespace UI.Main
     {
         public GComponent target;
         public Controller m_c1;
+        public GGraph m_mask;
         public GGraph m_holderSmokeIn;
         public GGraph m_holderLoop;
         public GGraph m_holder;
@@ -71,6 +72,7 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_mask = (GGraph)comp.GetChild("mask");
             m_holderSmokeIn = (GGraph)comp.GetChild("holderSmokeIn");
             m_holderLoop = (GGraph)comp.GetChild("holderLoop");
             m_holder = (GGraph)comp.GetChild("holder");
@@ -90,6 +92,7 @@ namespace UI.Main
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_mask = null;
             m_holderSmokeIn = null;
             m_holderLoop = null;
             m_holder = null;

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

@@ -25,6 +25,7 @@ namespace UI.Main
         public UI_BtnModle2 m_btnActivityLuckyBox;
         public UI_BtnModle2 m_btnActivityZCJB;
         public UI_BtnModle2 m_btnGetYuanXiao;
+        public UI_BtnModle2 m_btnActivityFYJY;
         public GTextField m_serverTime;
         public GLoader m_loaGuidestudio;
         public UI_ComAd m_comListAd;
@@ -111,6 +112,7 @@ namespace UI.Main
             m_btnActivityLuckyBox = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityLuckyBox"));
             m_btnActivityZCJB = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityZCJB"));
             m_btnGetYuanXiao = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnGetYuanXiao"));
+            m_btnActivityFYJY = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityFYJY"));
             m_serverTime = (GTextField)comp.GetChild("serverTime");
             m_loaGuidestudio = (GLoader)comp.GetChild("loaGuidestudio");
             m_comListAd = (UI_ComAd)UI_ComAd.Create(comp.GetChild("comListAd"));
@@ -162,6 +164,8 @@ namespace UI.Main
             m_btnActivityZCJB = null;
             m_btnGetYuanXiao.Dispose();
             m_btnGetYuanXiao = null;
+            m_btnActivityFYJY.Dispose();
+            m_btnActivityFYJY = null;
             m_serverTime = null;
             m_loaGuidestudio = null;
             m_comListAd.Dispose();

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

@@ -7,6 +7,7 @@ namespace UI.Main
     public partial class UI_StorySkillUI
     {
         public GComponent target;
+        public GGraph m_mask;
         public GImage m_bg;
         public UI_ComSkillShow m_comSkillShow;
         public GGraph m_effReduceScore;
@@ -65,6 +66,7 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
+            m_mask = (GGraph)comp.GetChild("mask");
             m_bg = (GImage)comp.GetChild("bg");
             m_comSkillShow = (UI_ComSkillShow)UI_ComSkillShow.Create(comp.GetChild("comSkillShow"));
             m_effReduceScore = (GGraph)comp.GetChild("effReduceScore");
@@ -79,6 +81,7 @@ namespace UI.Main
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_mask = null;
             m_bg = null;
             m_comSkillShow.Dispose();
             m_comSkillShow = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_PoemGalleryPreviewUI.cs

@@ -8,6 +8,7 @@ namespace UI.Poem
     {
         public GComponent target;
         public Controller m_c1;
+        public GGraph m_mask;
         public GLoader m_loaPicture;
         public GButton m_btnback;
         public GComponent m_comHead;
@@ -66,6 +67,7 @@ namespace UI.Poem
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_mask = (GGraph)comp.GetChild("mask");
             m_loaPicture = (GLoader)comp.GetChild("loaPicture");
             m_btnback = (GButton)comp.GetChild("btnback");
             m_comHead = (GComponent)comp.GetChild("comHead");
@@ -80,6 +82,7 @@ namespace UI.Poem
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_mask = null;
             m_loaPicture = null;
             m_btnback = null;
             m_comHead = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_PoemPhotoPreviewUI.cs

@@ -8,7 +8,7 @@ namespace UI.Poem
     {
         public GComponent target;
         public Controller m_c1;
-        public GGraph m_grhBg;
+        public GGraph m_mask;
         public GList m_list;
         public GList m_listTravel;
         public GButton m_btnLeft;
@@ -65,7 +65,7 @@ namespace UI.Poem
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_grhBg = (GGraph)comp.GetChild("grhBg");
+            m_mask = (GGraph)comp.GetChild("mask");
             m_list = (GList)comp.GetChild("list");
             m_listTravel = (GList)comp.GetChild("listTravel");
             m_btnLeft = (GButton)comp.GetChild("btnLeft");
@@ -78,7 +78,7 @@ namespace UI.Poem
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_grhBg = null;
+            m_mask = null;
             m_list = null;
             m_listTravel = null;
             m_btnLeft = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_PoemPhotoSaveUI.cs

@@ -8,7 +8,7 @@ namespace UI.Poem
     {
         public GComponent target;
         public Controller m_c1;
-        public GGraph m_grhBg;
+        public GGraph m_mask;
         public UI_ListPhotoPreviewItem m_personalPhoto;
         public GGraph m_saveImg;
         public GProgressBar m_progress;
@@ -61,7 +61,7 @@ namespace UI.Poem
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_grhBg = (GGraph)comp.GetChild("grhBg");
+            m_mask = (GGraph)comp.GetChild("mask");
             m_personalPhoto = (UI_ListPhotoPreviewItem)UI_ListPhotoPreviewItem.Create(comp.GetChild("personalPhoto"));
             m_saveImg = (GGraph)comp.GetChild("saveImg");
             m_progress = (GProgressBar)comp.GetChild("progress");
@@ -70,7 +70,7 @@ namespace UI.Poem
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_grhBg = null;
+            m_mask = null;
             m_personalPhoto.Dispose();
             m_personalPhoto = null;
             m_saveImg = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_PoemPhotoShareUI.cs

@@ -8,7 +8,7 @@ namespace UI.Poem
     {
         public GComponent target;
         public Controller m_c1;
-        public GGraph m_graBg;
+        public GGraph m_mask;
         public GLoader m_loaBg;
         public GButton m_btnback;
         public GButton m_btnSave;
@@ -62,7 +62,7 @@ namespace UI.Poem
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_graBg = (GGraph)comp.GetChild("graBg");
+            m_mask = (GGraph)comp.GetChild("mask");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnback = (GButton)comp.GetChild("btnback");
             m_btnSave = (GButton)comp.GetChild("btnSave");
@@ -72,7 +72,7 @@ namespace UI.Poem
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_graBg = null;
+            m_mask = null;
             m_loaBg = null;
             m_btnback = null;
             m_btnSave = null;

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

@@ -0,0 +1,22 @@
+using ET;
+using System.Collections;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class ActivityFYJYProxy
+    {
+
+        public static async ETTask<bool> ReqGetActivityGameInfos()
+        {
+            int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.AfternoonLeisure);
+            if (activityId <= 0)
+                return false;
+
+            var response = (S2C_GetActivityGameInfos)await MessageHelper.SendToServer(new C2S_GetActivityGameInfos { ActivityId = activityId });
+            if (!(response is { Error: ErrorCode.ERR_Success })) return false;
+            
+            return true;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/ServerProxy/ActivityFYJYProxy.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 53c86009a7c19a94c87e76600beb44f7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -68,6 +68,7 @@ namespace GFGGame
                     ActivitySProxy.ReqGetActivitySignInfos().Coroutine();
                     await NewYearRedEnvelopeSProxy.ReqGetRedPacketInfo();
                     await ActivityGetYuanXiaoProxy.ReqGetActivityGameInfos();
+                    await ActivityFYJYProxy.ReqGetActivityGameInfos();
                     ActivityDataManager.Instance.todayActivityTips = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropYchmActivity);
                     ActivityDataManager.Instance.todayMonthlyCardTips = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropCzykActivity);
                     EventAgent.DispatchEvent(ConstMessage.RESET_DAILY_DATA);

GameClient/Assets/Game/HotUpdate/Views/ActivityHuaRongDao/ActivityHuaRongDaoEntryView.cs

@@ -28,9 +28,10 @@ namespace GFGGame
 
             _ui.m_btnStart.onClick.Add(OnBtnStartClick);
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
+            _ui.m_btnClose.onClick.Add(OnBtnBackClick);
             InitBtnRule();
 
-            InitIDList();
+            
             _ui.m_scrollPane.m_listBg.itemRenderer = RenderListItem;
             _ui.m_scrollPane.m_listItems.itemRenderer = RenderRewardListItem;
             //_ui.m_scrollPane.m_listBg.onClickItem.Add(OnClickReward);
@@ -53,6 +54,7 @@ namespace GFGGame
 
             _ui.m_hide.Play();
             _activityID = (int)viewData;
+            InitIDList();
             await InitInfo();
 
             if (!isShowing)
@@ -87,10 +89,15 @@ namespace GFGGame
         {
             IDList = new List<int>();
 
+            string gameID = ActivityOpenCfgArray.Instance.GetCfg(_activityID).params5Arr[0];
+            int gameTypeID = int.Parse(gameID.Split('_')[1]);
             HuarongRoadGame[] cfgs = HuarongRoadGameArray.Instance.dataArray;
             foreach (var t in cfgs)
             {
-                IDList.Add(t.id);
+                if(t.subType == gameTypeID)
+                {
+                    IDList.Add(t.id);
+                }
             }
         }
 
@@ -102,6 +109,7 @@ namespace GFGGame
         private async Task InitInfo()
         {
             curLevel = await GetCurLevel(_activityID);
+            _ui.m_activityID.selectedPage = _activityID.ToString();
 
             RoleLimitData limitData;
 
@@ -192,7 +200,8 @@ namespace GFGGame
                 return;
             }
 
-            HuarongRoadGame cfg = HuarongRoadGameArray.Instance.dataArray[curLevel];
+            HuarongRoadGame cfg = HuarongRoadGameArray.Instance.GetCfg(IDList[curLevel]);
+
             var result = await MiniGameProxy.ReqMiniGameStart(cfg.id, cfg.type, _activityID);
             if (!result) return;
 

GameClient/Assets/Game/HotUpdate/Views/ActivityHuaRongDao/ActivityHuaRongDaoView.cs

@@ -88,6 +88,7 @@ namespace GFGGame
             object[] arr = viewData as object[];
             _cfg = (HuarongRoadGame)arr[0];
             _activityID = (int)arr[1];
+            _ui.m_activityID.selectedPage = _activityID.ToString();
 
             RefreshData();
             _cancellationTokenSource = new CancellationTokenSource();

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/ClothingDecompose/ClothingDecomposeView.cs

@@ -49,7 +49,7 @@ namespace GFGGame
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
 
-            _ui.m_bg.url = ResPathUtil.GetBgImgPath("quanping_moren_bg");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("quanping_moren_bg");
 
             _ui.m_listTab.onClickItem.Add((EventContext context) =>
             {

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/MainUI/MainUIView.cs

@@ -111,6 +111,7 @@ namespace GFGGame
             _ui.m_btnTea.target.onClick.Add(OnClickBtnTea);
             _ui.m_btnActivityZCJB.target.onClick.Add(OnClickBtnZCJB);
             _ui.m_btnGetYuanXiao.target.onClick.Add(OnClickBtnGetYuanXiao);
+            _ui.m_btnActivityFYJY.target.onClick.Add(OnClickBtnFYJY);
             _btnLeague.onClick.Add(OnClickBtnLeague);
             _btnStore.onClick.Add(OnClickBtnStore);
             _btnTuJian.onClick.Add(OnClickBtnTuJian);
@@ -278,12 +279,19 @@ namespace GFGGame
                 {
                     RefreshBtnYuanXiaoActivity();
                 }
+
+                result = await ActivityFYJYProxy.ReqGetActivityGameInfos();
+                if (result)
+                {
+                    RefreshBtnActivityFYJY();
+                }
             }
             // 后续活动按钮的刷新检测
             else
             {
                 RefreshBtnNewYearRedEnvelope();
                 RefreshBtnYuanXiaoActivity();
+                RefreshBtnActivityFYJY();
             }
 
         }
@@ -299,6 +307,12 @@ namespace GFGGame
             _ui.m_btnGetYuanXiao.target.visible = ActivityGetYuanXiaoDataManager.Instance.CheckOpen();
         }
 
+        private void RefreshBtnActivityFYJY()
+        {
+            _ui.m_btnActivityFYJY.target.visible 
+                = (ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.AfternoonLeisure) > 0);
+        }
+
         private void AddEffect()
         {
             _effectUIList.Add(EffectUIPool.CreateEffectUI(_ui.m_btnMain.m_holder, "ui_zjm", "ZJM_szl_down_3"));
@@ -1157,6 +1171,7 @@ namespace GFGGame
             CheckAutoShowViews();
             RefreshBtnNewYearRedEnvelope();
             RefreshBtnYuanXiaoActivity();
+            RefreshBtnActivityFYJY();
         }
         private void CheckAutoShowViews()
         {
@@ -1266,5 +1281,10 @@ namespace GFGGame
         {
             ViewManager.Show<ActivityGetYuanXiaoEntryView>();
         }
+
+        private void OnClickBtnFYJY()
+        {
+            ViewManager.Show<ActivityHuaRongDaoEntryView>(5016);
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemPhotoPreView.cs

@@ -33,7 +33,7 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
 
-            _ui.m_grhBg.onClick.Add(OnBtnBackClick);
+            _ui.m_mask.onClick.Add(OnBtnBackClick);
 
             _ui.m_list.SetVirtual();
             _ui.m_list.itemRenderer = RenderListItem;

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemPhotoShareView.cs

@@ -32,7 +32,7 @@ namespace GFGGame
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("xc_bjbj");
 
             _ui.m_btnback.onClick.Add(OnBtnBackClick);
-            _ui.m_graBg.onClick.Add(OnBtnBackClick);
+            _ui.m_mask.onClick.Add(OnBtnBackClick);
             _ui.m_btnSave.onClick.Add(OnBtnSaveClick);
             _ui.m_btnShare.onClick.Add(OnBtnShareClick);
             _ui.m_btnShare.visible = false;

GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_2!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: ee4883bc7954b8a43a3a57e89e50b3bd
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_2.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 662d0f911a389924d86458873ad30140
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_3!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: e88e89b03b2a66d408935403b655bb2b
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_3.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: dc1841433e821034580e6b37bed614c8
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: