zhaoyang 3 lat temu
rodzic
commit
4bc8153438

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

@@ -9,10 +9,13 @@ namespace GFGGame
         public const string TARGET_FIGHT = "TARGET_FIGHT";
         public const string LUCKY_BOX = "LUCKY_BOX";
         public const string FREEDOM_DRESS = "FREEDOM_DRESS";
+        public const string CLOTHING_DECOMPOSE = "CLOTHING_DECOMPOSE";
         public const string CLOTHING_SYNTHETIC = "CLOTHING_SYNTHETIC";
+
         public const string SKILL_CARD_FIGHT = "SKILL_CARD_FIGHT";
         public const string OPEN_TAGS = "OPEN_TAGS";
         public const string UP_CARD_STAR = "UP_CARD_STAR";
+        public const string UP_CARD_LV = "UP_CARD_LV";
         public const string PHOTOGRAPH = "PHOTOGRAPH";
         public const string FIRST_FIGHT_FAILED = "FIRST_FIGHT_FAILED";
         public const string FIRST_FIGHT_SINGLE_WIN = "FIRST_FIGHT_SINGLE_WIN";

+ 1 - 1
GameClient/Assets/Game/HotUpdate/DressUp/DressUpObjDataCache.cs

@@ -110,7 +110,7 @@ namespace GFGGame
                 StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_AUTO_PLAY, _autoPlay == true ? 1 : 0).Coroutine();
             }
         }
-        public int maxFightSpeed = 2;
+        public int maxFightSpeed = 8;
         private int _fightSpeed = 1;
         public int fightSpeed
         {

+ 9 - 4
GameClient/Assets/Game/HotUpdate/ServerProxy/InstanceZonesSProxy.cs

@@ -39,8 +39,8 @@ namespace GFGGame
                     List<ItemData> bonusList = StoryBonusDataCache.GetBonusList(response.LevelCfgId, true, true);
                     BonusController.TryShowBonusList(bonusList);
                     InstanceZonesDataManager.TrySetLevelPass(response.LevelCfgId);
-                    FunctionOpenDataManager.Instance.CheckHasChapterFunOpen(response.LevelCfgId);//首次通过要检查是否有功能开启
                     InstanceZonesController.OnFinishStoryLevel(levelCfgId, true, true);
+                    FunctionOpenDataManager.Instance.CheckHasChapterFunOpen(response.LevelCfgId);//首次通过要检查是否有功能开启
                     return;
                 }
             }
@@ -56,8 +56,9 @@ namespace GFGGame
                 LevelCfgId = levelCfgId,
                 Score = score,
                 NpcScore = npcScore,
-                UseRecommend = useRecomend
+                UseRecommend = false
             });
+            bool ifFirstFinish = false;
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)
@@ -78,8 +79,7 @@ namespace GFGGame
 
                     if (response.HasOnceBonus)
                     {
-                        //首次通过要检查是否有功能开启
-                        FunctionOpenDataManager.Instance.CheckHasChapterFunOpen(response.LevelCfgId);
+                        ifFirstFinish = true;
                     }
                     InstanceZonesDataManager.TrySetLevelPass(response.LevelCfgId);
                     ViewManager.Show(ViewName.STORY_FIGHT_RESULT_VIEW, new StoryFightResultData
@@ -94,6 +94,11 @@ namespace GFGGame
                 }
             }
             InstanceZonesController.OnFinishStoryLevel(levelCfgId, false, false);
+            if (ifFirstFinish)
+            {
+                //首次通过要检查是否有功能开启
+                FunctionOpenDataManager.Instance.CheckHasChapterFunOpen(response.LevelCfgId);
+            }
         }
 
         //剧情战斗关卡失败,更新最高分

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Card/CardDetailView.cs

@@ -142,7 +142,7 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            GuideController.TryGuide(_ui.m_listCard, ConstGuideId.UP_CARD_STAR, 3, "选择可升星的词牌", 0);
+            GuideController.TryGuide(_ui.m_listCard, ConstGuideId.UP_CARD_LV, 3, "选择可升级的词牌", 0);
         }
     }
 }

