引导

FGUIProject/assets/Guide/GuideUI.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" opaque="false">
   <displayList>
+    <graph id="n21_ofwu" name="grhMask" xy="0,0" size="1080,1920" visible="false" alpha="0.4" type="rect" lineSize="0" fillColor="#ff000000">
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
     <component id="n0" name="mask" src="tu96e" fileName="components/Component2.xml" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </component>

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

@@ -349,6 +349,9 @@ namespace GFGGame
                 GetSkillScore(FightRoleType.TAEGET, roundIndex, currentTime, partId, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore, mainScore, cardId, skillLvs, roundTime, ref score);
                 // Debug.Log(" targetScore444:" + targetScore);
             }
+            currentTime = BeginTime.ALL_PERFECT_START;
+            GetSkillScore(FightRoleType.MINE, roundIndex, currentTime, partId, mainScore, cardId, skillLvs, roundTime, ref score, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore);
+            GetSkillScore(FightRoleType.TAEGET, roundIndex, currentTime, partId, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore, mainScore, cardId, skillLvs, roundTime, ref score);
             score += ScoreSystemData.Instance.GetAllCircleAddScore(mainScore);
             targetScore += ScoreSystemData.Instance.GetAllCircleAddScore(targetMainScore);
             Debug.Log(" targetScore666:" + targetScore);

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Guide/UI_GuideUI.cs

@@ -7,6 +7,7 @@ namespace UI.Guide
     public partial class UI_GuideUI
     {
         public GComponent target;
+        public GGraph m_grhMask;
         public UI_Component2 m_mask;
         public GLoader m_loaMask;
         public UI_ComHolder m_comHolder;
@@ -58,6 +59,7 @@ namespace UI.Guide
 
         private void Init(GComponent comp)
         {
+            m_grhMask = (GGraph)comp.GetChild("grhMask");
             m_mask = (UI_Component2)UI_Component2.Create(comp.GetChild("mask"));
             m_loaMask = (GLoader)comp.GetChild("loaMask");
             m_comHolder = (UI_ComHolder)UI_ComHolder.Create(comp.GetChild("comHolder"));
@@ -65,6 +67,7 @@ namespace UI.Guide
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_grhMask = null;
             m_mask.Dispose();
             m_mask = null;
             m_loaMask = null;

GameClient/Assets/Game/HotUpdate/Views/Guide/GuideView.cs

@@ -72,12 +72,14 @@ namespace GFGGame
 
             _ui.m_mask.target.visible = false;
             _ui.m_loaMask.visible = false;
+            _ui.m_grhMask.visible = false;
             if (guideTarget != null)
             {
-
-                Timers.inst.AddUpdate(UpdateGuideRect);
-                _ui.m_mask.target.visible = true;
-                _ui.m_comHolder.target.visible = true;
+                _ui.m_grhMask.visible = true;
+                _ui.m_comHolder.target.visible = false;
+                Timers.inst.Add(0.3f, 1, UpdateTime);
+                // _ui.m_mask.target.visible = true;
+                // _ui.m_comHolder.target.visible = true;
                 guideTarget.onClick.Add(OnClickTarget);
             }
             else
@@ -128,7 +130,9 @@ namespace GFGGame
             base.OnHide();
             _ui.m_comHolder.target.visible = false;
             _ui.m_compTxt.target.visible = false;
+            _ui.m_grhMask.visible = true;
             guideTarget = null;
+            Timers.inst.Remove(UpdateTime);
             Timers.inst.Remove(UpdateGuideRect);
             Timers.inst.Remove(UpdateStudioMetalGuide);
             // EventAgent.DispatchEvent(ConstMessage.GUIDE_VIEW_HIDE);
@@ -159,7 +163,10 @@ namespace GFGGame
                 }
             }
         }
-
+        private void UpdateTime(object param = null)
+        {
+            Timers.inst.AddUpdate(UpdateGuideRect);
+        }
         private void UpdateGuideRect(object param = null)
         {
             if (guideTarget != null)
@@ -183,6 +190,8 @@ namespace GFGGame
                         _ui.m_comHolder.m_c1.selectedIndex = 1;//手在右边
                     }
                     _ui.m_comHolder.target.visible = !NoTips;
+                    _ui.m_mask.target.visible = !NoTips;
+                    _ui.m_grhMask.visible = NoTips;
                     _ui.m_compTxt.target.visible = !String.IsNullOrEmpty(txtContent);
 
 

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

@@ -279,6 +279,7 @@ namespace GFGGame
              || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_4) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_5) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_STAR) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.ARENA_OPEN) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.CLOTHING_DECOMPOSE) <= 0)
             {
                 UpdateToCheckGuide(null);

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -1082,7 +1082,7 @@ namespace GFGGame
 
                 GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.SUIT_LIST_VIEW, 1,
                     "获得“天衣”服饰后，可进行养护和焕新，到绣坊看看。", -1, false);
-                GuideController.TryGuide(_ui.m_loaRight.target, ConstGuideId.ARENA_OPEN, 2, "新玩法-飞花令开启了哦", -1, false);
+                GuideController.TryGuide(_ui.m_loaRight.target, ConstGuideId.ARENA_OPEN, 2, "新玩法-飞花令开启了哦", -1, true);
 
 
                 bool isStudioMetalGuide = GuideController.TryGuide(null, ConstGuideId.STUDIO_PORCELAIN, 2, "向左滑动界面。", -1,