Merge remote-tracking branch 'remotes/origin/master' into yooasset

GameClient/Assets/Game/HotUpdate/Data/ActivityAfuGiftDataManager.cs

@@ -50,7 +50,7 @@ namespace GFGGame
 
         public bool CanGetSuperReward(int id)
         {
-            return !_superRewards.Contains(id);
+            return _isBuy && !_superRewards.Contains(id);
         }
 
         public void AddNormalReward(int levelId)
@@ -67,5 +67,10 @@ namespace GFGGame
         {
             _isBuy = isBuy;
         }
+
+        public bool GetIsBuy()
+        {
+            return _isBuy;
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Data/LeagueDataManager.cs

@@ -307,7 +307,7 @@ namespace GFGGame
             if (teapartyRewardRoleCfg == null)
                 return 0;
             var roleTeapartyInfo = LeagueDataManager.Instance.RoleTeapartyInfo;
-            if (roleTeapartyInfo == null || roleTeapartyInfo.PerAwardStatusVs == null)
+            if (roleTeapartyInfo == null || roleTeapartyInfo.PerAwardStatusVs == null || roleTeapartyInfo.PerAwardStatusVs.Count <= 0)
                 return 0;
             for (int i = 0; i < teapartyRewardRoleCfg.Length; i++)
             {

GameClient/Assets/Game/HotUpdate/Data/LuckyBoxDataManager.cs

@@ -296,19 +296,17 @@ namespace GFGGame
 
         public bool RedBtnLeft(int curIndex)
         {
-            int index = curIndex;
+            int index = curIndex - 1;
             for (int i = index; i >= BOX_ID_2 - 1; i--)
             {
                 int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[i];
                 long freeTime = LuckyBoxDataManager.Instance.GetFreeTime(boxId);
-                if (freeTime > 0)
-                {
-                    if (freeTime - TimeHelper.ServerNow() < 0)
-                        return true;
-                }
+                if (freeTime > 0 && freeTime - TimeHelper.ServerNow() < 0)
+                    return true;
+
+                if (index == 1 && RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitTsy))
+                    return true;
             }
-            if(curIndex == 1 && RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitTsy))
-                return true;
 
             return false;
         }
@@ -319,15 +317,12 @@ namespace GFGGame
             for (int i = index; i < BOX_ID_3; i++) {
                 int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[i];
                 long freeTime = LuckyBoxDataManager.Instance.GetFreeTime(boxId);
-                if (freeTime > 0)
-                {
-                    if (freeTime - TimeHelper.ServerNow() < 0)
-                        return true;
-                }
-            }
+                if (freeTime > 0 && freeTime - TimeHelper.ServerNow() < 0)
+                    return true;
 
-            if (curIndex == 1 && RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitTsy))
-                return true;
+                if (index == 1 && RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitTsy))
+                    return true;
+            }
 
             return false;
         }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAFuGift/UI_day.cs

