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

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

@@ -145,6 +145,9 @@ namespace GFGGame
         //通知通行证赛季变更
         public const string NOTICE_PASSPORT_SEASON_CHANGE = "NOTICE_PASSPORT_SEASON_CHANGE";
 
+        //通知锦罗织造领取
+        public const string STORE_BROCADE_WEAV_RECEIVE = "STORE_BROCADE_WEAV_RECEIVE";
+
         //通知多个任务状态变更
         public const string NOTICE_BATCH_TASK_STATE_CHANGE = "NOTICE_BATCH_TASK_STATE_CHANGE";
 

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

@@ -193,5 +193,24 @@ namespace GFGGame
             tempItems.Clear();
             initedFromServer = false;
         }
+
+        //一键获取是否领取状态
+        public bool CheckStoreBrocadeWeavRed()
+        {
+            var battlePassCfgs = BattlePassCfgArray.Instance.GetCfgsByidAndisGood(GetSeasonId(), 1);
+            var _rewardCfgs =new List<BattlePassCfg>( BattlePassCfgArray.Instance.GetCfgsByid(GetSeasonId()));
+            var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
+            for (int level = 1; level < _rewardCfgs.Count; level++) {
+                var state = GetRewardState(level);
+                bool normalRewardGet = (state == 1);
+                if (normalRewardGet)
+                    return true;
+
+                bool superLevelRewardGet = (isBuy && !CheckSuperLevelRewardGet(level) && state == 1);
+                if (superLevelRewardGet)
+                    return true;
+            }
+            return false;
+        }
     }
 }

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

@@ -521,7 +521,7 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetShopRed()
         {
-            return GetChargeAddUpRewardRed() || GetGiftBagRewardRed() || GetGoldCardRewardRed() || GetBlackCardRewardRed() || GetBlackCardClothingRed();
+            return GetChargeAddUpRewardRed() || GetGiftBagRewardRed() || GetGoldCardRewardRed() || GetBlackCardRewardRed() || GetBlackCardClothingRed() || GetStoreBrocadeWeavRewardRed();
         }
         //商店-充值-会员中心
         public bool GetChargeAddUpRewardRed()
@@ -581,6 +581,15 @@ namespace GFGGame
             return RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold) && !MathUtil.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardExclusiveClothesMouth), _month);
         }
         /// <summary>
