Merge remote-tracking branch 'remotes/origin/master' into dev

GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -33,6 +33,10 @@ namespace GFGEditor
         public static string VoiceTargetPath = $"{ResPathUtil.Voice_DIR_PATH}/";
         public static string VoiceMd5FileSaveName = "VoiceMd5";
 
+        private static string[] VideoSrcPaths { get { return new string[] { ResRootPath + "video/" }; } }
+        public static string VideoTargetPath = $"{ResPathUtil.Voice_DIR_PATH}/";
+        public static string VideoMd5FileSaveName = "VideoMd5";
+
         private static string[] CardMusicSrcPaths { get { return new string[] { ResRootPath + "cardMusic/Card/" }; } }
         public static string CardMusicTargetPath = $"{ResPathUtil.SOUND_DIR_PATH}/Card/";
         public static string CardMusicMd5FileSaveName = "CardMusicMd5";
@@ -182,6 +186,9 @@ namespace GFGEditor
             //语音
             EditorUtility.DisplayProgressBar("进度", "正在导入语音", 1);
             ImportRes(VoiceSrcPaths, VoiceTargetPath, VoiceMd5FileSaveName);
+            //视频
+            EditorUtility.DisplayProgressBar("进度", "正在导入视频", 1);
+            ImportRes(VideoSrcPaths, VideoTargetPath, VideoMd5FileSaveName);
             //词牌音乐
             EditorUtility.DisplayProgressBar("进度", "正在导入词牌音乐", 1);
             ImportRes(CardMusicSrcPaths, CardMusicTargetPath, CardMusicMd5FileSaveName);

GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs

@@ -224,6 +224,8 @@ namespace GFGGame
 
         //更新2048游戏关卡状态
         public const string TZFE_GAME_UPDATE = "TZFE_GAME_UPDATE";