@@ -7,6 +7,7 @@ namespace UI.ActivityAFuGift
     public partial class UI_day
     {
         public GComponent target;
+        public Controller m_light;
         public GTextField m_day;
         public const string URL = "ui://f3o25i6ljm6kl";
         public const string PACKAGE_NAME = "ActivityAFuGift";
@@ -55,10 +56,12 @@ namespace UI.ActivityAFuGift
 
         private void Init(GComponent comp)
         {
+            m_light = comp.GetController("light");
             m_day = (GTextField)comp.GetChild("day");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_light = null;
             m_day = null;
             if(disposeTarget && target != null)
             {

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/ServerProxy/ActivityAfuGiftProxy.cs

@@ -9,7 +9,6 @@ namespace ET
     {
         protected override async ETTask Run(Session session, S2C_PushActivityLoginInfo message)
         {
-
             var info =  message.ActivityLoginInfo;
             var afuGiftDataManager = ActivityAfuGiftDataManager.Instance;
             afuGiftDataManager.SetIsBuy(info.IsBuy);
@@ -22,7 +21,7 @@ namespace ET
                 afuGiftDataManager.AddSuperReward(superRewardID);
             }
             //EventAgent.DispatchEvent(ConstMessage.NOTICE_PASSPORT_OPEN);
-            //EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
+            EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
             await ETTask.CompletedTask;
         }
     }
@@ -32,14 +31,45 @@ namespace GFGGame
 {
     public class ActivityAfuGiftProxy : MonoBehaviour
     {
-        public static async ETTask<bool> GetAfuGiftInfo()
+        public static async ETTask GetAfuGiftInfo()
         {
             var response =
-                (S2C_GetBattlePassInfo)await MessageHelper.SendToServer(new C2S_GetBattlePassInfo {  });
+                (S2C_GetActivityLoginInfo)await MessageHelper.SendToServer(new C2S_GetActivityLoginInfo {  });
+            if (!(response is { Error: ErrorCode.ERR_Success })) return;
+            var info = response.ActivityLoginInfo;
+            var activityAfuGiftDataManager = ActivityAfuGiftDataManager.Instance;
+            activityAfuGiftDataManager.SetIsBuy(info.IsBuy);
+            foreach(var t in info.FreeRewardStatusList)
+            {
+                activityAfuGiftDataManager.AddNormalReward(t);
+            }
+            foreach (var t in info.PayRewardStatusList)
+            {
+                activityAfuGiftDataManager.AddSuperReward(t);
+            }
+        }
+
+        public static async ETTask<bool> ReqGetReward(bool isPay, int rewardDay)
+        {
+            var response =
+                (S2C_GetActivityLoginReward)await MessageHelper.SendToServer(new C2S_GetActivityLoginReward()
+                { IsPay = isPay, RewardDay = rewardDay });
             if (!(response is { Error: ErrorCode.ERR_Success })) return false;
-            //var responseGetType = response.Type;
+            //奖励弹窗
+            BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.BonusList));
+            var info = response.ActivityLoginInfo;
+            var activityAfuGiftDataManager = ActivityAfuGiftDataManager.Instance;
+            foreach (var t in info.FreeRewardStatusList)
+            {
+                activityAfuGiftDataManager.AddNormalReward(t);
+            }
+            foreach (var t in info.PayRewardStatusList)
+            {
+                activityAfuGiftDataManager.AddSuperReward(t);
+            }
 
-            return true;
+            EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
+            return false;
         }
     }
 

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

@@ -84,17 +84,20 @@ namespace GFGGame
             ShopDataManager.Instance.UpdateGoodsData(buyId, totalTimes);
             ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(buyId);
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.itemId);
+            ItemCfg doubleItemIdCfg = ItemCfgArray.Instance.GetCfg(shopCfg.doubleItemId);
 
             EventAgent.DispatchEvent(ConstMessage.CONTINUOUS_REBATE_GIFT_SHOP_BUY, shopCfg);
             if (showItems)
             {
                 //判断倍数
                 var multiple = 1;
-                if (totalTimes <= shopCfg.doubleTimes)
-                {
-                    multiple = 2;
-                }
-                List<ItemData> itemDatas = ItemUtil.CreateItemDataList(itemCfg.id, times * shopCfg.itemNum * multiple);
+                //if (totalTimes <= shopCfg.doubleTimes)
+                //{
+                //    multiple = 2;
+                //}
+                List<ItemData> itemDatas = new List<ItemData>();
+                itemDatas.Add(ItemUtil.createItemData(itemCfg.id, times * shopCfg.itemNum * multiple));
+                itemDatas.Add(ItemUtil.createItemData(doubleItemIdCfg.id, times * shopCfg.itemNum * multiple));
                 BonusController.TryShowBonusList(itemDatas);
             }
             EventAgent.DispatchEvent(ConstMessage.SHOP_BUY);

GameClient/Assets/Game/HotUpdate/Views/ActivityAfuGift/ActivityAfuGiftView.cs

@@ -5,6 +5,7 @@ using ET;
 using FairyGUI;
 using System;
 using UI.CommonGame;