+        /// 商城-月卡-锦罗织造
+        /// </summary>
+        /// <returns></returns>
+        public bool GetStoreBrocadeWeavRewardRed()
+        {
+            return TaskDataManager.Instance.CheckTaskRewardCanGet(TaskFuncType.BattlePass)
+                || BattlePassTaskDataManager.Instance.CheckStoreBrocadeWeavRed();
+        }
+        /// <summary>
         /// 联盟
         /// </summary>
         /// <returns></returns>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_BrocadeWeavReward.cs

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Store
+{
+    public partial class UI_BrocadeWeavReward
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public Controller m_c2;
+        public GComponent m_NormalReward;
+        public GTextField m_Level;
+        public GList m_RewardList;
+        public const string URL = "ui://p9mtgheoot07tdc";
+        public const string PACKAGE_NAME = "Store";
+        public const string RES_NAME = "BrocadeWeavReward";
+        private static UI_BrocadeWeavReward _proxy;
+
+        public static UI_BrocadeWeavReward Create(GObject gObject = null)
+        {
+            var ui = new UI_BrocadeWeavReward();
+            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_BrocadeWeavReward Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_BrocadeWeavReward();
+            }
+            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_c1 = comp.GetController("c1");
+            m_c2 = comp.GetController("c2");
+            m_NormalReward = (GComponent)comp.GetChild("NormalReward");
+            m_Level = (GTextField)comp.GetChild("Level");
+            m_RewardList = (GList)comp.GetChild("RewardList");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_c2 = null;
+            m_NormalReward = null;
+            m_Level = null;
+            m_RewardList = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_BrocadeWeavReward.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_BrocadeWeavRewardItem.cs

@@ -0,0 +1,98 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Store
+{
+    public partial class UI_BrocadeWeavRewardItem
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public Controller m_c2;
+        public GImage m_imageProgress;
+        public GTextField m_Level;
+        public GButton m_GetRewardBt;
+        public GButton m_ContinueBt;
+        public GButton m_ComeBt;
+        public GComponent m_NormalReward;
+        public GList m_RewardList;
+        public GLoader m_touch;
+        public const string URL = "ui://p9mtgheoot07td8";
+        public const string PACKAGE_NAME = "Store";
+        public const string RES_NAME = "BrocadeWeavRewardItem";
+        private static UI_BrocadeWeavRewardItem _proxy;
+
+        public static UI_BrocadeWeavRewardItem Create(GObject gObject = null)
+        {
+            var ui = new UI_BrocadeWeavRewardItem();
+            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_BrocadeWeavRewardItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_BrocadeWeavRewardItem();
+            }
+            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_c1 = comp.GetController("c1");
+            m_c2 = comp.GetController("c2");
+            m_imageProgress = (GImage)comp.GetChild("imageProgress");
+            m_Level = (GTextField)comp.GetChild("Level");
+            m_GetRewardBt = (GButton)comp.GetChild("GetRewardBt");
+            m_ContinueBt = (GButton)comp.GetChild("ContinueBt");
+            m_ComeBt = (GButton)comp.GetChild("ComeBt");
+            m_NormalReward = (GComponent)comp.GetChild("NormalReward");
+            m_RewardList = (GList)comp.GetChild("RewardList");
+            m_touch = (GLoader)comp.GetChild("touch");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_c2 = null;
+            m_imageProgress = null;
+            m_Level = null;
+            m_GetRewardBt = null;
+            m_ContinueBt = null;
+            m_ComeBt = null;
+            m_NormalReward = null;
+            m_RewardList = null;
+            m_touch = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_BrocadeWeavRewardItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_BrocadeWeavTask.cs

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Store
+{
+    public partial class UI_BrocadeWeavTask
+    {
+        public GComponent target;
+        public GImage m_bg;
+        public GGraph m_holderLeftTop;
+        public GGraph m_holderRightDowm;
+        public GList m_TaskList;
+        public GTextField m_txtCount;
+        public GButton m_btnGet;
+        public const string URL = "ui://p9mtgheoga99tdi";
+        public const string PACKAGE_NAME = "Store";
+        public const string RES_NAME = "BrocadeWeavTask";
+        private static UI_BrocadeWeavTask _proxy;
+
+        public static UI_BrocadeWeavTask Create(GObject gObject = null)
+        {
+            var ui = new UI_BrocadeWeavTask();
+            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_BrocadeWeavTask Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_BrocadeWeavTask();
+            }
+            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");
+            m_TaskList = (GList)comp.GetChild("TaskList");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_btnGet = (GButton)comp.GetChild("btnGet");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_holderLeftTop = null;
+            m_holderRightDowm = null;
+            m_TaskList = null;
+            m_txtCount = null;
+            m_btnGet = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_BrocadeWeavTask.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ExpProcess.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Store
+{
+    public partial class UI_ExpProcess
+    {
+        public GProgressBar target;
+        public Controller m_c1;
+        public GTextField m_Level;
+        public GTextField m_NumProcess;
+        public GLoader m_loaIcon;
+        public const string URL = "ui://p9mtgheoot07tct";
+        public const string PACKAGE_NAME = "Store";
+        public const string RES_NAME = "ExpProcess";
+        private static UI_ExpProcess _proxy;
+
+        public static UI_ExpProcess Create(GObject gObject = null)
+        {
+            var ui = new UI_ExpProcess();
+            if(gObject == null)
+            	ui.target =  (GProgressBar)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GProgressBar)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ExpProcess Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ExpProcess();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GProgressBar)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GProgressBar)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_c1 = comp.GetController("c1");
+            m_Level = (GTextField)comp.GetChild("Level");
+            m_NumProcess = (GTextField)comp.GetChild("NumProcess");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_Level = null;
+            m_NumProcess = null;
+            m_loaIcon = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ExpProcess.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListBrocadeWeavTaskItem.cs

@@ -0,0 +1,92 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Store
+{
+    public partial class UI_ListBrocadeWeavTaskItem
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public Controller m_c2;
+        public Controller m_c3;
+        public GTextField m_txtDesc;
+        public GTextField m_txtCount;
+        public GList m_listTaskReward;
+        public GButton m_GetRewardBt;
+        public GButton m_ComeBt;
+        public const string URL = "ui://p9mtgheoga99tdl";
+        public const string PACKAGE_NAME = "Store";
+        public const string RES_NAME = "ListBrocadeWeavTaskItem";
+        private static UI_ListBrocadeWeavTaskItem _proxy;
+
+        public static UI_ListBrocadeWeavTaskItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListBrocadeWeavTaskItem();
+            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_ListBrocadeWeavTaskItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListBrocadeWeavTaskItem();
+            }
+            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_c1 = comp.GetController("c1");
+            m_c2 = comp.GetController("c2");
+            m_c3 = comp.GetController("c3");
+            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_listTaskReward = (GList)comp.GetChild("listTaskReward");
+            m_GetRewardBt = (GButton)comp.GetChild("GetRewardBt");
+            m_ComeBt = (GButton)comp.GetChild("ComeBt");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_c2 = null;
+            m_c3 = null;
+            m_txtDesc = null;
+            m_txtCount = null;
+            m_listTaskReward = null;
+            m_GetRewardBt = null;
+            m_ComeBt = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListBrocadeWeavTaskItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreBrocadeWeavUI.cs

@@ -0,0 +1,100 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Store
+{
+    public partial class UI_StoreBrocadeWeavUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GTextField m_LeftTime;
+        public GButton m_tip;
+        public UI_ExpProcess m_LevelProcess;
+        public GButton m_btnBuyLevel;
+        public GButton m_btnOpen;
+        public GButton m_btnBrocadeWeavTask;
+        public GList m_RewardList;
+        public GButton m_btnGetAll;
+        public UI_BrocadeWeavReward m_SpecialReward;
+        public const string URL = "ui://p9mtgheoot07tcq";
+        public const string PACKAGE_NAME = "Store";
+        public const string RES_NAME = "StoreBrocadeWeavUI";
+        private static UI_StoreBrocadeWeavUI _proxy;
+
+        public static UI_StoreBrocadeWeavUI Create(GObject gObject = null)
+        {
+            var ui = new UI_StoreBrocadeWeavUI();
+            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_StoreBrocadeWeavUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_StoreBrocadeWeavUI();
+            }
+            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_c1 = comp.GetController("c1");
+            m_LeftTime = (GTextField)comp.GetChild("LeftTime");
+            m_tip = (GButton)comp.GetChild("tip");
+            m_LevelProcess = (UI_ExpProcess)UI_ExpProcess.Create(comp.GetChild("LevelProcess"));
+            m_btnBuyLevel = (GButton)comp.GetChild("btnBuyLevel");
+            m_btnOpen = (GButton)comp.GetChild("btnOpen");
+            m_btnBrocadeWeavTask = (GButton)comp.GetChild("btnBrocadeWeavTask");
+            m_RewardList = (GList)comp.GetChild("RewardList");
+            m_btnGetAll = (GButton)comp.GetChild("btnGetAll");
+            m_SpecialReward = (UI_BrocadeWeavReward)UI_BrocadeWeavReward.Create(comp.GetChild("SpecialReward"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_LeftTime = null;
+            m_tip = null;
+            m_LevelProcess.Dispose();
+            m_LevelProcess = null;
+            m_btnBuyLevel = null;
+            m_btnOpen = null;
+            m_btnBrocadeWeavTask = null;
+            m_RewardList = null;
+            m_btnGetAll = null;
+            m_SpecialReward.Dispose();
+            m_SpecialReward = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreBrocadeWeavUI.cs.meta

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

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

@@ -102,6 +102,7 @@ namespace GFGGame
                 BattlePassTaskDataManager.Instance.AddSuperReward(level);
             }
             EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
+            EventAgent.DispatchEvent(ConstMessage.STORE_BROCADE_WEAV_RECEIVE);
             BonusController.TryShowBonusList(bonusList);
             return true;
         }

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

@@ -112,11 +112,11 @@ namespace GFGGame
             _ui.m_ComFosterBottom.m_listShowCard.onClickItem.Add(OnClickShowCardListItem);
 
             // _ui.m_loaCard.onClick.Add(OnClickLoaCard);
-            _ui.m_loaListener1.onClick.Add(OnClickLoaCard);
-            _ui.m_comImgCard.target.onClick.Add(OnClickLoaCard);
+            //_ui.m_loaListener1.onClick.Add(OnClickLoaCard);
+            //_ui.m_comImgCard.target.onClick.Add(OnClickLoaCard);
 
-            _ui.m_loaListener.onClick.Add(OnClickComCard);
-            _ui.m_comCard.target.onClick.Add(OnClickComCard);
+            //_ui.m_loaListener.onClick.Add(OnClickComCard);
+            //_ui.m_comCard.target.onClick.Add(OnClickComCard);
 
             _effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_ComFosterBottom.m_holderflower, "ui_Activity", "SX_Top_TX");
             _effectUI4 = EffectUIPool.CreateEffectUI(_ui.m_ComFosterBottom.m_holderfBgEff, "ui_Activity", "SX_Down_TX");
@@ -812,41 +812,41 @@ namespace GFGGame
             playAni = true;
             if (!showCard)
             {
-                _ui.m_loaListener1.visible = false;
-                GTween.To(comCardImgResInitSize, comCardImgResTargetSize, 0.5f).SetTarget(_ui.m_comImgCard.m_ComCardImgRes).OnUpdate((GTweener t) =>
-                {
-                    _ui.m_comImgCard.m_ComCardImgRes.target.size = t.value.vec2;
-                });
-
-                GTween.To(_ui.m_comImgCard.target.scrollPane.posX, (comCardImgResTargetSize.x - _ui.target.width) / 2, 0.5f).SetTarget(_ui.m_comImgCard.target.scrollPane).OnUpdate((GTweener t) =>
-                {
-                    _ui.m_comImgCard.target.scrollPane.posX = t.value.x;
-                });
-                _ui.m_t0.Play(() =>
-                {
-                    playAni = false;
-                });
+                //_ui.m_loaListener1.visible = false;
+                //GTween.To(comCardImgResInitSize, comCardImgResTargetSize, 0.5f).SetTarget(_ui.m_comImgCard.m_ComCardImgRes).OnUpdate((GTweener t) =>
+                //{
+                //    _ui.m_comImgCard.m_ComCardImgRes.target.size = t.value.vec2;
+                //});
+
+                //GTween.To(_ui.m_comImgCard.target.scrollPane.posX, (comCardImgResTargetSize.x - _ui.target.width) / 2, 0.5f).SetTarget(_ui.m_comImgCard.target.scrollPane).OnUpdate((GTweener t) =>
+                //{
+                //    _ui.m_comImgCard.target.scrollPane.posX = t.value.x;
+                //});
+                //_ui.m_t0.Play(() =>
+                //{
+                //    playAni = false;
+                //});
                 showCard = true;
             }
             else
             {
-                _ui.m_loaListener1.visible = true;
-                _ui.m_t1.SetHook("scale", () =>
-                {
-                    GTween.To(comCardImgResTargetSize, comCardImgResInitSize, 0.5f).SetTarget(_ui.m_comImgCard.m_ComCardImgRes).OnUpdate((GTweener t) =>
-                   {
-                       _ui.m_comImgCard.m_ComCardImgRes.target.size = t.value.vec2;
-                   });
-                    GTween.To(_ui.m_comImgCard.target.scrollPane.posX, (comCardImgResInitSize.x - _ui.target.width) / 2, 0.5f).SetTarget(_ui.m_comImgCard.target.scrollPane).OnUpdate((GTweener t) =>
-                    {
-                        _ui.m_comImgCard.target.scrollPane.posX = t.value.x;
-                    });
-                });
-
-                _ui.m_t1.Play(() =>
-                {
-                    playAni = false;
-                });
+                //_ui.m_loaListener1.visible = true;
+                //_ui.m_t1.SetHook("scale", () =>
+                //{
+                //    GTween.To(comCardImgResTargetSize, comCardImgResInitSize, 0.5f).SetTarget(_ui.m_comImgCard.m_ComCardImgRes).OnUpdate((GTweener t) =>
+                //   {
+                //       _ui.m_comImgCard.m_ComCardImgRes.target.size = t.value.vec2;
+                //   });
+                //    GTween.To(_ui.m_comImgCard.target.scrollPane.posX, (comCardImgResInitSize.x - _ui.target.width) / 2, 0.5f).SetTarget(_ui.m_comImgCard.target.scrollPane).OnUpdate((GTweener t) =>
+                //    {
+                //        _ui.m_comImgCard.target.scrollPane.posX = t.value.x;
+                //    });
+                //});
+
+                //_ui.m_t1.Play(() =>
+                //{
+                //    playAni = false;
+                //});
                 showCard = false;
             }
         }
@@ -856,37 +856,37 @@ namespace GFGGame
             playAni = true;
             if (showCard)
             {
-                _ui.m_loaListener.visible = true;
+                //_ui.m_loaListener.visible = true;
 
-                _ui.m_comCard.target.scrollPane.SetPercX(0.5f, true);
+                //_ui.m_comCard.target.scrollPane.SetPercX(0.5f, true);
 
-                float scale = _ui.m_comCard.target.scaleX;
-                _ui.m_t1.SetValue("scale", scale, scale);
-                _ui.m_t1.SetValue("normal", _cardScale, _cardScale);
-                _ui.m_t1.Play(() =>
-                {
-                    playAni = false;
+                //float scale = _ui.m_comCard.target.scaleX;
+                //_ui.m_t1.SetValue("scale", scale, scale);
+                //_ui.m_t1.SetValue("normal", _cardScale, _cardScale);
+                //_ui.m_t1.Play(() =>
+                //{
+                //    playAni = false;
 
-                });
+                //});
                 showCard = false;
 
             }
             else
             {
-                _ui.m_loaListener.visible = false;
+                //_ui.m_loaListener.visible = false;
 
-                float scale = _ui.target.height / 1920;
-                _ui.m_comCard.target.scrollPane.viewWidth = 1080 / scale;
-                _ui.m_comCard.target.scrollPane.SetPercX(0.5f, true);
+                //float scale = _ui.target.height / 1920;
+                //_ui.m_comCard.target.scrollPane.viewWidth = 1080 / scale;
+                //_ui.m_comCard.target.scrollPane.SetPercX(0.5f, true);
 
-                _ui.m_t0.SetValue("scale", scale, scale);
-                _ui.m_t0.SetValue("normal", _cardScale, _cardScale);
+                //_ui.m_t0.SetValue("scale", scale, scale);
+                //_ui.m_t0.SetValue("normal", _cardScale, _cardScale);
 
-                _ui.m_t0.Play(() =>
-                {
-                    playAni = false;
+                //_ui.m_t0.Play(() =>
+                //{
+                //    playAni = false;
 
-                });
+                //});
                 showCard = true;
 
             }

GameClient/Assets/Game/HotUpdate/Views/CommonGame/ItemView.cs

@@ -97,6 +97,15 @@ namespace GFGGame
                 return _itemData;
             }
         }
+
+        public GComponent GetGComponentObj
+        {
+            get
+            {
+                return _obj;
+            }
+        }
+
         /// <summary>
         /// “已领取”显示状态
         /// </summary>
@@ -157,7 +166,7 @@ namespace GFGGame
                 _imgShouTong.visible = value;
             }
         }