-        
+
+        //显示系统公告界面
+        public const string SHOW_SYSTEM_NOTICE = "SHOW_SYSTEM_NOTICE";
     }
 }

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -187,8 +187,8 @@ namespace GFGGame
                     // GameGlobal.isFirstEntry == true 
                     if (!InstanceZonesDataManager.CheckLevelPass(100001001))
                     {
-                        //UICGView.Instance.Show();
-                        StoryController.ShowLevelView(100001001);
+                        UICGView.Instance.Show();
+                        //StoryController.ShowLevelView(100001001);
                     }
                     else
                     {

GameClient/Assets/Game/HotUpdate/Controller/MainController.cs

@@ -18,6 +18,7 @@ namespace GFGGame
                 StoryChapterCfg chapterCfg = _chapterCfgs[i];
                 if (i == _chapterCfgs.Count - 1 && MainStoryDataManager.CheckChapterUnlock(chapterCfg.id))
                 {
+                    MainStoryDataManager.currentChapterCfgId = chapterCfg.id;
                     ViewManager.Show<StoryChapterView>(new object[] { chapterCfg.id, 0 });
                     isOpen = false;
                     return isOpen;
@@ -25,18 +26,29 @@ namespace GFGGame
                 else if (!MainStoryDataManager.CheckChapterUnlock(chapterCfg.id))
                 {
                     StoryChapterCfg chapterTowCfg = _chapterCfgs[Mathf.Max(0, i - 1)];
+                    StoryChapterCfg chaptersuitCfg = _chapterCfgs[Mathf.Max(0, i - 2)];
                     var list = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(chapterTowCfg.type, chapterTowCfg.subType, chapterTowCfg.id);
                     StoryLevelCfg lastLevelCfg = list[list.Count - 1];
                     //这里是当下一章没解锁，但是上一章的最后一关已经通过了
-                    if (lastLevelCfg != null && InstanceZonesDataManager.CheckLevelPass(lastLevelCfg.id))//MainStoryDataManager.CheckLevelUnlock(lastLevelCfg.id))
+                    if (lastLevelCfg != null && InstanceZonesDataManager.CheckLevelPass(lastLevelCfg.id))
+                    {
+                        ViewManager.Show<StoryChapterListView>(new object[] { 0, Mathf.Max(0, chapterCfg.order - 1) });
+                        isOpen = false;
+                        return isOpen;
+                    }
+                    if (StoryController.CheckSuitGot(chaptersuitCfg.suitId))
+                    {
+                        MainStoryDataManager.currentChapterCfgId = chapterCfg.id - 1;
+                        ViewManager.Show<StoryChapterView>(new object[] { chapterCfg.id - 1, 0 });
+                        isOpen = false;
+                        return isOpen;
+                    }
+                    else
                     {
                         ViewManager.Show<StoryChapterListView>(new object[] { 0, Mathf.Max(0, chapterCfg.order - 1) });
                         isOpen = false;
                         return isOpen;
                     }
-                    ViewManager.Show<StoryChapterView>(new object[] { chapterCfg.id - 1, 0 });
-                    isOpen = false;
-                    return isOpen;
                 }
             }
             return isOpen;

GameClient/Assets/Game/HotUpdate/Data/DressUpMenuItemDataManager.cs

@@ -82,7 +82,7 @@ namespace GFGGame
                 {
                     AddNewDressItem(value);
                     DressUpMenuSuitDataManager.CheckItemInSuit(value);
-                    PreloadManager.Instance.PreloadDressUpRes(value);
+                    PreloadManager.Instance.PreloadDressUpRes(value, ResType.Both);
                 }
                 else
                 {

GameClient/Assets/Game/HotUpdate/Data/FriendDataManager.cs

@@ -109,7 +109,16 @@ namespace GFGGame
             if (!sort) return;
             _list.Sort((long a, long b) =>
             {
-                long count = _friendDic[b].roleInfo.offlineTimeSec - _friendDic[b].roleInfo.offlineTimeSec;
+                if(_friendDic[a].roleInfo.offlineTimeSec == 0)
+                {
+                    return -1;
+                }
+                if(_friendDic[b].roleInfo.offlineTimeSec == 0)
+                {
+                    return 1;
+                }
+
+                long count = _friendDic[a].roleInfo.offlineTimeSec - _friendDic[b].roleInfo.offlineTimeSec;
                 if (count > 0)
                 {
                     return -1;

GameClient/Assets/Game/HotUpdate/DressUp/SceneController.cs

@@ -113,6 +113,7 @@ namespace GFGGame
             if (value == "0")
             {
                 SpriteHelper.RemoveSpriteFrom(spr);
+                SpriteHelper.RemoveSpriteFrom(sprFace);
             }
             else
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ActivityMainTipsUI.cs

@@ -11,7 +11,6 @@ namespace UI.ActivityMain
         public GLoader m_icon;
         public GTextField m_activityDesc;
         public GLoader m_notTips;
-        public GTextField m_activityTime;
         public GLoader m_backBtn;
         public Transition m_t0;
         public Transition m_t1;
@@ -67,7 +66,6 @@ namespace UI.ActivityMain
             m_icon = (GLoader)comp.GetChild("icon");
             m_activityDesc = (GTextField)comp.GetChild("activityDesc");
             m_notTips = (GLoader)comp.GetChild("notTips");
-            m_activityTime = (GTextField)comp.GetChild("activityTime");
             m_backBtn = (GLoader)comp.GetChild("backBtn");
             m_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
@@ -79,7 +77,6 @@ namespace UI.ActivityMain
             m_icon = null;
             m_activityDesc = null;
             m_notTips = null;
-            m_activityTime = null;
             m_backBtn = null;
             m_t0 = null;
             m_t1 = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ActivityZCJB.cs

@@ -13,6 +13,8 @@ namespace UI.ActivityMain
         public GTextField m_activityTime;
         public GLoader m_backBtn;
         public GLoader m_viewBtn;
+        public GGraph m_bgEffect;
+        public GGraph m_btnEffect;
         public const string URL = "ui://4ht5s77uqbf4l";
         public const string PACKAGE_NAME = "ActivityMain";
         public const string RES_NAME = "ActivityZCJB";
@@ -66,6 +68,8 @@ namespace UI.ActivityMain
             m_activityTime = (GTextField)comp.GetChild("activityTime");
             m_backBtn = (GLoader)comp.GetChild("backBtn");
             m_viewBtn = (GLoader)comp.GetChild("viewBtn");
+            m_bgEffect = (GGraph)comp.GetChild("bgEffect");
+            m_btnEffect = (GGraph)comp.GetChild("btnEffect");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -75,6 +79,8 @@ namespace UI.ActivityMain
             m_activityTime = null;
             m_backBtn = null;
             m_viewBtn = null;
+            m_bgEffect = null;
+            m_btnEffect = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -9,6 +9,7 @@ namespace UI.LuckyBox
         public GComponent target;
         public GLoader m_loaRes;
         public GGraph m_holder;
+        public GLoader m_loaTitle;
         public const string URL = "ui://drx9d1uso4m7tf6";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComModelRes";
@@ -58,11 +59,13 @@ namespace UI.LuckyBox
         {
             m_loaRes = (GLoader)comp.GetChild("loaRes");
             m_holder = (GGraph)comp.GetChild("holder");
+            m_loaTitle = (GLoader)comp.GetChild("loaTitle");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaRes = null;
             m_holder = null;
+            m_loaTitle = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -29,6 +29,11 @@ namespace UI.Main
         public GLoader m_switchChapter;
         public GTextField m_ZCJBTimeText;
         public GGroup m_ActivityZCJB;
+        public GLoader m_suitBg;
+        public GTextField m_suitText;
+        public GLoader m_suitIcon;
+        public GTextField m_suitNum;
+        public GGroup m_targetSuit;
         public Transition m_t0;
         public const string URL = "ui://mfvz4q8km7n51u";
         public const string PACKAGE_NAME = "Main";
@@ -99,6 +104,11 @@ namespace UI.Main
             m_switchChapter = (GLoader)comp.GetChild("switchChapter");
             m_ZCJBTimeText = (GTextField)comp.GetChild("ZCJBTimeText");
             m_ActivityZCJB = (GGroup)comp.GetChild("ActivityZCJB");
+            m_suitBg = (GLoader)comp.GetChild("suitBg");
+            m_suitText = (GTextField)comp.GetChild("suitText");
+            m_suitIcon = (GLoader)comp.GetChild("suitIcon");
+            m_suitNum = (GTextField)comp.GetChild("suitNum");
+            m_targetSuit = (GGroup)comp.GetChild("targetSuit");
             m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
@@ -129,6 +139,11 @@ namespace UI.Main
             m_switchChapter = null;
             m_ZCJBTimeText = null;
             m_ActivityZCJB = null;
+            m_suitBg = null;
+            m_suitText = null;
+            m_suitIcon = null;
+            m_suitNum = null;
+            m_targetSuit = null;
             m_t0 = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/HotUpdateDriver.cs

@@ -45,11 +45,20 @@ namespace GFGGame
             }
         }
 
+        private float pauseTime;
+
         private void OnApplicationPause(bool pause)
         {
-            if(!pause)
+            if(pause)
+            {
+                pauseTime = Time.realtimeSinceStartup;
+            }
+            else
             {
-                StartCoroutine(CheckVersion(VersionController.DefaultPackage));
+                if(Time.realtimeSinceStartup - pauseTime > 300 || LauncherConfig.netType == LauncherConfig.EnumNetType.LOCAL)
+                {
+                    StartCoroutine(CheckVersion(VersionController.DefaultPackage));
+                }
             }
         }
 

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

@@ -1,5 +1,6 @@
 using GFGGame;
 using ET;
+using System.Collections.Generic;
 
 namespace ET
 {
@@ -24,6 +25,18 @@ namespace ET
             roleInfo.roleLv = message.RoleInfo.RoleLvl;
             roleInfo.roleName = message.RoleInfo.RoleName;
             roleInfo.offlineTimeSec = message.RoleInfo.OfflineTimeSec;
+            roleInfo.headId = message.RoleInfo.HeadItemId;
+            roleInfo.headBorderId = message.RoleInfo.HeadBorderItemId;
+            roleInfo.leagueName = message.RoleInfo.LeagueName;
+            roleInfo.itemList = new List<int>();
+            for(int i=0;i< message.RoleInfo.ItemList.Count; i++)
+            {
+                roleInfo.itemList.Add(message.RoleInfo.ItemList[i]);
+            }
+            roleInfo.suitCollect = message.RoleInfo.SuitCollect;
+            roleInfo.cardCollect = message.RoleInfo.CardCollect;
+            roleInfo.achievementTaskCollect = message.RoleInfo.AchievementTaskCollect;
+            roleInfo.roleExp = message.RoleInfo.RoleExp;
 
             FriendDataManager.Instance.ChangeFriendInfo(roleInfo);
             EventAgent.DispatchEvent(ConstMessage.FRIEND_REFRESH);

GameClient/Assets/Game/HotUpdate/UGUI/UICGView.cs

@@ -4,7 +4,6 @@ using UnityEngine.Video;
 using YooAsset;
 using GFGGame.Launcher;
 using System.Collections;
-using System;
 
 namespace GFGGame
 {
@@ -16,7 +15,9 @@ namespace GFGGame
         private AssetOperationHandle handle;
         private RawFileOperationHandle videoHandle;
         private RawImage imgVideo;
-        private Button btnFullScreen;
+        private Button BtnFullScreen;
+        private Button BtnSkipVertical;
+        private Button BtnSkipHorizontal;
         private VideoPlayer videoPlayer;
 
         public void Show()
@@ -32,13 +33,26 @@ namespace GFGGame
             imgVideo.rectTransform.sizeDelta = imgVideoSizeDelta;
             
 
-            btnFullScreen = _ui.transform.Find("BtnFullScreen").GetComponent<Button>();
-            RectTransform rectTransform = btnFullScreen.GetComponent<RectTransform>();
-            Vector2 buttonSizeDelta = rectTransform.sizeDelta;
-            Vector2 anchoredPosition = rectTransform.anchoredPosition;
+            BtnFullScreen = _ui.transform.Find("BtnFullScreen").GetComponent<Button>();
+            RectTransform rectbtnFullScreen = BtnFullScreen.GetComponent<RectTransform>();
+            Vector2 buttonSizeDelta = rectbtnFullScreen.sizeDelta;
+            Vector2 anchoredPosition = rectbtnFullScreen.anchoredPosition;
             anchoredPosition.y = -imgVideoSizeDelta.y / 2 - buttonSizeDelta.y;
-            rectTransform.anchoredPosition = anchoredPosition;
-            btnFullScreen.onClick.AddListener(OnClickBtnFullScreen);
+            rectbtnFullScreen.anchoredPosition = anchoredPosition;
+            BtnFullScreen.onClick.AddListener(OnClickBtnFullScreen);
+
+
+            BtnSkipVertical = _ui.transform.Find("BtnSkipVertical").GetComponent<Button>();
+            RectTransform rectBtnSkipVertical = BtnSkipVertical.GetComponent<RectTransform>();
+            anchoredPosition = rectBtnSkipVertical.anchoredPosition;
+            anchoredPosition.y = rectbtnFullScreen.anchoredPosition.y;
+            rectBtnSkipVertical.anchoredPosition = anchoredPosition;
+            BtnSkipVertical.onClick.AddListener(OnClickrectBtnSkip);
+
+
+            BtnSkipHorizontal = _ui.transform.Find("BtnSkipHorizontal").GetComponent<Button>();
+            BtnSkipHorizontal.gameObject.SetActive(false);
+            BtnSkipHorizontal.onClick.AddListener(OnClickrectBtnSkip);
 
             videoPlayer = _ui.transform.Find("VideoPlayer").GetComponent<VideoPlayer>();
             videoPlayer.loopPointReached += OnVideoEnded;
@@ -55,23 +69,25 @@ namespace GFGGame
         private void OnVideoPrepared(VideoPlayer source)
         {
             videoPlayer.prepareCompleted -= OnVideoPrepared;
-            StartCoroutine(FadeButtonOverTime());
+            StartCoroutine(FadeButtonOverTime(BtnFullScreen));
+            StartCoroutine(FadeButtonOverTime(BtnSkipVertical));
+            StartCoroutine(FadeButtonOverTime(BtnSkipHorizontal));
         }
 
-        IEnumerator FadeButtonOverTime()
+        IEnumerator FadeButtonOverTime(Button btn)
         {
-            Image buttonImage = btnFullScreen.GetComponent<Image>();
-            Text buttonText = btnFullScreen.GetComponentInChildren<Text>();
+            Image buttonImage = btn.GetComponent<Image>();
+            //Image img = btn.GetComponentInChildren<Image>();
             yield return new WaitForSeconds((float)videoPlayer.length - 3f);
             if (buttonImage != null)
             {
                 // 获取初始颜色
                 Color startColor = buttonImage.color;
-                Color startColorText = buttonText.color;
+                //Color startColorText = img.color;
 
                 // 目标颜色，透明度设为 0
                 Color targetColor = new Color(startColor.r, startColor.g, startColor.b, 0f);
-                Color targetColorText = new Color(startColorText.r, startColorText.g, startColorText.b, 0f);
+                //Color targetColorText = new Color(startColorText.r, startColorText.g, startColorText.b, 0f);
 
                 float fadeDuration = 1f;
                 // 记录开始时间
@@ -82,26 +98,31 @@ namespace GFGGame
                     // 在一定时间内逐渐插值颜色
                     float t = (Time.time - startTime) / fadeDuration;
                     buttonImage.color = Color.Lerp(startColor, targetColor, t);
-                    buttonText.color = Color.Lerp(startColorText, targetColorText, t);
+                    //img.color = Color.Lerp(startColorText, targetColorText, t);
                     yield return null; // 等待下一帧
                 }
 
                 // 设置最终颜色，确保透明度为 0
                 buttonImage.color = targetColor;
-                buttonText.color = targetColorText;
+                //img.color = targetColorText;
             }
         }
 
         private void OnVideoEnded(VideoPlayer source)
         {
-            videoPlayer.loopPointReached -= OnVideoEnded;
             this.Hide();
-            StoryController.ShowLevelView(100001001);
+        }
+
+        private void OnClickrectBtnSkip()
+        {
+            Hide();
         }
 
         private void OnClickBtnFullScreen()
         {
-            btnFullScreen.gameObject.SetActive(false);
+            BtnSkipVertical.gameObject.SetActive(false);
+            BtnSkipHorizontal.gameObject.SetActive(true);
+            BtnFullScreen.gameObject.SetActive(false);
             imgVideo.rectTransform.localRotation = Quaternion.Euler(0, 0, -90);
             Vector2 imgVideoSizeDelta = imgVideo.rectTransform.sizeDelta;
             imgVideoSizeDelta.y = Screen.width;
@@ -112,16 +133,24 @@ namespace GFGGame
                 videoPlayer.Stop();
                 videoPlayer.Play();
             }
+            RectTransform rectBtnSkipVertical = BtnSkipHorizontal.GetComponent<RectTransform>();
+            Vector2 anchoredPosition = rectBtnSkipVertical.anchoredPosition;
+            anchoredPosition.y = (Screen.height - imgVideoSizeDelta.x)/2 + rectBtnSkipVertical.sizeDelta.x/2;
+            rectBtnSkipVertical.anchoredPosition = anchoredPosition;
         }
 
         public void Hide()
         {
+            StopAllCoroutines();
+            videoPlayer.Stop();
+            videoPlayer.loopPointReached -= OnVideoEnded;
             handle.Release();
             handle = null;
             videoHandle.Release();
             videoHandle = null;
             GameObject.Destroy(_ui);
             _ui = null;
+            StoryController.ShowLevelView(100001001);
         }
     }
 }

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("qrhd_banner_yxzy");
             _ui.m_DayList.itemRenderer = DayListRenderer;
             _ui.m_comTaskList.m_TaskList.itemRenderer = TaskListRenderer;
             _ui.m_tip.onClick.Add(RuleController.ShowRuleView);

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityMainTipsView.cs

@@ -75,7 +75,6 @@ namespace GFGGame
                 return;
             }
             long curTime = TimeHelper.ServerNow();
-            _ui.m_activityTime.text = string.Format("剩余{0}", TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime));
             _ui.m_icon.url = ResPathUtil.GetActivityPath(showActivity[0].ActivityNotice,"png");
             _ui.m_activityDesc.visible = false;
         }
