Squashed commit of the following:

commit 9da0ebc1fde318dd3daf4a0867214d81b1ed2dcd
Merge: f87b89bc5 293a786f8
Author: hexiaojie <510463496@qq.com>
Date:   Sat Jun 15 16:08:11 2024 +0800

    Merge branch 'master' of http://192.168.2.10:3000/GFG/Client

commit 293a786f8ef617e23efde7169eb86cb70eadd58a
Merge: 7924a44a8 e2aaaab6c
Author: zhangyuqian <2974606464@qq.com>
Date:   Sat Jun 15 15:27:50 2024 +0800

    Merge branch 'master' of http://192.168.2.10:3000/GFG/Client

commit 7924a44a88f4b8c892e110de4a48a9293f3c88b4
Author: zhangyuqian <2974606464@qq.com>
Date:   Sat Jun 15 15:27:37 2024 +0800

    第四周补充提交

commit f87b89bc5bc4f190bc475ebf7d23dabedd20059e
Merge: 712c83bfd d10dbd679
Author: hexiaojie <510463496@qq.com>
Date:   Thu Jun 13 14:30:43 2024 +0800

    Merge branch 'master' of http://192.168.2.10:3000/GFG/Client

commit 712c83bfd8af9b913c969bbf2c533086acec63fb
Author: hexiaojie <510463496@qq.com>
Date:   Thu Jun 13 14:30:31 2024 +0800

    1

commit 2a6535a244981cb80085b980b14d7d578b7c132c
Author: hexiaojie <510463496@qq.com>
Date:   Thu Jun 13 14:29:16 2024 +0800

    master的gradle

commit 2ac2477a93803f217844d7bc66e7df693df61076
Author: hexiaojie <510463496@qq.com>
Date:   Thu Jun 13 14:28:13 2024 +0800

    新的秘钥

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

@@ -1,3 +1,4 @@
+using ET;
 using System.Collections.Generic;
 
 namespace GFGGame
@@ -358,5 +359,34 @@ namespace GFGGame
             }
 
         }
+
+        //根据创角时间判断活动是否开启
+        public bool CheckActivityByRoleTime(int id)
+        {
+           return ActivityGlobalDataManager.Instance.IsActivityOpen(id);
+            //ActivityOpenCfg item = ActivityOpenCfgArray.Instance.GetCfg(id);
+            //if (item == null || item.CreatTime == 0)
+            //{
+            //    return false;
+            //}
+            ////创角时间
+            //long time = GameGlobal.zoneScene.GetComponent<RoleInfosComponent>().GetCurrentRole().CreateTime;
+            //long laterTime = (TimeHelper.ServerNow() - time) / 1000 / 60;
+            //if (laterTime >= item.CreatTime && laterTime < (item.CreatTime + item.OpenLastTime))
+            //{
+            //    return true;
+            //}
+            //return false;
+        }
+        public long GetActivityTime(int id)
+        {
+            ActivityOpenCfg _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(id);
+            int endTime = (_activityCfg.AfterCreatRoleTime * 24 * 60) + _activityCfg.OpenLastTime;
+            endTime = endTime * 60;
+            long time = GameGlobal.zoneScene.GetComponent<RoleInfosComponent>().GetCurrentRole().CreateTime;
+            long laterTime = (TimeHelper.ServerNow() - time)/1000;
+            long curTime = (endTime - laterTime)* 1000;
+            return curTime;
+        }
     }
 }

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

@@ -52,5 +52,20 @@ namespace GFGGame
                 _needUpdateProxyData = value;
             }
         }
+        /// <summary>
+        /// 收纳状态，0：已收纳，1：二级界面
+        /// </summary>
+        private int _StorageStatus = 0;
+        public int StorageStatus
+        {
+            get
+            {
+                return _StorageStatus;
+            }
+            set
+            {
+                _StorageStatus = value;
+            }
+        }
     }
 }

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

@@ -13,33 +13,44 @@ namespace GFGGame
         //当前分享
         public byte[] imageBytes;
         public string outputImagePath; // 输出图片的路径
-
+        public GGroup group;
         public void ShareImage(string imageUrl)
         {
             // 使用ShareSDK或其他分享插件来分享图片URL
             // 这里需要根据具体插件的API来实现分享功能
         }
-        public void CaptureCameraToImage(bool isJump = true)
+        //isJump:是否跳转
+        //isCapture：是否截图
+        public void CaptureCameraToImage(bool isJump = true,bool isCapture = true)
         {
-            Timers.inst.StartCoroutine(CaptureCameraImage(isJump));
+            Timers.inst.StartCoroutine(CaptureCameraImage(isJump,isCapture));
         }
-        private IEnumerator CaptureCameraImage(bool isJump = true)
+        private IEnumerator CaptureCameraImage(bool isJump = true, bool isCapture = true)
         {
+            if (!isJump)
+            {
+                group.visible = false;
+            }
             yield return new WaitForEndOfFrame();
             SetImageTargetPath();
-            Rect rect = new Rect(0, 0, UnityEngine.Screen.width, UnityEngine.Screen.height);
-            Texture2D tex = new Texture2D((int)rect.width, (int)rect.height, TextureFormat.ARGB32, false);//新建一个Texture2D对象
-            tex.ReadPixels(rect, 0, 0);//读取像素，屏幕左下角为0点
-            tex.Apply();//保存像素信息
-
-            // 将Texture2D保存为图片
-            imageBytes = tex.EncodeToPNG();
+            if (isCapture)
+            {
+                Rect rect = new Rect(0, 0, UnityEngine.Screen.width, UnityEngine.Screen.height);
+                Texture2D tex = new Texture2D((int)rect.width, (int)rect.height, TextureFormat.ARGB32, false);//新建一个Texture2D对象
+                tex.ReadPixels(rect, 0, 0);//读取像素，屏幕左下角为0点
+                tex.Apply();//保存像素信息
 
+                // 将Texture2D保存为图片
+                imageBytes = tex.EncodeToPNG();
+            }
             // 保存到磁盘
             File.WriteAllBytes(outputImagePath, imageBytes);
-
             Debug.Log("Camera capture saved to " + outputImagePath);
-            if(isJump)
+            if (!isJump)
+            {
+                group.visible = true;
+            }
+            if (isJump)
             {
                 ViewManager.Show<ShareView>();
             }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivityTeaVisitUI.cs

@@ -13,7 +13,6 @@ namespace UI.ActivityAfternoonTea
         public GTextField m_time;
         public GLoader m_ruleIcon;
         public GList m_taskList;
-        public GImage m_visitNumTips;
         public GTextField m_visitNum;
         public const string URL = "ui://wpsqkdbznjone";
         public const string PACKAGE_NAME = "ActivityAfternoonTea";
@@ -68,7 +67,6 @@ namespace UI.ActivityAfternoonTea
             m_time = (GTextField)comp.GetChild("time");
             m_ruleIcon = (GLoader)comp.GetChild("ruleIcon");
             m_taskList = (GList)comp.GetChild("taskList");
-            m_visitNumTips = (GImage)comp.GetChild("visitNumTips");
             m_visitNum = (GTextField)comp.GetChild("visitNum");
         }
         public void Dispose(bool disposeTarget = false)
