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

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

@@ -107,6 +107,40 @@ namespace GFGGame
             set { _sevenDayLoginBonusStatus = value; }
         }
         /******************************************************************************************************************/
+
+
+        /**********************************************************每日登录修改*************************************************/
+        public List<int> sevenDayLoginLoginIdList = new List<int>();
+        /// <summary>
+        /// 七日登录 当日奖励id
+        /// </summary>
+        /// <value></value>
+
+        public List<int> sevenDayLoginBonusStatusList = new List<int>();
+        /// <summary>
+        /// 七日登录 当前奖励状态
+        /// </summary>
+        /// <value></value>
+        /// 
+        public bool CanGetSevenDayBonus()
+        {
+            foreach(int a in sevenDayLoginBonusStatusList)
+            {
+                if (a == 1) return true;
+            }
+            return false;
+        }
+
+        public bool AllSevenDayBonusGot()
+        {
+            foreach (int a in sevenDayLoginBonusStatusList)
+            {
+                if (a != 2) return false;
+            }
+            return true;
+        }
+        /******************************************************************************************************************/
+
         private int _firstChargeBonusStatus = 0;
         /// <summary>
         /// 首冲奖励 当前奖励状态,ConstBonusStatus 0不可领，1可领，2已领

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

@@ -252,5 +252,23 @@ namespace GFGGame
             }
             return _cardStoryCfgDic.ContainsKey(cardId) ? _cardStoryCfgDic[cardId] : new List<CardStoryCfg>();
         }
+
+        //升星是否满足材料消耗
+        public static bool GetUpStarEnoughMaterial(int cardId)
+        {
+            CardData cardData = CardDataManager.GetCardDataById(cardId);
+            CardStarCfg starCfg = CardStarCfgArray.Instance.GetCfgBycardIdAndstarLvl(cardId, cardData.star);
+            for (int i = 0; i < starCfg.materiarsArr.Length; i++)
+            {
+                if (GameGlobal.myNumericComponent.GetAsInt(NumericType.IsAutoSelect) == 0 &&
+                    ItemDataManager.GetItemNum(starCfg.materiarsArr[i][0]) < starCfg.materiarsArr[i][1])
+                    return false;
+                else if (GameGlobal.myNumericComponent.GetAsInt(NumericType.IsAutoSelect) == 1 &&
+                    (i == 0 && (ItemDataManager.GetItemNum(6003001) + ItemDataManager.GetItemNum(starCfg.materiarsArr[i][0])) < starCfg.materiarsArr[i][1]) || (i == 1 && (ItemDataManager.GetItemNum(6003002) + ItemDataManager.GetItemNum(starCfg.materiarsArr[i][0])) < starCfg.materiarsArr[i][1]))
+                    return false;
+            }
+
+            return true;
+        }
     }
 }

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

@@ -335,10 +335,7 @@ namespace GFGGame
             CardStarCfg starCfg = CardStarCfgArray.Instance.GetCfgBycardIdAndstarLvl(cardId, cardData.star);
             if (ItemDataManager.GetItemNum(starCfg.costID) < starCfg.costNum) return false;
             if (cardData.lv < starCfg.needLv) return false;
-            for (int i = 0; i < starCfg.materiarsArr.Length; i++)
-            {
-                if (ItemDataManager.GetItemNum(starCfg.materiarsArr[i][0]) < starCfg.materiarsArr[i][1]) return false;
-            }
+            if (CardDataManager.GetUpStarEnoughMaterial(cardId) == false) return false;
             return true;
         }
         /// <summary>
@@ -794,7 +791,7 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetSevenDayLoginRed()
         {
-            return ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.CAN_GET;
+            return ActivityDataManager.Instance.CanGetSevenDayBonus();
         }
         /// <summary>
         /// 福利大厅-每日签到

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

@@ -14,11 +14,13 @@ namespace GFGGame
 
         private bool _waitPicFade = false;
         private bool _waitBgChange = false;
-
+        private float _dialogShowDelay = 0.0f;
 
         // Dialog wait pic's animation finished 
         public bool waitPicFade { get { return _waitPicFade; } set { _waitPicFade = value; } }
         public bool waitBgChange { get { return _waitBgChange; } set { _waitBgChange = value; } }
+        public float dialogShowDelay { get { return _dialogShowDelay; } set { _dialogShowDelay = value; } }
+
     }
 }
 

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

@@ -173,6 +173,12 @@ namespace GFGGame
 
         }
 
+        public List<int> GetFilingRewardList(int id)
+        {
+            StudioData studioData = GetStudioDataById(id);
+            return studioData.RewardsStatus;
+        }
+
 
     }
 }

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

@@ -65,6 +65,7 @@ namespace GFGGame
                 else
                 {
                     StoryDialogDataManager.Instance.waitBgChange = true;
+                    StoryDialogDataManager.Instance.dialogShowDelay = 0.4f;
                     SetSpriteRendererAlpha(bgSpr, 1f);
                     bgNextSpr.sprite = sp;
                     FairyGUI.Timers.inst.StartCoroutine(LastBgFadeOut());
@@ -141,6 +142,7 @@ namespace GFGGame
                         }
                         yield return new WaitForEndOfFrame();
                     }
+                    StoryDialogDataManager.Instance.waitPicFade = false;
                 }
             }
         }

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

@@ -12,11 +12,12 @@ namespace UI.ActivityDay7
         public GTextField m_TimeStr;
         public GButton m_tip;
         public GProgressBar m_ExpProcess;
-        public GTextField m_Score;
         public GList m_DayList;
         public GList m_TaskList;
         public GLoader m_EndIndex;
         public GLoader m_StartIndex;
+        public GTextField m_Score;
+        public GTextField m_txtLevel;
         public const string URL = "ui://kupdwln7nyhm1";
         public const string PACKAGE_NAME = "ActivityDay7";
         public const string RES_NAME = "ActivityDay7UI";
@@ -69,11 +70,12 @@ namespace UI.ActivityDay7
             m_TimeStr = (GTextField)comp.GetChild("TimeStr");
             m_tip = (GButton)comp.GetChild("tip");
             m_ExpProcess = (GProgressBar)comp.GetChild("ExpProcess");
-            m_Score = (GTextField)comp.GetChild("Score");
             m_DayList = (GList)comp.GetChild("DayList");
             m_TaskList = (GList)comp.GetChild("TaskList");
             m_EndIndex = (GLoader)comp.GetChild("EndIndex");
             m_StartIndex = (GLoader)comp.GetChild("StartIndex");
+            m_Score = (GTextField)comp.GetChild("Score");
+            m_txtLevel = (GTextField)comp.GetChild("txtLevel");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -82,11 +84,12 @@ namespace UI.ActivityDay7
             m_TimeStr = null;
             m_tip = null;
             m_ExpProcess = null;
-            m_Score = null;
             m_DayList = null;
             m_TaskList = null;
             m_EndIndex = null;
             m_StartIndex = null;
+            m_Score = null;
+            m_txtLevel = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ListPropertyItem.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CreateRole/UI_ButtonDice.cs

@@ -2,20 +2,20 @@
 
 using FairyGUI;
 