@@ -170,13 +169,15 @@ namespace GFGGame
             {
                 jumpIndex = adCfg.jumpParamArr[0];
             }
+            if (adCfg.jumpId == nameof(ClothingSyntheticView))
+            {
+                param = new object[] { adCfg.jumpParamArr[0] };
+            }
 
             if (jumpIndex != 0)
                 ViewManager.Show($"GFGGame.{adCfg.jumpId}", jumpIndex);
             else
                 ViewManager.Show($"GFGGame.{adCfg.jumpId}", param);
         }
-
-
     }
 }

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBChapterView.cs

@@ -125,6 +125,7 @@ namespace GFGGame
             gamey = GameObject.Find("Stage/GRoot/Window - StoryChapterUI/ContentPane/CompChapter/Container/Container");
             _ui.m_chapter.m_compChapterScroll.m_imgBegin.visible = false;
             _ui.m_chapter.m_compChapterScroll.m_nextEffect.visible = false;
+            _ui.m_targetSuit.visible = false;
 
             Timers.inst.StartCoroutine(InitChapter());
 

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBView.cs

@@ -9,9 +9,14 @@ namespace GFGGame
     public class ActivityZCJBView : BaseWindow
     {
         private UI_ActivityZCJB _ui;
+        private EffectUI _effectUI1;
+        private EffectUI _effectUI2;
         public override void Dispose()
         {
-
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+            EffectUIPool.Recycle(_effectUI2);
+            _effectUI2 = null;
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -30,6 +35,9 @@ namespace GFGGame
             _ui.m_rewardBTn.onClick.Add(OnClickShowReward);
             _ui.m_backBtn.onClick.Add(this.Hide);
             _ui.m_btnChange.onClick.Add(this.Hide);
+
+            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_bgEffect, "ui_Activity", "zcjb_All");
+            _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_btnEffect, "ui_Activity", "zcjb_icon");
         }
         protected override void OnShown()
         {

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/MonthlyCardTipsView.cs

@@ -11,7 +11,7 @@ namespace GFGGame
     {
         private UI_MonthlyCardTipsUI _ui;
         private int rewards = 3;
-        private List<int> itemID = new List<int>() { 1000005, 1000004, 5005006 };
+        private List<int> itemID = new List<int>() { 1000005, 1000004, 5005011 };
         private List<string> rarity = new List<string>() {"", "wpk_db_fp", "wpk_db_zx", "wpk_db_dc", "wpk_db_ty" };
         private List<string> rewardNum = new List<string>() { "x1800", "x300", "专属头像框" };
         public override void Dispose()
@@ -72,11 +72,11 @@ namespace GFGGame
             }
             if(index == rewards - 1)
             {
-                item.m_icon.url = "ui://ActivityMain/" + itemCfg.res;
+                item.m_icon.url = ResPathUtil.GetIconPath(itemCfg.res, "png");
             }
             else
             {
-                item.m_icon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
+                item.m_icon.url = ResPathUtil.GetIconPath(itemCfg.res,"png");
             }
             item.m_txtNum.text = rewardNum[index];
             item.target.data = itemCfg;

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

@@ -77,7 +77,7 @@ namespace GFGGame
             {
                 _startInAnim = false;
                 _ui.m_comListCard.m_listCard.scrollPane.ScrollTop();
-                _ui.m_In.Play();
+                //_ui.m_In.Play();
             }
         }
         protected override void OnHide()