@@ -79,7 +77,6 @@ namespace UI.ActivityAfternoonTea
             m_time = null;
             m_ruleIcon = null;
             m_taskList = null;
-            m_visitNumTips = null;
             m_visitNum = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_PhotographSaveUI.cs

@@ -16,6 +16,7 @@ namespace UI.DressUp
         public GButton m_btnShareWX;
         public GButton m_btnShareWB;
         public GButton m_btnSavePhoto;
+        public GButton m_share;
         public const string URL = "ui://mbo439wbi3ix58";
         public const string PACKAGE_NAME = "DressUp";
         public const string RES_NAME = "PhotographSaveUI";
@@ -72,6 +73,7 @@ namespace UI.DressUp
             m_btnShareWX = (GButton)comp.GetChild("btnShareWX");
             m_btnShareWB = (GButton)comp.GetChild("btnShareWB");
             m_btnSavePhoto = (GButton)comp.GetChild("btnSavePhoto");
+            m_share = (GButton)comp.GetChild("share");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -84,6 +86,7 @@ namespace UI.DressUp
             m_btnShareWX = null;
             m_btnShareWB = null;
             m_btnSavePhoto = null;
+            m_share = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnBack0.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_Button6.cs

@@ -2,20 +2,20 @@
 
 using FairyGUI;
 