+ 3 - 3
GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -760,9 +760,9 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(_ui.m_ComFosterBottom.m_btnStar, ConstGuideId.UP_CARD_STAR, 4, "选择升星");
-            GuideController.TryGuide(_ui.m_ComFosterBottom.m_btnUpStar, ConstGuideId.UP_CARD_STAR, 5, "升满5星后,可解锁词牌的隐藏卡面哦");
-            GuideController.TryCompleteGuide(ConstGuideId.UP_CARD_STAR, 5);
+            GuideController.TryGuide(_ui.m_ComFosterBottom.m_listLvConsume, ConstGuideId.UP_CARD_LV, 4, "长按材料图标,可持续给词牌增加经验", 0);
+            // GuideController.TryGuide(_ui.m_ComFosterBottom.m_btnUpStar, ConstGuideId.UP_CARD_STAR, 5, "升满5星后,可解锁词牌的隐藏卡面哦");
+            GuideController.TryCompleteGuide(ConstGuideId.UP_CARD_LV, 4);
         }
     }
 }

+ 13 - 0
GameClient/Assets/Game/HotUpdate/Views/ClothingDecompose/ClothingDecomposeView.cs

@@ -268,5 +268,18 @@ namespace GFGGame
         {
             ViewManager.GoBackFrom(typeof(ClothingDecomposeView).FullName);
         }
+
+        protected override void UpdateToCheckGuide(object param)
+        {
+
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+
+
+            GuideController.TryGuide(_ui.m_list, ConstGuideId.CLOTHING_DECOMPOSE, 4, "选择重复获得的服饰部件", 0);
+            GuideController.TryGuide(_ui.m_btnDecompose, ConstGuideId.CLOTHING_DECOMPOSE, 5, "分解获得的材料可用于新服饰合成");
+            GuideController.TryCompleteGuide(ConstGuideId.CLOTHING_DECOMPOSE, 5);
+            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.CLOTHING_SYNTHETIC, 1, "回到绣坊界面");
+
+        }
     }
 }

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

@@ -383,15 +383,15 @@ namespace GFGGame
             }
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            GuideController.TryGuide(_ui.m_listClothing, ConstGuideId.CLOTHING_SYNTHETIC, 8, "找到需要合成的物品", 0);
+            GuideController.TryGuide(_ui.m_listClothing, ConstGuideId.CLOTHING_SYNTHETIC, 4, "找到需要合成的物品", 0);
             if (_ui.m_listMaterias.numChildren > 0)
             {
                 listTypeItem_CloSynthetic = UI_MateriasListItem.Proxy(_ui.m_listMaterias.GetChildAt(0));
 
             }
-            if (listTypeItem_CloSynthetic != null) GuideController.TryGuide(listTypeItem_CloSynthetic.m_loaderIcon, ConstGuideId.CLOTHING_SYNTHETIC, 9, "这里可以查看合成需要的材料,和材料的获取途径");
-            GuideController.TryGuide(_ui.m_btnProduction, ConstGuideId.CLOTHING_SYNTHETIC, 10, "点击合成物品");
-            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.CLOTHING_SYNTHETIC, 11, "获得必需品啦,继续通关主线剧情吧", -1, true, 180);
+            if (listTypeItem_CloSynthetic != null) GuideController.TryGuide(listTypeItem_CloSynthetic.m_loaderIcon, ConstGuideId.CLOTHING_SYNTHETIC, 5, "这里可以查看合成需要的材料,和材料的获取途径");
+            GuideController.TryGuide(_ui.m_btnProduction, ConstGuideId.CLOTHING_SYNTHETIC, 6, "点击获得新的服饰");
+            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.CLOTHING_SYNTHETIC, 7, "获得必需品啦,继续通关主线剧情吧", -1, true, 180);
         }
     }
 }

+ 6 - 6
GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/SuitSyntheticView.cs

@@ -171,12 +171,12 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            int storyLevelId = GuideCfgArray.Instance.GetCfg(ConstGuideId.CLOTHING_SYNTHETIC).storyLevelId;
-            string fightID = StoryLevelCfgArray.Instance.GetCfg(storyLevelId).fightID;
-            int itemId = StoryFightCfgArray.Instance.GetCfg(fightID).needItemId;
-            int suitId = ItemCfgArray.Instance.GetCfg(itemId).suitId;
-            int index = _suitListIds.IndexOf(suitId);
-            GuideController.TryGuide(_ui.m_listSuit, ConstGuideId.CLOTHING_SYNTHETIC, 7, "查看已解锁的图谱", index);
+            // int storyLevelId = GuideCfgArray.Instance.GetCfg(ConstGuideId.CLOTHING_SYNTHETIC).storyLevelId;
+            // string fightID = StoryLevelCfgArray.Instance.GetCfg(storyLevelId).fightID;
+            // int itemId = StoryFightCfgArray.Instance.GetCfg(fightID).needItemId;
+            // int suitId = ItemCfgArray.Instance.GetCfg(itemId).suitId;
+            // int index = _suitListIds.IndexOf(suitId);
+            GuideController.TryGuide(_ui.m_listSuit, ConstGuideId.CLOTHING_SYNTHETIC, 3, "查看已解锁的图谱", 0);
         }
     }
 }

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -111,7 +111,7 @@ namespace GFGGame
             InstanceZonesDataManager.usedRecommend = false;
             // _ui.m_comboBox.title = "我的套装";
             _ui.m_txtRecommendCount.SetVar("v1", "" + GameGlobal.myNumericComponent.GetAsInt(ET.NumericType.RecommendCount)).FlushVars();
