Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2019-05-21 36452c203b971a725cfb0001593d7c864bce0ad6

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 Fight/Stage/Dungeon/DungeonStage.cs

@@ -56,11 +56,9 @@
        }



        WindowCenter.Instance.Open<MainInterfaceWin>(true);



        if (PlayerDatas.Instance.baseData.LV == 1 && !CreateRolePostProcessor.HasPlayMovie((int)PlayerDatas.Instance.baseData.PlayerID))

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();

            CameraController.Instance.CameraObject.enabled = false;

            CreateRolePostProcessor.Begin(() =>

            {

                CreateRolePostProcessor.RecordPlayMovie((int)PlayerDatas.Instance.baseData.PlayerID);


 System/CreateRolePostProcess/CreateRolePostProcessor.cs

@@ -23,27 +23,31 @@
        onEnd = onComplete;
        isSkiped = false;

        var uiroot = WindowCenter.Instance.uiRoot;
        uiroot.EnableCanvas(false, uiroot.baseCanvas,
                              uiroot.lifeBarCanvas,
                              uiroot.nameCanvas,
                              uiroot.normalCanvas,
                              uiroot.modalCanvas,
                              uiroot.tipsCanvas,
                              uiroot.systemCanvas,
                              uiroot.recycleBin,
                              uiroot.fightCanvasGroup.damageNumGroups[0].parent);

        WindowCenter.Instance.Open<CreateRoleMovieSkipWin>();
        CameraController.Instance.CameraObject.enabled = false;

        if (Application.isEditor)
        {
            var uiroot = WindowCenter.Instance.uiRoot;
            uiroot.EnableCanvas(false, uiroot.baseCanvas,
                                  uiroot.lifeBarCanvas,
                                  uiroot.nameCanvas,
                                  uiroot.normalCanvas,
                                  uiroot.modalCanvas,
                                  uiroot.tipsCanvas,
                                  uiroot.systemCanvas,
                                  uiroot.recycleBin,
                                  uiroot.fightCanvasGroup.damageNumGroups[0].parent);

            WindowCenter.Instance.Open<CreateRoleMovieSkipWin>();
            PlayMovie();
        }
        else
        {
            CameraManager.uiCamera.enabled = false;
            WindowCenter.Instance.Close<LoadingWin>();
            CameraManager.uiCamera.backgroundColor = Color.black;
            CameraManager.uiCamera.clearFlags = CameraClearFlags.SolidColor;
            Clock.AlarmAfter(0.1f, PlayMovie);
        }

        PlayMovie();
    }

    public static void Skip()
@@ -59,7 +63,7 @@
            case RuntimePlatform.Android:
            case RuntimePlatform.IPhonePlayer:
                Handheld.PlayFullScreenMovie("CreateRoleMovie.mp4", Color.black, FullScreenMovieControlMode.CancelOnInput, FullScreenMovieScalingMode.AspectFit);
                Clock.AlarmAfter(0.1f, () => { PlayCameraAnimation(); });
                Clock.AlarmAfter(0.1f, PlayCameraAnimation);
                break;
            case RuntimePlatform.WindowsPlayer:
                MoviePlayer.Instance.Play("CreateRoleMovie", PlayCameraAnimation);
@@ -73,6 +77,7 @@

    static void PlayCameraAnimation()
    {
        CameraManager.uiCamera.clearFlags = CameraClearFlags.Depth;
        CameraController.Instance.CameraObject.enabled = true;
        CameraController.Instance.PlayAnimationClip("KC_Camera");
        var logicUpdate = new LogicUpdate();
@@ -88,28 +93,22 @@

    static void OnStop()
    {
        if (Application.isEditor)
        {
            var uiroot = WindowCenter.Instance.uiRoot;
            uiroot.EnableCanvas(true, uiroot.baseCanvas,
                                          uiroot.lifeBarCanvas,
                                          uiroot.nameCanvas,
                                          uiroot.normalCanvas,
                                          uiroot.modalCanvas,
                                          uiroot.tipsCanvas,
                                          uiroot.systemCanvas,
                                          uiroot.recycleBin,
                                          uiroot.fightCanvasGroup.damageNumGroups[0].parent);
        var uiroot = WindowCenter.Instance.uiRoot;
        uiroot.EnableCanvas(true, uiroot.baseCanvas,
                                      uiroot.lifeBarCanvas,
                                      uiroot.nameCanvas,
                                      uiroot.normalCanvas,
                                      uiroot.modalCanvas,
                                      uiroot.tipsCanvas,
                                      uiroot.systemCanvas,
                                      uiroot.recycleBin,
                                      uiroot.fightCanvasGroup.damageNumGroups[0].parent);

            WindowCenter.Instance.Close<CreateRoleMovieSkipWin>();
        }
        else
        {
            CameraManager.uiCamera.enabled = false;
        }
        WindowCenter.Instance.Close<CreateRoleMovieSkipWin>();

        var sendInfo = new CA108_tagCMRefreshMainServerRole();
        GameNetSystem.Instance.SendInfo(sendInfo);
        CameraController.Instance.CameraObject.enabled = true;
        if (onEnd != null)
        {
            onEnd();

 System/MainWin/SkillButton.cs

@@ -70,8 +70,10 @@
                m_Icon.SetSprite(skillConfig.IconName);
            }

            DisplaySkillDynamicInfo(true);
            m_CoolDown.gameObject.SetActive(false);
            m_CoolDownMask.gameObject.SetActive(false);
            m_Selected.gameObject.SetActive(false);
            DisplaySkillDynamicInfo(true);
            HideSkillTip();

            this.enabled = true;