-namespace UI.Studio
+namespace UI.CreateRole
 {
-    public partial class UI_ListPropertyItem
+    public partial class UI_ButtonDice
     {
         public GButton target;
-        public GLoader m_loaBg;
-        public const string URL = "ui://xz8kxrecn3xhn";
-        public const string PACKAGE_NAME = "Studio";
-        public const string RES_NAME = "ListPropertyItem";
-        private static UI_ListPropertyItem _proxy;
+        public GGraph m_holder;
+        public const string URL = "ui://5al8chbdxt5s4";
+        public const string PACKAGE_NAME = "CreateRole";
+        public const string RES_NAME = "ButtonDice";
+        private static UI_ButtonDice _proxy;
 
-        public static UI_ListPropertyItem Create(GObject gObject = null)
+        public static UI_ButtonDice Create(GObject gObject = null)
         {
-            var ui = new UI_ListPropertyItem();
+            var ui = new UI_ButtonDice();
             if(gObject == null)
             	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -24,11 +24,11 @@ namespace UI.Studio
             return ui;
         }
 
-        public static UI_ListPropertyItem Proxy(GObject gObject = null)
+        public static UI_ButtonDice Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ListPropertyItem();
+                _proxy = new UI_ButtonDice();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -55,11 +55,11 @@ namespace UI.Studio
 
         private void Init(GComponent comp)
         {
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_holder = (GGraph)comp.GetChild("holder");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaBg = null;
+            m_holder = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ListPropertyItem.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CreateRole/UI_ButtonDice.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 19cb10eac624157459540ca424f9fb7e
+guid: 9dda6f9c193c169459a7bd7f77b73693
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -9,7 +9,7 @@ namespace UI.CreateRole
         public GComponent target;
         public GGraph m_NiaoEffectHolder;
         public GButton m_btnSure;
-        public GButton m_btnDice;
+        public UI_ButtonDice m_btnDice;
         public GTextInput m_inputName;
         public GGraph m_ShanZiEffectHolder;
         public GGraph m_TextEffectHolder;
@@ -67,7 +67,7 @@ namespace UI.CreateRole
         {
             m_NiaoEffectHolder = (GGraph)comp.GetChild("NiaoEffectHolder");
             m_btnSure = (GButton)comp.GetChild("btnSure");
-            m_btnDice = (GButton)comp.GetChild("btnDice");
+            m_btnDice = (UI_ButtonDice)UI_ButtonDice.Create(comp.GetChild("btnDice"));
             m_inputName = (GTextInput)comp.GetChild("inputName");
             m_ShanZiEffectHolder = (GGraph)comp.GetChild("ShanZiEffectHolder");
             m_TextEffectHolder = (GGraph)comp.GetChild("TextEffectHolder");
@@ -81,6 +81,7 @@ namespace UI.CreateRole
         {
             m_NiaoEffectHolder = null;
             m_btnSure = null;
+            m_btnDice.Dispose();
             m_btnDice = null;
             m_inputName = null;
             m_ShanZiEffectHolder = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueTeaPartyOverUI.cs

@@ -0,0 +1,101 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_LeagueTeaPartyOverUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GButton m_btnBack;
+        public GTextField m_txtTeaName;
+        public UI_comTeaPartyOverItem m_TeaPartyOverItem1;
+        public UI_comTeaPartyOverItem m_TeaPartyOverItem3;
+        public UI_comTeaPartyOverItem m_TeaPartyOverItem4;
+        public UI_comTeaPartyOverItem m_TeaPartyOverItem2;
+        public UI_comTeaPartyOverItem m_TeaPartyOverItem5;
+        public UI_comTeaPartyOverItem m_TeaPartyOverItem6;
+        public const string URL = "ui://tw70qm9dic4otq4";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "LeagueTeaPartyOverUI";
+        private static UI_LeagueTeaPartyOverUI _proxy;
+
+        public static UI_LeagueTeaPartyOverUI Create(GObject gObject = null)
+        {
+            var ui = new UI_LeagueTeaPartyOverUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_LeagueTeaPartyOverUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_LeagueTeaPartyOverUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_txtTeaName = (GTextField)comp.GetChild("txtTeaName");
+            m_TeaPartyOverItem1 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem1"));
+            m_TeaPartyOverItem3 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem3"));
+            m_TeaPartyOverItem4 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem4"));
+            m_TeaPartyOverItem2 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem2"));
+            m_TeaPartyOverItem5 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem5"));
+            m_TeaPartyOverItem6 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem6"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_btnBack = null;
+            m_txtTeaName = null;
+            m_TeaPartyOverItem1.Dispose();
+            m_TeaPartyOverItem1 = null;
+            m_TeaPartyOverItem3.Dispose();
+            m_TeaPartyOverItem3 = null;
+            m_TeaPartyOverItem4.Dispose();
+            m_TeaPartyOverItem4 = null;
+            m_TeaPartyOverItem2.Dispose();
+            m_TeaPartyOverItem2 = null;
+            m_TeaPartyOverItem5.Dispose();
+            m_TeaPartyOverItem5 = null;
+            m_TeaPartyOverItem6.Dispose();
+            m_TeaPartyOverItem6 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueTeaPartyOverUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueTeaPartyRewardUI.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_LeagueTeaPartyRewardUI
+    {
+        public GComponent target;
+        public GImage m_bg;
+        public GGraph m_holderLeftTop;
+        public GGraph m_holderRightDowm;
+        public const string URL = "ui://tw70qm9dic4otpz";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "LeagueTeaPartyRewardUI";
+        private static UI_LeagueTeaPartyRewardUI _proxy;
+
+        public static UI_LeagueTeaPartyRewardUI Create(GObject gObject = null)
+        {
+            var ui = new UI_LeagueTeaPartyRewardUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_LeagueTeaPartyRewardUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_LeagueTeaPartyRewardUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_bg = (GImage)comp.GetChild("bg");
+            m_holderLeftTop = (GGraph)comp.GetChild("holderLeftTop");
+            m_holderRightDowm = (GGraph)comp.GetChild("holderRightDowm");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_holderLeftTop = null;
+            m_holderRightDowm = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueTeaPartyRewardUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueTeaPartyUI.cs

@@ -11,6 +11,7 @@ namespace UI.League
         public GButton m_btnBack;
         public GButton m_btnChallenge;
         public GButton m_btnChat;
+        public GButton m_btnReward;
         public GTextField m_txtTeaName;
         public UI_comTeaPartyItem m_teaPartyItem1;
         public UI_comTeaPartyItem m_teaPartyItem2;
@@ -70,6 +71,7 @@ namespace UI.League
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnChallenge = (GButton)comp.GetChild("btnChallenge");
             m_btnChat = (GButton)comp.GetChild("btnChat");
+            m_btnReward = (GButton)comp.GetChild("btnReward");
             m_txtTeaName = (GTextField)comp.GetChild("txtTeaName");
             m_teaPartyItem1 = (UI_comTeaPartyItem)UI_comTeaPartyItem.Create(comp.GetChild("teaPartyItem1"));
             m_teaPartyItem2 = (UI_comTeaPartyItem)UI_comTeaPartyItem.Create(comp.GetChild("teaPartyItem2"));
@@ -85,6 +87,7 @@ namespace UI.League
             m_btnBack = null;
             m_btnChallenge = null;
             m_btnChat = null;
+            m_btnReward = null;
             m_txtTeaName = null;
             m_teaPartyItem1.Dispose();
             m_teaPartyItem1 = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_comTeaPartyOverItem.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_comTeaPartyOverItem
+    {
+        public GComponent target;
+        public GLoader m_iconRole;
+        public GTextField m_txtRoleName;
+        public const string URL = "ui://tw70qm9dic4otq5";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "comTeaPartyOverItem";
+        private static UI_comTeaPartyOverItem _proxy;
+
+        public static UI_comTeaPartyOverItem Create(GObject gObject = null)
+        {
+            var ui = new UI_comTeaPartyOverItem();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_comTeaPartyOverItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_comTeaPartyOverItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_iconRole = (GLoader)comp.GetChild("iconRole");
+            m_txtRoleName = (GTextField)comp.GetChild("txtRoleName");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_iconRole = null;
+            m_txtRoleName = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_comTeaPartyOverItem.cs.meta

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

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

@@ -8,7 +8,7 @@ namespace UI.Studio
     {
         public GComponent target;
         public Controller m_c1;
-        public GLoader m_icon;
+        public GTextField m_name;
         public GImage m_img;
         public const string URL = "ui://xz8kxrecrbxq5";
         public const string PACKAGE_NAME = "Studio";
@@ -58,13 +58,13 @@ namespace UI.Studio
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_icon = (GLoader)comp.GetChild("icon");
+            m_name = (GTextField)comp.GetChild("name");
             m_img = (GImage)comp.GetChild("img");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_icon = null;
+            m_name = null;
             m_img = null;
             if(disposeTarget && target != null)
             {

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

@@ -8,14 +8,17 @@ namespace UI.Studio
     {
         public GComponent target;
         public Controller m_c1;
+        public GLoader m_bg0;
+        public GLoader m_bg1;
         public GList m_list;
         public GTextField m_txtNum;
-        public GTextField m_txtTime;
         public GButton m_btnBuy;
-        public UI_ListPropertyItem m_btn0;
-        public UI_ListPropertyItem m_btn1;
-        public UI_ListPropertyItem m_btn2;
-        public UI_ListPropertyItem m_btn3;
+        public GLoader m_btnChageLine;
+        public GTextField m_txtTime;
+        public GButton m_btn0;
+        public GButton m_btn1;
+        public GButton m_btn2;
+        public GButton m_btn3;
         public const string URL = "ui://xz8kxrecf2bf2z";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "ComProperty";
@@ -64,29 +67,31 @@ namespace UI.Studio
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_bg0 = (GLoader)comp.GetChild("bg0");
+            m_bg1 = (GLoader)comp.GetChild("bg1");
             m_list = (GList)comp.GetChild("list");
             m_txtNum = (GTextField)comp.GetChild("txtNum");
-            m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_btnBuy = (GButton)comp.GetChild("btnBuy");
-            m_btn0 = (UI_ListPropertyItem)UI_ListPropertyItem.Create(comp.GetChild("btn0"));
-            m_btn1 = (UI_ListPropertyItem)UI_ListPropertyItem.Create(comp.GetChild("btn1"));
-            m_btn2 = (UI_ListPropertyItem)UI_ListPropertyItem.Create(comp.GetChild("btn2"));
-            m_btn3 = (UI_ListPropertyItem)UI_ListPropertyItem.Create(comp.GetChild("btn3"));
+            m_btnChageLine = (GLoader)comp.GetChild("btnChageLine");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_btn0 = (GButton)comp.GetChild("btn0");
+            m_btn1 = (GButton)comp.GetChild("btn1");
+            m_btn2 = (GButton)comp.GetChild("btn2");
+            m_btn3 = (GButton)comp.GetChild("btn3");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_bg0 = null;
+            m_bg1 = null;
             m_list = null;
             m_txtNum = null;
-            m_txtTime = null;
             m_btnBuy = null;
-            m_btn0.Dispose();
+            m_btnChageLine = null;
+            m_txtTime = null;
             m_btn0 = null;
-            m_btn1.Dispose();
             m_btn1 = null;
-            m_btn2.Dispose();
             m_btn2 = null;
-            m_btn3.Dispose();
             m_btn3 = null;
             if(disposeTarget && target != null)
             {

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

@@ -12,6 +12,7 @@ namespace UI.Studio
         public GTextField m_txtName;
         public GGroup m_grpName;
         public GImage m_imgLock;
+        public Transition m_ToLeft;
         public const string URL = "ui://xz8kxrechbio1u";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "ListNpcItem";
@@ -64,6 +65,7 @@ namespace UI.Studio
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_grpName = (GGroup)comp.GetChild("grpName");
             m_imgLock = (GImage)comp.GetChild("imgLock");
+            m_ToLeft = comp.GetTransition("ToLeft");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -73,6 +75,7 @@ namespace UI.Studio
             m_txtName = null;
             m_grpName = null;
             m_imgLock = null;
+            m_ToLeft = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,6 +7,7 @@ namespace UI.Studio
     public partial class UI_ListRewardItem
     {
         public GComponent target;
+        public GImage m_canGet;
         public GTextField m_txtDesc;
         public GList m_listReward;
         public const string URL = "ui://xz8kxrecrqo41p";
@@ -56,11 +57,13 @@ namespace UI.Studio
 
         private void Init(GComponent comp)
         {
+            m_canGet = (GImage)comp.GetChild("canGet");
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
             m_listReward = (GList)comp.GetChild("listReward");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_canGet = null;
             m_txtDesc = null;
             m_listReward = null;
             if(disposeTarget && target != null)

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

@@ -0,0 +1,92 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Studio
+{
+    public partial class UI_PropertyItem
+    {
+        public GComponent target;
+        public Controller m_star;
+        public GImage m_bg;
+        public GLoader m_loaIcon;
+        public GImage m_lock;
+        public GImage m_imgLock;
+        public GTextField m_txtTitle;
+        public GLoader m_loaBg;
+        public Transition m_test;
+        public const string URL = "ui://xz8kxrecpj8w4j";
+        public const string PACKAGE_NAME = "Studio";
+        public const string RES_NAME = "PropertyItem";
+        private static UI_PropertyItem _proxy;
+
+        public static UI_PropertyItem Create(GObject gObject = null)
+        {
+            var ui = new UI_PropertyItem();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_PropertyItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_PropertyItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_star = comp.GetController("star");
+            m_bg = (GImage)comp.GetChild("bg");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_lock = (GImage)comp.GetChild("lock");
+            m_imgLock = (GImage)comp.GetChild("imgLock");
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_test = comp.GetTransition("test");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_star = null;
+            m_bg = null;
+            m_loaIcon = null;
+            m_lock = null;
+            m_imgLock = null;
+            m_txtTitle = null;
+            m_loaBg = null;
+            m_test = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_PropertyItem.cs.meta

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

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

@@ -8,7 +8,7 @@ namespace UI.Studio
     {
         public GComponent target;
         public Controller m_c1;
-        public GComponent m_loaBg;
+        public GLoader m_loaBg;
         public GTextField m_txtTitle;
         public GTextField m_txtTips;
         public GTextField m_txtNum0;
@@ -17,6 +17,7 @@ namespace UI.Studio
         public GButton m_btnExchange;
         public GComponent m_comCostCurrent;
         public GButton m_btnBuy;
+        public GButton m_btnBack;
         public const string URL = "ui://xz8kxrecn3xhh";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "StudioBuyNumUI";
@@ -65,7 +66,7 @@ namespace UI.Studio
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_loaBg = (GComponent)comp.GetChild("loaBg");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_txtNum0 = (GTextField)comp.GetChild("txtNum0");
@@ -74,6 +75,7 @@ namespace UI.Studio
             m_btnExchange = (GButton)comp.GetChild("btnExchange");
             m_comCostCurrent = (GComponent)comp.GetChild("comCostCurrent");
             m_btnBuy = (GButton)comp.GetChild("btnBuy");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -87,6 +89,7 @@ namespace UI.Studio
             m_btnExchange = null;
             m_comCostCurrent = null;
             m_btnBuy = null;
+            m_btnBack = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,9 +7,11 @@ namespace UI.Studio
     public partial class UI_StudioFilingRewardUI
     {
         public GComponent target;
+        public GLoader m_bg;
         public GTextField m_txtScore;
         public GList m_list;
         public GButton m_btnGet;
+        public GButton m_btnBack;
         public const string URL = "ui://xz8kxrecrqo41k";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "StudioFilingRewardUI";
@@ -57,15 +59,19 @@ namespace UI.Studio
 
         private void Init(GComponent comp)
         {
+            m_bg = (GLoader)comp.GetChild("bg");
             m_txtScore = (GTextField)comp.GetChild("txtScore");
             m_list = (GList)comp.GetChild("list");
             m_btnGet = (GButton)comp.GetChild("btnGet");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_bg = null;
             m_txtScore = null;
             m_list = null;
             m_btnGet = null;
+            m_btnBack = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,10 +7,12 @@ namespace UI.Studio
     public partial class UI_StudioFilingUI
     {
         public GComponent target;
-        public GLoader m_loaBg;
+        public GLoader m_Bg;
         public GComponent m_comValueBar;
         public GButton m_btnBack;
         public GButton m_btnChange;
+        public GLoader m_btnChageLine;
+        public GLoader m_loaBg;
         public GTextField m_txtNum;
         public GButton m_btnAdd;
         public GGroup m_grpAdd;
@@ -67,10 +69,12 @@ namespace UI.Studio
 
         private void Init(GComponent comp)
         {
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_Bg = (GLoader)comp.GetChild("Bg");
             m_comValueBar = (GComponent)comp.GetChild("comValueBar");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnChange = (GButton)comp.GetChild("btnChange");
+            m_btnChageLine = (GLoader)comp.GetChild("btnChageLine");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_txtNum = (GTextField)comp.GetChild("txtNum");
             m_btnAdd = (GButton)comp.GetChild("btnAdd");
             m_grpAdd = (GGroup)comp.GetChild("grpAdd");
@@ -83,10 +87,12 @@ namespace UI.Studio
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaBg = null;
+            m_Bg = null;
             m_comValueBar = null;
             m_btnBack = null;
             m_btnChange = null;
+            m_btnChageLine = null;
+            m_loaBg = null;
             m_txtNum = null;
             m_btnAdd = null;
             m_grpAdd = null;

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

@@ -23,14 +23,14 @@ namespace GFGGame
     {
         public static async ETTask<bool> ReqSevenDayLoginInfos()
         {
-            M2C_GetDailySignInBonusInfos response = null;
-            response = (M2C_GetDailySignInBonusInfos)await MessageHelper.SendToServer(new C2M_GetDailySignInBonusInfos());
+            M2C_GetDailySignInBonusInfoList response = null;
+            response = (M2C_GetDailySignInBonusInfoList)await MessageHelper.SendToServer(new C2M_GetDailySignInBonusInfoList());
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    ActivityDataManager.Instance.sevenDayLoginLoginId = response.CuurentBonusId;
-                    ActivityDataManager.Instance.sevenDayLoginBonusStatus = response.BonusStatus;
+                    ActivityDataManager.Instance.sevenDayLoginLoginIdList = response.KsBonusId;
+                    ActivityDataManager.Instance.sevenDayLoginBonusStatusList = response.VsBonusStatus;
                     return true;
                 }
             }
@@ -44,7 +44,7 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    ActivityDataManager.Instance.sevenDayLoginBonusStatus = response.BonusStatus;
+                    ActivityDataManager.Instance.sevenDayLoginBonusStatusList[response.BonusId - 1] = response.BonusStatus;
                     int[][] rewards = DailyLoginCfgArray.Instance.GetCfg(response.BonusId).rewardsArr;
 
                     BonusController.TryShowBonusList(rewards, onSuccess: () =>

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

@@ -119,5 +119,11 @@ namespace GFGGame
             }
             return false;
         }
+
+        public static async ETTask<bool> SaveIsAutoSelect(bool isAutoSelect)
+        {
+            await MessageHelper.SendToServer(new C2M_SaveIsAutoSelect() { IsAutoSelect = isAutoSelect });
+            return true;
+        }
     }
 }

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

@@ -239,7 +239,7 @@ namespace GFGGame
             var maxCfgID = maxCfg.id;
             var maxScore = maxCfg.score;
             var pos = _ui.m_StartIndex.position;
-            var endY = _ui.m_EndIndex.position.y;
+            var endX = _ui.m_EndIndex.position.x;
             _ui.m_ExpProcess.max = maxScore;
             //循环设置UI
             foreach (var cfg in activity7DaysCfgs)
@@ -250,8 +250,8 @@ namespace GFGGame
                 components.Add(target);
                 _ui.target.AddChild(target);
                 // 根据 maxScore  cfgScore pos.y endY 设置target 位置 x，z不变，y根据比例设置 
-                var y = pos.y + (endY - pos.y) * cfgScore / maxScore;
-                target.SetPosition(pos.x, y, pos.z);
+                var x = pos.x + (endX - pos.x) * cfgScore / maxScore;
+                target.SetPosition(x, pos.y, pos.z);
                 item.m_Score.text = cfgScore.ToString();
                 var cfgBonusArr = cfg.bonusArr;
                 var itemCfg = ItemCfgArray.Instance.GetCfg(cfgBonusArr[0][0]);
@@ -284,8 +284,8 @@ namespace GFGGame
                 var state = ActivityDay7DataManager.Instance.GetActivityDay7RewardState(cfgID);
                 item.m_c2.selectedIndex = state ? 1 : 0;
                 RedDotController.Instance.SetComRedDot(item.target,
-                    ActivityDay7DataManager.Instance.CheckActivityDay7RewardCanGet(cfgID));
-                UI_ExpProcessItem.ProxyEnd();
+                    ActivityDay7DataManager.Instance.CheckActivityDay7RewardCanGet(cfgID),"",-90);
+                UI_ExpProcessItem.ProxyEnd();   
             });
         }
 

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

@@ -24,11 +24,13 @@ namespace GFGGame
         private int _selectTab = 0;
         private List<LongPressGesture> _listLongPress = new List<LongPressGesture>();
         private List<GGraph> _listEffectHolder = new List<GGraph>();
-        private List<CardData> cardList = new List<CardData>();
-        private int wordRow = 4;  //字行数
-        private int wordNumber = 5;//字每行个数
-        private int nowIndex = 0;
-        private bool refDodgeStar = true;
+        private List<CardData> _cardList = new List<CardData>();
+        private int _wordRow = 4;  //字行数
+        private int _wordNumber = 5;//字每行个数
+        private int _nowIndex = 0;
+        private bool _refDodgeStar = true;
+        private int _isAutoSelect = 0;
+        
         private EffectUI _effectUI1;
         private EffectUI _effectUI3;
         private EffectUI _effectUI4;
@@ -110,6 +112,7 @@ namespace GFGGame
             _ui.m_ComFosterBottom.m_btnClearAll.onClick.Add(OnClcikBtnClearAll);
             _ui.m_ComFosterBottom.m_btnUpStar.onClick.Add(OnClickBtnUpStar);
             _ui.m_ComFosterBottom.m_btnUpSkillLv.onClick.Add(OnBtnUpSkill);
+            _ui.m_ComFosterBottom.m_btnCheckAuto.onClick.Add(OnBtnCheckAuto);
 
             //升级升星消耗材料列表
             _ui.m_ComFosterBottom.m_listLvConsume.itemRenderer = RenderListLvConsumeItem;
@@ -144,7 +147,7 @@ namespace GFGGame
 
         private void RefLeftAndRight()
         {
-            if (nowIndex <= 0)
+            if (_nowIndex <= 0)
             {
                 _ui.m_btnLeft.grayed = true;
                 _ui.m_btnLeft.touchable = false;
@@ -154,7 +157,7 @@ namespace GFGGame
                 _ui.m_btnLeft.touchable = true;
             }
 
-            if (nowIndex >= cardList.Count - 1)
+            if (_nowIndex >= _cardList.Count - 1)
             {
                 _ui.m_btnRight.grayed = true;
                 _ui.m_btnRight.touchable = false;
@@ -168,17 +171,17 @@ namespace GFGGame
 
         private void OnClickBtnLeft()
         {
-            nowIndex -= 1;
+            _nowIndex -= 1;
             RefLeftAndRight();
-            _cardData = cardList[nowIndex];
+            _cardData = _cardList[_nowIndex];
             RefCardFosterInfo();
         }
 
         private void OnClickBtnRight()
         {
-            nowIndex += 1;
+            _nowIndex += 1;
             RefLeftAndRight();
-            _cardData = cardList[nowIndex];
+            _cardData = _cardList[_nowIndex];
             RefCardFosterInfo();
         }
 
@@ -228,16 +231,16 @@ namespace GFGGame
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("cp_beijing");
 
             _cardData = CardDataManager.GetCardDataById((this.viewData as CardData).id);
-            nowIndex = _cardData.index;
+            _nowIndex = _cardData.index;
             _comFosterBottom = _ui.m_ComFosterBottom;
 
-            cardList = CardDataManager.GetCardListByRarity(_cardData.pageIndex);
+            _cardList = CardDataManager.GetCardListByRarity(_cardData.pageIndex);
             if (CardDataManager.isFilter == true)
             {
                 //筛选
-                cardList = CardDataManager.FilterCardList(cardList);
+                _cardList = CardDataManager.FilterCardList(_cardList);
             }
-            cardList = CardDataManager.SortItemList(cardList);
+            _cardList = CardDataManager.SortItemList(_cardList);
 
             RefCardFosterInfo();
         }
@@ -700,15 +703,18 @@ namespace GFGGame
                 ET.Log.Error("词牌：" + _cardData.id + "   无" + _cardData.star + "星升星配置");
                 return;
             }
+            _isAutoSelect = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsAutoSelect);
+            _comFosterBottom.m_btnCheckAuto.selected = _isAutoSelect == 1;
 
             //升星后星数正5才不进入
-            if (refDodgeStar || _cardData.star % 5 != 0) { 
+            if (_refDodgeStar || _cardData.star % 5 != 0) { 
                 UpdateUpStarOfStarAndText();
             }
-            refDodgeStar = true;
+            _refDodgeStar = true;
 
             _comFosterBottom.m_btnRule.onClick.Add(RuleController.ShowRuleView);
-            _comFosterBottom.m_btnRule.data = 300015;
+            _comFosterBottom.m_btnRule.data = 300021;
+
             if (CardDataManager.isFullStar(_cardData.id, _cardData.star, false))
             {
                 _comFosterBottom.m_ctrlFullStar.selectedIndex = 1;
@@ -722,7 +728,7 @@ namespace GFGGame
                 _comFosterBottom.m_ctrlFullStar.selectedIndex = 0;
                 // List<CardStarCfg> starCfgs = CardStarCfgArray.Instance.GetCfgsBycardId(_cardData.id);
 
-                _comFosterBottom.m_btnUpStar.data = 0;//data  0:材料不足，1：可以升级
+                //_comFosterBottom.m_btnUpStar.data = 0;//data  0:材料不足，1：可以升级
 
                 ItemUtil.UpdateItemNeedNum(_comFosterBottom.m_comStarCousumeGold, cardStarCfg.costID, cardStarCfg.costNum);
 
@@ -730,7 +736,7 @@ namespace GFGGame
                 _comFosterBottom.m_listStarConsume.numItems = cardStarCfg.materiarsArr.Length;
                 _comFosterBottom.m_txtTips.text = _cardData.lv < cardStarCfg.needLv ? string.Format("需等级达到{0}级", cardStarCfg.needLv) : "";
                 _comFosterBottom.m_comStarCousumeGold.visible = _cardData.lv >= cardStarCfg.needLv;
-                _comFosterBottom.m_btnUpStar.grayed = int.Parse(_comFosterBottom.m_btnUpStar.data.ToString()) == 0 ? true : false;
+                //_comFosterBottom.m_btnUpStar.grayed = int.Parse(_comFosterBottom.m_btnUpStar.data.ToString()) == 0 ? true : false;
                 // _comFosterBottom.m_btnUpStar.GetChild("ani").asMovieClip.visible = false;// !_comFosterBottom.m_btnUpStar.grayed;
             }
         }
@@ -743,8 +749,8 @@ namespace GFGGame
 
         private void UpdateUpStarOfStar()
         {
-            int starLevelDodge = _cardData.star / wordNumber;
-            for (int i = 0; i < wordRow; i++)
+            int starLevelDodge = _cardData.star / _wordNumber;
+            for (int i = 0; i < _wordRow; i++)
             {
                 UI_ComDodgeStar dodgeStar = UI_ComDodgeStar.Proxy(_comFosterBottom.target.GetChild("dodgeStar" + i));
                 dodgeStar.m_lightType.selectedIndex = (starLevelDodge > i) ? 1 : 0;
@@ -754,10 +760,10 @@ namespace GFGGame
 
         private void UpdateUpStarOfText()
         {
-            int starLevel = _cardData.star / wordNumber;
-            if (starLevel >= wordRow)
-                starLevel = wordRow - 1;
-            int index = starLevel * wordNumber;
+            int starLevel = _cardData.star / _wordNumber;
+            if (starLevel >= _wordRow)
+                starLevel = _wordRow - 1;
+            int index = starLevel * _wordNumber;
             UI_ComStarItem comStarItem = UI_ComStarItem.Proxy(_comFosterBottom.target.GetChild("comStarItem"));
             string starDesc = "";
             for (int j = 0; j < _cardData.itemCfg.starDescArr[starLevel].Length; j++)
@@ -785,6 +791,13 @@ namespace GFGGame
             listItem.m_QualityType.selectedIndex = 4;
             int needCount = cardStarCfg.materiarsArr[index][1];
             long hasCount = ItemDataManager.GetItemNum(cardStarCfg.materiarsArr[index][0]);
+            if (_isAutoSelect == 1) { 
+                if(index == 0)
+                    hasCount += ItemDataManager.GetItemNum(6003001);
+                else
+                    hasCount += ItemDataManager.GetItemNum(6003002);
+            }
+
             listItem.m_txtDecomCount.text = StringUtil.GetColorText(hasCount.ToString(), hasCount < needCount ? "#D27869" : "#FFFFFF");// StringUtil.GetColorText(needCount.ToString(), hasCount < needCount ? "#D27869" : "#FDF3D7"); ;
             listItem.m_txtDecomHasCount.text = "/" + needCount.ToString();   //;  hasCount.ToString();     
             if (listItem.target.data == null)
@@ -794,7 +807,9 @@ namespace GFGGame
             // listItem.m_btnPlus.data = cardStarCfg.materiarsArr[index][0];
             listItem.target.data = cardStarCfg.materiarsArr[index][0];
 
-            _comFosterBottom.m_btnUpStar.data = hasCount >= needCount && ItemDataManager.GetItemNum(cardStarCfg.costID) >= cardStarCfg.costNum ? 1 : 0;
+            //if (CardDataManager.GetUpStarEnoughMaterial(_cardData.id) == false) return;
+
+            //_comFosterBottom.m_btnUpStar.data = hasCount >= needCount && ItemDataManager.GetItemNum(cardStarCfg.costID) >= cardStarCfg.costNum ? 1 : 0;
 
             if (hasCount < needCount)
             {
@@ -867,20 +882,16 @@ namespace GFGGame
                 return;
             }
 
-            for (int i = 0; i < cardStarCfg.materiarsArr.Length; i++)
-            {
-                if (!ItemUtil.CheckItemEnough(cardStarCfg.materiarsArr[i][0], cardStarCfg.materiarsArr[i][1], true)) return;
-            }
-
             this.UpStar();
         }
         private async void UpStar()
         {
+            _comFosterBottom.m_btnCheckAuto.selected = _isAutoSelect == 1;
             bool result = await CardSProxy.UpgradeCardStar(_cardData.id, _comFosterBottom.m_btnCheckAuto.selected);
             if (result)
             {
                 UpdateCommon();
-                refDodgeStar = false;
+                _refDodgeStar = false;
                 UpdateUpStarView();
                 UpdateCardRes();
                 // this._selectTab = _comFosterBottom.m_ctrlTab.selectedIndex;
@@ -889,8 +900,8 @@ namespace GFGGame
                 UpdateRedDot();
 
                 if (_cardData.star % 5 == 0) {
-                    int starLevelDodge = _cardData.star / wordNumber;
-                    int starLevel = _cardData.star / wordNumber - 1;
+                    int starLevelDodge = _cardData.star / _wordNumber;
+                    int starLevel = _cardData.star / _wordNumber - 1;
                     UI_ComStarItem comStarItem = UI_ComStarItem.Proxy(_comFosterBottom.target.GetChild("comStarItem"));
                     string starDesc = "";
                     for (int j = 0; j < _cardData.itemCfg.starDescArr[starLevel].Length; j++)
@@ -929,7 +940,7 @@ namespace GFGGame
                 EffectUIPool.Recycle(_effectUI9);
                 _effectUI9 = null;
             }
-            int starLevelDodge = _cardData.star / wordNumber;
+            int starLevelDodge = _cardData.star / _wordNumber;
             UI_ComDodgeStar dodgeStar = UI_ComDodgeStar.Proxy(_comFosterBottom.target.GetChild("dodgeStar" + (starLevelDodge - 1)));
             //升星字体拖尾特效
             _effectUI9 = EffectUIPool.CreateEffectUI(dodgeStar.m_holderUpStarMove, "ui_Activity", "SX_Text_Taril_02");
@@ -949,7 +960,7 @@ namespace GFGGame
                 EffectUIPool.Recycle(_effectUI10);
                 _effectUI10 = null;
             }
-            int starLevelDodge = _cardData.star / wordNumber;
+            int starLevelDodge = _cardData.star / _wordNumber;
             UI_ComDodgeStar dodgeStar = UI_ComDodgeStar.Proxy(_comFosterBottom.target.GetChild("dodgeStar" + (starLevelDodge - 1)));
             //星星特效
             _effectUI10 = EffectUIPool.CreateEffectUI(dodgeStar.m_holderStarLight, "ui_Activity", "SX_Text_STAR_03");
@@ -1000,6 +1011,24 @@ namespace GFGGame
             }
         }
 
+        private void OnBtnCheckAuto()
+        {
+            var success = CardSProxy.SaveIsAutoSelect(_comFosterBottom.m_btnCheckAuto.selected);
+            CardStarCfg cardStarCfg = CardStarCfgArray.Instance.GetCfgBycardIdAndstarLvl(_cardData.id, _cardData.star);
+            if (cardStarCfg == null)
+            {
+                ET.Log.Error("词牌：" + _cardData.id + "   无" + _cardData.star + "星升星配置");
+                return;
+            }
+            if (_isAutoSelect == 0)
+                _isAutoSelect = 1;
+            else
+                _isAutoSelect = 0;
+
+            _comFosterBottom.m_listStarConsume.data = cardStarCfg;
+            _comFosterBottom.m_listStarConsume.numItems = cardStarCfg.materiarsArr.Length;
+        }
+
         private void OnBtnUpSkill()
         {
             List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(_cardData.id);
@@ -1020,7 +1049,7 @@ namespace GFGGame
             float diffValueX = touchBeginX - inputEvent.x;
             if (diffValueX > 20 && showCard == false)
             {
-                if (nowIndex < cardList.Count - 1)
+                if (_nowIndex < _cardList.Count - 1)
                 {
                     OnClickBtnRight();
                     RefLeftAndRight();
@@ -1028,7 +1057,7 @@ namespace GFGGame
             }
             else if (diffValueX < -20 && showCard == false)
             {
-                if (nowIndex > 0)
+                if (_nowIndex > 0)
                 {
                     OnClickBtnLeft();
                     RefLeftAndRight();

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingView.cs

@@ -271,8 +271,16 @@ namespace GFGGame
         {
             _ui.m_comFosterAni.target.visible = true;
             _ui.m_comFosterAni.m_txtContent.text = string.Format("服装{0}中......", SuitFosterDataManager.Instance.stepNames[_index]);
+
+            if (_effectUI1 != null)
+            {
+                EffectUIPool.Recycle(_effectUI1);
+                _effectUI1 = null;
+            }
+
             _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_comFosterAni.m_holder, "ui_gcdh", "ui_gcdh_" + (_index + 1));
 
+
             _ui.m_comFosterAni.m_t0.Play(() =>
             {
                 ViewManager.Show<ClothingFosterFinishView>(new object[] { _suitId, _index, _propertyList });

GameClient/Assets/Game/HotUpdate/Views/CreateRole/CreateRoleView.cs

@@ -52,13 +52,14 @@ namespace GFGGame
 
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_yaoqinghan");
             _ui.m_envelopeModel.m_btnSure.onClick.Add(OnClickBtnSure);
-            _ui.m_envelopeModel.m_btnDice.onClick.Add(() =>
+            _ui.m_envelopeModel.m_btnDice.target.onClick.Add(() =>
             {
                 RandomRoleName().Coroutine();
             });
         }
 
         //private bool test = false;
+        private Animator _btnDiceAnimator;
         private void ChangeAnimationState(State state)
         {
             switch (state)
@@ -83,6 +84,8 @@ namespace GFGGame
                 case State.OPEN:
                     EffectUIPool.Recycle(_effectUIDic["FX_player"]);
                     _effectUIDic.Remove("FX_player");
+                    _effectUIDic.Add("FX_TZ_DJ", EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_btnDice.m_holder, "ui_CreateRoleUI/After_Open", "FX_TZ_DJ"));
+                    _btnDiceAnimator = _effectUIDic["FX_TZ_DJ"].GetObj().GetComponentInChildren<Animator>();
                     _effectUIDic.Add("FX_Text", EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_TextEffectHolder, "ui_CreateRoleUI/After_Open", "FX_Text"));
                     _effectUIDic.Add("FX_ShanZi", EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_ShanZiEffectHolder, "ui_CreateRoleUI/After_Open", "FX_ShanZi"));
                     _effectUIDic.Add("FX_Niao", EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_NiaoEffectHolder, "ui_CreateRoleUI/After_Open", "FX_Niao"));
@@ -147,6 +150,8 @@ namespace GFGGame
 
         private async ETTask RandomRoleName()
         {
+            _btnDiceAnimator?.SetTrigger("click");
+
             string name = await LoginController.ReqRandomRoleName();
             if (_ui != null && _ui.m_envelopeModel.m_inputName != null)
             {

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailyWelfareView.cs

@@ -67,7 +67,7 @@ namespace GFGGame
             _valueBarController.OnShown();
 
             _ui.m_comList.m_btnSevenDayLogin.target.visible = !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SevenDayLoginView).Name, false)
-            || (ActivityDataManager.Instance.sevenDayLoginLoginId >= 7 && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.GOT));
+            || ActivityDataManager.Instance.AllSevenDayBonusGot());
 
             _limitChargeInfo = ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.XSLC);
             _ui.m_comList.m_listLimitCharge.numItems = _limitChargeInfo.Count;

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/SevenDayLoginView.cs

@@ -55,7 +55,7 @@ namespace GFGGame
         {
             _ui.m_list.numItems = _cfgs.Count;
 
-            RedDotController.Instance.SetComRedDot(_ui.m_comIcon.target, _cfg.id == ActivityDataManager.Instance.sevenDayLoginLoginId && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.CAN_GET);
+            RedDotController.Instance.SetComRedDot(_ui.m_comIcon.target, ActivityDataManager.Instance.sevenDayLoginBonusStatusList[_cfg.id - 1] == ConstBonusStatus.CAN_GET);
         }
         protected override void OnHide()
         {
@@ -72,11 +72,10 @@ namespace GFGGame
             item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
             item.m_txtName.text = itemCfg.name;
             item.m_txtNum.text = "x" + NumberUtil.ChangeNumberUnit(cfg.rewardsArr[0][1], 10000);
-            int dailyLoginId = ActivityDataManager.Instance.sevenDayLoginLoginId;
-            item.m_imgGot.visible = cfg.id < dailyLoginId || cfg.id == dailyLoginId && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.GOT;
+            item.m_imgGot.visible = ActivityDataManager.Instance.sevenDayLoginBonusStatusList[cfg.id - 1] == ConstBonusStatus.GOT;
             // if (cfg.id == dailyLoginId)
             // {
-            RedDotController.Instance.SetComRedDot(item.target, cfg.id == dailyLoginId && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.CAN_GET);
+           RedDotController.Instance.SetComRedDot(item.target, ActivityDataManager.Instance.sevenDayLoginBonusStatusList[cfg.id - 1] == ConstBonusStatus.CAN_GET);
             // }
             if (item.target.data == null)
             {
@@ -89,7 +88,7 @@ namespace GFGGame
         {
             DailyLoginCfg cfg = (context.sender as GObject).data as DailyLoginCfg;
 
-            if (cfg.id == ActivityDataManager.Instance.sevenDayLoginLoginId && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.CAN_GET)
+            if (cfg.id < ActivityDataManager.Instance.sevenDayLoginBonusStatusList.Count && ActivityDataManager.Instance.sevenDayLoginBonusStatusList[cfg.id - 1] == ConstBonusStatus.CAN_GET)
             {
                 bool result = await ActivitySProxy.ReqSevenDayLoginRewards(cfg.id);
                 if (result)

GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyOverView.cs

@@ -0,0 +1,62 @@
+using ET;
+using FairyGUI;
+using Hutool;
+using System.Collections.Generic;
+using UI.League;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class LeagueTeaPartyOverView : BaseWindow
+    {
+        private UI_LeagueTeaPartyOverUI _ui;
+        private List<UI_comTeaPartyItem> teaPartyItemList = new List<UI_comTeaPartyItem>();
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_LeagueTeaPartyOverUI.PACKAGE_NAME;
+            _ui = UI_LeagueTeaPartyOverUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zjm_2_2");
+            _ui.m_btnBack.onClick.Add(OnBtnBackClick);
+          
+        }
+
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+        }
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+        
+        private void OnBtnBackClick()
+        {
+            ViewManager.GoBackFrom(typeof(LeagueView).FullName);
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyOverView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyRewardView.cs

@@ -0,0 +1,58 @@
+using ET;
+using FairyGUI;
+using Hutool;
+using System.Collections.Generic;
+using UI.League;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class LeagueTeaPartyRewardView : BaseWindow
+    {
+        private UI_LeagueTeaPartyRewardUI _ui;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_LeagueTeaPartyRewardUI.PACKAGE_NAME;
+            _ui = UI_LeagueTeaPartyRewardUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+        }
+
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+        }
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+       
+        private void OnBtnBackClick()
+        {
+            ViewManager.GoBackFrom(typeof(LeagueView).FullName);
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyRewardView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyView.cs

@@ -7,7 +7,6 @@ using UnityEngine;
 
 namespace GFGGame
 {
-    //联盟
     public class LeagueTeaPartyView : BaseWindow
     {
         private UI_LeagueTeaPartyUI _ui;
@@ -35,6 +34,7 @@ namespace GFGGame
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_btnChat.onClick.Add(OnBtnChatClick);
             _ui.m_btnChallenge.onClick.Add(OnBtnChallengeClick);
+            _ui.m_btnReward.onClick.Add(OnBtnRewardClick);
 
             teaPartyItemList.Add(_ui.m_teaPartyItem1);
             teaPartyItemList.Add(_ui.m_teaPartyItem2);
@@ -45,9 +45,15 @@ namespace GFGGame
 
             _ui.m_teaPartyItemTips.target.onClick.Add(OnTeaPartyItemTipsClick);
 
+            int index = 0;
+            int teaPartyType = 1;
+            List<TeapartyRoleCfg> teapartyRoleCfg = TeapartyRoleCfgArray.Instance.GetCfgsByid(teaPartyType);
+
             foreach (var itemObj in teaPartyItemList) {
                 itemObj.m_btnDetail.onClick.Add(OnBtnDetailClick);
                 itemObj.m_iconRole.onClick.Add(OnBtnIconRoleClick);
+                itemObj.m_txtRoleName.text = teapartyRoleCfg[index].name;
+                index += 1;
             }
         }
 
@@ -79,9 +85,14 @@ namespace GFGGame
         {
             PromptController.Instance.ShowFloatTextPrompt("开始挑战");
 
-
+            ViewManager.Show<LeagueTeaPartyOverView>();
         }
 
+        private void OnBtnRewardClick()
+        {
+            ViewManager.Show<LeagueTeaPartyRewardView>();
+        }
+        
         private void OnBtnBackClick()
         {
             ViewManager.GoBackFrom(typeof(LeagueView).FullName);

GameClient/Assets/Game/HotUpdate/Views/League/LeagueView.cs

@@ -115,9 +115,9 @@ namespace GFGGame
         }
         private void OnBtnPartyClick()
         {
-            PromptController.Instance.ShowFloatTextPrompt("活动未开启");
+            //PromptController.Instance.ShowFloatTextPrompt("活动未开启");
 
-            //ViewManager.Show<LeagueTeaPartyView>();
+            ViewManager.Show<LeagueTeaPartyView>();
         }
         private void OnBtnShopClick()
         {

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

@@ -37,6 +37,8 @@ namespace GFGGame
         private string _currentWords;
         private string _storyStartID;
         private string lastTextFieldType;   // 上一段文本框的类型
+        TypingFadeEffect _typingEffect;
+
 
         //屏幕效果中
         private Action<object> _onScreenEffectComplete;
@@ -61,7 +63,7 @@ namespace GFGGame
             EffectUIPool.Recycle(_effectUI1);
             _effectUI1 = null;
             _onScreenEffectComplete = null;
-            Timers.inst.Remove(UpdateLetters);
+            _typingEffect = null;
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -155,7 +157,6 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
-            Timers.inst.Remove(UpdateLetters);
             Timers.inst.Remove(UpdateShake);
             Timers.inst.Remove(OnScreenEffectComplete);
             Timers.inst.Remove(ShowNextWords);
@@ -305,6 +306,7 @@ namespace GFGGame
                 delay = delay / 1000f;
                 _onScreenEffectComplete = OnScreenEffectComplete;
                 Timers.inst.Add(delay, 1, OnScreenEffectComplete);
+                StoryDialogDataManager.Instance.dialogShowDelay = 0.6f;
             }
             else
             {
@@ -341,14 +343,15 @@ namespace GFGGame
             string content = storyDialogCfg.content;
             content = storyDialogCfg.content.Replace("self", RoleDataManager.roleName);
 
-            bool delay = StoryDialogDataManager.Instance.waitBgChange;
             while (StoryDialogDataManager.Instance.waitBgChange)
             {
                 yield return new WaitForEndOfFrame();
             }
-            if (delay)
+
+            if(StoryDialogDataManager.Instance.dialogShowDelay > 0)
             {
-                yield return new WaitForSeconds(0.4f);
+                yield return new WaitForSeconds(StoryDialogDataManager.Instance.dialogShowDelay);
+                StoryDialogDataManager.Instance.dialogShowDelay = 0f;
             }
 
             _canClickBtnNext = true;
@@ -500,6 +503,8 @@ namespace GFGGame
             }
             _wordList = Regex.Split(words, "&&");
             _wordIndex = 0;
+            _typingEffect = new TypingFadeEffect(_wordTextField);
+            _typingEffect.typeFinishedAction = ShowCurrentWords;
 
             ShowNextDialog();
         }
@@ -532,7 +537,9 @@ namespace GFGGame
         private void ShowCurrentWords()
         {
             _arrow.target.visible = true;
-            Timers.inst.Remove(UpdateLetters);
+            //Timers.inst.Remove(UpdateLetters);
+            StopTyping();
+            _typingEffect?.Cancel();
             _wordTextField.text = _currentWords;
             _dialogListLookBack.Add(_currentWords);
             _isShowLetters = false;
@@ -573,33 +580,30 @@ namespace GFGGame
             _wordTextField.verticalAlign = VertAlignType.Top;
             _wordTextField.text = "";
             ArrayList letters = StoryUtil.GetLettersList(_currentWords);
+            _canClickBtnNext = false;
 
-            if (StoryDialogDataManager.Instance.waitPicFade)
+            while (StoryDialogDataManager.Instance.waitPicFade)
             {
-                StoryDialogDataManager.Instance.waitPicFade = false;
-                _canClickBtnNext = false;
-                yield return new WaitForSeconds(0.4f);
-                _canClickBtnNext = true;
+                yield return new WaitForEndOfFrame();
             }
 
-            Timers.inst.Add(GameConst.LETTERS_INTERVAL_MAX / _speedAutoPlay, 0, UpdateLetters, letters);
+            _canClickBtnNext = true;
+            _wordTextField.text = _currentWords;
+            StartTyping();
         }
 
-        private void UpdateLetters(object param)
+        private void StartTyping()
         {
-            ArrayList letters = (ArrayList)param;
-            if (letters == null || letters.Count <= 0)
-            {
-                ShowCurrentWords();
-            }
-            else
-            {
-                string letter = (string)letters[0];
-                letters.RemoveAt(0);
-                _wordTextField.text = _wordTextField.text + letter;
-            }
+            _typingEffect.SetSpeed(GameConst.LETTERS_INTERVAL_MAX / _speedAutoPlay);
+            _typingEffect.Start();
+        }
+
+        private void StopTyping()
+        {
+            _typingEffect.Cancel();
         }
 
+
         private void UpdateBg(string value)
         {
             if (value.Length > 0)
@@ -712,6 +716,8 @@ namespace GFGGame
             {
                 _ui.m_btnSpeedUp.text = "";
             }
+
+            _typingEffect?.SetSpeed(GameConst.LETTERS_INTERVAL_MAX / _speedAutoPlay);
         }
 
         private void StopAutoPlay()

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

@@ -0,0 +1,260 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using FairyGUI;
+using System;
+
+namespace GFGGame
+{
+    public class TypingFadeEffect : TypingEffect
+    {
+        protected Color32[] _backupColor32s;
+        protected Color32[] _color32s;
+        protected float charFadeDuration = 0.1f;
+
+
+        private float _currentCharFadeTime;
+
+        public Action typeFinishedAction;
+        public float progressShowNextWord = 0.8f;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="textField"></param>
+        public TypingFadeEffect(TextField textField) : base(textField) { }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="textField"></param>
+        public TypingFadeEffect(GTextField textField) : base(textField) { }
+
+        /// <summary>
+        /// 开始打字效果。可以重复调用重复启动。
+        /// </summary>
+        public new void Start()
+        {
+            _textField.graphics.meshModifier -= OnMeshModified;
+            _textField.Redraw();
+            _textField.graphics.meshModifier += OnMeshModified;
+
+            _stroke = false;
+            _shadow = false;
+            _strokeDrawDirs = 4;
+            _mainLayerStart = 0;
+            _mainLayerVertCount = 0;
+            _printIndex = 0;
+            _vertIndex = 0;
+            _currentCharFadeTime = 0.0f;
+            _started = true;
+
+            int vertCount = _textField.graphics.mesh.vertexCount;
+
+            UpdateBackUp();
+
+            // Clear mesh info
+            if (_vertices == null || _vertices.Length != vertCount)
+                _vertices = new Vector3[vertCount];
+
+            if (_color32s == null || _color32s.Length != vertCount)
+            {
+                _color32s = new Color32[vertCount];
+            }
+
+            Vector3 zero = Vector3.zero;
+            for (int i = 0; i < vertCount; i++)
+                _vertices[i] = zero;
+            _textField.graphics.mesh.vertices = _vertices;
+
+
+
+            //隐藏所有混排的对象
+            if (_textField.richTextField != null)
+            {
+                int ec = _textField.richTextField.htmlElementCount;
+                for (int i = 0; i < ec; i++)
+                    _textField.richTextField.ShowHtmlObject(i, false);
+            }
+
+            int charCount = _textField.charPositions.Count;
+            for (int i = 0; i < charCount; i++)
+            {
+                TextField.CharPosition cp = _textField.charPositions[i];
+                _mainLayerVertCount += cp.vertCount;
+            }
+
+            if (_mainLayerVertCount < vertCount) //说明有描边或者阴影
+            {
+                int repeat = vertCount / _mainLayerVertCount;
+                _stroke = repeat > 2;
+                _shadow = repeat % 2 == 0;
+                _mainLayerStart = vertCount - vertCount / repeat;
+                _strokeLayerStart = _shadow ? (vertCount / repeat) : 0;
+                _strokeDrawDirs = repeat > 8 ? 8 : 4;
+            }
+
+            Timers.inst.StartCoroutine(UpdateFadeProgress());
+        }
+
+        public bool PrintFade(byte alpha)
+        {
+            if (!_started)
+                return false;
+
+            TextField.CharPosition cp;
+            List<TextField.CharPosition> charPositions = _textField.charPositions;
+            int listCnt = charPositions.Count;
+
+            while (_printIndex < listCnt - 1) //最后一个是占位的，无效的，所以-1
+            {
+                cp = charPositions[_printIndex];
+                if (cp.vertCount > 0)
+                    output(cp.vertCount, alpha);
+                if (cp.imgIndex > 0) //这是一个图片
+                {
+                    _textField.richTextField.ShowHtmlObject(cp.imgIndex - 1, true);
+                    return true;
+                }
+                else if (!char.IsWhiteSpace(_textField.parsedText[Mathf.Max(_printIndex - 1, 0)]))
+                    return true;
+            }
+
+            Cancel();
+            typeFinishedAction.Invoke();
+            return false;
+        }
+
+
+        private void output(int vertCount, byte alpha)
+        {
+            int start, end;
+
+            start = _mainLayerStart + _vertIndex;
+            end = start + vertCount;
+            for (int i = start; i < end; i++)
+            {
+                _vertices[i] = _backupVerts[i];
+                _color32s[i] = _backupColor32s[i];
+                _color32s[i].a = alpha;
+            }
+                
+            if (_stroke)
+            {
+                start = _strokeLayerStart + _vertIndex;
+                end = start + vertCount;
+                for (int i = start; i < end; i++)
+                {
+                    for (int j = 0; j < _strokeDrawDirs; j++)
+                    {
+                        int k = i + _mainLayerVertCount * j;
+                        _vertices[k] = _backupVerts[k];
+                    }
+                }
+            }
+
+            if (_shadow)
+            {
+                start = _vertIndex;
+                end = start + vertCount;
+                for (int i = start; i < end; i++)
+                {
+                    _vertices[i] = _backupVerts[i];
+                }
+            }
+
+            _textField.graphics.mesh.vertices = _vertices;
+            _textField.graphics.mesh.colors32 = _color32s;
+
+
+            if (alpha == 255)
+            {
+                _vertIndex += vertCount;
+            }
+        }
+
+
+        public new void Cancel()
+        {
+            if (!_started)
+                return;
+
+            _started = false;
+            _textField.graphics.meshModifier -= OnMeshModified;
+            _textField.graphics.SetMeshDirty();
+        }
+
+        /// <summary>
+        /// 当打字过程中，文本可能会由于字体纹理更改而发生字体重建，要处理这种情况。
+        /// 图片对象不需要处理，因为HtmlElement.status里设定的隐藏标志不会因为Mesh更新而被冲掉。
+        /// </summary>
+        void OnMeshModified()
+        {
+            if (_textField.graphics.mesh.vertexCount != _backupVerts.Length) //可能文字都改了
+            {
+                Cancel();
+                return;
+            }
+
+            UpdateBackUp();
+
+            int vertCount = _vertices.Length;
+            Vector3 zero = Vector3.zero;
+            for (int i = 0; i < vertCount; i++)
+            {
+                if (_vertices[i] != zero)
+                    _vertices[i] = _backupVerts[i];
+            }
+
+            _textField.graphics.mesh.vertices = _vertices;
+        }
+
+        IEnumerator UpdateFadeProgress()
+        {
+            while (true)
+            {
+                if (!_started)
+                    break;
+
+                _currentCharFadeTime += Time.deltaTime;
+                float progress = _currentCharFadeTime / charFadeDuration;
+                if(progress > progressShowNextWord)
+                {
+                    PrintFade(255);
+                    ++_printIndex;
+                    _currentCharFadeTime = 0.0f;
+
+                    int listCnt = _textField.charPositions.Count;
+                    if (_printIndex >= listCnt - 1)
+                    {
+                        typeFinishedAction.Invoke();
+                        break;
+                    }
+                }
+                else 
+                {
+                    byte alpha = (byte)(progress * 255);
+                    PrintFade(alpha);
+                }
+
+                yield return new WaitForEndOfFrame();
+            }
+        }
+
+        // Back up origin text info
+        protected void UpdateBackUp()
+        {
+            _backupVerts = _textField.graphics.mesh.vertices;
+            _backupColor32s = _textField.graphics.mesh.colors32;
+        }
+
+        public void SetSpeed(float speed)
+        {
+            charFadeDuration = speed;
+        }
+
+    }
+
+}
+
+

GameClient/Assets/Game/HotUpdate/Views/MainStory/TypingFadeEffect.cs.meta

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

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

@@ -214,7 +214,7 @@ namespace GFGGame
             //if (!TimeUtil.CheckIsSameTime(lastTime * 1000, TimeHelper.ClientNow()))
             if (GameGlobal.isLogon)
             {
-                if (ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.CAN_GET &&
+                if (ActivityDataManager.Instance.CanGetSevenDayBonus() &&
                     GuideDataManager.currentGuideId <= 0)
                 {
                     ViewManager.Show<SevenDayLoginView>();
@@ -805,7 +805,7 @@ namespace GFGGame
                 FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailySignView).Name, false) ||
                 FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailySupplyView).Name, false) ||
                 !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SevenDayLoginView).Name, false) ||
-                (ActivityDataManager.Instance.sevenDayLoginLoginId >= 7 && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.GOT)));
+                ActivityDataManager.Instance.AllSevenDayBonusGot()));
             }
 
             _ui.m_btnActivityDay7.target.visible = ActivityDay7DataManager.Instance.CheckOpen();
@@ -961,7 +961,7 @@ namespace GFGGame
             FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailySignView).Name, false) ||
             FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailySupplyView).Name, false) ||
             !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SevenDayLoginView).Name, false) ||
-            (ActivityDataManager.Instance.sevenDayLoginLoginId >= 7 && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.GOT)));
+            ActivityDataManager.Instance.AllSevenDayBonusGot()));
             _btnGongGao.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(NoticeView).Name, false);
             _btnHaoYou.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FriendView).Name, false);
             _btnYouJian.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(MailView).Name, false);

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

@@ -61,7 +61,7 @@ namespace GFGGame
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.NOTICE_LIMIT_CHANGED, OnLimitChanged);
         }
-        public void AddChildCom(GComponent com)
+        public void AddChildCom(GComponent com,bool isNeedRender = true)
         {
             _ui.target.AddChildAt(com, 1);
 
@@ -69,8 +69,10 @@ namespace GFGGame
             _txtNum = com.GetChild("txtNum").asTextField;
             _txtTime = com.GetChild("txtTime").asTextField;
             _btnBuy = com.GetChild("btnBuy").asButton;
-
-            list.itemRenderer = ListItemRender;
+           if (isNeedRender)
+            {
+                list.itemRenderer = ListItemRender;
+            }
             _btnBuy.onClick.Add(OnCliclBtnBuy);
         }
         protected override void OnShown()

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

@@ -40,6 +40,7 @@ namespace GFGGame
 
             _ui.m_btnExchange.onClick.Add(() => { OnClickBtnBuy(BUY_TYPE_0); });
             _ui.m_btnBuy.onClick.Add(() => { OnClickBtnBuy(BUY_TYPE_1); });
+            _ui.m_btnBack.onClick.Add(this.Hide);
 
         }
         protected override void AddEventListener()
@@ -63,6 +64,7 @@ namespace GFGGame
             _ui.m_c1.selectedIndex = 0;
             _ui.m_txtNum1.visible = false;
             _ui.m_txtNum0.text = string.Format("(今天已兑换{0}/{1}次)", _limitData.BuyTimes, _limitCfg.buyNum);
+            _ui.m_loaBg.url = ResPathUtil.GetCommonGameResPath("ty_tc_s");
 
             List<MonthlyCardPrivilegeCfg> privilegeCfgs = MonthlyCardPrivilegeCfgArray.Instance.GetCfgsByparamsType(1);
             for (int i = 0; i < privilegeCfgs.Count; i++)

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

@@ -3,6 +3,7 @@ using FairyGUI;
 using UI.CommonGame;
 using UI.Studio;
 using UnityEngine;
+using System.Collections.Generic;
 using UI_ListRewardItem = UI.Studio.UI_ListRewardItem;
 
 namespace GFGGame
@@ -10,6 +11,7 @@ namespace GFGGame
     public class StudioFilingRewardView : BaseWindow
     {
         private UI_StudioFilingRewardUI _ui;
+        private List<int> rewardList;
 
         public override void Dispose()
         {
@@ -33,6 +35,7 @@ namespace GFGGame
 
             _ui.m_list.itemRenderer = RenderListItem;
             _ui.m_btnGet.onClick.Add(OnBtnGetClcik);
+            _ui.m_btnBack.onClick.Add(this.Hide);
         }
         protected override void AddEventListener()
         {
@@ -43,7 +46,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_txtScore.text = string.Format("本章评分:{0}", StudioDataManager.Instance.GetStudioDataById(StudioDataManager.Instance.filingChapterId).ChapterScore);
+            _ui.m_bg.url = ResPathUtil.GetCommonGameResPath("ty_tc_s");
+            _ui.m_txtScore.text = string.Format("本章评分: {0}", StudioDataManager.Instance.GetStudioDataById(StudioDataManager.Instance.filingChapterId).ChapterScore);
             UpdateView();
         }
 
@@ -68,6 +72,20 @@ namespace GFGGame
             FilingRewardCfg cfg = FilingRewardCfgArray.Instance.GetCfgsByid(StudioDataManager.Instance.filingChapterId)[index];
             UI_ListRewardItem item = UI_ListRewardItem.Proxy(obj);
             item.m_txtDesc.text = string.Format("总评分达到{0}", cfg.score);
+
+            rewardList = StudioDataManager.Instance.GetFilingRewardList(StudioDataManager.Instance.filingChapterId);
+            if (index < rewardList.Count && rewardList[index] == ConstBonusStatus.CAN_GET)
+            {
+                item.m_canGet.visible = true;
+            }
+            else if (index < rewardList.Count && rewardList[index] == ConstBonusStatus.CAN_NOT_GET)
+            {
+                item.m_canGet.visible = false;
+            }
+            else
+            {
+                item.m_canGet.visible = false;
+            }
             item.m_listReward.data = index;
             item.m_listReward.itemRenderer = RenderListRewardItem;
             item.m_listReward.numItems = cfg.itemsArr.Length;

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

@@ -39,6 +39,9 @@ namespace GFGGame
             isfullScreen = true;
             _valueBarController = new ValueBarController(_ui.m_comValueBar);
 
+            _ui.m_Bg.url = ResPathUtil.GetBgImgPath("bg_fhl");
+            _ui.m_btnChageLine.url = ResPathUtil.GetCommonGameResPath("zsx_fl");
+
             _ui.m_list.itemRenderer = RenderListItem;
 
             _ui.m_btnBack.onClick.Add(GoBackFrom);
@@ -138,11 +141,11 @@ namespace GFGGame
             item.m_txtName.text = _storyLevelCfgs[index].name;
             bool isFight = string.IsNullOrEmpty(_storyLevelCfgs[index].storyStartID);
             string resBg = isFight ? "cyjd_di_1" : "cyjd_di_2";
-            item.m_loaBg.url = string.Format("ui://Studio/{0}", resBg);
+            //item.m_loaBg.url = string.Format("ui://Studio/{0}", resBg);
 
             if (isFight)
             {
-                item.m_loaBg.url = "ui://Studio/cyjd_di_1";
+                //item.m_loaBg.url = "ui://Studio/cyjd_di_1";
                 item.m_loaIcon.visible = false;
                 item.m_loaItem.visible = true;
                 StoryFightCfg storyFightCfg = StoryFightCfgArray.Instance.GetCfg(_storyLevelCfgs[index].fightID);
@@ -157,7 +160,7 @@ namespace GFGGame
             }
             else
             {
-                item.m_loaBg.url = "ui://Studio/cyjd_di_2";
+                //item.m_loaBg.url = "ui://Studio/cyjd_di_2";
                 item.m_loaItem.visible = false;
                 item.m_loaIcon.visible = true;
                 item.m_loaIcon.url = string.Format("ui://Studio/{0}", _studioCfg.res);
@@ -272,17 +275,6 @@ namespace GFGGame
         {
             _ui.m_list.GetChildAt(itemIndex).visible = true;
             UI_ListLevelItem item = UI_ListLevelItem.Proxy(_ui.m_list.GetChildAt(itemIndex));
-            Vector3 position = item.target.position;
-            if (itemIndex % 2 == 0)
-            {
-                //item.m_ToLeft.Play();
-            }
-            else
-            {
-                position.x = 200;
-                item.target.position = position;
-                //item.m_ToRight.Play();
-            }
             item.m_Left.Play();
             itemIndex++;
             UI_ListLevelItem.ProxyEnd();

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

@@ -9,7 +9,10 @@ namespace GFGGame
     public class StudioPropertyView : StudioBaseView
     {
         // private GList _listProperty;
-
+        private GComponent com;
+        private GLoader _bg0;
+        private GLoader _bg1;
+        private GLoader _btnChageLine;
         private Controller _croProperty;
         private int _propertySelectIndex = 0;
         private int firstOpenProperty = -1;//第一个开放的副本（打开界面时，如未选择副本，则默认选中第一个开启的副本）
@@ -25,15 +28,26 @@ namespace GFGGame
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             // _ui.m_listProperty.itemRenderer = ListPropertyItemRender;
             // _ui.m_listProperty.onClickItem.Add(OnClickListProperty);
+            com = UIPackage.CreateObject(UI_StudioUI.PACKAGE_NAME, "ComProperty").asCom;
+            //AddChildCom(com, false);
+            //list.itemRenderer = ListItemRender;
+            _croProperty = com.GetController("c1");
+
+            _bg0 = com.GetChild("bg0").asLoader;
+            _bg1 = com.GetChild("bg1").asLoader;
+            _btnChageLine = com.GetChild("btnChageLine").asLoader;
         }
 
         protected override void OnShown()
         {
-            GComponent com = UIPackage.CreateObject(UI_StudioUI.PACKAGE_NAME, "ComProperty").asCom;
-            this.AddChildCom(com);
-            _croProperty = com.GetController("c1");
+            AddChildCom(com, false);
+            list.itemRenderer = ListItemRender;
             _croProperty.onChanged.Add(OnControllerChange);
 
+            _bg0.url = ResPathUtil.GetBgImgPath("bg_fhl");
+            _bg1.url = "ui://Studio/lm_db_chang_2";
+            _btnChageLine.url = ResPathUtil.GetCommonGameResPath("zsx_fl");
+            
             _propertySelectIndex = this.viewData == null ? 0 : (int)this.viewData;
 
             StudioDataManager.Instance.VIEW_NAME = typeof(StudioPropertyView).FullName;
@@ -58,8 +72,10 @@ namespace GFGGame
             list.ScrollToView(curIndex);
 
             Timers.inst.AddUpdate(CheckGuide);
-            base.OnShown();
 
+            
+            base.OnShown();
+            _ui.m_loaBg.visible = false;
         }
 
         protected override void OnHide()
@@ -125,5 +141,30 @@ namespace GFGGame
             GuideController.TryCompleteGuideIndex(ConstGuideId.STUDIO_PROPERTY, 6);
             GuideController.TryCompleteGuide(ConstGuideId.STUDIO_PROPERTY, 6);
         }
+        protected override void ListItemRender(int index, GObject obj)
+        {
+            UI_PropertyItem item = UI_PropertyItem.Proxy(obj);
+            StudioDataManager.Instance.IsCanFight(storyLevelCfgs, index, out bool canFight, out string content);
+
+            ItemData itemData = StoryBonusDataCache.GetBonusData(storyLevelCfgs[index].id).bonusBase[0];
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemData.id);
+            item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
+            item.m_star.selectedIndex = InstanceZonesDataManager.GetStarCountHistory(storyLevelCfgs[index].id);
+            item.m_imgLock.visible = canFight ? false : true;
+            item.m_lock.visible = canFight ? false : true;
+            item.m_txtTitle.text = canFight ? storyLevelCfgs[index].name : content;
+            if (canFight) curIndex = index;
+            if (item.m_loaIcon.data == null)
+            {
+                item.m_loaIcon.onClick.Add(OnLoaItemClick);
+            }
+            item.m_loaIcon.data = index;
+            if (item.m_loaBg.data == null)
+            {
+                item.m_loaBg.onClick.Add(OnCliclListItem);
+            }
+            item.m_loaBg.data = index;
+            UI_PropertyItem.ProxyEnd();
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Task/TaskAchieveDetailView.cs

@@ -161,6 +161,7 @@ namespace GFGGame
             {
                 param[i] = taskCfg.jumpParamArr[i];
             }
+
             ViewManager.JumpToView(taskCfg.jumpId, param, new object[] { typeof(TaskAchieveDetailView).FullName});
         }
     }

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

@@ -465,6 +465,9 @@ namespace GFGGame
                 case nameof(FirstChargeBonusView):
                     ViewManager.Show<FirstChargeBonusView>(param, goBackDatas, false);
                     break;
+                case nameof(ClothingSyntheticView):
+                    ViewManager.Show<ClothingSyntheticView>(param, goBackDatas, false);
+                    break;
                 default:
                     ViewManager.Show($"GFGGame.{jumpId}", null, goBackDatas, hideOther, true);
                     break;

GameClient/Assets/ResIn/UI/Studio/Studio_atlas0_3!a.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6d10296cca273b44ca26f55011c3b064
+guid: 895ffd5a0537c3b4a8688dbe83f7ec1c
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/Studio/Studio_atlas0_3.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 814cf7c198e170c4b8edca875d5a6754
+guid: ddcb539da2982954ab1d65d2f9387f6b
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}