ソースを参照

成长基金提交

zhangyuqian 1 年間 前
コミット
4bd2b4b69c
21 ファイル変更642 行追加2 行削除
  1. 34 1
      GameClient/Assets/Game/HotUpdate/Data/RedDotDataManager.cs
  2. 2 0
      GameClient/Assets/Game/HotUpdate/Data/ShopDataManager.cs
  3. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Button13.cs
  4. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Button13.cs.meta
  5. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Button14.cs
  6. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Button14.cs.meta
  7. 78 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_GrowthFundItemUI.cs
  8. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_GrowthFundItemUI.cs.meta
  9. 105 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreGrowthFundUI.cs
  10. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreGrowthFundUI.cs.meta
  11. 36 0
      GameClient/Assets/Game/HotUpdate/ServerProxy/ShopSProxy.cs
  12. 169 0
      GameClient/Assets/Game/HotUpdate/Views/Store/StoreGrowthFundView.cs
  13. 11 0
      GameClient/Assets/Game/HotUpdate/Views/Store/StoreGrowthFundView.cs.meta
  14. 21 1
      GameClient/Assets/Game/HotUpdate/Views/Store/StoreView.cs
  15. BIN
      GameClient/Assets/ResIn/UI/Store/Store_atlas0!a.png
  16. BIN
      GameClient/Assets/ResIn/UI/Store/Store_atlas0.png
  17. BIN
      GameClient/Assets/ResIn/UI/Store/Store_atlas0_1!a.png
  18. BIN
      GameClient/Assets/ResIn/UI/Store/Store_atlas0_1.png
  19. BIN
      GameClient/Assets/ResIn/UI/Store/Store_atlas0_3!a.png
  20. BIN
      GameClient/Assets/ResIn/UI/Store/Store_atlas0_3.png
  21. BIN
      GameClient/Assets/ResIn/UI/Store/Store_fui.bytes

+ 34 - 1
GameClient/Assets/Game/HotUpdate/Data/RedDotDataManager.cs

@@ -605,7 +605,7 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetShopRed()
         {
-            return GetChargeAddUpRewardRed() || GetGiftBagRewardRed() || GetGoldCardRewardRed() || GetBlackCardRewardRed() || GetBlackCardClothingRed() || GetStoreBrocadeWeavRewardRed() || GetGiftBagRebateRed();
+            return GetChargeAddUpRewardRed() || GetGiftBagRewardRed() || GetGoldCardRewardRed() || GetBlackCardRewardRed() || GetBlackCardClothingRed() || GetStoreBrocadeWeavRewardRed() || GetGiftBagRebateRed() || GetGrowthFundRewardRed();
         }
         //商店-充值-会员中心
         public bool GetChargeAddUpRewardRed()
@@ -650,6 +650,39 @@ namespace GFGGame
         }
 
         /// <summary>