-            _ui.m_btnRecommend.enabled = GameGlobal.myNumericComponent.GetAsInt(ET.NumericType.RecommendCount) > 0;
+            // _ui.m_btnRecommend.enabled = GameGlobal.myNumericComponent.GetAsInt(ET.NumericType.RecommendCount) > 0;
             _scoreIndex = _ui.m_partsList.m_comboBoxRarity.selectedIndex;
             _ui.m_btnAutoPlay.selected = EquipDataCache.cacher.autoPlay;
             _ui.m_btnAutoPlay.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(ConstFunctionId.FUNCTION_AUTOPLAY_FIGHT, false);
@@ -970,7 +970,7 @@ namespace GFGGame
             GuideController.TryGuide(_ui.m_btnNext, ConstGuideId.SINGLE_FIGHT, 8, "穿着完毕,来验证一下,换上的服饰是否符合需求");
 
             GuideController.TryGuide(_ui.m_compNeed.target, ConstGuideId.BUY_CLOTHING, 1, "当提示有“必需品”时,需要穿上对应物品才能通关", -1, true, 170);
-            GuideController.TryGuide(_ui.m_comListType1.m_listType, ConstGuideId.BUY_CLOTHING, 5, "按照指示就可以找到必需品啦", buyClothingIndex, true, (int)listTypeItem_BuyClothing.target.y);
+            GuideController.TryGuide(_ui.m_comListType1.m_listType, ConstGuideId.BUY_CLOTHING, 5, "按照指示就可以找到必需品啦", buyClothingIndex);
             GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.BUY_CLOTHING, 6, "点击换上吧", buyClothingIdIndex, true, 170);
             GuideController.TryCompleteGuide(ConstGuideId.BUY_CLOTHING, 6);
 

+ 9 - 0
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterListView.cs

@@ -160,5 +160,14 @@ namespace GFGGame
             }
         }
 
+        protected override void UpdateToCheckGuide(object param)
+        {
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+
+            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.CLOTHING_DECOMPOSE, 1, "点击返回主界面");
+            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.UP_CARD_LV, 1, "点击返回主界面");
+
+        }
+
     }
 }

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

@@ -251,10 +251,10 @@ namespace GFGGame
             GuideController.TryGuide(_unPasslevelItem, ConstGuideId.SINGLE_FIGHT, 1, "遇到意外事件了,暂时解释不清,先按请求换上服饰吧");
             GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.LUCKY_BOX, 1, "点击返回主界面");
 
-            GuideController.TryGuide(_unPasslevelItem, ConstGuideId.CLOTHING_SYNTHETIC, 1, "点击下一关");
-            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.CLOTHING_SYNTHETIC, 4, "先回到主界面");
+            // GuideController.TryGuide(_unPasslevelItem, ConstGuideId.CLOTHING_SYNTHETIC, 1, "点击下一关");
+            // GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.CLOTHING_SYNTHETIC, 4, "先回到主界面");
 
-            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.UP_CARD_STAR, 1, "点击返回主界面");
+            // GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.UP_CARD_STAR, 1, "点击返回主界面");
 
             GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.PHOTOGRAPH, 1, "拍照功能已开启,解锁更多搭配和玩法哦");
 

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

@@ -21,7 +21,7 @@ namespace GFGGame
         private const float _prefectScale = 60f;//完美缩放比
         private float _time = 0;// 登峰造极按住的时间
 
-        private float _playTime = 2.3f / 2;
+        private float _playTime = 2.3f;
         private bool _stopFight = false;
 
         private GameObject _gameObject0;

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

@@ -214,7 +214,7 @@ namespace GFGGame
             _ui.m_proScore.m_txtMineScore.text = RoleDataManager.roleName + "0";
             _ui.m_btnBack.visible = true;
 