@@ -105,7 +105,7 @@ namespace GFGGame
 
         private void FilterItems()
         {
-            _ui.m_Refresh.Play();
+            //_ui.m_Refresh.Play();
             _ui.m_comListCard.m_listCard.scrollPane.ScrollTop();
             UpdateCardList();
         }

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

@@ -39,6 +39,7 @@ namespace GFGGame
         private ValueBarController _valueBarController;
         private GImage _imgSelected;
         private int _suitId;
+        private int _chapterID;
         private int _itemId;
         private int[] _items;
         private int _selectedItemId;
@@ -121,10 +122,13 @@ namespace GFGGame
             base.OnShown();
             _suitId = 0;
             _selectedItemId = 0;
+            _chapterID = 0;
             if (this.viewData != null)
             {
                 _suitId = (int)(this.viewData as object[])[0];
                 _selectedItemId = (this.viewData as object[]).Length > 1 ? (int)(this.viewData as object[])[1] : 0;
+                if((this.viewData as object[]).Length > 2)
+                    _chapterID = (int)(this.viewData as object[])[2];
             }
 
             if (DressUpMenuSuitDataManager.chooseClothing > 0)
@@ -144,7 +148,8 @@ namespace GFGGame
             _ui.m_listMaterias.selectedIndex = 0;
             Timers.inst.Remove(CheckGuide);
             _dressUpObjUI.dressUpObj.TakeOffAll();