+using static GFGGame.ShopSProxy;
 
 namespace GFGGame
 {
@@ -15,7 +16,9 @@ namespace GFGGame
         private struct GetState
         {
             public int rewardID;
-            public bool canGet;
+            public int dayIndex;
+            public bool canGet; 
+            public bool isVip;
         }
 
 
@@ -35,6 +38,7 @@ namespace GFGGame
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             _ui.m_btnClose.onClick.Add(Hide);
+            _ui.m_btnGet.onClick.Add(OnClickBtnGet);
 
             // Data
             ActivityAfuGiftDataManager.Instance.InitActivityInfo();
@@ -64,25 +68,33 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateState);
         }
 
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateState);
         }
 
 
         private void InitUI()
         {
-            // 112121
+            _ui.m_c1.SetSelectedIndex(ActivityAfuGiftDataManager.Instance.GetIsBuy() ? 1 : 0);
             // 使列表宽度等于子节点的总宽度
             float itemWidth = _rewardListUI.GetChildAt(0).width;
             float columnGap = _rewardListUI.columnGap;
             _rewardListUI.width = CalculateListWidth(_rewardListUI.numItems, itemWidth, columnGap);
+            Timers.inst.StartCoroutine(InitProgressWidth());
+        }
+
+        private IEnumerator InitProgressWidth()
+        {
+            yield return new WaitForSeconds(0.5f);
             // 根据列表 初始化进度条长度
-            float marginLeft = 147;
+            float marginLeft = 149;
             GProgressBar gProgressBar = _ui.m_panel.m_scrollPane.m_progress;
-            gProgressBar.width = marginLeft + _rewardListUI.width;
+            gProgressBar.width = marginLeft + _rewardListUI.GetChildAt(_rewardListUI.numChildren - 1).position.x - _rewardListUI.GetChildAt(0).position.x;
         }
 
         private float CalculateListWidth(int num, float itemWidth, float columnGap)
@@ -102,27 +114,37 @@ namespace GFGGame
             UI_reward rewardUI = UI_reward.Proxy(item);
             rewardUI.m_day.m_day.SetVar("day", (index + 1).ToString()).FlushVars();
 
+            // 已经到达的日期
+            int passDay = ActivityAfuGiftDataManager.Instance.GetMaxPassDay();
+            int arrive = (index + 1) <= passDay ? 0 : 1;
+            rewardUI.m_day.m_light.SetSelectedIndex(arrive);
+
             int itemNormalId = ActivityAfuGiftDataManager.Instance.RewardCfgs[index].bonusFreeArr[0][0];
             int itemVipId1 = ActivityAfuGiftDataManager.Instance.RewardCfgs[index].bonusPayArr[0][0];
             int itemVipId2 = ActivityAfuGiftDataManager.Instance.RewardCfgs[index].bonusPayArr[1][0];
 
             LoadItem(itemNormalId, rewardUI.m_reward_normal, ActivityAfuGiftDataManager.Instance.RewardCfgs[index].bonusFreeArr[0][1]);
-            LoadItem(itemVipId1, rewardUI.m_reward_vip1, ActivityAfuGiftDataManager.Instance.RewardCfgs[index].bonusPayArr[0][1], true, true);
-            LoadItem(itemVipId2, rewardUI.m_reward_vip2, ActivityAfuGiftDataManager.Instance.RewardCfgs[index].bonusPayArr[1][1], true, true);
+            LoadItem(itemVipId1, rewardUI.m_reward_vip1, ActivityAfuGiftDataManager.Instance.RewardCfgs[index].bonusPayArr[0][1], true);
+            LoadItem(itemVipId2, rewardUI.m_reward_vip2, ActivityAfuGiftDataManager.Instance.RewardCfgs[index].bonusPayArr[1][1], true);
 
             UI_reward.ProxyEnd();
         }
 
