Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2b9fd70c85 | ||
|
|
cd384239ff | ||
|
|
f3a83eb909 | ||
|
|
35f703a8d2 | ||
|
|
e5f4f292c2 | ||
|
|
efad72b4d9 |
No files matched your search
@@ -15,7 +15,7 @@ MonoBehaviour:
|
|||||||
m_DefaultGroup: d447fc60305c17a17bf20948ab295a45
|
m_DefaultGroup: d447fc60305c17a17bf20948ab295a45
|
||||||
m_currentHash:
|
m_currentHash:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
Hash: db97f0adbdaa5d76ea9341571ea44391
|
Hash: f3899bd8b96717b1b70a2db310a9fcf2
|
||||||
m_OptimizeCatalogSize: 0
|
m_OptimizeCatalogSize: 0
|
||||||
m_BuildRemoteCatalog: 0
|
m_BuildRemoteCatalog: 0
|
||||||
m_CatalogRequestsTimeout: 0
|
m_CatalogRequestsTimeout: 0
|
||||||
|
|||||||
+18
-25
@@ -15,21 +15,23 @@ MonoBehaviour:
|
|||||||
m_GroupName: Default Local Group
|
m_GroupName: Default Local Group
|
||||||
m_GUID: d447fc60305c17a17bf20948ab295a45
|
m_GUID: d447fc60305c17a17bf20948ab295a45
|
||||||
m_SerializeEntries:
|
m_SerializeEntries:
|
||||||
- m_GUID: 03e51c504fa7e0624ba855ec35b60bcc
|
|
||||||
m_Address: absolutely
|
|
||||||
m_ReadOnly: 0
|
|
||||||
m_SerializedLabels: []
|
|
||||||
FlaggedDuringContentUpdateRestriction: 0
|
|
||||||
- m_GUID: 111011400ce13ae859c52c757aef859e
|
|
||||||
m_Address: ahfreeman
|
|
||||||
m_ReadOnly: 0
|
|
||||||
m_SerializedLabels: []
|
|
||||||
FlaggedDuringContentUpdateRestriction: 0
|
|
||||||
- m_GUID: 144ab5188f8ad7a0a92c75703bd12e60
|
- m_GUID: 144ab5188f8ad7a0a92c75703bd12e60
|
||||||
m_Address: launch_upmenu1
|
m_Address: launch_upmenu1
|
||||||
m_ReadOnly: 0
|
m_ReadOnly: 0
|
||||||
m_SerializedLabels: []
|
m_SerializedLabels: []
|
||||||
FlaggedDuringContentUpdateRestriction: 0
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 16562a5c87213914cad415f10c65a3b0
|
||||||
|
m_Address: "Assets/Resources_moved/Audio/Music/LASKX3I - \u041F\u0440\u043E\u0442\u0438\u0432
|
||||||
|
\u0446\u0430\u0440\u044F (\u041A\u0430\u0440\u0430\u043E\u043A\u0435).mp3"
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 170b1a70ddee4d948abea041b9b805e4
|
||||||
|
m_Address: Assets/Resources_moved/Audio/Music/Half Life Original Soundtrack -
|
||||||
|
Track 8 - Diabolical Adrenaline Guitar.mp3
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
- m_GUID: 1d4767c722c05b5d6b96bb226d378c65
|
- m_GUID: 1d4767c722c05b5d6b96bb226d378c65
|
||||||
m_Address: Assets/Resources_moved/Prefabs/Player/ArmsMesh.prefab
|
m_Address: Assets/Resources_moved/Prefabs/Player/ArmsMesh.prefab
|
||||||
m_ReadOnly: 0
|
m_ReadOnly: 0
|
||||||
@@ -45,11 +47,6 @@ MonoBehaviour:
|
|||||||
m_ReadOnly: 0
|
m_ReadOnly: 0
|
||||||
m_SerializedLabels: []
|
m_SerializedLabels: []
|
||||||
FlaggedDuringContentUpdateRestriction: 0
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
- m_GUID: 2301400160a23924eb27c4bdbe797739
|
|
||||||
m_Address: 'Audio/Music/Nightmargin (Oneshot OST) - The Prophecy '
|
|
||||||
m_ReadOnly: 0
|
|
||||||
m_SerializedLabels: []
|
|
||||||
FlaggedDuringContentUpdateRestriction: 0
|
|
||||||
- m_GUID: 23e11d2c8a4f12f4ea9a7a43d1118464
|
- m_GUID: 23e11d2c8a4f12f4ea9a7a43d1118464
|
||||||
m_Address: Gameplay
|
m_Address: Gameplay
|
||||||
m_ReadOnly: 0
|
m_ReadOnly: 0
|
||||||
@@ -115,6 +112,12 @@ MonoBehaviour:
|
|||||||
m_ReadOnly: 0
|
m_ReadOnly: 0
|
||||||
m_SerializedLabels: []
|
m_SerializedLabels: []
|
||||||
FlaggedDuringContentUpdateRestriction: 0
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 8187ea542d6ed824d81230966a3b7499
|
||||||
|
m_Address: Assets/Resources_moved/Audio/Music/Bauhaus - Bela Lugosi's Dead (No
|
||||||
|
Vocals Remix).mp3
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
- m_GUID: 82c71411174bfa86ca1f676b9d389f94
|
- m_GUID: 82c71411174bfa86ca1f676b9d389f94
|
||||||
m_Address: bastard!
|
m_Address: bastard!
|
||||||
m_ReadOnly: 0
|
m_ReadOnly: 0
|
||||||
@@ -140,11 +143,6 @@ MonoBehaviour:
|
|||||||
m_ReadOnly: 0
|
m_ReadOnly: 0
|
||||||
m_SerializedLabels: []
|
m_SerializedLabels: []
|
||||||
FlaggedDuringContentUpdateRestriction: 0
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
- m_GUID: b2c9f83c47783069aabb564f68cb0cbb
|
|
||||||
m_Address: absolutelynot
|
|
||||||
m_ReadOnly: 0
|
|
||||||
m_SerializedLabels: []
|
|
||||||
FlaggedDuringContentUpdateRestriction: 0
|
|
||||||
- m_GUID: b2e8dc2aeb0311cd8a826b51cf8e94dc
|
- m_GUID: b2e8dc2aeb0311cd8a826b51cf8e94dc
|
||||||
m_Address: GameOver
|
m_Address: GameOver
|
||||||
m_ReadOnly: 0
|
m_ReadOnly: 0
|
||||||
@@ -170,11 +168,6 @@ MonoBehaviour:
|
|||||||
m_ReadOnly: 0
|
m_ReadOnly: 0
|
||||||
m_SerializedLabels: []
|
m_SerializedLabels: []
|
||||||
FlaggedDuringContentUpdateRestriction: 0
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
- m_GUID: f4b6fa54ecac6cc418f98824491aa17a
|
|
||||||
m_Address: Audio/Music/SANABI - JUSTICE Is Watching You
|
|
||||||
m_ReadOnly: 0
|
|
||||||
m_SerializedLabels: []
|
|
||||||
FlaggedDuringContentUpdateRestriction: 0
|
|
||||||
- m_GUID: f74a409bf11b25148ad305acc05b14f5
|
- m_GUID: f74a409bf11b25148ad305acc05b14f5
|
||||||
m_Address: Audio/Dispatcher/take_damage2
|
m_Address: Audio/Dispatcher/take_damage2
|
||||||
m_ReadOnly: 0
|
m_ReadOnly: 0
|
||||||
|
|||||||
@@ -1,41 +1,76 @@
|
|||||||
using Code.App.StateMachine;
|
using Code.App.StateMachine;
|
||||||
using Code.Scenes;
|
using Code.Gameplay.Player;
|
||||||
|
using Code.Input;
|
||||||
using Code.StateMachine;
|
using Code.StateMachine;
|
||||||
using Code.UI;
|
using Code.UI;
|
||||||
|
using Cysharp.Threading.Tasks;
|
||||||
|
using Reflex.Core;
|
||||||
|
using Reflex.Extensions;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
using UnityEngine.InputSystem;
|
||||||
|
using UnityEngine.SceneManagement;
|
||||||
|
|
||||||
namespace Code.App.AppStates
|
namespace Code.App.AppStates
|
||||||
{
|
{
|
||||||
public class GameOverState : BaseState<AppStateMachineContext>
|
public class GameOverState : BaseState<AppStateMachineContext>
|
||||||
{
|
{
|
||||||
public GameOverState(AppStateMachineContext context) : base(context)
|
public GameOverState(AppStateMachineContext context) : base(context)
|
||||||
{ }
|
{
|
||||||
|
}
|
||||||
|
private IPlayerScore _playerScore;
|
||||||
|
|
||||||
private float damnTimer = 3f; // TODO Удалить при первой возможности
|
private GameOverPanel _gameOverPanel;
|
||||||
|
|
||||||
public override void EnterState()
|
public override void EnterState()
|
||||||
{
|
{
|
||||||
Context.UIService.SwitchPanelTo(UIPanel.GameOver);
|
Container sceneContainer = SceneManager.GetActiveScene().GetSceneContainer();
|
||||||
|
_playerScore = sceneContainer.Resolve<IPlayerScore>();
|
||||||
|
_scoreCounter = 0;
|
||||||
|
|
||||||
|
Context.InputService.EnableMap(ActionMappings.UI);
|
||||||
|
Context.InputService.DebugBindAction((int)ActionMappings.UI,(int)UIActions.Continue, TryToExit);
|
||||||
|
|
||||||
|
GameOver();
|
||||||
|
|
||||||
base.EnterState();
|
base.EnterState();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void TryToExit(InputAction.CallbackContext context)
|
||||||
|
{
|
||||||
|
ToMainMenu();
|
||||||
|
}
|
||||||
|
|
||||||
|
private async UniTaskVoid GameOver()
|
||||||
|
{
|
||||||
|
await Context.UIService.AsyncSwitchPanelTo(UIPanel.GameOver);
|
||||||
|
|
||||||
|
_gameOverPanel = (GameOverPanel)Context.UIService.CurrentPanel;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
private void ToMainMenu()
|
private void ToMainMenu()
|
||||||
{
|
{
|
||||||
Context.StateMachine.SwitchState(AppState.MainMenu)
|
Context.StateMachine.SwitchState(AppState.MainMenu)
|
||||||
.AllowStateTransition(AppState.Gameplay);
|
.AllowStateTransition(AppState.Gameplay);
|
||||||
}
|
}
|
||||||
|
private float _scoreCounter;
|
||||||
public override void Tick()
|
public override void Tick()
|
||||||
{
|
{
|
||||||
damnTimer -= Time.deltaTime;
|
if (!_gameOverPanel) return;
|
||||||
if (damnTimer <= float.Epsilon) ToMainMenu();
|
|
||||||
|
_scoreCounter += Time.deltaTime * 100;
|
||||||
|
// UnityEngine.Debug.Log($"Score: {_scoreCounter}");
|
||||||
|
if((int)_scoreCounter >= _playerScore.Score)
|
||||||
|
{
|
||||||
|
_gameOverPanel.UpdateScoreText(_playerScore.Score);
|
||||||
|
}
|
||||||
|
else _gameOverPanel.UpdateScoreText((int)_scoreCounter);
|
||||||
}
|
}
|
||||||
public override void ExitState()
|
public override void ExitState()
|
||||||
{
|
{
|
||||||
damnTimer = 5f;
|
Context.InputService.DisableMap(ActionMappings.UI);
|
||||||
|
Context.InputService.DebugUnbindAction((int)ActionMappings.UI,(int)UIActions.Continue, TryToExit);
|
||||||
|
|
||||||
Context.UIService.LoadingScreen.Show();
|
|
||||||
base.ExitState();
|
base.ExitState();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.Reflection.Emit;
|
using System.Reflection.Emit;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using Code.App.Loading;
|
||||||
using Code.App.StateMachine;
|
using Code.App.StateMachine;
|
||||||
using Code.Audio;
|
using Code.Audio;
|
||||||
using Code.Gameplay.Camera;
|
using Code.Gameplay.Camera;
|
||||||
@@ -28,9 +30,8 @@ namespace Code.App.AppStates
|
|||||||
{
|
{
|
||||||
|
|
||||||
private PlayerHealth _playerHealth;
|
private PlayerHealth _playerHealth;
|
||||||
private PlayerMoney _playerMoney;
|
private IPlayerScore _playerScore;
|
||||||
|
|
||||||
private IScoreService _scoreService;
|
|
||||||
private IOrderService _orderService;
|
private IOrderService _orderService;
|
||||||
|
|
||||||
private CharacterProvider _playerCharacter;
|
private CharacterProvider _playerCharacter;
|
||||||
@@ -41,70 +42,100 @@ namespace Code.App.AppStates
|
|||||||
|
|
||||||
public override void EnterState()
|
public override void EnterState()
|
||||||
{
|
{
|
||||||
Context.UIService.LoadingScreen.Show();
|
Context.LoadingManager
|
||||||
|
.RegisterLoading(LoadingWork.LoadScene)
|
||||||
|
.RegisterLoading(LoadingWork.LoadUI)
|
||||||
|
// .RegisterLoading(LoadingWork.LoadModelResource)
|
||||||
|
.RegisterLoading(LoadingWork.LoadAudio);
|
||||||
|
|
||||||
_playerMoney = Context.PlayerFactory.CreatePlayerMoney();
|
|
||||||
_playerHealth = Context.PlayerFactory.CreatePlayerHealth();
|
_playerHealth = Context.PlayerFactory.CreatePlayerHealth();
|
||||||
|
|
||||||
|
_playerHealth.OnDamage += PlayerDamageTaken;
|
||||||
_playerHealth.OnDeath += EndGame;
|
_playerHealth.OnDeath += EndGame;
|
||||||
|
|
||||||
Context.AudioService.TransitToSnapshot(AudioSnapshotState.Peaceful);
|
Context.AudioService.TransitToSnapshot(AudioSnapshotState.None);
|
||||||
|
|
||||||
Context.InputService.EnableMap(ActionMappings.Gameplay);
|
Context.InputService.EnableMap(ActionMappings.Gameplay);
|
||||||
|
|
||||||
Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug1, GiveOrderDEBUG);
|
Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug1, InstaKillDEBUG);
|
||||||
Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug2, RecieveOrderDEBUG);
|
|
||||||
Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug3, DeliverOrderDEBUG);
|
|
||||||
Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug4, RoomPassedDEBUG);
|
Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug4, RoomPassedDEBUG);
|
||||||
Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug5, Tube);
|
Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug5, Tube);
|
||||||
// Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug6, PlayDebugDispatcher);
|
|
||||||
|
Context.SceneLoaderService.LoadSceneAsyncAwaitable((int)SceneIds.Gameplay);
|
||||||
|
Context.LoadingManager.OnLoadingEnded += AfterSceneLoaded;
|
||||||
|
|
||||||
#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
|
#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
|
||||||
WaitForSceneToLoad();
|
WaitForLoad();
|
||||||
#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
|
#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
|
||||||
}
|
}
|
||||||
private async UniTask WaitForPlayerCharacterLoad() => _playerCharacter = await Context.PlayerFactory.CreatePlayer();
|
private async UniTask WaitForPlayerCharacterLoad() => _playerCharacter = await Context.PlayerFactory.CreatePlayer();
|
||||||
|
|
||||||
private async UniTaskVoid WaitForSceneToLoad()
|
private async UniTaskVoid WaitForLoad()
|
||||||
{
|
{
|
||||||
await Context.SceneLoaderService.LoadSceneAsyncAwaitable((int)SceneIds.Gameplay);
|
|
||||||
|
|
||||||
await UniTask.WhenAll(
|
await UniTask.WhenAll(
|
||||||
Context.UIService.AsyncSwitchPanelTo(UIPanel.Gameplay),
|
Context.UIService.AsyncSwitchPanelTo(UIPanel.Gameplay),
|
||||||
// TODO
|
|
||||||
Context.AudioFactory.WarmGameplayMusic(),
|
Context.AudioFactory.WarmGameplayMusic(),
|
||||||
Context.AudioFactory.WarmSFX(),
|
Context.AudioFactory.WarmSFX(),
|
||||||
Context.AudioFactory.WarmDispatcher(),
|
Context.AudioFactory.WarmDispatcher()
|
||||||
// TODO
|
);
|
||||||
|
|
||||||
|
Context.LoadingManager
|
||||||
|
.UnregisterLoading(LoadingWork.LoadUI)
|
||||||
|
.UnregisterLoading(LoadingWork.LoadAudio);
|
||||||
|
|
||||||
|
InputServiceInitialize();
|
||||||
|
|
||||||
|
MusicInitialize();
|
||||||
|
}
|
||||||
|
|
||||||
|
private async void AfterSceneLoaded()
|
||||||
|
{
|
||||||
|
Context.LoadingManager
|
||||||
|
.RegisterLoading(LoadingWork.LoadModelResource);
|
||||||
|
|
||||||
|
Context.LoadingManager.OnLoadingEnded -= AfterSceneLoaded;
|
||||||
|
Context.LoadingManager.OnLoadingEnded += AfterPlayerLoaded;
|
||||||
|
|
||||||
|
await UniTask.WhenAll(
|
||||||
WaitForPlayerArmsToInitialize(),
|
WaitForPlayerArmsToInitialize(),
|
||||||
WaitForPlayerCharacterLoad()
|
WaitForPlayerCharacterLoad()
|
||||||
);
|
);
|
||||||
MusicInitialize();
|
|
||||||
|
|
||||||
|
Context.LoadingManager
|
||||||
|
.UnregisterLoading(LoadingWork.LoadModelResource);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void AfterPlayerLoaded()
|
||||||
|
{
|
||||||
Container sceneContainer = SceneManager.GetActiveScene().GetSceneContainer();
|
Container sceneContainer = SceneManager.GetActiveScene().GetSceneContainer();
|
||||||
|
|
||||||
|
_playerScore = sceneContainer.Resolve<IPlayerScore>();
|
||||||
|
|
||||||
GameplaySceneEnvironment sceneEnvironment = SceneEnvironmentVariables(sceneContainer);
|
GameplaySceneEnvironment sceneEnvironment = SceneEnvironmentVariables(sceneContainer);
|
||||||
|
|
||||||
PlayerInitialize(sceneEnvironment);
|
PlayerInitialize(sceneEnvironment);
|
||||||
|
|
||||||
UIInitialize();
|
|
||||||
|
|
||||||
CameraInitialize();
|
CameraInitialize();
|
||||||
|
|
||||||
InputServiceInitialize();
|
|
||||||
|
|
||||||
GameplayServicesInitialize(sceneContainer);
|
GameplayServicesInitialize(sceneContainer);
|
||||||
|
|
||||||
_tickEnabled = true;
|
UIInitialize();
|
||||||
|
|
||||||
Context.UIService.LoadingScreen.Hide();
|
Context.LoadingManager.OnLoadingEnded -= AfterPlayerLoaded;
|
||||||
|
|
||||||
|
_tickEnabled = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private async UniTask WaitForPlayerArmsToInitialize() => _armsMesh = await Context.PlayerFactory.CreateArms(Context.CameraStateMachine.Camera.transform);
|
private async UniTask WaitForPlayerArmsToInitialize() => _armsMesh = await Context.PlayerFactory.CreateArms(Context.CameraStateMachine.Camera.transform);
|
||||||
|
|
||||||
private void OrderGiven(float time)
|
private void OrderGiven(float time)
|
||||||
{
|
{
|
||||||
|
_gameplayPanel.ShowTimer();
|
||||||
|
Context.AudioService.TransitToSnapshot(AudioSnapshotState.Action);
|
||||||
|
}
|
||||||
|
private void OrderFailure()
|
||||||
|
{
|
||||||
|
_playerHealth.InstaKill();
|
||||||
}
|
}
|
||||||
private void OrderRecieved(float time)
|
private void OrderRecieved(float time)
|
||||||
{
|
{
|
||||||
@@ -112,22 +143,22 @@ namespace Code.App.AppStates
|
|||||||
}
|
}
|
||||||
private void OrderDelivered(int score, float time)
|
private void OrderDelivered(int score, float time)
|
||||||
{
|
{
|
||||||
|
_gameplayPanel.HideTimer();
|
||||||
|
|
||||||
if(time < 0f) Context.AudioService.PlayDispatcher((DispatcherSounds)Random.Range((int)DispatcherSounds.Late1,(int)DispatcherSounds.Late2));
|
if(time < 0f) Context.AudioService.PlayDispatcher((DispatcherSounds)Random.Range((int)DispatcherSounds.Late1,(int)DispatcherSounds.Late2));
|
||||||
_playerMoney.GiveMoney(score);
|
_playerScore.UpdateScore(score);
|
||||||
}
|
|
||||||
// DEBUG
|
Context.AudioService.TransitToSnapshot(AudioSnapshotState.Peaceful);
|
||||||
private void GiveOrderDEBUG(InputAction.CallbackContext context)
|
|
||||||
{
|
|
||||||
_orderService.OrderGive();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void RecieveOrderDEBUG(InputAction.CallbackContext context)
|
private void PlayerDamageTaken(int damage, PlayerHealth health)
|
||||||
{
|
{
|
||||||
_orderService.OrderRecieved();
|
Context.AudioService.PlayDispatcher((DispatcherSounds)Random.Range((int)DispatcherSounds.TakeDamage1,(int)DispatcherSounds.TakeDamage4));
|
||||||
}
|
}
|
||||||
private void DeliverOrderDEBUG(InputAction.CallbackContext context)
|
// DEBUG
|
||||||
|
private void InstaKillDEBUG(InputAction.CallbackContext context)
|
||||||
{
|
{
|
||||||
_orderService.OrderDelivered();
|
_playerHealth.InstaKill();
|
||||||
}
|
}
|
||||||
private void RoomPassedDEBUG(InputAction.CallbackContext context)
|
private void RoomPassedDEBUG(InputAction.CallbackContext context)
|
||||||
{
|
{
|
||||||
@@ -145,8 +176,7 @@ namespace Code.App.AppStates
|
|||||||
{
|
{
|
||||||
if (!_tickEnabled) return;
|
if (!_tickEnabled) return;
|
||||||
|
|
||||||
// TODO ГРЯЗь
|
_orderService.DecreaseTimer(Time.deltaTime);
|
||||||
_gameplayPanel.Timer.text = ((int)_orderService.DecreaseTimer(Time.deltaTime)).ToString(CultureInfo.CurrentCulture);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void EndGame()
|
private void EndGame()
|
||||||
@@ -158,7 +188,7 @@ namespace Code.App.AppStates
|
|||||||
public override void ExitState()
|
public override void ExitState()
|
||||||
{
|
{
|
||||||
_playerHealth = null;
|
_playerHealth = null;
|
||||||
_playerMoney = null;
|
_playerScore = null;
|
||||||
|
|
||||||
_tickEnabled = false;
|
_tickEnabled = false;
|
||||||
|
|
||||||
@@ -166,18 +196,19 @@ namespace Code.App.AppStates
|
|||||||
_playerCharacter = null;
|
_playerCharacter = null;
|
||||||
Context.PlayerFactory.ReleaseArms(_armsMesh);
|
Context.PlayerFactory.ReleaseArms(_armsMesh);
|
||||||
_armsMesh = null;
|
_armsMesh = null;
|
||||||
|
_orderService = null;
|
||||||
|
|
||||||
|
Context.AudioService.OnDispatcherStarted -= _gameplayPanel.SummonDispatcher;
|
||||||
|
Context.AudioService.OnDispatcherEnded -= _gameplayPanel.CloseDispatcher;
|
||||||
|
|
||||||
Context.InputService.DisableMap(ActionMappings.Gameplay);
|
Context.InputService.DisableMap(ActionMappings.Gameplay);
|
||||||
Context.AudioService.GladlyAskToStopMusic(MusicType.Action, callback: Context.AudioFactory.ReleaseActionMusic);
|
Context.AudioService.GladlyAskToStopMusic(MusicType.Action, callback: Context.AudioFactory.ReleaseActionMusic);
|
||||||
Context.AudioService.GladlyAskToStopMusic(MusicType.Peaceful, callback: Context.AudioFactory.ReleasePeacefulMusic);
|
Context.AudioService.GladlyAskToStopMusic(MusicType.Peaceful, callback: Context.AudioFactory.ReleasePeacefulMusic);
|
||||||
|
|
||||||
|
|
||||||
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug1, GiveOrderDEBUG);
|
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug1, InstaKillDEBUG);
|
||||||
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug2, RecieveOrderDEBUG);
|
|
||||||
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug3, DeliverOrderDEBUG);
|
|
||||||
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug4, RoomPassedDEBUG);
|
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug4, RoomPassedDEBUG);
|
||||||
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug5, Tube);
|
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug5, Tube);
|
||||||
// Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug6, PlayDebugDispatcher);
|
|
||||||
|
|
||||||
base.ExitState();
|
base.ExitState();
|
||||||
}
|
}
|
||||||
@@ -198,12 +229,15 @@ namespace Code.App.AppStates
|
|||||||
private void UIInitialize()
|
private void UIInitialize()
|
||||||
{
|
{
|
||||||
_gameplayPanel = (GameplayPanel)Context.UIService.CurrentPanel;
|
_gameplayPanel = (GameplayPanel)Context.UIService.CurrentPanel;
|
||||||
_gameplayPanel.Initialize(_playerMoney, _playerHealth);
|
_gameplayPanel.Initialize(_playerScore, _playerHealth, _orderService);
|
||||||
|
Context.AudioService.OnDispatcherStarted += _gameplayPanel.SummonDispatcher;
|
||||||
|
Context.AudioService.OnDispatcherEnded += _gameplayPanel.CloseDispatcher;
|
||||||
}
|
}
|
||||||
private void MusicInitialize()
|
private void MusicInitialize()
|
||||||
{
|
{
|
||||||
Context.AudioService.PlayRandomMusicUntilHumanityWillBeDestroyedForTheySins(MusicType.Peaceful);
|
Context.AudioService.PlayRandomMusicUntilHumanityWillBeDestroyedForTheySins(MusicType.Peaceful);
|
||||||
Context.AudioService.PlayRandomMusicUntilHumanityWillBeDestroyedForTheySins(MusicType.Action);
|
Context.AudioService.PlayRandomMusicUntilHumanityWillBeDestroyedForTheySins(MusicType.Action);
|
||||||
|
Context.AudioService.TransitToSnapshot(AudioSnapshotState.Peaceful);
|
||||||
}
|
}
|
||||||
private void PlayerInitialize(GameplaySceneEnvironment sceneEnvironment)
|
private void PlayerInitialize(GameplaySceneEnvironment sceneEnvironment)
|
||||||
{
|
{
|
||||||
@@ -212,12 +246,12 @@ namespace Code.App.AppStates
|
|||||||
}
|
}
|
||||||
private void GameplayServicesInitialize(Container sceneContainer)
|
private void GameplayServicesInitialize(Container sceneContainer)
|
||||||
{
|
{
|
||||||
_scoreService = sceneContainer.Resolve<IScoreService>();
|
|
||||||
_orderService = sceneContainer.Resolve<IOrderService>();
|
_orderService = sceneContainer.Resolve<IOrderService>();
|
||||||
|
|
||||||
_orderService.OnOrderGiven += OrderGiven;
|
_orderService.OnOrderGiven += OrderGiven;
|
||||||
_orderService.OnOrderRecieved += OrderRecieved;
|
_orderService.OnOrderRecieved += OrderRecieved;
|
||||||
_orderService.OnOrderDelivered += OrderDelivered;
|
_orderService.OnOrderDelivered += OrderDelivered;
|
||||||
|
_orderService.OnOrderFailure += OrderFailure;
|
||||||
}
|
}
|
||||||
private GameplaySceneEnvironment SceneEnvironmentVariables(Container sceneContainer)
|
private GameplaySceneEnvironment SceneEnvironmentVariables(Container sceneContainer)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
using Code.App.Loading;
|
||||||
using Code.App.StateMachine;
|
using Code.App.StateMachine;
|
||||||
using Code.Audio;
|
using Code.Audio;
|
||||||
using Code.Gameplay.Camera;
|
using Code.Gameplay.Camera;
|
||||||
@@ -24,44 +25,79 @@ namespace Code.App.AppStates
|
|||||||
|
|
||||||
public override void EnterState()
|
public override void EnterState()
|
||||||
{
|
{
|
||||||
Context.UIService.LoadingScreen.Show();
|
Context.LoadingManager
|
||||||
|
.RegisterLoading(LoadingWork.LoadScene)
|
||||||
|
.RegisterLoading(LoadingWork.LoadUI)
|
||||||
|
.RegisterLoading(LoadingWork.LoadAudio);
|
||||||
|
|
||||||
Context.CameraStateMachine.SwitchState(CameraMode.UltraStatic);
|
// Context.UIService.LoadingScreen.Show();
|
||||||
|
|
||||||
|
Context.CameraStateMachine.SwitchState(CameraMode.MainMenu);
|
||||||
|
|
||||||
|
Context.SceneLoaderService.LoadSceneAsyncAwaitable((int)SceneIds.MainMenu);
|
||||||
|
Context.LoadingManager.OnLoadingEnded += AfterSceneLoaded;
|
||||||
|
|
||||||
#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
|
#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
|
||||||
WaitForSceneToLoad();
|
WaitForLoad();
|
||||||
#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
|
#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
|
||||||
}
|
}
|
||||||
|
|
||||||
private CinematicDoorOpening _damnDoor = new();
|
private async UniTaskVoid WaitForLoad()
|
||||||
private async UniTaskVoid WaitForSceneToLoad()
|
|
||||||
{
|
{
|
||||||
await UniTask.WhenAll(
|
await UniTask.WhenAll(
|
||||||
Context.SceneLoaderService.LoadSceneAsyncAwaitable((int)SceneIds.MainMenu),
|
|
||||||
Context.UIService.AsyncSwitchPanelTo(UIPanel.MainMenu),
|
Context.UIService.AsyncSwitchPanelTo(UIPanel.MainMenu),
|
||||||
Context.AudioFactory.WarmMenuMusic()
|
Context.AudioFactory.WarmMenuMusic()
|
||||||
);
|
);
|
||||||
|
Context.LoadingManager
|
||||||
|
.UnregisterLoading(LoadingWork.LoadUI)
|
||||||
|
.UnregisterLoading(LoadingWork.LoadAudio);
|
||||||
|
|
||||||
|
InitializeAudio();
|
||||||
|
|
||||||
|
InitializeInput();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void AfterSceneLoaded()
|
||||||
|
{
|
||||||
|
var mainMenuEnvironment = (MainMenuEnvironment)SceneManager.GetActiveScene()
|
||||||
|
.GetSceneContainer().Resolve<CurrentSceneEnvironment>();
|
||||||
|
|
||||||
|
InitializeUI(mainMenuEnvironment);
|
||||||
|
|
||||||
|
InitializeCamera(mainMenuEnvironment);
|
||||||
|
|
||||||
|
Context.LoadingManager.OnLoadingEnded -= AfterSceneLoaded;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void InitializeCamera(MainMenuEnvironment mainMenuEnvironment)
|
||||||
|
{
|
||||||
|
((Gameplay.Camera.CameraStates.MainMenuState)Context.CameraStateMachine.CurrentBaseState).SetFollowTransform(mainMenuEnvironment
|
||||||
|
.cameraPosition);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void InitializeInput()
|
||||||
|
{
|
||||||
|
Context.InputService.EnableMap(ActionMappings.MainMenu);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void InitializeAudio()
|
||||||
|
{
|
||||||
Context.AudioService.TransitToSnapshot(AudioSnapshotState.Menu);
|
Context.AudioService.TransitToSnapshot(AudioSnapshotState.Menu);
|
||||||
Context.AudioService.PlayRandomMusicUntilHumanityWillBeDestroyedForTheySins(MusicType.Menu);
|
Context.AudioService.PlayRandomMusicUntilHumanityWillBeDestroyedForTheySins(MusicType.Menu);
|
||||||
|
}
|
||||||
|
|
||||||
var hui = ((MainMenuEnvironment)SceneManager.GetActiveScene()
|
private void InitializeUI(MainMenuEnvironment mainMenuEnvironment)
|
||||||
.GetSceneContainer().Resolve<CurrentSceneEnvironment>());
|
{
|
||||||
_damnDoor.DamnDoor = hui.damnDoor;
|
|
||||||
_damnDoor.DamnDoor.SetPhysics(false);
|
|
||||||
_damnDoor.DoorLight = hui.doorLight;
|
|
||||||
|
|
||||||
var menuPanel = (MainMenuPanel)Context.UIService.CurrentPanel;
|
var menuPanel = (MainMenuPanel)Context.UIService.CurrentPanel;
|
||||||
|
menuPanel.Initialize(mainMenuEnvironment.uiVariables,
|
||||||
|
mainMenuEnvironment.startButton,
|
||||||
|
mainMenuEnvironment.settingButton,
|
||||||
|
mainMenuEnvironment.exitButton);
|
||||||
|
|
||||||
menuPanel.startButton.button.onClick.AddListener(StartGame);
|
menuPanel.startButton.button.onClick.AddListener(StartGame);
|
||||||
menuPanel.exitButton.button.onClick.AddListener(ExitGame);
|
menuPanel.exitButton.button.onClick.AddListener(ExitGame);
|
||||||
menuPanel.CinematicDoorOpening = _damnDoor;
|
|
||||||
|
|
||||||
((UltraStaticState)Context.CameraStateMachine.CurrentBaseState).SetFollowTransform(hui.cameraPosition);
|
mainMenuEnvironment.menuButtonsCanvas.worldCamera = Context.CameraStateMachine.Camera;
|
||||||
|
|
||||||
Context.UIService.LoadingScreen.Hide();
|
|
||||||
|
|
||||||
Context.InputService.EnableMap(ActionMappings.MainMenu);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void Tick()
|
public override void Tick()
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
using System.Collections.Generic;
|
||||||
|
using Code.App.Loading;
|
||||||
using Code.App.StateMachine;
|
using Code.App.StateMachine;
|
||||||
using Code.Audio;
|
using Code.Audio;
|
||||||
using Code.Configs;
|
using Code.Configs;
|
||||||
@@ -26,10 +28,13 @@ namespace Code.App
|
|||||||
|
|
||||||
InstallInfrastructureUnit(containerBuilder, staticDataService);
|
InstallInfrastructureUnit(containerBuilder, staticDataService);
|
||||||
|
|
||||||
|
containerBuilder.AddSingleton(typeof(LoadingManager), typeof(ILoadingManager));
|
||||||
|
|
||||||
containerBuilder.AddSingleton(typeof(InputService), typeof(IInputService));
|
containerBuilder.AddSingleton(typeof(InputService), typeof(IInputService));
|
||||||
containerBuilder.AddSingleton(typeof(PlayerFactory), typeof(IPlayerFactory));
|
containerBuilder.AddSingleton(typeof(PlayerFactory), typeof(IPlayerFactory));
|
||||||
|
|
||||||
InitializeCamera(containerBuilder, staticDataService);
|
InitializeCamera(containerBuilder, staticDataService);
|
||||||
|
|
||||||
containerBuilder.AddSingleton(typeof(UIFactory), typeof(IUIFactory));
|
containerBuilder.AddSingleton(typeof(UIFactory), typeof(IUIFactory));
|
||||||
containerBuilder.AddSingleton(typeof(UIService), typeof(IUIService));
|
containerBuilder.AddSingleton(typeof(UIService), typeof(IUIService));
|
||||||
|
|
||||||
@@ -72,6 +77,7 @@ namespace Code.App
|
|||||||
containerBuilder.AddSingleton(staticDataService.InputConfig, typeof(InputConfig));
|
containerBuilder.AddSingleton(staticDataService.InputConfig, typeof(InputConfig));
|
||||||
|
|
||||||
containerBuilder.AddSingleton(staticDataService.CameraConfig, typeof(CameraConfig));
|
containerBuilder.AddSingleton(staticDataService.CameraConfig, typeof(CameraConfig));
|
||||||
|
containerBuilder.AddSingleton(staticDataService.CameraSettingsConfigs, typeof(Dictionary<CameraMode,CameraSettingsConfig>));
|
||||||
|
|
||||||
containerBuilder.AddSingleton(staticDataService.PlayerConfig, typeof(PlayerConfig));
|
containerBuilder.AddSingleton(staticDataService.PlayerConfig, typeof(PlayerConfig));
|
||||||
containerBuilder.AddSingleton(staticDataService.CharacterConfig, typeof(CharacterConfig));
|
containerBuilder.AddSingleton(staticDataService.CharacterConfig, typeof(CharacterConfig));
|
||||||
@@ -83,6 +89,7 @@ namespace Code.App
|
|||||||
containerBuilder.AddSingleton(staticDataService.SFXListConfig, typeof(SFXListConfig));
|
containerBuilder.AddSingleton(staticDataService.SFXListConfig, typeof(SFXListConfig));
|
||||||
containerBuilder.AddSingleton(staticDataService.DispatcherSoundListConfig, typeof(DispatcherSoundListConfig));
|
containerBuilder.AddSingleton(staticDataService.DispatcherSoundListConfig, typeof(DispatcherSoundListConfig));
|
||||||
containerBuilder.AddSingleton(staticDataService.EnemiesSoundListConfig, typeof(EnemiesSoundListConfig));
|
containerBuilder.AddSingleton(staticDataService.EnemiesSoundListConfig, typeof(EnemiesSoundListConfig));
|
||||||
|
containerBuilder.AddSingleton(staticDataService.AudioSourceSettingsConfigs, typeof(Dictionary<AudioSourceType, AudioSourceSettingsConfig>));
|
||||||
|
|
||||||
containerBuilder.AddSingleton(staticDataService.OrderServiceConfig, typeof(OrderServiceConfig));
|
containerBuilder.AddSingleton(staticDataService.OrderServiceConfig, typeof(OrderServiceConfig));
|
||||||
containerBuilder.AddSingleton(staticDataService.OrderBoxConfig, typeof(OrderBoxConfig));
|
containerBuilder.AddSingleton(staticDataService.OrderBoxConfig, typeof(OrderBoxConfig));
|
||||||
@@ -106,14 +113,22 @@ namespace Code.App
|
|||||||
}
|
}
|
||||||
private async UniTaskVoid BootstrapFinish(Container container)
|
private async UniTaskVoid BootstrapFinish(Container container)
|
||||||
{
|
{
|
||||||
var loadingScreen = GameObject.FindWithTag(Tags.LoadingScreen);
|
var loadingScreen = GameObject.FindWithTag(Tags.LoadingScreen).GetComponent<LoadingScreen>();
|
||||||
DontDestroyOnLoad(loadingScreen);
|
DontDestroyOnLoad(loadingScreen.gameObject);
|
||||||
|
|
||||||
|
ILoadingManager loadingManager = container.Resolve<ILoadingManager>();
|
||||||
|
loadingManager.OnLoadingStarted += loadingScreen.Show;
|
||||||
|
loadingManager.OnLoadingEnded += loadingScreen.Hide;
|
||||||
|
|
||||||
|
loadingManager.RegisterLoading(LoadingWork.Bootstrap);
|
||||||
|
|
||||||
await UniTask.WhenAll(
|
await UniTask.WhenAll(
|
||||||
container.Resolve<IUIService>().Initialize(loadingScreen.GetComponent<LoadingScreen>()),
|
container.Resolve<IUIService>().Initialize(loadingScreen),
|
||||||
container.Resolve<IAudioService>().Initialize()
|
container.Resolve<IAudioService>().Initialize()
|
||||||
);
|
);
|
||||||
|
|
||||||
|
loadingManager.UnregisterLoading(LoadingWork.Bootstrap);
|
||||||
|
|
||||||
_appStateMachine
|
_appStateMachine
|
||||||
.SwitchState(AppState.MainMenu)
|
.SwitchState(AppState.MainMenu)
|
||||||
.AllowStateTransition(AppState.Gameplay);
|
.AllowStateTransition(AppState.Gameplay);
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 08b54658296d4279b85a2bfc3cf10e62
|
||||||
|
timeCreated: 1763842256
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
using System.Collections.ObjectModel;
|
||||||
|
using Cysharp.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace Code.App.Loading
|
||||||
|
{
|
||||||
|
public interface ILoadingManager
|
||||||
|
{
|
||||||
|
delegate void OnLoadingDelegate();
|
||||||
|
|
||||||
|
event OnLoadingDelegate OnLoadingStarted;
|
||||||
|
event OnLoadingDelegate OnLoadingEnded;
|
||||||
|
ReadOnlyCollection<LoadingWork> LoadingThings { get; }
|
||||||
|
LoadingManager RegisterLoading(LoadingWork loadingThingName);
|
||||||
|
LoadingManager UnregisterLoading(LoadingWork loadingThingName);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: bfb3837590d04da3b04ca8b0f0aca437
|
||||||
|
timeCreated: 1763842985
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Collections.ObjectModel;
|
||||||
|
using Cysharp.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace Code.App.Loading
|
||||||
|
{
|
||||||
|
public class LoadingManager : ILoadingManager
|
||||||
|
{
|
||||||
|
public event ILoadingManager.OnLoadingDelegate OnLoadingStarted;
|
||||||
|
public event ILoadingManager.OnLoadingDelegate OnLoadingEnded;
|
||||||
|
|
||||||
|
private List<LoadingWork> _loadingThings = new();
|
||||||
|
public ReadOnlyCollection<LoadingWork> LoadingThings => _loadingThings.AsReadOnly();
|
||||||
|
|
||||||
|
public LoadingManager RegisterLoading(LoadingWork loadingThingName)
|
||||||
|
{
|
||||||
|
if(_loadingThings.Count == 0) OnLoadingStarted?.Invoke();
|
||||||
|
|
||||||
|
_loadingThings.Add(loadingThingName);
|
||||||
|
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
public LoadingManager UnregisterLoading(LoadingWork loadingThingName)
|
||||||
|
{
|
||||||
|
_loadingThings.Remove(loadingThingName);
|
||||||
|
|
||||||
|
if(_loadingThings.Count == 0) OnLoadingEnded?.Invoke();
|
||||||
|
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// public static class LoadingManagerExtensions
|
||||||
|
// {
|
||||||
|
// public static LoadingManager AddLoading(this LoadingManager manager, LoadingWork loadingThingName)
|
||||||
|
// {
|
||||||
|
// manager.RegisterLoading(loadingThingName);
|
||||||
|
// return manager;
|
||||||
|
// }
|
||||||
|
// public static LoadingManager RemoveLoading(this LoadingManager manager, LoadingWork loadingThingName)
|
||||||
|
// {
|
||||||
|
// manager.UnregisterLoading(loadingThingName);
|
||||||
|
// return manager;
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 185988ac74a24a39864238cd7f5cb626
|
||||||
|
timeCreated: 1763842268
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
namespace Code.App.Loading
|
||||||
|
{
|
||||||
|
public enum LoadingWork
|
||||||
|
{
|
||||||
|
Bootstrap,
|
||||||
|
LoadUI,
|
||||||
|
LoadAudio,
|
||||||
|
LoadScene,
|
||||||
|
LoadModelResource,
|
||||||
|
WaitingForTime
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 318d1b29b41d4b96bc09334acbf36506
|
||||||
|
timeCreated: 1763843934
|
||||||
@@ -1,8 +1,11 @@
|
|||||||
|
using Code.App.Loading;
|
||||||
using Code.Gameplay.Orders.Order;
|
using Code.Gameplay.Orders.Order;
|
||||||
|
using Code.Gameplay.Player;
|
||||||
using Code.Scenes;
|
using Code.Scenes;
|
||||||
using Code.Scenes.SceneEnvironments;
|
using Code.Scenes.SceneEnvironments;
|
||||||
using Reflex.Core;
|
using Reflex.Core;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
using IPlayerScore = Code.Gameplay.Player.IPlayerScore;
|
||||||
|
|
||||||
namespace Code.App.SceneInstallers
|
namespace Code.App.SceneInstallers
|
||||||
{
|
{
|
||||||
@@ -13,7 +16,7 @@ namespace Code.App.SceneInstallers
|
|||||||
public void InstallBindings(ContainerBuilder containerBuilder)
|
public void InstallBindings(ContainerBuilder containerBuilder)
|
||||||
{
|
{
|
||||||
containerBuilder.AddScoped(typeof(GameplaySceneEnvironment), typeof(CurrentSceneEnvironment));
|
containerBuilder.AddScoped(typeof(GameplaySceneEnvironment), typeof(CurrentSceneEnvironment));
|
||||||
containerBuilder.AddScoped(typeof(ScoreService), typeof(IScoreService));
|
containerBuilder.AddScoped(typeof(PlayerScore), typeof(IPlayerScore));
|
||||||
containerBuilder.AddScoped(typeof(OrderService), typeof(IOrderService));
|
containerBuilder.AddScoped(typeof(OrderService), typeof(IOrderService));
|
||||||
|
|
||||||
containerBuilder.OnContainerBuilt += Initialize;
|
containerBuilder.OnContainerBuilt += Initialize;
|
||||||
@@ -21,9 +24,14 @@ namespace Code.App.SceneInstallers
|
|||||||
|
|
||||||
private void Initialize(Container container)
|
private void Initialize(Container container)
|
||||||
{
|
{
|
||||||
|
ILoadingManager loadingManager = container.Resolve<ILoadingManager>();
|
||||||
|
|
||||||
GameplaySceneEnvironment env = (GameplaySceneEnvironment)container.Resolve<CurrentSceneEnvironment>();
|
GameplaySceneEnvironment env = (GameplaySceneEnvironment)container.Resolve<CurrentSceneEnvironment>();
|
||||||
|
|
||||||
env.TransitVariables(_gameplaySceneEnvironment);
|
env.TransitVariables(_gameplaySceneEnvironment);
|
||||||
|
|
||||||
|
loadingManager
|
||||||
|
.UnregisterLoading(LoadingWork.LoadScene);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
|
using Code.App.Loading;
|
||||||
using Code.Scenes;
|
using Code.Scenes;
|
||||||
using Code.Scenes.SceneEnvironments;
|
using Code.Scenes.SceneEnvironments;
|
||||||
using Reflex.Core;
|
using Reflex.Core;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.Serialization;
|
|
||||||
|
|
||||||
namespace Code.App.SceneInstallers
|
namespace Code.App.SceneInstallers
|
||||||
{
|
{
|
||||||
@@ -22,6 +22,11 @@ namespace Code.App.SceneInstallers
|
|||||||
MainMenuEnvironment env = (MainMenuEnvironment)container.Resolve<CurrentSceneEnvironment>();
|
MainMenuEnvironment env = (MainMenuEnvironment)container.Resolve<CurrentSceneEnvironment>();
|
||||||
|
|
||||||
env.TransitVariables(_mainMenuEnvironment);
|
env.TransitVariables(_mainMenuEnvironment);
|
||||||
|
|
||||||
|
ILoadingManager loadingManager = container.Resolve<ILoadingManager>();
|
||||||
|
|
||||||
|
loadingManager
|
||||||
|
.UnregisterLoading(LoadingWork.LoadScene);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
using Code.App.Loading;
|
||||||
using Code.Audio;
|
using Code.Audio;
|
||||||
using Code.Gameplay.Camera;
|
using Code.Gameplay.Camera;
|
||||||
using Code.Gameplay.Player;
|
using Code.Gameplay.Player;
|
||||||
@@ -10,6 +11,7 @@ namespace Code.App.StateMachine
|
|||||||
{
|
{
|
||||||
public class AppStateMachineContext
|
public class AppStateMachineContext
|
||||||
{
|
{
|
||||||
|
[Inject] public ILoadingManager LoadingManager { get; private set; }
|
||||||
[Inject] public ISceneLoaderService SceneLoaderService { get; private set; }
|
[Inject] public ISceneLoaderService SceneLoaderService { get; private set; }
|
||||||
[Inject] public IInputService InputService { get; private set; }
|
[Inject] public IInputService InputService { get; private set; }
|
||||||
[Inject] public AppStateMachine StateMachine { get; private set; }
|
[Inject] public AppStateMachine StateMachine { get; private set; }
|
||||||
|
|||||||
@@ -16,9 +16,6 @@ namespace Code.Audio
|
|||||||
}
|
}
|
||||||
public enum DispatcherSounds
|
public enum DispatcherSounds
|
||||||
{
|
{
|
||||||
Absolutely,
|
|
||||||
AbsolutelyNot,
|
|
||||||
AhFreeman,
|
|
||||||
Recieve1,
|
Recieve1,
|
||||||
Recieve2,
|
Recieve2,
|
||||||
TakeDamage1,
|
TakeDamage1,
|
||||||
|
|||||||
@@ -31,13 +31,16 @@ namespace Code.Audio
|
|||||||
_courierGroup,
|
_courierGroup,
|
||||||
_enemiesGroup;
|
_enemiesGroup;
|
||||||
|
|
||||||
private readonly AudioSourcePool _audioSourcePool = new();
|
private readonly AudioSourcePool _audioSourcePool;
|
||||||
|
|
||||||
private Dictionary<AudioSnapshotState, AudioMixerSnapshot> _snapshots = new();
|
private Dictionary<AudioSnapshotState, AudioMixerSnapshot> _snapshots = new();
|
||||||
|
private Dictionary<AudioSourceType, AudioSourceSettingsConfig> _settings;
|
||||||
|
|
||||||
public AudioService(IAudioFactory audioFactory)
|
public AudioService(IAudioFactory audioFactory, Dictionary<AudioSourceType,AudioSourceSettingsConfig> settings)
|
||||||
{
|
{
|
||||||
_audioFactory = audioFactory;
|
_audioFactory = audioFactory;
|
||||||
|
_audioSourcePool = new(settings);
|
||||||
|
_settings = settings;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async UniTask Initialize()
|
public async UniTask Initialize()
|
||||||
@@ -86,7 +89,7 @@ namespace Code.Audio
|
|||||||
if(!_musicAudioSources[musicType])
|
if(!_musicAudioSources[musicType])
|
||||||
{
|
{
|
||||||
_musicAudioSources[musicType] = _audioSourcePool.GetSource();
|
_musicAudioSources[musicType] = _audioSourcePool.GetSource();
|
||||||
_musicAudioSources[musicType].spatialBlend = 0f;
|
_musicAudioSources[musicType].spatialBlend = _settings[AudioSourceType.NoBlend].spatialBlend;
|
||||||
_musicAudioSources[musicType].outputAudioMixerGroup = _musicAudioGroups[musicType];
|
_musicAudioSources[musicType].outputAudioMixerGroup = _musicAudioGroups[musicType];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -164,9 +167,13 @@ namespace Code.Audio
|
|||||||
_audioSourcePool.PlayOneShot(_audioFactory.EnemiesAudios[(int)enemySoundId], position, _enemiesGroup);
|
_audioSourcePool.PlayOneShot(_audioFactory.EnemiesAudios[(int)enemySoundId], position, _enemiesGroup);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Чинить долго и дорого пусть Артёмов будет много, ведь он наш друг
|
||||||
|
public event IAudioService.OnAudioPlayingDelegate OnDispatcherStarted;
|
||||||
|
public event IAudioService.OnAudioPlayingDelegate OnDispatcherEnded;
|
||||||
public void PlayDispatcher(DispatcherSounds dispatcherSoundId)
|
public void PlayDispatcher(DispatcherSounds dispatcherSoundId)
|
||||||
{
|
{
|
||||||
_audioSourcePool.PlayShizo(_audioFactory.DispatcherAudios[(int)dispatcherSoundId], _dispatcherGroup);
|
OnDispatcherStarted?.Invoke();
|
||||||
|
_audioSourcePool.PlayOneShot(_audioFactory.DispatcherAudios[(int)dispatcherSoundId], _dispatcherGroup, AudioSourceType.NoBlend, () => OnDispatcherEnded?.Invoke());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,119 +0,0 @@
|
|||||||
using System.Collections.Generic;
|
|
||||||
using Code.Constants;
|
|
||||||
using UnityEngine;
|
|
||||||
using UnityEngine.Audio;
|
|
||||||
using UnityEngine.Serialization;
|
|
||||||
|
|
||||||
namespace Code.Audio
|
|
||||||
{
|
|
||||||
public class AudioServiceDebug : MonoBehaviour
|
|
||||||
{
|
|
||||||
[SerializeField] private AudioMixer mixer;
|
|
||||||
|
|
||||||
private AudioSource _actionMusicSource;
|
|
||||||
private AudioSource _peacefulMusicSource;
|
|
||||||
[SerializeField] private AudioSource prefab;
|
|
||||||
|
|
||||||
[SerializeField] private AudioResource[] peacefulAudio;
|
|
||||||
[SerializeField] private AudioResource[] actionAudio;
|
|
||||||
|
|
||||||
private AudioMixerGroup _masterGroup,
|
|
||||||
_musicGroup,
|
|
||||||
_actionMusicGroup,
|
|
||||||
_peacefulMusicGroup,
|
|
||||||
_SFXGroup,
|
|
||||||
_creaturesGroup,
|
|
||||||
_dispatcherGroup,
|
|
||||||
_courierGroup,
|
|
||||||
_enemiesGroup;
|
|
||||||
|
|
||||||
private readonly AudioSourcePool _audioSourcePool = new();
|
|
||||||
|
|
||||||
private Dictionary<AudioSnapshotState, AudioMixerSnapshot> _snapshots = new();
|
|
||||||
|
|
||||||
[FormerlySerializedAs("sfxAudio")] [SerializeField] private AudioClip[] sfxAudios;
|
|
||||||
[SerializeField] private AudioClip[] enemiesAudios;
|
|
||||||
[SerializeField] private AudioClip[] dispatcherAudios;
|
|
||||||
|
|
||||||
private void MixerCreated()
|
|
||||||
{
|
|
||||||
_masterGroup = mixer.FindMatchingGroups(AudioGroups.MasterGroup)[0];
|
|
||||||
_actionMusicGroup = mixer.FindMatchingGroups(AudioGroups.ActionMusicGroup)[0];
|
|
||||||
_peacefulMusicGroup = mixer.FindMatchingGroups(AudioGroups.PeacefulMusicGroup)[0];
|
|
||||||
_SFXGroup = mixer.FindMatchingGroups(AudioGroups.SFXGroup)[0];
|
|
||||||
_musicGroup = mixer.FindMatchingGroups(AudioGroups.MusicGroup)[0];
|
|
||||||
_creaturesGroup = mixer.FindMatchingGroups(AudioGroups.CreaturesGroup)[0];
|
|
||||||
_dispatcherGroup = mixer.FindMatchingGroups(AudioGroups.DispatcherMusicGroup)[0];
|
|
||||||
_courierGroup = mixer.FindMatchingGroups(AudioGroups.CourierMusicGroup)[0];
|
|
||||||
_enemiesGroup = mixer.FindMatchingGroups(AudioGroups.EnemiesMusicGroup)[0];
|
|
||||||
|
|
||||||
_snapshots[AudioSnapshotState.Peaceful] = mixer.FindSnapshot(AudioGroups.PeacefulSnapshot);
|
|
||||||
_snapshots[AudioSnapshotState.Action] = mixer.FindSnapshot(AudioGroups.ActionSnapshot);
|
|
||||||
|
|
||||||
// _audioSourcePool.Initialize(10,prefab);
|
|
||||||
|
|
||||||
InitializeMusicSources();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void InitializeMusicSources()
|
|
||||||
{
|
|
||||||
_actionMusicSource = _audioSourcePool.GetSource();
|
|
||||||
_actionMusicSource.outputAudioMixerGroup = _actionMusicGroup;
|
|
||||||
_actionMusicSource.spatialBlend = 0f;
|
|
||||||
|
|
||||||
_peacefulMusicSource = _audioSourcePool.GetSource();
|
|
||||||
_peacefulMusicSource.outputAudioMixerGroup = _peacefulMusicGroup;
|
|
||||||
_peacefulMusicSource.spatialBlend = 0f;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void Start()
|
|
||||||
{
|
|
||||||
MixerCreated();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void PlayRandomGameplayMusic()
|
|
||||||
{
|
|
||||||
_peacefulMusicSource.resource = peacefulAudio[Random.Range(0, peacefulAudio.Length)];
|
|
||||||
_actionMusicSource.resource = actionAudio[Random.Range(0, actionAudio.Length)];
|
|
||||||
|
|
||||||
_peacefulMusicSource.Play();
|
|
||||||
_actionMusicSource.Play();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void TransitToSnapshot(AudioSnapshotState state)
|
|
||||||
{
|
|
||||||
_snapshots[state].TransitionTo(1f);
|
|
||||||
}
|
|
||||||
|
|
||||||
#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
|
|
||||||
public void PlaySFX(SFXSounds sfxId, Vector3 position)
|
|
||||||
{
|
|
||||||
_audioSourcePool.PlayOneShot(sfxAudios[(int)sfxId], position, _SFXGroup);
|
|
||||||
}
|
|
||||||
public void PlayDebugSFX()
|
|
||||||
{
|
|
||||||
_audioSourcePool.PlayOneShot(sfxAudios[(int)SFXSounds.Crowbar], transform.position, _SFXGroup);
|
|
||||||
}
|
|
||||||
public void PlayEnemy(EnemiesSounds enemySoundId, Vector3 position)
|
|
||||||
{
|
|
||||||
_audioSourcePool.PlayOneShot(enemiesAudios[(int)enemySoundId], position, _enemiesGroup);
|
|
||||||
}
|
|
||||||
public void PlayDebugEnemySFX()
|
|
||||||
{
|
|
||||||
_audioSourcePool.PlayOneShot(enemiesAudios[(int)EnemiesSounds.Bastard], transform.position, _enemiesGroup);
|
|
||||||
}
|
|
||||||
public void PlayDispatcher(DispatcherSounds dispatcherSoundId)
|
|
||||||
{
|
|
||||||
_audioSourcePool.PlayShizo(dispatcherAudios[(int)dispatcherSoundId], _dispatcherGroup);
|
|
||||||
}
|
|
||||||
public void PlayDebugDispatcherSFX()
|
|
||||||
{
|
|
||||||
_audioSourcePool.PlayShizo(dispatcherAudios[(int)DispatcherSounds.AhFreeman], _dispatcherGroup);
|
|
||||||
}
|
|
||||||
|
|
||||||
#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: a42cad8f28f54a53bef23d9313014abd
|
|
||||||
timeCreated: 1762805867
|
|
||||||
@@ -1,7 +1,11 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using Code.Configs;
|
||||||
using Cysharp.Threading.Tasks;
|
using Cysharp.Threading.Tasks;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.Audio;
|
using UnityEngine.Audio;
|
||||||
using UnityEngine.Pool;
|
using UnityEngine.Pool;
|
||||||
|
using Object = UnityEngine.Object;
|
||||||
|
|
||||||
namespace Code.Audio
|
namespace Code.Audio
|
||||||
{
|
{
|
||||||
@@ -11,6 +15,10 @@ namespace Code.Audio
|
|||||||
private IObjectPool<AudioSource> _pool;
|
private IObjectPool<AudioSource> _pool;
|
||||||
private GameObject _sourcePrefab;
|
private GameObject _sourcePrefab;
|
||||||
|
|
||||||
|
private Dictionary<AudioSourceType, AudioSourceSettingsConfig> _settings;
|
||||||
|
|
||||||
|
public AudioSourcePool(Dictionary<AudioSourceType, AudioSourceSettingsConfig> settings) => _settings = settings;
|
||||||
|
|
||||||
public void Initialize(GameObject sourcePrefab)
|
public void Initialize(GameObject sourcePrefab)
|
||||||
{
|
{
|
||||||
_sourcePrefab = sourcePrefab;
|
_sourcePrefab = sourcePrefab;
|
||||||
@@ -55,27 +63,27 @@ namespace Code.Audio
|
|||||||
Object.Destroy(source.gameObject);
|
Object.Destroy(source.gameObject);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async UniTaskVoid PlayOneShot(AudioClip clip, Vector3 position, AudioMixerGroup audioMixerGroup)
|
public async UniTaskVoid PlayOneShot(AudioClip clip, Vector3 position, AudioMixerGroup audioMixerGroup, AudioSourceType audioSourceType = AudioSourceType.NoBlend, Action onComplete = null)
|
||||||
{
|
{
|
||||||
AudioSource source = _pool.Get();
|
AudioSource source = _pool.Get();
|
||||||
source.PlayOneShot(clip);
|
source.PlayOneShot(clip);
|
||||||
source.spatialBlend = 1f;
|
source.spatialBlend = _settings[audioSourceType].spatialBlend;
|
||||||
source.transform.position = position;
|
source.transform.position = position;
|
||||||
source.outputAudioMixerGroup = audioMixerGroup;
|
source.outputAudioMixerGroup = audioMixerGroup;
|
||||||
|
|
||||||
await UniTask.WaitUntilValueChanged(source, x => x.isPlaying);
|
await UniTask.WaitUntilValueChanged(source, x => x.isPlaying);
|
||||||
|
onComplete?.Invoke();
|
||||||
_pool.Release(source);
|
_pool.Release(source);
|
||||||
}
|
}
|
||||||
public async UniTaskVoid PlayShizo(AudioClip clip, AudioMixerGroup audioMixerGroup)
|
public async UniTaskVoid PlayOneShot(AudioClip clip, AudioMixerGroup audioMixerGroup, AudioSourceType audioSourceType = AudioSourceType.NoBlend, Action onComplete = null)
|
||||||
{
|
{
|
||||||
AudioSource source = _pool.Get();
|
AudioSource source = _pool.Get();
|
||||||
source.PlayOneShot(clip);
|
source.PlayOneShot(clip);
|
||||||
source.spatialBlend = 0f;
|
source.spatialBlend = _settings[audioSourceType].spatialBlend;
|
||||||
source.outputAudioMixerGroup = audioMixerGroup;
|
source.outputAudioMixerGroup = audioMixerGroup;
|
||||||
|
|
||||||
await UniTask.WaitUntilValueChanged(source, x => x.isPlaying);
|
await UniTask.WaitUntilValueChanged(source, x => x.isPlaying);
|
||||||
|
onComplete?.Invoke();
|
||||||
_pool.Release(source);
|
_pool.Release(source);
|
||||||
}
|
}
|
||||||
public AudioSource GetSource() => _pool.Get();
|
public AudioSource GetSource() => _pool.Get();
|
||||||
|
|||||||
@@ -0,0 +1,8 @@
|
|||||||
|
namespace Code.Audio
|
||||||
|
{
|
||||||
|
public enum AudioSourceType
|
||||||
|
{
|
||||||
|
Full3D,
|
||||||
|
NoBlend
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 260bbb19b55049928b9ab4d55b32fc3f
|
||||||
|
timeCreated: 1763849966
|
||||||
@@ -14,6 +14,11 @@ namespace Code.Audio
|
|||||||
void TransitToSnapshot(AudioSnapshotState state, float time = 1f);
|
void TransitToSnapshot(AudioSnapshotState state, float time = 1f);
|
||||||
void PlaySFX(SFXSounds sfxId, Vector3 position);
|
void PlaySFX(SFXSounds sfxId, Vector3 position);
|
||||||
void PlayEnemy(EnemiesSounds enemySoundId, Vector3 position);
|
void PlayEnemy(EnemiesSounds enemySoundId, Vector3 position);
|
||||||
|
|
||||||
|
delegate void OnAudioPlayingDelegate();
|
||||||
|
|
||||||
|
event OnAudioPlayingDelegate OnDispatcherStarted;
|
||||||
|
event OnAudioPlayingDelegate OnDispatcherEnded;
|
||||||
void PlayDispatcher(DispatcherSounds dispatcherSoundId);
|
void PlayDispatcher(DispatcherSounds dispatcherSoundId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
using Code.Audio;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Code.Configs
|
||||||
|
{
|
||||||
|
[CreateAssetMenu(fileName = "AudioSourceSettingsConfig", menuName = "Audio/AudioSourceSettingsConfig")]
|
||||||
|
public class AudioSourceSettingsConfig : ScriptableObject
|
||||||
|
{
|
||||||
|
// Дополнять по мере необходимости
|
||||||
|
public float spatialBlend;
|
||||||
|
|
||||||
|
public AudioSourceType sourceType;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: e6406ab390b74d5ca336d7d4d0e1a732
|
||||||
|
timeCreated: 1763850008
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
using Code.Gameplay.Camera;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Code.Configs
|
||||||
|
{
|
||||||
|
[CreateAssetMenu(fileName = "CameraSettingsConfig", menuName = "Config/CameraSettingsConfig")]
|
||||||
|
public class CameraSettingsConfig : ScriptableObject
|
||||||
|
{
|
||||||
|
// Дополнять по мере необходимости
|
||||||
|
public float fov;
|
||||||
|
|
||||||
|
public CameraMode cameraMode;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 6610b94e9823401c94533e1756a97195
|
||||||
|
timeCreated: 1763846744
|
||||||
@@ -10,9 +10,9 @@ namespace Code.Gameplay.Camera
|
|||||||
*/
|
*/
|
||||||
public enum CameraMode
|
public enum CameraMode
|
||||||
{
|
{
|
||||||
Bogdan,
|
None,
|
||||||
Static,
|
Static,
|
||||||
UltraStatic,
|
MainMenu,
|
||||||
FirstPerson,
|
FirstPerson,
|
||||||
ThirdPerson,
|
ThirdPerson,
|
||||||
Cinematic
|
Cinematic
|
||||||
|
|||||||
@@ -9,12 +9,13 @@ namespace Code.Gameplay.Camera
|
|||||||
// Текущий режим работы камеры
|
// Текущий режим работы камеры
|
||||||
public override void Initialize()
|
public override void Initialize()
|
||||||
{
|
{
|
||||||
|
States.Add(CameraMode.None, new NoneState(StateMachineContext));
|
||||||
States.Add(CameraMode.Static, new StaticState(StateMachineContext));
|
States.Add(CameraMode.Static, new StaticState(StateMachineContext));
|
||||||
States.Add(CameraMode.UltraStatic, new UltraStaticState(StateMachineContext));
|
States.Add(CameraMode.MainMenu, new MainMenuState(StateMachineContext));
|
||||||
States.Add(CameraMode.FirstPerson, new FirstPersonState(StateMachineContext));
|
States.Add(CameraMode.FirstPerson, new FirstPersonState(StateMachineContext));
|
||||||
States.Add(CameraMode.ThirdPerson, new ThirdPersonState(StateMachineContext));
|
States.Add(CameraMode.ThirdPerson, new ThirdPersonState(StateMachineContext));
|
||||||
|
|
||||||
CurrentBaseState = States[CameraMode.UltraStatic];
|
CurrentBaseState = States[CameraMode.None];
|
||||||
}
|
}
|
||||||
|
|
||||||
public UnityEngine.Camera Camera => StateMachineContext.Camera;
|
public UnityEngine.Camera Camera => StateMachineContext.Camera;
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
using System.Collections.Generic;
|
||||||
using Code.Configs;
|
using Code.Configs;
|
||||||
using Code.Input;
|
using Code.Input;
|
||||||
using Reflex.Attributes;
|
using Reflex.Attributes;
|
||||||
@@ -9,5 +10,6 @@ namespace Code.Gameplay.Camera
|
|||||||
[Inject] public UnityEngine.Camera Camera;
|
[Inject] public UnityEngine.Camera Camera;
|
||||||
[Inject] public CameraConfig Config;
|
[Inject] public CameraConfig Config;
|
||||||
[Inject] public IInputService InputService;
|
[Inject] public IInputService InputService;
|
||||||
|
[Inject] public Dictionary<CameraMode,CameraSettingsConfig> CameraSettingsConfigs;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -14,6 +14,8 @@ namespace Code.Gameplay.Camera.CameraStates
|
|||||||
|
|
||||||
public override void EnterState()
|
public override void EnterState()
|
||||||
{
|
{
|
||||||
|
base.EnterState();
|
||||||
|
|
||||||
// В FirstPerson режиме дистанция всегда равна 0
|
// В FirstPerson режиме дистанция всегда равна 0
|
||||||
MinDistance = 0f;
|
MinDistance = 0f;
|
||||||
MaxDistance = 0f;
|
MaxDistance = 0f;
|
||||||
@@ -21,7 +23,7 @@ namespace Code.Gameplay.Camera.CameraStates
|
|||||||
TargetDistance = 0f;
|
TargetDistance = 0f;
|
||||||
CurrentDistance = 0f;
|
CurrentDistance = 0f;
|
||||||
|
|
||||||
base.EnterState();
|
Camera.fieldOfView = Context.CameraSettingsConfigs[CameraMode.FirstPerson].fov;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void HandlePosition(float deltaTime, float zoomInput, Quaternion targetRotation)
|
protected override void HandlePosition(float deltaTime, float zoomInput, Quaternion targetRotation)
|
||||||
|
|||||||
+5
-4
@@ -2,14 +2,15 @@ using UnityEngine;
|
|||||||
|
|
||||||
namespace Code.Gameplay.Camera.CameraStates
|
namespace Code.Gameplay.Camera.CameraStates
|
||||||
{
|
{
|
||||||
public class UltraStaticState : BaseCameraState, ICameraState
|
public class MainMenuState : BaseCameraState, ICameraState
|
||||||
{
|
{
|
||||||
public UltraStaticState(CameraStateMachineContext context) : base(context) { }
|
public MainMenuState(CameraStateMachineContext context) : base(context) { }
|
||||||
|
|
||||||
public override void EnterState()
|
public override void EnterState()
|
||||||
{
|
{
|
||||||
Debug.Log("Ultra static State Enter");
|
|
||||||
base.EnterState();
|
base.EnterState();
|
||||||
|
|
||||||
|
Camera.fieldOfView = Context.CameraSettingsConfigs[CameraMode.MainMenu].fov;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void HandlePosition(float deltaTime, float zoomInput, Quaternion targetRotation)
|
protected override void HandlePosition(float deltaTime, float zoomInput, Quaternion targetRotation)
|
||||||
@@ -17,7 +18,7 @@ namespace Code.Gameplay.Camera.CameraStates
|
|||||||
Camera.transform.position = FollowTransform.position;
|
Camera.transform.position = FollowTransform.position;
|
||||||
}
|
}
|
||||||
|
|
||||||
public CameraMode GetCameraMode() => CameraMode.UltraStatic;
|
public CameraMode GetCameraMode() => CameraMode.MainMenu;
|
||||||
|
|
||||||
protected override void HandleRotationInput(float deltaTime, Vector3 rotationInput,
|
protected override void HandleRotationInput(float deltaTime, Vector3 rotationInput,
|
||||||
out Quaternion targetRotation)
|
out Quaternion targetRotation)
|
||||||
File renamed without changes.
@@ -0,0 +1,21 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Code.Gameplay.Camera.CameraStates
|
||||||
|
{
|
||||||
|
public class NoneState : BaseCameraState, ICameraState
|
||||||
|
{
|
||||||
|
public NoneState(CameraStateMachineContext context) : base(context) { }
|
||||||
|
|
||||||
|
protected override void HandlePosition(float deltaTime, float zoomInput, Quaternion targetRotation)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public CameraMode GetCameraMode() => CameraMode.None;
|
||||||
|
|
||||||
|
protected override void HandleRotationInput(float deltaTime, Vector3 rotationInput,
|
||||||
|
out Quaternion targetRotation)
|
||||||
|
{
|
||||||
|
targetRotation = Quaternion.identity;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: d8fa6119113f4f12a35365fd27387124
|
||||||
|
timeCreated: 1763847889
|
||||||
@@ -9,8 +9,9 @@ namespace Code.Gameplay.Camera.CameraStates
|
|||||||
|
|
||||||
public override void EnterState()
|
public override void EnterState()
|
||||||
{
|
{
|
||||||
Debug.Log("Static State Enter");
|
|
||||||
base.EnterState();
|
base.EnterState();
|
||||||
|
|
||||||
|
Camera.fieldOfView = Context.CameraSettingsConfigs[CameraMode.Static].fov;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void HandlePosition(float deltaTime, float zoomInput, Quaternion targetRotation)
|
protected override void HandlePosition(float deltaTime, float zoomInput, Quaternion targetRotation)
|
||||||
|
|||||||
@@ -14,13 +14,13 @@ namespace Code.Gameplay.Camera.CameraStates
|
|||||||
|
|
||||||
public override void EnterState()
|
public override void EnterState()
|
||||||
{
|
{
|
||||||
|
base.EnterState();
|
||||||
|
|
||||||
// Восстанавливаем исходные значения дистанции
|
// Восстанавливаем исходные значения дистанции
|
||||||
MinDistance = OriginalMinDistance;
|
MinDistance = OriginalMinDistance;
|
||||||
MaxDistance = OriginalMaxDistance;
|
MaxDistance = OriginalMaxDistance;
|
||||||
DefaultDistance = OriginalDefaultDistance;
|
DefaultDistance = OriginalDefaultDistance;
|
||||||
TargetDistance = DefaultDistance;
|
TargetDistance = DefaultDistance;
|
||||||
|
|
||||||
base.EnterState();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void HandlePosition(float deltaTime, float zoomInput, Quaternion targetRotation)
|
protected override void HandlePosition(float deltaTime, float zoomInput, Quaternion targetRotation)
|
||||||
|
|||||||
@@ -180,7 +180,6 @@ namespace Code.Gameplay.Character.Controller
|
|||||||
// Заготовка на будущее (если понадобится)
|
// Заготовка на будущее (если понадобится)
|
||||||
case CameraMode.Static:
|
case CameraMode.Static:
|
||||||
case CameraMode.Cinematic:
|
case CameraMode.Cinematic:
|
||||||
case CameraMode.Bogdan: // Скорее всего юзлес, но пускай будет
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,19 +5,44 @@ namespace Code.Gameplay.Door
|
|||||||
{
|
{
|
||||||
public class CinematicDoorOpening
|
public class CinematicDoorOpening
|
||||||
{
|
{
|
||||||
public DamnDoor DamnDoor;
|
private MainMenuDoor _mainMenuDoor;
|
||||||
public Light DoorLight;
|
private Light _doorLight;
|
||||||
|
|
||||||
public void PreOpen(bool start)
|
public CinematicDoorOpening(MainMenuDoor mainMenuDoor, Light doorLight)
|
||||||
{
|
{
|
||||||
DoorLight.DOColor(start ? Color.yellow : Color.red, 0.2f);
|
_mainMenuDoor = mainMenuDoor;
|
||||||
|
_doorLight = doorLight;
|
||||||
|
}
|
||||||
|
public void PreOpen(int type)
|
||||||
|
{
|
||||||
|
switch (type)
|
||||||
|
{
|
||||||
|
case 0:
|
||||||
|
_doorLight.DOColor(Color.green, 0.2f);
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
_doorLight.DOColor(Color.yellow, 0.2f);
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
_doorLight.DOColor(Color.red, 0.2f);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
DamnDoor.Petlya.DORotate(new Vector3(0, -40, 0), 1f);
|
_mainMenuDoor.Petlya.DORotate(new Vector3(0, -10, 0), 1f);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Close()
|
public void Close()
|
||||||
{
|
{
|
||||||
DamnDoor.Petlya.DORotate(new Vector3(0, 0, 0), 1f);
|
_mainMenuDoor.Petlya.DORotate(new Vector3(0, 0, 0), 1f);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[System.Serializable]
|
||||||
|
public class MainMenuUIVariables
|
||||||
|
{
|
||||||
|
public MainMenuDoor MainMenuDoor;
|
||||||
|
public Light DoorLight;
|
||||||
|
public Color ButtonDefaultColor;
|
||||||
|
public Color ButtonHoverColor;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+1
-1
@@ -2,7 +2,7 @@ using UnityEngine;
|
|||||||
|
|
||||||
namespace Code.Gameplay.Door
|
namespace Code.Gameplay.Door
|
||||||
{
|
{
|
||||||
public class DamnDoor : MonoBehaviour
|
public class MainMenuDoor : MonoBehaviour
|
||||||
{
|
{
|
||||||
[SerializeField] Rigidbody rigidbody;
|
[SerializeField] Rigidbody rigidbody;
|
||||||
[SerializeField] private Transform petlya;
|
[SerializeField] private Transform petlya;
|
||||||
File renamed without changes.
@@ -2,19 +2,24 @@ namespace Code.Gameplay.Orders.Order
|
|||||||
{
|
{
|
||||||
public interface IOrderService
|
public interface IOrderService
|
||||||
{
|
{
|
||||||
|
delegate void OrderFailureDelegate();
|
||||||
|
|
||||||
delegate void OrderProgressDelegate(float time);
|
delegate void OrderProgressDelegate(float time);
|
||||||
|
|
||||||
event OrderProgressDelegate OnOrderGiven;
|
event OrderProgressDelegate OnOrderGiven;
|
||||||
event OrderProgressDelegate OnOrderRecieved;
|
event OrderProgressDelegate OnOrderRecieved;
|
||||||
|
event OrderFailureDelegate OnOrderFailure;
|
||||||
|
|
||||||
delegate void OrderDeliveredDelegate(int score, float time);
|
delegate void OrderDeliveredDelegate(int score, float time);
|
||||||
|
|
||||||
event OrderDeliveredDelegate OnOrderDelivered;
|
event OrderDeliveredDelegate OnOrderDelivered;
|
||||||
OrderState OrderState { get; }
|
OrderState OrderState { get; }
|
||||||
|
float DeliveryTimer { get; }
|
||||||
void RoomPassed();
|
void RoomPassed();
|
||||||
float DecreaseTimer(float delta);
|
void DecreaseTimer(float delta);
|
||||||
void OrderGive();
|
void OrderGive();
|
||||||
void OrderRecieved();
|
void OrderRecieved();
|
||||||
void OrderDelivered();
|
void OrderDelivered();
|
||||||
|
void OrderFailed();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
namespace Code.Gameplay.Orders.Order
|
|
||||||
{
|
|
||||||
public interface IScoreService
|
|
||||||
{
|
|
||||||
int Score { get; }
|
|
||||||
void IncreaseScore(int amount);
|
|
||||||
void DecreaseScore(int amount);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 64668c9ef4c441af84c635365cfbb2de
|
|
||||||
timeCreated: 1763559523
|
|
||||||
@@ -11,7 +11,7 @@ namespace Code.Gameplay.Orders.Order
|
|||||||
{
|
{
|
||||||
[Inject] private IOrderService _orderService;
|
[Inject] private IOrderService _orderService;
|
||||||
public Rigidbody rigidbody;
|
public Rigidbody rigidbody;
|
||||||
[SerializeField] private bool _pickupMode;
|
private bool _pickupMode;
|
||||||
// [SerializeField] private AnimationCurve debugCurve;
|
// [SerializeField] private AnimationCurve debugCurve;
|
||||||
|
|
||||||
//DEBUG
|
//DEBUG
|
||||||
@@ -41,9 +41,7 @@ namespace Code.Gameplay.Orders.Order
|
|||||||
|
|
||||||
public async UniTaskVoid SwitchMode()
|
public async UniTaskVoid SwitchMode()
|
||||||
{
|
{
|
||||||
Debug.LogWarning("Activating");
|
|
||||||
await UniTask.WaitForSeconds(_activationTime);
|
await UniTask.WaitForSeconds(_activationTime);
|
||||||
Debug.LogWarning("Available");
|
|
||||||
_pickupMode = true;
|
_pickupMode = true;
|
||||||
rigidbody.isKinematic = true;
|
rigidbody.isKinematic = true;
|
||||||
_capturedPosition = transform.position;
|
_capturedPosition = transform.position;
|
||||||
@@ -62,7 +60,6 @@ namespace Code.Gameplay.Orders.Order
|
|||||||
if (_timeForMoving > _curveLength) _timeForMoving = 0;
|
if (_timeForMoving > _curveLength) _timeForMoving = 0;
|
||||||
|
|
||||||
transform.position = _capturedPosition + new Vector3(0, _floatingCurve.Evaluate(_timeForMoving), 0);
|
transform.position = _capturedPosition + new Vector3(0, _floatingCurve.Evaluate(_timeForMoving), 0);
|
||||||
Debug.Log(transform.position);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
using Code.Audio;
|
|
||||||
using Code.Configs;
|
using Code.Configs;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
using Random = UnityEngine.Random;
|
||||||
|
|
||||||
namespace Code.Gameplay.Orders.Order
|
namespace Code.Gameplay.Orders.Order
|
||||||
{
|
{
|
||||||
@@ -9,11 +9,13 @@ namespace Code.Gameplay.Orders.Order
|
|||||||
public event IOrderService.OrderProgressDelegate OnOrderGiven;
|
public event IOrderService.OrderProgressDelegate OnOrderGiven;
|
||||||
public event IOrderService.OrderProgressDelegate OnOrderRecieved;
|
public event IOrderService.OrderProgressDelegate OnOrderRecieved;
|
||||||
public event IOrderService.OrderDeliveredDelegate OnOrderDelivered;
|
public event IOrderService.OrderDeliveredDelegate OnOrderDelivered;
|
||||||
|
public event IOrderService.OrderFailureDelegate OnOrderFailure;
|
||||||
|
|
||||||
private OrderState _orderState;
|
private OrderState _orderState;
|
||||||
public OrderState OrderState => _orderState;
|
public OrderState OrderState => _orderState;
|
||||||
|
|
||||||
private float _deliveryTimer = 0.0f;
|
private float _deliveryTimer;
|
||||||
|
public float DeliveryTimer => _deliveryTimer;
|
||||||
|
|
||||||
private Vector2 _timeBounds;
|
private Vector2 _timeBounds;
|
||||||
private float _koefRooms, _koefOvertime;
|
private float _koefRooms, _koefOvertime;
|
||||||
@@ -30,10 +32,7 @@ namespace Code.Gameplay.Orders.Order
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void RoomPassed() => _roomsPassed++;
|
public void RoomPassed() => _roomsPassed++;
|
||||||
public float DecreaseTimer(float delta)
|
public void DecreaseTimer(float delta) => _deliveryTimer -= delta;
|
||||||
{
|
|
||||||
return _deliveryTimer -= delta;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void OrderGive()
|
public void OrderGive()
|
||||||
{
|
{
|
||||||
@@ -49,9 +48,16 @@ namespace Code.Gameplay.Orders.Order
|
|||||||
_orderState = OrderState.Recieved;
|
_orderState = OrderState.Recieved;
|
||||||
OnOrderRecieved?.Invoke(_deliveryTimer);
|
OnOrderRecieved?.Invoke(_deliveryTimer);
|
||||||
}
|
}
|
||||||
|
public void OrderFailed() => OnOrderFailure?.Invoke();
|
||||||
|
|
||||||
public void OrderDelivered()
|
public void OrderDelivered()
|
||||||
{
|
{
|
||||||
|
if (_orderState != OrderState.Recieved)
|
||||||
|
{
|
||||||
|
OnOrderFailure?.Invoke();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
_orderState = OrderState.Delivered;
|
_orderState = OrderState.Delivered;
|
||||||
|
|
||||||
int score = (int)(_koefRooms * _roomsPassed + _deliveryTimer * _koefOvertime);
|
int score = (int)(_koefRooms * _roomsPassed + _deliveryTimer * _koefOvertime);
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
namespace Code.Gameplay.Orders.Order
|
|
||||||
{
|
|
||||||
public class ScoreService : IScoreService
|
|
||||||
{
|
|
||||||
private int _score;
|
|
||||||
public int Score => _score;
|
|
||||||
|
|
||||||
public void IncreaseScore(int amount) => _score += amount;
|
|
||||||
public void DecreaseScore(int amount) => _score -= amount;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 619f2425460843aaa1f0f21e302158ce
|
|
||||||
timeCreated: 1763559528
|
|
||||||
@@ -8,7 +8,6 @@ namespace Code.Gameplay.Player
|
|||||||
public interface IPlayerFactory
|
public interface IPlayerFactory
|
||||||
{
|
{
|
||||||
PlayerHealth CreatePlayerHealth(int count = -1);
|
PlayerHealth CreatePlayerHealth(int count = -1);
|
||||||
PlayerMoney CreatePlayerMoney(int count = 0);
|
|
||||||
UniTask<CharacterProvider> CreatePlayer();
|
UniTask<CharacterProvider> CreatePlayer();
|
||||||
void ReleasePlayer(CharacterProvider characterProvider);
|
void ReleasePlayer(CharacterProvider characterProvider);
|
||||||
UniTask<ArmsMeshProvider> CreateArms(Transform papochka);
|
UniTask<ArmsMeshProvider> CreateArms(Transform papochka);
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
namespace Code.Gameplay.Player
|
||||||
|
{
|
||||||
|
public interface IPlayerScore
|
||||||
|
{
|
||||||
|
event PlayerScore.OnScoreGetDelegate OnScoreGet;
|
||||||
|
event PlayerScore.OnScoreLooseDelegate OnScoreLoose;
|
||||||
|
int Score { get; }
|
||||||
|
void UpdateScore(int amount);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5084b2568ebd4cddaef2154e5ad1f870
|
||||||
|
timeCreated: 1763890486
|
||||||
@@ -21,7 +21,6 @@ namespace Code.Gameplay.Player
|
|||||||
|
|
||||||
return new(count);
|
return new(count);
|
||||||
}
|
}
|
||||||
public PlayerMoney CreatePlayerMoney(int count = 0) => new(count);
|
|
||||||
|
|
||||||
public async UniTask<CharacterProvider> CreatePlayer()
|
public async UniTask<CharacterProvider> CreatePlayer()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -28,5 +28,11 @@ namespace Code.Gameplay.Player
|
|||||||
_healthPoints = maxHealthPoints;
|
_healthPoints = maxHealthPoints;
|
||||||
MaxHealthPoints = maxHealthPoints;
|
MaxHealthPoints = maxHealthPoints;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void InstaKill()
|
||||||
|
{
|
||||||
|
_healthPoints = 0;
|
||||||
|
OnDeath?.Invoke();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
namespace Code.Gameplay.Player
|
|
||||||
{
|
|
||||||
public class PlayerMoney
|
|
||||||
{
|
|
||||||
public delegate void OnMoneyGetDelegate(int count, int money);
|
|
||||||
public event OnMoneyGetDelegate OnMoneyGet;
|
|
||||||
public delegate void OnMoneyLooseDelegate(int count, int money);
|
|
||||||
public event OnMoneyLooseDelegate OnMoneyLoose;
|
|
||||||
|
|
||||||
private int _money;
|
|
||||||
public int Money => _money;
|
|
||||||
|
|
||||||
public void GiveMoney(int amount)
|
|
||||||
{
|
|
||||||
_money += amount;
|
|
||||||
OnMoneyGet?.Invoke(amount, _money);
|
|
||||||
}
|
|
||||||
public void LooseMoney(int amount)
|
|
||||||
{
|
|
||||||
_money -= amount;
|
|
||||||
OnMoneyLoose?.Invoke(amount, _money);
|
|
||||||
}
|
|
||||||
|
|
||||||
public PlayerMoney(int money) => _money = money;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
namespace Code.Gameplay.Player
|
||||||
|
{
|
||||||
|
public class PlayerScore : IPlayerScore
|
||||||
|
{
|
||||||
|
public delegate void OnScoreGetDelegate(int count, int score);
|
||||||
|
|
||||||
|
public event OnScoreGetDelegate OnScoreGet;
|
||||||
|
|
||||||
|
public delegate void OnScoreLooseDelegate(int count, int score);
|
||||||
|
|
||||||
|
public event OnScoreLooseDelegate OnScoreLoose;
|
||||||
|
|
||||||
|
private int _score;
|
||||||
|
public int Score => _score;
|
||||||
|
|
||||||
|
public void UpdateScore(int amount)
|
||||||
|
{
|
||||||
|
_score += amount;
|
||||||
|
|
||||||
|
if (amount > 0) OnScoreGet?.Invoke(amount, _score);
|
||||||
|
else OnScoreLoose?.Invoke(amount, _score);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
File renamed without changes.
@@ -2,6 +2,6 @@ namespace Code.Input
|
|||||||
{
|
{
|
||||||
public enum UIActions
|
public enum UIActions
|
||||||
{
|
{
|
||||||
|
Continue
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
using Code.Gameplay.Door;
|
using Code.Gameplay.Door;
|
||||||
|
using Code.UI.Panels.Etc;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.Experimental.GlobalIllumination;
|
using UnityEngine.Experimental.GlobalIllumination;
|
||||||
|
using UnityEngine.Serialization;
|
||||||
|
|
||||||
namespace Code.Scenes.SceneEnvironments
|
namespace Code.Scenes.SceneEnvironments
|
||||||
{
|
{
|
||||||
@@ -8,14 +10,20 @@ namespace Code.Scenes.SceneEnvironments
|
|||||||
public class MainMenuEnvironment : CurrentSceneEnvironment
|
public class MainMenuEnvironment : CurrentSceneEnvironment
|
||||||
{
|
{
|
||||||
public Transform cameraPosition;
|
public Transform cameraPosition;
|
||||||
public DamnDoor damnDoor;
|
public MainMenuUIVariables uiVariables;
|
||||||
public Light doorLight;
|
public MainMenuButton startButton;
|
||||||
|
public MainMenuButton settingButton;
|
||||||
|
public MainMenuButton exitButton;
|
||||||
|
public Canvas menuButtonsCanvas;
|
||||||
|
|
||||||
public void TransitVariables(MainMenuEnvironment env)
|
public void TransitVariables(MainMenuEnvironment env)
|
||||||
{
|
{
|
||||||
cameraPosition = env.cameraPosition;
|
cameraPosition = env.cameraPosition;
|
||||||
damnDoor = env.damnDoor;
|
uiVariables = env.uiVariables;
|
||||||
doorLight = env.doorLight;
|
startButton = env.startButton;
|
||||||
|
settingButton = env.settingButton;
|
||||||
|
exitButton = env.exitButton;
|
||||||
|
menuButtonsCanvas = env.menuButtonsCanvas;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,7 +1,9 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
using Code.Audio;
|
||||||
using Code.Configs;
|
using Code.Configs;
|
||||||
|
using Code.Gameplay.Camera;
|
||||||
using Cysharp.Threading.Tasks;
|
using Cysharp.Threading.Tasks;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.AddressableAssets;
|
using UnityEngine.AddressableAssets;
|
||||||
@@ -23,6 +25,8 @@ namespace Code.StaticData
|
|||||||
EnemiesSoundListConfig EnemiesSoundListConfig { get; }
|
EnemiesSoundListConfig EnemiesSoundListConfig { get; }
|
||||||
OrderServiceConfig OrderServiceConfig { get; }
|
OrderServiceConfig OrderServiceConfig { get; }
|
||||||
OrderBoxConfig OrderBoxConfig { get; }
|
OrderBoxConfig OrderBoxConfig { get; }
|
||||||
|
Dictionary<CameraMode, CameraSettingsConfig> CameraSettingsConfigs { get; }
|
||||||
|
Dictionary<AudioSourceType, AudioSourceSettingsConfig> AudioSourceSettingsConfigs { get; }
|
||||||
void Load();
|
void Load();
|
||||||
Task<T> InstantiateAsset<T>(AssetReference assetReference) where T : Behaviour;
|
Task<T> InstantiateAsset<T>(AssetReference assetReference) where T : Behaviour;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,10 @@
|
|||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
using Code.Audio;
|
||||||
using Code.Configs;
|
using Code.Configs;
|
||||||
using Code.Constants;
|
using Code.Constants;
|
||||||
|
using Code.Gameplay.Camera;
|
||||||
using Cysharp.Threading.Tasks;
|
using Cysharp.Threading.Tasks;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.AddressableAssets;
|
using UnityEngine.AddressableAssets;
|
||||||
@@ -23,17 +27,25 @@ namespace Code.StaticData
|
|||||||
public OrderServiceConfig OrderServiceConfig { get; private set; }
|
public OrderServiceConfig OrderServiceConfig { get; private set; }
|
||||||
public OrderBoxConfig OrderBoxConfig { get; private set; }
|
public OrderBoxConfig OrderBoxConfig { get; private set; }
|
||||||
|
|
||||||
|
public Dictionary<CameraMode, CameraSettingsConfig> CameraSettingsConfigs { get; private set; } = new();
|
||||||
|
|
||||||
|
public Dictionary<AudioSourceType, AudioSourceSettingsConfig> AudioSourceSettingsConfigs { get; private set; } = new();
|
||||||
|
|
||||||
public void Load()
|
public void Load()
|
||||||
{
|
{
|
||||||
InputConfig = Resources.Load<InputConfig>(string.Format(StringPaths.ConfigSingle, "App", "InputConfig"));
|
InputConfig = Resources.Load<InputConfig>(string.Format(StringPaths.ConfigSingle, "App", "InputConfig"));
|
||||||
AppConfig = Resources.Load<AppConfig>(string.Format(StringPaths.ConfigSingle, "App", "AppConfig"));
|
AppConfig = Resources.Load<AppConfig>(string.Format(StringPaths.ConfigSingle, "App", "AppConfig"));
|
||||||
CameraConfig = Resources.Load<CameraConfig>(string.Format(StringPaths.ConfigSingle, "App", "CameraConfig"));
|
|
||||||
CharacterConfig = Resources.Load<CharacterConfig>(string.Format(StringPaths.ConfigSingle, "App", "CharacterConfig"));
|
CharacterConfig = Resources.Load<CharacterConfig>(string.Format(StringPaths.ConfigSingle, "App", "CharacterConfig"));
|
||||||
UIConfig = Resources.Load<UIConfig>(string.Format(StringPaths.ConfigSingle, "App", "UIConfig"));
|
UIConfig = Resources.Load<UIConfig>(string.Format(StringPaths.ConfigSingle, "App", "UIConfig"));
|
||||||
PlayerConfig = Resources.Load<PlayerConfig>(string.Format(StringPaths.ConfigSingle, "App", "PlayerConfig"));
|
PlayerConfig = Resources.Load<PlayerConfig>(string.Format(StringPaths.ConfigSingle, "App", "PlayerConfig"));
|
||||||
OrderServiceConfig = Resources.Load<OrderServiceConfig>(string.Format(StringPaths.ConfigSingle, "Gameplay", "OrderServiceConfig"));
|
OrderServiceConfig = Resources.Load<OrderServiceConfig>(string.Format(StringPaths.ConfigSingle, "Gameplay", "OrderServiceConfig"));
|
||||||
OrderBoxConfig = Resources.Load<OrderBoxConfig>(string.Format(StringPaths.ConfigSingle, "Gameplay", "OrderBoxConfig"));
|
OrderBoxConfig = Resources.Load<OrderBoxConfig>(string.Format(StringPaths.ConfigSingle, "Gameplay", "OrderBoxConfig"));
|
||||||
|
|
||||||
|
CameraConfig = Resources.Load<CameraConfig>(string.Format(StringPaths.ConfigSingle, "Camera", "CameraConfig"));
|
||||||
|
CameraSettingsConfigs = Resources
|
||||||
|
.LoadAll<CameraSettingsConfig>(string.Format(StringPaths.ConfigMultiple, "Camera"))
|
||||||
|
.ToDictionary(x => x.cameraMode);
|
||||||
|
|
||||||
LoadAudioConfigs();
|
LoadAudioConfigs();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -44,6 +56,9 @@ namespace Code.StaticData
|
|||||||
SFXListConfig = Resources.Load<SFXListConfig>(string.Format(StringPaths.ConfigSingle, "Audio", "SFXListConfig"));
|
SFXListConfig = Resources.Load<SFXListConfig>(string.Format(StringPaths.ConfigSingle, "Audio", "SFXListConfig"));
|
||||||
DispatcherSoundListConfig = Resources.Load<DispatcherSoundListConfig>(string.Format(StringPaths.ConfigSingle, "Audio", "DispatcherSoundListConfig"));
|
DispatcherSoundListConfig = Resources.Load<DispatcherSoundListConfig>(string.Format(StringPaths.ConfigSingle, "Audio", "DispatcherSoundListConfig"));
|
||||||
EnemiesSoundListConfig = Resources.Load<EnemiesSoundListConfig>(string.Format(StringPaths.ConfigSingle, "Audio", "EnemiesSoundListConfig"));
|
EnemiesSoundListConfig = Resources.Load<EnemiesSoundListConfig>(string.Format(StringPaths.ConfigSingle, "Audio", "EnemiesSoundListConfig"));
|
||||||
|
AudioSourceSettingsConfigs = Resources
|
||||||
|
.LoadAll<AudioSourceSettingsConfig>(string.Format(StringPaths.ConfigMultiple, "Audio"))
|
||||||
|
.ToDictionary(x => x.sourceType);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<T> InstantiateAsset<T>(AssetReference assetReference) where T : Behaviour
|
public async Task<T> InstantiateAsset<T>(AssetReference assetReference) where T : Behaviour
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ namespace Code.UI.Panels.Etc
|
|||||||
public Button button;
|
public Button button;
|
||||||
public Action OnPointerEnterEvent, OnPointerExitEvent;
|
public Action OnPointerEnterEvent, OnPointerExitEvent;
|
||||||
|
|
||||||
public void OnPointerEnter(PointerEventData eventData) => OnPointerEnterEvent?.Invoke();
|
public virtual void OnPointerEnter(PointerEventData eventData) => OnPointerEnterEvent?.Invoke();
|
||||||
public void OnPointerExit(PointerEventData eventData) => OnPointerExitEvent?.Invoke();
|
public virtual void OnPointerExit(PointerEventData eventData) => OnPointerExitEvent?.Invoke();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
using DG.Tweening;
|
||||||
|
using TMPro;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.EventSystems;
|
||||||
|
|
||||||
|
namespace Code.UI.Panels.Etc
|
||||||
|
{
|
||||||
|
public class MainMenuButton : HoverButton
|
||||||
|
{
|
||||||
|
public TMP_Text text;
|
||||||
|
|
||||||
|
public Color defaultColor;
|
||||||
|
public Color hoverColor;
|
||||||
|
|
||||||
|
public override void OnPointerEnter(PointerEventData eventData)
|
||||||
|
{
|
||||||
|
text.DOColor(hoverColor, 0.2f);
|
||||||
|
OnPointerEnterEvent?.Invoke();
|
||||||
|
}
|
||||||
|
public override void OnPointerExit(PointerEventData eventData)
|
||||||
|
{
|
||||||
|
text.DOColor(defaultColor, 0.2f);
|
||||||
|
OnPointerExitEvent?.Invoke();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b0e3f905e0af4d1ab624b1dfe8eaa1df
|
||||||
|
timeCreated: 1763762376
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
using TMPro;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
|
|
||||||
@@ -5,15 +6,25 @@ namespace Code.UI
|
|||||||
{
|
{
|
||||||
public class GameOverPanel : UIElement
|
public class GameOverPanel : UIElement
|
||||||
{
|
{
|
||||||
|
[SerializeField] private TMP_Text scoreText;
|
||||||
|
[SerializeField] private TMP_Text gameOverText;
|
||||||
[SerializeField] private Image _background;
|
[SerializeField] private Image _background;
|
||||||
|
|
||||||
|
public void UpdateScoreText(int score) => scoreText.text = score.ToString();
|
||||||
|
|
||||||
public override void Hide()
|
public override void Hide()
|
||||||
{
|
{
|
||||||
_background.enabled = false;
|
_background.enabled = false;
|
||||||
|
scoreText.enabled = false;
|
||||||
|
gameOverText.enabled = false;
|
||||||
|
base.Hide();
|
||||||
}
|
}
|
||||||
public override void Show()
|
public override void Show()
|
||||||
{
|
{
|
||||||
_background.enabled = true;
|
_background.enabled = true;
|
||||||
|
scoreText.enabled = true;
|
||||||
|
gameOverText.enabled = true;
|
||||||
|
base.Show();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
using Code.Gameplay.Orders.Order;
|
||||||
using Code.Gameplay.Player;
|
using Code.Gameplay.Player;
|
||||||
using DG.Tweening;
|
using DG.Tweening;
|
||||||
using TMPro;
|
using TMPro;
|
||||||
@@ -15,13 +16,17 @@ namespace Code.UI.Panels
|
|||||||
[SerializeField] private float dispatcherTransitionTime = 0.5f;
|
[SerializeField] private float dispatcherTransitionTime = 0.5f;
|
||||||
[Header("Timer")]
|
[Header("Timer")]
|
||||||
[SerializeField] private TMP_Text timer;
|
[SerializeField] private TMP_Text timer;
|
||||||
|
[SerializeField] private Image timerBackGround;
|
||||||
public TMP_Text Timer => timer;
|
public TMP_Text Timer => timer;
|
||||||
|
[SerializeField] private RectTransform timerHiddenPosition;
|
||||||
|
[SerializeField] private RectTransform timerShownPosition;
|
||||||
|
[SerializeField] private float timerTransitionTime = 0.5f;
|
||||||
[Header("HealthBar")]
|
[Header("HealthBar")]
|
||||||
[SerializeField] private Image healthBar;
|
[SerializeField] private Image healthBar;
|
||||||
[Header("MoneyBar")]
|
[Header("MoneyBar")]
|
||||||
[SerializeField] private TMP_Text moneyText;
|
[SerializeField] private TMP_Text moneyText;
|
||||||
|
|
||||||
private void MoneyUpdate(int count, int money)
|
private void ScoreUpdate(int count, int money)
|
||||||
{
|
{
|
||||||
// TODO Анимация получения\потери
|
// TODO Анимация получения\потери
|
||||||
moneyText.text = money.ToString();
|
moneyText.text = money.ToString();
|
||||||
@@ -32,30 +37,47 @@ namespace Code.UI.Panels
|
|||||||
float fillAmount = (float)health.HealthPoints / health.MaxHealthPoints;
|
float fillAmount = (float)health.HealthPoints / health.MaxHealthPoints;
|
||||||
healthBar.fillAmount = fillAmount;
|
healthBar.fillAmount = fillAmount;
|
||||||
}
|
}
|
||||||
public void Initialize(PlayerMoney money, PlayerHealth health)
|
private IOrderService _orderService;
|
||||||
|
|
||||||
|
public void Initialize(IPlayerScore score, PlayerHealth health, IOrderService orderService)
|
||||||
{
|
{
|
||||||
money.OnMoneyGet += MoneyUpdate;
|
score.OnScoreGet += ScoreUpdate;
|
||||||
money.OnMoneyLoose += MoneyUpdate;
|
score.OnScoreLoose += ScoreUpdate;
|
||||||
MoneyUpdate(0,money.Money);
|
ScoreUpdate(0,score.Score);
|
||||||
|
|
||||||
health.OnDamage += HealthUpdate;
|
health.OnDamage += HealthUpdate;
|
||||||
HealthUpdate(0,health);
|
HealthUpdate(0,health);
|
||||||
|
|
||||||
|
_orderService = orderService;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void Update()
|
||||||
|
{
|
||||||
|
if (_orderService != null) timer.text = ((int)_orderService.DeliveryTimer).ToString();
|
||||||
|
}
|
||||||
|
private int _dispatcherCalls;
|
||||||
public void SummonDispatcher()
|
public void SummonDispatcher()
|
||||||
{
|
{
|
||||||
// TODO
|
// TODO
|
||||||
dispatcher.transform.DOMoveX(dispatcherShownPosition.position.x, dispatcherTransitionTime);
|
_dispatcherCalls++;
|
||||||
|
dispatcher.transform.DOMoveY(dispatcherShownPosition.position.y, dispatcherTransitionTime);
|
||||||
}
|
}
|
||||||
public void CloseDispatcher()
|
public void CloseDispatcher()
|
||||||
{
|
{
|
||||||
dispatcher.transform.DOMoveX(dispatcherHiddenPosition.position.x, dispatcherTransitionTime);
|
_dispatcherCalls--;
|
||||||
|
if (_dispatcherCalls > 0) return;
|
||||||
|
dispatcher.transform.DOMoveY(dispatcherHiddenPosition.position.y, dispatcherTransitionTime);
|
||||||
// TODO
|
// TODO
|
||||||
}
|
}
|
||||||
public override void Hide()
|
public void ShowTimer()
|
||||||
{
|
{
|
||||||
|
// TODO
|
||||||
|
timerBackGround.transform.DOMoveX(timerShownPosition.position.x, timerTransitionTime);
|
||||||
}
|
}
|
||||||
public override void Show()
|
public void HideTimer()
|
||||||
{
|
{
|
||||||
|
timerBackGround.transform.DOMoveX(timerHiddenPosition.position.x, timerTransitionTime);
|
||||||
|
// TODO
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8,15 +8,20 @@ namespace Code.UI.Panels
|
|||||||
{
|
{
|
||||||
[SerializeField] private Image background;
|
[SerializeField] private Image background;
|
||||||
[SerializeField] private TMP_Text loadingTitle;
|
[SerializeField] private TMP_Text loadingTitle;
|
||||||
|
[SerializeField] private TMP_Text vyapWatermark;
|
||||||
public override void Hide()
|
public override void Hide()
|
||||||
{
|
{
|
||||||
|
Shown = false;
|
||||||
background.enabled = false;
|
background.enabled = false;
|
||||||
loadingTitle.enabled = false;
|
loadingTitle.enabled = false;
|
||||||
|
vyapWatermark.enabled = false;
|
||||||
}
|
}
|
||||||
public override void Show()
|
public override void Show()
|
||||||
{
|
{
|
||||||
|
Shown = true;
|
||||||
background.enabled = true;
|
background.enabled = true;
|
||||||
loadingTitle.enabled = true;
|
loadingTitle.enabled = true;
|
||||||
|
vyapWatermark.enabled = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -5,37 +5,46 @@ namespace Code.UI.Panels
|
|||||||
{
|
{
|
||||||
public class MainMenuPanel : UIElement
|
public class MainMenuPanel : UIElement
|
||||||
{
|
{
|
||||||
public HoverButton startButton;
|
public MainMenuButton startButton;
|
||||||
public HoverButton exitButton;
|
public MainMenuButton settingButton;
|
||||||
public CinematicDoorOpening CinematicDoorOpening;
|
public MainMenuButton exitButton;
|
||||||
|
|
||||||
public void Start()
|
private CinematicDoorOpening _cinematicDoorOpening;
|
||||||
|
|
||||||
|
public void Initialize(MainMenuUIVariables mainMenuUIVariables,
|
||||||
|
MainMenuButton startButton,
|
||||||
|
MainMenuButton settingButton,
|
||||||
|
MainMenuButton exitButton)
|
||||||
{
|
{
|
||||||
|
this.startButton = startButton;
|
||||||
|
this.settingButton = settingButton;
|
||||||
|
this.exitButton = exitButton;
|
||||||
|
|
||||||
|
startButton.defaultColor = mainMenuUIVariables.ButtonDefaultColor;
|
||||||
|
settingButton.defaultColor = mainMenuUIVariables.ButtonDefaultColor;
|
||||||
|
exitButton.defaultColor = mainMenuUIVariables.ButtonDefaultColor;
|
||||||
|
|
||||||
|
startButton.hoverColor = mainMenuUIVariables.ButtonHoverColor;
|
||||||
|
settingButton.hoverColor = mainMenuUIVariables.ButtonHoverColor;
|
||||||
|
exitButton.hoverColor = mainMenuUIVariables.ButtonHoverColor;
|
||||||
|
|
||||||
startButton.OnPointerEnterEvent = OpenStart;
|
startButton.OnPointerEnterEvent = OpenStart;
|
||||||
|
settingButton.OnPointerEnterEvent = OpenSettings;
|
||||||
exitButton.OnPointerEnterEvent = OpenExit;
|
exitButton.OnPointerEnterEvent = OpenExit;
|
||||||
|
|
||||||
startButton.OnPointerExitEvent = CloseDoor;
|
startButton.OnPointerExitEvent = CloseDoor;
|
||||||
|
settingButton.OnPointerExitEvent = CloseDoor;
|
||||||
exitButton.OnPointerExitEvent = CloseDoor;
|
exitButton.OnPointerExitEvent = CloseDoor;
|
||||||
|
|
||||||
|
_cinematicDoorOpening = new(mainMenuUIVariables.MainMenuDoor, mainMenuUIVariables.DoorLight);
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void Show()
|
private void OpenStart() => _cinematicDoorOpening.PreOpen(0);
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void Hide()
|
private void OpenSettings() => _cinematicDoorOpening.PreOpen(1);
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OpenExit()
|
private void OpenExit() => _cinematicDoorOpening.PreOpen(2);
|
||||||
{
|
|
||||||
CinematicDoorOpening.PreOpen(false);
|
private void CloseDoor() => _cinematicDoorOpening.Close();
|
||||||
}
|
|
||||||
private void OpenStart()
|
|
||||||
{
|
|
||||||
CinematicDoorOpening.PreOpen(true);
|
|
||||||
}
|
|
||||||
private void CloseDoor()
|
|
||||||
{
|
|
||||||
CinematicDoorOpening.Close();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
using TMPro;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.UI;
|
||||||
|
|
||||||
|
namespace Code.UI
|
||||||
|
{
|
||||||
|
public class SettingsPanel : UIElement
|
||||||
|
{
|
||||||
|
[SerializeField] private TMP_Text scoreText;
|
||||||
|
[SerializeField] private TMP_Text gameOverText;
|
||||||
|
[SerializeField] private Image _background;
|
||||||
|
|
||||||
|
public void UpdateScoreText(int score) => scoreText.text = score.ToString();
|
||||||
|
|
||||||
|
public override void Hide()
|
||||||
|
{
|
||||||
|
_background.enabled = false;
|
||||||
|
scoreText.enabled = false;
|
||||||
|
gameOverText.enabled = false;
|
||||||
|
base.Hide();
|
||||||
|
}
|
||||||
|
public override void Show()
|
||||||
|
{
|
||||||
|
_background.enabled = true;
|
||||||
|
scoreText.enabled = true;
|
||||||
|
gameOverText.enabled = true;
|
||||||
|
base.Show();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 31187576397b467a92a2f6a0fb383c9b
|
||||||
|
timeCreated: 1763899490
|
||||||
@@ -4,7 +4,8 @@ namespace Code.UI
|
|||||||
{
|
{
|
||||||
public abstract class UIElement : MonoBehaviour
|
public abstract class UIElement : MonoBehaviour
|
||||||
{
|
{
|
||||||
public abstract void Show();
|
public bool Shown { get; protected set; }
|
||||||
public abstract void Hide();
|
public virtual void Show() => Shown = true;
|
||||||
|
public virtual void Hide() => Shown = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -13,21 +13,6 @@ MonoBehaviour:
|
|||||||
m_Name: DispatcherSoundListConfig
|
m_Name: DispatcherSoundListConfig
|
||||||
m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.DispatcherSoundListConfig
|
m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.DispatcherSoundListConfig
|
||||||
dispatcher:
|
dispatcher:
|
||||||
- m_AssetGUID: 03e51c504fa7e0624ba855ec35b60bcc
|
|
||||||
m_SubObjectName:
|
|
||||||
m_SubObjectType:
|
|
||||||
m_SubObjectGUID:
|
|
||||||
m_EditorAssetChanged: 0
|
|
||||||
- m_AssetGUID: b2c9f83c47783069aabb564f68cb0cbb
|
|
||||||
m_SubObjectName:
|
|
||||||
m_SubObjectType:
|
|
||||||
m_SubObjectGUID:
|
|
||||||
m_EditorAssetChanged: 1
|
|
||||||
- m_AssetGUID: 111011400ce13ae859c52c757aef859e
|
|
||||||
m_SubObjectName:
|
|
||||||
m_SubObjectType:
|
|
||||||
m_SubObjectGUID:
|
|
||||||
m_EditorAssetChanged: 1
|
|
||||||
- m_AssetGUID: 735f38402ea347fa381408293503a24e
|
- m_AssetGUID: 735f38402ea347fa381408293503a24e
|
||||||
m_SubObjectName:
|
m_SubObjectName:
|
||||||
m_SubObjectType:
|
m_SubObjectType:
|
||||||
|
|||||||
@@ -0,0 +1,16 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &11400000
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: e6406ab390b74d5ca336d7d4d0e1a732, type: 3}
|
||||||
|
m_Name: Full3D
|
||||||
|
m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.AudioSourceSettingsConfig
|
||||||
|
spatialBlend: 1
|
||||||
|
sourceType: 0
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 058f1d54faced1a488eff486612f38e5
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &11400000
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: e6406ab390b74d5ca336d7d4d0e1a732, type: 3}
|
||||||
|
m_Name: NoBlend
|
||||||
|
m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.AudioSourceSettingsConfig
|
||||||
|
spatialBlend: 0
|
||||||
|
sourceType: 1
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 86857ed7de331464dacb1a95b66b970d
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -13,17 +13,7 @@ MonoBehaviour:
|
|||||||
m_Name: SoundtrackListConfig
|
m_Name: SoundtrackListConfig
|
||||||
m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.SoundtrackListConfig
|
m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.SoundtrackListConfig
|
||||||
peacefulSoundtrack:
|
peacefulSoundtrack:
|
||||||
- m_AssetGUID: 803e40b883c823b89a91aa8b9d9fc483
|
- m_AssetGUID: 8187ea542d6ed824d81230966a3b7499
|
||||||
m_SubObjectName:
|
|
||||||
m_SubObjectType:
|
|
||||||
m_SubObjectGUID:
|
|
||||||
m_EditorAssetChanged: 0
|
|
||||||
- m_AssetGUID: ebe18293a5ef86704b23dad3a1786476
|
|
||||||
m_SubObjectName:
|
|
||||||
m_SubObjectType:
|
|
||||||
m_SubObjectGUID:
|
|
||||||
m_EditorAssetChanged: 0
|
|
||||||
- m_AssetGUID: 803e40b883c823b89a91aa8b9d9fc483
|
|
||||||
m_SubObjectName:
|
m_SubObjectName:
|
||||||
m_SubObjectType:
|
m_SubObjectType:
|
||||||
m_SubObjectGUID:
|
m_SubObjectGUID:
|
||||||
@@ -34,29 +24,14 @@ MonoBehaviour:
|
|||||||
m_SubObjectType:
|
m_SubObjectType:
|
||||||
m_SubObjectGUID:
|
m_SubObjectGUID:
|
||||||
m_EditorAssetChanged: 0
|
m_EditorAssetChanged: 0
|
||||||
- m_AssetGUID: f4b6fa54ecac6cc418f98824491aa17a
|
- m_AssetGUID: 170b1a70ddee4d948abea041b9b805e4
|
||||||
m_SubObjectName:
|
|
||||||
m_SubObjectType:
|
|
||||||
m_SubObjectGUID:
|
|
||||||
m_EditorAssetChanged: 0
|
|
||||||
- m_AssetGUID: ebe18293a5ef86704b23dad3a1786476
|
|
||||||
m_SubObjectName:
|
m_SubObjectName:
|
||||||
m_SubObjectType:
|
m_SubObjectType:
|
||||||
m_SubObjectGUID:
|
m_SubObjectGUID:
|
||||||
m_EditorAssetChanged: 0
|
m_EditorAssetChanged: 0
|
||||||
menuSoundtrack:
|
menuSoundtrack:
|
||||||
- m_AssetGUID: 2301400160a23924eb27c4bdbe797739
|
- m_AssetGUID: 16562a5c87213914cad415f10c65a3b0
|
||||||
m_SubObjectName:
|
m_SubObjectName:
|
||||||
m_SubObjectType:
|
m_SubObjectType:
|
||||||
m_SubObjectGUID:
|
m_SubObjectGUID:
|
||||||
m_EditorAssetChanged: 0
|
m_EditorAssetChanged: 1
|
||||||
- m_AssetGUID: f4b6fa54ecac6cc418f98824491aa17a
|
|
||||||
m_SubObjectName:
|
|
||||||
m_SubObjectType:
|
|
||||||
m_SubObjectGUID:
|
|
||||||
m_EditorAssetChanged: 0
|
|
||||||
- m_AssetGUID: ebe18293a5ef86704b23dad3a1786476
|
|
||||||
m_SubObjectName:
|
|
||||||
m_SubObjectType:
|
|
||||||
m_SubObjectGUID:
|
|
||||||
m_EditorAssetChanged: 0
|
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b2c1c1c5a8388644d8c7c19ed905fea9
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,16 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &11400000
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 6610b94e9823401c94533e1756a97195, type: 3}
|
||||||
|
m_Name: FirstPerson
|
||||||
|
m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.CameraSettingsConfig
|
||||||
|
fov: 60
|
||||||
|
cameraMode: 3
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ef5c54378f76a9f4494ff3d9bc6e1bf0
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &11400000
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 6610b94e9823401c94533e1756a97195, type: 3}
|
||||||
|
m_Name: MainMenu
|
||||||
|
m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.CameraSettingsConfig
|
||||||
|
fov: 35.4
|
||||||
|
cameraMode: 2
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b4331dbccd27d3545b29ac1ad2bd4dcc
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &11400000
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 6610b94e9823401c94533e1756a97195, type: 3}
|
||||||
|
m_Name: Static
|
||||||
|
m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.CameraSettingsConfig
|
||||||
|
fov: 60
|
||||||
|
cameraMode: 1
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: d430ac29855b3c8459d44556d86c9405
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,143 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!21 &2100000
|
||||||
|
Material:
|
||||||
|
serializedVersion: 8
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: TestOnTop
|
||||||
|
m_Shader: {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
|
m_Parent: {fileID: 0}
|
||||||
|
m_ModifiedSerializedProperties: 0
|
||||||
|
m_ValidKeywords: []
|
||||||
|
m_InvalidKeywords: []
|
||||||
|
m_LightmapFlags: 4
|
||||||
|
m_EnableInstancingVariants: 0
|
||||||
|
m_DoubleSidedGI: 0
|
||||||
|
m_CustomRenderQueue: -1
|
||||||
|
stringTagMap: {}
|
||||||
|
disabledShaderPasses:
|
||||||
|
- MOTIONVECTORS
|
||||||
|
m_LockedProperties:
|
||||||
|
m_SavedProperties:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TexEnvs:
|
||||||
|
- _BaseMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _BumpMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailAlbedoMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailMask:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailNormalMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _EmissionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MainTex:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MetallicGlossMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _OcclusionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _ParallaxMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _SpecGlossMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- unity_Lightmaps:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- unity_LightmapsInd:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- unity_ShadowMasks:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
m_Ints: []
|
||||||
|
m_Floats:
|
||||||
|
- _AddPrecomputedVelocity: 0
|
||||||
|
- _AlphaClip: 0
|
||||||
|
- _AlphaToMask: 0
|
||||||
|
- _Blend: 0
|
||||||
|
- _BlendModePreserveSpecular: 1
|
||||||
|
- _BumpScale: 1
|
||||||
|
- _ClearCoatMask: 0
|
||||||
|
- _ClearCoatSmoothness: 0
|
||||||
|
- _ColorMask: 15
|
||||||
|
- _Cull: 2
|
||||||
|
- _Cutoff: 0.5
|
||||||
|
- _DetailAlbedoMapScale: 1
|
||||||
|
- _DetailNormalMapScale: 1
|
||||||
|
- _DstBlend: 0
|
||||||
|
- _DstBlendAlpha: 0
|
||||||
|
- _EnvironmentReflections: 1
|
||||||
|
- _GlossMapScale: 0
|
||||||
|
- _Glossiness: 0
|
||||||
|
- _GlossyReflections: 0
|
||||||
|
- _Metallic: 0
|
||||||
|
- _OcclusionStrength: 1
|
||||||
|
- _Parallax: 0.005
|
||||||
|
- _QueueOffset: 0
|
||||||
|
- _ReceiveShadows: 1
|
||||||
|
- _Smoothness: 0.5
|
||||||
|
- _SmoothnessTextureChannel: 0
|
||||||
|
- _SpecularHighlights: 1
|
||||||
|
- _SrcBlend: 1
|
||||||
|
- _SrcBlendAlpha: 1
|
||||||
|
- _Stencil: 0
|
||||||
|
- _StencilComp: 8
|
||||||
|
- _StencilOp: 0
|
||||||
|
- _StencilReadMask: 255
|
||||||
|
- _StencilWriteMask: 255
|
||||||
|
- _Surface: 0
|
||||||
|
- _UseUIAlphaClip: 0
|
||||||
|
- _WorkflowMode: 1
|
||||||
|
- _XRMotionVectorsPass: 1
|
||||||
|
- _ZWrite: 1
|
||||||
|
m_Colors:
|
||||||
|
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
|
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||||
|
m_BuildTextureStacks: []
|
||||||
|
m_AllowLocking: 1
|
||||||
|
--- !u!114 &1261182030382286586
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 11
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion
|
||||||
|
version: 10
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: a1f1b5a364203f14d8a6023ed28c1977
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 2100000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 711ff4fdf034fbb44b13e6519ed4e461
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 0e6388becbfe4944db9b18decc8c2dd0
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
@@ -0,0 +1,21 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 98e7fc378a7e85041973e08cb146bdc6
|
||||||
|
TrueTypeFontImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 4
|
||||||
|
fontSize: 16
|
||||||
|
forceTextureCase: -2
|
||||||
|
characterSpacing: 0
|
||||||
|
characterPadding: 1
|
||||||
|
includeFontData: 1
|
||||||
|
fontNames:
|
||||||
|
- Clear Sans Infanity
|
||||||
|
fallbackFontReferences: []
|
||||||
|
customCharacters:
|
||||||
|
fontRenderingMode: 0
|
||||||
|
ascentCalculationMode: 1
|
||||||
|
useLegacyBoundsCalculation: 0
|
||||||
|
shouldRoundAdvanceValue: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -60,122 +60,8 @@ MonoBehaviour:
|
|||||||
m_SourceFontFilePath:
|
m_SourceFontFilePath:
|
||||||
m_AtlasPopulationMode: 1
|
m_AtlasPopulationMode: 1
|
||||||
InternalDynamicOS: 0
|
InternalDynamicOS: 0
|
||||||
m_GlyphTable:
|
m_GlyphTable: []
|
||||||
- m_Index: 30
|
m_CharacterTable: []
|
||||||
m_Metrics:
|
|
||||||
m_Width: 51.296875
|
|
||||||
m_Height: 63
|
|
||||||
m_HorizontalBearingX: 2.703125
|
|
||||||
m_HorizontalBearingY: 63
|
|
||||||
m_HorizontalAdvance: 56.703125
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 10
|
|
||||||
m_Y: 10
|
|
||||||
m_Width: 52
|
|
||||||
m_Height: 63
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 60
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 49.234375
|
|
||||||
m_Height: 63
|
|
||||||
m_HorizontalBearingX: 2.703125
|
|
||||||
m_HorizontalBearingY: 63
|
|
||||||
m_HorizontalAdvance: 54.625
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 10
|
|
||||||
m_Y: 92
|
|
||||||
m_Width: 50
|
|
||||||
m_Height: 63
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 67
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 49.234375
|
|
||||||
m_Height: 63
|
|
||||||
m_HorizontalBearingX: 2.703125
|
|
||||||
m_HorizontalBearingY: 63
|
|
||||||
m_HorizontalAdvance: 54.625
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 10
|
|
||||||
m_Y: 174
|
|
||||||
m_Width: 50
|
|
||||||
m_Height: 63
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 64
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 31.40625
|
|
||||||
m_Height: 63
|
|
||||||
m_HorizontalBearingX: 2.703125
|
|
||||||
m_HorizontalBearingY: 63
|
|
||||||
m_HorizontalAdvance: 36.8125
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 10
|
|
||||||
m_Y: 256
|
|
||||||
m_Width: 33
|
|
||||||
m_Height: 63
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 77
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 53.09375
|
|
||||||
m_Height: 63
|
|
||||||
m_HorizontalBearingX: 2.703125
|
|
||||||
m_HorizontalBearingY: 63
|
|
||||||
m_HorizontalAdvance: 58.5
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 10
|
|
||||||
m_Y: 338
|
|
||||||
m_Width: 54
|
|
||||||
m_Height: 63
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 73
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 52.203125
|
|
||||||
m_Height: 63
|
|
||||||
m_HorizontalBearingX: 2.703125
|
|
||||||
m_HorizontalBearingY: 63
|
|
||||||
m_HorizontalAdvance: 55.984375
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 62
|
|
||||||
m_Y: 256
|
|
||||||
m_Width: 53
|
|
||||||
m_Height: 63
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
m_CharacterTable:
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 68
|
|
||||||
m_GlyphIndex: 30
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 101
|
|
||||||
m_GlyphIndex: 60
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 108
|
|
||||||
m_GlyphIndex: 67
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 105
|
|
||||||
m_GlyphIndex: 64
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 118
|
|
||||||
m_GlyphIndex: 77
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 114
|
|
||||||
m_GlyphIndex: 73
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasTextures:
|
m_AtlasTextures:
|
||||||
- {fileID: 688428377202190775}
|
- {fileID: 688428377202190775}
|
||||||
m_AtlasTextureIndex: 0
|
m_AtlasTextureIndex: 0
|
||||||
@@ -186,52 +72,12 @@ MonoBehaviour:
|
|||||||
m_AtlasHeight: 1024
|
m_AtlasHeight: 1024
|
||||||
m_AtlasPadding: 9
|
m_AtlasPadding: 9
|
||||||
m_AtlasRenderMode: 4165
|
m_AtlasRenderMode: 4165
|
||||||
m_UsedGlyphRects:
|
m_UsedGlyphRects: []
|
||||||
- m_X: 0
|
|
||||||
m_Y: 0
|
|
||||||
m_Width: 71
|
|
||||||
m_Height: 82
|
|
||||||
- m_X: 0
|
|
||||||
m_Y: 82
|
|
||||||
m_Width: 69
|
|
||||||
m_Height: 82
|
|
||||||
- m_X: 0
|
|
||||||
m_Y: 164
|
|
||||||
m_Width: 69
|
|
||||||
m_Height: 82
|
|
||||||
- m_X: 0
|
|
||||||
m_Y: 246
|
|
||||||
m_Width: 52
|
|
||||||
m_Height: 82
|
|
||||||
- m_X: 0
|
|
||||||
m_Y: 328
|
|
||||||
m_Width: 73
|
|
||||||
m_Height: 82
|
|
||||||
- m_X: 52
|
|
||||||
m_Y: 246
|
|
||||||
m_Width: 72
|
|
||||||
m_Height: 82
|
|
||||||
m_FreeGlyphRects:
|
m_FreeGlyphRects:
|
||||||
- m_X: 0
|
- m_X: 0
|
||||||
m_Y: 410
|
m_Y: 0
|
||||||
m_Width: 1023
|
m_Width: 1023
|
||||||
m_Height: 613
|
|
||||||
- m_X: 71
|
|
||||||
m_Y: 0
|
|
||||||
m_Width: 952
|
|
||||||
m_Height: 246
|
|
||||||
- m_X: 73
|
|
||||||
m_Y: 328
|
|
||||||
m_Width: 950
|
|
||||||
m_Height: 695
|
|
||||||
- m_X: 124
|
|
||||||
m_Y: 0
|
|
||||||
m_Width: 899
|
|
||||||
m_Height: 1023
|
m_Height: 1023
|
||||||
- m_X: 69
|
|
||||||
m_Y: 82
|
|
||||||
m_Width: 954
|
|
||||||
m_Height: 164
|
|
||||||
m_FontFeatureTable:
|
m_FontFeatureTable:
|
||||||
m_MultipleSubstitutionRecords: []
|
m_MultipleSubstitutionRecords: []
|
||||||
m_LigatureSubstitutionRecords: []
|
m_LigatureSubstitutionRecords: []
|
||||||
@@ -307,9 +153,9 @@ Texture2D:
|
|||||||
Hash: 00000000000000000000000000000000
|
Hash: 00000000000000000000000000000000
|
||||||
m_IsAlphaChannelOptional: 0
|
m_IsAlphaChannelOptional: 0
|
||||||
serializedVersion: 4
|
serializedVersion: 4
|
||||||
m_Width: 1024
|
m_Width: 1
|
||||||
m_Height: 1024
|
m_Height: 1
|
||||||
m_CompleteImageSize: 1048576
|
m_CompleteImageSize: 1
|
||||||
m_MipsStripped: 0
|
m_MipsStripped: 0
|
||||||
m_TextureFormat: 1
|
m_TextureFormat: 1
|
||||||
m_MipCount: 1
|
m_MipCount: 1
|
||||||
@@ -334,8 +180,8 @@ Texture2D:
|
|||||||
m_LightmapFormat: 0
|
m_LightmapFormat: 0
|
||||||
m_ColorSpace: 1
|
m_ColorSpace: 1
|
||||||
m_PlatformBlob:
|
m_PlatformBlob:
|
||||||
image data: 1048576
|
image data: 1
|
||||||
_typelessdata: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000407090a131313131313131313131313131212121212121212121212121212121212121212110f0d0a070604010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050b101416172020202020202020202020201f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1e1e1c1a171413110d08010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000Line truncated
|
_typelessdata: 00
|
||||||
m_StreamData:
|
m_StreamData:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
offset: 0
|
offset: 0
|
||||||
|
|||||||
@@ -60,540 +60,8 @@ MonoBehaviour:
|
|||||||
m_SourceFontFilePath:
|
m_SourceFontFilePath:
|
||||||
m_AtlasPopulationMode: 1
|
m_AtlasPopulationMode: 1
|
||||||
InternalDynamicOS: 0
|
InternalDynamicOS: 0
|
||||||
m_GlyphTable:
|
m_GlyphTable: []
|
||||||
- m_Index: 185
|
m_CharacterTable: []
|
||||||
m_Metrics:
|
|
||||||
m_Width: 43.953125
|
|
||||||
m_Height: 8.796875
|
|
||||||
m_HorizontalBearingX: 4.390625
|
|
||||||
m_HorizontalBearingY: 13.1875
|
|
||||||
m_HorizontalAdvance: 52.734375
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 10
|
|
||||||
m_Y: 10
|
|
||||||
m_Width: 45
|
|
||||||
m_Height: 10
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 66
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 52.734375
|
|
||||||
m_Height: 8.796875
|
|
||||||
m_HorizontalBearingX: 0
|
|
||||||
m_HorizontalBearingY: 8.796875
|
|
||||||
m_HorizontalAdvance: 52.734375
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 74
|
|
||||||
m_Y: 10
|
|
||||||
m_Width: 53
|
|
||||||
m_Height: 9
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 47
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 43.953125
|
|
||||||
m_Height: 61.53125
|
|
||||||
m_HorizontalBearingX: 4.390625
|
|
||||||
m_HorizontalBearingY: 65.921875
|
|
||||||
m_HorizontalAdvance: 52.734375
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 146
|
|
||||||
m_Y: 10
|
|
||||||
m_Width: 45
|
|
||||||
m_Height: 62
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 82
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 43.953125
|
|
||||||
m_Height: 48.34375
|
|
||||||
m_HorizontalBearingX: 4.390625
|
|
||||||
m_HorizontalBearingY: 52.734375
|
|
||||||
m_HorizontalAdvance: 52.734375
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 74
|
|
||||||
m_Y: 38
|
|
||||||
m_Width: 45
|
|
||||||
m_Height: 49
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 68
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 43.953125
|
|
||||||
m_Height: 52.734375
|
|
||||||
m_HorizontalBearingX: 4.390625
|
|
||||||
m_HorizontalBearingY: 57.125
|
|
||||||
m_HorizontalAdvance: 52.734375
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 10
|
|
||||||
m_Y: 39
|
|
||||||
m_Width: 45
|
|
||||||
m_Height: 54
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 71
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 43.953125
|
|
||||||
m_Height: 61.53125
|
|
||||||
m_HorizontalBearingX: 4.390625
|
|
||||||
m_HorizontalBearingY: 65.921875
|
|
||||||
m_HorizontalAdvance: 52.734375
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 210
|
|
||||||
m_Y: 10
|
|
||||||
m_Width: 45
|
|
||||||
m_Height: 62
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 76
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 26.359375
|
|
||||||
m_Height: 57.140625
|
|
||||||
m_HorizontalBearingX: 13.1875
|
|
||||||
m_HorizontalBearingY: 61.53125
|
|
||||||
m_HorizontalAdvance: 52.734375
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 274
|
|
||||||
m_Y: 10
|
|
||||||
m_Width: 27
|
|
||||||
m_Height: 58
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 81
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 43.953125
|
|
||||||
m_Height: 48.34375
|
|
||||||
m_HorizontalBearingX: 4.390625
|
|
||||||
m_HorizontalBearingY: 52.734375
|
|
||||||
m_HorizontalAdvance: 52.734375
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 320
|
|
||||||
m_Y: 10
|
|
||||||
m_Width: 45
|
|
||||||
m_Height: 49
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 74
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 43.953125
|
|
||||||
m_Height: 52.734375
|
|
||||||
m_HorizontalBearingX: 4.390625
|
|
||||||
m_HorizontalBearingY: 57.125
|
|
||||||
m_HorizontalAdvance: 52.734375
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 384
|
|
||||||
m_Y: 10
|
|
||||||
m_Width: 45
|
|
||||||
m_Height: 54
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 3
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 0
|
|
||||||
m_Height: 0
|
|
||||||
m_HorizontalBearingX: 0
|
|
||||||
m_HorizontalBearingY: 0
|
|
||||||
m_HorizontalAdvance: 52.734375
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 0
|
|
||||||
m_Y: 0
|
|
||||||
m_Width: 0
|
|
||||||
m_Height: 0
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 90
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 43.953125
|
|
||||||
m_Height: 48.34375
|
|
||||||
m_HorizontalBearingX: 4.390625
|
|
||||||
m_HorizontalBearingY: 52.734375
|
|
||||||
m_HorizontalAdvance: 52.734375
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 320
|
|
||||||
m_Y: 78
|
|
||||||
m_Width: 45
|
|
||||||
m_Height: 49
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 69
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 43.953125
|
|
||||||
m_Height: 61.53125
|
|
||||||
m_HorizontalBearingX: 4.390625
|
|
||||||
m_HorizontalBearingY: 65.921875
|
|
||||||
m_HorizontalAdvance: 52.734375
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 138
|
|
||||||
m_Y: 91
|
|
||||||
m_Width: 45
|
|
||||||
m_Height: 62
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 72
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 43.953125
|
|
||||||
m_Height: 48.34375
|
|
||||||
m_HorizontalBearingX: 4.390625
|
|
||||||
m_HorizontalBearingY: 52.734375
|
|
||||||
m_HorizontalAdvance: 52.734375
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 74
|
|
||||||
m_Y: 106
|
|
||||||
m_Width: 45
|
|
||||||
m_Height: 49
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 83
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 43.953125
|
|
||||||
m_Height: 52.734375
|
|
||||||
m_HorizontalBearingX: 4.390625
|
|
||||||
m_HorizontalBearingY: 57.125
|
|
||||||
m_HorizontalAdvance: 52.734375
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 10
|
|
||||||
m_Y: 112
|
|
||||||
m_Width: 45
|
|
||||||
m_Height: 54
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 87
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 26.359375
|
|
||||||
m_Height: 61.53125
|
|
||||||
m_HorizontalBearingX: 13.1875
|
|
||||||
m_HorizontalBearingY: 65.921875
|
|
||||||
m_HorizontalAdvance: 52.734375
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 274
|
|
||||||
m_Y: 87
|
|
||||||
m_Width: 27
|
|
||||||
m_Height: 62
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 20
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 26.359375
|
|
||||||
m_Height: 61.53125
|
|
||||||
m_HorizontalBearingX: 13.1875
|
|
||||||
m_HorizontalBearingY: 65.921875
|
|
||||||
m_HorizontalAdvance: 52.734375
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 202
|
|
||||||
m_Y: 91
|
|
||||||
m_Width: 27
|
|
||||||
m_Height: 62
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 23
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 43.953125
|
|
||||||
m_Height: 61.53125
|
|
||||||
m_HorizontalBearingX: 4.390625
|
|
||||||
m_HorizontalBearingY: 65.921875
|
|
||||||
m_HorizontalAdvance: 52.734375
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 448
|
|
||||||
m_Y: 10
|
|
||||||
m_Width: 45
|
|
||||||
m_Height: 62
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 29
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 8.796875
|
|
||||||
m_Height: 43.9375
|
|
||||||
m_HorizontalBearingX: 17.578125
|
|
||||||
m_HorizontalBearingY: 57.125
|
|
||||||
m_HorizontalAdvance: 52.734375
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 384
|
|
||||||
m_Y: 83
|
|
||||||
m_Width: 10
|
|
||||||
m_Height: 45
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 27
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 43.953125
|
|
||||||
m_Height: 61.53125
|
|
||||||
m_HorizontalBearingX: 4.390625
|
|
||||||
m_HorizontalBearingY: 65.921875
|
|
||||||
m_HorizontalAdvance: 52.734375
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 320
|
|
||||||
m_Y: 146
|
|
||||||
m_Width: 45
|
|
||||||
m_Height: 62
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 7
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 43.953125
|
|
||||||
m_Height: 61.53125
|
|
||||||
m_HorizontalBearingX: 4.390625
|
|
||||||
m_HorizontalBearingY: 65.921875
|
|
||||||
m_HorizontalAdvance: 52.734375
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 248
|
|
||||||
m_Y: 168
|
|
||||||
m_Width: 45
|
|
||||||
m_Height: 62
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 19
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 43.953125
|
|
||||||
m_Height: 61.53125
|
|
||||||
m_HorizontalBearingX: 4.390625
|
|
||||||
m_HorizontalBearingY: 65.921875
|
|
||||||
m_HorizontalAdvance: 52.734375
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 138
|
|
||||||
m_Y: 172
|
|
||||||
m_Width: 45
|
|
||||||
m_Height: 62
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 16
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 35.15625
|
|
||||||
m_Height: 8.78125
|
|
||||||
m_HorizontalBearingX: 8.796875
|
|
||||||
m_HorizontalBearingY: 39.546875
|
|
||||||
m_HorizontalAdvance: 52.734375
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 74
|
|
||||||
m_Y: 174
|
|
||||||
m_Width: 36
|
|
||||||
m_Height: 10
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 21
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 43.953125
|
|
||||||
m_Height: 61.53125
|
|
||||||
m_HorizontalBearingX: 4.390625
|
|
||||||
m_HorizontalBearingY: 65.921875
|
|
||||||
m_HorizontalAdvance: 52.734375
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 10
|
|
||||||
m_Y: 185
|
|
||||||
m_Width: 45
|
|
||||||
m_Height: 62
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 22
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 43.953125
|
|
||||||
m_Height: 61.53125
|
|
||||||
m_HorizontalBearingX: 4.390625
|
|
||||||
m_HorizontalBearingY: 65.921875
|
|
||||||
m_HorizontalAdvance: 52.734375
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 74
|
|
||||||
m_Y: 203
|
|
||||||
m_Width: 45
|
|
||||||
m_Height: 62
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 24
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 43.953125
|
|
||||||
m_Height: 61.53125
|
|
||||||
m_HorizontalBearingX: 4.390625
|
|
||||||
m_HorizontalBearingY: 65.921875
|
|
||||||
m_HorizontalAdvance: 52.734375
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 10
|
|
||||||
m_Y: 266
|
|
||||||
m_Width: 45
|
|
||||||
m_Height: 62
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 25
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 43.953125
|
|
||||||
m_Height: 61.53125
|
|
||||||
m_HorizontalBearingX: 4.390625
|
|
||||||
m_HorizontalBearingY: 65.921875
|
|
||||||
m_HorizontalAdvance: 52.734375
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 512
|
|
||||||
m_Y: 10
|
|
||||||
m_Width: 45
|
|
||||||
m_Height: 62
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 26
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 43.953125
|
|
||||||
m_Height: 61.53125
|
|
||||||
m_HorizontalBearingX: 4.390625
|
|
||||||
m_HorizontalBearingY: 65.921875
|
|
||||||
m_HorizontalAdvance: 52.734375
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 576
|
|
||||||
m_Y: 10
|
|
||||||
m_Width: 45
|
|
||||||
m_Height: 62
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 28
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 43.953125
|
|
||||||
m_Height: 61.53125
|
|
||||||
m_HorizontalBearingX: 4.390625
|
|
||||||
m_HorizontalBearingY: 65.921875
|
|
||||||
m_HorizontalAdvance: 52.734375
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 640
|
|
||||||
m_Y: 10
|
|
||||||
m_Width: 45
|
|
||||||
m_Height: 62
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
m_CharacterTable:
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 8230
|
|
||||||
m_GlyphIndex: 185
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 95
|
|
||||||
m_GlyphIndex: 66
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 76
|
|
||||||
m_GlyphIndex: 47
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 111
|
|
||||||
m_GlyphIndex: 82
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 97
|
|
||||||
m_GlyphIndex: 68
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 100
|
|
||||||
m_GlyphIndex: 71
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 105
|
|
||||||
m_GlyphIndex: 76
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 110
|
|
||||||
m_GlyphIndex: 81
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 103
|
|
||||||
m_GlyphIndex: 74
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 32
|
|
||||||
m_GlyphIndex: 3
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 119
|
|
||||||
m_GlyphIndex: 90
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 98
|
|
||||||
m_GlyphIndex: 69
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 101
|
|
||||||
m_GlyphIndex: 72
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 112
|
|
||||||
m_GlyphIndex: 83
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 116
|
|
||||||
m_GlyphIndex: 87
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 49
|
|
||||||
m_GlyphIndex: 20
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 52
|
|
||||||
m_GlyphIndex: 23
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 58
|
|
||||||
m_GlyphIndex: 29
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 56
|
|
||||||
m_GlyphIndex: 27
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 36
|
|
||||||
m_GlyphIndex: 7
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 48
|
|
||||||
m_GlyphIndex: 19
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 45
|
|
||||||
m_GlyphIndex: 16
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 50
|
|
||||||
m_GlyphIndex: 21
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 51
|
|
||||||
m_GlyphIndex: 22
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 53
|
|
||||||
m_GlyphIndex: 24
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 54
|
|
||||||
m_GlyphIndex: 25
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 55
|
|
||||||
m_GlyphIndex: 26
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 57
|
|
||||||
m_GlyphIndex: 28
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasTextures:
|
m_AtlasTextures:
|
||||||
- {fileID: 948717598527772745}
|
- {fileID: 948717598527772745}
|
||||||
m_AtlasTextureIndex: 0
|
m_AtlasTextureIndex: 0
|
||||||
@@ -604,171 +72,11 @@ MonoBehaviour:
|
|||||||
m_AtlasHeight: 1024
|
m_AtlasHeight: 1024
|
||||||
m_AtlasPadding: 9
|
m_AtlasPadding: 9
|
||||||
m_AtlasRenderMode: 4165
|
m_AtlasRenderMode: 4165
|
||||||
m_UsedGlyphRects:
|
m_UsedGlyphRects: []
|
||||||
- m_X: 0
|
|
||||||
m_Y: 0
|
|
||||||
m_Width: 64
|
|
||||||
m_Height: 29
|
|
||||||
- m_X: 64
|
|
||||||
m_Y: 0
|
|
||||||
m_Width: 72
|
|
||||||
m_Height: 28
|
|
||||||
- m_X: 136
|
|
||||||
m_Y: 0
|
|
||||||
m_Width: 64
|
|
||||||
m_Height: 81
|
|
||||||
- m_X: 64
|
|
||||||
m_Y: 28
|
|
||||||
m_Width: 64
|
|
||||||
m_Height: 68
|
|
||||||
- m_X: 0
|
|
||||||
m_Y: 29
|
|
||||||
m_Width: 64
|
|
||||||
m_Height: 73
|
|
||||||
- m_X: 200
|
|
||||||
m_Y: 0
|
|
||||||
m_Width: 64
|
|
||||||
m_Height: 81
|
|
||||||
- m_X: 264
|
|
||||||
m_Y: 0
|
|
||||||
m_Width: 46
|
|
||||||
m_Height: 77
|
|
||||||
- m_X: 310
|
|
||||||
m_Y: 0
|
|
||||||
m_Width: 64
|
|
||||||
m_Height: 68
|
|
||||||
- m_X: 374
|
|
||||||
m_Y: 0
|
|
||||||
m_Width: 64
|
|
||||||
m_Height: 73
|
|
||||||
- m_X: 310
|
|
||||||
m_Y: 68
|
|
||||||
m_Width: 64
|
|
||||||
m_Height: 68
|
|
||||||
- m_X: 128
|
|
||||||
m_Y: 81
|
|
||||||
m_Width: 64
|
|
||||||
m_Height: 81
|
|
||||||
- m_X: 64
|
|
||||||
m_Y: 96
|
|
||||||
m_Width: 64
|
|
||||||
m_Height: 68
|
|
||||||
- m_X: 0
|
|
||||||
m_Y: 102
|
|
||||||
m_Width: 64
|
|
||||||
m_Height: 73
|
|
||||||
- m_X: 264
|
|
||||||
m_Y: 77
|
|
||||||
m_Width: 46
|
|
||||||
m_Height: 81
|
|
||||||
- m_X: 192
|
|
||||||
m_Y: 81
|
|
||||||
m_Width: 46
|
|
||||||
m_Height: 81
|
|
||||||
- m_X: 438
|
|
||||||
m_Y: 0
|
|
||||||
m_Width: 64
|
|
||||||
m_Height: 81
|
|
||||||
- m_X: 374
|
|
||||||
m_Y: 73
|
|
||||||
m_Width: 29
|
|
||||||
m_Height: 64
|
|
||||||
- m_X: 310
|
|
||||||
m_Y: 136
|
|
||||||
m_Width: 64
|
|
||||||
m_Height: 81
|
|
||||||
- m_X: 238
|
|
||||||
m_Y: 158
|
|
||||||
m_Width: 64
|
|
||||||
m_Height: 81
|
|
||||||
- m_X: 128
|
|
||||||
m_Y: 162
|
|
||||||
m_Width: 64
|
|
||||||
m_Height: 81
|
|
||||||
- m_X: 64
|
|
||||||
m_Y: 164
|
|
||||||
m_Width: 55
|
|
||||||
m_Height: 29
|
|
||||||
- m_X: 0
|
|
||||||
m_Y: 175
|
|
||||||
m_Width: 64
|
|
||||||
m_Height: 81
|
|
||||||
- m_X: 64
|
|
||||||
m_Y: 193
|
|
||||||
m_Width: 64
|
|
||||||
m_Height: 81
|
|
||||||
- m_X: 0
|
|
||||||
m_Y: 256
|
|
||||||
m_Width: 64
|
|
||||||
m_Height: 81
|
|
||||||
- m_X: 502
|
|
||||||
m_Y: 0
|
|
||||||
m_Width: 64
|
|
||||||
m_Height: 81
|
|
||||||
- m_X: 566
|
|
||||||
m_Y: 0
|
|
||||||
m_Width: 64
|
|
||||||
m_Height: 81
|
|
||||||
- m_X: 630
|
|
||||||
m_Y: 0
|
|
||||||
m_Width: 64
|
|
||||||
m_Height: 81
|
|
||||||
m_FreeGlyphRects:
|
m_FreeGlyphRects:
|
||||||
- m_X: 128
|
|
||||||
m_Y: 28
|
|
||||||
m_Width: 8
|
|
||||||
m_Height: 53
|
|
||||||
- m_X: 403
|
|
||||||
m_Y: 81
|
|
||||||
m_Width: 620
|
|
||||||
m_Height: 942
|
|
||||||
- m_X: 403
|
|
||||||
m_Y: 73
|
|
||||||
m_Width: 35
|
|
||||||
m_Height: 950
|
|
||||||
- m_X: 374
|
|
||||||
m_Y: 137
|
|
||||||
m_Width: 649
|
|
||||||
m_Height: 886
|
|
||||||
- m_X: 238
|
|
||||||
m_Y: 81
|
|
||||||
m_Width: 26
|
|
||||||
m_Height: 77
|
|
||||||
- m_X: 302
|
|
||||||
m_Y: 217
|
|
||||||
m_Width: 721
|
|
||||||
m_Height: 806
|
|
||||||
- m_X: 302
|
|
||||||
m_Y: 158
|
|
||||||
m_Width: 8
|
|
||||||
m_Height: 865
|
|
||||||
- m_X: 192
|
|
||||||
m_Y: 162
|
|
||||||
m_Width: 46
|
|
||||||
m_Height: 861
|
|
||||||
- m_X: 192
|
|
||||||
m_Y: 239
|
|
||||||
m_Width: 831
|
|
||||||
m_Height: 784
|
|
||||||
- m_X: 119
|
|
||||||
m_Y: 164
|
|
||||||
m_Width: 9
|
|
||||||
m_Height: 29
|
|
||||||
- m_X: 128
|
|
||||||
m_Y: 243
|
|
||||||
m_Width: 895
|
|
||||||
m_Height: 780
|
|
||||||
- m_X: 0
|
- m_X: 0
|
||||||
m_Y: 337
|
|
||||||
m_Width: 1023
|
|
||||||
m_Height: 686
|
|
||||||
- m_X: 64
|
|
||||||
m_Y: 274
|
|
||||||
m_Width: 959
|
|
||||||
m_Height: 749
|
|
||||||
- m_X: 694
|
|
||||||
m_Y: 0
|
m_Y: 0
|
||||||
m_Width: 329
|
m_Width: 1023
|
||||||
m_Height: 1023
|
m_Height: 1023
|
||||||
m_FontFeatureTable:
|
m_FontFeatureTable:
|
||||||
m_MultipleSubstitutionRecords: []
|
m_MultipleSubstitutionRecords: []
|
||||||
@@ -851,9 +159,9 @@ Texture2D:
|
|||||||
Hash: 00000000000000000000000000000000
|
Hash: 00000000000000000000000000000000
|
||||||
m_IsAlphaChannelOptional: 0
|
m_IsAlphaChannelOptional: 0
|
||||||
serializedVersion: 4
|
serializedVersion: 4
|
||||||
m_Width: 1024
|
m_Width: 1
|
||||||
m_Height: 1024
|
m_Height: 1
|
||||||
m_CompleteImageSize: 1048576
|
m_CompleteImageSize: 1
|
||||||
m_MipsStripped: 0
|
m_MipsStripped: 0
|
||||||
m_TextureFormat: 1
|
m_TextureFormat: 1
|
||||||
m_MipCount: 1
|
m_MipCount: 1
|
||||||
@@ -878,8 +186,8 @@ Texture2D:
|
|||||||
m_LightmapFormat: 0
|
m_LightmapFormat: 0
|
||||||
m_ColorSpace: 1
|
m_ColorSpace: 1
|
||||||
m_PlatformBlob:
|
m_PlatformBlob:
|
||||||
image data: 1048576
|
image data: 1
|
||||||
_typelessdata: 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005080a0b0e0e0e0e0e0e0e0e0807050200000306070e0e0e0e0e0e0e0e0c0c0a0602000407090a0e0e0e0e0e0e0e0e090806030000000000000000000000050a0f121313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313100f0d090500000000000000000000000005080a0b0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0908060300000000000000000000000000000000000000000000000000000407090a0e0e0e0e0e0e0e0e0e0e0e0e0c0c0a0602000407090a0e0e0e0e0e0e0e0e09080603000000000000000000000000000000000000000000000000000000000000020507080e0e0e0e0e0e0e0e0b0a08050000000000000000000000000005080a0b0e0e0e0e0e0e0e0e08070502000000000000000000000000000000000000000407090a0e0e0e0e0e0e0e0e0908060300000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a0805000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020507080e0e0e0e0e0e0e0e0b0a080500000000000000000000000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a0805000000000000000000000000000000000000000000000000000000000000000000000000000000000306070e0e0e0e0e0e0e0e0c0c0a0602000000000000000000000000000000000000000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a08050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060c111517181b1b1b1b1b1b1b1b1514120e090c1012131b1b1b1b1b1b1b1b191816120d0b101416171b1b1b1b1b1b1b1b1615130f0a0400000000000000010910161b1e20202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020201d1c1915100a030000000000000000060c111517181b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1615130f0a0400000000000000000000000000000000000000000000050b101316161b1b1b1b1b1b1b1b1b1b1b1b191816120d0b101416171b1b1b1b1b1b1b1b1615130f0a04000000000000000000000000000000000000000000000000000003090e1214151b1b1b1b1b1b1b1b171714110c05000000000000000000060c111517181b1b1b1b1b1b1b1b1514120e0903000000000000000000000000000000050b101416171b1b1b1b1b1b1b1b1615130f0a04000000000000000000000000000000000000070d121619191b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b171714110c05000000000000000000000000000000000000Line truncated
|
_typelessdata: 00
|
||||||
m_StreamData:
|
m_StreamData:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
offset: 0
|
offset: 0
|
||||||
|
|||||||
Binary file not shown.
@@ -0,0 +1,117 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 93e7494bdfc7cc84a9ef8b8fd66a6c9f
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 13
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 0
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
flipGreenChannel: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
vTOnly: 0
|
||||||
|
ignoreMipmapLimit: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 0
|
||||||
|
aniso: 1
|
||||||
|
mipBias: 0
|
||||||
|
wrapU: 1
|
||||||
|
wrapV: 1
|
||||||
|
wrapW: 0
|
||||||
|
nPOTScale: 0
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 1
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 0
|
||||||
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
|
spritePixelsToUnits: 100
|
||||||
|
spriteBorder: {x: 3023, y: 1528, z: 96, w: 379}
|
||||||
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
|
alphaUsage: 1
|
||||||
|
alphaIsTransparency: 1
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 8
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
flipbookRows: 1
|
||||||
|
flipbookColumns: 1
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
ignorePngGamma: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
swizzle: 50462976
|
||||||
|
cookieLightType: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
customData:
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
internalID: 1537655665
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spriteCustomMetadata:
|
||||||
|
entries: []
|
||||||
|
nameFileIdTable: {}
|
||||||
|
mipmapLimitGroupName:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
@@ -0,0 +1,117 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ba66fd0cf3dffd94c851a6685575e4e4
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 13
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 0
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
flipGreenChannel: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
vTOnly: 0
|
||||||
|
ignoreMipmapLimit: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 0
|
||||||
|
aniso: 1
|
||||||
|
mipBias: 0
|
||||||
|
wrapU: 1
|
||||||
|
wrapV: 1
|
||||||
|
wrapW: 0
|
||||||
|
nPOTScale: 0
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 1
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 0
|
||||||
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
|
spritePixelsToUnits: 100
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
|
alphaUsage: 1
|
||||||
|
alphaIsTransparency: 1
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 8
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
flipbookRows: 1
|
||||||
|
flipbookColumns: 1
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
ignorePngGamma: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
swizzle: 50462976
|
||||||
|
cookieLightType: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
customData:
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spriteCustomMetadata:
|
||||||
|
entries: []
|
||||||
|
nameFileIdTable: {}
|
||||||
|
mipmapLimitGroupName:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Loaded 100 of 128 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user