-
+        
         /// <summary>
         /// 显示名字
         /// </summary>

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

@@ -76,9 +76,9 @@ namespace GFGGame
                 obj.data = new ItemView(obj as GComponent);
             }
             (obj.data as ItemView).SetData(reward);
-            (obj.data as ItemView).SetComItemScale = 0.72f;
+            //(obj.data as ItemView).SetComItemScale = 0.72f;
             // (obj.data as ItemView).SetTxtCountScale = 0.8f;
-            (obj.data as ItemView).SetTxtCountPos(185, 155);
+            //(obj.data as ItemView).SetTxtCountPos(185, 155);
         }
     }
 }

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

@@ -81,9 +81,9 @@ namespace GFGGame
                 obj.data = new ItemView(obj as GComponent);
             }
             (obj.data as ItemView).SetData(reward);
-            (obj.data as ItemView).SetComItemScale = 0.72f;
+            //(obj.data as ItemView).SetComItemScale = 0.72f;
             // (obj.data as ItemView).SetTxtCountScale = 0.8f;
-            (obj.data as ItemView).SetTxtCountPos(185, 155);
+            //(obj.data as ItemView).SetTxtCountPos(185, 155);
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Store/BrocadeWeavTask.cs

@@ -0,0 +1,212 @@
+using System.Collections.Generic;
+using System.Linq;
+using ET;
+using FairyGUI;
+using UI.CommonGame;
+using UI.Store;
+
+namespace GFGGame
+{
+    public class BrocadeWeavTaskView : BaseWindow
+    {
+        private UI_BrocadeWeavTask _ui;
+        private List<TaskCfg> _cfgs;
+        private int funcType = TaskFuncType.BattlePass;
+
+        private EffectUI _effectUI1;
+        private EffectUI _effectUI2;
+
+        public override void Dispose()
+        {
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+            EffectUIPool.Recycle(_effectUI2);
+            _effectUI2 = null;
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_BrocadeWeavTask.PACKAGE_NAME;
+            _ui = UI_BrocadeWeavTask.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+            _ui.m_TaskList.itemRenderer = TaskItemRender;
+            _ui.m_btnGet.onClick.Add(OnBtnGetAllClick);
+            AddEffect();
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            UpdateTask();
+            if (_ui.m_TaskList.numItems > 0)
+            {
+                _ui.m_TaskList.ScrollToView(0);
+            }
+        }
+
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            // EventAgent.AddEventListener(ConstMessage.NOTICE_TASK_STATE_CHANGE, OnTaskChange);
+            EventAgent.AddEventListener(ConstMessage.NOTICE_BATCH_TASK_STATE_CHANGE, OnTaskChanges);
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            // EventAgent.RemoveEventListener(ConstMessage.NOTICE_TASK_STATE_CHANGE, OnTaskChange);
+            EventAgent.RemoveEventListener(ConstMessage.NOTICE_BATCH_TASK_STATE_CHANGE, OnTaskChanges);
+        }
+
+
+        //OnTaskChanges
+        private void OnTaskChanges(EventContext eventContext)
+        {
+            var taskIds = (List<int>)eventContext.data;
+            if (taskIds.Select(taskId => TaskCfgArray.Instance.GetCfg(taskId)).Where(taskCfg => taskCfg != null)
+                .Any(taskCfg => taskCfg.funcType == funcType))
+            {
+                UpdateTask();
+            }
+        }
+
+        private void OnTaskChange(EventContext eventContext)
+        {
+            var taskId = (int)eventContext.data;
+            var taskCfg = TaskCfgArray.Instance.GetCfg(taskId);
+            if (taskCfg == null) return;
+            if (taskCfg.funcType != funcType) return;
+            UpdateTask();
+        }
+
+        //切换任务类型
+        private void OnCtrlChange()
+        {
+            //更新任务列表
+            UpdateTask();
+        }
+
+        //更新任务列表
+        private void UpdateTask()
+        {
+            _cfgs = TaskDataManager.Instance.GetTaskCfgs(funcType);
+            _ui.m_TaskList.numItems = _cfgs.Count;
+            RedDotController.Instance.SetComRedDot(_ui.m_btnGet,
+                TaskDataManager.Instance.CheckTaskRewardCanGet(TaskFuncType.BattlePass));
+        }
+
+        private void TaskItemRender(int index, GObject obj)
+        {
+            var item = UI_TaskListItem.Proxy(obj);
+            //领取状态
+            item.m_c1.selectedIndex = TaskDataManager.Instance.GetTaskStateById(_cfgs[index].id);
+            item.m_c2.selectedIndex = _cfgs[index].jumpId == "" ? 1 : 0;
+            item.m_txtDesc.text = TaskDataManager.Instance.GetTaskDesc(_cfgs[index].id);
+            item.m_txtCount.text =
+                $"{TaskDataManager.Instance.GetTaskProgressById(_cfgs[index].id)}/{_cfgs[index].GetTargetCount()}";
+            if (item.m_GetRewardBt.data == null)
+            {
+                item.m_GetRewardBt.onClick.Add(OnBtnGetClick);
+            }
+            item.m_GetRewardBt.data = _cfgs[index].id;
+            if (item.m_ComeBt.data == null)
+            {
+                item.m_ComeBt.onClick.Add(OnBtnGoClick);
+            }
+            item.m_ComeBt.data = _cfgs[index];
+            if (item.m_listTaskReward.data == null)
+            {
+                item.m_listTaskReward.itemRenderer = ListTaskRewardItemRender;
+            }
+            var reward = TaskDataManager.Instance.GetReward(_cfgs[index]);
+            item.m_listTaskReward.data = reward;
+            item.m_listTaskReward.numItems = reward.Length;
+            var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
+            bool canGet = item.m_c1.selectedIndex == 1 && (funcType != TaskFuncType.BattlePass || funcType == TaskFuncType.BattlePass && isBuy);
+            RedDotController.Instance.SetComRedDot(item.m_GetRewardBt, canGet);
+            UI_TaskListItem.ProxyEnd();
+        }
+
+        private static void ListTaskRewardItemRender(int index, GObject obj)
+        {
+            var rewards = (int[][])obj.parent.data;
+            var itemData = ItemUtil.createItemData(rewards[index]);
+            var item = new ItemView(obj as GComponent);
+            obj.data = item;
+            item.SetData(itemData);
+            item.ChangeTxtCountStyle();
+            UI_RewardIconYellow.ProxyEnd();
+        }
+
+        private async void OnBtnGetClick(EventContext context)
+        {
+            if (!(context.sender is GObject btnGet)) return;
+            if (funcType == TaskFuncType.BattlePass)
+            {
+                //检查通行证是否开启
+                var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
+                if (!isBuy)
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("开启锦罗织造可领取");
+                    return;
+                }
+            }
+            var result = await TaskSProxy.GetTaskBonus((int)btnGet.data);
+            if (!result) return;
+            UpdateTask();
+            LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_REN_WU, 2);
+        }
+
+        private void OnBtnGoClick(EventContext context)
+        {
+            if (!(context.sender is GObject { data: TaskCfg taskCfg })) return;
+            //功能未开放
+            if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(taskCfg.jumpId)) return;
+            Hide();
+            var param = new object[taskCfg.jumpParamArr.Length];
+            for (var i = 0; i < taskCfg.jumpParamArr.Length; i++)
+            {
+                param[i] = taskCfg.jumpParamArr[i];
+            }
+            ViewManager.JumpToView(taskCfg.jumpId, param, new[] { typeof(StoreView).FullName, viewData });
+        }
+
+        private async void OnBtnGetAllClick()
+        {
+            //通用任务一键领奖
+            if (funcType == TaskFuncType.BattlePass)
+            {
+                //检查通行证是否开启
+                var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
+                if (!isBuy)
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("开启锦罗织造可领取");
+                    return;
+                }
+            }
+            var result = await TaskSProxy.GetAllTaskBonus(funcType);
+            if (!result) return;
+            UpdateTask();
+            LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_REN_WU, 2);
+        }
+
+        private void AddEffect()
+        {
+            //邊框左上角特效
+            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holderLeftTop, "ui_Activity", "Com_window_L_up");
+
+            //邊框右下角特效
+            _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_holderRightDowm, "ui_Activity", "Com_window_R_Down");
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/Store/BrocadeWeavTask.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/Store/StoreBrocadeWeavView.cs

