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

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

@@ -228,7 +228,6 @@ namespace GFGGame
         /// <returns></returns>
         public List<CardData> SortCardList(List<CardData> cardList, double itemSum, int scoreType)
         {
-
             int baseScore = RoleLevelCfgArray.Instance.GetCfg(RoleDataManager.lvl).baseScore;
             int leagueSkillScore = LeagueDataManager.Instance.GetAllSkillScore(scoreType);
             cardList.Sort((CardData a, CardData b) =>

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

@@ -169,7 +169,7 @@ namespace GFGGame
                     return string.Format(activeRewardCfg.desc, suitCfg.name);
                 case ConstTaskType.UpgradeCardLvl:
                 case ConstTaskType.UpgradeCardStar:
-                    return string.Format(activeRewardCfg.desc, taskCfg.paramsArr[0], taskCfg.paramsArr[1]);
+                    return string.Format(activeRewardCfg.desc, taskCfg.GetTargetCount(), taskCfg.paramsArr[0]);
                 case ConstTaskType.FinishStory:
                 case ConstTaskType.FinishInstanceZones:
                     {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComConsume.cs

@@ -9,6 +9,7 @@ namespace UI.Card
         public GComponent target;
         public GLoader m_loaBg;
         public GLoader m_loaItem;
+        public GGraph m_holderTouch;
         public GButton m_btnMinus;
         public GTextField m_txtUseCount;
         public GTextField m_txtNum;
@@ -61,6 +62,7 @@ namespace UI.Card
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaItem = (GLoader)comp.GetChild("loaItem");
+            m_holderTouch = (GGraph)comp.GetChild("holderTouch");
             m_btnMinus = (GButton)comp.GetChild("btnMinus");
             m_txtUseCount = (GTextField)comp.GetChild("txtUseCount");
             m_txtNum = (GTextField)comp.GetChild("txtNum");
@@ -69,6 +71,7 @@ namespace UI.Card
         {
             m_loaBg = null;
             m_loaItem = null;
+            m_holderTouch = null;
             m_btnMinus = null;
             m_txtUseCount = null;
             m_txtNum = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComFosterBottom.cs

@@ -11,6 +11,7 @@ namespace UI.Card
         public Controller m_ctrlFullLv;
         public Controller m_ctrlTab;
         public Controller m_ctrlSkillCount;
+        public GGraph m_holderfBgEff;
         public GLoader m_loaRarity;
         public GTextField m_txtName0;
         public GTextField m_txtName1;
@@ -24,9 +25,11 @@ namespace UI.Card
         public GButton m_btnAll;
         public GButton m_btnClearAll;
         public GButton m_btnUpLv;
+        public GGraph m_holderflower;
         public GComponent m_ComLvConsumeGold;
         public GTextField m_txtCurExp;
         public GTextField m_txtMaxExp;
+        public GGraph m_holderbarLv;
         public GGroup m_grpLv;
         public GButton m_btnUpStar;
         public GComponent m_comStarCousumeGold;
@@ -97,6 +100,7 @@ namespace UI.Card
             m_ctrlFullLv = comp.GetController("ctrlFullLv");
             m_ctrlTab = comp.GetController("ctrlTab");
             m_ctrlSkillCount = comp.GetController("ctrlSkillCount");
+            m_holderfBgEff = (GGraph)comp.GetChild("holderfBgEff");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
             m_txtName0 = (GTextField)comp.GetChild("txtName0");
             m_txtName1 = (GTextField)comp.GetChild("txtName1");
@@ -110,9 +114,11 @@ namespace UI.Card
             m_btnAll = (GButton)comp.GetChild("btnAll");
             m_btnClearAll = (GButton)comp.GetChild("btnClearAll");
             m_btnUpLv = (GButton)comp.GetChild("btnUpLv");
+            m_holderflower = (GGraph)comp.GetChild("holderflower");
             m_ComLvConsumeGold = (GComponent)comp.GetChild("ComLvConsumeGold");
             m_txtCurExp = (GTextField)comp.GetChild("txtCurExp");
             m_txtMaxExp = (GTextField)comp.GetChild("txtMaxExp");
+            m_holderbarLv = (GGraph)comp.GetChild("holderbarLv");
             m_grpLv = (GGroup)comp.GetChild("grpLv");
             m_btnUpStar = (GButton)comp.GetChild("btnUpStar");
             m_comStarCousumeGold = (GComponent)comp.GetChild("comStarCousumeGold");
@@ -139,6 +145,7 @@ namespace UI.Card
             m_ctrlFullLv = null;
             m_ctrlTab = null;
             m_ctrlSkillCount = null;
+            m_holderfBgEff = null;
             m_loaRarity = null;
             m_txtName0 = null;
             m_txtName1 = null;
@@ -152,9 +159,11 @@ namespace UI.Card
             m_btnAll = null;
             m_btnClearAll = null;
             m_btnUpLv = null;
+            m_holderflower = null;
             m_ComLvConsumeGold = null;
             m_txtCurExp = null;
             m_txtMaxExp = null;
+            m_holderbarLv = null;
             m_grpLv = null;
             m_btnUpStar = null;
             m_comStarCousumeGold = null;

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -23,7 +23,12 @@ namespace GFGGame
         private List<CardStarCfg> _cardStarRewards = new List<CardStarCfg>();
         private int _selectTab = 0;
         private List<LongPressGesture> _listLongPress = new List<LongPressGesture>();
+        private List<GGraph> _listEffectHolder = new List<GGraph>();
         private EffectUI _effectUI1;
+        private EffectUI _effectUI3;
+        private EffectUI _effectUI4;
+        private EffectUI _effectUI5;
+        private EffectUI _effectUI6;
 
         private GObject _consumeSelectItem;//选中的材料item
         private int _consumeSelectIndex = 0;//0为减，1为加
@@ -47,6 +52,11 @@ namespace GFGGame
         private Vector2 comCardImgResTargetSize;
         public override void Dispose()
         {
+            EffectUIPool.Recycle(_effectUI3);
+            _effectUI3 = null;
+            EffectUIPool.Recycle(_effectUI4);
+            _effectUI4 = null;
+            
             for (int i = 0; i < _listLongPress.Count; i++)
             {
                 _listLongPress[i].Dispose();
@@ -108,10 +118,10 @@ namespace GFGGame
             _ui.m_loaListener.onClick.Add(OnClickComCard);
             _ui.m_comCard.target.onClick.Add(OnClickComCard);
 
-
+            _effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_ComFosterBottom.m_holderflower, "ui_Activity", "SX_Top_TX");
+            _effectUI4 = EffectUIPool.CreateEffectUI(_ui.m_ComFosterBottom.m_holderfBgEff, "ui_Activity", "SX_Down_TX");
         }
 
-
         protected override void OnShown()
         {
             base.OnShown();
@@ -284,6 +294,9 @@ namespace GFGGame
             }
             _comFosterBottom.m_barLv.max = cardLvCfg.needExp;
             _comFosterBottom.m_barLv.value = _showExp;
+            EffectUIPool.Recycle(_effectUI6);
+            _effectUI6 = EffectUIPool.CreateEffectUI(_comFosterBottom.m_holderbarLv, "ui_Activity", "SX_JinDuTiao");
+
             int maxLv = CardRarityCfgArray.Instance.GetCfg(_cardData.itemCfg.rarity).maxCardLvl;
             _comFosterBottom.m_txtMaxLv.text = maxLv.ToString();
             _comFosterBottom.m_txtCurLv.text = _showLv.ToString();
@@ -310,9 +323,10 @@ namespace GFGGame
             listItem.m_txtUseCount.text = "0";
             listItem.target.data = index;
 
+            _listEffectHolder.Add(listItem.m_holderTouch);
+            
             if (listItem.m_btnMinus.data == null)
             {
-
                 listItem.m_btnMinus.onTouchBegin.Add(OnClickItemConsumsBegin);
                 listItem.m_btnMinus.onTouchEnd.Add(OnClickItemLvConsumsEnd);
             }
@@ -355,6 +369,9 @@ namespace GFGGame
             }
             OnTimedEvent(null);
             Timers.inst.Add(0.3f, 0, OnTimedEvent);
+
+            EffectUIPool.Recycle(_effectUI5);
+            _effectUI5 = EffectUIPool.CreateEffectUI(_listEffectHolder[index], "ui_Activity", "SX_DianJi");
         }
         private void OnTimedEvent(object param)
         {
@@ -938,7 +955,11 @@ namespace GFGGame
 
             EffectUIPool.Recycle(_effectUI1);
             _effectUI1 = null;
-
+            EffectUIPool.Recycle(_effectUI5);
+            _effectUI5 = null;
+            EffectUIPool.Recycle(_effectUI6);
+            _effectUI6 = null;
+            
             Timers.inst.Remove(CheckGuide);
             Timers.inst.Remove(OnTimedEvent);
             UI_ComCostCurrency.ProxyEnd();

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingView.cs

@@ -378,7 +378,8 @@ namespace GFGGame
             SuitFosterListCfg cfg = SuitFosterListCfgArray.Instance.GetCfg(_suitId);
             if (data.maintainStep < cfg.renewOpenLv)
             {
-                PromptController.Instance.ShowFloatTextPrompt(string.Format("完成{0}开启焕新", SuitFosterDataManager.Instance.stepNames[cfg.renewOpenLv - 1]));
+                PromptController.Instance.ShowFloatTextPrompt("完成养护后开启焕新");
+                //PromptController.Instance.ShowFloatTextPrompt(string.Format("完成{0}开启焕新", SuitFosterDataManager.Instance.stepNames[cfg.renewOpenLv - 1]));
                 return;
             }
 

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -26,6 +26,7 @@ namespace GFGGame
         private int _currentSuitId;
         private StoryLevelCfg _levelCfg;
         private StoryFightCfg _fightCfg;
+        private int scoreType = 0;  //目标分数类型保存
 
         private const int SORT_BY_HIGH_SCORE = 0;
         private const int SORT_BY_LOW_SCORE = 1;
@@ -149,9 +150,12 @@ namespace GFGGame
             _fightCfg = StoryFightCfgArray.Instance.GetCfg(_levelCfg.fightID);
             if (_levelCfg.type == ConstInstanceZonesType.Field)
             {
-                _fightCfg.scoreType = FieldDataManager.Instance.fieldInfos.theme;
+                scoreType = FieldDataManager.Instance.fieldInfos.theme;
                 _ui.m_btnAutoPlay.visible = false;
             }
+            else {
+                scoreType = _fightCfg.scoreType;
+            }
             InstanceZonesDataManager.FightScene = _levelCfg.type;
 
             _ui.m_compNeed.target.visible = _fightCfg.needItemId > 0 || _fightCfg.needSuitId > 0 || _fightCfg.needTagsArr.Length > 0;
@@ -177,7 +181,7 @@ namespace GFGGame
                     _ui.m_compNeed.m_imgGot.visible = false;
                 }
             }
-            InstanceZonesDataManager.currentScoreType = _fightCfg.scoreType;
+            InstanceZonesDataManager.currentScoreType = scoreType;
             //一级菜单
             _ui.m_comListType1.m_listType.RemoveChildrenToPool();
             _ui.m_comListType1.m_listType.numItems = DressUpMenuItemCfg1Array.Instance.dataArray.Length - 3;
@@ -192,7 +196,7 @@ namespace GFGGame
             _ui.m_partsList.target.x = _ui.target.width;
             _ui.m_partsList2.target.x = _ui.target.width;
             _ui.m_partsListSearch.target.x = _ui.target.width;
-            _ui.m_scoreType.url = "ui://CommonGame/kp_sx_" + _fightCfg.scoreType;
+            _ui.m_scoreType.url = "ui://CommonGame/kp_sx_" + scoreType;
             this.showListType1();
             if (_sceneObject == null)
             {
@@ -293,7 +297,7 @@ namespace GFGGame
 
         private void OnClickBtnClothingShop()
         {
-            ViewManager.Show<ClothingShopView>(new object[] { null, _fightCfg.scoreType }, null, false, true);
+            ViewManager.Show<ClothingShopView>(new object[] { null, scoreType }, null, false, true);
         }
 
         private void OnClickListType1Item(EventContext context)
@@ -566,7 +570,7 @@ namespace GFGGame
             if (CardDataManager.GetCardListByRarity(0).Count > 0)
             {
 
-                ViewManager.Show<StoryCardChoose>(_fightCfg.scoreType);
+                ViewManager.Show<StoryCardChoose>(scoreType);
             }
             else
             {
@@ -997,7 +1001,7 @@ namespace GFGGame
             }
             listItem.m_btnAni.visible = false;
             listItem.m_icon.url = ResPathUtil.GetIconPath(iconRes, ext);
-            listItem.m_ScoreType.url = "ui://CommonGame/kp_sx_" + _fightCfg.scoreType;
+            listItem.m_ScoreType.url = "ui://CommonGame/kp_sx_" + scoreType;
             listItem.m_txtTitle.text = partName;
             listItem.target.data = id;
             listItem.m_imgNeed.visible = _fightCfg.needItemId == id || _fightCfg.needSuitId == id;
@@ -1031,8 +1035,8 @@ namespace GFGGame
             // int mainScore;
             // int mainValuel;
             // ItemDataManager.GetMainScore(id, out mainScore, out mainValuel);
-            listItem.m_ScoreType.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + _fightCfg.scoreType);
-            listItem.m_txtScore.text = "" + ItemDataManager.GetItemAdditionScore(id, _fightCfg.scoreType, _fightCfg.needTagsArr);
+            listItem.m_ScoreType.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + scoreType);
+            listItem.m_txtScore.text = "" + ItemDataManager.GetItemAdditionScore(id, scoreType, _fightCfg.needTagsArr);
 
             listItem.m_icon.url = ResPathUtil.GetIconPath(iconRes, ext);
             listItem.m_txtTitle.text = partName;

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

