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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComSkillShow.cs

@@ -17,6 +17,7 @@ namespace UI.Main
         public GTextField m_SkillScore;
         public Transition m_t0;
         public Transition m_t1;
+        public Transition m_t2;
         public const string URL = "ui://mfvz4q8kpsphiy";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ComSkillShow";
@@ -74,6 +75,7 @@ namespace UI.Main
             m_SkillScore = (GTextField)comp.GetChild("SkillScore");
             m_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
+            m_t2 = comp.GetTransition("t2");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -89,6 +91,7 @@ namespace UI.Main
             m_SkillScore = null;
             m_t0 = null;
             m_t1 = null;
+            m_t2 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StorySkillUI.cs

@@ -7,7 +7,9 @@ namespace UI.Main
     public partial class UI_StorySkillUI
     {
         public GComponent target;
+        public GImage m_bg;
         public UI_ComSkillShow m_comSkillShow;
+        public GGraph m_effReduceScore;
         public Transition m_t1;
         public Transition m_t2;
         public const string URL = "ui://mfvz4q8kpy009l";
@@ -57,14 +59,18 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
+            m_bg = (GImage)comp.GetChild("bg");
             m_comSkillShow = (UI_ComSkillShow)UI_ComSkillShow.Create(comp.GetChild("comSkillShow"));
+            m_effReduceScore = (GGraph)comp.GetChild("effReduceScore");
             m_t1 = comp.GetTransition("t1");
             m_t2 = comp.GetTransition("t2");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_bg = null;
             m_comSkillShow.Dispose();
             m_comSkillShow = null;
+            m_effReduceScore = null;
             m_t1 = null;
             m_t2 = null;
             if(disposeTarget && target != null)

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

@@ -209,7 +209,7 @@ namespace GFGGame
             bool _showCard = ScoreSystemData.Instance.IsShowCard(InstanceZonesDataManager.currentCardId, vaildSkills);
             if (_showCard)
             {
-                //第四个参数用于分数展示，和
+               
                 ViewManager.Show<StorySkillView>(new object[] { skillsToShowDic ,null });
                 //这里可以写卡牌加分
                 _score += _skillScore;

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

@@ -33,7 +33,6 @@ namespace GFGGame
         private EffectUI _effectUI13;
         private EffectUI _effectUI14;
         private EffectUI _effectUI15;
-        private EffectUI _effectUI16;
 
         private NTexture _nTexture;
         private bool _isAutoPlay = false;
@@ -86,8 +85,6 @@ namespace GFGGame
             _effectUI14 = null;
             EffectUIPool.Recycle(_effectUI15);
             _effectUI15 = null;
-            EffectUIPool.Recycle(_effectUI16);
-            _effectUI16 = null;
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -112,7 +109,6 @@ namespace GFGGame
             _effectUI13 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comAllPerfect.m_holder, "ui_fight_new", "3S_textAppear01");
             _effectUI14 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comAllPerfect.m_holderSmokeIn, "ui_fight_new", "smoke_Approach");
             _effectUI15 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comAllPerfect.m_holderSmokeOut, "ui_fight_new", "smoke_out");
-            _effectUI16 = EffectUIPool.CreateEffectUI(_ui.m_effReduceScore, "ui_fight_new", "CFKP_Down_end");
         }
 
         protected override void OnInit()
@@ -276,12 +272,12 @@ namespace GFGGame
             if (showCard)
             {
                 _ui.m_reduceTxt.SetVar("value", _targetSkillScore.ToString()).FlushVars();
-                ViewManager.Show<StorySkillView>(new object[] { skillScoreDic, _ui.m_effReduceScore, _ui.m_t3});
+                ViewManager.Show<StorySkillView>(new object[] { skillScoreDic, _ui.m_t3});
                 _score += _skillScore;
                 _targetScore += _targetSkillScore;
                 _skillScore = 0;
                 _targetSkillScore = 0;
-                Timers.inst.Add(2.0f, 1, UpdateProgressA);
+                Timers.inst.Add(2.5f, 1, UpdateProgressA);
             }
             else
             {

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

@@ -15,7 +15,7 @@ namespace GFGGame
         private EffectUI _effectUI2;
         private EffectUI _effectUI3;
         private EffectUI _effectUI4;
-        private GGraph _m_effReduceScore;
+        private EffectUI _effectUI5;
         private Transition m_ReduceTxt;
 
         private bool isFirst;
@@ -32,6 +32,8 @@ namespace GFGGame
             _effectUI3 = null;
             EffectUIPool.Recycle(_effectUI4);
             _effectUI4 = null;
+            EffectUIPool.Recycle(_effectUI5);
+            _effectUI5 = null;
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -50,6 +52,7 @@ namespace GFGGame
             //_effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_comSkillShow.m_holderTop, "ui_fight_new", "CFKP_TX_up");
             _effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_comSkillShow.m_addScore, "ui_fight_new", "CFKP_UP");
             _effectUI4 = EffectUIPool.CreateEffectUI(_ui.m_comSkillShow.m_reduceScore, "ui_fight_new", "CFKP_Down");
+            _effectUI5 = EffectUIPool.CreateEffectUI(_ui.m_effReduceScore, "ui_fight_new", "CFKP_Down_end");
 
             _ui.m_comSkillShow.m_t0.ignoreEngineTimeScale = false;
             _ui.m_comSkillShow.m_t1.ignoreEngineTimeScale = false;
@@ -62,11 +65,7 @@ namespace GFGGame
         {
             base.OnShown();
             skillScoreDic = (this.viewData as object[])[0] as Dictionary<int, int>;
-            _m_effReduceScore = (this.viewData as object[])[1] as GGraph;
-            if ((this.viewData as object[]).Length >= 3)
-            {
-                m_ReduceTxt = (this.viewData as object[])[2] as Transition;
-            }
+            m_ReduceTxt = (this.viewData as object[])[1] as Transition;
             
             UpdateView();
         }
@@ -130,9 +129,9 @@ namespace GFGGame
             base.OnHide();
                 _ui.m_comSkillShow.m_addScore.visible = false;
                 _ui.m_comSkillShow.m_reduceScore.visible = false;
-                if (_m_effReduceScore != null)
+                if (_ui.m_effReduceScore != null)
                 {
-                    _m_effReduceScore.visible = false;
+                    _ui.m_effReduceScore.visible = false;
                 }
             SetCamera(false);
             Timers.inst.Remove(SetEffReduceScore);
@@ -146,8 +145,12 @@ namespace GFGGame
 
         private void SetEffReduceScore(object param)
         {
-            _m_effReduceScore.visible = true;
-            m_ReduceTxt.Play();
+            _ui.m_effReduceScore.visible = true;
+            if (m_ReduceTxt != null)
+            { 
+                m_ReduceTxt.Play();
+            }
+            
         }
         
         private void SetEffVisible(object param)
@@ -167,7 +170,9 @@ namespace GFGGame
             {
                 _ui.m_comSkillShow.m_SkillScore.color = new Color(0.973f, 0.784f, 0.431f, 1.000f);
                 _ui.m_comSkillShow.m_reduceScore.visible = false;
-                _ui.m_comSkillShow.m_addScore.visible = true;  
+                _ui.m_comSkillShow.m_addScore.visible = true;
+                _ui.m_comSkillShow.m_SkillScore.visible = true;
+                _ui.m_comSkillShow.m_t2.Play();
                 SetCamera(true);
             }
             else if (skillScoreDic[skillId] < 0)
@@ -175,6 +180,7 @@ namespace GFGGame
                 _ui.m_comSkillShow.m_SkillScore.color = new Color(0.906f, 0.894f, 0.894f, 1.000f);
                 _ui.m_comSkillShow.m_addScore.visible = false;
                 _ui.m_comSkillShow.m_reduceScore.visible = true;
+                _ui.m_comSkillShow.m_SkillScore.visible = false;
                 Timers.inst.Add(1.5f, 1, SetEffReduceScore);
             }
         }