-namespace UI.CommonGame
+namespace UI.Main
 {
-    public partial class UI_BtnBack0
+    public partial class UI_Button6
     {
         public GButton target;
-        public GLoader m_loaBg;
-        public const string URL = "ui://eg2y0ldpuyuxtj5";
-        public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "BtnBack0";
-        private static UI_BtnBack0 _proxy;
+        public Controller m_c1;
+        public const string URL = "ui://mfvz4q8kxfki9fzp";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "Button6";
+        private static UI_Button6 _proxy;
 
-        public static UI_BtnBack0 Create(GObject gObject = null)
+        public static UI_Button6 Create(GObject gObject = null)
         {
-            var ui = new UI_BtnBack0();
+            var ui = new UI_Button6();
             if(gObject == null)
             	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -24,11 +24,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_BtnBack0 Proxy(GObject gObject = null)
+        public static UI_Button6 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_BtnBack0();
+                _proxy = new UI_Button6();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -55,11 +55,11 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_c1 = comp.GetController("c1");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaBg = null;
+            m_c1 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnBack0.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_Button6.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d055b393d18a66d4c998ef80dc39e70f
+guid: 75dc9a1b4e468974a848dd48cbd5b6a5
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -12,8 +12,8 @@ namespace UI.Main
         public GGraph m_holder;
         public GGraph m_holder1;
         public GLoader m_titleText;
-        public GLoader m_loaLockIcons;
         public GLoader m_iconMain;
+        public GLoader m_loaLockIcons;
         public const string URL = "ui://mfvz4q8kdkxp9fyb";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ButtonModleEffect";
@@ -66,8 +66,8 @@ namespace UI.Main
             m_holder = (GGraph)comp.GetChild("holder");
             m_holder1 = (GGraph)comp.GetChild("holder1");
             m_titleText = (GLoader)comp.GetChild("titleText");
-            m_loaLockIcons = (GLoader)comp.GetChild("loaLockIcons");
             m_iconMain = (GLoader)comp.GetChild("iconMain");
+            m_loaLockIcons = (GLoader)comp.GetChild("loaLockIcons");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -76,8 +76,8 @@ namespace UI.Main
             m_holder = null;
             m_holder1 = null;
             m_titleText = null;
-            m_loaLockIcons = null;
             m_iconMain = null;
+            m_loaLockIcons = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -10,14 +10,16 @@ namespace UI.Main
         public Controller m_type;
         public GLoader m_loaBg;
         public GComponent m_valueBar;
-        public GTextField m_grpLeaguetext;
-        public GGroup m_grpLeagueTips;
         public GGraph m_BottomEffectHolder;
         public UI_ComponentHeadBar m_headBar;
         public GButton m_btnYouJian;
         public GButton m_btnGongGao;
-        public GList m_list;
+        public UI_Button6 m_storageBtn;
         public UI_ButtonChange m_btnChange;
+        public GList m_list;
+        public GTextField m_grpLeaguetext;
+        public GGroup m_grpLeagueTips;
+        public GGroup m_listGroud;
         public UI_BtnModle2 m_btnActivityAfuGift;
         public UI_BtnModle2 m_btnWanShiLi;
         public UI_BtnModle2 m_btnTea;
@@ -32,13 +34,13 @@ namespace UI.Main
         public UI_BtnModle m_btnFirstRecharge;
         public UI_BtnModle m_btnGiftBag1;
         public UI_BtnModle m_btnGiftBag2;
-        public UI_BtnModle1 m_btnShow;
         public UI_ButtonModle1 m_btnZhaiXing;
         public UI_ButtonModleEffect m_btnMain;
         public UI_ButtonModle1 m_btnCiPai;
         public UI_ButtonModle1 m_btnXiuFang;
         public UI_ButtonModle1 m_btnHuanZhuang;
         public UI_ButtonModleEffect m_btnHaiZhiShi;
+        public UI_BtnModle1 m_btnShow;
         public UI_BtnModle1 m_btnDailyWelfare;
         public UI_BtnModle1 m_btnNewPlayerReward;
         public UI_BtnModle3 m_btnSevenReward;
@@ -50,6 +52,7 @@ namespace UI.Main
         public Transition m_openViewAction;
         public Transition m_hide;
         public Transition m_show;
+        public Transition m_storage;
         public const string URL = "ui://mfvz4q8kq08x0";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "MainUI";
@@ -100,14 +103,16 @@ namespace UI.Main
             m_type = comp.GetController("type");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
-            m_grpLeaguetext = (GTextField)comp.GetChild("grpLeaguetext");
-            m_grpLeagueTips = (GGroup)comp.GetChild("grpLeagueTips");
             m_BottomEffectHolder = (GGraph)comp.GetChild("BottomEffectHolder");
             m_headBar = (UI_ComponentHeadBar)UI_ComponentHeadBar.Create(comp.GetChild("headBar"));
             m_btnYouJian = (GButton)comp.GetChild("btnYouJian");
             m_btnGongGao = (GButton)comp.GetChild("btnGongGao");
-            m_list = (GList)comp.GetChild("list");
+            m_storageBtn = (UI_Button6)UI_Button6.Create(comp.GetChild("storageBtn"));
             m_btnChange = (UI_ButtonChange)UI_ButtonChange.Create(comp.GetChild("btnChange"));
+            m_list = (GList)comp.GetChild("list");
+            m_grpLeaguetext = (GTextField)comp.GetChild("grpLeaguetext");
+            m_grpLeagueTips = (GGroup)comp.GetChild("grpLeagueTips");
+            m_listGroud = (GGroup)comp.GetChild("listGroud");
             m_btnActivityAfuGift = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityAfuGift"));
             m_btnWanShiLi = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnWanShiLi"));
             m_btnTea = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnTea"));
@@ -122,13 +127,13 @@ namespace UI.Main
             m_btnFirstRecharge = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnFirstRecharge"));
             m_btnGiftBag1 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag1"));
             m_btnGiftBag2 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag2"));
-            m_btnShow = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnShow"));
             m_btnZhaiXing = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnZhaiXing"));
             m_btnMain = (UI_ButtonModleEffect)UI_ButtonModleEffect.Create(comp.GetChild("btnMain"));
             m_btnCiPai = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnCiPai"));
             m_btnXiuFang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnXiuFang"));
             m_btnHuanZhuang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnHuanZhuang"));
             m_btnHaiZhiShi = (UI_ButtonModleEffect)UI_ButtonModleEffect.Create(comp.GetChild("btnHaiZhiShi"));
+            m_btnShow = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnShow"));
             m_btnDailyWelfare = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnDailyWelfare"));
             m_btnNewPlayerReward = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnNewPlayerReward"));
             m_btnSevenReward = (UI_BtnModle3)UI_BtnModle3.Create(comp.GetChild("btnSevenReward"));
@@ -140,22 +145,26 @@ namespace UI.Main
             m_openViewAction = comp.GetTransition("openViewAction");
             m_hide = comp.GetTransition("hide");
             m_show = comp.GetTransition("show");
+            m_storage = comp.GetTransition("storage");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_type = null;
             m_loaBg = null;
             m_valueBar = null;
-            m_grpLeaguetext = null;
-            m_grpLeagueTips = null;
             m_BottomEffectHolder = null;
             m_headBar.Dispose();
             m_headBar = null;
             m_btnYouJian = null;
             m_btnGongGao = null;
-            m_list = null;
+            m_storageBtn.Dispose();
+            m_storageBtn = null;
             m_btnChange.Dispose();
             m_btnChange = null;
+            m_list = null;
+            m_grpLeaguetext = null;
+            m_grpLeagueTips = null;
+            m_listGroud = null;
             m_btnActivityAfuGift.Dispose();
             m_btnActivityAfuGift = null;
             m_btnWanShiLi.Dispose();
@@ -182,8 +191,6 @@ namespace UI.Main
             m_btnGiftBag1 = null;
             m_btnGiftBag2.Dispose();
             m_btnGiftBag2 = null;
-            m_btnShow.Dispose();
-            m_btnShow = null;
             m_btnZhaiXing.Dispose();
             m_btnZhaiXing = null;
             m_btnMain.Dispose();
@@ -196,6 +203,8 @@ namespace UI.Main
             m_btnHuanZhuang = null;
             m_btnHaiZhiShi.Dispose();
             m_btnHaiZhiShi = null;
+            m_btnShow.Dispose();
+            m_btnShow = null;
             m_btnDailyWelfare.Dispose();
             m_btnDailyWelfare = null;
             m_btnNewPlayerReward.Dispose();
@@ -213,6 +222,7 @@ namespace UI.Main
             m_openViewAction = null;
             m_hide = null;
             m_show = null;
+            m_storage = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -26,6 +26,7 @@ namespace UI.Main
         public GGroup m_comPlayName;
         public GGraph m_mask;
         public GGraph m_effect;
+        public GLoader m_eyeOpen;
         public Transition m_t0;
         public Transition m_showMask;
         public Transition m_hideMask;
@@ -98,6 +99,7 @@ namespace UI.Main
             m_comPlayName = (GGroup)comp.GetChild("comPlayName");
             m_mask = (GGraph)comp.GetChild("mask");
             m_effect = (GGraph)comp.GetChild("effect");
+            m_eyeOpen = (GLoader)comp.GetChild("eyeOpen");
             m_t0 = comp.GetTransition("t0");
             m_showMask = comp.GetTransition("showMask");
             m_hideMask = comp.GetTransition("hideMask");
@@ -130,6 +132,7 @@ namespace UI.Main
             m_comPlayName = null;
             m_mask = null;
             m_effect = null;
+            m_eyeOpen = null;
             m_t0 = null;
             m_showMask = null;
             m_hideMask = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Share/UI_ShareUI.cs

@@ -10,9 +10,15 @@ namespace UI.Share
         public GGraph m_mask;
         public GImage m_icon;
         public GLoader m_CRCodeIcon;
+        public GComponent m_head;
+        public GTextField m_nameText;
+        public GTextField m_levelText;
         public GButton m_btnShare;
         public GButton m_btnShareWX;
         public GButton m_btnShareWB;
+        public GButton m_btnShareQQ;
+        public GButton m_btnShareQQZone;
+        public GButton m_btnShareDouYin;
         public GGroup m_shareGrade;
         public GButton m_btnClose;
         public const string URL = "ui://1f45z9smxfki0";
@@ -65,9 +71,15 @@ namespace UI.Share
             m_mask = (GGraph)comp.GetChild("mask");
             m_icon = (GImage)comp.GetChild("icon");
             m_CRCodeIcon = (GLoader)comp.GetChild("CRCodeIcon");
+            m_head = (GComponent)comp.GetChild("head");
+            m_nameText = (GTextField)comp.GetChild("nameText");
+            m_levelText = (GTextField)comp.GetChild("levelText");
             m_btnShare = (GButton)comp.GetChild("btnShare");
             m_btnShareWX = (GButton)comp.GetChild("btnShareWX");
             m_btnShareWB = (GButton)comp.GetChild("btnShareWB");
+            m_btnShareQQ = (GButton)comp.GetChild("btnShareQQ");
+            m_btnShareQQZone = (GButton)comp.GetChild("btnShareQQZone");
+            m_btnShareDouYin = (GButton)comp.GetChild("btnShareDouYin");
             m_shareGrade = (GGroup)comp.GetChild("shareGrade");
             m_btnClose = (GButton)comp.GetChild("btnClose");
         }
@@ -76,9 +88,15 @@ namespace UI.Share
             m_mask = null;
             m_icon = null;
             m_CRCodeIcon = null;
+            m_head = null;
+            m_nameText = null;
+            m_levelText = null;
             m_btnShare = null;
             m_btnShareWX = null;
             m_btnShareWB = null;
+            m_btnShareQQ = null;
+            m_btnShareQQZone = null;
+            m_btnShareDouYin = null;
             m_shareGrade = null;
             m_btnClose = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivitySyntheticView.cs

@@ -38,7 +38,6 @@ namespace GFGGame
             _valueBarController = new ValueBarController(_ui.m_valueBar);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_listSynthetic.itemRenderer = RenderListSyntheticItem;
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gf_hdzy_bj");
         }
 
         protected override void OnShown()
@@ -99,10 +98,8 @@ namespace GFGGame
         private void RefreshTimeText()
         {
             var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.ItemSynthetic);
-            ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityInfo.ActivityId);
-            long time = TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow();
-            string strTime = TimeUtil.FormattingTimeTo_DDHHmm(time);
-            _ui.m_txtTime.text = "剩余:" + strTime;
+            long curTime = ActivityDataManager.Instance.GetActivityTime(activityInfo.ActivityId);
+            _ui.m_txtTime.text = "剩余:" + TimeUtil.FormattingTimeTo_DDHHmm(curTime);
         }
         
         private void RenderListSyntheticItem(int index, GObject obj)

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivityTeaMainView.cs