-        private void LoadItem(int id, GObject obj, int num, bool isVip = false, bool isLock = false)
+        private void LoadItem(int id, GObject obj, int num, bool isVip = false)
         {
             ItemCfg itemNormal = ItemCfgArray.Instance.GetCfg(id);
             UI_ComItem comItem = UI_ComItem.Proxy(obj);
             comItem.m_loaIcon.url = ResPathUtil.GetIconPath(itemNormal);
             comItem.m_txtCount.text = num.ToString();
             comItem.m_QualityType.selectedIndex = itemNormal.rarity - 1;
-
             comItem.target.onClick.Add(OnItemClick);
-            comItem.m_Lock.selectedIndex = isLock ? 1 : 0;
+
+            int isLock = 0;
+            if (isVip)
+            {
+                isLock = ActivityAfuGiftDataManager.Instance.GetIsBuy() ? 0 : 1;
+            }
+            comItem.m_Lock.selectedIndex = isLock;
 
             int dayIndex = _rewardListUI.GetChildIndex(obj) + 1;
             // 已经到达的日期
@@ -131,7 +153,9 @@ namespace GFGGame
             comItem.target.data = new GetState
             {
                 rewardID = id,
-                canGet = arrive
+                canGet = arrive,
+                dayIndex = dayIndex,
+                isVip = isVip
             };
             if (arrive)
             {
@@ -173,6 +197,16 @@ namespace GFGGame
 
             if (getState.canGet)
             {
+                // Vip奖励同时领取两个
+                if (getState.isVip)
+                {
+                    int rewardID1 = ActivityAfuGiftDataManager.Instance.RewardCfgs[getState.dayIndex - 1].bonusPayArr[0][1];
+                    int rewardID2 = ActivityAfuGiftDataManager.Instance.RewardCfgs[getState.dayIndex - 1].bonusPayArr[1][1];
+                }
+                else
+                {
+                    int ID = ActivityAfuGiftDataManager.Instance.RewardCfgs[getState.dayIndex - 1].bonusFreeArr[0][1];
+                }
                 //ActivityGlobalSProxy.ReqGetActivityBonus(_activityInfo.ActivityId, getState.rewardID).Coroutine();
             }
             else
@@ -181,5 +215,49 @@ namespace GFGGame
             }
         }
 
