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

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

@@ -181,6 +181,9 @@ namespace GFGGame
         //摘星抽奖等待动画加载
         public const string LUCKY_BOX_ANIMATION_WAIT = "LUCKY_BOX_ANIMATION_WAIT";
 
+        //词牌升级刷新
+        public const string CARD_LEVEL_UP = "CARD_LEVEL_UP";
+
         // 服装散件图鉴配置加载完成
         public const string DRESS_PART_LOAD_FINISHED = "DRESS_PART_LOAD_FINISHED";
 

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

@@ -116,7 +116,7 @@ namespace GFGGame
 
         private void SetSpecialCfgCache()
         {
-            var battlePassCfgs = BattlePassCfgArray.Instance.GetCfgsByidAndisGood(GetSeasonId(), 1);
+            var battlePassCfgs = GetIsGoodToId(GetSeasonId());
             var minIndex = 0;
             var selections = new List<Selection<int, int>>();
             foreach (var battlePassCfg in battlePassCfgs)
@@ -202,10 +202,28 @@ namespace GFGGame
             initedFromServer = false;
         }
 
+        //筛选出大奖数据 
+        public List<BattlePassCfg> GetIsGoodToId(int SeasonId)
+        {
+            var battlePassCfgs = BattlePassCfgArray.Instance.GetCfgsByisGood(1);
+            List<BattlePassCfg> battlePassTypeCfg = new List<BattlePassCfg>();
+            foreach (var info in battlePassCfgs) {
+                if(info.id == SeasonId)
+                    battlePassTypeCfg.Add(info);
+            }
+            battlePassTypeCfg.Sort((BattlePassCfg a, BattlePassCfg b) =>
+            {
+                if (a.level < b.level) return -1;
+
+                return 1;
+            });
+            return battlePassTypeCfg;
+        }
+
         //一键获取是否领取状态
         public bool CheckStoreBrocadeWeavRed()
         {
-            var battlePassCfgs = BattlePassCfgArray.Instance.GetCfgsByidAndisGood(GetSeasonId(), 1);
+            var battlePassCfgs = GetIsGoodToId(GetSeasonId());
             var _rewardCfgs =new List<BattlePassCfg>( BattlePassCfgArray.Instance.GetCfgsByid(GetSeasonId()));
             var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
             for (int level = 1; level < _rewardCfgs.Count; level++) {

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

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

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityDay7
+{
+    public partial class UI_comTaskList
+    {
+        public GComponent target;
+        public GList m_TaskList;
+        public const string URL = "ui://kupdwln7drdvm";
+        public const string PACKAGE_NAME = "ActivityDay7";
+        public const string RES_NAME = "comTaskList";
+        private static UI_comTaskList _proxy;
+
+        public static UI_comTaskList Create(GObject gObject = null)
+        {
+            var ui = new UI_comTaskList();
+            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_comTaskList Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_comTaskList();
+            }
+            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_TaskList = (GList)comp.GetChild("TaskList");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_TaskList = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityDay7/UI_comTaskList.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListCardItem.cs

@@ -8,6 +8,7 @@ namespace UI.CommonGame
     {
         public GComponent target;
         public Controller m_starNumType;
+        public Controller m_showType;
         public UI_ComCardMask m_comCard;
         public GLoader m_loaBorder;
         public GLoader m_loaRarity;
@@ -67,6 +68,7 @@ namespace UI.CommonGame
         private void Init(GComponent comp)
         {
             m_starNumType = comp.GetController("starNumType");
+            m_showType = comp.GetController("showType");
             m_comCard = (UI_ComCardMask)UI_ComCardMask.Create(comp.GetChild("comCard"));
             m_loaBorder = (GLoader)comp.GetChild("loaBorder");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
@@ -82,6 +84,7 @@ namespace UI.CommonGame
         public void Dispose(bool disposeTarget = false)
         {
             m_starNumType = null;
+            m_showType = null;
             m_comCard.Dispose();
             m_comCard = null;
             m_loaBorder = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox.cs

@@ -15,9 +15,9 @@ namespace UI.LuckyBox
         public UI_ComCost2 m_comCostOne;
         public UI_ComCost2 m_comCostTen;
         public GButton m_btnBuyOne;
-        public GGraph m_btnBuyTen_eff;
         public GButton m_btnBuyTen;
         public GTextField m_txtRemainTimes;
+        public GGraph m_btnBuyTen_eff;
         public GGraph m_Special_eff;
         public GImage m_imgSpecial;
         public GGroup m_grpSpecial;
@@ -76,9 +76,9 @@ namespace UI.LuckyBox
             m_comCostOne = (UI_ComCost2)UI_ComCost2.Create(comp.GetChild("comCostOne"));
             m_comCostTen = (UI_ComCost2)UI_ComCost2.Create(comp.GetChild("comCostTen"));
             m_btnBuyOne = (GButton)comp.GetChild("btnBuyOne");
-            m_btnBuyTen_eff = (GGraph)comp.GetChild("btnBuyTen_eff");
             m_btnBuyTen = (GButton)comp.GetChild("btnBuyTen");
             m_txtRemainTimes = (GTextField)comp.GetChild("txtRemainTimes");
+            m_btnBuyTen_eff = (GGraph)comp.GetChild("btnBuyTen_eff");
             m_Special_eff = (GGraph)comp.GetChild("Special_eff");
             m_imgSpecial = (GImage)comp.GetChild("imgSpecial");
             m_grpSpecial = (GGroup)comp.GetChild("grpSpecial");
@@ -97,9 +97,9 @@ namespace UI.LuckyBox
             m_comCostTen.Dispose();
             m_comCostTen = null;
             m_btnBuyOne = null;
-            m_btnBuyTen_eff = null;
             m_btnBuyTen = null;
             m_txtRemainTimes = null;
+            m_btnBuyTen_eff = null;
             m_Special_eff = null;
             m_imgSpecial = null;
             m_grpSpecial = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComCard.cs

@@ -14,6 +14,8 @@ namespace UI.LuckyBox
         public GLoader m_loaType;
         public GLoader m_loaProperty;
         public GTextField m_txtName;
+        public GGraph m_holder_get;
+        public Transition m_card_in;
         public const string URL = "ui://drx9d1usqdrt1a";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComCard";
@@ -68,6 +70,8 @@ namespace UI.LuckyBox
             m_loaType = (GLoader)comp.GetChild("loaType");
             m_loaProperty = (GLoader)comp.GetChild("loaProperty");
             m_txtName = (GTextField)comp.GetChild("txtName");
+            m_holder_get = (GGraph)comp.GetChild("holder_get");
+            m_card_in = comp.GetTransition("card_in");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -78,6 +82,8 @@ namespace UI.LuckyBox
             m_loaType = null;
             m_loaProperty = null;
             m_txtName = null;
+            m_holder_get = null;
+            m_card_in = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxNewDressUI.cs

@@ -13,9 +13,9 @@ namespace UI.LuckyBox
         public GGraph m_holder_cloud;
         public UI_ComCard m_comCard;
         public GButton m_btnPass;
-        public Transition m_t_open;
+        public Transition m_t_open_old;
         public Transition m_t_close;
-        public Transition m_t2;
+        public Transition m_t_open;
         public const string URL = "ui://drx9d1usqdrt19";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "LuckyBoxNewDressUI";
@@ -69,9 +69,9 @@ namespace UI.LuckyBox
             m_holder_cloud = (GGraph)comp.GetChild("holder_cloud");
             m_comCard = (UI_ComCard)UI_ComCard.Create(comp.GetChild("comCard"));
             m_btnPass = (GButton)comp.GetChild("btnPass");
-            m_t_open = comp.GetTransition("t_open");
+            m_t_open_old = comp.GetTransition("t_open_old");
             m_t_close = comp.GetTransition("t_close");
-            m_t2 = comp.GetTransition("t2");
+            m_t_open = comp.GetTransition("t_open");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -82,9 +82,9 @@ namespace UI.LuckyBox
             m_comCard.Dispose();
             m_comCard = null;
             m_btnPass = null;
-            m_t_open = null;
+            m_t_open_old = null;
             m_t_close = null;
-            m_t2 = null;
+            m_t_open = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxStarUI.cs

@@ -10,6 +10,7 @@ namespace UI.LuckyBox
         public Controller m_ctrlBuyType;
         public Controller m_ctrlRewardsType;
         public GLoader m_bg;
+        public GMovieClip m_effEnd;
         public GGraph m_holder_star;
         public GGraph m_holder_star_sky;
         public GGraph m_holder_bg;
@@ -51,7 +52,8 @@ namespace UI.LuckyBox
         public UI_ComStar m_comStar1_2_8;
         public UI_ComStar m_comStar1_2_9;
         public GGroup m_grpComStar2;
-        public GMovieClip m_effEnd;
+        public GGroup m_star;
+        public Transition m_t0;
         public const string URL = "ui://drx9d1usl5nzm";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "LuckyBoxStarUI";
@@ -102,6 +104,7 @@ namespace UI.LuckyBox
             m_ctrlBuyType = comp.GetController("ctrlBuyType");
             m_ctrlRewardsType = comp.GetController("ctrlRewardsType");
             m_bg = (GLoader)comp.GetChild("bg");
+            m_effEnd = (GMovieClip)comp.GetChild("effEnd");
             m_holder_star = (GGraph)comp.GetChild("holder_star");
             m_holder_star_sky = (GGraph)comp.GetChild("holder_star_sky");
             m_holder_bg = (GGraph)comp.GetChild("holder_bg");
@@ -143,13 +146,15 @@ namespace UI.LuckyBox
             m_comStar1_2_8 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_8"));
             m_comStar1_2_9 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_9"));
             m_grpComStar2 = (GGroup)comp.GetChild("grpComStar2");
-            m_effEnd = (GMovieClip)comp.GetChild("effEnd");
+            m_star = (GGroup)comp.GetChild("star");
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_ctrlBuyType = null;
             m_ctrlRewardsType = null;
             m_bg = null;
+            m_effEnd = null;
             m_holder_star = null;
             m_holder_star_sky = null;
             m_holder_bg = null;
@@ -224,7 +229,8 @@ namespace UI.LuckyBox
             m_comStar1_2_9.Dispose();
             m_comStar1_2_9 = null;
             m_grpComStar2 = null;
-            m_effEnd = null;
+            m_star = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -10,9 +10,9 @@ namespace UI.Store
         public Controller m_c1;
         public Controller m_c2;
         public GImage m_imgDouble;
-        public GGraph m_holderfEff;
         public GTextField m_txtDesc;
         public GGroup m_grpDiscount;
+        public GGraph m_holderfEff;
         public GLoader m_icon;
         public GTextField m_txtName;
         public GTextField m_txtEndTime;
@@ -69,9 +69,9 @@ namespace UI.Store
             m_c1 = comp.GetController("c1");
             m_c2 = comp.GetController("c2");
             m_imgDouble = (GImage)comp.GetChild("imgDouble");
-            m_holderfEff = (GGraph)comp.GetChild("holderfEff");
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
             m_grpDiscount = (GGroup)comp.GetChild("grpDiscount");
+            m_holderfEff = (GGraph)comp.GetChild("holderfEff");
             m_icon = (GLoader)comp.GetChild("icon");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtEndTime = (GTextField)comp.GetChild("txtEndTime");
@@ -84,9 +84,9 @@ namespace UI.Store
             m_c1 = null;
             m_c2 = null;
             m_imgDouble = null;
-            m_holderfEff = null;
             m_txtDesc = null;
             m_grpDiscount = null;
+            m_holderfEff = null;
             m_icon = null;
             m_txtName = null;
             m_txtEndTime = null;

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

@@ -53,6 +53,7 @@ namespace GFGGame
                         cardData.scores[response.KsAttribute[i]] = response.VsAttribute[i];
                     }
                     EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
+                    EventAgent.DispatchEvent(ConstMessage.CARD_LEVEL_UP);
                     return true;
                 }
             }

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

@@ -47,7 +47,7 @@ namespace GFGGame
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("qrhd_banner_yxzy");
             _ui.m_DayList.itemRenderer = DayListRenderer;
-            _ui.m_TaskList.itemRenderer = TaskListRenderer;
+            _ui.m_comTaskList.m_TaskList.itemRenderer = TaskListRenderer;
             _ui.m_tip.onClick.Add(RuleController.ShowRuleView);
             _ui.m_tip.data = 300014;
         }
@@ -175,11 +175,11 @@ namespace GFGGame
             var taskIdArr = activity7DaysTaskCfg.taskIdArr;
             //排序根据领取状态
             var taskCfgs = TaskDataManager.Instance.GetTaskCfgs(taskIdArr);
-            _ui.m_TaskList.data = taskCfgs;
-            _ui.m_TaskList.numItems = taskIdArr.Length;
-            if (_ui.m_TaskList.numItems > 0)
+            _ui.m_comTaskList.m_TaskList.data = taskCfgs;
+            _ui.m_comTaskList.m_TaskList.numItems = taskIdArr.Length;
+            if (_ui.m_comTaskList.m_TaskList.numItems > 0)
             {
-                _ui.m_TaskList.ScrollToView(0);
+                _ui.m_comTaskList.m_TaskList.ScrollToView(0);
             }
         }
 

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

@@ -55,6 +55,7 @@ namespace GFGGame
             EventAgent.AddEventListener(ConstMessage.CARD_FILTER, FilterItems);
             EventAgent.AddEventListener(ConstMessage.CARD_INFO, UpdateCardList);
             EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, UpdateCardList);
+            EventAgent.AddEventListener(ConstMessage.CARD_LEVEL_UP, UpdateCardList);
         }
         protected override void OnShown()
         {
@@ -88,6 +89,7 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.CARD_FILTER, FilterItems);
             EventAgent.RemoveEventListener(ConstMessage.CARD_INFO, UpdateCardList);
             EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, UpdateCardList);