+        /// 商城-月卡-成长基金
+        /// </summary>
+        /// <returns></returns>
+        public bool GetGrowthFundBuy()
+        {
+            return GameGlobal.myNumericComponent.GetAsInt(NumericType.BuyGrowthFund) == 0;
+        }
+
+        public bool GetGrowthFundRewardRed()
+        {
+            if (ShopDataManager.Instance.GrowthFundRewardList.Count == GrowthFundCfgArray.Instance.dataArray.Length)
+            {
+                return false;
+            }
+            if (GetGrowthFundBuy())
+            {
+                return false;
+            }
+            for (int i = 0; i < GrowthFundCfgArray.Instance.dataArray.Length - 1; i++)
+            {
+                if (RoleDataManager.lvl < GrowthFundCfgArray.Instance.dataArray[i].level)
+                {
+                    //可领取数量和已领取数量比较
+                    if (i != ShopDataManager.Instance.GrowthFundRewardList.Count)
+                    {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+
+        /// <summary>
         /// 商城-月卡-红包卡
         /// </summary>
         /// <returns></returns>

+ 2 - 0
GameClient/Assets/Game/HotUpdate/Data/ShopDataManager.cs

@@ -11,6 +11,8 @@ namespace GFGGame
         public string[] refreshType = { "永久限购", "每日限购", "每周限购", "每月限购" };
 
         private Dictionary<int, int> _goodsDic = new Dictionary<int, int>();
+
+        public List<int> GrowthFundRewardList = new List<int>();
         public void Clear()
         {
             _goodsDic.Clear();

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Button13.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Store
+{
+    public partial class UI_Button13
+    {
+        public GButton target;
+        public Controller m_c1;
+        public const string URL = "ui://p9mtgheojwwvteh";
+        public const string PACKAGE_NAME = "Store";
+        public const string RES_NAME = "Button13";
+        private static UI_Button13 _proxy;
+
+        public static UI_Button13 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button13();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button13 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button13();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)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");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Button13.cs.meta

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

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Button14.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Store
+{
+    public partial class UI_Button14
+    {
+        public GButton target;
+        public Controller m_c1;
+        public const string URL = "ui://p9mtgheojwwvtek";
+        public const string PACKAGE_NAME = "Store";
+        public const string RES_NAME = "Button14";
+        private static UI_Button14 _proxy;
+
+        public static UI_Button14 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button14();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button14 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button14();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)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");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Button14.cs.meta

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

+ 78 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_GrowthFundItemUI.cs

@@ -0,0 +1,78 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Store
+{
+    public partial class UI_GrowthFundItemUI
+    {
+        public GComponent target;
+        public GComponent m_reward;
+        public GTextField m_rewardDesc;
+        public UI_Button14 m_rewardBtn;
+        public const string URL = "ui://p9mtgheojwwvtei";
+        public const string PACKAGE_NAME = "Store";
+        public const string RES_NAME = "GrowthFundItemUI";
+        private static UI_GrowthFundItemUI _proxy;
+
+        public static UI_GrowthFundItemUI Create(GObject gObject = null)
+        {
+            var ui = new UI_GrowthFundItemUI();
+            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_GrowthFundItemUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_GrowthFundItemUI();
+            }
+            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_reward = (GComponent)comp.GetChild("reward");
+            m_rewardDesc = (GTextField)comp.GetChild("rewardDesc");
+            m_rewardBtn = (UI_Button14)UI_Button14.Create(comp.GetChild("rewardBtn"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_reward = null;
+            m_rewardDesc = null;
+            m_rewardBtn.Dispose();
+            m_rewardBtn = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_GrowthFundItemUI.cs.meta

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

+ 105 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreGrowthFundUI.cs

@@ -0,0 +1,105 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Store
+{
+    public partial class UI_StoreGrowthFundUI
+    {
+        public GComponent target;
+        public GComponent m_valueBar;
+        public GLoader m_loaMoney;
+        public GTextField m_txtMoneyCount;
+        public GTextField m_txtDesc;
+        public GLoader m_loaDailyMoney;
+        public GTextField m_txtDailyMoneyCount;
+        public GTextField m_txt;
+        public GLoader m_Moneyma3;
+        public GTextField m_txtGiftBag;
+        public GTextField m_txtt;
+        public GList m_list;
+        public UI_Button13 m_btnBuy;
+        public const string URL = "ui://p9mtgheojwwvte9";
+        public const string PACKAGE_NAME = "Store";
+        public const string RES_NAME = "StoreGrowthFundUI";
+        private static UI_StoreGrowthFundUI _proxy;
+
+        public static UI_StoreGrowthFundUI Create(GObject gObject = null)
+        {
+            var ui = new UI_StoreGrowthFundUI();
+            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_StoreGrowthFundUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_StoreGrowthFundUI();
+            }
+            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_valueBar = (GComponent)comp.GetChild("valueBar");
+            m_loaMoney = (GLoader)comp.GetChild("loaMoney");
+            m_txtMoneyCount = (GTextField)comp.GetChild("txtMoneyCount");
+            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
+            m_loaDailyMoney = (GLoader)comp.GetChild("loaDailyMoney");
+            m_txtDailyMoneyCount = (GTextField)comp.GetChild("txtDailyMoneyCount");
+            m_txt = (GTextField)comp.GetChild("txt");
+            m_Moneyma3 = (GLoader)comp.GetChild("Moneyma3");
+            m_txtGiftBag = (GTextField)comp.GetChild("txtGiftBag");
+            m_txtt = (GTextField)comp.GetChild("txtt");
+            m_list = (GList)comp.GetChild("list");
+            m_btnBuy = (UI_Button13)UI_Button13.Create(comp.GetChild("btnBuy"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_valueBar = null;
+            m_loaMoney = null;
+            m_txtMoneyCount = null;
+            m_txtDesc = null;
+            m_loaDailyMoney = null;
+            m_txtDailyMoneyCount = null;
+            m_txt = null;
+            m_Moneyma3 = null;
+            m_txtGiftBag = null;
+            m_txtt = null;
+            m_list = null;
+            m_btnBuy.Dispose();
+            m_btnBuy = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreGrowthFundUI.cs.meta

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

+ 36 - 0
GameClient/Assets/Game/HotUpdate/ServerProxy/ShopSProxy.cs

@@ -189,6 +189,42 @@ namespace GFGGame
             return false;
         }
 
+        //获取成长基金消息
+        public static async ETTask<bool> ReqGetGrowthFundInfo(int activityID)
+        {
+            ActivityOpenCfg activityCfg = ActivityOpenCfgArray.Instance.GetCfg(activityID);
+            if(RoleDataManager.lvl < activityCfg.level || ShopDataManager.Instance.GrowthFundRewardList.Count == GrowthFundCfgArray.Instance.dataArray.Length)
+            {
+                return false;
+            }
+            S2C_GetGrowthFundRewrd response = null;
+            response = (S2C_GetGrowthFundRewrd)await MessageHelper.SendToServer(new C2S_GetGrowthFundRewrd() { ActivityId = activityID});
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    ShopDataManager.Instance.GrowthFundRewardList = response.RewrdIds;
+                    return true;
+                }
+            }
+            return false;
+        }
+        //领取成长基金奖励
+        public static async ETTask<bool> ReqGetGrowthFundReward(int activityID,int id)
+        {
+            S2C_GetGrowthFundRewrd response = null;
+            response = (S2C_GetGrowthFundRewrd)await MessageHelper.SendToServer(new C2S_GetGrowthFundRewrd() {ActivityId = activityID, RewrdId = id });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    ShopDataManager.Instance.GrowthFundRewardList = response.RewrdIds;
+                    BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.BonusList));
+                    return true;
+                }
+            }
+            return false;
+        }
 
     }
 }

+ 169 - 0
GameClient/Assets/Game/HotUpdate/Views/Store/StoreGrowthFundView.cs

@@ -0,0 +1,169 @@
+using UI.Store;
+using UI.CommonGame;
+using FairyGUI;
+using System.Collections.Generic;
+using ET;
+using System;
+
+namespace GFGGame
+{
+    public class StoreGrowthFundView : BaseWindow
+    {
+        private UI_StoreGrowthFundUI _ui;
+        private ValueBarController _valueBarController;
+        private int menu2;
+        private EffectUI _effectUI1;
+
+        public override void Dispose()
+        {
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+
+            if (_valueBarController != null)
+            {
+                _valueBarController.Dispose();
+                _valueBarController = null;
+            }
+            if (_ui != null)
+            {
+                _ui.Dispose();
+            }
+            _ui = null;
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_StoreGrowthFundUI.PACKAGE_NAME;
+            _ui = UI_StoreGrowthFundUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+            this.clickBlankToClose = false;
+            this.bringToFontOnClick = false;
+
+            _valueBarController = new ValueBarController(_ui.m_valueBar);
+            _ui.m_list.itemRenderer = ListItemRenderer;
+            _ui.m_btnBuy.target.onClick.Add(OnBtnBuyClick);
+
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
+
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _valueBarController.OnShown();
+
+            UpdateView();
+            UpdateRedDot();
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+            _valueBarController.OnHide();
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
+        }
+        private void OnBtnBlackRewardClick()
+        {
+            ViewManager.Show<StoreBlackCardRewardView>();
+        }
+        private void UpdateView()
+        {
+            _ui.m_btnBuy.m_c1.selectedIndex = RedDotDataManager.Instance.GetGrowthFundBuy()?0:1; 
+            int count = 0;
+            for(int i = 0;i < GrowthFundCfgArray.Instance.dataArray.Length;i++)
+            {
+                if(RoleDataManager.lvl >= GrowthFundCfgArray.Instance.dataArray[i].level)
+                {
+                    count += GrowthFundCfgArray.Instance.dataArray[i].bonusArr[0][1];
+                }
+            }
+            _ui.m_txtGiftBag.text = count.ToString();
+            _ui.m_list.numItems = GrowthFundCfgArray.Instance.dataArray.Length;
+        }
+        private void OnBtnBuyClick()
+        {
+            //是否购买
+            if (RedDotDataManager.Instance.GetGrowthFundBuy())
+            {
+                int id = ActivityOpenCfgArray.Instance.GetCfg(3002).paramsArr[0];
+                ShopSProxy.ReqShopBuy(id).Coroutine();
+                _ui.m_btnBuy.m_c1.selectedIndex = 1;
+                _ui.m_list.numItems = GrowthFundCfgArray.Instance.dataArray.Length;
+            }
+        }
+        private async void OnBtnGetClick(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            int goodsId = (int)obj.data;
+            UI_GrowthFundItemUI item = UI_GrowthFundItemUI.Proxy(_ui.m_list.GetChildAt(goodsId - 1));
+            if(item.m_rewardBtn.m_c1.selectedIndex != 1)
+            {
+                return;
+            }
+            UI_GrowthFundItemUI.ProxyEnd();
+            bool result = await ShopSProxy.ReqGetGrowthFundReward(3002,goodsId);
+            if (result)
+            {
+                _ui.m_list.numItems = GrowthFundCfgArray.Instance.dataArray.Length;
+            }
+        }
+        private void ListItemRenderer(int index, GObject obj)
+        {
+            UI_GrowthFundItemUI item = UI_GrowthFundItemUI.Proxy(obj);
+            int num = GrowthFundCfgArray.Instance.dataArray[index].level;
+            item.m_rewardDesc.text = string.Format("等级达{0}级可领",num);
+            item.m_rewardBtn.m_c1.selectedIndex = 1;
+            if (!RedDotDataManager.Instance.GetGrowthFundBuy())
+            {
+                bool isRed = true;
+                if(RoleDataManager.lvl >= num)
+                {
+                    foreach (int i in ShopDataManager.Instance.GrowthFundRewardList)
+                    {
+                        if (i == GrowthFundCfgArray.Instance.dataArray[index].id)
+                        {
+                            item.m_rewardBtn.m_c1.selectedIndex = 2;
+                            isRed = false;
+                            break;
+                        }
+                    }
+                }
+                else
+                {
+                    item.m_rewardBtn.m_c1.selectedIndex = 0;
+                    isRed = false;
+                }
+                RedDotController.Instance.SetComRedDot(item.m_rewardBtn.target, isRed);
+            }
+            else
+            {
+                item.m_rewardBtn.m_c1.selectedIndex = 0;
+                RedDotController.Instance.SetComRedDot(item.m_rewardBtn.target, false);
+            }
+            ItemUtil.CreateItemView(GrowthFundCfgArray.Instance.dataArray[index].bonusArr[0], item.m_reward as GComponent);
+            if (item.m_rewardBtn.target.data == null)
+            {
+                item.m_rewardBtn.target.onClick.Add(OnBtnGetClick);
+            }
+            item.m_rewardBtn.target.data = index + 1;
+            UI_GrowthFundItemUI.ProxyEnd();
+
+        }
+
+        private void UpdateRedDot()
+        {
+
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/Store/StoreGrowthFundView.cs.meta

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

+ 21 - 1
GameClient/Assets/Game/HotUpdate/Views/Store/StoreView.cs

@@ -184,6 +184,16 @@ namespace GFGGame
             }
             else
             {
+                //成长基金单独处理
+                if (_storeTabCfgs[index][0] == "成长基金")
+                {
+                    ActivityOpenCfg activityCfg = ActivityOpenCfgArray.Instance.GetCfg(3002);
+                    if(RoleDataManager.lvl < activityCfg.level)
+                    {
+                        item.visible = false;
+                        return;
+                    }
+                }
                 item.title = _storeTabCfgs[index][0];
                 menu2 = int.Parse(_storeTabCfgs[index][1]);
             }
@@ -243,6 +253,7 @@ namespace GFGGame
             }
 
             UpdateStoreMonthRedDot();
+            UpdateGrowthFunRed();
 
             RedDotController.Instance.SetComRedDot(_ui.m_comTab.m_btn2.target, (RedDotDataManager.Instance.GetGiftBagRewardRed() || RedDotDataManager.Instance.GetGiftBagRebateRed()));
             if (_ui.m_comTab.m_c1.selectedIndex == ConstStoreTabId.STORE_GIFT_BAG)
@@ -263,7 +274,7 @@ namespace GFGGame
         private void UpdateStoreMonthRedDot()
         {
             RedDotController.Instance.SetComRedDot(_ui.m_comTab.m_btn1.target, RedDotDataManager.Instance.GetGoldCardRewardRed() || RedDotDataManager.Instance.GetBlackCardRewardRed() || RedDotDataManager.Instance.GetBlackCardClothingRed()
-                || RedDotDataManager.Instance.GetStoreBrocadeWeavRewardRed());
+                || RedDotDataManager.Instance.GetStoreBrocadeWeavRewardRed() || RedDotDataManager.Instance.GetGrowthFundRewardRed());
             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());
@@ -272,6 +283,15 @@ namespace GFGGame
             }
         }
 
+        //成长基金红点
+        public void UpdateGrowthFunRed()
+        {
+            if (_ui.m_comTab.m_c1.selectedIndex == ConstStoreTabId.STORE_MONTH_CARD)
+            {
+                RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_GROWTH_FUND).asCom, RedDotDataManager.Instance.GetGrowthFundRewardRed());
+            }
+        }
+
         //会员中心模型预加载
         private void PreloadStoreChargeAddUp()
         {

BIN
GameClient/Assets/ResIn/UI/Store/Store_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/Store/Store_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Store/Store_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/Store/Store_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/Store/Store_atlas0_3!a.png


BIN
GameClient/Assets/ResIn/UI/Store/Store_atlas0_3.png


BIN
GameClient/Assets/ResIn/UI/Store/Store_fui.bytes