+        /// <summary>
+        /// 领取所有奖励按钮
+        /// </summary>
+        private void OnClickBtnGet()
+        {
+            if (!ActivityAfuGiftDataManager.Instance.GetIsBuy())
+            {
+                // 跳转充值画面
+                ReqShopBuy(990005).Coroutine();
+                return;
+            }
+
+            // 一键领取
+            int passDay = ActivityAfuGiftDataManager.Instance.GetMaxPassDay();
+            for(int i = passDay - 1; i >= 0; i++)
+            {
+                int itemNormalId = ActivityAfuGiftDataManager.Instance.RewardCfgs[i].bonusFreeArr[0][0];
+                int itemVipId1 = ActivityAfuGiftDataManager.Instance.RewardCfgs[i].bonusPayArr[0][0];
+                int itemVipId2 = ActivityAfuGiftDataManager.Instance.RewardCfgs[i].bonusPayArr[1][0];
+                if (ActivityAfuGiftDataManager.Instance.CanGetNormalReward(itemNormalId))
+                {
+
+                }
+                if (ActivityAfuGiftDataManager.Instance.CanGetSuperReward(itemVipId1))
+                {
+
+                }
+                if (ActivityAfuGiftDataManager.Instance.CanGetSuperReward(itemVipId2))
+                {
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// 充值，领取东西后调用
+        /// </summary>
+        private void UpdateState()
+        {
+            // 更新底部按钮
+            _ui.m_c1.SetSelectedIndex(ActivityAfuGiftDataManager.Instance.GetIsBuy() ? 1 : 0);
+            // 更新锁 红点状态
+            _rewardListUI.numItems = ActivityAfuGiftDataManager.Instance.RewardCfgs.Count;
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -234,7 +234,8 @@ namespace GFGGame
             UI_ComBox1 comBox = UI_ComBox1.Proxy(obj);
             _listActivityBtnObj.Add(obj);
             int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitTsy);
-            if (activityId > 0 && boxId == LuckyBoxDataManager.BOX_ID_2) {
+            if (activityId > 0 && boxId == LuckyBoxDataManager.BOX_ID_2)
+            {
                 comBox.m_showActivityType.selectedIndex = 1;
                 UpGiftBox(comBox);
                 if (comBox.m_btnRule.data == null)
@@ -243,7 +244,7 @@ namespace GFGGame
                     comBox.m_btnRule.data = 300024;
                 }
             }
-            else
+            else 
                 comBox.m_showActivityType.selectedIndex = 0;
 
             if (!_lcukyBoxCtrl.ContainsKey(boxId))
@@ -488,7 +489,6 @@ namespace GFGGame
             int boxId = (int)obj.data;
             LuckyBoxCfg luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(boxId);
             long freeTime = LuckyBoxDataManager.Instance.GetFreeTime(boxId);
-
             int boughtCount = GameGlobal.myNumericComponent.GetAsInt(luckyBoxCfg.numericType);
 
             if (boughtCount + LuckyBoxDataManager.ONCE_TIME > luckyBoxCfg.maxCount)
@@ -502,12 +502,8 @@ namespace GFGGame
                  if (boxId == LuckyBoxDataManager.BOX_ID_2) {
                      activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitTsy);
                  }
-                 bool result = false;
-                 if (freeTime > 0 && freeTime < TimeHelper.ServerNow())
-                    result = await LuckyBoxSProxy.ReqGetBonus(boxId, LuckyBoxDataManager.ONCE_TIME, true, activityId);
-                 else
-                    result = await LuckyBoxSProxy.ReqGetBonus(boxId, LuckyBoxDataManager.ONCE_TIME,false, activityId);
-
+                 bool freeType = (freeTime > 0 && freeTime < TimeHelper.ServerNow());
+                 bool result = await LuckyBoxSProxy.ReqGetBonus(boxId, LuckyBoxDataManager.ONCE_TIME, freeType, activityId);
                  if (result)
                  {
                      ViewManager.Show<LuckyBoxStarView>(null, new object[] { typeof(LuckyBoxView).FullName, boxId });

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

@@ -207,7 +207,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

@@ -32,7 +32,6 @@ namespace GFGGame
         private EffectUI _effectUI13;
         private EffectUI _effectUI14;
         private EffectUI _effectUI15;
-        private EffectUI _effectUI16;
 
         private NTexture _nTexture;
         private bool _isAutoPlay = false;
@@ -85,8 +84,6 @@ namespace GFGGame
             _effectUI14 = null;
             EffectUIPool.Recycle(_effectUI15);
             _effectUI15 = null;
-            EffectUIPool.Recycle(_effectUI16);
-            _effectUI16 = null;
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -111,7 +108,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()
@@ -274,12 +270,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);
             }
         }

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

@@ -136,7 +136,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.visible = false;
             _ui.m_btnActivityAfuGift.target.onClick.Add(OnClickBtnAfuGift);
             _ui.m_btnActivityAfuGift.target.visible = false;
             _btnActivityDay7.onClick.Add(OnClickBtnDay7);

GameClient/Assets/Game/HotUpdate/Views/Store/StoreChargeView.cs

@@ -81,8 +81,10 @@ namespace GFGGame
                 item.target.onClick.Add(OnClickBtnBuy);
             }
             item.target.data = index;
-            item.m_txtName.text = string.Format("{0}{1}", shopCfg.itemNum, shopCfg.itemName);
-            item.m_txtDesc.text = string.Format("首充赠送+{0}{1}", shopCfg.itemNum, shopCfg.itemName);
+            ItemCfg doubleItem = ItemCfgArray.Instance.GetCfg(shopCfg.doubleItemId);
+
+            item.m_txtName.text = string.Format("{0}{1}", shopCfg.itemNum, doubleItem.name);
+            item.m_txtDesc.text = string.Format("首充赠送+{0}{1}", shopCfg.itemNum, doubleItem.name);
             bool isDouble = ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.id) < shopCfg.doubleTimes;
             item.m_grpDouble.visible = isDouble;
             item.m_txtDesc.visible = isDouble;