+            EventAgent.RemoveEventListener(ConstMessage.CARD_LEVEL_UP, UpdateCardList);
         }
 
         private void FilterItems()
@@ -129,7 +131,7 @@ namespace GFGGame
             RedDotController.Instance.SetComRedDot(listItem.target, RedDotDataManager.Instance.GetCardRed(data.id), "", 5, -10);
 
             int starLevelDodge = data.star / 5;
-            listItem.m_starNumType.selectedIndex = data.itemCfg.starDescArr.Length-1;
+            listItem.m_starNumType.selectedIndex = data.itemCfg.starDescArr.Length - 1;
             for (int i = 0; i < 4; i++)
             {
                 UI_ComDodgeStar dodgeStar = UI_ComDodgeStar.Proxy(listItem.target.GetChild("dodgeStar" + i));

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/SuitSyntheticView.cs

@@ -45,6 +45,7 @@ namespace GFGGame
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.SUIT_BOX_STATUS_CHANGED, UpdateSuitBoxStatus);
             EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
+            EventAgent.AddEventListener(ConstMessage.CLOTHING_SYNTHETIC_SUCCESS, UpdateSuitList);
         }
         protected override void OnShown()
         {
@@ -74,6 +75,7 @@ namespace GFGGame
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.SUIT_BOX_STATUS_CHANGED, UpdateSuitBoxStatus);
             EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
