锦罗织造优化

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_OpenServerSuitAdditionUI.cs

@@ -10,7 +10,7 @@ namespace UI.OpenServerActivity
         public GImage m_bg;
         public GGraph m_holderLeftTop;
         public GGraph m_holderRightDowm;
-        public GTextField m_txtMaxCount;
+        public GTextField m_txtTips;
         public GList m_list;
         public GTextField m_txtPer;
         public const string URL = "ui://b8ha2mnsdcmv13";
@@ -63,7 +63,7 @@ namespace UI.OpenServerActivity
             m_bg = (GImage)comp.GetChild("bg");
             m_holderLeftTop = (GGraph)comp.GetChild("holderLeftTop");
             m_holderRightDowm = (GGraph)comp.GetChild("holderRightDowm");
-            m_txtMaxCount = (GTextField)comp.GetChild("txtMaxCount");
+            m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_list = (GList)comp.GetChild("list");
             m_txtPer = (GTextField)comp.GetChild("txtPer");
         }
@@ -72,7 +72,7 @@ namespace UI.OpenServerActivity
             m_bg = null;
             m_holderLeftTop = null;
             m_holderRightDowm = null;
-            m_txtMaxCount = null;
+            m_txtTips = null;
             m_list = null;
             m_txtPer = null;
             if(disposeTarget && target != null)

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

@@ -17,6 +17,8 @@ namespace UI.Store
         public GComponent m_NormalReward;
         public GList m_RewardList;
         public GLoader m_touch;
+        public GImage m_ImgBgGray;
+        public GImage m_ImgLock;
         public const string URL = "ui://p9mtgheoot07td8";
         public const string PACKAGE_NAME = "Store";
         public const string RES_NAME = "BrocadeWeavRewardItem";
@@ -74,6 +76,8 @@ namespace UI.Store
             m_NormalReward = (GComponent)comp.GetChild("NormalReward");
             m_RewardList = (GList)comp.GetChild("RewardList");
             m_touch = (GLoader)comp.GetChild("touch");
+            m_ImgBgGray = (GImage)comp.GetChild("ImgBgGray");
+            m_ImgLock = (GImage)comp.GetChild("ImgLock");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -87,6 +91,8 @@ namespace UI.Store
             m_NormalReward = null;
             m_RewardList = null;
             m_touch = null;
+            m_ImgBgGray = null;
+            m_ImgLock = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -20,6 +20,7 @@ namespace GFGGame
         private GImage _imgNum;
         private Controller _qualityType;
         private Controller _scaleType;
+        private Controller _buttonType;
         // private GGroup _grpCount;
         private bool _showTips = true;
 
@@ -41,6 +42,7 @@ namespace GFGGame
             _imgNum = _item.GetChild("imgNum") as GImage;
             _qualityType = _item.GetController("QualityType") as Controller;
             _scaleType = _item.GetController("ScaleType") as Controller;
+            _buttonType = _item.GetController("ButtonType") as Controller;
             // _grpCount = obj.GetChild("grpCount") as GGroup;
             // AddClickListener();
             _item.onClick.Remove(AddClickListener);
@@ -121,6 +123,21 @@ namespace GFGGame
                 _grpGot.visible = value;
             }
         }
+        /// <summary>
+        /// 左右上角小按钮显示状态
+        /// </summary>
+        /// <value></value>
+        public int ButtonTypeVisible
+        {
+            get
+            {
+                return _buttonType.selectedIndex;
+            }
+            set
+            {
+                _buttonType.selectedIndex = value;
+            }
+        }
         /// “已获得”显示状态
         /// </summary>
         /// <value></value>

GameClient/Assets/Game/HotUpdate/Views/OpenServerActivity/OpenServerSuitAdditionView.cs

@@ -67,6 +67,7 @@ namespace GFGGame
             float addition = StudioDataManager.Instance.GetAddition(ConstInstanceZonesType.PureFight);
             addition = addition / 10000 * 100;
             _ui.m_txtPer.text = "(" + addition + "%)";
+            _ui.m_txtTips.SetVar("name", activityOpenCfg.themeName).FlushVars();
         }
 
         protected override void OnHide()

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

@@ -229,9 +229,13 @@ namespace GFGGame
                 itemView.SetData(itemData);
                 itemView.ChangeTxtCountStyle();
                 itemView.GrpGotVisible = BattlePassTaskDataManager.Instance.CheckLevelRewardGet(level);
+                item.m_ImgBgGray.visible = state == 0;
+                if (state == 0 && (level == 1 || (level > 1 && BattlePassTaskDataManager.Instance.GetRewardState(level-1) > 0)))
+                    item.m_ImgLock.visible = true;
+                else
+                    item.m_ImgLock.visible = false;
                 bool redDot = (!BattlePassTaskDataManager.Instance.CheckLevelRewardGet(level) && state == 1);
                 RedDotController.Instance.SetComRedDot(item.m_NormalReward, redDot, "", -12, 24);
-
             }
             else
             {
@@ -281,6 +285,10 @@ namespace GFGGame
                 RedDotController.Instance.SetComRedDot(itemView.GetGComponentObj, keyValuePair.Item3 == 1, "", -12, 24);
                 itemView.GrpGotVisible = keyValuePair.Item4;
             }
+            if (!isBuy)
+                itemView.ButtonTypeVisible = 3;
+            else
+                itemView.ButtonTypeVisible = 0;
         }
 
         //根据状态设置按钮
@@ -372,6 +380,7 @@ namespace GFGGame
             _ui.m_RewardList.numItems = _rewardCfgs.Count - 1;
             RedDotController.Instance.SetComRedDot(_ui.m_btnGetAll,
               BattlePassTaskDataManager.Instance.CheckStoreBrocadeWeavRed(), "", -18, -8);
+            _ui.m_btnGetAll.grayed = !BattlePassTaskDataManager.Instance.CheckStoreBrocadeWeavRed();
         }
 
         private void SetOpenBattlePassBtnStatus()
@@ -403,6 +412,7 @@ namespace GFGGame
             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);