zhaoyang 3 years ago
parent
commit
8737d99ac4
21 changed files with 189 additions and 20 deletions
  1. 3 3
      FGUIProject/assets/DressUp/PhotographSaveUI.xml
  2. 1 0
      GameClient/Assets/Game/HotUpdate/Constant/ConstGuideId.cs
  3. 1 0
      GameClient/Assets/Game/HotUpdate/Controller/GameController.cs
  4. 118 1
      GameClient/Assets/Game/HotUpdate/Controller/GuideController.cs
  5. 1 1
      GameClient/Assets/Game/HotUpdate/Data/PhotographDataManager.cs
  6. 1 1
      GameClient/Assets/Game/HotUpdate/Views/ClothingShop/ClothingShopView.cs
  7. 2 1
      GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs
  8. 1 1
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachOfItemView.cs
  9. 4 1
      GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs
  10. 3 0
      GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographSaveView.cs
  11. 8 1
      GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographView.cs
  12. 3 3
      GameClient/Assets/Game/HotUpdate/Views/Guide/GuideView.cs
  13. 10 3
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs
  14. 19 0
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterView.cs
  15. 2 1
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs
  16. 2 0
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StorySkillView.cs
  17. 1 1
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StroyFightResultView.cs
  18. 6 1
      GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs
  19. 3 1
      GameClient/Assets/Game/HotUpdate/Views/XiuFang/XiuFangView.cs
  20. BIN
      GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes
  21. BIN
      GameClient/Assets/ResIn/UI/DressUp/DressUp_fui.bytes

+ 3 - 3
FGUIProject/assets/DressUp/PhotographSaveUI.xml

@@ -14,15 +14,15 @@
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <Button icon="ui://mbo439wbxmtl4x"/>
     </component>
-    <component id="n5_i3ix" name="btnShare" src="i3ix5a" fileName="components/Button12.xml" xy="667,1816">
+    <component id="n5_i3ix" name="btnShare" src="i3ix5a" fileName="components/Button12.xml" xy="667,1816" visible="false">
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <Button icon="ui://mbo439wbxmtl4v"/>
     </component>
-    <component id="n6_i3ix" name="btnShareWX" src="i3ix5a" fileName="components/Button12.xml" xy="796,1816">
+    <component id="n6_i3ix" name="btnShareWX" src="i3ix5a" fileName="components/Button12.xml" xy="796,1816" visible="false">
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <Button icon="ui://mbo439wbxmtl4w"/>
     </component>
-    <component id="n7_i3ix" name="btnShareWB" src="i3ix5a" fileName="components/Button12.xml" xy="925,1816">
+    <component id="n7_i3ix" name="btnShareWB" src="i3ix5a" fileName="components/Button12.xml" xy="925,1816" visible="false">
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <Button icon="ui://mbo439wbxmtl4u"/>
     </component>

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Constant/ConstGuideId.cs

@@ -13,6 +13,7 @@ namespace GFGGame
         public const int USE_CARD_FIGHT = 15;//引导使用卡牌战斗
         public const int TIPS_TAGS_FIGHT = 16;//提示标签
         public const int CARD_UP_STAR = 17;//词牌升星
+        public const int PHOTOGRAPH_GUIDE = 18;//引导拍照
 
         public const int MAIN_UI_BTN_STORY = 5;
         public const int CHAPTER_RESULT_VIEW = 6;

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -226,6 +226,7 @@ namespace GFGGame
                 StoryDataManager.currentChapter = 1;
                 if (!StoryDataManager.CheckLevelPass(1, 1))
                 {
+                    ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, StoryDataManager.currentChapter, new object[] { ViewName.STORY_CHAPTER_LIST_VIEW });
                     StoryController.ShowLevelView(StoryDataManager.currentChapter, 1);
                 }
                 else

+ 118 - 1
GameClient/Assets/Game/HotUpdate/Controller/GuideController.cs

@@ -40,6 +40,10 @@ namespace GFGGame
                 GuideDataManager.currentGuideId = ConstGuideId.SINGLE_FIGHT_GUIDE;
                 ShowGuide(target, true, guideStr);
             }
+            else if (GuideDataManager.GetGuideCount(ConstGuideId.SINGLE_FIGHT_GUIDE) <= 0)
+            {
+
+            }
         }
 
         public static void TryGuideChapterInfoViewBtnStart(GObject target, string guideStr = null)