+            EventAgent.RemoveEventListener(ConstMessage.CLOTHING_SYNTHETIC_SUCCESS, UpdateSuitList);
         }
         private void OnClickBtnBack()
         {

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/CardGuideView.cs

@@ -94,7 +94,7 @@ namespace GFGGame
                 listItem.m_unlockMask.visible = false;
                 listItem.m_comCard.m_loaCard.url = ResPathUtil.GetCardIconPath(data.resources[data.resIndex]);
                 int starLevelDodge = data.star / 5;
-                listItem.m_starNumType.selectedIndex = data.itemCfg.starDescArr.Length - 1;
+                listItem.m_showType.selectedIndex = 1;
                 listItem.m_txtLv.visible = false;
                 for (int i = 0; i < 4; i++)
                 {

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitGuideView.cs

@@ -56,9 +56,8 @@ namespace GFGGame
             {
                 _needRefresh = false;
                 UpdateItemsByType(1);
-                UpdateListSuitTypeRedDots();
             }
-
+            UpdateListSuitTypeRedDots();
             Timers.inst.StartCoroutine(UpdateRedDot());
         }
 

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxActivityView.cs

@@ -17,9 +17,18 @@ namespace GFGGame
         private ActivityOpenCfg _activityCfg;
         private LuckyBoxCfg _luckyBoxCfg;
         private int _activityId;
+        private Dictionary<string, EffectUI> _effectUIDic = new Dictionary<string, EffectUI>();
 
         public override void Dispose()
         {
+            // Clear Effect
+            foreach (var v in _effectUIDic)
+            {
+                EffectUIPool.Recycle(v.Value);
+            }
+
+            _effectUIDic.Clear();
+
             if (_valueBarController != null)
             {
                 _valueBarController.Dispose();
@@ -55,7 +64,8 @@ namespace GFGGame
             _ui.m_btnReward.onClick.Add(OnClickBtnReward);
             _ui.m_btnShop.onClick.Add(OnClickBtnShop);
             _ui.m_btnGiftBag.onClick.Add(OnClickBtnGiftBag);
-
+            _effectUIDic.Add("Button_public", EffectUIPool.CreateEffectUI(_ui.m_comBox.m_btnBuyTen_eff, "ui_LuckyBox", "Button_public"));
+            _effectUIDic.Add("Button_Text_DianCang", EffectUIPool.CreateEffectUI(_ui.m_comBox.m_Special_eff, "ui_LuckyBox", "Button_Text_DianCang"));
         }
         protected override void AddEventListener()
         {

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxNewDressView.cs

@@ -23,6 +23,7 @@ namespace GFGGame
         private EffectUI _effectUI4;
         private EffectUI _effectUI5;
         private EffectUI _effectUI6;
+        private EffectUI _effectUI7;
 
         public override void Dispose()
         {
@@ -104,6 +105,11 @@ namespace GFGGame
                 EffectUIPool.Recycle(_effectUI6);
                 _effectUI6 = null;
             }
+            if (_effectUI7 != null)
+            {
+                EffectUIPool.Recycle(_effectUI7);
+                _effectUI7 = null;
+            }
             //_ui.m_btnPass.visible = _newRewardList.Count <= 1;
             _rewardList = _newRewardList.Count > 0 ? _newRewardList : _oldRewardList;
 
@@ -133,6 +139,7 @@ namespace GFGGame
                     _ui.m_comCard.m_holder.visible = true;
                     break;
             }
+            _effectUI7 = EffectUIPool.CreateEffectUI(_ui.m_comCard.m_holder_get, "ui_LuckyBox", "CK_OneBigCard_end");
 
             _ui.m_comCard.m_loaType.url = ResPathUtil.GetCommonGameResPath("hz_bq_shuxing_" + itemCfg.rarity);
             _ui.m_comCard.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxStarView.cs

@@ -114,6 +114,7 @@ namespace GFGGame
         {
             base.OnShown();
             Debug.Log("OnShown：  LuckyBoxStarView");
+            _ui.m_star.visible = true;
             _ui.target.onTouchBegin.Add(OnClickUIBegin);
             _ui.target.onTouchMove.Add(OnClickUIMove);
             _ui.target.onTouchEnd.Add(OnClickUIEnd);
@@ -330,13 +331,17 @@ namespace GFGGame
         // }
         private void SetEndEffect(object param)
         {
-            _ui.m_effEnd.visible = true;
-            _ui.m_effEnd.SetPlaySettings(0, -1, 1, -1);
+            //_ui.m_effEnd.visible = true;
+            //_ui.m_effEnd.SetPlaySettings(0, -1, 1, -1);
+            _ui.m_t0.Play(()=>
+            {
+                ClickUIEnd(null);
+            });
+            //Timers.inst.Add(0.4f, 1, ClickUIEnd);
 
-            Timers.inst.Add(0.6f, 1, ClickUIEnd);
-            // ClickUIEnd(null);
             TryCompleteGuide();
         }
+
         private void ClickUIEnd(object param)
         {
             if (curComStar != null)
@@ -346,9 +351,9 @@ namespace GFGGame
                 //ViewManager.Show<LuckyBoxBonusView>(new object[] { _rewardList });
 
                 ViewManager.Show<LuckyBoxBonusShowView>(_rewardList);
-
-                //ViewManager.Show<LuckyBoxNewDressView>(_rewardList);
                 this.Hide();
+                //ViewManager.Show<LuckyBoxNewDressView>(_rewardList);
+
             }
         }
 

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

@@ -95,9 +95,10 @@ namespace GFGGame
                 item.target.onClick.Add(OnClickBtnBuy);
             }
             item.target.data = index;
+            ItemCfg itemIdCfg = ItemCfgArray.Instance.GetCfg(shopCfg.itemId);
             ItemCfg doubleItem = ItemCfgArray.Instance.GetCfg(shopCfg.doubleItemId);
 
-            item.m_txtName.text = string.Format("{0}{1}", shopCfg.itemNum, doubleItem.name);
+            item.m_txtName.text = string.Format("{0}{1}", shopCfg.itemNum, itemIdCfg.name);
             item.m_txtDesc.text = string.Format("首充赠送+{0}{1}", shopCfg.itemNum, doubleItem.name);
             bool isDouble = ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.id) < shopCfg.doubleTimes;
             item.m_grpDouble.visible = isDouble;

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

@@ -54,6 +54,7 @@ namespace GFGGame
             _shopCfgs = ShopDataManager.Instance.RemoveNotOpenCfg(_shopCfgs);
             _valueBarController.OnShown();
             _valueBarController.UpdateList(ShopDataManager.Instance.GetShopCostIds(_shopCfgs));
+            _ui.m_list.scrollPane.ScrollTop();
             UpdateView();
         }