-            _speed = EquipDataCache.cacher.fightSpeed;
+            _speed =EquipDataCache.cacher.fightSpeed;
             if (_levelCfg.type == ConstInstanceZonesType.Field)
             {
                 _speed = EquipDataCache.cacher.fieldFightSpeed;

+ 5 - 5
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryLevelInfoView.cs

@@ -266,11 +266,11 @@ namespace GFGGame
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
             GuideController.TryGuide(_ui.m_btnStart, ConstGuideId.SINGLE_FIGHT, 2, "点击开启换装");
-            if (GuideController.TryGuide(_ui.m_txtNeed, ConstGuideId.CLOTHING_SYNTHETIC, 2, "这次必需品,要通过合成获得"))
-            {
-                _ui.m_btnStart.touchable = false;
-            }
-            GuideController.TryGuide(null, ConstGuideId.CLOTHING_SYNTHETIC, 3, "点击空白处关闭", -1, true, (int)(this.viewCom.y + _ui.m_txtPowerDesc.y), 0, 0, false);
+            // if (GuideController.TryGuide(_ui.m_txtNeed, ConstGuideId.CLOTHING_SYNTHETIC, 2, "这次必需品,要通过合成获得"))
+            // {
+            //     _ui.m_btnStart.touchable = false;
+            // }
+            // GuideController.TryGuide(null, ConstGuideId.CLOTHING_SYNTHETIC, 3, "点击空白处关闭", -1, true, (int)(this.viewCom.y + _ui.m_txtPowerDesc.y), 0, 0, false);
             GuideController.TryGuide(_ui.m_listTag, ConstGuideId.OPEN_TAGS, 1, "选择相应的关卡标签,可提高分数", -1, true, 0);
             GuideController.TryCompleteGuide(ConstGuideId.OPEN_TAGS, 1);
 

+ 10 - 3
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -241,9 +241,14 @@ namespace GFGGame
             // Timers.inst.Add(effectTime, 1, (param) =>
             // {
             //     _ui.m_btnDailyLogin.m_holder.visible = false;
+            // List<string> list = new List<string>();
+            // list.Add("StudioView");
+            // list.Add("XiuFangView");
+            // ViewManager.Show<FunctionOpenView>(list);
             ViewManager.Show<DailyLoginView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
             //     isOpen = false;
             // });
+
         }
         private void OnClickBtnCiPai()
         {
@@ -368,10 +373,12 @@ namespace GFGGame
             GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 6);
             GuideController.TryGuide(_ui.m_btnHuanZhuang.target, ConstGuideId.FREEDOM_DRESS, 2, "在这里,可以自由搭配服饰和分享哦~", -1, false);
 
-            GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.CLOTHING_SYNTHETIC, 5, "绣坊里增添了新功能", -1, true);
-            GuideController.TryCompleteGuide(ConstGuideId.CLOTHING_SYNTHETIC, 11);
+            GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.CLOTHING_DECOMPOSE, 2, "绣坊里增添了新功能", -1, false);
+
+            GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.CLOTHING_SYNTHETIC, 1, "进入绣坊界面", -1, false);
+            GuideController.TryCompleteGuide(ConstGuideId.CLOTHING_SYNTHETIC, 7);
 
-            GuideController.TryGuide(_ui.m_btnCiPai.target, ConstGuideId.UP_CARD_STAR, 2, "已经收集了足够的材料,可以给词牌升星了", -1, false);
+            GuideController.TryGuide(_ui.m_btnCiPai.target, ConstGuideId.UP_CARD_LV, 2, "获得了一张“词牌”,点击查看", -1, false);
             GuideController.TryGuide(_ui.m_btnHuanZhuang.target, ConstGuideId.PHOTOGRAPH, 2, "点这里看看吧", -1, false);
 
         }

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

@@ -35,6 +35,13 @@ namespace GFGGame
             base.OnShown();
 
             _ui.m_component.target.scrollPane.SetPosX(0, false);
+            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.CLOTHING_DECOMPOSE);
+            if (GuideDataManager.currentGuideId == cfg.id)
+            {
+                // _ui.m_component.target.scrollPane.ScrollLeft();// SetPosX(0, false);
+                _ui.m_component.target.scrollPane.SetPosX(320, false);
+
+            }
         }
 
         protected override void OnHide()
@@ -76,7 +83,9 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            GuideController.TryGuide(_ui.m_component.m_btnSuitSynthetic, ConstGuideId.CLOTHING_SYNTHETIC, 6, "这里可以查看已获得的服饰图谱");
+            GuideController.TryGuide(_ui.m_component.m_btnSuitSynthetic, ConstGuideId.CLOTHING_SYNTHETIC, 2, "这里可以查看已获得的服饰图谱");
+
+            GuideController.TryGuide(_ui.m_component.m_btnDecompose, ConstGuideId.CLOTHING_DECOMPOSE, 3, "这里可以消耗重复获得的服饰");
 
         }
 

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