r.nikolin
/
rabidus-test
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp

This commit is contained in:
Кичигин Алексей 2023-10-30 17:52:57 +03:00
parent acd4a5e193 c8f7b198a2
commit 374781f089
5 changed files with 692 additions and 943 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Assets/BNG Framework/Scripts/UI/UIButtonCollider.cs
View File

@ -46,6 +46,7 @@ namespace BNG {
if (boxCollider) { if (boxCollider) {
colliderInitialCenterZ = boxCollider.center.z; colliderInitialCenterZ = boxCollider.center.z;
} }
CanBeHeldDown = false;
} }
void Update() { void Update() {

4
Assets/Prefabs/Player.prefab
View File

@ -1360,7 +1360,7 @@ MonoBehaviour:
m_enableAutoSizing: 1 m_enableAutoSizing: 1
m_fontSizeMin: 18 m_fontSizeMin: 18
m_fontSizeMax: 116.62 m_fontSizeMax: 116.62
m_fontStyle: 0 m_fontStyle: 1
m_HorizontalAlignment: 2 m_HorizontalAlignment: 2
m_VerticalAlignment: 512 m_VerticalAlignment: 512
m_textAlignment: 65535 m_textAlignment: 65535
@ -16870,7 +16870,7 @@ MonoBehaviour:
m_enableAutoSizing: 1 m_enableAutoSizing: 1
m_fontSizeMin: 18 m_fontSizeMin: 18
m_fontSizeMax: 116.62 m_fontSizeMax: 116.62
m_fontStyle: 0 m_fontStyle: 1
m_HorizontalAlignment: 2 m_HorizontalAlignment: 2
m_VerticalAlignment: 512 m_VerticalAlignment: 512
m_textAlignment: 65535 m_textAlignment: 65535

1625
Assets/Scenes/ResultScene.unity
View File

File diff suppressed because one or more lines are too long

3
Assets/Scripts/CutsceneController.cs
View File

@ -17,7 +17,7 @@ public class CutsceneController : MonoBehaviour
private void Awake() private void Awake()
{ {
_shipMoveSides = FindObjectOfType<ShipPathFollower>().GetComponent<ShipMoveSides>(); _shipMoveSides = FindObjectOfType<PlayerInputHandler>().GetComponent<ShipMoveSides>();
_previewModule = FindObjectOfType<PreviewModule>(); _previewModule = FindObjectOfType<PreviewModule>();
} }
@ -28,6 +28,7 @@ public class CutsceneController : MonoBehaviour
private IEnumerator CutsceneCoroutine() private IEnumerator CutsceneCoroutine()
{ {
Debug.Log("Cutscene Coroutine");
_shipMoveSides.ToggleInput(false); _shipMoveSides.ToggleInput(false);
_previewModule.TogglePanel(true); _previewModule.TogglePanel(true);
_cutscene.Play(); _cutscene.Play();

2
Assets/Scripts/FinishController.cs
View File

@ -13,7 +13,7 @@ public class FinishController : MonoBehaviour
private void Awake() private void Awake()
{ {
_moveSides = FindObjectOfType<ShipMoveSides>(); _moveSides = FindObjectOfType<PlayerInputHandler>().GetComponent<ShipMoveSides>();
_vTimerCounter = FindObjectOfType<vTimerCounter>(); _vTimerCounter = FindObjectOfType<vTimerCounter>();
_monumentController = FindObjectOfType<MonumentController>(); _monumentController = FindObjectOfType<MonumentController>();
} }