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

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

GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -24,7 +24,9 @@ namespace GFGEditor
         public static string ChapterGuideIconTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/FieldGuide/ChapterIcon/";
         public static string ChapterGuideIconMd5FileSaveName = "ChapterGuideIconMd5";
 
-
+        private static string[] StoryGuideIconSrcPaths { get { return new string[] { ResRootPath + "图鉴/故事图鉴" }; } }
+        public static string StoryGuideIconTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/FieldGuide/ChapterIcon/";
+        public static string StoryGuideIconMd5FileSaveName = "StoryGuideIconMd5";
         private static string[] MusicSrcPaths { get { return new string[] { ResRootPath + "music/" }; } }
         public static string MusicTargetPath = $"{ResPathUtil.MUSIC_DIR_PATH}/";
         public static string MusicMd5FileSaveName = "MusicMd5";
@@ -202,6 +204,9 @@ namespace GFGEditor
             //博物图鉴图标
             EditorUtility.DisplayProgressBar("进度", "正在导入博物图鉴图标", 1);
             ImportRes(ChapterGuideIconSrcPaths, ChapterGuideIconTargetPath, ChapterGuideIconMd5FileSaveName);
+            //故事图鉴图标
+            EditorUtility.DisplayProgressBar("进度", "正在导入故事图鉴图标", 1);
+            ImportRes(StoryGuideIconSrcPaths, StoryGuideIconTargetPath, StoryGuideIconMd5FileSaveName);
             //物品图标
             EditorUtility.DisplayProgressBar("进度", "正在导入物品图标", 1);
             ImportRes(ItemIconSrcPaths, ItemIconTargetPath, IconMd5FileSaveName);

GameClient/Assets/Editor/Excel/Scanner/ItemApproachScanner.cs

@@ -18,7 +18,7 @@ namespace GFGEditor
         public static void startScan()
         {
             ItemCfg[] dataArray = ItemCfgArray.Instance.dataArray;
-            GetApproachCall[] actions = new GetApproachCall[] { GetClothingShopApproach, GetLeaguePrayApproach, GetLeagueAnswerApproach, CheckStoreApproach, GetClothingSyntheticApproach, GetSuitGuideApproach, GetSuitSyntheticApproach, GetClothingDecomposeApproach, CheckClothingFosterApproach, CheckDailyTaskApproach, CheckWeeklyTaskApproach, GetZhaiXingApproach, GetStoryLevelApproach, GetArenaApproach,GetHeavenApproach ,GetOpenServerFightApproach, GetYuanXiaoGameConsumeApproach, GetYuanXiaoRewardItemApproach };
+            GetApproachCall[] actions = new GetApproachCall[] { GetClothingShopApproach, GetLeaguePrayApproach, GetLeagueAnswerApproach, CheckStoreApproach, GetClothingSyntheticApproach, GetSuitGuideApproach, GetSuitSyntheticApproach, GetClothingDecomposeApproach, CheckClothingFosterApproach, CheckDailyTaskApproach, CheckWeeklyTaskApproach, GetZhaiXingApproach, GetStoryLevelApproach, GetArenaApproach,GetHeavenApproach ,GetOpenServerFightApproach, GetYuanXiaoGameConsumeApproach, GetYuanXiaoRewardItemApproach, GetSkillBookSyntheticApproach };
             Dictionary<SuitCfg, List<int>> suitDic = new Dictionary<SuitCfg, List<int>>();
             Dictionary<ItemCfg, List<int>> syntheticSuitDic = new Dictionary<ItemCfg, List<int>>();
             Dictionary<SuitCfg, Dictionary<string, string>> suitTagsDic = new Dictionary<SuitCfg, Dictionary<string, string>>();
@@ -871,15 +871,15 @@ namespace GFGEditor
         private static string GetSkillBookSyntheticApproach(int itemId)
         {
             var itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
-            if (itemCfg == null)
-            {
-                return null;
-            }
-            if (itemCfg.param1Arr.Length <= 0)
+            if (itemCfg.itemType == ConstItemType.ITEM && itemCfg.subType == 1 && itemCfg.rarity >= 3)
             {
-                return null;
+                ItemExchangeCfg itemExchange = ItemExchangeCfgArray.Instance.GetCfg(itemId);
+                if(itemExchange != null)
+                {
+                    return ConstFunctionId.SKILLBOOK;
+                }
             }
-            return ConstFunctionId.SKILLBOOK;
+            return null;
         }
     }
 }

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