@@ -227,6 +227,9 @@ namespace GFGGame
             _effectUI1 = EffectUIPool.CreateEffectUI(holder, "ui_LuckyBox", "Button_Glow");
             _effectUI2 = EffectUIPool.CreateEffectUI(comBox.m_comLuckBoxBtn.m_holder, "ui_LuckyBox", "but_text_dc");
 
+            comBox.m_comLuckBoxBtn.m_comCostOne.m_txtCost.text = cfg.costNum.ToString();
+            comBox.m_comLuckBoxBtn.m_comCostOne.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(cfg.costID).res);
+
             comBox.m_comLuckBoxBtn.m_comCostTen.m_txtCost.text = cfg.costNumTen.ToString();
             comBox.m_comLuckBoxBtn.m_comCostTen.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(cfg.costID).res);
             if (comBox.m_comLuckBoxBtn.m_btnBuyOne.data == null)
@@ -474,8 +477,6 @@ namespace GFGGame
             {
                 comBox.m_comLuckBoxBtn.m_comCostOne.m_c1.selectedIndex = 0;
                 comBox.m_comLuckBoxBtn.m_txtFreeTime.visible = false;
-                comBox.m_comLuckBoxBtn.m_comCostOne.m_txtCost.text = cfg.costNum.ToString();
-                comBox.m_comLuckBoxBtn.m_comCostOne.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(cfg.costID).res);
             }
         }
     }

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

@@ -60,6 +60,7 @@ namespace GFGGame
             _ui.m_listChapter.touchable = false;
             UpdateList();
             Timers.inst.AddUpdate(CheckGuide);
+            _ui.m_openViewAction.Play();
         }
 
         protected override void OnHide()

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

@@ -68,10 +68,18 @@ namespace GFGGame
         {
             UI_ListFailItem item = UI_ListFailItem.Proxy(gObject);
 
+            FieldDataManager _dataManager = FieldDataManager.Instance;
+
             StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
             StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
             item.m_grpRecommend.visible = _cfgs[index].isAdvise == 1;
-            item.m_txtDesc.text = string.Format(_cfgs[index].desc, ConstDressUpScoreType.scoreTypeList()[fightCfg.scoreType]);
+            int scoreType = 0;
+            if (fightCfg.scoreType > 0) 
+                scoreType = fightCfg.scoreType;
+            else
+                scoreType = _dataManager.fieldInfos.theme;
+
+            item.m_txtDesc.text = string.Format(_cfgs[index].desc, ConstDressUpScoreType.scoreTypeList()[scoreType]);
             if (item.m_btnGo.data == null)
             {
                 item.m_btnGo.onClick.Add(OnBtnGoClick);
@@ -79,7 +87,6 @@ namespace GFGGame
             item.m_btnGo.data = _cfgs[index];
 
             UI_ListFailItem.ProxyEnd();
-
         }
 
         private void OnBtnGoClick(EventContext context)
@@ -94,7 +101,6 @@ namespace GFGGame
             }
             if (cfg.jumpId != nameof(FirstChargeBonusView))
             {
-
                 ViewManager.Hide<StroyFightResultView>();
                 Hide();
             }