@@ -231,7 +235,7 @@ namespace GFGGame
                 && !StoryDataManager.CheckLevelPass(StoryDataManager.currentChapter, StoryDataManager.currentLevel))
             {
                 GuideDataManager.currentGuideId = ConstGuideId.TARGET_FIGHT_GUIDE;
-                ShowGuide(target, false, "这里可以观察双方的分数计算", 0, false, devWidth, devHeight);
+                ShowGuide(target, false, "这里可以观察双方的分数计算", 0, true, devWidth, devHeight);
             }
         }
         public static void TryGuideStoryFightTargetScorebtnSkill0(GObject target)
@@ -328,6 +332,18 @@ namespace GFGGame
 
         /************************************************************引导合成套装*******************************************************/
 
+        public static void TryGuideStoryChapterView(GObject target)
+        {
+
+            if (GuideDataManager.GetGuideCount(ConstGuideId.SUIT_SYNTHETIC_GUIDE) <= 0
+                && StoryDataManager.CheckLevelPass(2, 1)
+                && !StoryDataManager.CheckLevelPass(2, 2)
+                && StoryDataManager.currentChapter == 2 && StoryDataManager.currentLevel <= 2)
+            {
+                GuideDataManager.currentGuideId = ConstGuideId.SUIT_SYNTHETIC_GUIDE;
+                ShowGuide(target, false, "点击进行下一关");
+            }
+        }
         public static void TryGuideStoryLevelInfoViewTxtNeed(GObject target)
         {
 
@@ -567,6 +583,107 @@ namespace GFGGame
                 ShowGuide(target, true, "升满5星后,可解锁词牌的隐藏卡面哦", 0);
             }
         }
