Skip to content

Commit

Permalink
빌드를 위한 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
ddayin committed Feb 6, 2025
1 parent 9ed490e commit 9a292e3
Show file tree
Hide file tree
Showing 8 changed files with 134 additions and 290 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Build
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,10 @@ MonoBehaviour:
DoFResolution: 040000000200000001000000
DoFHighQualityFiltering: 000101
DoFPhysicallyBased: 000000
AdaptiveSamplingWeight:
- 0.5
- 0.75
- 2
LimitManualRangeNearBlur: 000000
MotionBlurSampleCount: 04000000080000000c000000
BloomRes: 040000000200000002000000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,23 @@ MonoBehaviour:
- rid: 279004926962303007
- rid: 279004926962303008
m_RuntimeSettings:
m_List: []
m_List:
- rid: 279004926962302976
- rid: 279004926962302977
- rid: 279004926962302982
- rid: 279004926962302983
- rid: 279004926962302984
- rid: 279004926962302986
- rid: 279004926962302989
- rid: 279004926962302990
- rid: 279004926962302991
- rid: 279004926962302993
- rid: 279004926962302994
- rid: 279004926962302996
- rid: 279004926962302997
- rid: 279004926962303000
- rid: 279004926962303004
- rid: 279004926962303008
renderingLayerNames:
- Light Layer default
- Light Layer 1
Expand Down
8 changes: 6 additions & 2 deletions DivisionLike/Assets/Scripts/IntroScene/IntroGUI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ private void OnClickMultiButton()

private void OnClickTrainingButton()
{
SceneController.instance.LoadScene(SceneName.Training);
//SceneController.instance.LoadScene(SceneName.Training);
}

private void OnClickOptionButton()
Expand Down Expand Up @@ -141,7 +141,8 @@ public void LoadPlayScene(bool isFreeAssets)

IEnumerator LoadScene(bool isFreeAssets)
{
SceneName sceneName = SceneName.PlayPaidAssets;
/*SceneName sceneName = SceneName.PlayPaidAssets;
if (isFreeAssets == true)
{
sceneName = SceneName.PlayFreeAssets;
Expand Down Expand Up @@ -170,6 +171,9 @@ IEnumerator LoadScene(bool isFreeAssets)
yield break;
}
}
*/

yield break;
}

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion DivisionLike/Assets/Scripts/Managers/PauseManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ private void ShowMouseCursor(bool isShow)
private void ReturnToIntroScene()
{
Time.timeScale = 1;
SceneController.instance.LoadScene(SceneName.Intro);
//SceneController.instance.LoadScene(SceneName.Intro);
}

/// <summary>
Expand Down
16 changes: 6 additions & 10 deletions DivisionLike/Assets/Scripts/Managers/SceneController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ public enum SceneName
/// <summary>
///
/// </summary>
None = -1,
//None = -1,

/// <summary>
/// 처음 인트로 화면
/// </summary>
Intro = 0,
//Intro = 0,

/// <summary>
/// 실제 인게임 플레이 화면 (무료 에셋 사용한 배경)
Expand All @@ -26,17 +26,12 @@ public enum SceneName
/// <summary>
/// 실제 인게임 플레이 화면 (유료 에셋 사용한 배경)
/// </summary>
PlayPaidAssets,
//PlayPaidAssets,

/// <summary>
/// 사격 훈련장
/// </summary>
Training,

/// <summary>
/// 인게임 플레이 화면의 GUI
/// </summary>
HUD
//Training
}

/// <summary>
Expand All @@ -49,7 +44,8 @@ public class SceneController : MonoBehaviour
/// <summary>
/// 현재 실행 중인 씬의 이름
/// </summary>
[SerializeField] private SceneName m_CurrentSceneName = SceneName.None;
//[SerializeField] private SceneName m_CurrentSceneName = SceneName.None;
[SerializeField] private SceneName m_CurrentSceneName = SceneName.PlayFreeAssets;

public SceneName CurrentScene
{
Expand Down
Loading

0 comments on commit 9a292e3

Please sign in to comment.