@@ -638,7 +638,7 @@ namespace GFGGame
         {
             //合成材料判断
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
-            if (itemCfg == null || ItemDataManager.GetItemNum(itemCfg.syntheticCostID) < itemCfg.syntheticCostNum)
+            if (itemCfg == null || ItemDataManager.GetItemNum(itemCfg.syntheticCostID) < itemCfg.syntheticCostNum || itemCfg.syntheticTimes <= 0)
             {
                 return false;
             }

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

@@ -7,7 +7,7 @@ namespace GFGGame
 {
     public class TimeTracingDataManager : SingletonBase<TimeTracingDataManager>
     {
-        public List<int> IdList = new List<int>() { 5017, 5018, 5019 };
+        public List<int> IdList = new List<int>() { 5017, 5018 };
         public List<int> chapterIdList = new List<int>();
         //时光回溯,关卡编号
         public static int _currentChapterId = 62001;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_SevenDailyTipsUI.cs

@@ -8,7 +8,6 @@ namespace UI.ActivityMain
     {
         public GComponent target;
         public GLoader m_btnBack;
-        public GTextField m_activityDesc;
         public GLoader m_icon;
         public GLoader m_backBtn;
         public Transition m_t0;
@@ -62,7 +61,6 @@ namespace UI.ActivityMain
         private void Init(GComponent comp)
         {
             m_btnBack = (GLoader)comp.GetChild("btnBack");
-            m_activityDesc = (GTextField)comp.GetChild("activityDesc");
             m_icon = (GLoader)comp.GetChild("icon");
             m_backBtn = (GLoader)comp.GetChild("backBtn");
             m_t0 = comp.GetTransition("t0");
@@ -72,7 +70,6 @@ namespace UI.ActivityMain
         public void Dispose(bool disposeTarget = false)
         {
             m_btnBack = null;
-            m_activityDesc = null;
             m_icon = null;
             m_backBtn = null;
             m_t0 = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ArenaUI.cs

@@ -12,6 +12,7 @@ namespace UI.Arena
         public GButton m_btnBack;
         public GComponent m_valueBar;
         public UI_ComTheme m_comTheme;
+        public GButton m_btnRank;
         public GTextField m_txtTime;
         public GButton m_btnRule;
         public GGroup m_gtpTop;
@@ -22,22 +23,22 @@ namespace UI.Arena
         public GLoader m_loaDanIcon;
         public GTextField m_txtName;
         public GTextField m_txtDanTitle;
+        public GButton m_btnFightScoreRule;
         public GTextField m_txtRank;
         public GTextField m_txtFightScore;
-        public GButton m_btnFightScoreRule;
-        public UI_ComFightScore m_comFightScore;
+        public GLoader m_rankIcon;
         public GTextField m_txtMoneyCount;
         public GButton m_btnAddFightCount;
         public GTextField m_txtFightCount;
         public GTextField m_txtRefreshCount;
         public GButton m_btnRefresh;
         public UI_ComCostCurrency m_comCostCurrent;
+        public UI_ComFightScore m_comFightScore;
         public GButton m_btnQuickFight;
         public GButton m_btnShop;
-        public GButton m_btnDress;
         public GButton m_btnReward;
-        public GButton m_btnRank;
         public GButton m_btnRecord;
+        public GButton m_btnDress;
         public GGroup m_grpBottom;
         public const string URL = "ui://4lc5fhlbpsph0";
         public const string PACKAGE_NAME = "Arena";
@@ -91,6 +92,7 @@ namespace UI.Arena
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_comTheme = (UI_ComTheme)UI_ComTheme.Create(comp.GetChild("comTheme"));
+            m_btnRank = (GButton)comp.GetChild("btnRank");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_btnRule = (GButton)comp.GetChild("btnRule");
             m_gtpTop = (GGroup)comp.GetChild("gtpTop");
@@ -101,22 +103,22 @@ namespace UI.Arena
             m_loaDanIcon = (GLoader)comp.GetChild("loaDanIcon");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtDanTitle = (GTextField)comp.GetChild("txtDanTitle");
+            m_btnFightScoreRule = (GButton)comp.GetChild("btnFightScoreRule");
             m_txtRank = (GTextField)comp.GetChild("txtRank");
             m_txtFightScore = (GTextField)comp.GetChild("txtFightScore");
-            m_btnFightScoreRule = (GButton)comp.GetChild("btnFightScoreRule");
-            m_comFightScore = (UI_ComFightScore)UI_ComFightScore.Create(comp.GetChild("comFightScore"));
+            m_rankIcon = (GLoader)comp.GetChild("rankIcon");
             m_txtMoneyCount = (GTextField)comp.GetChild("txtMoneyCount");
             m_btnAddFightCount = (GButton)comp.GetChild("btnAddFightCount");
             m_txtFightCount = (GTextField)comp.GetChild("txtFightCount");
             m_txtRefreshCount = (GTextField)comp.GetChild("txtRefreshCount");
             m_btnRefresh = (GButton)comp.GetChild("btnRefresh");
             m_comCostCurrent = (UI_ComCostCurrency)UI_ComCostCurrency.Create(comp.GetChild("comCostCurrent"));
+            m_comFightScore = (UI_ComFightScore)UI_ComFightScore.Create(comp.GetChild("comFightScore"));
             m_btnQuickFight = (GButton)comp.GetChild("btnQuickFight");
             m_btnShop = (GButton)comp.GetChild("btnShop");
-            m_btnDress = (GButton)comp.GetChild("btnDress");
             m_btnReward = (GButton)comp.GetChild("btnReward");
-            m_btnRank = (GButton)comp.GetChild("btnRank");
             m_btnRecord = (GButton)comp.GetChild("btnRecord");
+            m_btnDress = (GButton)comp.GetChild("btnDress");
             m_grpBottom = (GGroup)comp.GetChild("grpBottom");
         }
         public void Dispose(bool disposeTarget = false)
@@ -127,6 +129,7 @@ namespace UI.Arena
             m_valueBar = null;
             m_comTheme.Dispose();
             m_comTheme = null;
+            m_btnRank = null;
             m_txtTime = null;
             m_btnRule = null;
             m_gtpTop = null;
@@ -137,11 +140,10 @@ namespace UI.Arena
             m_loaDanIcon = null;
             m_txtName = null;
             m_txtDanTitle = null;
+            m_btnFightScoreRule = null;
             m_txtRank = null;
             m_txtFightScore = null;
-            m_btnFightScoreRule = null;
-            m_comFightScore.Dispose();
-            m_comFightScore = null;
+            m_rankIcon = null;
             m_txtMoneyCount = null;
             m_btnAddFightCount = null;
             m_txtFightCount = null;
@@ -149,12 +151,13 @@ namespace UI.Arena
             m_btnRefresh = null;
             m_comCostCurrent.Dispose();
             m_comCostCurrent = null;
+            m_comFightScore.Dispose();
+            m_comFightScore = null;
             m_btnQuickFight = null;
             m_btnShop = null;
-            m_btnDress = null;
             m_btnReward = null;
-            m_btnRank = null;
             m_btnRecord = null;
+            m_btnDress = null;
             m_grpBottom = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ListTargetItem.cs

@@ -10,9 +10,11 @@ namespace UI.Arena
         public GLoader m_loaBg;
         public GComponent m_comHead;
         public GComponent m_comLv;
+        public GTextField m_lvText;
         public GTextField m_txtName;
         public GButton m_btnLook;
         public GTextField m_txtDanTitle;
+        public GLoader m_rankIcon;
         public GTextField m_txtRank;
         public GTextField m_txtFightScore;
         public GImage m_imgUpDan;
@@ -67,9 +69,11 @@ namespace UI.Arena
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_comHead = (GComponent)comp.GetChild("comHead");
             m_comLv = (GComponent)comp.GetChild("comLv");
+            m_lvText = (GTextField)comp.GetChild("lvText");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_btnLook = (GButton)comp.GetChild("btnLook");
             m_txtDanTitle = (GTextField)comp.GetChild("txtDanTitle");
+            m_rankIcon = (GLoader)comp.GetChild("rankIcon");
             m_txtRank = (GTextField)comp.GetChild("txtRank");
             m_txtFightScore = (GTextField)comp.GetChild("txtFightScore");
             m_imgUpDan = (GImage)comp.GetChild("imgUpDan");
@@ -80,9 +84,11 @@ namespace UI.Arena
             m_loaBg = null;
             m_comHead = null;
             m_comLv = null;
+            m_lvText = null;
             m_txtName = null;
             m_btnLook = null;
             m_txtDanTitle = null;
+            m_rankIcon = null;
             m_txtRank = null;
             m_txtFightScore = null;
             m_imgUpDan = null;

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

@@ -9,6 +9,8 @@ namespace UI.Main
         public GComponent target;
         public GLoader m_rewardIcon;
         public GTextField m_rewardNum;
+        public GImage m_gettedBg;
+        public GImage m_isGetted;
         public const string URL = "ui://mfvz4q8kg91j9fzb";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "Component8";
@@ -58,11 +60,15 @@ namespace UI.Main
         {
             m_rewardIcon = (GLoader)comp.GetChild("rewardIcon");
             m_rewardNum = (GTextField)comp.GetChild("rewardNum");
+            m_gettedBg = (GImage)comp.GetChild("gettedBg");
+            m_isGetted = (GImage)comp.GetChild("isGetted");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_rewardIcon = null;
             m_rewardNum = null;
+            m_gettedBg = null;
+            m_isGetted = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -15,6 +15,7 @@ namespace UI.Main
         public GTextField m_txtChapterName2;
         public GTextField m_txtChapterName3;
         public GTextField m_txtChapterName4;
+        public GTextField m_txtChapterName5;
         public GLoader m_numBg;
         public GTextField m_txtCurProgress;
         public GTextField m_txtMaxProgress;
@@ -76,6 +77,7 @@ namespace UI.Main
             m_txtChapterName2 = (GTextField)comp.GetChild("txtChapterName2");
             m_txtChapterName3 = (GTextField)comp.GetChild("txtChapterName3");
             m_txtChapterName4 = (GTextField)comp.GetChild("txtChapterName4");
+            m_txtChapterName5 = (GTextField)comp.GetChild("txtChapterName5");
             m_numBg = (GLoader)comp.GetChild("numBg");
             m_txtCurProgress = (GTextField)comp.GetChild("txtCurProgress");
             m_txtMaxProgress = (GTextField)comp.GetChild("txtMaxProgress");
@@ -94,6 +96,7 @@ namespace UI.Main
             m_txtChapterName2 = null;
             m_txtChapterName3 = null;
             m_txtChapterName4 = null;
+            m_txtChapterName5 = null;
             m_numBg = null;
             m_txtCurProgress = null;
             m_txtMaxProgress = null;

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs

@@ -147,7 +147,7 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("活动已结束");
                 return;
             }
-            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_ACTIVITY_EXCHANGE });
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY });
         }
 
         private void UpdateTime(object param = null)

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs

@@ -6,6 +6,7 @@ using FairyGUI;
 using UI.Arena;
 using UI.CommonGame;
 using UnityEngine;
+using YooAsset;
 
 namespace GFGGame
 {
@@ -111,6 +112,9 @@ namespace GFGGame
             if (_sceneObject == null)
             {
                 _sceneObject = PrefabManager.Instance.InstantiateSync(ResPathUtil.GetPrefabPath("SceneArena"));
+                var handle = YooAssets.LoadAssetSync<Sprite>(ResPathUtil.GetBgImgPath("fhl_bg"));
+                Sprite bgSprite = handle.AssetObject as Sprite;
+                _sceneObject.transform.Find("Bg").GetComponent<SpriteRenderer>().sprite = bgSprite;
             }
 
             UpdateNormal();
@@ -329,6 +333,7 @@ namespace GFGGame
             _ui.m_txtName.text = RoleDataManager.roleName;
             _ui.m_txtRank.text = string.Format("段位排名：{0}", _dataManager.Rank);
             _ui.m_txtDanTitle.text = ArenaRankCfgArray.Instance.GetCfg(_dataManager.Grade).gradeName;
+            _ui.m_rankIcon.url = string.Format("ui://Arena/{0}", ArenaRankCfgArray.Instance.GetCfg(_dataManager.Grade).res);
             long fightScore = _dataManager.GetAllFightScore(_dataManager.DressupList);
             _ui.m_txtFightScore.text = string.Format("飞花令战力：{0}", fightScore);
             _ui.m_btnQuickFight.selected = _dataManager.QuickFight;
@@ -410,8 +415,9 @@ namespace GFGGame
 
             item.m_txtName.text = targetData.RoleInfo.roleName;
             item.m_txtDanTitle.text = rankCfg.gradeName;
+            item.m_rankIcon.url = string.Format("ui://Arena/{0}", rankCfg.res);
             item.m_comLv.GetChild("txtLvl").asTextField.text = targetData.RoleInfo.roleLv.ToString();
-
+            item.m_lvText.text = targetData.RoleInfo.roleLv.ToString();
             long fightScore = _dataManager.GetAllFightScore(targetData.FightDatas);
             item.m_txtFightScore.text = string.Format("飞花令战力:{0}", fightScore);
             item.m_txtRank.text = string.Format("段位排名:{0}", targetData.RankInGrade);

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

@@ -36,9 +36,6 @@ namespace GFGGame
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             _ui.m_btnUpLv.onClick.Add(OnClickBtnUp);
-            _ui.m_btnCheckself.onClick.Add(OnClickCheckSelf);
-            _ui.m_btnCheckother.onClick.Add(OnClickCheckOther);
-            _ui.m_btnUpLvSpecial.onClick.Add(OnClickBtnUpSpecial);
             _ui.m_listConsume.itemRenderer = RenderListStarConsumeItem;
 
 
@@ -64,7 +61,9 @@ namespace GFGGame
 
             _ui.m_txtName.text = skillCfg.name;
             _ui.m_loaSkill.url = ResPathUtil.GetCardSkillPath(skillCfg.res);
-
+            _ui.m_btnUpLvSpecial.visible = false;
+            _ui.m_btnCheckother.visible = false;
+            _ui.m_btnCheckself.visible = false;
             UpdateView();
         }
 
@@ -86,26 +85,14 @@ namespace GFGGame
             costCurrency.m_txtNeed.text = skillLvCfg.costNum.ToString();
             UI_ComCostCurrency.ProxyEnd();
             UpdateComLv(_ui.m_comNextLv, skillLv + 1, "下一级");
-            ItemCfg item = ItemCfgArray.Instance.GetCfg(skillLvCfg.materiarsArr[0][0]);
-            if(item.subType == 1)
-            {
-                _ui.m_listConsume.numItems = skillLvCfg.materiarsArr.Length + 1;
-                _ui.m_btnUpLvSpecial.visible = true;
-                _ui.m_btnUpLv.visible = false;
-            }
-            else
-            {
-                _ui.m_listConsume.numItems = skillLvCfg.materiarsArr.Length;
-                _ui.m_btnUpLvSpecial.visible = false;
-                _ui.m_btnUpLv.visible = true;
-            }
-           
+            _ui.m_listConsume.numItems = skillLvCfg.materiarsArr.Length;
         }
 
         private void UpdateUpSkill()
         {
             UpdateView();
-            if (_effectUI1 != null) {
+            if (_effectUI1 != null)
+            {
                 EffectUIPool.Recycle(_effectUI1);
                 _effectUI1 = null;
             }
@@ -125,59 +112,26 @@ namespace GFGGame
             UI_ComStarConsume listItem = UI_ComStarConsume.Proxy(obj);
             // int skillLv = SkillDataManager.Instance.GetSkillLv(_cardId, _skillId);
             // skillCfg = SkillDataManager.Instance.GetPassivitySkillCfg(_cardId, _skillId, skillLv);
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(skillLvCfg.materiarsArr[index][0]);
 
-            if(ItemCfgArray.Instance.GetCfg(skillLvCfg.materiarsArr[0][0]).subType == 1 && index > skillLvCfg.materiarsArr.Length - 1)
-            {
-                ItemCfg item = ItemCfgArray.Instance.GetCfg(_cardId);
-                int needCount = GeneralMaterialCfgArray.Instance.GetCfgByrarityAndlevel(item.rarity,_skillLv).materiarsArr[0][1];
-                int id = GeneralMaterialCfgArray.Instance.GetCfgByrarityAndlevel(item.rarity, _skillLv).materiarsArr[0][0];
-                long hasCount = ItemDataManager.GetItemNum(id);
-                listItem.m_txtNeedCount.text = needCount.ToString();
-                listItem.m_txtHasCount.text = StringUtil.GetColorText(hasCount.ToString(), hasCount < needCount ? "#D27869" : "#716660"); ;
-                listItem.m_btnPlus.visible = false;
-
-                ItemCfg item1 = ItemCfgArray.Instance.GetCfg(id);
-                listItem.m_loaItem.url = ResPathUtil.GetIconPath(item1.res, "png");
-                if (listItem.target.data == null)
-                {
-                    listItem.target.onClick.Add(() => OnClickBtnPlusStarConsum(index));
-                }
-                listItem.target.data = id;
+            listItem.m_loaItem.url = ResPathUtil.GetIconPath(itemCfg);
 
-                if (hasCount < needCount)
-                {
-                    //材料不足显示加号
-                    listItem.m_btnPlus.visible = true;
-                }
-                _ui.m_btnCheckself.visible = true;
-                _ui.m_btnCheckother.visible = true;
-            }
-            else
+            int needCount = skillLvCfg.materiarsArr[index][1];
+            long hasCount = ItemDataManager.GetItemNum(skillLvCfg.materiarsArr[index][0]);
+            listItem.m_txtNeedCount.text = needCount.ToString();
+            listItem.m_txtHasCount.text = StringUtil.GetColorText(hasCount.ToString(), hasCount < needCount ? "#D27869" : "#716660"); ;
+            listItem.m_btnPlus.visible = false;
+            if (listItem.target.data == null)
             {
-                ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(skillLvCfg.materiarsArr[index][0]);
-
-                listItem.m_loaItem.url = ResPathUtil.GetIconPath(itemCfg);
-
-                int needCount = skillLvCfg.materiarsArr[index][1];
-                long hasCount = ItemDataManager.GetItemNum(skillLvCfg.materiarsArr[index][0]);
-                listItem.m_txtNeedCount.text = needCount.ToString();
-                listItem.m_txtHasCount.text = StringUtil.GetColorText(hasCount.ToString(), hasCount < needCount ? "#D27869" : "#716660"); ;
-                listItem.m_btnPlus.visible = false;
-                if (listItem.target.data == null)
-                {
-                    listItem.target.onClick.Add(() => OnClickBtnPlusStarConsum(index));
-                }
-                listItem.target.data = skillLvCfg.materiarsArr[index][0];
-
-                if (hasCount < needCount)
-                {
-                    //材料不足显示加号
-                    listItem.m_btnPlus.visible = true;
-                }
-                _ui.m_btnCheckself.visible = false;
-                _ui.m_btnCheckother.visible = false;
+                listItem.target.onClick.Add(() => OnClickBtnPlusStarConsum(index));
             }
+            listItem.target.data = skillLvCfg.materiarsArr[index][0];
 
+            if (hasCount < needCount)
+            {
+                //材料不足显示加号
+                listItem.m_btnPlus.visible = true;
+            }
             UI_ComStarConsume.ProxyEnd();
         }
         private void OnClickBtnPlusStarConsum(int index)
@@ -212,56 +166,6 @@ namespace GFGGame
             }
 
         }
-        private async void OnClickBtnUpSpecial()
-        {
-            if (!ItemUtil.CheckItemEnough(skillLvCfg.costID, skillLvCfg.costNum))
-            {
-                long has = ItemDataManager.GetItemNum(skillLvCfg.costID);
-                ItemUtil.BuyCurrency(skillLvCfg.costID, skillLvCfg.costNum - has);
-                return;
-            }
-            if (_ui.m_btnCheckself.selected && !_ui.m_btnCheckother.selected)
-            {
-                for (int i = 0; i < skillLvCfg.materiarsArr.Length; i++)
-                {
-                    if (!ItemUtil.CheckItemEnough(skillLvCfg.materiarsArr[i][0], skillLvCfg.materiarsArr[i][1], true)) return;
-                }
-
-                bool result = await SkillSProxy.ReqUpgradeCardSkill(_cardId, _skillId);
-                if (result)
-                {
-                    LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CI_PAI, 2);
-                }
-            }
-            else if (!_ui.m_btnCheckself.selected && _ui.m_btnCheckother.selected)
-            {
-                ItemCfg item = ItemCfgArray.Instance.GetCfg(_cardId);
-                GeneralMaterialCfg grneral = GeneralMaterialCfgArray.Instance.GetCfgByrarityAndlevel(item.rarity, _skillLv);
-                for (int i = 0; i < grneral.materiarsArr.Length; i++)
-                {
-                    if (!ItemUtil.CheckItemEnough(grneral.materiarsArr[i][0], grneral.materiarsArr[i][1], true)) return;
-                }
-                //这里要改
-                bool result = await SkillSProxy.ReqUpgradeCardSkill(_cardId, _skillId,1);
-                if (result)
-                {
-                    LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CI_PAI, 2);
-                }
-            }
-            else
-            {
-                PromptController.Instance.ShowFloatTextPrompt("请选择消耗的材料");
-            }
-            
-        }
-        private void OnClickCheckSelf()
-        {
-            _ui.m_btnCheckother.selected = false;
-        }
-        private void OnClickCheckOther()
-        {
-            _ui.m_btnCheckself.selected = false;
-        }
         protected override void OnHide()
         {
             base.OnHide();

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/SuitSyntheticView.cs

@@ -178,6 +178,8 @@ namespace GFGGame
             RedDotController.Instance.SetComRedDot(listItem.target, RedDotDataManager.Instance.GetClothingSyntheticRed(suitId), "", 0, 0);
             // 奖励红点
             RedDotController.Instance.SetComRedDot(listItem.m_bonusGift.target, status == ConstBonusStatus.CAN_GET && !isLock, "", -13, -7);
+            //卡牌领取红点
+            RedDotController.Instance.SetComRedDot(listItem.target, DressUpMenuSuitDataManager.GetSuitSyntheticRewardStatus(suitId) == 1, "");
             UI_SuitListItem.ProxyEnd();
         }
 

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitGuideDetailView.cs