+        /***********************************************************引导拍照********************************************************/
+        // PHOTOGRAPH_GUIDE
+        public static bool TryGuideGoBackStoryChapter1(GObject target)
+        {
+            if (GuideDataManager.GetGuideCount(ConstGuideId.PHOTOGRAPH_GUIDE) <= 0
+                && StoryDataManager.CheckLevelPass(2, 4)
+                && !StoryDataManager.CheckLevelPass(2, 5))
+            {
+                GuideDataManager.currentGuideId = ConstGuideId.PHOTOGRAPH_GUIDE;
+                ShowGuide(target, false, "拍照功能开启了,点击返回主界面", 0);
+                return true;
+            }
+            return false;
+        }
+        public static bool TryGuideOpenDressUpView(GObject target)
+        {
+            if (GuideDataManager.GetGuideCount(ConstGuideId.PHOTOGRAPH_GUIDE) <= 0
+                && StoryDataManager.CheckLevelPass(2, 4)
+                && !StoryDataManager.CheckLevelPass(2, 5))
+            {
+                GuideDataManager.currentGuideId = ConstGuideId.PHOTOGRAPH_GUIDE;
+                ShowGuide(target, false, "点击进入自由换装", 0);
+                return true;
+            }
+            return false;
+        }
+        public static bool TryGuideDressUpViewMenuType2(GList list)
+        {
+            if (GuideDataManager.currentGuideId == ConstGuideId.PHOTOGRAPH_GUIDE)
+            {
+                int len = list.numChildren;
+                list.ScrollToView(len - 1);
+                for (int i = 0; i < len; i++)
+                {
+                    UI_comListType item = UI_comListType.Proxy(list.GetChildAt(i));
+                    if (item != null)
+                    {
+                        int menuID = (int)item.target.data;
+                        DressUpMenuItemCfg1 dressUpMenuItemCfg1 = DressUpMenuItemCfg1Array.Instance.GetCfg(menuID);
+                        if (dressUpMenuItemCfg1.type == ConstDressUpItemType.TAO_ZHUANG)
+                        {
+                            ShowGuide(item.target, true, "点击套装");
+                            return true;
+                        }
+                    }
+                }
+            }
+            return false;
+        }
+        public static void TryGuideDressUpViewMenuPart1(GList list)
+        {
+            if (GuideDataManager.currentGuideId == ConstGuideId.PHOTOGRAPH_GUIDE)
+            {
+                if (list.numChildren > 0)
+                {
+                    UI_PartsList listItem = UI_PartsList.Proxy(list.GetChildAt(0));
+                    if (listItem != null)
+                    {
+                        ShowGuide(listItem.target, true, "选择一套衣服换上");
+                        return;
+                    }
+                }
+            }
+        }
+        public static bool TryGuideOpenPhotographView(GObject target)
+        {
+            if (GuideDataManager.GetGuideCount(ConstGuideId.PHOTOGRAPH_GUIDE) <= 0
+                && StoryDataManager.CheckLevelPass(2, 4)
+                && !StoryDataManager.CheckLevelPass(2, 5))
+            {
+                GuideDataManager.currentGuideId = ConstGuideId.PHOTOGRAPH_GUIDE;
+                ShowGuide(target, false, "换好衣服去试着拍张照片吧", 0);
+                return true;
+            }
+            return false;
+        }
+        public static bool TryGuideBtnPhotograph(GObject target)
+        {
+            if (GuideDataManager.GetGuideCount(ConstGuideId.PHOTOGRAPH_GUIDE) <= 0
+                && StoryDataManager.CheckLevelPass(2, 4)
+                && !StoryDataManager.CheckLevelPass(2, 5))
+            {
+                GuideDataManager.currentGuideId = ConstGuideId.PHOTOGRAPH_GUIDE;
+                ShowGuide(target, false, "摆好姿势可以拍照了", 0);
+                return true;
+            }
+            return false;
+        }
+        public static bool TryGuideBtnSave(GObject target)
+        {
+
+            if (GuideDataManager.GetGuideCount(ConstGuideId.PHOTOGRAPH_GUIDE) <= 0
+                && StoryDataManager.CheckLevelPass(2, 4)
+                && !StoryDataManager.CheckLevelPass(2, 5))
+            {
+                GuideDataManager.currentGuideId = ConstGuideId.PHOTOGRAPH_GUIDE;
+                ShowGuide(target, false, "拍照的照片记得保存到手机相册哦", 0);
+                return true;
+            }
+            return false;
+        }
         /*******************************************************************************************************************/
         public static bool TryGuideByGuideId(GObject target, int guideId, int maxCount = 1, bool needUpdate = false, string guideStr = null, int yTxt = 0, int preGuideIdAtThisLogin = 0)
         {

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Data/PhotographDataManager.cs

@@ -71,7 +71,7 @@ namespace GFGGame
             for (int i = 0; i < EquipDataCache.cacher.equipDatas.Length; i++)
             {
                 ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(EquipDataCache.cacher.equipDatas[i]);
-                if (itemCfg.subType == ConstDressUpItemType.QIAN_JING || itemCfg.subType == ConstDressUpItemType.BEI_SHI || itemCfg.subType == ConstDressUpItemType.HUAN_JING)
+                if (itemCfg.subType == ConstDressUpItemType.QIAN_JING || itemCfg.subType == ConstDressUpItemType.BEI_SHI || itemCfg.subType == ConstDressUpItemType.HUAN_JING || itemCfg.subType == ConstDressUpItemType.FEN_WEI)
                 {
                     PhotographDataManager.Instance.AddEquipItem(_equipSceneData, itemCfg.id, out _equipSceneData);
                 }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/ClothingShop/ClothingShopView.cs

@@ -7,7 +7,7 @@ using System;
 
 namespace GFGGame
 {
-    public class ClothingShopView : BaseWindow
+    public class ClothingShopView : BaseView
     {
         private const int SHOES_Y = 105;
         private const int HEAD_Y = 609;

+ 2 - 1
GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -141,6 +141,8 @@ namespace GFGGame
 
         private void OnClickBtnProcuction()
         {
+            Timers.inst.AddUpdate(UpdateTryGuide);
+            // GuideController.HideGuide();
             if (ItemDataManager.GetItemNum(_selectedItemId) > 0)
             {
                 PromptController.Instance.ShowFloatTextPrompt("不能制作已经拥有的物品!");
@@ -171,7 +173,6 @@ namespace GFGGame
             ItemDataManager.Add(_selectedItemId, 1);
             GetSuitItemController.TryShow(_selectedItemId);
 
-            Timers.inst.AddUpdate(UpdateTryGuide);
         }
 
         private void ListClothingItemRender(int index, GObject item)

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachOfItemView.cs

@@ -102,7 +102,7 @@ namespace GFGGame
             {
                 case ConstFunctionId.FU_ZHUANG_DIAN:
                     this.Hide();
-                    ViewManager.Show(ViewName.CLOTHING_SHOP_VIEW, new object[] { null, null, _itemId });
+                    ViewManager.Show(ViewName.CLOTHING_SHOP_VIEW, new object[] { null, null, _itemId }, null, false, true);
                     break;
                 case ConstFunctionId.JU_QING_GUAN_QIA:
                     string value = infos[1];

+ 4 - 1
GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs

@@ -97,6 +97,7 @@ namespace GFGGame
             _ui.m_comboBox.selectedIndex = CustomSuitDataManager.currentIndex;
             EquipDataCache.cacher.PutOnCurrentSuitSaved();
             GuideController.TryGuideDressUpViewMenuType1(_ui.m_comListType1.m_listType);
+            GuideController.TryGuideDressUpViewMenuType2(_ui.m_comListType1.m_listType);
         }
 
         protected override void OnHide()
@@ -151,6 +152,7 @@ namespace GFGGame
             {
                 this.showListParts(item1.type);
                 GuideController.TryGuideDressUpViewMenuPart(_ui.m_partsList.m_list);
+                GuideController.TryGuideDressUpViewMenuPart1(_ui.m_partsList.m_list);
             }
             this.hideListType1();
         }
@@ -168,6 +170,7 @@ namespace GFGGame
         private void OnClickPartsListItem(EventContext context)
         {
             GuideController.TryGuideByGuideId(_ui.m_btnSave, ConstGuideId.MAIN_UI_BTN_HUAN_ZHUANG, 1, false, "搭配好的服饰,可以保存随时查看");
+            GuideController.TryGuideOpenPhotographView(_ui.m_btnPhoto);
             GObject listItem = (GObject)context.data as GObject;
             int id = (int)listItem.data;
             if (_currentMenuType == (int)ConstDressUpItemType.TAO_ZHUANG)
@@ -521,7 +524,7 @@ namespace GFGGame
         }
         private void OnClickBtnPhoto()
         {
-            // this.Hide();
+
             _ui.target.visible = false;
             this._sceneObject.gameObject.SetActive(false);
             ViewManager.Show<PhotographView>();

+ 3 - 0
GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographSaveView.cs

@@ -32,6 +32,8 @@ namespace GFGGame
             float height = width * tex.height / tex.width;
             _ui.m_imgRes.SetSize(width, height);
             _ui.m_imgBorder.SetSize(width, height + 12);
+            GuideController.TryGuideBtnSave(_ui.m_btnSave);
+
         }
 
         protected override void OnHide()
@@ -46,6 +48,7 @@ namespace GFGGame
 
         private void OnClickBtnSave()
         {
+            GuideController.TryCompleteGuide(ConstGuideId.PHOTOGRAPH_GUIDE);
             string path = Application.persistentDataPath + "/Pictures/WanshiJing/";
 
             //判断目录是否存在,不存在则会创建目录

+ 8 - 1
GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographView.cs

@@ -24,6 +24,7 @@ namespace GFGGame
         private const string BorderResPath = "Border/BorderRes";
         private const string NpcResPath = "Scene/Npc/NpcRes";
         private const string RolePath = "Scene/Role";
+        private const string RoleName = "Role";
         private const string NpcPath = "Scene/Npc";
         private const string BgResName = "BgRes";
         // private const string BorderResName = "BorderRes";
@@ -117,7 +118,7 @@ namespace GFGGame
             UpdateBg(ItemCfgArray.Instance.GetCfg(EquipDataCache.cacher.bgId));
             UpdateBody();
             UpdateScene();
-
+            GuideController.TryGuideBtnPhotograph(_ui.m_btnPhotograph);
         }
         /************************************************************UI界面*********************************************************/
         private void OnContorllerChanged(EventContext context)
@@ -458,6 +459,11 @@ namespace GFGGame
         private void OnTouchBtnFlipBegin()//翻转
         {
             Transform transform = memoryHitGameObj.transform;
+            if (memoryHitGameObj.name == RoleName)
+            {
+                transform.Rotate(Vector3.up, 180, Space.Self);
+                return;
+            }
             for (int i = 0; i < transform.childCount; i++)
             {
                 transform.GetChild(i).Rotate(Vector3.up, 180, Space.Self);
@@ -502,6 +508,7 @@ namespace GFGGame
         }
         private void OnClickBtnPhotograph()
         {
+            GuideController.HideGuide();
             _ui.target.visible = false;
             Timers.inst.StartCoroutine(ScreenShotTex());// ();
         }

+ 3 - 3
GameClient/Assets/Game/HotUpdate/Views/Guide/GuideView.cs

@@ -6,7 +6,7 @@ using System;
 
 namespace GFGGame
 {
-    public class GuideView : BaseView
+    public class GuideView : BaseWindow
     {
         private UI_GuideUI _ui;
         private bool _needUpdate;
@@ -26,8 +26,8 @@ namespace GFGGame
             packageName = UI_GuideUI.PACKAGE_NAME;
             _ui = UI_GuideUI.Create();
             this.viewCom = _ui.target;
-            // this.clickBlankToClose = false;
-            this.layer = ConstViewLayer.TOP;
+            this.clickBlankToClose = false;
+            // this.layer = ConstViewLayer.TOP;
             isfullScreen = true;
             _ui.m_rectFrame.target.AddRelation(_ui.m_mask.m_guideArea, RelationType.Width);
             _ui.m_rectFrame.target.AddRelation(_ui.m_mask.m_guideArea, RelationType.Height);

+ 10 - 3
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -188,6 +188,7 @@ namespace GFGGame
             LuckyBoxCfg luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(LuckyBoxBonusDataCache.currentBoxId);
             if (GuideDataManager.GetGuideCount(ConstGuideId.MAIN_UI_BTN_ZHAI_XING) <= 0)
             {
+                Timers.inst.AddUpdate(UpdateToCheckGuide);
                 ItemDataManager.Remove(luckyBoxCfg.costID, luckyBoxCfg.costNumTen);
                 LuckyBoxDataManager.Instance.RewardList = LuckyBoxBonusDataCache.GetBonusList(10, true);
                 ViewManager.Show(ViewName.LUCKY_BOX_STAR_VIEW, _ui.m_c1.selectedIndex);
@@ -208,12 +209,18 @@ namespace GFGGame
         {
             if (this.viewCom.parent != null)
             {
-                // int index = this.viewCom.parent.GetChildIndex(this.viewCom);
                 if (GRoot.inst.GetTopWindow() == this.viewCom)
                 {
-                    if (!GuideController.TryGuideByGuideId(_ui.m_btnBuyTen, ConstGuideId.MAIN_UI_BTN_ZHAI_XING, 1, true, "点击摘取十次"))
+                    if (GuideController.TryGuideByGuideId(_ui.m_btnBuyTen, ConstGuideId.MAIN_UI_BTN_ZHAI_XING, 1, true, "点击摘取十次"))
                     {
-                        GuideController.TryGuideByGuideId(_ui.m_btnBack, ConstGuideId.LUCKY_BOX_VIEW_BTN_BACK, 1, true, "获得一套完整的服装啦,马上去试穿一下", 0, ConstGuideId.MAIN_UI_BTN_ZHAI_XING);
+                        Timers.inst.Remove(UpdateToCheckGuide);
+                    }
+                    else
+                    {
+                        if (GuideController.TryGuideByGuideId(_ui.m_btnBack, ConstGuideId.LUCKY_BOX_VIEW_BTN_BACK, 1, true, "获得一套完整的服装啦,马上去试穿一下", 0, ConstGuideId.MAIN_UI_BTN_ZHAI_XING))
+                        {
+                            Timers.inst.Remove(UpdateToCheckGuide);
+                        }
                     }
                 }
             }

+ 19 - 0
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterView.cs

@@ -238,18 +238,37 @@ namespace GFGGame
                     if (_unPasslevelItem != null && GuideDataManager.GetGuideCount(ConstGuideId.SINGLE_FIGHT_GUIDE) <= 0)
                     {
                         GuideController.TryGuideChapterViewLevelItem(_unPasslevelItem);
+                        // Timers.inst.Remove(UpdateToCheckGuide);
+
                     }
                     else if (GuideDataManager.GetGuideCount(ConstGuideId.MAIN_UI_BTN_ZHAI_XING) <= 0)
                     {
                         GuideController.TryGuideGoBackStoryChapter(_ui.m_btnHome);
+                        // Timers.inst.Remove(UpdateToCheckGuide);
+
+                    }
+                    else if (GuideDataManager.GetGuideCount(ConstGuideId.SUIT_SYNTHETIC_GUIDE) <= 0 && GuideDataManager.GetGuideCount(ConstGuideId.MAIN_UI_BTN_HUAN_ZHUANG) > 0 && GuideDataManager.currentGuideId != ConstGuideId.SUIT_SYNTHETIC_GUIDE)
+                    {
+                        GuideController.TryGuideStoryChapterView(_unPasslevelItem);
+                        // Timers.inst.Remove(UpdateToCheckGuide);
+
                     }
                     else if (GuideDataManager.GetGuideCount(ConstGuideId.SUIT_SYNTHETIC_GUIDE) <= 0 && GuideDataManager.currentGuideId == ConstGuideId.SUIT_SYNTHETIC_GUIDE)
                     {
                         GuideController.TryGuideStoryChapterViewBtnHome(_ui.m_btnHome);
+                        // Timers.inst.Remove(UpdateToCheckGuide);
+
+                    }
+                    else if (GuideDataManager.GetGuideCount(ConstGuideId.PHOTOGRAPH_GUIDE) <= 0)
+                    {
+                        GuideController.TryGuideGoBackStoryChapter1(_ui.m_btnHome);
                     }
+
                     else if (GuideDataManager.GetGuideCount(ConstGuideId.CARD_UP_STAR) <= 0)
                     {
                         GuideController.TryGuideStoryLevelInfoBtnHome(_ui.m_btnHome);
+                        // Timers.inst.Remove(UpdateToCheckGuide);
+
                     }
                 }
             }

+ 2 - 1
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs

@@ -433,13 +433,14 @@ namespace GFGGame
 
         private void Skip(object param = null)
         {
-            EventAgent.RemoveEventListener(ConstMessage.CARD_SKILL, CircleScoreStart);
             Reset();
             this.Hide();
             ViewManager.Show(ViewName.STORY_FIGHT_RESULT_VIEW);
         }
         private void Reset()
         {
+            EventAgent.RemoveEventListener(ConstMessage.CARD_SKILL, CircleScoreStart);
+
             _ui.m_proScore.target.max = 100;
             _ui.m_proScore.target.value = 0;
 

+ 2 - 0
GameClient/Assets/Game/HotUpdate/Views/MainStory/StorySkillView.cs

@@ -14,6 +14,8 @@ namespace GFGGame
             _ui = UI_StorySkillUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            // this.modal = false;
+
         }
         protected override void OnShown()
         {

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/MainStory/StroyFightResultView.cs

@@ -175,7 +175,7 @@ namespace GFGGame
             {
                 txt = "你太厉害了,初次对战就获得了这么好的战绩,继续加油吧";
             }
-            GuideController.TryGuideByGuideId(null, ConstGuideId.CHAPTER_RESULT_VIEW, 2, false, txt, targetY);
+            GuideController.TryGuideByGuideId(null, ConstGuideId.TARGET_FIGHT_GUIDE, 2, false, txt, targetY);
         }
 
     }

+ 6 - 1
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -303,10 +303,15 @@ namespace GFGGame
                 {
                     GuideController.TryGuideMainUIViewBtnXiuFang(_ui.m_btnXiuFang.target);
                 }
-                else if (GuideDataManager.GetGuideCount(ConstGuideId.SUIT_SYNTHETIC_GUIDE) > 0 && GuideDataManager.GetGuideCount(ConstGuideId.CARD_UP_STAR) <= 0)
+                else if (GuideDataManager.GetGuideCount(ConstGuideId.SUIT_SYNTHETIC_GUIDE) > 0 && GuideDataManager.GetGuideCount(ConstGuideId.PHOTOGRAPH_GUIDE) <= 0)
+                {
+                    GuideController.TryGuideOpenDressUpView(_ui.m_btnHuanZhuang.target);
+                }
+                else if (GuideDataManager.GetGuideCount(ConstGuideId.PHOTOGRAPH_GUIDE) > 0 && GuideDataManager.GetGuideCount(ConstGuideId.CARD_UP_STAR) <= 0)
                 {
                     GuideController.TryGuideMainUIViewBtnCiPai(_ui.m_btnCiPai.target);
                 }
+
             }
         }
     }

+ 3 - 1
GameClient/Assets/Game/HotUpdate/Views/XiuFang/XiuFangView.cs

@@ -48,7 +48,9 @@ namespace GFGGame
 
         private void OnClickBtnClothingShop()
         {
-            ViewManager.Show(ViewName.CLOTHING_SHOP_VIEW, null, null, false, true);
+            ViewManager.Show(ViewName.CLOTHING_SHOP_VIEW, null, new object[] { ViewName.XIU_FANG_VIEW, this.viewData }, false, true);
+            this.Hide();
+
         }
 
         private void OnClickBtnSuitSynthetic()

BIN
GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes


BIN
GameClient/Assets/ResIn/UI/DressUp/DressUp_fui.bytes