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

GameClient/Assets/Game/HotUpdate/Views/EnduringGiftBox/SpecialOfferGiftBoxView.cs

@@ -232,7 +232,8 @@ namespace GFGGame
                 uiItem.m_btnBuy.m_txtOldPrice.visible = false;
                 uiItem.m_btnBuy.m_txtNewPrice.visible = false;
                 uiItem.m_btnBuy.m_loaIcon.visible = false;
-                uiItem.m_holderBtn.visible = false;
+                if(uiItem.m_holderBtn != null)
+                    uiItem.m_holderBtn.visible = false;
             }
             else
             {
@@ -244,7 +245,8 @@ namespace GFGGame
                 uiItem.m_btnBuy.m_txtOldPrice.visible = true;
                 uiItem.m_btnBuy.m_txtNewPrice.visible = true;
                 uiItem.m_btnBuy.m_loaIcon.visible = true;
-                uiItem.m_holderBtn.visible = true;
+                if (uiItem.m_holderBtn != null)
+                    uiItem.m_holderBtn.visible = true;
             }
 
             uiItem.m_comDiscount.m_txtDiscountNum.text =
@@ -255,19 +257,19 @@ namespace GFGGame
             uiItem.m_btnBuy.target.onClick.Add(OnBtnBuyClick);
             uiItem.m_txtBoxItemName.text = shopCfg.itemName;
 
-            if (!_graphList.Contains(uiItem.m_holderZheKou))
-            {
-                EffectUI _effectUI = EffectUIPool.CreateEffectUI(uiItem.m_holderZheKou, "ui_Activity", "Prefer_but_zhekou");
-                _graphList.Add(uiItem.m_holderZheKou);
-                _effectUIList.Add(_effectUI);
-            }
+            //if (!_graphList.Contains(uiItem.m_holderZheKou))
+            //{
+            //    EffectUI _effectUI = EffectUIPool.CreateEffectUI(uiItem.m_holderZheKou, "ui_Activity", "Prefer_but_zhekou");
+            //    _graphList.Add(uiItem.m_holderZheKou);
+            //    _effectUIList.Add(_effectUI);
+            //}
 
-            if (!_graphList.Contains(uiItem.m_holderBtn))
-            {
-                EffectUI _effectUI = EffectUIPool.CreateEffectUI(uiItem.m_holderBtn, "ui_Activity", "Prefer_button_buy");
-                _graphList.Add(uiItem.m_holderBtn);
-                _effectUIList.Add(_effectUI);
-            }
+            //if (!_graphList.Contains(uiItem.m_holderBtn))
+            //{
+            //    EffectUI _effectUI = EffectUIPool.CreateEffectUI(uiItem.m_holderBtn, "ui_Activity", "Prefer_button_buy");
+            //    _graphList.Add(uiItem.m_holderBtn);
+            //    _effectUIList.Add(_effectUI);
+            //}
 
             uiItem.m_t0.Play();
 

GameClient/Assets/Game/HotUpdate/Views/Friend/FriendView.cs

@@ -280,6 +280,7 @@ namespace GFGGame
                 UpdateScene(customSuit);
             }
         }
+
         private void UpdateScene(CustomSuitData suitSavedData)
         {
             Transform transform = _sceneObject.transform.Find("Role");

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

@@ -928,7 +928,7 @@ namespace GFGGame
             {
                 StoryDialogCfg cfg = _stepListToRead[i];
 
-                if (cfg.bgRes.Length > 0)
+                if (cfg.bgRes.Length > 0 && cfg.bgRes != "0")
                 {
                     string bgRes = ResPathUtil.GetSceneBgPath(cfg.bgRes);
                     if (!resList.Contains(bgRes))
@@ -937,7 +937,7 @@ namespace GFGGame
                     }
                 }
 
-                if (cfg.aniRes.Length > 0)
+                if (cfg.aniRes.Length > 0 && cfg.aniRes != "0")
                 {
                     string res = cfg.aniRes.Split('/')[1];
                     string aniRes = ResPathUtil.GetStoryDialogCGPath(cfg.aniRes, res);

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

@@ -709,7 +709,7 @@ namespace GFGGame
         {
             //评分结束后，添加套装加成分数
             StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
-            if (storyLevelCfg != null && storyLevelCfg.type == ConstInstanceZonesType.Studio && storyLevelCfg.subType == ConstInstanceZonesSubType.Hard3)
+            if (storyLevelCfg != null && InstanceZonesDataManager.FightScene != ConstInstanceZonesType.Arena && storyLevelCfg.type == ConstInstanceZonesType.Studio && storyLevelCfg.subType == ConstInstanceZonesSubType.Hard3)
             {
                 float addition = StudioDataManager.Instance.GetAddition();
                 addition = addition / 10000 * FightDataManager.Instance.totalScore;