-
+            if(_chapterID > 0)
+                MainStoryDataManager.currentChapterCfgId = _chapterID;
         }
         protected override void RemoveEventListener()
         {

GameClient/Assets/Game/HotUpdate/Views/Common/Alert/AlertWindow.cs

@@ -54,7 +54,6 @@ namespace GFGGame
             this.SetTips(m_tips);
             this.SetLeftButton(m_isShowLeftButton, m_textLeft);
             this.SetRightButton(m_isShowRightButton, m_textRight);
-
             updateButtonPosition();
             _ui.m_btnLeft.onClick.Add(() =>
             {
@@ -74,6 +73,7 @@ namespace GFGGame
         {
             base.OnShown();
             _ui.target.Center();
+            this.SetShowCheck(false);
             Timers.inst.AddUpdate(CheckGuide);
         }
 

GameClient/Assets/Game/HotUpdate/Views/Common/Controller/LuckyBoxController.cs

@@ -88,10 +88,12 @@ namespace GFGGame
 
             UI_ComModelRes comRes = _comModel.m_comModelRes;
             _comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.bgResArr[_bgIndex]);
+
             if (_luckyBoxCfg.resArr.Length > 0)
             {
                 //comRes.m_loaRes.url = string.Format("ui://LuckyBox/{0}", _luckyBoxCfg.resArr[_modelIndex]);
                 comRes.m_loaRes.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.resArr[_modelIndex]);
+                comRes.m_loaTitle.url = "ui://LuckyBox/" + _luckyBoxCfg.resArr[_modelIndex];
                 comRes.m_loaRes.SetPosition(_luckyBoxCfg.posArr[_modelIndex][0], _luckyBoxCfg.posArr[_modelIndex][1], 1);
 
                 int direction = _luckyBoxCfg.scaleArr[_modelIndex] >= 0 ? 1 : -1;
@@ -175,6 +177,7 @@ namespace GFGGame
 
             UI_ComModel _comModel = UI_ComModel.Proxy(_com);
             _comModel.m_comModelRes.m_loaRes.url = "";
+            _comModel.m_comModelRes.m_loaTitle.url = "";
             UI_ComModel.ProxyEnd();
             Timers.inst.Remove(UpdateTime);
         }

GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographSaveView.cs

@@ -172,7 +172,7 @@ namespace GFGGame
 
         private async void OnClickBtnSavePhoto()
         {
-
+            if (GuideDataManager.currentGuideId > 0) return;//引导时不保存
             if (PoemPhotoDataManager.Instance.PersonalPhotoInfos.Count >= GlobalCfgArray.globalCfg.maxPhotoCount)
             {
                 PromptController.Instance.ShowFloatTextPrompt("照片数量已达上限");
@@ -226,7 +226,7 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(_ui.m_btnSavePhoto, ConstGuideId.FREEDOM_DRESS, 9, "");
+            GuideController.TryGuide(_ui.m_btnSavePhoto, ConstGuideId.FREEDOM_DRESS, 9, "下次点击这里可以保存至相册哦！");
             GuideController.TryGuide(_ui.m_btnClose, ConstGuideId.FREEDOM_DRESS, 10, "");
             GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 10);
 

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitGuideView.cs

@@ -97,6 +97,7 @@ namespace GFGGame
             for (int j = 0; j < _ui.m_suitTypeList.numItems; j++)
             {
                 RedDotController.Instance.SetComRedDot(_ui.m_suitTypeList.GetChildAt(j).asCom, false);
+
                 for (int i = 0; i < _menuTypeAllDataDic[j + 1].Count; i++)
                 {
                     bool red = RedDotDataManager.Instance.GetSuitGuideRed(_menuTypeAllDataDic[j + 1][i]);

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

@@ -69,7 +69,12 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _friendRoleId = this.viewData == null ? 0 : (long)this.viewData;
+
+            if (backRefresh)
+            {
+                _friendRoleId = this.viewData == null ? 0 : (long)this.viewData;
+            }
+            
             if (_sceneObject == null)
             {
                 CustomSuitData customSuit = CustomSuitDataManager.GetSuitList(CustomSuitDataManager.currentIndex);
@@ -308,12 +313,12 @@ namespace GFGGame
         {
             if (_friendRoleId == 0)
             {
-                ViewManager.Show<RoleInfoView>();
+                ViewManager.Show<RoleInfoView>(null,false,false);
             }
             else
             {
                 FriendInfoData friendInfoData = FriendDataManager.Instance.GetFriendDataById(_friendRoleId);
-                ViewManager.Show<OtherRoleInfoView>(new object[] { friendInfoData.roleInfo, friendInfoData.roleDetailInfo });
+                ViewManager.Show<OtherRoleInfoView>(new object[] { friendInfoData.roleInfo, friendInfoData.roleDetailInfo },false,false);
             }
         }
         private void OnBtnAddClick()

GameClient/Assets/Game/HotUpdate/Views/Login/LoginView.cs

@@ -82,8 +82,14 @@ namespace GFGGame
 
             if(GameConfig.openTime > TimeHelper.ClientNow())
             {
-                AlertUI.Show("未到开放时间！")
-                        .SetLeftButton(true, "稍后再试", (obj) =>
+                var date = DateTimeUtil.LongTimeStampToDateTime(GameConfig.openTime);
+                string minuteText = "";
+                if(date.Minute > 0)
+                {
+                    minuteText = date.Minute + "分";
+                }
+                AlertUI.Show($"    亲爱的研究员，万世镜将于{date.Year}年{date.Month}月{date.Day}日{date.Hour}点{minuteText}开放，敬请期待！")
+                        .SetLeftButton(true, "好的", (obj) =>
                         {
                             Application.Quit();
                         });

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

@@ -449,8 +449,8 @@ namespace GFGGame
                             _AnimationWait = false;
                         }
 
-                        //判断是否需要显示集齐套装界面(需要的时候晚5个定时器时间)
-                        if (count < totalCount || (count >= totalCount && _countShow > 7))
+                        //判断是否需要显示集齐套装界面(需要的时候晚3个定时器时间)
+                        if (count < totalCount || (count >= totalCount && _countShow > 5))
                         {
                             _recordTurnIndex.Add(index);
                             _countShow = 0;

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

@@ -9,7 +9,7 @@ using System.Linq;
 
 namespace GFGGame
 {
-    public class LuckyBoxView : BaseView
+    public class LuckyBoxView : BaseWindow
     {
         private UI_LuckyBoxUI _ui;
         private ValueBarController _valueBarController;

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

@@ -41,7 +41,7 @@ namespace GFGGame
                 }
                 //, new object[] { typeof(StoryChapterView).FullName, MainStoryDataManager.currentChapterCfgId }
                 bool skipable = MainStoryDataManager.CheckCurrentLevelPass();
-                ViewManager.Show<StoryDialogView>(new object[] { levelCfg.storyStartID, skipable, new OnCompleteStoryDialogCall(OnCompleteChapterStoryDialog),null,false }, true);
+                ViewManager.Show<StoryDialogView>(new object[] { levelCfg.storyStartID, skipable, new OnCompleteStoryDialogCall(OnCompleteChapterStoryDialog),null,false }, true,false);
             }
         }
 

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

@@ -122,7 +122,8 @@ namespace GFGGame
             }
             else
             {
-                if (MainStoryDataManager.CheckChapterUnlock(chapterID))
+                StoryChapterCfg previousChapterCfg = _chapterCfgs[Mathf.Max(0, index - 1)];
+                if (MainStoryDataManager.CheckChapterUnlock(chapterID) && StoryController.CheckSuitGot(previousChapterCfg.suitId))
                 {
                     //if (chapterIndex == chapterCfg.order)
                     //{
@@ -130,7 +131,8 @@ namespace GFGGame
                     //}
                     //else
                     //{
-                        ViewManager.Show<StoryChapterView>(new object[] { chapterID, _ui.m_listType.selectedIndex });
+                    MainStoryDataManager.currentChapterCfgId = chapterID;
+                    ViewManager.Show<StoryChapterView>(new object[] { chapterID, _ui.m_listType.selectedIndex });
                         this.Hide();
                     //}
 
@@ -254,11 +256,12 @@ namespace GFGGame
                 int index = i - 1;
                 int chapterID = (int)listItem.target.data;
                 StoryChapterCfg chapterCfg = _chapterCfgs[index];
+                StoryChapterCfg previousChapterCfg = _chapterCfgs[Mathf.Max(0, index - 1)];
                 int starCountChapter = InstanceZonesDataManager.GetChapterStarCount(chapterCfg.id, chapterCfg.type, chapterCfg.subType);
                 listItem.m_content.m_txtCurProgress.text = starCountChapter.ToString();
                 listItem.m_content.m_txtMaxProgress.text = chapterCfg.bonusStar3.ToString();
                 _ui.m_listChapter.GetChildAt(i).visible = false;
-                if (MainStoryDataManager.CheckChapterUnlock(chapterCfg.id))
+                if (MainStoryDataManager.CheckChapterUnlock(chapterCfg.id) && StoryController.CheckSuitGot(previousChapterCfg.suitId))
                 {
                     listItem.m_content.m_imgLockBg.visible = false;
                     listItem.m_content.m_txtLockDesc.visible = false;
@@ -274,7 +277,7 @@ namespace GFGGame
                     }
                     else
                     {
-                        if (MainStoryDataManager.CheckChapterIsHard(chapterID) && !MainStoryDataManager.CheckNeedChapterPass(chapterID, out var needChapterId))
+                        if (MainStoryDataManager.CheckChapterIsHard(chapterID) && !MainStoryDataManager.CheckNeedChapterPass(chapterID, out var needChapterId) && StoryController.CheckSuitGot(needChapterId))
                         {
                             var needChapterCfg = StoryChapterCfgArray.Instance.GetCfg(needChapterId);
                             listItem.m_content.m_txtLockDesc.text = $"通关第{needChapterCfg.order}章普通剧情后开启";

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

@@ -29,7 +29,7 @@ namespace GFGGame
         private float indexY;
         private GameObject gamey;
         //特效类型数组,这里后面可以二维数组，放向左和向右的
-        private string[] effArray = new string[2]{ "ZJ_JuQing","ZJ_ZD"  };
+        private string[] effArray = new string[2] { "ZJ_JuQing", "ZJ_ZD" };
 
         private int currentDifficulty;
         public override void Dispose()
@@ -83,6 +83,7 @@ namespace GFGGame
             _ui.m_btnHome.onClick.Add(OnClickBtnHome);
             _ui.m_switchChapter.onClick.Add(OnClickSwitchBack);
             _ui.m_chapter.m_compChapterScroll.m_imgBegin.onClick.Add(OnClickNext);
+            _ui.m_suitIcon.onClick.Add(OnClickGotoView);
             _ui.m_bonusBox1.target.onClick.Add(() =>
             {
                 OnClickBonusBox(_ui.m_bonusBox1, 0);
@@ -114,6 +115,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+
             _ui.target.touchable = false;
             SuitFosterProxy.SendGetSuitInfos().Coroutine();
             MusicManager.Instance.PlayCroutine(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
@@ -121,13 +123,58 @@ namespace GFGGame
             {
                 _chapterID = (int)(this.viewData as object[])[0];
                 currentDifficulty = (int)(this.viewData as object[])[1];
+
+                if (!backRefresh && MainStoryDataManager.currentChapterCfgId != _chapterID)
+                {
+                    _chapterID = MainStoryDataManager.currentChapterCfgId;
+                }
+                else
+                {
+                    MainStoryDataManager.currentChapterCfgId = _chapterID;
+                }
             }
             else
             {
                 _chapterID = (int)this.viewData;
             }
-            MainStoryDataManager.currentChapterCfgId = _chapterID;
 
+            _valueBarController.OnShown();
+            _ui.m_t0.SetHook("canHit", () => { _ui.target.touchable = true; });
+            _ui.m_t0.Play();
+            Timers.inst.AddUpdate(CheckGuide);
+
+            UpdateView();
+
+
+            //
+
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+            _unPasslevelItem = null;
+            _endLevelItem = null;
+            // _ui.m_chapter.RemoveChildren(0, 0, true);
+            GRoot.inst.touchable = true;
+            _valueBarController.OnHide();
+            Timers.inst.Remove(SetContainerY);
+            Timers.inst.Remove(CheckGuide);
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.NOTICE_MAINSTORY_BOXBONUS_STATE, UpdateBonusBox);
+        }
+        private void OnClickBtnBack()
+        {
+            ViewManager.GoBackFrom(typeof(StoryChapterView).FullName);
+            //GameController.GoBackToMainView();
+        }
+
+        private void UpdateView()
+        {
             //由于这里会切换特效，所以切换界面时进行清空
             EffectUIPool.Recycle(_effectUI2);
             _effectUI2 = null;
@@ -142,14 +189,13 @@ namespace GFGGame
             gamey = GameObject.Find("Stage/GRoot/Window - StoryChapterUI/ContentPane/CompChapter/Container/Container");
             _ui.m_chapter.m_compChapterScroll.m_imgBegin.visible = false;
             _ui.m_chapter.m_compChapterScroll.m_nextEffect.visible = false;
+            _ui.m_targetSuit.visible = false;
 
             Timers.inst.StartCoroutine(InitChapter());
 
             //Timers.inst.Add(0.2f, 1, SetContainerY);
             _ui.m_chapter.m_compChapterScroll.target.y = 1;
 
-            _valueBarController.OnShown();
-
             //招财进宝活动
             if (chapterCfg.subType == 2)
             {
@@ -174,42 +220,18 @@ namespace GFGGame
                 _ui.m_bonusBox.visible = true;
                 _ui.m_ActivityZCJB.visible = false;
             }
-            //
-            _ui.m_t0.SetHook("canHit",()=> { _ui.target.touchable = true; });
-            _ui.m_t0.Play();
-            
-
-            Timers.inst.AddUpdate(CheckGuide);
-
         }
 
-        protected override void OnHide()
-        {
-            base.OnHide();
-            _unPasslevelItem = null;
-            _endLevelItem = null;
-            // _ui.m_chapter.RemoveChildren(0, 0, true);
-            GRoot.inst.touchable = true;
-            _valueBarController.OnHide();
-            Timers.inst.Remove(SetContainerY);
-            Timers.inst.Remove(CheckGuide);
-        }
 
-        protected override void RemoveEventListener()
-        {
-            base.RemoveEventListener();
-            EventAgent.RemoveEventListener(ConstMessage.NOTICE_MAINSTORY_BOXBONUS_STATE, UpdateBonusBox);
-        }
-        private void OnClickBtnBack()
-        {
-            ViewManager.GoBackFrom(typeof(StoryChapterView).FullName);
-            //GameController.GoBackToMainView();
-        }
-        
         private void OnClickSwitchBack()
         {
             Timers.inst.Remove(SetContainerY);
-            ViewManager.Show<StoryChapterListView>(new object[] {Mathf.Max(0, currentDifficulty) , newIndex });
+            ViewManager.Show<StoryChapterListView>(new object[] { Mathf.Max(0, currentDifficulty), newIndex });
+        }
+        private void OnClickGotoView()
+        {
+            StoryChapterCfg chapterSuitCfg = StoryChapterCfgArray.Instance.GetCfg(_chapterID);
+            ViewManager.Show<ClothingSyntheticView>(new object[] { chapterSuitCfg.suitId, 0, _chapterID }, false, false);
         }
 
         private void OnClickBtnHome()
@@ -219,23 +241,27 @@ namespace GFGGame
 
         private void OnClickNext()
         {
-            if (MainStoryDataManager.CheckChapterUnlock(_chapterID+1))
+            StoryChapterCfg chapterSuitCfg = StoryChapterCfgArray.Instance.GetCfg(_chapterID);
+            if (MainStoryDataManager.CheckChapterUnlock(_chapterID + 1) && StoryController.CheckSuitGot(chapterSuitCfg.suitId))
             {
                 Timers.inst.Remove(SetContainerY);
-                ViewManager.Show<StoryChapterView>(new object[] { _chapterID+1, currentDifficulty });
+                _chapterID += 1;
+                MainStoryDataManager.currentChapterCfgId = _chapterID;
+                //ViewManager.Show<StoryChapterView>(new object[] { (_chapterID+1), currentDifficulty });
+                UpdateView();
             }
             else
             {
                 StoryChapterCfg chapterCfg = StoryChapterCfgArray.Instance.GetCfg(_chapterID + 1);
-                if (GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl) < chapterCfg.lvl)
+                if (!StoryController.CheckSuitGot(chapterSuitCfg.suitId))
                 {
-                    PromptController.Instance.ShowFloatTextPrompt(string.Format("角色等级达到{0}级开启",chapterCfg.lvl));
+                    PromptController.Instance.ShowFloatTextPrompt("需集齐所需套装");
                 }
-                else
+                else if (GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl) < chapterCfg.lvl)
                 {
-                    PromptController.Instance.ShowFloatTextPrompt("需通关前置关卡");
+                    PromptController.Instance.ShowFloatTextPrompt(string.Format("角色等级达到{0}级开启", chapterCfg.lvl));
                 }
-                
+
             }
         }
 
@@ -268,6 +294,21 @@ namespace GFGGame
             {
                 _ui.m_chapter.m_compChapterScroll.m_imgBegin.visible = true;
                 _ui.m_chapter.m_compChapterScroll.m_nextEffect.visible = true;
+                if (chapterCfg.suitId > 0 && chapterCfg.subType == 0)
+                {
+                    _ui.m_targetSuit.visible = true;
+                    SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(chapterCfg.suitId);
+                    _ui.m_suitIcon.url = ResPathUtil.GetIconPath(suitCfg.res, "png");
+                    _ui.m_suitText.text = suitCfg.name;
+                    int count;
+                    int totalCount;
+                    DressUpMenuSuitDataManager.GetSuitProgressBySuitId(chapterCfg.suitId, out count, out totalCount);
+                    _ui.m_suitNum.text = count + "/" + totalCount;
+                }
+                else
+                {
+                    _ui.m_targetSuit.visible = false;
+                }
             }
 
             //根据困难程度选择显示图片
@@ -313,7 +354,7 @@ namespace GFGGame
                         {
                             levelItem.m_flower.target.visible = true;
                             int starCount = InstanceZonesDataManager.GetStarCountHistory(levelCfg.id);
-                            StoryUtil.UpdateStar(starCount, levelItem.m_flower.target,Mathf.Max(0, currentDifficulty));
+                            StoryUtil.UpdateStar(starCount, levelItem.m_flower.target, Mathf.Max(0, currentDifficulty));
                         }
                     }
                     else
@@ -372,14 +413,14 @@ namespace GFGGame
                         string effName;
                         if (currentDifficulty == 1)
                         {
-                            effName = effArray[levelItem.m_c1.selectedIndex] + "_Bule";  
+                            effName = effArray[levelItem.m_c1.selectedIndex] + "_Bule";
                         }
                         else
                         {
                             effName = effArray[levelItem.m_c1.selectedIndex];
                         }
-                        if(levelItem.m_c1.selectedIndex == 0)
-                        {  
+                        if (levelItem.m_c1.selectedIndex == 0)
+                        {
                             if (levelItem.m_c2.selectedIndex == 0)
                             {
                                 _effectUI2 = EffectUIPool.CreateEffectUI(_effFirst.GetChild("effect_jq_left").asGraph, "ui_zj", effName);
@@ -462,7 +503,7 @@ namespace GFGGame
         }
         private void UpdateBonusBoxStatus(UI_CompBonusBox bonusBox, int index)
         {
-            int status = MainStoryDataManager.GetChapterBonusStatus(MainStoryDataManager.currentChapterCfgId, index);
+            int status = MainStoryDataManager.GetChapterBonusStatus(_chapterID, index);
             bonusBox.m_iconActive.visible = status == ConstBonusStatus.CAN_GET;
             // bonusBox.m_ComRewardEffect.visible = status == ConstBonusStatus.CAN_GET;
             if (status == ConstBonusStatus.GOT)
@@ -481,10 +522,10 @@ namespace GFGGame
             int status = (int)bonusBox.target.data;
             if (status == ConstBonusStatus.CAN_GET)
             {
-                bool got = await MainStorySProxy.GetMainStoryBoxBonus(MainStoryDataManager.currentChapterCfgId, index);
+                bool got = await MainStorySProxy.GetMainStoryBoxBonus(_chapterID, index);
                 if (got)
                 {
-                    List<ItemData> bonusList = MainStoryDataManager.GetChapterBonus(MainStoryDataManager.currentChapterCfgId, index);
+                    List<ItemData> bonusList = MainStoryDataManager.GetChapterBonus(_chapterID, index);
                     if (bonusList != null && bonusList.Count > 0)
                     {
                         BonusController.TryShowBonusList(bonusList);
@@ -518,13 +559,13 @@ namespace GFGGame
              || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_5) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_STAR) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.ARENA_OPEN) <= 0)
-             //|| GuideDataManager.IsGuideFinish(ConstGuideId.CLOTHING_DECOMPOSE) <= 0)
+            //|| GuideDataManager.IsGuideFinish(ConstGuideId.CLOTHING_DECOMPOSE) <= 0)
             {
                 UpdateToCheckGuide(null);
             }
             else
             {
-            Timers.inst.Remove(CheckGuide);
+                Timers.inst.Remove(CheckGuide);
             }
         }
 
@@ -539,7 +580,7 @@ namespace GFGGame
             bool isGuide3 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_1, 3, "来继续我们的旅程吧。");
             GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_1, 3);
 
-            bool isGuide4 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.BUY_CLOTHING, 1, "衣服被弄脏了，到机场更衣室换身衣服吧。");
+            bool isGuide4 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.BUY_CLOTHING, 1, "停电了室内温度升高，点击换身轻薄的服饰吧。");
             bool isGuide5 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.UP_CARD_LV, 1, "点击返回主界面。");
 
             //bool isGuide6 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.CLOTHING_DECOMPOSE, 1, "点击返回主界面。");
@@ -560,7 +601,7 @@ namespace GFGGame
             bool isGuide12 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.ARENA_OPEN, 1, "点击返回主界面。");
 
             //&& !isGuide6 && !isGuide8
-            _ui.m_chapter.target.scrollPane.touchEffect = !isGuide0 && !isGuide1 && !isGuide2 && !isGuide3 && !isGuide4 && !isGuide5 && !isGuide7  && !isGuide9 && !isGuide10;
+            _ui.m_chapter.target.scrollPane.touchEffect = !isGuide0 && !isGuide1 && !isGuide2 && !isGuide3 && !isGuide4 && !isGuide5 && !isGuide7 && !isGuide9 && !isGuide10;
 
         }
         protected override void TryCompleteGuide()

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

@@ -1,3 +1,8 @@
+using System.Collections.Generic;
+using UnityEngine;
+using System.Collections;
+using ET;
+
 namespace GFGGame
 {
     //主线剧情专用类
@@ -42,10 +47,23 @@ namespace GFGGame
                     {
                         StoryChapterCfg lastChapter = StoryChapterCfgArray.Instance.GetCfg(levelCfg.chapterId);
                         ViewManager.Show<StoryChapterListView>(new object[] { index, lastChapter.order }, true);
+                        return;
                     }
                     else
                     {
-                        ViewManager.Show<StoryChapterListView>(new object[] { index , nextStoryChapterCfg.order},true);
+                        //ViewManager.Show<StoryChapterListView>(new object[] { index, nextStoryChapterCfg.order }, true);
+                        StoryChapterCfg previousChapterCfg = StoryChapterCfgArray.Instance.GetCfg(levelCfg.chapterId);
+                        StoryChapterCfg nextChapterCfg = StoryChapterCfgArray.Instance.GetCfg(levelCfg.chapterId + 1);
+                        bool lv = nextChapterCfg.lvl < GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl);
+                        if (CheckSuitGot(previousChapterCfg.suitId) && MainStoryDataManager.CheckChapterUnlock(levelCfg.chapterId) && lv)
+                        {
+                            ViewManager.Show<StoryChapterListView>(new object[] { index, nextStoryChapterCfg.order }, true);
+                        }
+                        else
+                        {
+                            //MainStoryDataManager.currentChapterCfgId = previousChapterCfg.id;
+                            ViewManager.Show<StoryChapterView>(new object[] { previousChapterCfg.id, 0 }, true);
+                        }
                     }
                     
                 }