@@ -0,0 +1,403 @@
+using System.Collections.Generic;
+using System.Linq;
+using ET;
+using FairyGUI;
+using UI.Store;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class StoreBrocadeWeavView : BaseWindow
+    {
+        private UI_StoreBrocadeWeavUI _ui;
+
+        private List<BattlePassCfg> _rewardCfgs;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_StoreBrocadeWeavUI.PACKAGE_NAME;
+            _ui = UI_StoreBrocadeWeavUI.Create();
+            viewCom = _ui.target;
+            isfullScreen = true;
+            clickBlankToClose = false;
+            _ui.m_btnOpen.onClick.Add(OnBtnOpenClick);
+            _ui.m_btnBuyLevel.onClick.Add(OnBtnBuyLevel);
+            _ui.m_btnGetAll.onClick.Add(OnBtnGetAllClick);
+            _ui.m_btnBrocadeWeavTask.onClick.Add(OnBtnBrocadeWeavTaskClick);
+            _ui.m_RewardList.itemRenderer = ListBoxRewardItemRender;
+            _ui.m_RewardList.SetVirtual();
+            _ui.m_SpecialReward.m_RewardList.itemRenderer = SpecialRewardRender;
+            _ui.m_tip.onClick.Add(RuleController.ShowRuleView);
+            _ui.m_tip.data = 300012;
+            _ui.m_LevelProcess.m_loaIcon.url =
+            ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(ConstItemID.BATTLE_PASS_CURRENCY).res);
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+            Timers.inst.Remove(UpdateTime);
+        }
+
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            oldLevel = 0;
+            SetSeasonLeftTime();
+            SetBattlePassLevel();
+            SetOpenBattlePassBtnStatus();
+            FreshSpecialReward(oldLevel);
+            var battlePassCfgs =
+                BattlePassCfgArray.Instance.GetCfgsByid(BattlePassTaskDataManager.Instance.GetSeasonId());
+            var minLevel =
+                (from battlePassCfg in battlePassCfgs
+                 let state = BattlePassTaskDataManager.Instance.GetRewardState(battlePassCfg.level)
+                 where battlePassCfg.level != 0 && state != 2
+                 select battlePassCfg.level).FirstOrDefault();
+            minLevel = Mathf.Max(1, minLevel);
+            _ui.m_RewardList.ScrollToView(minLevel - 1);
+            UpdateBtnBrocadeWeavTaskRed();
+        }
+
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            //监听通行证等级变化
+            EventAgent.AddEventListener(ConstMessage.BATTLEPASS_LEVEL_CHANGE, SetBattlePassLevel);
+            EventAgent.AddEventListener(ConstMessage.NOTICE_PASSPORT_OPEN, OnBattlePassOpen);
+            EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, OnItemChange);
+            EventAgent.AddEventListener(ConstMessage.NOTICE_BATCH_TASK_STATE_CHANGE, UpdateBtnBrocadeWeavTaskRed);
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.BATTLEPASS_LEVEL_CHANGE, SetBattlePassLevel);
+            EventAgent.RemoveEventListener(ConstMessage.NOTICE_PASSPORT_OPEN, OnBattlePassOpen);
+            EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, OnItemChange);
+            EventAgent.RemoveEventListener(ConstMessage.NOTICE_BATCH_TASK_STATE_CHANGE, UpdateBtnBrocadeWeavTaskRed);
+        }
+
+        private void OnBattlePassOpen()
+        {
+            SetOpenBattlePassBtnStatus();
+            FreshReward();
+        }
+
+        private void OnItemChange(EventContext eventContext)
+        {
+            var itemId = (int)eventContext.data;
+            if (itemId != ConstItemID.BATTLE_PASS_CURRENCY) return;
+
+            //刷新积分列表
+            SetExpProcess();
+        }
+
+
+        //开启通行证
+        private void OnBtnOpenClick(EventContext context)
+        {
+            ViewManager.Show<OpenBattlePassView>(null, new object[] { typeof(StoreBrocadeWeavView).FullName, null });
+        }
+
+        private void OnBtnBuyLevel(EventContext context)
+        {
+            var dataManager = BattlePassTaskDataManager.Instance;
+            var seasonId = dataManager.GetSeasonId();
+            var battlePassCfg =
+                BattlePassCfgArray.Instance.GetCfgByidAndlevel(seasonId, dataManager.GetBattlePassLevel() + 1);
+            if (battlePassCfg == null)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("已经满级");
+                return;
+            }
+            ViewManager.Show<BuyBattlePassLevelView>(null, new object[] { typeof(StoreBrocadeWeavView).FullName, null });
+        }
+
+        //领取奖励
+        private async void OnBtnGetClick(EventContext context)
+        {
+            if (!(context.sender is GObject obj)) return;
+            var id = (int)obj.data;
+            var get = await BattlePassTaskSProxy.GetBattlePassReward(id);
+            if (!get) return;
+            SetBattlePassLevel();
+        }
+
+        //继续领取
+        private void OnBtnContinueClick(EventContext context)
+        {
+            // if (!(context.sender is GObject obj)) return;
+            // var id = (int)obj.data;
+            // var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
+            // if (!isBuy)
+            // {
+            ViewManager.Show<OpenBattlePassView>(null, new object[] { typeof(StoreBrocadeWeavView).FullName, null });
+            // return;
+            // }
+            // var get = await BattlePassTaskSProxy.GetBattlePassReward(id);
+            // if (!get) return;
+            // SetBattlePassLevel();
+        }
+
+        //领取全部奖励
+        private async void OnBtnGetAllClick(EventContext context)
+        {
+            var get = await BattlePassTaskSProxy.GetAllBattlePassReward(onSuccess: () =>
+            {
+                var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
+                if (isBuy) return;
+                ViewManager.Show<OpenBattlePassView>(null,
+                    new object[] { typeof(StoreBrocadeWeavView).FullName, null });
+            });
+            if (!get) return;
+            SetBattlePassLevel();
+        }
+
+        //点击织造任务
+        private void OnBtnBrocadeWeavTaskClick(EventContext context)
+        {
+            ViewManager.Show<BrocadeWeavTaskView>();
+        }
+        
+
+        //前往
+        // private void OnBtnGoClick(EventContext context)
+        // {
+        //     Hide();
+        //     var btnGo = context.sender as GObject;
+        //     if (btnGo == null) return;
+        //     ViewManager.Show($"GFGGame.{btnGo.data}", null, new[] { typeof(TaskView).FullName, viewData }, true);
+        // }
+
+
+        private void ListBoxRewardItemRender(int index, GObject obj)
+        {
+            var item = UI_BrocadeWeavRewardItem.Proxy(obj);
+            var level = index + 1;
+
+            //设置进度
+            item.m_imageProgress.visible = BattlePassTaskDataManager.Instance.GetBattlePassLevel() >= level;
+            //这里跳过为0的第一个配置
+            var battlePassCfg = _rewardCfgs[level];
+            //设置等级
+            item.m_Level.text = battlePassCfg.level.ToString();
+            //获取玩家当前的通行证等级
+            var state = BattlePassTaskDataManager.Instance.GetRewardState(level);
+            //设置奖励
+            var bonusNormalArr = battlePassCfg.bonusNormalArr;
+            if (bonusNormalArr != null && bonusNormalArr.Length > 0)
+            {
+                item.m_NormalReward.visible = true;
+                var itemData = ItemUtil.createItemData(bonusNormalArr[0]);
+                var itemView = new ItemView(item.m_NormalReward);
+                item.m_NormalReward.data ??= itemView;
+                itemView.SetData(itemData);
+                itemView.ChangeTxtCountStyle();
+                itemView.GrpGotVisible = BattlePassTaskDataManager.Instance.CheckLevelRewardGet(level);
+                bool redDot = (!BattlePassTaskDataManager.Instance.CheckLevelRewardGet(level) && state == 1);
+                RedDotController.Instance.SetComRedDot(item.m_NormalReward, redDot);
+            }
+            else
+            {
+                item.m_NormalReward.data = null;
+                item.m_NormalReward.visible = false;
+            }
+            if (item.m_RewardList.data == null)
+            {
+                item.m_RewardList.itemRenderer = SpecialRewardRender;
+            }
+            var superLevelRewardGet = BattlePassTaskDataManager.Instance.CheckSuperLevelRewardGet(level);
+            item.m_RewardList.data = (battlePassCfg.bonusSpecialArr, true , state, superLevelRewardGet);
+            item.m_RewardList.numItems = battlePassCfg.bonusSpecialArr.Length;
+            if (state == 1)
+            {
+                item.m_touch.onClick.Set(OnBtnGetClick);
+                item.m_touch.data = battlePassCfg.level;
+                item.m_touch.touchable = true;
+            }
+            else {
+                item.m_touch.onClick.Clear();
+                item.m_touch.touchable = false;
+            }
+
+            //设置按钮状态
+            //SetBtnState(item, battlePassCfg.level, state);
+            //item.target.data = battlePassCfg;
+
+            UI_BrocadeWeavRewardItem.ProxyEnd();
+            FreshSpecialReward(level);
+        }
+
+        //SpecialRewardRender
+        private static void SpecialRewardRender(int index, GObject obj)
+        {
+            var keyValuePair = ((int[][], bool, int, bool))obj.parent.data;
+            var itemInfo = keyValuePair.Item1[index];
+            var itemData = ItemUtil.createItemData(itemInfo);
+            var itemView = new ItemView(obj as GComponent);
+            obj.data ??= itemView;
+            itemView.SetData(itemData);
+            itemView.ChangeTxtCountStyle();
+            var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
+            if (keyValuePair.Item2 && isBuy) {
+                RedDotController.Instance.SetComRedDot(itemView.GetGComponentObj, keyValuePair.Item3 == 1);
+                itemView.GrpGotVisible = keyValuePair.Item4;
+            }
+        }
+
+        //根据状态设置按钮
+        private void SetBtnState(UI_BrocadeWeavRewardItem item, int id, int state)
+        {
+            item.m_c1.selectedIndex = state;
+            RedDotController.Instance.SetComRedDot(item.m_GetRewardBt, state == 1);
+            if (item.m_GetRewardBt.data == null)
+            {
+                item.m_GetRewardBt.onClick.Add(OnBtnGetClick);
+            }
+            item.m_GetRewardBt.data = id;
+            //继续领取
+            if (item.m_ContinueBt.data == null)
+            {
+                item.m_ContinueBt.onClick.Add(OnBtnContinueClick);
+            }
+            item.m_ContinueBt.data = id;
+            //前往
+            if (item.m_ComeBt.data == null)
+            {
+                item.m_ComeBt.enabled = false;
+            }
+            item.m_ComeBt.data = id;
+        }
+
+        //设置赛季剩余时间
+        private void SetSeasonLeftTime()
+        {
+            //获取赛季结束时间
+            Timers.inst.Add(1, 0, UpdateTime);
+        }
+
+        //UpdateTime
+        private void UpdateTime(object param)
+        {
+            var seasonEndTime = BattlePassTaskDataManager.Instance.GetSeasonEndTime();
+            var leftTime = seasonEndTime - TimeHelper.ServerNow();
+            if (leftTime <= 0)
+            {
+                Timers.inst.Remove(UpdateTime);
+                return;
+            }
+            _ui.m_LeftTime.text = TimeUtil.FormattingTimeTo_DDHHmm(leftTime);
+        }
+
+        private void SetBattlePassLevel()
+        {
+            //获取玩家当前的通行证等级
+            var dataManager = BattlePassTaskDataManager.Instance;
+            var battlePassLevel = dataManager.GetBattlePassLevel();
+            var uiExpProcess = _ui.m_LevelProcess;
+            uiExpProcess.m_Level.text = battlePassLevel.ToString();
+            SetExpProcess();
+        }
+
+        private void SetExpProcess()
+        {
+            var dataManager = BattlePassTaskDataManager.Instance;
+            var seasonId = dataManager.GetSeasonId();
+            var uiExpProcess = _ui.m_LevelProcess;
+            //获取当前等级的经验
+            var battlePassCfg =
+                BattlePassCfgArray.Instance.GetCfgByidAndlevel(seasonId, dataManager.GetBattlePassLevel());
+            if (battlePassCfg == null)
+            {
+                //已经超过了最大等级
+                uiExpProcess.target.max = 100;
+                uiExpProcess.target.value = 0;
+                uiExpProcess.m_c1.selectedIndex = 1;
+            }
+            else
+            {
+                uiExpProcess.target.max = battlePassCfg.value;
+                uiExpProcess.target.value = dataManager.GetBattlePassExp();
+                uiExpProcess.m_NumProcess.SetVar("value", dataManager.GetBattlePassExp().ToString())
+                    .SetVar("maxValue", battlePassCfg.value.ToString()).FlushVars();
+                FreshReward();
+            }
+        }
+
+        private void FreshReward()
+        {
+            //刷新奖励列表
+            _rewardCfgs =
+                new List<BattlePassCfg>(
+                    BattlePassCfgArray.Instance.GetCfgsByid(BattlePassTaskDataManager.Instance.GetSeasonId()));
+            //去掉第一个为0的配置
+            _ui.m_RewardList.numItems = _rewardCfgs.Count - 1;
+            RedDotController.Instance.SetComRedDot(_ui.m_btnGetAll,
+              BattlePassTaskDataManager.Instance.CheckStoreBrocadeWeavRed());
+        }
+
+        private void SetOpenBattlePassBtnStatus()
+        {
+            //通行证是否购买
+            var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
+            _ui.m_c1.selectedIndex = isBuy ? 1 : 0;
+        }
+
+        private int oldLevel;
+
+        //刷新特别大奖展示
+        private void FreshSpecialReward(int level)
+        {
+            var battlePassCfg = BattlePassTaskDataManager.Instance.GetSpecialCfg(level);
+            var uiBattlePassReward = _ui.m_SpecialReward;
+            if (battlePassCfg == null)
+            {
+                uiBattlePassReward.target.visible = false;
+                return;
+            }
+            var newLeve = battlePassCfg.level;
+            if (newLeve == oldLevel) return;
+            oldLevel = newLeve;
+            uiBattlePassReward.target.visible = true;
+            uiBattlePassReward.m_Level.text = newLeve.ToString();
+            //设置奖励
+            var bonusNormalArr = battlePassCfg.bonusNormalArr;
+            if (bonusNormalArr != null && bonusNormalArr.Length > 0)
+            {
+                uiBattlePassReward.m_NormalReward.visible = true;
+                var itemData = ItemUtil.createItemData(bonusNormalArr[0]);
+                var item = new ItemView(uiBattlePassReward.m_NormalReward);
+                item.SetData(itemData);
+                item.ChangeTxtCountStyle();
+            }
+            else
+            {
+                uiBattlePassReward.m_NormalReward.visible = false;
+            }
+            var superLevelRewardGet = BattlePassTaskDataManager.Instance.CheckSuperLevelRewardGet(level);
+            var state = BattlePassTaskDataManager.Instance.GetRewardState(level);
+            uiBattlePassReward.m_RewardList.data = (battlePassCfg.bonusSpecialArr,false ,state, superLevelRewardGet);
+            uiBattlePassReward.m_RewardList.numItems = battlePassCfg.bonusSpecialArr.Length;
+        }
+
+        //更新织造任务按钮红点
+        private void UpdateBtnBrocadeWeavTaskRed()
+        {
+            RedDotController.Instance.SetComRedDot(_ui.m_btnBrocadeWeavTask,
+                TaskDataManager.Instance.CheckTaskRewardCanGet(TaskFuncType.BattlePass));
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/Store/StoreBrocadeWeavView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/Store/StoreView.cs

@@ -54,6 +54,9 @@ namespace GFGGame
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateRedDot);
             EventAgent.AddEventListener(ConstMessage.SHOP_BUY, UpdateRedDot);
+            EventAgent.AddEventListener(ConstMessage.NOTICE_BATCH_TASK_STATE_CHANGE, UpdateStoreMonthRedDot);
+            EventAgent.AddEventListener(ConstMessage.STORE_BROCADE_WEAV_RECEIVE, UpdateStoreMonthRedDot);
+
         }
         protected override void OnShown()
         {
@@ -94,13 +97,15 @@ namespace GFGGame
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateRedDot);
             EventAgent.RemoveEventListener(ConstMessage.SHOP_BUY, UpdateRedDot);
-
+            EventAgent.RemoveEventListener(ConstMessage.NOTICE_BATCH_TASK_STATE_CHANGE, UpdateStoreMonthRedDot);
+            EventAgent.RemoveEventListener(ConstMessage.STORE_BROCADE_WEAV_RECEIVE, UpdateStoreMonthRedDot);
         }
+
         private void OnClickBtnBack()
         {
             ViewManager.Hide(_curViewName);
             this.Hide();
-             ViewManager.GoBackFrom(typeof(StoreView).FullName);
+            ViewManager.GoBackFrom(typeof(StoreView).FullName);
         }
 
         private void OnTabChange()
@@ -131,7 +136,6 @@ namespace GFGGame
                         }
                         _storeTabCfgs.Add(tabCfg.subTabArr[i]);
                     }
-
                 }
                 else
                 {
@@ -148,6 +152,7 @@ namespace GFGGame
         {
             GButton item = obj.asButton;
             StoreTabCfg tabCfg = StoreTabCfgArray.Instance.GetCfg(_curTabIndex);
+
             int menu2 = 0;
             if (tabCfg.functionId == ConstFunctionId.STORE_ARENA)
             {
@@ -197,8 +202,8 @@ namespace GFGGame
             }
             _curSubTabIndex = index;
             _curViewName = "GFGGame." + viewName;
-
         }
+
         private void UpdateRedDot()
         {
             RedDotController.Instance.SetComRedDot(_ui.m_comTab.m_btn0.target, RedDotDataManager.Instance.GetChargeAddUpRewardRed());
@@ -213,20 +218,26 @@ namespace GFGGame
                 RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_CHARGE_ADDUP).asCom, RedDotDataManager.Instance.GetChargeAddUpRewardRed());
             }
 
-            RedDotController.Instance.SetComRedDot(_ui.m_comTab.m_btn1.target, RedDotDataManager.Instance.GetGoldCardRewardRed() || RedDotDataManager.Instance.GetBlackCardRewardRed() || RedDotDataManager.Instance.GetBlackCardClothingRed());
-            if (_ui.m_comTab.m_c1.selectedIndex == ConstStoreTabId.STORE_MONTH_CARD)
-            {
-                RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_MONTH_GOLD_CARD).asCom, RedDotDataManager.Instance.GetGoldCardRewardRed());
-                RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_MONTH_BLACK_CARD).asCom, RedDotDataManager.Instance.GetBlackCardRewardRed() || RedDotDataManager.Instance.GetBlackCardClothingRed());
-            }
+            UpdateStoreMonthRedDot();
 
             RedDotController.Instance.SetComRedDot(_ui.m_comTab.m_btn2.target, RedDotDataManager.Instance.GetGiftBagRewardRed());
             if (_ui.m_comTab.m_c1.selectedIndex == ConstStoreTabId.STORE_GIFT_BAG)
             {
                 RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY).asCom, RedDotDataManager.Instance.GetGiftBagRewardRed());
             }
+        }
 
-
+        //月卡红点刷新
+        private void UpdateStoreMonthRedDot()
+        {
+            RedDotController.Instance.SetComRedDot(_ui.m_comTab.m_btn1.target, RedDotDataManager.Instance.GetGoldCardRewardRed() || RedDotDataManager.Instance.GetBlackCardRewardRed() || RedDotDataManager.Instance.GetBlackCardClothingRed()
+                || RedDotDataManager.Instance.GetStoreBrocadeWeavRewardRed());
+            if (_ui.m_comTab.m_c1.selectedIndex == ConstStoreTabId.STORE_MONTH_CARD)
+            {
+                RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_MONTH_GOLD_CARD).asCom, RedDotDataManager.Instance.GetGoldCardRewardRed());
+                RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_MONTH_BLACK_CARD).asCom, RedDotDataManager.Instance.GetBlackCardRewardRed() || RedDotDataManager.Instance.GetBlackCardClothingRed());
+                RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_MONTH_BROCADE_WEAV).asCom, RedDotDataManager.Instance.GetStoreBrocadeWeavRewardRed());
+            }
         }
     }
 }

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

@@ -160,6 +160,7 @@ namespace GFGGame
                     {
                         _goBackDatas.Add(name, new List<object[]>());
                     }
+
                     _goBackDatas[name].Add(goBackParams);
                 }
                 Debug.Log("当前打开：" + name);

GameClient/Assets/ResIn/UI/Store/Store_atlas0_4.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 8ad3bfb21b6a4f74b9df645db2bf76bd
+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
+  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/Store/Store_atlas0_5.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 1a220ab3991363647afc3bac21725423
+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
+  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/ThirdParty/FairyGUI/Scripts/Core/DisplayObject.cs

@@ -1874,61 +1874,5 @@ namespace FairyGUI
             if (displayObject != null)
                 displayObject._flags |= DisplayObject.Flags.GameObjectDisposed;
         }
-
-        //public static string FontName;
-
-        //private void LoadLocalizationFont()
-        //{
-        //    switch (GameEntry.Localization.Language)
-        //    {
-        //        case GameFramework.Localization.Language.ChineseSimplified:
-        //        case GameFramework.Localization.Language.ChineseSimplified:
-        //            LoadFont2("FZZCH_GBK");
-        //            break;
-        //        case GameFramework.Localization.Language.ChineseSimplified:
-        //            LoadFont2("MyFont");
-        //            break;
-        //        default:
-        //            LoadFont2("IMPACT");
-        //            break;
-        //    }
-        //}
-
-        //private void LoadFont2(string fontName)
-        //{
-
-        //    BaseFont newFont = FontManager.GetFont(fontName);
-
-        //    if (newFont == null)
-        //    {
-        //        Debug.Log("字体:" + fontName + ",不存在Resources或Resources/Fonts文件夹下");
-        //        return;
-        //    }
-        //    FGuiForm.setMainFont(fontName);
-        //}
-
-        //public static void SetMainFont(string fontName)
-        //{
-        //    FontName = fontName;
-        //}
-
-        //private void SetFont()
-        //{
-        //    DisplayObjectInfo[] displayObjectInfos = GetComponentsInChildren<DisplayObjectInfo>(true);
-        //    foreach (var item in displayObjectInfos)
-        //    {
-        //        if (item.displayObject.GetType() == typeof(TextField))
-        //        {
-        //            TextField textField = item.displayObject as TextField;
-        //            textField.textFormat.font = FontName;
-        //            textField.ApplyFormat();
-        //        }
-        //        else if (item.displayObject.GetType() == typeof(InputTextField))
-        //        {
-        //            InputTextField textField = item.displayObject as InputTextField;
-        //            textField.textFormat.font = FontName;
-        //        }
-        //    }
-        //}
     }
 }