@@ -46,11 +46,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_Bg.url = ResPathUtil.GetBgImgPath("gfxwc_zymbj");
-            _ui.m_BgOne.url = ResPathUtil.GetBgImgPath("gfxwc_zjmlp");
-            _ui.m_oneTimeIcon.visible = false;
-            _ui.m_threeTimeIcon.visible = false;
-            _ui.m_twoTimeIcon.visible = false;
+            _ui.m_Bg.url = ResPathUtil.GetBgImgPath("gfxwc_xrbj");
+            _ui.m_BgOne.url = "";
             RedDotController.Instance.SetComRedDot(_ui.m_twoViewIcon, ActivityTeaDataManager.Instance.GetRewardRed()|| ActivityTeaDataManager.Instance.CheckVisitTaskRed());
             RedDotController.Instance.SetComRedDot(_ui.m_oneViewIcon, ActivityTeaDataManager.Instance.CheckHRDRed(),"",-85);
             RedDotController.Instance.SetComRedDot(_ui.m_threeViewIcon, ActivityTeaDataManager.Instance.GetActivitySyntheticRed(),"",-85);

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivityTeaVisitView.cs

@@ -50,18 +50,14 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("xnbh_bg");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_hybh");
             _ui.m_ruleIcon.data = 300028;
             activityID = 5004;
             RoleLimitData limitData = RoleLimitDataManager.GetLimitData(ActivityVisitCfgArray.Instance.dataArray[0].limitId);
             time = limitData.TotalPlayMax - limitData.PlayTimes;
             _ui.m_visitNum.text = "当前拜访次数：" + time + "/" + limitData.TotalPlayMax;
             _ui.m_taskList.numItems = ActivityVisitCfgArray.Instance.dataArray.Length;
-            ActivityOpenCfg _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(activityID);
-            long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
-            long curTime = TimeHelper.ServerNow();
-            TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
-            _ui.m_time.text = "剩余时间：" + TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
+            _ui.m_time.text = "剩余时间:" + TimeUtil.FormattingTimeTo_DDHHmm(ActivityDataManager.Instance.GetActivityTime(activityID));
             Timers.inst.Add(1, 0, UpdateTime);
         }
 
