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

# Conflicts:
#	GameClient/Assets/ResIn/UI/Main/Main_fui.bytes

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

@@ -17,8 +17,10 @@ namespace UI.Main
         public GComponent m_myHead;
         public GComponent m_targetHead;
         public GGraph m_effReduceScore;
+        public GTextField m_reduceTxt;
         public Transition m_t1;
         public Transition m_t2;
+        public Transition m_t3;
         public const string URL = "ui://mfvz4q8k8xpg3w";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryFightTargetScoreUI";
@@ -76,8 +78,10 @@ namespace UI.Main
             m_myHead = (GComponent)comp.GetChild("myHead");
             m_targetHead = (GComponent)comp.GetChild("targetHead");
             m_effReduceScore = (GGraph)comp.GetChild("effReduceScore");
+            m_reduceTxt = (GTextField)comp.GetChild("reduceTxt");
             m_t1 = comp.GetTransition("t1");
             m_t2 = comp.GetTransition("t2");
+            m_t3 = comp.GetTransition("t3");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -95,8 +99,10 @@ namespace UI.Main
             m_myHead = null;
             m_targetHead = null;
             m_effReduceScore = null;
+            m_reduceTxt = null;
             m_t1 = null;
             m_t2 = null;
+            m_t3 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -167,8 +167,8 @@ namespace GFGGame
                         ActivityDataManager.Instance.luckyActTsyBonusState[response.BonusKey] = response.BonusStatus;
                     }
                         
-                    int[][] bonus = ActivityLuckybonusCfgArray.Instance.GetCfgByidAndnum(response.ActivityId, response.BonusKey).bonusArr;
-                    BonusController.TryShowBonusList(bonus);
+                    // int[][] bonus = ActivityLuckybonusCfgArray.Instance.GetCfgByidAndnum(response.ActivityId, response.BonusKey).bonusArr;
+                    BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.BonusList));
                     EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
                     EventAgent.DispatchEvent(ConstMessage.LUCKY_BOX_ACTIVITY_REWARD);
                     return true;

GameClient/Assets/Game/HotUpdate/ShakeCamera/SC_shakeCamera.cs

@@ -28,6 +28,10 @@ public class SC_shakeCamera : MonoBehaviour
 
     private void OnDisable()
     {
+        if (cam == null )
+        {
+            cam = gameObject.GetComponent<Camera>();
+        }
         cam.rect = new Rect(0.0f, 0.0f, 1.0f, 1.0f);
     }
 
@@ -46,13 +50,13 @@ public class SC_shakeCamera : MonoBehaviour
                     shakeTime = 0.1f;
                     fps = 60.0f;
                     frameTime = 0.01f;
-                    shakeDelta = 0.005f;
+                    shakeDelta = 0.002f;
                 }
                 else
                 {
                     frameTime += Time.deltaTime;
 
-                    if (frameTime > 1.0 / fps)
+                    if (frameTime > 2.0 / fps)
                     {
                         frameTime = 0;
 						cam.rect = new Rect(shakeDelta * (-1.0f + shakeINT * Random.value), shakeDelta * (-1.0f + shakeINT * Random.value), 1.0f, 1.0f);

GameClient/Assets/Game/HotUpdate/ShakeCamera/shakecameraControl.cs

@@ -7,7 +7,7 @@ public class shakecameraControl : MonoBehaviour {
     private float time=0f;
     public float StartTime = 0.7f;
     private float Time0;
-    public float shaketime = 0.5f;
+    public float shaketime = 0.3f;
 	public float shakeInt;
     public bool end = false;
 

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

@@ -275,7 +275,8 @@ namespace GFGGame
             List<PassivitySkillLvlCfg> vaildSkills = ScoreSystemData.Instance.GetValidSkills(_currentTime, _partId, roleData.cardId, roleData.skillLvs, 0, null, roundTimes, new List<int>());
             if (showCard)
             {
-                ViewManager.Show<StorySkillView>(new object[] { skillScoreDic, _ui.m_effReduceScore});
+                _ui.m_reduceTxt.SetVar("value", _targetSkillScore.ToString()).FlushVars();
+                ViewManager.Show<StorySkillView>(new object[] { skillScoreDic, _ui.m_effReduceScore, _ui.m_t3});
                 _score += _skillScore;
                 _targetScore += _targetSkillScore;
                 _skillScore = 0;

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

@@ -16,6 +16,7 @@ namespace GFGGame
         private EffectUI _effectUI3;
         private EffectUI _effectUI4;
         private GGraph _m_effReduceScore;
+        private Transition m_ReduceTxt;
 
         private bool isFirst;
         private GameObject mainCamera;
@@ -62,6 +63,11 @@ 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;
+            }
+            
             UpdateView();
         }
         private void UpdateView()
@@ -141,6 +147,7 @@ namespace GFGGame
         private void SetEffReduceScore(object param)
         {
             _m_effReduceScore.visible = true;
+            m_ReduceTxt.Play();
         }
         
         private void SetEffVisible(object param)
@@ -158,15 +165,17 @@ namespace GFGGame
             //Õ½¶·¿¨ÅÆÌØЧ´¦Àí
             if (skillScoreDic[skillId] > 0)
             {
+                _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;  
                 SetCamera(true);
             }
             else if (skillScoreDic[skillId] < 0)
             {
+                _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;
-                Timers.inst.Add(1.3f, 1, SetEffReduceScore);
+                Timers.inst.Add(1.5f, 1, SetEffReduceScore);
             }
         }
 

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -138,6 +138,7 @@ namespace GFGGame
             _btnHaoYou.onClick.Add(OnClickBtnHaoYou);
             _btnGongGao.onClick.Add(OnClickBtnGongGao);
             _btnRenWu.onClick.Add(OnClickBtnRenWu);
+            _ui.m_btnActivityAfuGift.target.visible = false;
             _ui.m_btnActivityAfuGift.target.onClick.Add(OnClickBtnAfuGift);
             _btnActivityDay7.onClick.Add(OnClickBtnDay7);
             _ui.m_btnFirstRecharge.target.onClick.Add(OnClickBtnFirstRecharge);