10331 【越南】【英语】【BT】【砍树】境界修改 - 引导增加点击其他区域立即结束引导

hch

2025-01-07 3fffb6ea6b378f441cb81d6bff247110c160682e

10331 【越南】【英语】【BT】【砍树】境界修改 - 引导增加点击其他区域立即结束引导

 System/Equip/RealmEquipWin.cs

@@ -36,6 +36,8 @@

        protected override void BindController()
        {
            var canvas = m_SuitPropertyWidget.GetComponent<Canvas>();
            canvas.sortingLayerName = "UI";
        }

        protected override void AddListeners()
@@ -50,8 +52,13 @@
        {
            if (m_SuitPropertyWidget.gameObject.activeSelf)
                m_SuitPropertyWidget.SetActive(false);
            else
            else

            {

                var level = model.selectedLevel.Fetch();
                var eightSuitLevel = model.GetSuitLevel(level, EquipSuitType.EightSuit);
                m_SuitPropertyWidget.Init(level, eightSuitLevel);
                m_SuitPropertyWidget.SetActive(true);
            }
        }

        protected void TriggerLast()

 System/NewBieGuidance/NewBieGuideScriptableObject.cs

@@ -22,6 +22,7 @@
    public int usherAction;
    public bool clickAnyWhereComplete = false;
    public bool pointerDownComplete = false;
    public bool clickOthersComplete = false;

    public enum ArrowPosition
    {

 System/NewBieGuidance/NewBieWin.cs

@@ -9,7 +9,6 @@
using UnityEngine;

using UnityEngine.UI;



using UnityEngine.EventSystems;



namespace vnxbqy.UI

{

@@ -56,7 +55,7 @@
        protected override void OnPreOpen()

        {

            m_ClickTarget = null;



            m_NewBieMask.SetActive(true);

            m_NewFunction.SetActive(false);

            m_NewBieGuide.SetActive(false);

            m_RaycasterMask.SetActive(true);

@@ -76,6 +75,7 @@
                UnAttachTrigger();

                m_ClickTarget = null;

                NewBieCenter.Instance.FinishCurrentGuideWithoutCloseWin();

                stepConfig = null;

            }

        }



@@ -146,11 +146,13 @@
            NewBieCenter.Instance.FinishNewBieGuide(NewBieCenter.Instance.currentGuide);

        }



        NewBieGuideScriptableObject stepConfig;

        private void DisplayGuide()

        {

            var config = GuideConfig.Get(NewBieCenter.Instance.currentGuide);

            m_Skip.SetActive(config.CanSkip == 1);

            m_Effect2.Stop();

            stepConfig = null;

            StartCoroutine(Co_DisplayGuide());

        }



@@ -203,7 +205,7 @@
            }



            var step = NewBieCenter.Instance.guideStep;

            var stepConfig = ScriptableObjectLoader.LoadSoNewBieGuideStep(step);

            stepConfig = ScriptableObjectLoader.LoadSoNewBieGuideStep(step);



            var timer = 0f;

            while (m_ClickTarget == null)

@@ -233,7 +235,9 @@
            m_RaycasterMask.SetActive(false);

            m_NewBieGuide.SetActive(true);





            m_NewBieMask.Display(step);



            m_Dialogue.text = stepConfig.GetTipContent(GuideType.NewBie);

            m_ContainerDialogue.transform.localPosition = stepConfig.tipPosition;



@@ -327,9 +331,33 @@
            {

                m_NewBieMask.mask.center = m_NewBieMask.mask.transform.InverseTransformPoint(m_ClickTarget.position);

                m_ClickHintRoot.position = m_ClickTarget.position;

                if (stepConfig != null && stepConfig.clickOthersComplete)

                {

                    m_NewBieMask.SetActive(false);

                }

                else

                {

                    m_NewBieMask.SetActive(true);

                }

            }



            ClickOtherFinish();

        }



        private void ClickOtherFinish()

        {

            if (stepConfig != null && stepConfig.clickOthersComplete && Input.GetMouseButtonDown(0))

            {

                var sp = Input.mousePosition;

                if (!RectTransformUtility.RectangleContainsScreenPoint(m_ClickHintRoot, sp, CameraManager.uiCamera))

                {

                    ReportStepOver();

                    return;

                }

            }

        }





        private void FindAndAttachTrigger(NewBieGuideScriptableObject _stepConfig)

        {

            m_ClickTarget = WindowCenter.Instance.uiRoot.transform.Find(_stepConfig.UIElementPath);