套装部件集齐特效

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

@@ -8,12 +8,14 @@ namespace UI.CommonGame
     {
         public GComponent target;
         public GLoader m_loaBg;
-        public GGraph m_iconEffect;
         public GLoader m_iconBg;
         public GLoader m_icon;
         public GLoader m_iconBgDown;
         public GProgressBar m_probar;
         public GTextField m_txtName;
+        public GGraph m_topEffect;
+        public GGraph m_probarEffect;
+        public GGraph m_downEffect;
         public Transition m_t_open;
         public Transition m_t_close;
         public const string URL = "ui://eg2y0ldpcbywtqq";
@@ -64,24 +66,28 @@ namespace UI.CommonGame
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_iconEffect = (GGraph)comp.GetChild("iconEffect");
             m_iconBg = (GLoader)comp.GetChild("iconBg");
             m_icon = (GLoader)comp.GetChild("icon");
             m_iconBgDown = (GLoader)comp.GetChild("iconBgDown");
             m_probar = (GProgressBar)comp.GetChild("probar");
             m_txtName = (GTextField)comp.GetChild("txtName");
+            m_topEffect = (GGraph)comp.GetChild("topEffect");
+            m_probarEffect = (GGraph)comp.GetChild("probarEffect");
+            m_downEffect = (GGraph)comp.GetChild("downEffect");
             m_t_open = comp.GetTransition("t_open");
             m_t_close = comp.GetTransition("t_close");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
-            m_iconEffect = null;
             m_iconBg = null;
             m_icon = null;
             m_iconBgDown = null;
             m_probar = null;
             m_txtName = null;
+            m_topEffect = null;
+            m_probarEffect = null;
+            m_downEffect = null;
             m_t_open = null;
             m_t_close = null;
             if(disposeTarget && target != null)

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

@@ -13,18 +13,18 @@ namespace GFGGame
         private int count = 0;//套装当前拥有的部件数量
         private int totalCount = 1;
 
-        //private EffectUI _effectUI1;
-        //private EffectUI _effectUI2;
-        //private EffectUI _effectUI3;
+        private EffectUI _effectUI1;
+        private EffectUI _effectUI2;
+        private EffectUI _effectUI3;
 
         public override void Dispose()
         {
-            //EffectUIPool.Recycle(_effectUI1);
-            //_effectUI1 = null;
-            //EffectUIPool.Recycle(_effectUI2);
-            //_effectUI2 = null;
-            //EffectUIPool.Recycle(_effectUI3);
-            //_effectUI3 = null;
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+            EffectUIPool.Recycle(_effectUI2);
+            _effectUI2 = null;
+            EffectUIPool.Recycle(_effectUI3);
+            _effectUI3 = null;
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -42,9 +42,9 @@ namespace GFGGame
             isfullScreen = true;
             _ui.m_loaBg.onTouchBegin.Add(OnClickBg);
 
-            //_effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_topEffect, "ui_LuckyBox", "SJJD_CradUp");
-            //_effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_probarEffect, "ui_LuckyBox", "SJJD_CradUP_once");
-            //_effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_downEffect, "ui_LuckyBox", "SJJD_CradDown");
+            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_topEffect, "ui_LuckyBox", "SJJD_CradUp");
+            _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_probarEffect, "ui_LuckyBox", "SJJD_CradUP_once");
+            _effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_downEffect, "ui_LuckyBox", "SJJD_CradDown");
         }
         protected override void OnShown()
         {

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs

@@ -597,11 +597,13 @@ namespace GFGGame
 
         private void Skip(object param = null)
         {
+            _prefectCount = 0;
             InstanceZonesController.CheckStoryFightResult().Coroutine();
         }
         private void OnBtnBackClick()
         {
             this.Hide();
+            _prefectCount = 0;
             InstanceZonesController.OnFinishStoryLevel(InstanceZonesDataManager.currentLevelCfgId, false, false);
             Reset();
         }
@@ -695,7 +697,7 @@ namespace GFGGame
             if (_isAllPerfect)
             {
                 bool guide = GuideController.TryGuide(_ui.m_comClick.target, ConstGuideId.START_FIGHT, 10, "太棒啦，6次卓越点击会触发登峰造极哦！任意地方按住3秒就行！", -1, true, 230, false, true);
-                if (guide) _ui.m_comClick.target.touchable = true;
+                if (guide || !FightDataManager.Instance.autoPlay) _ui.m_comClick.target.touchable = true;
             }
         }