@@ -61,7 +79,21 @@ namespace GFGGame
             }
         }
 
-
+        public static bool CheckSuitGot(int suitID = 0)
+        {
+            if(suitID == 0)
+            {
+                return true;
+            }
+            int count;
+            int totalCount;
+            DressUpMenuSuitDataManager.GetSuitProgressBySuitId(suitID, out count, out totalCount);
+            if(count >= totalCount)
+            {
+                return true;
+            }
+            return false;
+        }
 
         public static void ShowCardStoryDialog(CardStoryCfg cardStoryCfg, CardData cardData)
         {

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

@@ -146,7 +146,7 @@ namespace GFGGame
             IsTeaParty = (bool)datas[4];
             _autoPlay = _lastStartAutoPlay;
 
-            if (LauncherConfig.netType != LauncherConfig.EnumNetType.LOCAL && !InstanceZonesDataManager.CheckLevelPass(MainStoryDataManager.currentLevelCfgId))
+            if (LauncherConfig.ChannelId != (int)ChannelID.Test && !InstanceZonesDataManager.CheckLevelPass(MainStoryDataManager.currentLevelCfgId))
             {
                 // 临时设置都可以跳过对话
                 skipable = false;

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

@@ -93,7 +93,7 @@ namespace GFGGame
                 DressUpFightType dressUpFightType = new DressUpFightType();
                 dressUpFightType.levelID = _levelID;
                 dressUpFightType.teaPartID = 0;
-                ViewManager.Show<DressUpFightView>(dressUpFightType,true);
+                ViewManager.Show<DressUpFightView>(dressUpFightType,true,false);
                 this.Hide();
             }
             else

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -951,7 +951,7 @@ namespace GFGGame
             if (_ui.m_btnActivityZCJB.target.visible)
             {
                 if (redPointUpdateFrame == 20)
-                    RedDotController.Instance.SetComRedDot(_ui.m_btnActivityZCJB.target, ActivityDataManager.Instance.CheckZCJBRed(), "", -20, -3);
+                    RedDotController.Instance.SetComRedDot(_ui.m_btnActivityZCJB.target, ActivityDataManager.Instance.CheckZCJBRed(), "", -12, 5);
             }
 
             redPointUpdateFrame++;
@@ -1053,6 +1053,8 @@ namespace GFGGame
 
         private void MainUIAnimFinished()
         {
+            // 摘星特效 在未解锁的时候不显示
+            _ui.m_btnZhaiXing.m_holder1.visible = !_ui.m_btnZhaiXing.m_loaLockIcons.visible;
             _ui.m_grpLeagueTips.visible = _btnLeague.visible && LeagueDataManager.Instance.CheckLeagueMainTips() != "";
 
             if (_ui.m_grpLeagueTips.visible)
@@ -1080,7 +1082,7 @@ namespace GFGGame
         private void CheckAutoShowViews()
         {
             if (GameConfig.tsStatus > 0) return; //提审时不显示弹窗
-            if (RoleDataManager.lvl < 10) return;
+            if (RoleDataManager.lvl < 5) return;
             if (GuideDataManager.currentGuideId > 0) return;
             if (GameGlobal.AutoShowCompleted) return;
             if (!GameGlobal.AfterDataInited) return;

GameClient/Assets/Game/HotUpdate/Views/Notice/NoticeSystemShowView.cs

@@ -54,8 +54,10 @@ namespace GFGGame
 
         private void GoBackFrom()
         {
-            ViewManager.GoBackFrom(typeof(NoticeSystemShowView).Name);
-            ViewManager.Show<NoticeView>();
+            EventAgent.DispatchEvent(ConstMessage.SHOW_SYSTEM_NOTICE);
+            //ViewManager.GoBackFrom(typeof(NoticeSystemShowView).Name);
+            //ViewManager.Show<NoticeView>(null,false, false);
+            Hide();
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Notice/NoticeView.cs

@@ -38,7 +38,7 @@ namespace GFGGame
             this.viewCom.Center();
             this.modal = true;
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
-            isReturnView = true;
+            //isReturnView = true;
         }
 
         protected override void OnInit()
@@ -58,22 +58,19 @@ namespace GFGGame
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.NOTICE_SYSTOM_ADD, OnCtrlChange);
             EventAgent.AddEventListener(ConstMessage.NOTICE_SYSTOM_REMOVE, OnCtrlChange);
+            EventAgent.AddEventListener(ConstMessage.SHOW_SYSTEM_NOTICE, UpdateView);
         }
         protected override void OnShown()
         {
             base.OnShown();
 
+            
             if (backRefresh)
             {
-                _ui.m_c1.selectedIndex = 1;
-                _ui.m_listActivity.visible = true;
-                _ui.m_listNotice.visible = true;
-                _ui.m_buttonCom.visible = true;
+                _ui.m_c1.selectedIndex = 0;
             }
 
-            OnCtrlChange();
-            UpdateInfo();
-            UpdateTitleRedDot();
+            UpdateView();
         }
 
         protected override void OnHide()
@@ -85,6 +82,7 @@ namespace GFGGame
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.NOTICE_SYSTOM_ADD, OnCtrlChange);
             EventAgent.RemoveEventListener(ConstMessage.NOTICE_SYSTOM_REMOVE, OnCtrlChange);
