修改摘星动画

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/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/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();
         }