diff --git a/Game/CourierOld/.idea/.idea.CourierOld/.idea/.gitignore b/Game/CourierOld/.idea/.idea.CourierOld/.idea/.gitignore new file mode 100644 index 0000000..d138502 --- /dev/null +++ b/Game/CourierOld/.idea/.idea.CourierOld/.idea/.gitignore @@ -0,0 +1,13 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Rider ignored files +/contentModel.xml +/projectSettingsUpdater.xml +/modules.xml +/.idea.CourierOld.iml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/Game/CourierOld/.idea/.idea.CourierOld/.idea/indexLayout.xml b/Game/CourierOld/.idea/.idea.CourierOld/.idea/indexLayout.xml new file mode 100644 index 0000000..7b08163 --- /dev/null +++ b/Game/CourierOld/.idea/.idea.CourierOld/.idea/indexLayout.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Game/CourierOld/.idea/.idea.CourierOld/.idea/inspectionProfiles/Project_Default.xml b/Game/CourierOld/.idea/.idea.CourierOld/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..ab0423b --- /dev/null +++ b/Game/CourierOld/.idea/.idea.CourierOld/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/Game/CourierOld/.idea/.idea.CourierOld/.idea/vcs.xml b/Game/CourierOld/.idea/.idea.CourierOld/.idea/vcs.xml new file mode 100644 index 0000000..b2bdec2 --- /dev/null +++ b/Game/CourierOld/.idea/.idea.CourierOld/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Game/CourierOld/Assets/TutorialInfo.meta b/Game/CourierOld/Assets/Code.meta similarity index 77% rename from Game/CourierOld/Assets/TutorialInfo.meta rename to Game/CourierOld/Assets/Code.meta index a700bca..39b4fc9 100644 --- a/Game/CourierOld/Assets/TutorialInfo.meta +++ b/Game/CourierOld/Assets/Code.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ba062aa6c92b140379dbc06b43dd3b9b +guid: f2466cc2ed032a056a43687e26d6d7b3 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Game/CourierOld/Assets/Code/App.meta b/Game/CourierOld/Assets/Code/App.meta new file mode 100644 index 0000000..65c8a66 --- /dev/null +++ b/Game/CourierOld/Assets/Code/App.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: a770060b9cb94a4b9577f2ca5137659b +timeCreated: 1760422853 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/App/AppStates.meta b/Game/CourierOld/Assets/Code/App/AppStates.meta new file mode 100644 index 0000000..16f0f9e --- /dev/null +++ b/Game/CourierOld/Assets/Code/App/AppStates.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 5b984d26778442e28274df043ee9a83c +timeCreated: 1760423231 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/App/AppStates/GameOverState.cs b/Game/CourierOld/Assets/Code/App/AppStates/GameOverState.cs new file mode 100644 index 0000000..8da0b7d --- /dev/null +++ b/Game/CourierOld/Assets/Code/App/AppStates/GameOverState.cs @@ -0,0 +1,24 @@ +using Code.App.StateMachine; +using Code.StateMachine; + +namespace Code.App.AppStates +{ + public class GameOverState : BaseState + { + public GameOverState(AppStateMachineContext context) : base(context) + { } + + public override void EnterState() + { + base.EnterState(); + } + + public override void Tick() + { } + + public override void ExitState() + { + base.ExitState(); + } + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/App/AppStates/GameOverState.cs.meta b/Game/CourierOld/Assets/Code/App/AppStates/GameOverState.cs.meta new file mode 100644 index 0000000..4a55a0b --- /dev/null +++ b/Game/CourierOld/Assets/Code/App/AppStates/GameOverState.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 97314a9736904f47ab06a6744ca2692f +timeCreated: 1758640549 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/App/AppStates/GameplayState.cs b/Game/CourierOld/Assets/Code/App/AppStates/GameplayState.cs new file mode 100644 index 0000000..d93eff3 --- /dev/null +++ b/Game/CourierOld/Assets/Code/App/AppStates/GameplayState.cs @@ -0,0 +1,38 @@ +using Code.App.StateMachine; +using Code.Input; +using Code.Scenes; +using Code.StateMachine; +using UnityEngine; + +namespace Code.App.AppStates +{ + public class GameplayState : BaseState + { + public GameplayState(AppStateMachineContext context) : base(context) + { + } + + public override void EnterState() + { + Context.SceneLoaderService.LoadScene((int)SceneIds.Gameplay, SceneLoaded); + Context.InputService.EnableMap(ActionMappings.Gameplay); + } + + private void SceneLoaded() + { + + base.EnterState(); + } + + public override void Tick() + { + } + + public override void ExitState() + { + Context.InputService.DisableMap(ActionMappings.Gameplay); + + base.ExitState(); + } + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/App/AppStates/GameplayState.cs.meta b/Game/CourierOld/Assets/Code/App/AppStates/GameplayState.cs.meta new file mode 100644 index 0000000..788de34 --- /dev/null +++ b/Game/CourierOld/Assets/Code/App/AppStates/GameplayState.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: b543b6d48f8b4c37bf3288f57d11dbc9 +timeCreated: 1758640462 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/App/AppStates/MainMenuState.cs b/Game/CourierOld/Assets/Code/App/AppStates/MainMenuState.cs new file mode 100644 index 0000000..6283804 --- /dev/null +++ b/Game/CourierOld/Assets/Code/App/AppStates/MainMenuState.cs @@ -0,0 +1,35 @@ +using Code.App.StateMachine; +using Code.Input; +using Code.Scenes; +using Code.StateMachine; + +namespace Code.App.AppStates +{ + public class MainMenuState : BaseState + { + public MainMenuState(AppStateMachineContext context) : base(context) + { } + + public override void EnterState() + { + Context.SceneLoaderService.LoadScene((int)SceneIds.MainMenu, SceneLoaded); + Context.InputService.EnableMap(ActionMappings.MainMenu); + } + + private void SceneLoaded() + { + + + base.EnterState(); + } + public override void Tick() + { } + + public override void ExitState() + { + Context.InputService.DisableMap(ActionMappings.MainMenu); + + base.ExitState(); + } + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/App/AppStates/MainMenuState.cs.meta b/Game/CourierOld/Assets/Code/App/AppStates/MainMenuState.cs.meta new file mode 100644 index 0000000..b8306b3 --- /dev/null +++ b/Game/CourierOld/Assets/Code/App/AppStates/MainMenuState.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 74975b23ce5e4ba29add02c6406902f5 +timeCreated: 1758640536 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/App/BootstrapInstaller.cs b/Game/CourierOld/Assets/Code/App/BootstrapInstaller.cs new file mode 100644 index 0000000..7f87fb0 --- /dev/null +++ b/Game/CourierOld/Assets/Code/App/BootstrapInstaller.cs @@ -0,0 +1,60 @@ +using Code.App.StateMachine; +using Code.Configs; +using Code.Input; +using Code.Scenes; +using Code.StaticData; +using Reflex.Core; +using Reflex.Injectors; +using UnityEngine; +using UnityEngine.InputSystem; + +namespace Code.App +{ + public class BootstrapInstaller : MonoBehaviour, IInstaller + { + + public void InstallBindings(ContainerBuilder containerBuilder) + { + InstallStaticData(containerBuilder, out IStaticDataService staticDataService); + + InstallInfrastructureUnit(containerBuilder, staticDataService); + + containerBuilder.AddSingleton(typeof(InputService), typeof(IInputService)); + containerBuilder.AddSingleton(typeof(SceneLoaderService), typeof(ISceneLoaderService)); + + containerBuilder.OnContainerBuilt += Bootstrap; + } + + private void InstallInfrastructureUnit(ContainerBuilder containerBuilder, IStaticDataService staticDataService) + { + GameObject infrastructureUnit = Instantiate(staticDataService.AppConfig.infrastructureUnitPrefab); + DontDestroyOnLoad(infrastructureUnit); + + containerBuilder.AddSingleton(infrastructureUnit); + containerBuilder.AddSingleton(infrastructureUnit.GetComponent(), + typeof(ICoroutineRunner)); + containerBuilder.AddSingleton(infrastructureUnit.AddComponent()); + } + + private void InstallStaticData(ContainerBuilder containerBuilder, out IStaticDataService staticDataService) + { + staticDataService = new StaticDataService(); + staticDataService.Load(); + + containerBuilder.AddSingleton(staticDataService, typeof(IStaticDataService)); + containerBuilder.AddSingleton(staticDataService.InputConfig.inputActionAsset, typeof(InputActionAsset)); + } + + private void Bootstrap(Container container) + { + AppStateMachine appStateMachine = container.Resolve(); + appStateMachine.Initialize(); + + AttributeInjector.Inject(appStateMachine.StateMachineContext, container); + + appStateMachine + .SwitchState(AppState.MainMenu) + .AllowStateTransition(AppState.Gameplay); + } + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/App/BootstrapInstaller.cs.meta b/Game/CourierOld/Assets/Code/App/BootstrapInstaller.cs.meta new file mode 100644 index 0000000..65d50cd --- /dev/null +++ b/Game/CourierOld/Assets/Code/App/BootstrapInstaller.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 1efb7de496e44fed9b40cb92d99ef116 +timeCreated: 1760423402 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/App/CoroutineRunner.cs b/Game/CourierOld/Assets/Code/App/CoroutineRunner.cs new file mode 100644 index 0000000..ca7c9c8 --- /dev/null +++ b/Game/CourierOld/Assets/Code/App/CoroutineRunner.cs @@ -0,0 +1,9 @@ +using UnityEngine; + +namespace Code.App +{ + public class CoroutineRunner : MonoBehaviour, ICoroutineRunner + { + private void Awake() => DontDestroyOnLoad(this); + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/App/CoroutineRunner.cs.meta b/Game/CourierOld/Assets/Code/App/CoroutineRunner.cs.meta new file mode 100644 index 0000000..418b61a --- /dev/null +++ b/Game/CourierOld/Assets/Code/App/CoroutineRunner.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: c1c87e09de06474cb53bc7ebb77e90cd +timeCreated: 1760423209 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/App/Debug.meta b/Game/CourierOld/Assets/Code/App/Debug.meta new file mode 100644 index 0000000..5334566 --- /dev/null +++ b/Game/CourierOld/Assets/Code/App/Debug.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 8550610dc3df4f2ea40f05e33fc4a323 +timeCreated: 1760423877 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/App/Debug/GoToState.cs b/Game/CourierOld/Assets/Code/App/Debug/GoToState.cs new file mode 100644 index 0000000..31a1562 --- /dev/null +++ b/Game/CourierOld/Assets/Code/App/Debug/GoToState.cs @@ -0,0 +1,18 @@ +using Code.App.StateMachine; +using Reflex.Attributes; +using UnityEngine; + +namespace Code.App.Debug +{ + public class GoToState : MonoBehaviour + { + [SerializeField] private AppState gotoState; + [SerializeField] private AppState allowedState; + [Inject] private AppStateMachine _appStateMachine; + private void Start() + { + _appStateMachine.SwitchState(gotoState) + .AllowStateTransition(allowedState); + } + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/App/Debug/GoToState.cs.meta b/Game/CourierOld/Assets/Code/App/Debug/GoToState.cs.meta new file mode 100644 index 0000000..95dbbc3 --- /dev/null +++ b/Game/CourierOld/Assets/Code/App/Debug/GoToState.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: affd42e82c2547a5af4604b574a24f59 +timeCreated: 1760083049 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/App/ICoroutineRunner.cs b/Game/CourierOld/Assets/Code/App/ICoroutineRunner.cs new file mode 100644 index 0000000..1b29dea --- /dev/null +++ b/Game/CourierOld/Assets/Code/App/ICoroutineRunner.cs @@ -0,0 +1,10 @@ +using System.Collections; +using UnityEngine; + +namespace Code.App +{ + public interface ICoroutineRunner + { + Coroutine StartCoroutine(IEnumerator coroutine); + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/App/ICoroutineRunner.cs.meta b/Game/CourierOld/Assets/Code/App/ICoroutineRunner.cs.meta new file mode 100644 index 0000000..be7f91b --- /dev/null +++ b/Game/CourierOld/Assets/Code/App/ICoroutineRunner.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 3e7be46265584ecb9643632be0164f68 +timeCreated: 1760423209 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/App/StateMachine.meta b/Game/CourierOld/Assets/Code/App/StateMachine.meta new file mode 100644 index 0000000..ccbca95 --- /dev/null +++ b/Game/CourierOld/Assets/Code/App/StateMachine.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: d3240c88cce7490dadba30536b7c2189 +timeCreated: 1760423231 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/App/StateMachine/AppState.cs b/Game/CourierOld/Assets/Code/App/StateMachine/AppState.cs new file mode 100644 index 0000000..343ef3b --- /dev/null +++ b/Game/CourierOld/Assets/Code/App/StateMachine/AppState.cs @@ -0,0 +1,13 @@ +using System; + +namespace Code.App.StateMachine +{ + [Flags] + public enum AppState + { + Bootstrap = 1, + MainMenu = 2, + Gameplay = 4, + GameOver = 8 + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/App/StateMachine/AppState.cs.meta b/Game/CourierOld/Assets/Code/App/StateMachine/AppState.cs.meta new file mode 100644 index 0000000..13d33c5 --- /dev/null +++ b/Game/CourierOld/Assets/Code/App/StateMachine/AppState.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 2bda641d023e417083386b3e0bce89b1 +timeCreated: 1758561696 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/App/StateMachine/AppStateMachine.cs b/Game/CourierOld/Assets/Code/App/StateMachine/AppStateMachine.cs new file mode 100644 index 0000000..566e990 --- /dev/null +++ b/Game/CourierOld/Assets/Code/App/StateMachine/AppStateMachine.cs @@ -0,0 +1,33 @@ +using Code.App.AppStates; +using Code.StateMachine; + +namespace Code.App.StateMachine +{ + public class AppStateMachine : AbstractStateMachine + { + public override void Initialize() + { + States.Add(AppState.MainMenu, new MainMenuState(StateMachineContext)); + States.Add(AppState.Gameplay, new GameplayState(StateMachineContext)); + States.Add(AppState.GameOver, new GameOverState(StateMachineContext)); + + AllowedStates |= AppState.MainMenu; + AllowedStates |= AppState.Gameplay; + } + + protected override bool CheckTransitionAllowed(AppState nextState) => AllowedStates.HasFlag(nextState); + protected override void ResetAllowedTransitions() => AllowedStates = 0; + } + + public static class AppStateMachineExtensions + { + public static AbstractStateMachine AllowStateTransition( + this AbstractStateMachine appStateMachine, AppState state) + { + if (appStateMachine == null) return null; + + appStateMachine.AllowedStates |= state; + return appStateMachine; + } + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/App/StateMachine/AppStateMachine.cs.meta b/Game/CourierOld/Assets/Code/App/StateMachine/AppStateMachine.cs.meta new file mode 100644 index 0000000..bb9910a --- /dev/null +++ b/Game/CourierOld/Assets/Code/App/StateMachine/AppStateMachine.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 818668cb48d54c90859d6486f38e307a +timeCreated: 1758561251 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/App/StateMachine/AppStateMachineContext.cs b/Game/CourierOld/Assets/Code/App/StateMachine/AppStateMachineContext.cs new file mode 100644 index 0000000..c6d995a --- /dev/null +++ b/Game/CourierOld/Assets/Code/App/StateMachine/AppStateMachineContext.cs @@ -0,0 +1,12 @@ +using Code.Input; +using Code.Scenes; +using Reflex.Attributes; + +namespace Code.App.StateMachine +{ + public class AppStateMachineContext + { + [Inject] public ISceneLoaderService SceneLoaderService; + [Inject] public IInputService InputService; + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/App/StateMachine/AppStateMachineContext.cs.meta b/Game/CourierOld/Assets/Code/App/StateMachine/AppStateMachineContext.cs.meta new file mode 100644 index 0000000..8228ecb --- /dev/null +++ b/Game/CourierOld/Assets/Code/App/StateMachine/AppStateMachineContext.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 7ceb9ced4a3f47c3b0e56b7469164c38 +timeCreated: 1758654630 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Configs.meta b/Game/CourierOld/Assets/Code/Configs.meta new file mode 100644 index 0000000..e3f7ad8 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Configs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 0c406adea623484589c43c299f333413 +timeCreated: 1760423371 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Configs/AppConfig.cs b/Game/CourierOld/Assets/Code/Configs/AppConfig.cs new file mode 100644 index 0000000..9332e41 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Configs/AppConfig.cs @@ -0,0 +1,10 @@ +using UnityEngine; + +namespace Code.Configs +{ + [CreateAssetMenu(menuName = "Config/AppConfig", fileName = "AppConfig")] + public class AppConfig : ScriptableObject + { + public GameObject infrastructureUnitPrefab; + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Configs/AppConfig.cs.meta b/Game/CourierOld/Assets/Code/Configs/AppConfig.cs.meta new file mode 100644 index 0000000..519f03e --- /dev/null +++ b/Game/CourierOld/Assets/Code/Configs/AppConfig.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 8e3665cd0ff1429b9df87f9a5cfcbf50 +timeCreated: 1760082720 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Configs/InputConfig.cs b/Game/CourierOld/Assets/Code/Configs/InputConfig.cs new file mode 100644 index 0000000..a125944 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Configs/InputConfig.cs @@ -0,0 +1,11 @@ +using UnityEngine; +using UnityEngine.InputSystem; + +namespace Code.Configs +{ + [CreateAssetMenu(fileName = "InputConfig", menuName = "Config/InputConfig")] + public class InputConfig : ScriptableObject + { + public InputActionAsset inputActionAsset; + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Configs/InputConfig.cs.meta b/Game/CourierOld/Assets/Code/Configs/InputConfig.cs.meta new file mode 100644 index 0000000..4badaca --- /dev/null +++ b/Game/CourierOld/Assets/Code/Configs/InputConfig.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: aa2d88f014404229865860b1af1f1374 +timeCreated: 1758565659 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Constants.meta b/Game/CourierOld/Assets/Code/Constants.meta new file mode 100644 index 0000000..eeb807e --- /dev/null +++ b/Game/CourierOld/Assets/Code/Constants.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 0478f38b61fb455f9087309cd7f0c0ca +timeCreated: 1760423130 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Constants/StringPaths.cs b/Game/CourierOld/Assets/Code/Constants/StringPaths.cs new file mode 100644 index 0000000..e392007 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Constants/StringPaths.cs @@ -0,0 +1,9 @@ +namespace Code.Constants +{ + public static class StringPaths + { + public const string ConfigSingle = "Configs/{0}/{1}"; + public const string ConfigMultiple = "Configs/{0}"; + + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Constants/StringPaths.cs.meta b/Game/CourierOld/Assets/Code/Constants/StringPaths.cs.meta new file mode 100644 index 0000000..b0e09a9 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Constants/StringPaths.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 768bb57caea24b08a0d98f167bad6c5c +timeCreated: 1758635906 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay.meta b/Game/CourierOld/Assets/Code/Gameplay.meta new file mode 100644 index 0000000..9420e3c --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: a8d4b5b0fbd947b093f98937d7b80f8e +timeCreated: 1760423477 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Input.meta b/Game/CourierOld/Assets/Code/Input.meta new file mode 100644 index 0000000..0389b2a --- /dev/null +++ b/Game/CourierOld/Assets/Code/Input.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 745a62fd7ec24bb3aedc1765c78e4856 +timeCreated: 1760422940 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Input/ActionMappings.cs b/Game/CourierOld/Assets/Code/Input/ActionMappings.cs new file mode 100644 index 0000000..e74af3f --- /dev/null +++ b/Game/CourierOld/Assets/Code/Input/ActionMappings.cs @@ -0,0 +1,9 @@ +namespace Code.Input +{ + public enum ActionMappings + { + MainMenu, + UI, + Gameplay + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Input/ActionMappings.cs.meta b/Game/CourierOld/Assets/Code/Input/ActionMappings.cs.meta new file mode 100644 index 0000000..6a11772 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Input/ActionMappings.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ea2ed0b0725d4abd80f95c4c9e279bc5 +timeCreated: 1758565105 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Input/GameplayActions.cs b/Game/CourierOld/Assets/Code/Input/GameplayActions.cs new file mode 100644 index 0000000..cdbb3ed --- /dev/null +++ b/Game/CourierOld/Assets/Code/Input/GameplayActions.cs @@ -0,0 +1,6 @@ +namespace Code.Input +{ + public enum GameplayActions + { + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Input/GameplayActions.cs.meta b/Game/CourierOld/Assets/Code/Input/GameplayActions.cs.meta new file mode 100644 index 0000000..d7abb99 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Input/GameplayActions.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ba4c07ed3bbf4636b24dc1d608491673 +timeCreated: 1759237958 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Input/IInputService.cs b/Game/CourierOld/Assets/Code/Input/IInputService.cs new file mode 100644 index 0000000..49f0e78 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Input/IInputService.cs @@ -0,0 +1,11 @@ +using System; +using UnityEngine.InputSystem; + +namespace Code.Input +{ + public interface IInputService + { + void EnableMap(ActionMappings actionMap); + void DisableMap(ActionMappings actionMap); + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Input/IInputService.cs.meta b/Game/CourierOld/Assets/Code/Input/IInputService.cs.meta new file mode 100644 index 0000000..8899361 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Input/IInputService.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 6171809034944b61969be9090df0b627 +timeCreated: 1758561216 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Input/InputService.cs b/Game/CourierOld/Assets/Code/Input/InputService.cs new file mode 100644 index 0000000..2589f22 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Input/InputService.cs @@ -0,0 +1,32 @@ +using System; +using Reflex.Attributes; +using UnityEngine; +using UnityEngine.InputSystem; + +namespace Code.Input +{ + public class InputService : IInputService, IDisposable + { + + private InputActionAsset _inputActionAsset; + + public void EnableMap(ActionMappings actionMap) => _inputActionAsset.actionMaps[(int)actionMap].Enable(); + public void DisableMap(ActionMappings actionMap) => _inputActionAsset.actionMaps[(int)actionMap].Disable(); + + public void BindAction(int mapId, int actionId, Action action) => _inputActionAsset + .actionMaps[mapId].actions[actionId].performed += action; + + public void UnbindAction(int mapId, int actionId, Action action) => + _inputActionAsset + .actionMaps[mapId].actions[actionId].performed -= action; + + public InputService(InputActionAsset inputActionAsset) + { + _inputActionAsset = inputActionAsset; + } + + public void Dispose() + { + } + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Input/InputService.cs.meta b/Game/CourierOld/Assets/Code/Input/InputService.cs.meta new file mode 100644 index 0000000..5989905 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Input/InputService.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 0fe368017b914ddea45ccdffab5bd4b9 +timeCreated: 1758561207 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Input/MainMenuActions.cs b/Game/CourierOld/Assets/Code/Input/MainMenuActions.cs new file mode 100644 index 0000000..91339cb --- /dev/null +++ b/Game/CourierOld/Assets/Code/Input/MainMenuActions.cs @@ -0,0 +1,7 @@ +namespace Code.Input +{ + public enum MainMenuActions + { + Exit + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Input/MainMenuActions.cs.meta b/Game/CourierOld/Assets/Code/Input/MainMenuActions.cs.meta new file mode 100644 index 0000000..c4d6897 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Input/MainMenuActions.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: c091224afc3e41c8897829d1de189773 +timeCreated: 1758735801 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Input/UIActions.cs b/Game/CourierOld/Assets/Code/Input/UIActions.cs new file mode 100644 index 0000000..a2f201a --- /dev/null +++ b/Game/CourierOld/Assets/Code/Input/UIActions.cs @@ -0,0 +1,7 @@ +namespace Code.Input +{ + public enum UIActions + { + + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Input/UIActions.cs.meta b/Game/CourierOld/Assets/Code/Input/UIActions.cs.meta new file mode 100644 index 0000000..bcadce2 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Input/UIActions.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: e1073378cdb949e59965189b44af89a4 +timeCreated: 1760423091 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Scenes.meta b/Game/CourierOld/Assets/Code/Scenes.meta new file mode 100644 index 0000000..3f1dc9a --- /dev/null +++ b/Game/CourierOld/Assets/Code/Scenes.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 54da53b176a2428fb509b3c3982b7812 +timeCreated: 1760423145 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Scenes/ISceneLoaderService.cs b/Game/CourierOld/Assets/Code/Scenes/ISceneLoaderService.cs new file mode 100644 index 0000000..1e0c6a3 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Scenes/ISceneLoaderService.cs @@ -0,0 +1,10 @@ +using System; + +namespace Code.Scenes +{ + public interface ISceneLoaderService + { + void LoadScene(string sceneName, Action callback = null, float waitFor = 0f); + void LoadScene(int sceneId, Action callback = null, float waitFor = 0f); + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Scenes/ISceneLoaderService.cs.meta b/Game/CourierOld/Assets/Code/Scenes/ISceneLoaderService.cs.meta new file mode 100644 index 0000000..5cc0892 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Scenes/ISceneLoaderService.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 3ba21110b8c64cc18b3907e55d9c83b5 +timeCreated: 1758563665 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Scenes/SceneIds.cs b/Game/CourierOld/Assets/Code/Scenes/SceneIds.cs new file mode 100644 index 0000000..ac3b0d9 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Scenes/SceneIds.cs @@ -0,0 +1,9 @@ +namespace Code.Scenes +{ + public enum SceneIds + { + Initial, + MainMenu, + Gameplay + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Scenes/SceneIds.cs.meta b/Game/CourierOld/Assets/Code/Scenes/SceneIds.cs.meta new file mode 100644 index 0000000..fbefd2b --- /dev/null +++ b/Game/CourierOld/Assets/Code/Scenes/SceneIds.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: bceada3812d14920a4c3eb81cc0cd0d3 +timeCreated: 1758564352 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Scenes/SceneLoaderService.cs b/Game/CourierOld/Assets/Code/Scenes/SceneLoaderService.cs new file mode 100644 index 0000000..05d12ce --- /dev/null +++ b/Game/CourierOld/Assets/Code/Scenes/SceneLoaderService.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections; +using Code.App; +using Reflex.Attributes; +using UnityEngine; +using UnityEngine.SceneManagement; + +namespace Code.Scenes +{ + public class SceneLoaderService : ISceneLoaderService + { + [Inject] private ICoroutineRunner _coroutineRunner; + + public void LoadScene(string sceneName, Action callback = null, float waitFor = 0f) => + _coroutineRunner.StartCoroutine(LoadSceneAsync(sceneName, callback, waitFor)); + + public void LoadScene(int sceneId, Action callback = null, float waitFor = 0f) => + _coroutineRunner.StartCoroutine(LoadSceneAsync(sceneId, callback, waitFor)); + + private IEnumerator LoadSceneAsync(string sceneName, Action callback = null, float waitFor = 0f) + { + if (waitFor > 0f) + yield return new WaitForSeconds(waitFor); + + AsyncOperation waitNextScene = SceneManager.LoadSceneAsync(sceneName, LoadSceneMode.Single); + + while (!waitNextScene.isDone) + yield return null; + + callback?.Invoke(); + } + + private IEnumerator LoadSceneAsync(int sceneId, Action callback = null, float waitFor = 0f) + { + if (waitFor > 0f) + yield return new WaitForSeconds(waitFor); + + AsyncOperation waitNextScene = SceneManager.LoadSceneAsync(sceneId, LoadSceneMode.Single); + + while (!waitNextScene.isDone) + yield return null; + + callback?.Invoke(); + } + } +} diff --git a/Game/CourierOld/Assets/Code/Scenes/SceneLoaderService.cs.meta b/Game/CourierOld/Assets/Code/Scenes/SceneLoaderService.cs.meta new file mode 100644 index 0000000..c40948c --- /dev/null +++ b/Game/CourierOld/Assets/Code/Scenes/SceneLoaderService.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ba78fc1986cc438b81de879f440151cc +timeCreated: 1758561857 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/StateMachine.meta b/Game/CourierOld/Assets/Code/StateMachine.meta new file mode 100644 index 0000000..bf3098e --- /dev/null +++ b/Game/CourierOld/Assets/Code/StateMachine.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 92d93ee1370647669e6ef6f307ce2844 +timeCreated: 1760422921 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/StateMachine/AbstractStateMachine.cs b/Game/CourierOld/Assets/Code/StateMachine/AbstractStateMachine.cs new file mode 100644 index 0000000..28298dc --- /dev/null +++ b/Game/CourierOld/Assets/Code/StateMachine/AbstractStateMachine.cs @@ -0,0 +1,68 @@ +using System.Collections.Generic; +using UnityEngine; + +namespace Code.StateMachine +{ + public abstract class AbstractStateMachine + : MonoBehaviour + where TStateMachineContext : new() + { + public BaseState CurrentBaseState { get; private set; } + private BaseState _previousBaseState; + + protected Dictionary> States = new(); + public TStateEnum AllowedStates { get; set; } + + public TStateMachineContext StateMachineContext { get; protected set; } = new(); + + protected virtual void Update() + { + CurrentBaseState.Tick(); + } + + public abstract void Initialize(); + + // Костыли 2 шт. для флагового енама в шаблонах + protected abstract bool CheckTransitionAllowed(TStateEnum nextState); + protected abstract void ResetAllowedTransitions(); + + // TODO Если в EnterState вызывается ExitState, то будет гарантированная поломка + public virtual AbstractStateMachine SwitchState(TStateEnum nextState) + { + if (!CheckTransitionAllowed(nextState)) + { + Debug.LogError("TransitionNotAllowed"); + return null; + } + + Debug.Log("Entered " + nextState); + ResetAllowedTransitions(); + + _previousBaseState = CurrentBaseState; + + CurrentBaseState = States[nextState]; + + if (_previousBaseState != null) + { + _previousBaseState.OnExited += CurrentBaseState.EnterState; + _previousBaseState.OnExited += FinishBaseStateTransition; + _previousBaseState.ExitState(); + } + else + { + CurrentBaseState.EnterState(); + } + + return this; + } + + protected virtual void FinishBaseStateTransition() + { + _previousBaseState.OnExited -= CurrentBaseState.EnterState; + _previousBaseState.OnExited -= FinishBaseStateTransition; + + _previousBaseState = null; + } + } +} + diff --git a/Game/CourierOld/Assets/Code/StateMachine/AbstractStateMachine.cs.meta b/Game/CourierOld/Assets/Code/StateMachine/AbstractStateMachine.cs.meta new file mode 100644 index 0000000..233da46 --- /dev/null +++ b/Game/CourierOld/Assets/Code/StateMachine/AbstractStateMachine.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 7321778c90464deabe0f2622cf7e1b7b +timeCreated: 1758650857 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/StateMachine/BaseState.cs b/Game/CourierOld/Assets/Code/StateMachine/BaseState.cs new file mode 100644 index 0000000..5f93849 --- /dev/null +++ b/Game/CourierOld/Assets/Code/StateMachine/BaseState.cs @@ -0,0 +1,23 @@ +namespace Code.StateMachine +{ + public abstract class BaseState + { + public delegate void Entered(); + public event Entered OnEntered; + + public delegate void Exited(); + public event Exited OnExited; + + public BaseState(TStateMachineContext context) + { + Context = context; + } + public TStateMachineContext Context { get; protected set; } + + public virtual void EnterState() => OnEntered?.Invoke(); + + public virtual void Tick(){} + + public virtual void ExitState() => OnExited?.Invoke(); + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/StateMachine/BaseState.cs.meta b/Game/CourierOld/Assets/Code/StateMachine/BaseState.cs.meta new file mode 100644 index 0000000..571d6e4 --- /dev/null +++ b/Game/CourierOld/Assets/Code/StateMachine/BaseState.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 7fac909e55264f26bb546a9a1879c151 +timeCreated: 1758561340 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/StaticData.meta b/Game/CourierOld/Assets/Code/StaticData.meta new file mode 100644 index 0000000..d893918 --- /dev/null +++ b/Game/CourierOld/Assets/Code/StaticData.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 7506360fc49e4ebf967422f049cd7683 +timeCreated: 1760423341 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/StaticData/IStaticDataService.cs b/Game/CourierOld/Assets/Code/StaticData/IStaticDataService.cs new file mode 100644 index 0000000..6b4561c --- /dev/null +++ b/Game/CourierOld/Assets/Code/StaticData/IStaticDataService.cs @@ -0,0 +1,12 @@ +using System.Collections.Generic; +using Code.Configs; + +namespace Code.StaticData +{ + public interface IStaticDataService + { + void Load(); + InputConfig InputConfig { get; } + AppConfig AppConfig { get; } + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/StaticData/IStaticDataService.cs.meta b/Game/CourierOld/Assets/Code/StaticData/IStaticDataService.cs.meta new file mode 100644 index 0000000..276aad2 --- /dev/null +++ b/Game/CourierOld/Assets/Code/StaticData/IStaticDataService.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 3422077bde514bf5a9e6852d7da8055c +timeCreated: 1758561230 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/StaticData/StaticDataService.cs b/Game/CourierOld/Assets/Code/StaticData/StaticDataService.cs new file mode 100644 index 0000000..33a1b9a --- /dev/null +++ b/Game/CourierOld/Assets/Code/StaticData/StaticDataService.cs @@ -0,0 +1,18 @@ +using Code.Configs; +using Code.Constants; +using UnityEngine; + +namespace Code.StaticData +{ + public class StaticDataService : IStaticDataService + { + public AppConfig AppConfig { get; private set; } + public InputConfig InputConfig { get; private set; } + + public void Load() + { + InputConfig = Resources.Load(string.Format(StringPaths.ConfigSingle, "App", "InputConfig")); + AppConfig = Resources.Load(string.Format(StringPaths.ConfigSingle, "App", "AppConfig")); + } + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/StaticData/StaticDataService.cs.meta b/Game/CourierOld/Assets/Code/StaticData/StaticDataService.cs.meta new file mode 100644 index 0000000..2f3f32a --- /dev/null +++ b/Game/CourierOld/Assets/Code/StaticData/StaticDataService.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 78a3e3dce12d489cae5d0d033b30d402 +timeCreated: 1758561099 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Readme.asset b/Game/CourierOld/Assets/Readme.asset deleted file mode 100644 index 77c2f83..0000000 --- a/Game/CourierOld/Assets/Readme.asset +++ /dev/null @@ -1,34 +0,0 @@ -%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: fcf7219bab7fe46a1ad266029b2fee19, type: 3} - m_Name: Readme - m_EditorClassIdentifier: - icon: {fileID: 2800000, guid: 727a75301c3d24613a3ebcec4a24c2c8, type: 3} - title: URP Empty Template - sections: - - heading: Welcome to the Universal Render Pipeline - text: This template includes the settings and assets you need to start creating with the Universal Render Pipeline. - linkText: - url: - - heading: URP Documentation - text: - linkText: Read more about URP - url: https://docs.unity3d.com/Packages/com.unity.render-pipelines.universal@latest - - heading: Forums - text: - linkText: Get answers and support - url: https://forum.unity.com/forums/universal-render-pipeline.383/ - - heading: Report bugs - text: - linkText: Submit a report - url: https://unity3d.com/unity/qa/bug-reporting - loadedLayout: 1 diff --git a/Game/CourierOld/Assets/TutorialInfo/Icons.meta b/Game/CourierOld/Assets/Resources.meta similarity index 57% rename from Game/CourierOld/Assets/TutorialInfo/Icons.meta rename to Game/CourierOld/Assets/Resources.meta index 1d19fb9..5577870 100644 --- a/Game/CourierOld/Assets/TutorialInfo/Icons.meta +++ b/Game/CourierOld/Assets/Resources.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 -guid: 8a0c9218a650547d98138cd835033977 +guid: b36f85518915a3b0eaad6269af0c7916 folderAsset: yes -timeCreated: 1484670163 -licenseType: Store DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Game/CourierOld/Assets/TutorialInfo/Scripts/Editor.meta b/Game/CourierOld/Assets/Resources/Configs.meta similarity index 57% rename from Game/CourierOld/Assets/TutorialInfo/Scripts/Editor.meta rename to Game/CourierOld/Assets/Resources/Configs.meta index f59f099..e6c4e6d 100644 --- a/Game/CourierOld/Assets/TutorialInfo/Scripts/Editor.meta +++ b/Game/CourierOld/Assets/Resources/Configs.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 -guid: 3ad9b87dffba344c89909c6d1b1c17e1 +guid: 8689472b62d77886a8d0cb4ddafeb6f0 folderAsset: yes -timeCreated: 1475593892 -licenseType: Store DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Game/CourierOld/Assets/TutorialInfo/Scripts.meta b/Game/CourierOld/Assets/Resources/Configs/App.meta similarity index 57% rename from Game/CourierOld/Assets/TutorialInfo/Scripts.meta rename to Game/CourierOld/Assets/Resources/Configs/App.meta index 02da605..8adb9a8 100644 --- a/Game/CourierOld/Assets/TutorialInfo/Scripts.meta +++ b/Game/CourierOld/Assets/Resources/Configs/App.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 -guid: 5a9bcd70e6a4b4b05badaa72e827d8e0 +guid: 27c53aa82f9b4e902892e4e2af60c316 folderAsset: yes -timeCreated: 1475835190 -licenseType: Store DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Configs/App/AppConfig.asset b/Game/CourierOld/Assets/Resources/Configs/App/AppConfig.asset new file mode 100644 index 0000000..d210611 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Configs/App/AppConfig.asset @@ -0,0 +1,15 @@ +%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: 8e3665cd0ff1429b9df87f9a5cfcbf50, type: 3} + m_Name: AppConfig + m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.AppConfig + infrastructureUnitPrefab: {fileID: 2862254794148572251, guid: eb190f8b18e3753859925e913b76b5f0, type: 3} diff --git a/Game/CourierOld/Assets/Readme.asset.meta b/Game/CourierOld/Assets/Resources/Configs/App/AppConfig.asset.meta similarity index 64% rename from Game/CourierOld/Assets/Readme.asset.meta rename to Game/CourierOld/Assets/Resources/Configs/App/AppConfig.asset.meta index ab3ad45..c2c26e1 100644 --- a/Game/CourierOld/Assets/Readme.asset.meta +++ b/Game/CourierOld/Assets/Resources/Configs/App/AppConfig.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 8105016687592461f977c054a80ce2f2 +guid: e3e015608e7bf69bfa5827b022255e08 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 0 + mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Configs/App/InputConfig.asset b/Game/CourierOld/Assets/Resources/Configs/App/InputConfig.asset new file mode 100644 index 0000000..b3ad030 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Configs/App/InputConfig.asset @@ -0,0 +1,15 @@ +%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: aa2d88f014404229865860b1af1f1374, type: 3} + m_Name: InputConfig + m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.InputConfig + inputActionAsset: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3} diff --git a/Game/CourierOld/Assets/Resources/Configs/App/InputConfig.asset.meta b/Game/CourierOld/Assets/Resources/Configs/App/InputConfig.asset.meta new file mode 100644 index 0000000..335fa06 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Configs/App/InputConfig.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7693edc790e21f9358e3cb8c1432d269 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/InfrastructureUnit.prefab b/Game/CourierOld/Assets/Resources/InfrastructureUnit.prefab new file mode 100644 index 0000000..b7c60f0 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/InfrastructureUnit.prefab @@ -0,0 +1,46 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2862254794148572251 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6998769077926471982} + - component: {fileID: 6034382256224092200} + m_Layer: 0 + m_Name: InfrastructureUnit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6998769077926471982 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2862254794148572251} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6034382256224092200 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2862254794148572251} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c1c87e09de06474cb53bc7ebb77e90cd, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Code.App.CoroutineRunner diff --git a/Game/CourierOld/Assets/Resources/InfrastructureUnit.prefab.meta b/Game/CourierOld/Assets/Resources/InfrastructureUnit.prefab.meta new file mode 100644 index 0000000..8b7c03e --- /dev/null +++ b/Game/CourierOld/Assets/Resources/InfrastructureUnit.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: eb190f8b18e3753859925e913b76b5f0 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/ProjectScope.prefab b/Game/CourierOld/Assets/Resources/ProjectScope.prefab new file mode 100644 index 0000000..9729946 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/ProjectScope.prefab @@ -0,0 +1,59 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6209735938922474344 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5613972869313170923} + - component: {fileID: 8643641025822982468} + - component: {fileID: -6843793150886761079} + m_Layer: 0 + m_Name: ProjectScope + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5613972869313170923 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6209735938922474344} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8643641025822982468 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6209735938922474344} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 238ee66aa2bafad47bf60938e98aebca, type: 3} + m_Name: + m_EditorClassIdentifier: Reflex::Reflex.Core.ProjectScope +--- !u!114 &-6843793150886761079 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6209735938922474344} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1efb7de496e44fed9b40cb92d99ef116, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Code.App.BootstrapInstaller diff --git a/Game/CourierOld/Assets/Resources/ProjectScope.prefab.meta b/Game/CourierOld/Assets/Resources/ProjectScope.prefab.meta new file mode 100644 index 0000000..23788e0 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/ProjectScope.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ef9a1e6f1d9eaa0e7b2cd9377d1ebfa6 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/ReflexSettings.asset b/Game/CourierOld/Assets/Resources/ReflexSettings.asset new file mode 100644 index 0000000..bdddd41 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/ReflexSettings.asset @@ -0,0 +1,17 @@ +%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: f50e4916e4924f2788a73057a16764c0, type: 3} + m_Name: ReflexSettings + m_EditorClassIdentifier: Reflex::Reflex.Configuration.ReflexSettings + k__BackingField: 0 + k__BackingField: + - {fileID: 8643641025822982468, guid: ef9a1e6f1d9eaa0e7b2cd9377d1ebfa6, type: 3} diff --git a/Game/CourierOld/Assets/Resources/ReflexSettings.asset.meta b/Game/CourierOld/Assets/Resources/ReflexSettings.asset.meta new file mode 100644 index 0000000..fa3c326 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/ReflexSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d8b8389d9927fb4b89b709927fe33d46 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Scenes.meta b/Game/CourierOld/Assets/Resources/Scenes.meta similarity index 100% rename from Game/CourierOld/Assets/Scenes.meta rename to Game/CourierOld/Assets/Resources/Scenes.meta diff --git a/Game/CourierOld/Assets/Resources/Scenes/Gameplay.unity b/Game/CourierOld/Assets/Resources/Scenes/Gameplay.unity new file mode 100644 index 0000000..eef873d --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Scenes/Gameplay.unity @@ -0,0 +1,170 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 10 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &1253837927 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1253837929} + - component: {fileID: 1253837928} + m_Layer: 0 + m_Name: SceneScope + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1253837928 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1253837927} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3fd1482e4a9dee141aecc5bcd0a4f0f3, type: 3} + m_Name: + m_EditorClassIdentifier: Reflex::Reflex.Core.SceneScope +--- !u!4 &1253837929 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1253837927} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1253837929} diff --git a/Game/CourierOld/Assets/TutorialInfo/Layout.wlt.meta b/Game/CourierOld/Assets/Resources/Scenes/Gameplay.unity.meta similarity index 53% rename from Game/CourierOld/Assets/TutorialInfo/Layout.wlt.meta rename to Game/CourierOld/Assets/Resources/Scenes/Gameplay.unity.meta index c0c8c77..bdd7e62 100644 --- a/Game/CourierOld/Assets/TutorialInfo/Layout.wlt.meta +++ b/Game/CourierOld/Assets/Resources/Scenes/Gameplay.unity.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: eabc9546105bf4accac1fd62a63e88e6 -timeCreated: 1487337779 -licenseType: Store +guid: 59150559bf28464b5a553799889b9b80 DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Scenes/Initial.unity b/Game/CourierOld/Assets/Resources/Scenes/Initial.unity new file mode 100644 index 0000000..eef873d --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Scenes/Initial.unity @@ -0,0 +1,170 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 10 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &1253837927 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1253837929} + - component: {fileID: 1253837928} + m_Layer: 0 + m_Name: SceneScope + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1253837928 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1253837927} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3fd1482e4a9dee141aecc5bcd0a4f0f3, type: 3} + m_Name: + m_EditorClassIdentifier: Reflex::Reflex.Core.SceneScope +--- !u!4 &1253837929 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1253837927} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1253837929} diff --git a/Game/CourierOld/Assets/Scenes/SampleScene.unity.meta b/Game/CourierOld/Assets/Resources/Scenes/Initial.unity.meta similarity index 100% rename from Game/CourierOld/Assets/Scenes/SampleScene.unity.meta rename to Game/CourierOld/Assets/Resources/Scenes/Initial.unity.meta diff --git a/Game/CourierOld/Assets/Resources/Scenes/MainMenu.unity b/Game/CourierOld/Assets/Resources/Scenes/MainMenu.unity new file mode 100644 index 0000000..286408a --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Scenes/MainMenu.unity @@ -0,0 +1,217 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 10 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &828922429 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 828922431} + - component: {fileID: 828922430} + m_Layer: 0 + m_Name: SkipToGameplay + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &828922430 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 828922429} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: affd42e82c2547a5af4604b574a24f59, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Code.App.Debug.GoToState + gotoState: 4 + allowedState: -1 +--- !u!4 &828922431 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 828922429} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1253837927 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1253837929} + - component: {fileID: 1253837928} + m_Layer: 0 + m_Name: SceneScope + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1253837928 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1253837927} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3fd1482e4a9dee141aecc5bcd0a4f0f3, type: 3} + m_Name: + m_EditorClassIdentifier: Reflex::Reflex.Core.SceneScope +--- !u!4 &1253837929 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1253837927} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1253837929} + - {fileID: 828922431} diff --git a/Game/CourierOld/Assets/Resources/Scenes/MainMenu.unity.meta b/Game/CourierOld/Assets/Resources/Scenes/MainMenu.unity.meta new file mode 100644 index 0000000..c60750b --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Scenes/MainMenu.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fb047145aa42fa81f940ba98cbe0a32f +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Scenes/SampleScene.unity b/Game/CourierOld/Assets/Scenes/SampleScene.unity deleted file mode 100644 index 1c63aa8..0000000 --- a/Game/CourierOld/Assets/Scenes/SampleScene.unity +++ /dev/null @@ -1,432 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!29 &1 -OcclusionCullingSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_OcclusionBakeSettings: - smallestOccluder: 5 - smallestHole: 0.25 - backfaceThreshold: 100 - m_SceneGUID: 00000000000000000000000000000000 - m_OcclusionCullingData: {fileID: 0} ---- !u!104 &2 -RenderSettings: - m_ObjectHideFlags: 0 - serializedVersion: 10 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_FogMode: 3 - m_FogDensity: 0.01 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} - m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} - m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 - m_AmbientMode: 0 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} - m_HaloStrength: 0.5 - m_FlareStrength: 1 - m_FlareFadeSpeed: 3 - m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 - m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 - m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} - m_UseRadianceAmbientProbe: 0 ---- !u!157 &3 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 0 - m_LightmapEditorSettings: - serializedVersion: 12 - m_Resolution: 2 - m_BakeResolution: 40 - m_AtlasSize: 1024 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAmbientOcclusion: 0 - m_Padding: 2 - m_LightmapParameters: {fileID: 0} - m_LightmapsBakeMode: 1 - m_TextureCompression: 1 - m_ReflectionCompression: 2 - m_MixedBakeMode: 2 - m_BakeBackend: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 512 - m_PVRBounces: 2 - m_PVREnvironmentSampleCount: 256 - m_PVREnvironmentReferencePointCount: 2048 - m_PVRFilteringMode: 1 - m_PVRDenoiserTypeDirect: 1 - m_PVRDenoiserTypeIndirect: 1 - m_PVRDenoiserTypeAO: 1 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVREnvironmentMIS: 1 - m_PVRCulling: 1 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} - m_LightingSettings: {fileID: 0} ---- !u!196 &4 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 3 - agentTypeID: 0 - agentRadius: 0.5 - agentHeight: 2 - agentSlope: 45 - agentClimb: 0.4 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - minRegionArea: 2 - manualCellSize: 0 - cellSize: 0.16666667 - manualTileSize: 0 - tileSize: 256 - buildHeightMesh: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 - debug: - m_Flags: 0 - m_NavMeshData: {fileID: 0} ---- !u!1 &330585543 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 330585546} - - component: {fileID: 330585545} - - component: {fileID: 330585544} - - component: {fileID: 330585547} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &330585544 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 330585543} - m_Enabled: 1 ---- !u!20 &330585545 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 330585543} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &330585546 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 330585543} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &330585547 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 330585543} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 0 - m_Cameras: [] - m_RendererIndex: -1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 1 - m_Antialiasing: 0 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 1 - m_AllowHDROutput: 1 - m_UseScreenCoordOverride: 0 - m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} - m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_Version: 2 - m_TaaSettings: - quality: 3 - frameInfluence: 0.1 - jitterScale: 1 - mipBias: 0 - varianceClampScale: 0.9 - contrastAdaptiveSharpening: 0 ---- !u!1 &410087039 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 410087041} - - component: {fileID: 410087040} - - component: {fileID: 410087042} - m_Layer: 0 - m_Name: Directional Light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!108 &410087040 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 410087039} - m_Enabled: 1 - serializedVersion: 11 - m_Type: 1 - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 2 - m_Range: 10 - m_SpotAngle: 30 - m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_CullingMatrixOverride: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_UseCullingMatrixOverride: 0 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingLayerMask: 1 - m_Lightmapping: 4 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 5000 - m_UseColorTemperature: 1 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 - m_ForceVisible: 0 - m_ShadowRadius: 0 - m_ShadowAngle: 0 ---- !u!4 &410087041 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 410087039} - serializedVersion: 2 - m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 0, y: 3, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!114 &410087042 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 410087039} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Version: 3 - m_UsePipelineSettings: 1 - m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 - m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 - m_LightCookieSize: {x: 1, y: 1} - m_LightCookieOffset: {x: 0, y: 0} - m_SoftShadowQuality: 1 ---- !u!1 &832575517 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 832575519} - - component: {fileID: 832575518} - m_Layer: 0 - m_Name: Global Volume - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &832575518 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 832575517} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IsGlobal: 1 - priority: 0 - blendDistance: 0 - weight: 1 - sharedProfile: {fileID: 11400000, guid: 10fc4df2da32a41aaa32d77bc913491c, type: 2} ---- !u!4 &832575519 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 832575517} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1660057539 &9223372036854775807 -SceneRoots: - m_ObjectHideFlags: 0 - m_Roots: - - {fileID: 330585546} - - {fileID: 410087041} - - {fileID: 832575519} diff --git a/Game/CourierOld/Assets/Settings/Graphics.meta b/Game/CourierOld/Assets/Settings/Graphics.meta new file mode 100644 index 0000000..93b4a10 --- /dev/null +++ b/Game/CourierOld/Assets/Settings/Graphics.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 941c7635ce6e6e00282fbccb2495580e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Settings/DefaultVolumeProfile.asset b/Game/CourierOld/Assets/Settings/Graphics/DefaultVolumeProfile.asset similarity index 99% rename from Game/CourierOld/Assets/Settings/DefaultVolumeProfile.asset rename to Game/CourierOld/Assets/Settings/Graphics/DefaultVolumeProfile.asset index 6fb1822..9e4bbfd 100644 --- a/Game/CourierOld/Assets/Settings/DefaultVolumeProfile.asset +++ b/Game/CourierOld/Assets/Settings/Graphics/DefaultVolumeProfile.asset @@ -342,6 +342,9 @@ MonoBehaviour: skyOcclusionIntensityMultiplier: m_OverrideState: 1 m_Value: 1 + worldOffset: + m_OverrideState: 1 + m_Value: {x: 0, y: 0, z: 0} --- !u!114 &-1216621516061285780 MonoBehaviour: m_ObjectHideFlags: 3 @@ -462,8 +465,6 @@ MonoBehaviour: - {fileID: -6288072647309666549} - {fileID: 7518938298396184218} - {fileID: -1410297666881709256} - - {fileID: -7750755424749557576} - - {fileID: -5139089513906902183} --- !u!114 &853819529557874667 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/Game/CourierOld/Assets/Settings/DefaultVolumeProfile.asset.meta b/Game/CourierOld/Assets/Settings/Graphics/DefaultVolumeProfile.asset.meta similarity index 100% rename from Game/CourierOld/Assets/Settings/DefaultVolumeProfile.asset.meta rename to Game/CourierOld/Assets/Settings/Graphics/DefaultVolumeProfile.asset.meta diff --git a/Game/CourierOld/Assets/Settings/Mobile_RPAsset.asset b/Game/CourierOld/Assets/Settings/Graphics/Mobile_RPAsset.asset similarity index 100% rename from Game/CourierOld/Assets/Settings/Mobile_RPAsset.asset rename to Game/CourierOld/Assets/Settings/Graphics/Mobile_RPAsset.asset diff --git a/Game/CourierOld/Assets/Settings/Mobile_RPAsset.asset.meta b/Game/CourierOld/Assets/Settings/Graphics/Mobile_RPAsset.asset.meta similarity index 100% rename from Game/CourierOld/Assets/Settings/Mobile_RPAsset.asset.meta rename to Game/CourierOld/Assets/Settings/Graphics/Mobile_RPAsset.asset.meta diff --git a/Game/CourierOld/Assets/Settings/Mobile_Renderer.asset b/Game/CourierOld/Assets/Settings/Graphics/Mobile_Renderer.asset similarity index 100% rename from Game/CourierOld/Assets/Settings/Mobile_Renderer.asset rename to Game/CourierOld/Assets/Settings/Graphics/Mobile_Renderer.asset diff --git a/Game/CourierOld/Assets/Settings/Mobile_Renderer.asset.meta b/Game/CourierOld/Assets/Settings/Graphics/Mobile_Renderer.asset.meta similarity index 100% rename from Game/CourierOld/Assets/Settings/Mobile_Renderer.asset.meta rename to Game/CourierOld/Assets/Settings/Graphics/Mobile_Renderer.asset.meta diff --git a/Game/CourierOld/Assets/Settings/PC_RPAsset.asset b/Game/CourierOld/Assets/Settings/Graphics/PC_RPAsset.asset similarity index 100% rename from Game/CourierOld/Assets/Settings/PC_RPAsset.asset rename to Game/CourierOld/Assets/Settings/Graphics/PC_RPAsset.asset diff --git a/Game/CourierOld/Assets/Settings/PC_RPAsset.asset.meta b/Game/CourierOld/Assets/Settings/Graphics/PC_RPAsset.asset.meta similarity index 100% rename from Game/CourierOld/Assets/Settings/PC_RPAsset.asset.meta rename to Game/CourierOld/Assets/Settings/Graphics/PC_RPAsset.asset.meta diff --git a/Game/CourierOld/Assets/Settings/PC_Renderer.asset b/Game/CourierOld/Assets/Settings/Graphics/PC_Renderer.asset similarity index 100% rename from Game/CourierOld/Assets/Settings/PC_Renderer.asset rename to Game/CourierOld/Assets/Settings/Graphics/PC_Renderer.asset diff --git a/Game/CourierOld/Assets/Settings/PC_Renderer.asset.meta b/Game/CourierOld/Assets/Settings/Graphics/PC_Renderer.asset.meta similarity index 100% rename from Game/CourierOld/Assets/Settings/PC_Renderer.asset.meta rename to Game/CourierOld/Assets/Settings/Graphics/PC_Renderer.asset.meta diff --git a/Game/CourierOld/Assets/Settings/SampleSceneProfile.asset b/Game/CourierOld/Assets/Settings/Graphics/SampleSceneProfile.asset similarity index 100% rename from Game/CourierOld/Assets/Settings/SampleSceneProfile.asset rename to Game/CourierOld/Assets/Settings/Graphics/SampleSceneProfile.asset diff --git a/Game/CourierOld/Assets/Settings/SampleSceneProfile.asset.meta b/Game/CourierOld/Assets/Settings/Graphics/SampleSceneProfile.asset.meta similarity index 100% rename from Game/CourierOld/Assets/Settings/SampleSceneProfile.asset.meta rename to Game/CourierOld/Assets/Settings/Graphics/SampleSceneProfile.asset.meta diff --git a/Game/CourierOld/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Game/CourierOld/Assets/Settings/Graphics/UniversalRenderPipelineGlobalSettings.asset similarity index 100% rename from Game/CourierOld/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset rename to Game/CourierOld/Assets/Settings/Graphics/UniversalRenderPipelineGlobalSettings.asset diff --git a/Game/CourierOld/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset.meta b/Game/CourierOld/Assets/Settings/Graphics/UniversalRenderPipelineGlobalSettings.asset.meta similarity index 100% rename from Game/CourierOld/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset.meta rename to Game/CourierOld/Assets/Settings/Graphics/UniversalRenderPipelineGlobalSettings.asset.meta diff --git a/Game/CourierOld/Assets/Settings/Input.meta b/Game/CourierOld/Assets/Settings/Input.meta new file mode 100644 index 0000000..7d85f32 --- /dev/null +++ b/Game/CourierOld/Assets/Settings/Input.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f2dee370d8e9569f9a461a2da09596e3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/InputSystem_Actions.inputactions b/Game/CourierOld/Assets/Settings/Input/InputSystem_Actions.inputactions similarity index 99% rename from Game/CourierOld/Assets/InputSystem_Actions.inputactions rename to Game/CourierOld/Assets/Settings/Input/InputSystem_Actions.inputactions index 1a12cb9..95c9647 100644 --- a/Game/CourierOld/Assets/InputSystem_Actions.inputactions +++ b/Game/CourierOld/Assets/Settings/Input/InputSystem_Actions.inputactions @@ -1,479 +1,12 @@ { + "version": 1, "name": "InputSystem_Actions", "maps": [ { - "name": "Player", - "id": "df70fa95-8a34-4494-b137-73ab6b9c7d37", - "actions": [ - { - "name": "Move", - "type": "Value", - "id": "351f2ccd-1f9f-44bf-9bec-d62ac5c5f408", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "Look", - "type": "Value", - "id": "6b444451-8a00-4d00-a97e-f47457f736a8", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "Attack", - "type": "Button", - "id": "6c2ab1b8-8984-453a-af3d-a3c78ae1679a", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Interact", - "type": "Button", - "id": "852140f2-7766-474d-8707-702459ba45f3", - "expectedControlType": "Button", - "processors": "", - "interactions": "Hold", - "initialStateCheck": false - }, - { - "name": "Crouch", - "type": "Button", - "id": "27c5f898-bc57-4ee1-8800-db469aca5fe3", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Jump", - "type": "Button", - "id": "f1ba0d36-48eb-4cd5-b651-1c94a6531f70", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Previous", - "type": "Button", - "id": "2776c80d-3c14-4091-8c56-d04ced07a2b0", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Next", - "type": "Button", - "id": "b7230bb6-fc9b-4f52-8b25-f5e19cb2c2ba", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Sprint", - "type": "Button", - "id": "641cd816-40e6-41b4-8c3d-04687c349290", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - } - ], - "bindings": [ - { - "name": "", - "id": "978bfe49-cc26-4a3d-ab7b-7d7a29327403", - "path": "/leftStick", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Move", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "WASD", - "id": "00ca640b-d935-4593-8157-c05846ea39b3", - "path": "Dpad", - "interactions": "", - "processors": "", - "groups": "", - "action": "Move", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "up", - "id": "e2062cb9-1b15-46a2-838c-2f8d72a0bdd9", - "path": "/w", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "up", - "id": "8180e8bd-4097-4f4e-ab88-4523101a6ce9", - "path": "/upArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "320bffee-a40b-4347-ac70-c210eb8bc73a", - "path": "/s", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "1c5327b5-f71c-4f60-99c7-4e737386f1d1", - "path": "/downArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "d2581a9b-1d11-4566-b27d-b92aff5fabbc", - "path": "/a", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "2e46982e-44cc-431b-9f0b-c11910bf467a", - "path": "/leftArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "fcfe95b8-67b9-4526-84b5-5d0bc98d6400", - "path": "/d", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "77bff152-3580-4b21-b6de-dcd0c7e41164", - "path": "/rightArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "", - "id": "1635d3fe-58b6-4ba9-a4e2-f4b964f6b5c8", - "path": "/{Primary2DAxis}", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Move", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "3ea4d645-4504-4529-b061-ab81934c3752", - "path": "/stick", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Move", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "c1f7a91b-d0fd-4a62-997e-7fb9b69bf235", - "path": "/rightStick", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Look", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "8c8e490b-c610-4785-884f-f04217b23ca4", - "path": "/delta", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse;Touch", - "action": "Look", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "3e5f5442-8668-4b27-a940-df99bad7e831", - "path": "/{Hatswitch}", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Look", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "143bb1cd-cc10-4eca-a2f0-a3664166fe91", - "path": "/buttonWest", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "05f6913d-c316-48b2-a6bb-e225f14c7960", - "path": "/leftButton", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "886e731e-7071-4ae4-95c0-e61739dad6fd", - "path": "/primaryTouch/tap", - "interactions": "", - "processors": "", - "groups": ";Touch", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "ee3d0cd2-254e-47a7-a8cb-bc94d9658c54", - "path": "/trigger", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "8255d333-5683-4943-a58a-ccb207ff1dce", - "path": "/{PrimaryAction}", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "b3c1c7f0-bd20-4ee7-a0f1-899b24bca6d7", - "path": "/enter", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "cbac6039-9c09-46a1-b5f2-4e5124ccb5ed", - "path": "/2", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Next", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "e15ca19d-e649-4852-97d5-7fe8ccc44e94", - "path": "/dpad/right", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Next", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "f2e9ba44-c423-42a7-ad56-f20975884794", - "path": "/leftShift", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Sprint", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "8cbb2f4b-a784-49cc-8d5e-c010b8c7f4e6", - "path": "/leftStickPress", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Sprint", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "d8bf24bf-3f2f-4160-a97c-38ec1eb520ba", - "path": "/trigger", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Sprint", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "eb40bb66-4559-4dfa-9a2f-820438abb426", - "path": "/space", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Jump", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "daba33a1-ad0c-4742-a909-43ad1cdfbeb6", - "path": "/buttonSouth", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Jump", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "603f3daf-40bd-4854-8724-93e8017f59e3", - "path": "/secondaryButton", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Jump", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "1534dc16-a6aa-499d-9c3a-22b47347b52a", - "path": "/1", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Previous", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "25060bbd-a3a6-476e-8fba-45ae484aad05", - "path": "/dpad/left", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Previous", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "1c04ea5f-b012-41d1-a6f7-02e963b52893", - "path": "/e", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Interact", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "b3f66d0b-7751-423f-908b-a11c5bd95930", - "path": "/buttonNorth", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Interact", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "4f4649ac-64a8-4a73-af11-b3faef356a4d", - "path": "/buttonEast", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Crouch", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "36e52cba-0905-478e-a818-f4bfcb9f3b9a", - "path": "/c", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Crouch", - "isComposite": false, - "isPartOfComposite": false - } - ] + "name": "MainMenu", + "id": "10d8bac4-a519-4deb-a45c-bb7632d07289", + "actions": [], + "bindings": [] }, { "name": "UI", @@ -990,6 +523,480 @@ "isPartOfComposite": false } ] + }, + { + "name": "Gameplay", + "id": "df70fa95-8a34-4494-b137-73ab6b9c7d37", + "actions": [ + { + "name": "Move", + "type": "Value", + "id": "351f2ccd-1f9f-44bf-9bec-d62ac5c5f408", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Look", + "type": "Value", + "id": "6b444451-8a00-4d00-a97e-f47457f736a8", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Attack", + "type": "Button", + "id": "6c2ab1b8-8984-453a-af3d-a3c78ae1679a", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Interact", + "type": "Button", + "id": "852140f2-7766-474d-8707-702459ba45f3", + "expectedControlType": "Button", + "processors": "", + "interactions": "Hold", + "initialStateCheck": false + }, + { + "name": "Crouch", + "type": "Button", + "id": "27c5f898-bc57-4ee1-8800-db469aca5fe3", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Jump", + "type": "Button", + "id": "f1ba0d36-48eb-4cd5-b651-1c94a6531f70", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Previous", + "type": "Button", + "id": "2776c80d-3c14-4091-8c56-d04ced07a2b0", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Next", + "type": "Button", + "id": "b7230bb6-fc9b-4f52-8b25-f5e19cb2c2ba", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Sprint", + "type": "Button", + "id": "641cd816-40e6-41b4-8c3d-04687c349290", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + } + ], + "bindings": [ + { + "name": "", + "id": "978bfe49-cc26-4a3d-ab7b-7d7a29327403", + "path": "/leftStick", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Move", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "WASD", + "id": "00ca640b-d935-4593-8157-c05846ea39b3", + "path": "Dpad", + "interactions": "", + "processors": "", + "groups": "", + "action": "Move", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "e2062cb9-1b15-46a2-838c-2f8d72a0bdd9", + "path": "/w", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "up", + "id": "8180e8bd-4097-4f4e-ab88-4523101a6ce9", + "path": "/upArrow", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "320bffee-a40b-4347-ac70-c210eb8bc73a", + "path": "/s", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "1c5327b5-f71c-4f60-99c7-4e737386f1d1", + "path": "/downArrow", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "d2581a9b-1d11-4566-b27d-b92aff5fabbc", + "path": "/a", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "2e46982e-44cc-431b-9f0b-c11910bf467a", + "path": "/leftArrow", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "fcfe95b8-67b9-4526-84b5-5d0bc98d6400", + "path": "/d", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "77bff152-3580-4b21-b6de-dcd0c7e41164", + "path": "/rightArrow", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "", + "id": "1635d3fe-58b6-4ba9-a4e2-f4b964f6b5c8", + "path": "/{Primary2DAxis}", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "Move", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "3ea4d645-4504-4529-b061-ab81934c3752", + "path": "/stick", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Move", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "c1f7a91b-d0fd-4a62-997e-7fb9b69bf235", + "path": "/rightStick", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Look", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "8c8e490b-c610-4785-884f-f04217b23ca4", + "path": "/delta", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse;Touch", + "action": "Look", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "3e5f5442-8668-4b27-a940-df99bad7e831", + "path": "/{Hatswitch}", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Look", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "143bb1cd-cc10-4eca-a2f0-a3664166fe91", + "path": "/buttonWest", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Attack", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "05f6913d-c316-48b2-a6bb-e225f14c7960", + "path": "/leftButton", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Attack", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "886e731e-7071-4ae4-95c0-e61739dad6fd", + "path": "/primaryTouch/tap", + "interactions": "", + "processors": "", + "groups": ";Touch", + "action": "Attack", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "ee3d0cd2-254e-47a7-a8cb-bc94d9658c54", + "path": "/trigger", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Attack", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "8255d333-5683-4943-a58a-ccb207ff1dce", + "path": "/{PrimaryAction}", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "Attack", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "b3c1c7f0-bd20-4ee7-a0f1-899b24bca6d7", + "path": "/enter", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Attack", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "cbac6039-9c09-46a1-b5f2-4e5124ccb5ed", + "path": "/2", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Next", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "e15ca19d-e649-4852-97d5-7fe8ccc44e94", + "path": "/dpad/right", + "interactions": "", + "processors": "", + "groups": "Gamepad", + "action": "Next", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "f2e9ba44-c423-42a7-ad56-f20975884794", + "path": "/leftShift", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Sprint", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "8cbb2f4b-a784-49cc-8d5e-c010b8c7f4e6", + "path": "/leftStickPress", + "interactions": "", + "processors": "", + "groups": "Gamepad", + "action": "Sprint", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "d8bf24bf-3f2f-4160-a97c-38ec1eb520ba", + "path": "/trigger", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "Sprint", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "eb40bb66-4559-4dfa-9a2f-820438abb426", + "path": "/space", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Jump", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "daba33a1-ad0c-4742-a909-43ad1cdfbeb6", + "path": "/buttonSouth", + "interactions": "", + "processors": "", + "groups": "Gamepad", + "action": "Jump", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "603f3daf-40bd-4854-8724-93e8017f59e3", + "path": "/secondaryButton", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "Jump", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "1534dc16-a6aa-499d-9c3a-22b47347b52a", + "path": "/1", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Previous", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "25060bbd-a3a6-476e-8fba-45ae484aad05", + "path": "/dpad/left", + "interactions": "", + "processors": "", + "groups": "Gamepad", + "action": "Previous", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "1c04ea5f-b012-41d1-a6f7-02e963b52893", + "path": "/e", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Interact", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "b3f66d0b-7751-423f-908b-a11c5bd95930", + "path": "/buttonNorth", + "interactions": "", + "processors": "", + "groups": "Gamepad", + "action": "Interact", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "4f4649ac-64a8-4a73-af11-b3faef356a4d", + "path": "/buttonEast", + "interactions": "", + "processors": "", + "groups": "Gamepad", + "action": "Crouch", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "36e52cba-0905-478e-a818-f4bfcb9f3b9a", + "path": "/c", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Crouch", + "isComposite": false, + "isPartOfComposite": false + } + ] } ], "controlSchemes": [ diff --git a/Game/CourierOld/Assets/InputSystem_Actions.inputactions.meta b/Game/CourierOld/Assets/Settings/Input/InputSystem_Actions.inputactions.meta similarity index 100% rename from Game/CourierOld/Assets/InputSystem_Actions.inputactions.meta rename to Game/CourierOld/Assets/Settings/Input/InputSystem_Actions.inputactions.meta diff --git a/Game/CourierOld/Assets/TutorialInfo/Icons/URP.png b/Game/CourierOld/Assets/TutorialInfo/Icons/URP.png deleted file mode 100644 index bdbf408..0000000 --- a/Game/CourierOld/Assets/TutorialInfo/Icons/URP.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1d17a9ff3537859abe2c008603d29d90cf43191ae77aa386167cc65e53ba03d9 -size 24069 diff --git a/Game/CourierOld/Assets/TutorialInfo/Icons/URP.png.meta b/Game/CourierOld/Assets/TutorialInfo/Icons/URP.png.meta deleted file mode 100644 index 0f2cab0..0000000 --- a/Game/CourierOld/Assets/TutorialInfo/Icons/URP.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -fileFormatVersion: 2 -guid: 727a75301c3d24613a3ebcec4a24c2c8 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - 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 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 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: 0 - 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: 2 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Game/CourierOld/Assets/TutorialInfo/Layout.wlt b/Game/CourierOld/Assets/TutorialInfo/Layout.wlt deleted file mode 100644 index 7b50a25..0000000 --- a/Game/CourierOld/Assets/TutorialInfo/Layout.wlt +++ /dev/null @@ -1,654 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &1 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_PixelRect: - serializedVersion: 2 - x: 0 - y: 45 - width: 1666 - height: 958 - m_ShowMode: 4 - m_Title: - m_RootView: {fileID: 6} - m_MinSize: {x: 950, y: 542} - m_MaxSize: {x: 10000, y: 10000} ---- !u!114 &2 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 466 - width: 290 - height: 442 - m_MinSize: {x: 234, y: 271} - m_MaxSize: {x: 10004, y: 10021} - m_ActualView: {fileID: 14} - m_Panes: - - {fileID: 14} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &3 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 4} - - {fileID: 2} - m_Position: - serializedVersion: 2 - x: 973 - y: 0 - width: 290 - height: 908 - m_MinSize: {x: 234, y: 492} - m_MaxSize: {x: 10004, y: 14042} - vertical: 1 - controlID: 226 ---- !u!114 &4 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 290 - height: 466 - m_MinSize: {x: 204, y: 221} - m_MaxSize: {x: 4004, y: 4021} - m_ActualView: {fileID: 17} - m_Panes: - - {fileID: 17} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &5 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 466 - width: 973 - height: 442 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 15} - m_Panes: - - {fileID: 15} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &6 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 7} - - {fileID: 8} - - {fileID: 9} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1666 - height: 958 - m_MinSize: {x: 950, y: 542} - m_MaxSize: {x: 10000, y: 10000} ---- !u!114 &7 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1666 - height: 30 - m_MinSize: {x: 0, y: 0} - m_MaxSize: {x: 0, y: 0} - m_LastLoadedLayoutName: Tutorial ---- !u!114 &8 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 10} - - {fileID: 3} - - {fileID: 11} - m_Position: - serializedVersion: 2 - x: 0 - y: 30 - width: 1666 - height: 908 - m_MinSize: {x: 713, y: 492} - m_MaxSize: {x: 18008, y: 14042} - vertical: 0 - controlID: 74 ---- !u!114 &9 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 938 - width: 1666 - height: 20 - m_MinSize: {x: 0, y: 0} - m_MaxSize: {x: 0, y: 0} ---- !u!114 &10 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 12} - - {fileID: 5} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 973 - height: 908 - m_MinSize: {x: 202, y: 442} - m_MaxSize: {x: 4002, y: 8042} - vertical: 1 - controlID: 75 ---- !u!114 &11 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 1263 - y: 0 - width: 403 - height: 908 - m_MinSize: {x: 277, y: 71} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 13} - m_Panes: - - {fileID: 13} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &12 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 973 - height: 466 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 16} - m_Panes: - - {fileID: 16} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &13 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_AutoRepaintOnSceneChange: 0 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Inspector - m_Image: {fileID: -6905738622615590433, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_DepthBufferBits: 0 - m_Pos: - serializedVersion: 2 - x: 2 - y: 19 - width: 401 - height: 887 - m_ScrollPosition: {x: 0, y: 0} - m_InspectorMode: 0 - m_PreviewResizer: - m_CachedPref: -160 - m_ControlHash: -371814159 - m_PrefName: Preview_InspectorPreview - m_PreviewWindow: {fileID: 0} ---- !u!114 &14 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_AutoRepaintOnSceneChange: 0 - m_MinSize: {x: 230, y: 250} - m_MaxSize: {x: 10000, y: 10000} - m_TitleContent: - m_Text: Project - m_Image: {fileID: -7501376956915960154, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_DepthBufferBits: 0 - m_Pos: - serializedVersion: 2 - x: 2 - y: 19 - width: 286 - height: 421 - m_SearchFilter: - m_NameFilter: - m_ClassNames: [] - m_AssetLabels: [] - m_AssetBundleNames: [] - m_VersionControlStates: [] - m_ReferencingInstanceIDs: - m_ScenePaths: [] - m_ShowAllHits: 0 - m_SearchArea: 0 - m_Folders: - - Assets - m_ViewMode: 0 - m_StartGridSize: 64 - m_LastFolders: - - Assets - m_LastFoldersGridSize: -1 - m_LastProjectPath: /Users/danielbrauer/Unity Projects/New Unity Project 47 - m_IsLocked: 0 - m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: ee240000 - m_LastClickedID: 9454 - m_ExpandedIDs: ee24000000ca9a3bffffff7f - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 68fbffff - m_LastClickedID: 0 - m_ExpandedIDs: ee240000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_ListAreaState: - m_SelectedInstanceIDs: 68fbffff - m_LastClickedInstanceID: -1176 - m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: c6230000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 64 - m_DirectoriesAreaWidth: 110 ---- !u!114 &15 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_AutoRepaintOnSceneChange: 1 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Game - m_Image: {fileID: -2087823869225018852, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_DepthBufferBits: 32 - m_Pos: - serializedVersion: 2 - x: 0 - y: 19 - width: 971 - height: 421 - m_MaximizeOnPlay: 0 - m_Gizmos: 0 - m_Stats: 0 - m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 - m_TargetDisplay: 0 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - m_HBaseRangeMin: -242.75 - m_HBaseRangeMax: 242.75 - m_VBaseRangeMin: -101 - m_VBaseRangeMax: 101 - m_HAllowExceedBaseRangeMin: 1 - m_HAllowExceedBaseRangeMax: 1 - m_VAllowExceedBaseRangeMin: 1 - m_VAllowExceedBaseRangeMax: 1 - m_ScaleWithWindow: 0 - m_HSlider: 0 - m_VSlider: 0 - m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 - m_EnableSliderZoom: 0 - m_UniformScale: 1 - m_UpDirection: 1 - m_DrawArea: - serializedVersion: 2 - x: 0 - y: 17 - width: 971 - height: 404 - m_Scale: {x: 2, y: 2} - m_Translation: {x: 485.5, y: 202} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -242.75 - y: -101 - width: 485.5 - height: 202 - m_MinimalGUI: 1 - m_defaultScale: 2 - m_TargetTexture: {fileID: 0} - m_CurrentColorSpace: 0 - m_LastWindowPixelSize: {x: 1942, y: 842} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 01000000000100000100 ---- !u!114 &16 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_AutoRepaintOnSceneChange: 1 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Scene - m_Image: {fileID: 2318424515335265636, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_DepthBufferBits: 32 - m_Pos: - serializedVersion: 2 - x: 0 - y: 19 - width: 971 - height: 445 - m_SceneLighting: 1 - lastFramingTime: 0 - m_2DMode: 0 - m_isRotationLocked: 0 - m_AudioPlay: 0 - m_Position: - m_Target: {x: 0, y: 0, z: 0} - speed: 2 - m_Value: {x: 0, y: 0, z: 0} - m_RenderMode: 0 - m_ValidateTrueMetals: 0 - m_SceneViewState: - showFog: 1 - showMaterialUpdate: 0 - showSkybox: 1 - showFlares: 1 - showImageEffects: 1 - grid: - xGrid: - m_Target: 0 - speed: 2 - m_Value: 0 - yGrid: - m_Target: 1 - speed: 2 - m_Value: 1 - zGrid: - m_Target: 0 - speed: 2 - m_Value: 0 - m_Rotation: - m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} - speed: 2 - m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} - m_Size: - m_Target: 10 - speed: 2 - m_Value: 10 - m_Ortho: - m_Target: 0 - speed: 2 - m_Value: 0 - m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0} - m_LastSceneViewOrtho: 0 - m_ReplacementShader: {fileID: 0} - m_ReplacementString: - m_LastLockedObject: {fileID: 0} - m_ViewIsLockedToObject: 0 ---- !u!114 &17 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_AutoRepaintOnSceneChange: 0 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Hierarchy - m_Image: {fileID: -590624980919486359, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_DepthBufferBits: 0 - m_Pos: - serializedVersion: 2 - x: 2 - y: 19 - width: 286 - height: 445 - m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 68fbffff - m_LastClickedID: -1176 - m_ExpandedIDs: 7efbffff00000000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_ExpandedScenes: - - - m_CurrenRootInstanceID: 0 - m_Locked: 0 - m_CurrentSortingName: TransformSorting diff --git a/Game/CourierOld/Assets/TutorialInfo/Scripts/Editor/ReadmeEditor.cs b/Game/CourierOld/Assets/TutorialInfo/Scripts/Editor/ReadmeEditor.cs deleted file mode 100644 index ad55eca..0000000 --- a/Game/CourierOld/Assets/TutorialInfo/Scripts/Editor/ReadmeEditor.cs +++ /dev/null @@ -1,242 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEditor; -using System; -using System.IO; -using System.Reflection; - -[CustomEditor(typeof(Readme))] -[InitializeOnLoad] -public class ReadmeEditor : Editor -{ - static string s_ShowedReadmeSessionStateName = "ReadmeEditor.showedReadme"; - - static string s_ReadmeSourceDirectory = "Assets/TutorialInfo"; - - const float k_Space = 16f; - - static ReadmeEditor() - { - EditorApplication.delayCall += SelectReadmeAutomatically; - } - - static void RemoveTutorial() - { - if (EditorUtility.DisplayDialog("Remove Readme Assets", - - $"All contents under {s_ReadmeSourceDirectory} will be removed, are you sure you want to proceed?", - "Proceed", - "Cancel")) - { - if (Directory.Exists(s_ReadmeSourceDirectory)) - { - FileUtil.DeleteFileOrDirectory(s_ReadmeSourceDirectory); - FileUtil.DeleteFileOrDirectory(s_ReadmeSourceDirectory + ".meta"); - } - else - { - Debug.Log($"Could not find the Readme folder at {s_ReadmeSourceDirectory}"); - } - - var readmeAsset = SelectReadme(); - if (readmeAsset != null) - { - var path = AssetDatabase.GetAssetPath(readmeAsset); - FileUtil.DeleteFileOrDirectory(path + ".meta"); - FileUtil.DeleteFileOrDirectory(path); - } - - AssetDatabase.Refresh(); - } - } - - static void SelectReadmeAutomatically() - { - if (!SessionState.GetBool(s_ShowedReadmeSessionStateName, false)) - { - var readme = SelectReadme(); - SessionState.SetBool(s_ShowedReadmeSessionStateName, true); - - if (readme && !readme.loadedLayout) - { - LoadLayout(); - readme.loadedLayout = true; - } - } - } - - static void LoadLayout() - { - var assembly = typeof(EditorApplication).Assembly; - var windowLayoutType = assembly.GetType("UnityEditor.WindowLayout", true); - var method = windowLayoutType.GetMethod("LoadWindowLayout", BindingFlags.Public | BindingFlags.Static); - method.Invoke(null, new object[] { Path.Combine(Application.dataPath, "TutorialInfo/Layout.wlt"), false }); - } - - static Readme SelectReadme() - { - var ids = AssetDatabase.FindAssets("Readme t:Readme"); - if (ids.Length == 1) - { - var readmeObject = AssetDatabase.LoadMainAssetAtPath(AssetDatabase.GUIDToAssetPath(ids[0])); - - Selection.objects = new UnityEngine.Object[] { readmeObject }; - - return (Readme)readmeObject; - } - else - { - Debug.Log("Couldn't find a readme"); - return null; - } - } - - protected override void OnHeaderGUI() - { - var readme = (Readme)target; - Init(); - - var iconWidth = Mathf.Min(EditorGUIUtility.currentViewWidth / 3f - 20f, 128f); - - GUILayout.BeginHorizontal("In BigTitle"); - { - if (readme.icon != null) - { - GUILayout.Space(k_Space); - GUILayout.Label(readme.icon, GUILayout.Width(iconWidth), GUILayout.Height(iconWidth)); - } - GUILayout.Space(k_Space); - GUILayout.BeginVertical(); - { - - GUILayout.FlexibleSpace(); - GUILayout.Label(readme.title, TitleStyle); - GUILayout.FlexibleSpace(); - } - GUILayout.EndVertical(); - GUILayout.FlexibleSpace(); - } - GUILayout.EndHorizontal(); - } - - public override void OnInspectorGUI() - { - var readme = (Readme)target; - Init(); - - foreach (var section in readme.sections) - { - if (!string.IsNullOrEmpty(section.heading)) - { - GUILayout.Label(section.heading, HeadingStyle); - } - - if (!string.IsNullOrEmpty(section.text)) - { - GUILayout.Label(section.text, BodyStyle); - } - - if (!string.IsNullOrEmpty(section.linkText)) - { - if (LinkLabel(new GUIContent(section.linkText))) - { - Application.OpenURL(section.url); - } - } - - GUILayout.Space(k_Space); - } - - if (GUILayout.Button("Remove Readme Assets", ButtonStyle)) - { - RemoveTutorial(); - } - } - - bool m_Initialized; - - GUIStyle LinkStyle - { - get { return m_LinkStyle; } - } - - [SerializeField] - GUIStyle m_LinkStyle; - - GUIStyle TitleStyle - { - get { return m_TitleStyle; } - } - - [SerializeField] - GUIStyle m_TitleStyle; - - GUIStyle HeadingStyle - { - get { return m_HeadingStyle; } - } - - [SerializeField] - GUIStyle m_HeadingStyle; - - GUIStyle BodyStyle - { - get { return m_BodyStyle; } - } - - [SerializeField] - GUIStyle m_BodyStyle; - - GUIStyle ButtonStyle - { - get { return m_ButtonStyle; } - } - - [SerializeField] - GUIStyle m_ButtonStyle; - - void Init() - { - if (m_Initialized) - return; - m_BodyStyle = new GUIStyle(EditorStyles.label); - m_BodyStyle.wordWrap = true; - m_BodyStyle.fontSize = 14; - m_BodyStyle.richText = true; - - m_TitleStyle = new GUIStyle(m_BodyStyle); - m_TitleStyle.fontSize = 26; - - m_HeadingStyle = new GUIStyle(m_BodyStyle); - m_HeadingStyle.fontStyle = FontStyle.Bold; - m_HeadingStyle.fontSize = 18; - - m_LinkStyle = new GUIStyle(m_BodyStyle); - m_LinkStyle.wordWrap = false; - - // Match selection color which works nicely for both light and dark skins - m_LinkStyle.normal.textColor = new Color(0x00 / 255f, 0x78 / 255f, 0xDA / 255f, 1f); - m_LinkStyle.stretchWidth = false; - - m_ButtonStyle = new GUIStyle(EditorStyles.miniButton); - m_ButtonStyle.fontStyle = FontStyle.Bold; - - m_Initialized = true; - } - - bool LinkLabel(GUIContent label, params GUILayoutOption[] options) - { - var position = GUILayoutUtility.GetRect(label, LinkStyle, options); - - Handles.BeginGUI(); - Handles.color = LinkStyle.normal.textColor; - Handles.DrawLine(new Vector3(position.xMin, position.yMax), new Vector3(position.xMax, position.yMax)); - Handles.color = Color.white; - Handles.EndGUI(); - - EditorGUIUtility.AddCursorRect(position, MouseCursor.Link); - - return GUI.Button(position, label, LinkStyle); - } -} diff --git a/Game/CourierOld/Assets/TutorialInfo/Scripts/Editor/ReadmeEditor.cs.meta b/Game/CourierOld/Assets/TutorialInfo/Scripts/Editor/ReadmeEditor.cs.meta deleted file mode 100644 index f038618..0000000 --- a/Game/CourierOld/Assets/TutorialInfo/Scripts/Editor/ReadmeEditor.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 476cc7d7cd9874016adc216baab94a0a -timeCreated: 1484146680 -licenseType: Store -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Game/CourierOld/Assets/TutorialInfo/Scripts/Readme.cs b/Game/CourierOld/Assets/TutorialInfo/Scripts/Readme.cs deleted file mode 100644 index 95f6269..0000000 --- a/Game/CourierOld/Assets/TutorialInfo/Scripts/Readme.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using UnityEngine; - -public class Readme : ScriptableObject -{ - public Texture2D icon; - public string title; - public Section[] sections; - public bool loadedLayout; - - [Serializable] - public class Section - { - public string heading, text, linkText, url; - } -} diff --git a/Game/CourierOld/Assets/TutorialInfo/Scripts/Readme.cs.meta b/Game/CourierOld/Assets/TutorialInfo/Scripts/Readme.cs.meta deleted file mode 100644 index 935153f..0000000 --- a/Game/CourierOld/Assets/TutorialInfo/Scripts/Readme.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: fcf7219bab7fe46a1ad266029b2fee19 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: - - icon: {instanceID: 0} - executionOrder: 0 - icon: {fileID: 2800000, guid: a186f8a87ca4f4d3aa864638ad5dfb65, type: 3} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Game/CourierOld/ProjectSettings/EditorBuildSettings.asset b/Game/CourierOld/ProjectSettings/EditorBuildSettings.asset index d057ba3..65b057f 100644 --- a/Game/CourierOld/ProjectSettings/EditorBuildSettings.asset +++ b/Game/CourierOld/ProjectSettings/EditorBuildSettings.asset @@ -6,8 +6,13 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/Scenes/SampleScene.unity + path: Assets/Resources/Scenes/Initial.unity guid: 99c9720ab356a0642a771bea13969a05 - m_configObjects: - com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3} + - enabled: 1 + path: Assets/Resources/Scenes/MainMenu.unity + guid: fb047145aa42fa81f940ba98cbe0a32f + - enabled: 1 + path: Assets/Resources/Scenes/Gameplay.unity + guid: 59150559bf28464b5a553799889b9b80 + m_configObjects: {} m_UseUCBPForAssetBundles: 0 diff --git a/Game/CourierOld/ProjectSettings/SceneTemplateSettings.json b/Game/CourierOld/ProjectSettings/SceneTemplateSettings.json new file mode 100644 index 0000000..ede5887 --- /dev/null +++ b/Game/CourierOld/ProjectSettings/SceneTemplateSettings.json @@ -0,0 +1,121 @@ +{ + "templatePinStates": [], + "dependencyTypeInfos": [ + { + "userAdded": false, + "type": "UnityEngine.AnimationClip", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.Animations.AnimatorController", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.AnimatorOverrideController", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.Audio.AudioMixerController", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.ComputeShader", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.Cubemap", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.GameObject", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.LightingDataAsset", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.LightingSettings", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Material", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.MonoScript", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicsMaterial", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicsMaterial2D", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessResources", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.VolumeProfile", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.SceneAsset", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.Shader", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.ShaderVariantCollection", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.Texture", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Texture2D", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Timeline.TimelineAsset", + "defaultInstantiationMode": 0 + } + ], + "defaultDependencyTypeInfo": { + "userAdded": false, + "type": "", + "defaultInstantiationMode": 1 + }, + "newSceneOverride": 0 +} \ No newline at end of file