+            EventAgent.RemoveEventListener(ConstMessage.SHOW_SYSTEM_NOTICE, UpdateView);
         }
 
         private void AddEffect()
@@ -206,12 +204,12 @@ namespace GFGGame
                 bool result = await NoticeSProxy.ReqSystemNotice(noticeInfo.noticeId);
                 if (result)
                 {
-                    ViewManager.Show<NoticeSystemShowView>(NoticeDataManager.Instance.GetNoticeInfoById(noticeInfo.noticeId));
+                    ViewManager.Show<NoticeSystemShowView>(NoticeDataManager.Instance.GetNoticeInfoById(noticeInfo.noticeId), false, false);
                 }
             }
             else
             {
-                ViewManager.Show<NoticeSystemShowView>(noticeInfo);
+                ViewManager.Show<NoticeSystemShowView>(noticeInfo, false, false);
             }
         }
 
@@ -247,5 +245,16 @@ namespace GFGGame
                 }
             }
         }
+
+        private void UpdateView()
+        {
+            _ui.m_listActivity.visible = true;
+            _ui.m_listNotice.visible = true;
+            _ui.m_buttonCom.visible = true;
+
+            OnCtrlChange();
+            UpdateInfo();
+            UpdateTitleRedDot();
+        }
     }
 }

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -44,7 +44,7 @@ namespace GFGGame
 
         public static void InitScriptCompilation()
         {
-            launcherRootUrl = "https://wsjclient.obs.cn-north-4.myhuaweicloud.com/";
+            launcherRootUrl = "http://cdn.wanshijing.com/";
 #if PT_DEV
             //外网dev版本
             netType = EnumNetType.PUBLIC;

GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_4!a.png.meta → GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_8!a.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0da4325dd4b1baa4a8b19dce7cfe0a5c
+guid: 1179efef6c0604a44a840ce62038780b
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_4.png.meta → GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_8.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: eeb4d50565d3baa4ab61c4ffc5417cd3
+guid: 5af6ff1c9a762fd428df4fda4068be6f
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/Main/Main_atlas0_11!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 01ccfcd5e70249f4cb2bb4d66cfd5b9a
+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/Main/Main_atlas0_11.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: d45accf141beaea43a002079d45a9d95
+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/Main/Main_atlas0_12!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 9ba8b683ecd004a4d85ca067cec09927
+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/Main/Main_atlas0_12.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 534cd3a9a0c30214ea1d7c86a0f79cf4
+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: