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

FGUIProject/assets/Arena/components/ListRankItem3.xml

@@ -4,7 +4,7 @@
     <image id="n19_jcej" name="n19" src="jcej44" fileName="images/phbphb_phdi_1.png" xy="0,0"/>
     <text id="n12_psph" name="txtRank" xy="28,41" pivot="0.5,0" size="132,59" group="n18_psph" fontSize="44" color="#a98860" align="center" autoClearText="true" text="100000"/>
     <component id="n31_v461" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="167,-18" size="229,230" group="n35_v461" scale="0.73,0.73" controller="c2,2"/>
-    <component id="n33_v461" name="btnLook" src="jcej2w" fileName="components/BtnLook.xml" xy="272,11" group="n35_v461" scale="0.7,0.7"/>
+    <component id="n33_v461" name="btnLook" src="jcej2w" fileName="components/BtnLook.xml" xy="272,11" group="n35_v461" scale="0.7,0.7" touchable="false"/>
     <component id="n34_v461" name="comLv" src="psphq" fileName="components/ComHeadLv.xml" pkg="eg2y0ldp" xy="273,99" group="n35_v461" scale="0.9,0.9"/>
     <group id="n35_v461" name="n35" xy="167,-18" size="229,230" group="n18_psph"/>
     <text id="n14_psph" name="txtName" xy="331,20" size="54,51" group="n29_jcej" fontSize="38" color="#927550" align="center" autoClearText="true" text="--"/>

FGUIProject/assets/Arena/components/ListRankItem4.xml

@@ -4,7 +4,7 @@
     <image id="n19_jcej" name="n19" src="jcej4d" fileName="images/phbphb_zjpm.png" xy="0,0"/>
     <text id="n12_psph" name="txtRank" xy="39,54" pivot="0.5,0" size="132,59" group="n18_psph" fontSize="44" color="#a98860" align="center" autoClearText="true" text="100000"/>
     <component id="n13_psph" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="189,-6" size="229,230" group="n30_jcej" scale="0.73,0.73" controller="c2,1"/>
-    <component id="n24_jcej" name="btnLook" src="jcej2w" fileName="components/BtnLook.xml" xy="294,19" group="n30_jcej" scale="0.7,0.7"/>
+    <component id="n24_jcej" name="btnLook" src="jcej2w" fileName="components/BtnLook.xml" xy="294,19" group="n30_jcej" scale="0.7,0.7" touchable="false"/>
     <component id="n23_jcej" name="comLv" src="psphq" fileName="components/ComHeadLv.xml" pkg="eg2y0ldp" xy="294,111" group="n30_jcej" scale="0.9,0.9"/>
     <group id="n30_jcej" name="n30" xy="189,-6" size="229,230" group="n18_psph"/>
     <text id="n14_psph" name="txtName" xy="346,33" size="54,51" group="n29_jcej" fontSize="38" color="#927550" align="center" autoClearText="true" text="--"/>

FGUIProject/assets/ClothingDecompose/ClothingDecomposeUI.xml

@@ -27,7 +27,8 @@
     </list>
     <text id="n21_qyr6" name="txtNone" xy="380,736" size="256,49" fontSize="36" color="#cfbf9c" vars="true" text="暂无物品可分解"/>
     <text id="n11_wlc2" name="txtShow" xy="301,1150" size="478,44" fontSize="32" color="#917960" align="center" ubb="true" autoSize="none" text="分解0件凡品可获得"/>
-    <list id="n12_wlc2" name="listReward" xy="36,1217" size="1008,263" layout="row" colGap="70" defaultItem="ui://h9mv1l71wlc24" align="center" autoClearItems="true">
+    <text id="n30_lrpa" name="n30" xy="300,1190" size="480,39" visible="false" fontSize="28" color="#da826e" align="center" ubb="true" text="（未合成的套装材料不会被分解哦！）"/>
+    <list id="n12_wlc2" name="listReward" xy="36,1238" size="1008,242" layout="row" colGap="70" defaultItem="ui://h9mv1l71wlc24" align="center" autoClearItems="true">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/ClothingDecompose/components/ListRewardItem.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="254,254">
+<component size="247,240">
   <displayList>
-    <image id="n16_qyr6" name="n16" src="qyr6m" fileName="images/fzfj_fjkuang.png" xy="0,0"/>
-    <text id="n13_wlc2" name="txtName" xy="0,0" size="10,44" fontSize="32" align="center" text=""/>
-    <loader id="n14_wlc2" name="loaIcon" xy="126,53" pivot="0.5,0.05" anchor="true" size="163,163" aspect="true" fill="scale"/>
-    <text id="n15_wlc2" name="txtCount" xy="82,168" size="100,44" fontSize="30" color="#fff8ea" align="right" vAlign="bottom" autoSize="none" strokeColor="#907240" strokeSize="2" autoClearText="true" text="666"/>
+    <image id="n16_qyr6" name="n16" src="qyr6m" fileName="images/fzfj_fjkuang.png" xy="7,0" size="240,240" group="n17_lrpa" aspect="true"/>
+    <text id="n13_wlc2" name="txtName" xy="0,3" size="10,44" group="n17_lrpa" fontSize="32" align="center" text=""/>
+    <loader id="n14_wlc2" name="loaIcon" xy="126,46" pivot="0.5,0.05" anchor="true" size="163,163" group="n17_lrpa" aspect="true" fill="scale"/>
+    <text id="n15_wlc2" name="txtCount" xy="82,161" size="100,44" group="n17_lrpa" fontSize="30" color="#fff8ea" align="right" vAlign="bottom" autoSize="none" strokeColor="#907240" strokeSize="2" autoClearText="true" text="666"/>
+    <group id="n17_lrpa" name="n17" xy="0,0" size="247,240"/>
   </displayList>
 </component>

FGUIProject/assets/DressUp/DressUpFightUI.xml

@@ -20,7 +20,7 @@
     <component id="n1_qsvd" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,60" group="n38_8lqj">
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
     </component>
-    <component id="n2_qsvd" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="35,200" group="n38_8lqj" visible="false">
+    <component id="n2_qsvd" name="btnHome" src="qp4l60" fileName="components/BtnHome.xml" pkg="eg2y0ldp" xy="35,200" group="n38_8lqj" visible="false">
       <relation target="n1_qsvd" sidePair="left-left,top-top"/>
     </component>
     <image id="n50_f2bf" name="n50" src="f2bfey" fileName="images/dz_cdxzcdxz.png" xy="837,60" group="n51_f2bf"/>
@@ -88,7 +88,7 @@
     <group id="n47_v95q" name="n47" xy="140,1728" size="684,97" group="n38_8lqj" advanced="true" layout="hz" colGap="26" excludeInvisibles="true">
       <relation target="" sidePair="center-center"/>
     </group>
-    <component id="n39_njn2" name="btnAutoPlay" src="jj0mdk" fileName="componentsDialog/Button2.xml" xy="355,1642" group="n38_8lqj">
+    <component id="n39_njn2" name="btnAutoPlay" src="jj0mdk" fileName="componentsDialog/Button2.xml" xy="355,1609" group="n38_8lqj">
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </component>
     <text id="n26_bx8o" name="txtRecommendCount" xy="305,1843" size="304,44" group="n38_8lqj" visible="false" fontSize="32" color="#f0eeee" align="center" vars="true" text="今日剩余次数：{v1=10}/{v2=10}">

FGUIProject/assets/League/LeagueCreatUI.xml

@@ -14,7 +14,6 @@
       <item/>
       <item/>
       <item/>
-      <item/>
     </list>
     <component id="n3_rv09" name="btnCreat" src="rv091g" fileName="components/BtnBig.xml" pkg="mk0fwx0x" xy="410,830">
       <Button title="创建雅集"/>

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

@@ -5,12 +5,14 @@ namespace GFGGame
     public class DecomposeDataManager : SingletonBase<DecomposeDataManager>
     {
         Dictionary<int, List<int>> _decomposeData = new Dictionary<int, List<int>>();//所有数量大于1的换装部件数据
+        Dictionary<int, List<int>> _suitSyntheticMaterials = new Dictionary<int, List<int>>();//materiasId,Lsit<suitId>
         List<int> _rewardList = new List<int>();
 
         public const int MaxCount = 999;
         public void Clear()
         {
             _decomposeData.Clear();
+            _suitSyntheticMaterials.Clear();
         }
         public void Add(int itemId)
         {
@@ -67,5 +69,45 @@ namespace GFGGame
         {
             return ItemDataManager.GetItemNum(itemId) - 1;
         }
+        public void InitSuitSyntheticMaterias()
+        {
+            List<SuitCfg> suitCfgs = new List<SuitCfg>();
+            suitCfgs.AddRange(new List<SuitCfg>(SuitCfgArray.Instance.GetCfgsBysyntheticType(1)));
+            suitCfgs.AddRange(new List<SuitCfg>(SuitCfgArray.Instance.GetCfgsBysyntheticType(2)));
+            suitCfgs.AddRange(new List<SuitCfg>(SuitCfgArray.Instance.GetCfgsBysyntheticType(3)));
+
+            for (int i = 0; i < suitCfgs.Count; i++)
+            {
+                int suitId = suitCfgs[i].id;
+                for (int j = 0; j < suitCfgs[i].partsArr.Length; j++)
+                {
+                    ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(suitCfgs[i].partsArr[j]);
+
+                    for (int k = 0; k < itemCfg.syntheticMateriarsArr.Length; k++)
+                    {
+                        int materialId = itemCfg.syntheticMateriarsArr[k][0];
+                        if (!_suitSyntheticMaterials.ContainsKey(materialId))
+                        {
+                            _suitSyntheticMaterials[materialId] = new List<int>();
+                        }
+                        if (_suitSyntheticMaterials[materialId].IndexOf(suitId) < 0) _suitSyntheticMaterials[materialId].Add(suitId);
+                    }
+                }
+            }
+        }
+        /// <summary>
+        /// 检测物品对应的套装是否全部合成
+        /// </summary>
+        /// <param name="itemId"></param>
+        /// <returns></returns>
+        public bool CheckIsItemForSuitSynthetic(int itemId)
+        {
+            if (!_suitSyntheticMaterials.ContainsKey(itemId)) return true;
+            for (int i = 0; i < _suitSyntheticMaterials[itemId].Count; i++)
+            {
+                if (!DressUpMenuSuitDataManager.CheckHaveSuit(_suitSyntheticMaterials[itemId][i])) return false;
+            }
+            return true;
+        }
     }
 }

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

@@ -38,10 +38,10 @@ namespace GFGGame
             {
                 return true;
             }
-            // if (TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.BattlePass))
-            // {
-            //     return true;
-            // }
+            if (TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.BattlePass))
+            {
+                return true;
+            }
             //判断是否有通行证奖励可领取
             return BattlePassTaskDataManager.Instance.GetHadCanGetReward();
         }

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

@@ -172,9 +172,9 @@ namespace GFGGame
                     return string.Format(activeRewardCfg.desc, taskCfg.paramsArr[0], taskCfg.paramsArr[1]);
                 case ConstTaskType.FinishStory:
                 case ConstTaskType.FinishInstanceZones:
-                {
-                    return string.Format(activeRewardCfg.desc, taskCfg.paramsArr[0]);
-                }
+                    {
+                        return string.Format(activeRewardCfg.desc, taskCfg.paramsArr[0]);
+                    }
                 default: return string.Format(activeRewardCfg.desc, taskCfg.GetTargetCount());
             }
         }
@@ -184,7 +184,14 @@ namespace GFGGame
             var taskInfos = TaskDataManager.Instance.GetTaskInfos(taskType);
             if (taskInfos.Select(taskInfo => taskInfo.Value).Any(info => info.State == ConstBonusStatus.CAN_GET))
             {
-                return true;
+                if (taskType == TaskType.BattlePass && !BattlePassTaskDataManager.Instance.GetIsBuy())
+                {
+                    return false;
+                }
+                else
+                {
+                    return true;
+                }
             }
             return false;
         }

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

@@ -322,10 +322,11 @@ namespace GFGGame
                     // if (list.Count < response.data.Count) return false;
                     for (int i = 0; i < response.data.Count; i++)
                     {
-                        list[i].cardScore = response.data[i].CardScore;
-                        for (int j = 0; j < response.data[i].SuitScore.Count; j++)
+                        ArenaDressupAttrProto attrProto = response.data[i];
+                        list[i].cardScore = attrProto.CardScore;
+                        for (int j = 0; j < attrProto.SuitScore.Count; j++)
                         {
-                            list[i].itemScoreList.Add(response.data[i].SuitScore[j]);
+                            list[i].itemScoreList.Add(attrProto.SuitScore[j]);
                         }
                         list[i].itemList = response.DressupList[i].EquipIds;
                         list[i].cardId = response.DressupList[i].CardId;
@@ -336,16 +337,18 @@ namespace GFGGame
                                 list[i].leagueSkillScore = response.SkillAttrs[j].Value;
                             }
                         }
-                        List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(response.data[i].CardId);
+                        list[i].skillLvs = attrProto.SkillLevel;
+                        // List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(attrProto.CardId);
 
-                        if (response.data[i].SkillId.Count == skillCfgs.Count)
-                        {
-                            for (int j = 0; j < skillCfgs.Count; j++)
-                            {
-                                int index = response.data[i].SkillId.IndexOf(skillCfgs[j].skillId);
-                                list[i].skillLvs.Add(response.data[i].SkillLevel[index]);
-                            }
-                        }
+                        // if (attrProto.SkillId.Count == skillCfgs.Count)
+                        // {
+                        //     for (int j = 0; j < skillCfgs.Count; j++)
+                        //     {
+                        //         int skillId = skillCfgs[j].skillId;
+                        //         int index = attrProto.SkillId.IndexOf(skillId);
+                        //         list[i].skillLvs.Add(attrProto.SkillLevel[index]);
+                        //     }
+                        // }
                         FightDataManager.Instance.SetItemScoreList(list[i]);
                         ScoreSystemData.Instance.SetEquipScoresWithPartId(list[i]);
                     }

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

@@ -114,7 +114,7 @@ namespace GFGGame
             {
                 count = ArenaDataManager.Instance.RankDatasDic[_rankType].Count;
             }
-            if (count > index)
+            if (count >= index)
             {
                 UpdateView();
                 return;
@@ -313,12 +313,12 @@ namespace GFGGame
                 }
             }
             item.m_btnLook.visible = _rankType != ArenaRankType.LAST_SEASON;
-            if (item.m_btnLook.data == null)
+            if (item.m_comHead.data == null)
             {
-                item.m_btnLook.onClick.Add(OnBtnLookClick);
+                // item.m_btnLook.onClick.Add(OnBtnLookClick);
                 item.m_comHead.onClick.Add(OnBtnLookClick);
             }
-            item.m_btnLook.data = arenaData;
+            // item.m_btnLook.data = arenaData;
             item.m_comHead.data = arenaData;
 
             UI_ListRankItem3.ProxyEnd();
@@ -331,7 +331,7 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("玩家不在线");
                 return;
             }
-            if (_rankType != ArenaRankType.LAST_SEASON)
+            if (_rankType == ArenaRankType.LAST_SEASON)
             {
                 return;
             }

GameClient/Assets/Game/HotUpdate/Views/ClothingDecompose/ClothingDecomposeView.cs

@@ -62,6 +62,8 @@ namespace GFGGame
             _ui.m_listReward.itemRenderer = ListRewardItemRander;
             _ui.m_listReward.onClickItem.Add(OnClickListRewardItem);
 
+            // DecomposeDataManager.Instance.InitSuitSyntheticMaterias();
+
 
         }
 
@@ -147,6 +149,11 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("已达到单次可分解上限，请分批操作");
                 return;
             }
+            // if (!DecomposeDataManager.Instance.CheckIsItemForSuitSynthetic(itemId))
+            // {
+            //     PromptController.Instance.ShowFloatTextPrompt("这是套装合成材料，先别分解了吧！");
+            //     return;
+            // }
 
             UI_ListItem item = UI_ListItem.Proxy(com);
             item.m_btnMinus.visible = true;
@@ -203,6 +210,10 @@ namespace GFGGame
             for (int i = 0; i < _clothingDatas.Count; i++)
             {
                 int itemId = _clothingDatas[i];
+                // if (!DecomposeDataManager.Instance.CheckIsItemForSuitSynthetic(itemId))
+                // {
+                //     continue;
+                // }
                 long itemHasCount = DecomposeDataManager.Instance.ItemCanDecomposeCount(itemId);
                 long itemLastCount = _decomposeData.ContainsKey(itemId) ? itemHasCount - _decomposeData[itemId] : itemHasCount;
 

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

@@ -144,7 +144,7 @@ namespace GFGGame
             UpdateStepBtn(true);
             UpdateValueInfo();
             SendLog();
-            Timers.inst.AddUpdate(CheckGuide);
+
         }
 
         protected override void OnHide()
@@ -156,11 +156,10 @@ namespace GFGGame
                 GameObject.Destroy(_sceneObject);
                 _sceneObject = null;
             }
-            // _dressUpData.TakeOffAll();
-            // _dressUpData = null;
+
             DressUpMenuItemDataManager.Clear();
             MyDressUpHelper.ResetMemory();
-            Timers.inst.Remove(CheckGuide);
+
             _ui.m_grhCloseComFightScore.visible = false;
             _ui.m_comValueInfo.GetController("c2").selectedIndex = 0;
 
@@ -989,27 +988,5 @@ namespace GFGGame
 
         }
 
-        private void CheckGuide(object param)
-        {
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0
-             || GuideDataManager.IsGuideFinish(ConstGuideId.AUTOPLAY_FIGHT) <= 0)
-            {
-                UpdateToCheckGuide(null);
-            }
-            else
-            {
-                Timers.inst.Remove(CheckGuide);
-            }
-        }
-
-        protected override void UpdateToCheckGuide(object param)
-        {
-            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-        }
-
-        protected override void TryCompleteGuide()
-        {
-            base.TryCompleteGuide();
-        }
     }
 }

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

@@ -1281,16 +1281,17 @@ namespace GFGGame
             // GuideController.TryCompleteGuide(ConstGuideId.START_FIGHT, 5);
 
             GuideController.TryGuide(_ui.m_compNeed.target, ConstGuideId.BUY_CLOTHING, 3, "当提示有“必需品”时，需要穿上对应物品才能通关。");
-            GuideController.TryGuide(_ui.m_comListType1.m_listType, ConstGuideId.BUY_CLOTHING, 7, "按照指示就可以找到必需品啦，点击换上吧。", buyClothingIndex);
-            GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.BUY_CLOTHING, 8, "", buyClothingSubIndex);
+            GuideController.TryGuide(_ui.m_btnRecommend, ConstGuideId.BUY_CLOTHING, 7, "点击推荐搭配，可以快速穿上必须品。");
+
+            GuideController.TryGuide(_ui.m_btnAutoPlay, ConstGuideId.BUY_CLOTHING, 8, "勾选后，会自动进行比拼哦~~");
             GuideController.TryCompleteGuide(ConstGuideId.BUY_CLOTHING, 8);
 
             GuideController.TryGuide(_ui.m_btnHint, ConstGuideId.FIGHT_TIPS, 1, "这次换装需要获得别人的认可呢。");
             GuideController.TryCompleteGuide(ConstGuideId.FIGHT_TIPS, 1);
 
-            GuideController.TryGuide(_ui.m_btnRecommend, ConstGuideId.AUTOPLAY_FIGHT, 1, "衣服太多难以选择，可以点击这里。");
-            GuideController.TryGuide(_ui.m_btnAutoPlay, ConstGuideId.AUTOPLAY_FIGHT, 2, "勾选后，自动进行比拼哦~~");
-            GuideController.TryCompleteGuide(ConstGuideId.AUTOPLAY_FIGHT, 2);
+            GuideController.TryGuide(_ui.m_btnRecommend, ConstGuideId.AUTOPLAY_FIGHT, 1, "", -1, true, 0, true, true);//这个引导自动完成，测试中策划要求件推荐搭配引导提前，为避免意外，没有改引导表，而是直接吧推荐搭配加到买必须品的引导力，这个引导自动完成
+            if (GuideDataManager.currentGuideId == GuideCfgArray.Instance.GetCfg(ConstGuideId.AUTOPLAY_FIGHT).id) GuideController.TryCompleteGuideIndex(ConstGuideId.AUTOPLAY_FIGHT, 1);
+            GuideController.TryCompleteGuide(ConstGuideId.AUTOPLAY_FIGHT, 1);
 
         }
 

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

@@ -284,6 +284,8 @@ namespace GFGGame
             {
                 _dressUpObj.PutOnDefaultDressUpData();
             }
+            Transform transform = _sceneObject.transform.Find("Role");
+            transform.localPosition = new Vector3(-2, transform.localPosition.y, 0);
         }
 
 

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

@@ -104,7 +104,8 @@ namespace GFGGame
             _ui.m_listSkill.numItems = skillCfgs.Count;
             _ui.m_comSkillTips.target.visible = false;
             _selectedIndex = index;
-            _ui.m_listCard.GetChildAt(index).asCom.AddChild(_comSelected);
+            int childIndex = _ui.m_listCard.ItemIndexToChildIndex(index);
+            _ui.m_listCard.GetChildAt(childIndex).asCom.AddChild(_comSelected);
         }
         private void RenderListSkillItem(int index, GObject obj)
         {

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

@@ -143,6 +143,7 @@ namespace GFGGame
         {
             _chapterCfgs = StoryChapterCfgArray.Instance.GetCfgsBysubType(subType);
             _ui.m_listChapter.numItems = _chapterCfgs.Count;
+            int currentChapterIndex = 0;
             for (int i = 0; i < _ui.m_listChapter.numChildren; i++)
             {
                 UI_ListChapterItem listItem = UI_ListChapterItem.Proxy(_ui.m_listChapter.GetChildAt(i));
@@ -155,6 +156,7 @@ namespace GFGGame
                 {
                     listItem.m_content.m_imgLockBg.visible = false;
                     listItem.m_content.m_txtLockDesc.visible = false;
+                    currentChapterIndex = i;
                 }
                 else
                 {
@@ -179,6 +181,7 @@ namespace GFGGame
                 }
                 UI_ListChapterItem.ProxyEnd();
             }
+            _ui.m_listChapter.ScrollToView(currentChapterIndex);
         }
         private void CheckGuide(object param)
         {

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

@@ -422,8 +422,8 @@ namespace GFGGame
                         if (_dressUpObjUI.dressUpObj.actionId > 0)
                         {
                             _dressUpObjUI.dressUpObj.CancelAction(true);
-                            _dressUpObjUI.dressUpObj.PutOnDressUpData(_dressUpObjUI.dressUpObj.DressUpDataClone(), new int[] { ConstDressUpItemType.SHOU_CHI_WU });
                         }
+                        _dressUpObjUI.dressUpObj.PutOnDressUpData(_dressUpObjUI.dressUpObj.DressUpDataClone(), new int[] { ConstDressUpItemType.SHOU_CHI_WU });
                     }
                     if (headAniCfg != null && headAniCfg.faceId > 0)
                     {

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

@@ -449,9 +449,11 @@ namespace GFGGame
         {
 
             if (!_isAllPerfect) return;
+
             _ui.m_comClick.m_comAllPerfect.m_t0.Stop(true, false);
             _ui.m_comClick.m_comAllPerfect.m_t1.timeScale = FightDataManager.Instance.fightSpeed;// 1 / _speed;
             _ui.m_comClick.m_comAllPerfect.m_t1.Play(AllCircleScoreEnd);
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.START_FIGHT) <= 0 && !ViewManager.isViewOpen(typeof(GuideView).FullName)) return;
             Timers.inst.Add(0.1f, 0, ComAllCirclePressTime);
 
         }
@@ -462,8 +464,8 @@ namespace GFGGame
         }
         private void AllCircleScoreEnd()
         {
-            if (!_isAllPerfect) return;
-            _ui.m_comClick.target.touchable = false;
+            if (!_isAllPerfect || _time == 0) return;
+
             _isAllPerfect = false;
             _ui.m_comClick.m_comAllPerfect.m_t1.Stop(true, false);
             Timers.inst.Remove(ComAllCirclePressTime);
@@ -599,7 +601,7 @@ namespace GFGGame
 
         private void UpdateToCheckGuide()
         {
-            _ui.m_comClick.target.touchable = true;
+            _ui.m_comClick.target.touchable = !_isAllPerfect;
             GuideCfg guideCfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.START_FIGHT);
             if (_partId == 1)
             {
@@ -613,7 +615,11 @@ namespace GFGGame
             {
                 GuideController.TryGuide(_ui.m_comClick.target, ConstGuideId.START_FIGHT, 9, "你真棒，再来一次", -1, true, 230, false, true);
             }
-            if (_isAllPerfect) GuideController.TryGuide(_ui.m_comClick.target, ConstGuideId.START_FIGHT, 10, "太棒啦，6次卓越点击会触发登峰造极哦！任意地方按住3秒就行！", -1, true, 230, false, true);
+            if (_isAllPerfect)
+            {
+                bool guide = GuideController.TryGuide(_ui.m_comClick.target, ConstGuideId.START_FIGHT, 10, "太棒啦，6次卓越点击会触发登峰造极哦！任意地方按住3秒就行！", -1, true, 230, false, true);
+                if (guide) _ui.m_comClick.target.touchable = true;
+            }
         }
 
     }

GameClient/Assets/Game/HotUpdate/Views/Task/CombTaskView.cs

@@ -153,8 +153,8 @@ namespace GFGGame
             _ui.m_TaskList.numItems = _cfgs.Count;
             RedDotController.Instance.SetComRedDot(_ui.m_btnDailyTask,
                 TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.Daily));
-            // RedDotController.Instance.SetComRedDot(_ui.m_btnBattlePassTask,
-            //     TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.BattlePass));
+            RedDotController.Instance.SetComRedDot(_ui.m_btnBattlePassTask,
+                TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.BattlePass));
         }
 
         private void TaskItemRender(int index, GObject obj)
@@ -183,7 +183,8 @@ namespace GFGGame
             var reward = TaskDataManager.Instance.GetReward(_cfgs[index]);
             item.m_listTaskReward.data = reward;
             item.m_listTaskReward.numItems = reward.Length;
-            bool canGet = taskType != TaskType.BattlePass && item.m_c1.selectedIndex == 1;
+            var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
+            bool canGet = item.m_c1.selectedIndex == 1 && (taskType != TaskType.BattlePass || taskType == TaskType.BattlePass && isBuy);
             RedDotController.Instance.SetComRedDot(item.m_GetRewardBt, canGet);
             UI_TaskListItem.ProxyEnd();
         }

GameClient/Assets/Game/HotUpdate/Views/Task/TaskView.cs

@@ -94,7 +94,7 @@ namespace GFGGame
         private void UpdateRedPoint()
         {
             bool showRedPoint = TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.Daily)
-                // || TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.BattlePass)
+                || TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.BattlePass)
                 || DailyTaskDataManager.Instance.GetHadGetRewardNum();
             RedDotController.Instance.SetComRedDot(_ui.m_btnTask, showRedPoint);
             showRedPoint = BattlePassTaskDataManager.Instance.GetHadCanGetReward();