@@ -87,18 +83,15 @@ namespace GFGGame
         
         private void UpdateTime(object param = null)
         {
-            ActivityOpenCfg _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(activityID);
-            long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
-            long curTime = TimeHelper.ServerNow();
-            if (endTime < curTime)
+            long curTime = ActivityDataManager.Instance.GetActivityTime(activityID);
+            if (curTime <= 0)
             {
                 PromptController.Instance.ShowFloatTextPrompt("拜访活动已结束");
                 Timers.inst.Remove(UpdateTime);
                 GameController.GoBackToMainView();
                 return;
             }
-            TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
-            _ui.m_time.text = "剩余时间：" + TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
+            _ui.m_time.text = "剩余时间:" + TimeUtil.FormattingTimeTo_DDHHmm(curTime);
         }
 
         private void UpdateVisitNum(EventContext context = null)
@@ -109,7 +102,7 @@ namespace GFGGame
             }
             RoleLimitData limitData = RoleLimitDataManager.GetLimitData(ActivityVisitCfgArray.Instance.dataArray[0].limitId);
             time = limitData.TotalPlayMax - limitData.PlayTimes;
-            _ui.m_visitNum.text = "当前拜访次数：" + time + "/" + limitData.TotalPlayMax;
+            _ui.m_visitNum.text = "当前拜访次数:" + time + "/" + limitData.TotalPlayMax;
         }
 
         private void RenderTaskList(int index, GObject obj)

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

@@ -245,12 +245,10 @@ namespace GFGGame
 
         private void UpdateTime(object param)
         {
-            long curTime = TimeHelper.ServerNow();
-            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(_activityID);
-            if (activityInfo != null)
+            long curTime = ActivityDataManager.Instance.GetActivityTime(_activityID);
+            if (curTime <= 0)
             {
-                long endTime = activityInfo.EndTime;
-                _ui.m_txtTime.text = "剩余" + TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
+                _ui.m_txtTime.text = "剩余" + TimeUtil.FormattingTimeTo_DDHHmm(curTime);
             }
         }
 

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

@@ -573,7 +573,7 @@ namespace GFGGame
 
         private void CheckActivityEnd(object param)
         {
-            if (!ActivityFYJYDataManager.Instance.CheckOpen())
+            if (!ActivityDataManager.Instance.CheckActivityByRoleTime(5003))
             {
                 // 活动结束时强行退回主界面
                 ViewManager.Show<MainUIView>(null, true);

GameClient/Assets/Game/HotUpdate/Views/ClothingUpgarde/ClothingSelectView.cs

@@ -57,6 +57,7 @@ namespace GFGGame
             base.OnShown();
             _ui.m_bg.url = ResPathUtil.GetBgImgPath("gyp_bg");
             UpdateList();
+            Timers.inst.AddUpdate(CheckGuide);
         }
 
         protected override void RemoveEventListener()
@@ -67,6 +68,7 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
+            Timers.inst.Remove(CheckGuide);
         }
         private void UpdateList()
         {
@@ -209,5 +211,21 @@ namespace GFGGame
         {
             ViewManager.GoBackFrom(typeof(ClothingSelectView).FullName);
         }
+
+        private void CheckGuide(object param)
+        {
+            GRoot.inst.touchable = true;
+            if (GuideDataManager.IsGuideFinish("ClothingSelectView") <= 0)
+                UpdateCheckGuide(null);
+            else
+                Timers.inst.Remove(CheckGuide);
+        }
+
+        protected void UpdateCheckGuide(object param)
+        {
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+            GuideController.TryGuide(null, "ClothingSelectView", 4, "“估衣铺”里可以通过升级各个部位获得加成。", -1, true, _ui.target.height - 600);
+            GuideController.TryGuide(_ui.m_selectList, "ClothingSelectView", 5, "选择升级部位。",0);
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/ClothingUpgarde/ClothingUpgradeView.cs

@@ -52,12 +52,14 @@ namespace GFGGame
 
             //更新数据
             Update();
+            Timers.inst.AddUpdate(CheckGuide);
         }
 
         protected override void OnHide()
         {
             itemList.Clear();
             base.OnHide();
+            Timers.inst.Remove(CheckGuide);
         }
         protected override void AddEventListener()
         {
@@ -216,5 +218,20 @@ namespace GFGGame
         {
             ViewManager.GoBackFrom(typeof(ClothingUpgradeView).FullName);
         }
+        private void CheckGuide(object param)
+        {
+            GRoot.inst.touchable = true;
+            if (GuideDataManager.IsGuideFinish("ClothingSelectView") <= 0)
+                UpdateCheckGuide(null);
+            else
+                Timers.inst.Remove(CheckGuide);
+        }
+
+        protected void UpdateCheckGuide(object param)
+        {
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+            GuideController.TryGuide(null, "ClothingSelectView", 6, "升级部位获得加成。", -1, true, _ui.target.height - 600);
+            GuideController.TryCompleteGuide("ClothingSelectView", 6);
+        }
     }
 }

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

@@ -24,6 +24,7 @@ namespace GFGGame
             _ui.m_btnClose.onClick.Add(this.Hide);
             _ui.m_btnSave.onClick.Add(this.OnClickBtnSave);
             _ui.m_btnSavePhoto.onClick.Add(this.OnClickBtnSavePhoto);
+            _ui.m_share.onClick.Add(this.BtnClickShare);
         }
 
         protected override void OnShown()
@@ -31,11 +32,13 @@ namespace GFGGame
             base.OnShown();
             tex = this.viewData as Texture2D;
             bytes = tex.EncodeToJPG();//将纹理数据，转化成一个jpg图片
+            ShareDataManager.Instance.imageBytes = bytes;
             _ui.m_imgRes.texture = new NTexture(tex);
             float width = _ui.m_imgBorder.width;
             float height = width * tex.height / tex.width;
             _ui.m_imgRes.SetSize(width, height);
             _ui.m_imgBorder.SetSize(width, height + 12);
+            _ui.m_share.visible = false;
             Timers.inst.AddUpdate(CheckGuide);
         }
 
@@ -210,7 +213,10 @@ namespace GFGGame
             _ui.m_btnSavePhoto.enabled = false;
 
         }
-
+        private void BtnClickShare()
+        {
+            ShareDataManager.Instance.CaptureCameraToImage(true,false);
+        }
         private void CheckGuide(object param)
         {
             if (GuideDataManager.IsGuideFinish(ConstGuideId.FREEDOM_DRESS) <= 0)

GameClient/Assets/Game/HotUpdate/Views/InstanceZones/InstanceZonesView.cs

@@ -95,7 +95,8 @@ namespace GFGGame
             if (GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PORCELAIN) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PROPERTY) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_FILING) <= 0
-                || GuideDataManager.IsGuideFinish(ConstGuideId.POEM) <= 0)
+                || GuideDataManager.IsGuideFinish(ConstGuideId.POEM) <= 0
+                || GuideDataManager.IsGuideFinish("ClothingSelectView") <= 0)
                 //|| GuideDataManager.IsGuideFinish(ConstGuideId.FIELD) <= 0)
             {
                 UpdateToCheckGuide(null);
@@ -119,7 +120,7 @@ namespace GFGGame
             _ui.m_btnPoem.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(PoemPhotoView).Name, false);
             _ui.m_btnStudio.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioView).Name, false);
             _ui.m_btnTravel.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(TravelView).Name, false);
-            _ui.m_btnField.m_loaLockIcon.visible = false;//!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldView).Name, false);
+            _ui.m_btnField.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(TimeTracingShowView).Name, false);
             _ui.m_btnArena.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ArenaView).Name, false);
         }
 
@@ -180,6 +181,7 @@ namespace GFGGame
             //GuideController.TryGuide(_ui.m_btnPoem.target, ConstGuideId.POEM, 1, "在“拍照”中保存的图片都会保存到这里。");
             GuideController.TryGuide(_ui.m_btnArena.target, ConstGuideId.ARENA_OPEN, 3, "在这里可以与其他小伙伴比拼搭配哦~");
             GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.ENTER_CHAPTER_5, 1, "", -1, false);
+            GuideController.TryGuide(_ui.m_btnField.target, "TimeTracingShowView", 3, "合成副本可获得奖励和服装哦~");
         }
 
     }

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

@@ -291,6 +291,7 @@ namespace GFGGame
             _chapterCfgs = StoryChapterCfgArray.Instance.GetCfgsBysubType(subType);
             //这里+2，只是为了list左右两边为空白的表现，对于数据没啥意义
             _ui.m_listChapter.numItems = _chapterCfgs.Count + 2;
+            //_ui.m_listChapter.numItems = MainStoryDataManager.CheckChapterPassIndex(subType) + 2;
             int currentChapterIndex = 0;
             for (int i = 0; i < _ui.m_listChapter.numChildren; i++) 
             {
@@ -436,7 +437,6 @@ namespace GFGGame
             //GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_4, 3, "", 1, true, _ui.target.height / 2);
             //GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_5, 3, "", 1, true, _ui.target.height / 2);
             GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.STUDIO_PORCELAIN, 1, "点击返回主界面。");
-            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.STUDIO_FILING, 1, "点击返回主界面。");
         }
 
         private void DoSpecialEffect(object parm = null)

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

@@ -571,7 +571,10 @@ namespace GFGGame
              || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_4) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_5) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_STAR) <= 0
-             || GuideDataManager.IsGuideFinish(ConstGuideId.ARENA_OPEN) <= 0)
+             || GuideDataManager.IsGuideFinish(ConstGuideId.ARENA_OPEN) <= 0
+             || GuideDataManager.IsGuideFinish("ClothingSelectView") <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_FILING) <=0
+             || GuideDataManager.IsGuideFinish("TimeTracingShowView") <=0)
             //|| GuideDataManager.IsGuideFinish(ConstGuideId.CLOTHING_DECOMPOSE) <= 0)
             {
                 UpdateToCheckGuide(null);
@@ -613,6 +616,9 @@ namespace GFGGame
             bool isGuide9 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.UP_CARD_STAR, 1, "点击返回主界面。");
             bool isGuide12 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.ARENA_OPEN, 1, "点击返回主界面。");
 
+            bool isGuide13 = GuideController.TryGuide(_ui.m_btnHome, "ClothingSelectView", 1, "点击返回主界面。");
+            bool isGuide14 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.STUDIO_FILING, 1, "点击返回主界面。");
+            bool isGuide15 = GuideController.TryGuide(_ui.m_btnHome, "TimeTracingShowView", 1, "点击返回主界面。");
             //&& !isGuide6 && !isGuide8
             _ui.m_chapter.target.scrollPane.touchEffect = !isGuide0 && !isGuide1 && !isGuide2 && !isGuide3 && !isGuide4 && !isGuide5 && !isGuide7 && !isGuide9 && !isGuide10;
 

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

@@ -146,6 +146,8 @@ namespace GFGGame
             _ui.m_btnChange.m_c1.selectedIndex = 1;
             _ui.m_btnChange.target.selected = true;
 
+            _ui.m_storageBtn.target.onClick.Add(OnBtnStorageClick);
+
             firstIn = true;
             //这个是东8时区的0时间戳
             unixStartTime = new DateTime(1970, 1, 1, 8, 0, 0);
@@ -371,6 +373,21 @@ namespace GFGGame
             }
         }
 
+        private void OnBtnStorageClick()
+        {
+
+            if(MainDataManager.Instance.StorageStatus == 0)
+            {
+                MainDataManager.Instance.StorageStatus = 1;
+                _ui.m_listGroud.visible = false;
+            }
+            else
+            {
+                MainDataManager.Instance.StorageStatus = 0;
+                _ui.m_listGroud.visible = true;
+            }
+            _ui.m_storageBtn.m_c1.selectedIndex = MainDataManager.Instance.StorageStatus;
+        }
         private void OnClickBtnMain()
         {
             isOpen = MainControllerr.GotoStoryChapter(isOpen);
@@ -1224,7 +1241,8 @@ namespace GFGGame
                 || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_5) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PROPERTY) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.ARENA_OPEN) <= 0
-                || GuideDataManager.IsGuideFinish(ConstGuideId.SUIT_LIST_VIEW) <= 0)
+                || GuideDataManager.IsGuideFinish(ConstGuideId.SUIT_LIST_VIEW) <= 0
+                || GuideDataManager.IsGuideFinish("ClothingSelectView") <= 0)
             {
                 UpdateToCheckGuide(null);
             }
@@ -1270,6 +1288,9 @@ namespace GFGGame
 
             bool isStudioPropertyGuide = GuideController.TryGuide(_ui.m_btnHaiZhiShi.target, ConstGuideId.STUDIO_PROPERTY, 1, "进入副本", -1, false, _ui.target.height - 700);
 
+            bool isGuide13 = GuideController.TryGuide(_ui.m_btnXiuFang.target, "ClothingSelectView", 2, "进入绣纺。");
+            bool isGuide14 = GuideController.TryGuide(_ui.m_btnHaiZhiShi.target, "TimeTracingShowView", 2, "进入副本。");
+
             _ui.m_loaGuidestudio.visible = false;
             // if (isStudioMetalGuide || isStudioFilingGuide || isFieldGuide || isStudioPropertyGuide)
             // {

GameClient/Assets/Game/HotUpdate/Views/Share/ShareView.cs

@@ -42,6 +42,14 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            _ui.m_btnShareWB.visible = false;
+            _ui.m_btnShareQQ.visible = false;
+            _ui.m_btnShareQQZone.visible = false;
+            _ui.m_btnShareDouYin.visible = false;
+            RoleInfoManager.Instance.UpdateHead(_ui.m_head, RoleDataManager.headId, RoleDataManager.headBorderId);
+            _ui.m_levelText.text = RoleDataManager.lvl.ToString();
+            _ui.m_nameText.text = RoleDataManager.roleName;
+            ShareDataManager.Instance.group = _ui.m_shareGrade;
             Texture2D imageText = ShareDataManager.Instance.ConvertBytesToTexture(ShareDataManager.Instance.imageBytes);
             _ui.m_icon.texture = new NTexture(imageText);
         }

GameClient/Assets/Game/HotUpdate/Views/TimeTracing/TimeTracingLevelView.cs

@@ -61,13 +61,15 @@ namespace GFGGame
             UpdateView();
             UpdateSuitNum();
             UpdateFirst();
-            UpdateproBar();  
+            UpdateproBar();
+            Timers.inst.AddUpdate(CheckGuide);
         }
 
         protected override void OnHide()
         {
             _valueBarController.OnHide();
             base.OnHide();
+            Timers.inst.Remove(CheckGuide);
         }
         protected override void AddEventListener()
         {
@@ -253,5 +255,22 @@ namespace GFGGame
         {
             ViewManager.GoBackFrom(typeof(TimeTracingLevelView).FullName);
         }
+        private void CheckGuide(object param)
+        {
+            GRoot.inst.touchable = true;
+            if (GuideDataManager.IsGuideFinish("TimeTracingShowView") <= 0)
+                UpdateCheckGuide(null);
+            else
+                Timers.inst.Remove(CheckGuide);
+        }
+
+        protected void UpdateCheckGuide(object param)
+        {
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+            MainStoryDataManager.currentLevelCfgId = 100003003;
+            GuideController.TryGuide(_ui.m_level1.target, "TimeTracingShowView", 5, "挑战。");
+            GuideController.TryGuide(_ui.m_btnBack, "TimeTracingShowView", 6, "点击返回。");
+            
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/TimeTracing/TimeTracingShowView.cs

@@ -60,6 +60,7 @@ namespace GFGGame
             UpdateView();
             RedDotController.Instance.SetComRedDot(_ui.m_switchBtn.target, TimeTracingDataManager.Instance.GetLevelRewardStatus() || TimeTracingDataManager.Instance.GetAllChapterReward(),"",-200,-10);
             RedDotController.Instance.SetComRedDot(_ui.m_challgeBtn, TimeTracingDataManager.Instance.GetChapterIDRewardStatus(ChapterID), "", -100,50);
+            Timers.inst.AddUpdate(CheckGuide);
         }
 
         protected override void OnHide()
@@ -71,6 +72,7 @@ namespace GFGGame
             //{
             //    dressUpObjUI.Dispose();
             //}
+            Timers.inst.Remove(CheckGuide);
         }
 
         private void UpdateView()
@@ -148,5 +150,23 @@ namespace GFGGame
                 }
             }
         }
+
+        private void CheckGuide(object param)
+        {
+            GRoot.inst.touchable = true;
+            if (GuideDataManager.IsGuideFinish("TimeTracingShowView") <= 0)
+                UpdateCheckGuide(null);
+            else
+                Timers.inst.Remove(CheckGuide);
+        }
+
+        protected void UpdateCheckGuide(object param)
+        {
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+            GuideController.TryGuide(_ui.m_challgeBtn, "TimeTracingShowView", 4, "进入副本。");
+            GuideController.TryGuide(_ui.m_switchBtn.target, "TimeTracingShowView", 7, "点击选择副本。");
+            GuideController.TryGuide(_ui.m_btnBack, "TimeTracingShowView", 8, "点击返回。");
+            GuideController.TryCompleteGuide("TimeTracingShowView", 8);
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/XiuFang/XiuFangView.cs

@@ -140,6 +140,7 @@ namespace GFGGame
 
 
             GuideController.TryGuide(_ui.m_component.m_btnClothingUpgrade.target, ConstGuideId.SUIT_LIST_VIEW, 2, "");
+            bool isGuide13 = GuideController.TryGuide(_ui.m_component.m_btnGYP.target, "ClothingSelectView", 3, "进入估衣铺。");
         }
     }
 }

GameClient/Assets/ResIn/Material/EyeOpeningEffect.mat

@@ -0,0 +1,37 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: EyeOpeningEffect
+  m_Shader: {fileID: 4800000, guid: e5af28e603185bf4da6c89af113219cb, type: 3}
+  m_ShaderKeywords: UNITY_UI_ALPHACLIP
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 2334f4e20bc3d8743984f3658a485597, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _ColorMask: 15
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UseUIAlphaClip: 1
+    m_Colors:
+    - _Color: {r: 0, g: 0, b: 0, a: 1}
+    - _Param: {r: 0.8, g: 0, b: 1, a: 1}
+  m_BuildTextureStacks: []

GameClient/Assets/ResIn/Material/EyeOpeningEffect.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 15688f2d6c5fcb6438aa5b1841360133
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/Material/ImageGradient.mat.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 15688f2d6c5fcb6438aa5b1841360133
+guid: c82f80e0d03b1434b8fa7d4106b4ec39
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000

GameClient/Assets/ResIn/Shader/EyeOpeningEffect.shader

@@ -0,0 +1,125 @@
+// Unity built-in shader source. Copyright (c) 2016 Unity Technologies. MIT license (see license.txt)
+
+Shader "FairyGUI/EyeOpeningEffect"
+{
+	Properties
+	{
+		_MainTex("Base (RGB), Alpha (A)", 2D) = "black" {}
+
+		_StencilComp("Stencil Comparison", Float) = 8
+		_Stencil("Stencil ID", Float) = 0
+		_StencilOp("Stencil Operation", Float) = 0
+		_StencilWriteMask("Stencil Write Mask", Float) = 255
+		_StencilReadMask("Stencil Read Mask", Float) = 255
+
+		_ColorMask("Color Mask", Float) = 15
+
+		[Toggle(UNITY_UI_ALPHACLIP)] _UseUIAlphaClip("Use Alpha Clip", Float) = 0
+
+		[Space(100)]
+		_Param("Param", vector) = (0.6, 0.3, 1, 1)
+	}
+
+		SubShader
+		{
+			Tags
+		{
+			"Queue" = "Transparent"
+			"IgnoreProjector" = "True"
+			"RenderType" = "Transparent"
+			"PreviewType" = "Plane"
+			"CanUseSpriteAtlas" = "True"
+		}
+
+			Stencil
+		{
+			Ref[_Stencil]
+			Comp[_StencilComp]
+			Pass[_StencilOp]
+			ReadMask[_StencilReadMask]
+			WriteMask[_StencilWriteMask]
+		}
+
+			Cull Off
+			Lighting Off
+			ZWrite Off
+			ZTest[unity_GUIZTestMode]
+			Blend SrcAlpha OneMinusSrcAlpha
+			ColorMask[_ColorMask]
+
+			Pass
+		{
+			Name "Default"
+			CGPROGRAM
+	#pragma vertex vert
+	#pragma fragment frag
+	#pragma target 2.0
+
+	#include "UnityCG.cginc"
+	#include "UnityUI.cginc"
+
+	#pragma multi_compile __ UNITY_UI_CLIP_RECT
+	#pragma multi_compile __ UNITY_UI_ALPHACLIP
+
+
+			struct appdata_t
+		{
+			float4 vertex   : POSITION;
+			float4 color    : COLOR;
+			float2 texcoord : TEXCOORD0;
+			UNITY_VERTEX_INPUT_INSTANCE_ID
+		};
+
+		struct v2f
+		{
+			float4 vertex   : SV_POSITION;
+			fixed4 color : COLOR;
+			float2 texcoord  : TEXCOORD0;
+			float4 worldPosition : TEXCOORD1;
+			UNITY_VERTEX_OUTPUT_STEREO
+		};
+
+		sampler2D _MainTex;
+		fixed4 _Color;
+		fixed4 _TextureSampleAdd;
+		float4 _ClipRect;
+		float4 _MainTex_ST;
+		half3 _Param;
+
+		v2f vert(appdata_t v)
+		{
+			v2f OUT;
+			UNITY_SETUP_INSTANCE_ID(v);
+			UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(OUT);
+			OUT.worldPosition = v.vertex;
+			OUT.vertex = UnityObjectToClipPos(OUT.worldPosition);
+
+			OUT.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex);
+
+			OUT.color = v.color * _Color;
+			return OUT;
+		}
+
+		fixed4 frag(v2f IN) : SV_Target
+		{
+			//half4 color = (tex2D(_MainTex, IN.texcoord) + _TextureSampleAdd) * IN.color;
+			half4 color = IN.color;
+			half x = IN.texcoord.x - 0.5;
+			half y = IN.texcoord.y - 0.5;
+			half oval = x * x / (_Param.x * _Param.x) + y * y / (_Param.y * _Param.y);
+			color.a = oval;
+
+	#ifdef UNITY_UI_CLIP_RECT
+			color.a *= UnityGet2DClipping(IN.worldPosition.xy, _ClipRect);
+	#endif
+
+	#ifdef UNITY_UI_ALPHACLIP
+			clip(color.a - 0.001);
+	#endif
+
+			return color;
+		}
+			ENDCG
+		}
+		}
+}

GameClient/Assets/ResIn/Shader/EyeOpeningEffect.shader.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: e5af28e603185bf4da6c89af113219cb
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  preprocessorOverride: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/Main/Main_atlas0_12.png.meta → GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_2!a.png.meta

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

GameClient/Assets/ResIn/UI/Main/Main_atlas0_12!a.png.meta → GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_2.png.meta

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

GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_3!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: ccc433881cb904548bb2875c70a44080
+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/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_3.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 86c6ff00f1ed8b641bb744bfc7388279
+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/Share/Share_atlas0_1!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 42efef436d0e2834f86a181616750068
+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/Share/Share_atlas0_1.png.meta

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