@@ -15,6 +15,7 @@ namespace GFGGame
         private int _suitTypeId;
         private Dictionary<int, EffectUI> _effectUIDic = new Dictionary<int, EffectUI>();
         private int index = 0;
+        private Dictionary<int, string> IdToImageDic = new Dictionary<int, string> {[201024] = "changxiawuj",[201025] = "xiangfengmr" };
         public override void Dispose()
         {
             foreach (var v in _effectUIDic)
@@ -188,7 +189,16 @@ namespace GFGGame
             }
 
             listItem.m_txtName.text = suitCfg.name;
-            listItem.m_loaderPic.url = ResPathUtil.GetFieldGuideIconPath(suitCfg.res);
+            string imageName;
+            if (IdToImageDic.ContainsKey(suitId))
+            {
+                imageName = IdToImageDic[suitId];
+            }
+            else
+            {
+                imageName = suitCfg.res;
+            }
+            listItem.m_loaderPic.url = ResPathUtil.GetChapterGuideIconPath(imageName);
             RarityIconController.UpdateRarityIcon(listItem.m_rarity, suitId, false, true);
             listItem.target.data = suitId;
             UpdateSuitStatusView(listItem);

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

@@ -184,7 +184,8 @@ namespace GFGGame
                 if (item.chapterId == rewardID)
                 {
                     UI_ListChapterItem listItem = UI_ListChapterItem.Proxy(_ui.m_listChapter.GetChildAt(item.id%10));
-                    listItem.m_content.m_reward.target.visible = false;
+                    listItem.m_content.m_reward.m_isGetted.visible = true;
+                    listItem.m_content.m_reward.m_gettedBg.visible = true;
                     RedDotController.Instance.SetComRedDot(listItem.m_content.m_reward.target, false, "");
                     UI_ListChapterItem.ProxyEnd();
                 }
@@ -210,6 +211,7 @@ namespace GFGGame
                 listItem.m_content.m_txtChapterName2.strokeColor = new Color(0.592f, 0.773f, 0.961f, 1.000f);
                 listItem.m_content.m_txtChapterName3.strokeColor = new Color(0.592f, 0.773f, 0.961f, 1.000f);
                 listItem.m_content.m_txtChapterName4.strokeColor = new Color(0.592f, 0.773f, 0.961f, 1.000f);
+                listItem.m_content.m_txtChapterName5.strokeColor = new Color(0.592f, 0.773f, 0.961f, 1.000f);
                 listItem.m_content.m_txtChapter.strokeColor = new Color(0.592f, 0.773f, 0.961f, 1.000f);
                 //listItem.m_content.m_txtCurProgress.color = new Color(0.592f, 0.773f, 0.961f, 1.000f);
                 //listItem.m_content.m_txtMaxProgress.color = new Color(0.592f, 0.773f, 0.961f, 1.000f);
@@ -224,6 +226,7 @@ namespace GFGGame
                 listItem.m_content.m_txtChapterName2.strokeColor = new Color(1.000f, 0.686f, 0.318f, 1.000f);
                 listItem.m_content.m_txtChapterName3.strokeColor = new Color(1.000f, 0.686f, 0.318f, 1.000f);
                 listItem.m_content.m_txtChapterName4.strokeColor = new Color(1.000f, 0.686f, 0.318f, 1.000f);
+                listItem.m_content.m_txtChapterName5.strokeColor = new Color(1.000f, 0.686f, 0.318f, 1.000f);
                 listItem.m_content.m_txtChapter.strokeColor = new Color(1.000f, 0.686f, 0.318f, 1.000f);
                 //listItem.m_content.m_txtCurProgress.color = new Color(0.514f, 0.345f, 0.220f, 1.000f); 
                 //listItem.m_content.m_txtMaxProgress.color = new Color(0.514f, 0.345f, 0.220f, 1.000f);
@@ -244,6 +247,7 @@ namespace GFGGame
             listItem.m_content.m_txtChapterName2.text = chapterCfg.name.Length > 2 ? chapterCfg.name[2].ToString() : "";
             listItem.m_content.m_txtChapterName3.text = chapterCfg.name.Length > 3 ? chapterCfg.name[3].ToString() : "";
             listItem.m_content.m_txtChapterName4.text = chapterCfg.name.Length > 4 ? chapterCfg.name[4].ToString() : "";
+            listItem.m_content.m_txtChapterName5.text = chapterCfg.name.Length > 5 ? chapterCfg.name[5].ToString() : "";
             int order = StoryUtil.GetChapterOrder(chapterCfg.id);
             listItem.m_content.m_txtChapter.text = order < 10 ? "0" + order : order.ToString();
 
@@ -315,25 +319,25 @@ namespace GFGGame
                     listItem.m_content.m_txtLockDesc.visible = false;
                     currentChapterIndex = i;
                     List<StoryLevelCfg> storylevelList = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(chapterCfg.type,chapterCfg.subType,chapterCfg.id);
-                    
-                    if(InstanceZonesDataManager.CheckLevelPass(storylevelList[storylevelList.Count - 1].id))
+                    ChapterRewardCfg chapterReward = ChapterRewardCfgArray.Instance.GetCfgBychapterId(chapterID);
+                    listItem.m_content.m_reward.m_rewardIcon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(chapterReward.bonusOnceArr[0][0]).res, "png");
+                    listItem.m_content.m_reward.m_rewardNum.text = string.Format("x{0}", chapterReward.bonusOnceArr[0][1].ToString());
+
+                    if (InstanceZonesDataManager.CheckLevelPass(storylevelList[storylevelList.Count - 1].id))
                     {
                         listItem.m_content.m_reward.target.visible = true;
+                        listItem.m_content.m_reward.m_isGetted.visible = false;
+                        listItem.m_content.m_reward.m_gettedBg.visible = false;
                         RedDotController.Instance.SetComRedDot(listItem.m_content.m_reward.target, false, "");
                         int status;
-                        if (MainStoryDataManager.ChapterRewardStatusDic.TryGetValue(chapterID, out status))
-                        {
-                            ChapterRewardCfg chapterReward = ChapterRewardCfgArray.Instance.GetCfgBychapterId(chapterID);
-                            listItem.m_content.m_reward.m_rewardIcon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(chapterReward.bonusOnceArr[0][0]).res, "png");
-                            listItem.m_content.m_reward.m_rewardNum.text = string.Format("x{0}", chapterReward.bonusOnceArr[0][1].ToString());
-                        }
                         if (MainStoryDataManager.ChapterRewardStatusDic.TryGetValue(chapterID, out status) && status == 1)
                         {
                             RedDotController.Instance.SetComRedDot(listItem.m_content.m_reward.target, true, "",-50,20);
                         }
                         else if (MainStoryDataManager.ChapterRewardStatusDic.TryGetValue(chapterID, out status) && status == 2)
                         {
-                            listItem.m_content.m_reward.target.visible = false;
+                            listItem.m_content.m_reward.m_isGetted.visible = true;
+                            listItem.m_content.m_reward.m_gettedBg.visible = true;
                         }
 
                         if (listItem.m_content.m_reward.target.data == null)
@@ -342,10 +346,6 @@ namespace GFGGame
                         }
                         listItem.m_content.m_reward.target.data = chapterID;
                     }
-                    else
-                    {
-                        listItem.m_content.m_reward.target.visible = false;
-                    }
                 }
                 else
                 {

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

@@ -201,6 +201,7 @@ namespace GFGGame
 
             Timers.inst.Remove(UpdateShake);
             Timers.inst.Remove(OnScreenEffectComplete);
+            Timers.inst.Remove(OnWait);
             ScreenBlackController.Instance.HideBlack();
 
             // 不是茶话会，则记录上一次自动播放按钮的状态
@@ -222,6 +223,8 @@ namespace GFGGame
                 PrefabManager.Instance.Restore(_animObject);
                 _animObject = null;
             }
+            EffectUIPool.Recycle(_effect);
+            _effect = null;
 
             _dressUpObj.TakeOffAll();
             MusicManager.Instance.PlayCroutine(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
@@ -372,7 +375,7 @@ namespace GFGGame
                     delay = _currentStepCfg.blackScreenDur;
                     ScreenBlackController.Instance.ShowBlack(delay, this.viewCom, 0);
                 }
-                else if (_currentStepCfg.blankScreenDur > 0)
+                if (_currentStepCfg.blankScreenDur > 0)
                 {
                     isWait = true;
                     delay = _currentStepCfg.blankScreenDur;
@@ -389,6 +392,9 @@ namespace GFGGame
             }
             else if (isWait)
             {
+                float waitTime = delay / 1000f;
+                _canClickBtnNext = false;
+                Timers.inst.Add(waitTime, 1, OnWait);
                 if (_autoPlay)
                 {
                     //转换成秒
@@ -397,6 +403,13 @@ namespace GFGGame
                     Timers.inst.Add(delay, 1, OnScreenEffectComplete);
                     StoryDialogDataManager.Instance.dialogShowDelay = 0.6f;
                 }
+                else if(_currentStepCfg.effectInfoArr.Length > 0)
+                {
+                    delay = delay / 1000f;
+                    _onScreenEffectComplete = OnScreenEffectComplete;
+                    Timers.inst.Add(delay, 1, OnScreenEffectComplete);
+                    StoryDialogDataManager.Instance.dialogShowDelay = 0.6f;
+                }
                 else
                 {
                     _onScreenEffectComplete = OnScreenEffectComplete;
@@ -408,7 +421,11 @@ namespace GFGGame
                 OnScreenEffectComplete();
             }
         }
-
+        private void OnWait(object param = null)
+        {
+            _canClickBtnNext = true;
+            Timers.inst.Remove(OnWait);
+        }
         private void OnScreenEffectComplete(object param = null)
         {
             _onScreenEffectComplete = null;
@@ -866,7 +883,7 @@ namespace GFGGame
                     _canClickBtnNext = false;
                     _ui.m_showMask.Play(() =>
                     {
-                        _canClickBtnNext = true;
+                        //_canClickBtnNext = true;
                         if (_animObject != null)
                         {
                             _ui.m_hideMask.Play();
@@ -927,7 +944,8 @@ namespace GFGGame
                 {
                     EffectUIPool.Recycle(_effect);
                     _effect = null;
-                    _effect = EffectUIPool.CreateEffectUI(_ui.m_effect, "ui_gyp", value[0]);
+                    string effectPath = string.Format("ui_Juqing/{0}", value[0]);
+                    _effect = EffectUIPool.CreateEffectUI(_ui.m_effect, effectPath, value[0]);
                     _ui.m_effect.visible = true;
                 }
             }

GameClient/Assets/Game/HotUpdate/Views/PopWindow/ExchangeGoodsView.cs

@@ -44,50 +44,41 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, UpdateItem);
         }
 
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, UpdateItem);
         }
 
         protected override void OnShown()
         {
             base.OnShown();
             _skillId = (int)this.viewData;
-
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_skillId);
-            long hasNum = ItemDataManager.GetItemNum(itemCfg.id);
-            _ui.m_txtHasNum.text = "已拥有:" + hasNum;
+            _ui.m_slideUpLevel.visible = false;
+            ItemExchangeCfg itemCfg = ItemExchangeCfgArray.Instance.GetCfg(_skillId);      
             getMaxCount();
-            UI_ComItem item = UI_ComItem.Proxy(_ui.m_itemSkill);
-            RarityIconController.UpdateRarityIcon(item.m_loaRarity, itemCfg.id, false);
-            string ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType, true);
-            item.m_ShowName.selectedIndex = 2;
-            item.m_txtCount.text = "1";
-            item.m_txtName.text = itemCfg.name;
-            item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg.res, ext);
-            item.m_QualityType.selectedIndex = itemCfg.rarity - 1;
-            UI_ComItem.ProxyEnd();
-
-            _ui.m_listConsume.data = itemCfg.param1Arr;
-            _ui.m_listConsume.numItems = itemCfg.param1Arr.Length;
+            _ui.m_listConsume.data = itemCfg.costId;
+            UpdateItem();
         }
 
         private void RenderListConsumeItem(int index, GObject obj)
         {
-            var itemSkill = (int[][])obj.parent.data;
+            var itemSkill = (int)obj.parent.data;
             UI_ComItem item = UI_ComItem.Proxy(obj);
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemSkill[index][0]);
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemSkill);
+            ItemExchangeCfg itemExchangeCfg = ItemExchangeCfgArray.Instance.GetCfg(_skillId);
             RarityIconController.UpdateRarityIcon(item.m_loaRarity, itemCfg.id, false);
             string ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType, true);
             item.m_CountType.selectedIndex = 1;
-            item.m_txtDecomCount.text = itemSkill[index][1].ToString();
-            item.m_txtDecomHasCount.text = "/" + ItemDataManager.GetItemNum(itemCfg.id);
+            item.m_txtDecomCount.text = ItemDataManager.GetItemNum(itemCfg.id).ToString();
+            item.m_txtDecomHasCount.text = "/" +  (itemExchangeCfg.costNumArr[index] * _nowCount).ToString();
             item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg.res, ext);
             item.m_QualityType.selectedIndex = itemCfg.rarity - 1;
             if (item.target.data == null)
-                item.target.onClick.Add(() => { GoodsItemTipsController.ShowItemTips(itemSkill[index][0]); });
+                item.target.onClick.Add(() => { GoodsItemTipsController.ShowItemTips(itemSkill); });
             item.target.data = index;
             UI_ComItem.ProxyEnd();
         }
@@ -95,13 +86,17 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
+            _maxCount = 0;
+            _nowCount = 0;
+            _ui.m_txtChooseLevel.text = _nowCount.ToString();
         }
 
         private void getMaxCount()
         {
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_skillId);
-            foreach (var info in itemCfg.param1Arr) {
-                long cout = ItemDataManager.GetItemNum(info[0]) / info[1];
+            ItemExchangeCfg itemExchangeCfg = ItemExchangeCfgArray.Instance.GetCfg(_skillId);
+            foreach (var info in itemExchangeCfg.costNumArr) {
+                long cout = ItemDataManager.GetItemNum(itemExchangeCfg.costId) / info;
                 if (_maxCount == 0 || _maxCount > cout)
                     _maxCount = cout;
             }
@@ -112,9 +107,15 @@ namespace GFGGame
             ViewManager.GoBackFrom(typeof(ExchangeGoodsView).FullName);
         }
 
-        private void OnBtnUseClick()
+        private async void OnBtnUseClick()
         {
             //兑换物品
+            if(_nowCount <= 0)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("请选择兑换数量");
+                return;
+            }
+           await ItemExchangeSProxy.ItemExchange(_skillId, _nowCount);
         }
 
         private void OnClickAllChoose()
@@ -158,6 +159,23 @@ namespace GFGGame
         private void ReferSlide()
         {
             _ui.m_slideUpLevel.value = (float)_nowCount / _maxCount * 100;
+            UpdateItem();
+        }
+        private void UpdateItem()
+        {
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_skillId);
+            UI_ComItem item = UI_ComItem.Proxy(_ui.m_itemSkill);
+            RarityIconController.UpdateRarityIcon(item.m_loaRarity, itemCfg.id, false);
+            string ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType, true);
+            item.m_ShowName.selectedIndex = 2;
+            long hasNum = ItemDataManager.GetItemNum(itemCfg.id);
+            item.m_txtCount.text = hasNum.ToString();
+            item.m_txtName.text = itemCfg.name;
+            item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg.res, ext);
+            item.m_QualityType.selectedIndex = itemCfg.rarity - 1;
+            UI_ComItem.ProxyEnd();
+            _ui.m_txtHasNum.text = "已拥有:" + hasNum;
+            _ui.m_listConsume.numItems = itemCfg.param1Arr.Length;
         }
     }
 }

GameClient/Assets/ResIn/UI/Arena/Arena_atlas0_5!a.png.meta

@@ -99,18 +99,6 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/Arena/Arena_atlas0_5.png.meta

@@ -99,18 +99,6 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []