Compare commits
31
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e654a0daf4 | ||
|
|
cfe5b39cc9 | ||
|
|
c14880457d | ||
|
|
344470978d | ||
|
|
dab970737a | ||
|
|
afdd523682 | ||
|
|
575e66425a | ||
|
|
c470f63409 | ||
|
|
5da64a7b3d | ||
|
|
c4ab11488b | ||
|
|
cb968d782b | ||
|
|
522f51be3f | ||
|
|
7024e1daf0 | ||
|
|
020934e07f | ||
|
|
d3fbd4c5c3 | ||
|
|
5b09068b0c | ||
|
|
ddb76a5b93 | ||
|
|
0f708ff4cb | ||
|
|
721d5ebf9c | ||
|
|
3bb99aaf1e | ||
|
|
a2acea39dc | ||
|
|
5c1fd1510d | ||
|
|
e128ee59f9 | ||
|
|
5c81bde5db | ||
|
|
d1aad440f5 | ||
|
|
0e1c274677 | ||
|
|
dbabd847c1 | ||
|
|
874280741c | ||
|
|
177464cc09 | ||
|
|
f8448ba922 | ||
|
|
0e188efe59 |
No files matched your search
@@ -15,7 +15,7 @@ MonoBehaviour:
|
|||||||
m_DefaultGroup: d447fc60305c17a17bf20948ab295a45
|
m_DefaultGroup: d447fc60305c17a17bf20948ab295a45
|
||||||
m_currentHash:
|
m_currentHash:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
Hash: 7ed5aa0308ed28c84409cb70340524a8
|
Hash: adba03da8c5086ecbcf5b8db72996dd1
|
||||||
m_OptimizeCatalogSize: 0
|
m_OptimizeCatalogSize: 0
|
||||||
m_BuildRemoteCatalog: 0
|
m_BuildRemoteCatalog: 0
|
||||||
m_CatalogRequestsTimeout: 0
|
m_CatalogRequestsTimeout: 0
|
||||||
|
|||||||
@@ -60,6 +60,11 @@ MonoBehaviour:
|
|||||||
m_ReadOnly: 0
|
m_ReadOnly: 0
|
||||||
m_SerializedLabels: []
|
m_SerializedLabels: []
|
||||||
FlaggedDuringContentUpdateRestriction: 0
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 2ed2d93a9f39d4edba511cb7396c7bb6
|
||||||
|
m_Address: Prefabs/Enemies/Cockroach
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
- m_GUID: 2f6134357dc2a5641a846a7478ce4c2c
|
- m_GUID: 2f6134357dc2a5641a846a7478ce4c2c
|
||||||
m_Address: bravo!
|
m_Address: bravo!
|
||||||
m_ReadOnly: 0
|
m_ReadOnly: 0
|
||||||
@@ -100,6 +105,11 @@ MonoBehaviour:
|
|||||||
m_ReadOnly: 0
|
m_ReadOnly: 0
|
||||||
m_SerializedLabels: []
|
m_SerializedLabels: []
|
||||||
FlaggedDuringContentUpdateRestriction: 0
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 81844a99f5b786b41b831174f8fb6d3a
|
||||||
|
m_Address: Prefabs/Player/CharacterController
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
- m_GUID: 82c71411174bfa86ca1f676b9d389f94
|
- m_GUID: 82c71411174bfa86ca1f676b9d389f94
|
||||||
m_Address: bastard!
|
m_Address: bastard!
|
||||||
m_ReadOnly: 0
|
m_ReadOnly: 0
|
||||||
@@ -135,6 +145,11 @@ MonoBehaviour:
|
|||||||
m_ReadOnly: 0
|
m_ReadOnly: 0
|
||||||
m_SerializedLabels: []
|
m_SerializedLabels: []
|
||||||
FlaggedDuringContentUpdateRestriction: 0
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: b33855c694de89386a25c56cbe463a0e
|
||||||
|
m_Address: Prefabs/Enemies/DrunkenGrandpa
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
- m_GUID: c566fc932edefbbee9e53271eac3c560
|
- m_GUID: c566fc932edefbbee9e53271eac3c560
|
||||||
m_Address: MainMenu
|
m_Address: MainMenu
|
||||||
m_ReadOnly: 0
|
m_ReadOnly: 0
|
||||||
@@ -155,6 +170,11 @@ MonoBehaviour:
|
|||||||
m_ReadOnly: 0
|
m_ReadOnly: 0
|
||||||
m_SerializedLabels: []
|
m_SerializedLabels: []
|
||||||
FlaggedDuringContentUpdateRestriction: 0
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: f3d7dc64b34919ad7b50a3dd307a935b
|
||||||
|
m_Address: Prefabs/Enemies/Fog
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
- m_GUID: f4b6fa54ecac6cc418f98824491aa17a
|
- m_GUID: f4b6fa54ecac6cc418f98824491aa17a
|
||||||
m_Address: Audio/Music/SANABI - JUSTICE Is Watching You
|
m_Address: Audio/Music/SANABI - JUSTICE Is Watching You
|
||||||
m_ReadOnly: 0
|
m_ReadOnly: 0
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
using Code.App.StateMachine;
|
using Code.App.StateMachine;
|
||||||
using Code.Audio;
|
using Code.Audio;
|
||||||
using Code.Gameplay.Camera;
|
using Code.Gameplay.Camera;
|
||||||
|
using Code.Gameplay.Camera.CameraStates;
|
||||||
|
using Code.Gameplay.Character.Core;
|
||||||
using Code.Gameplay.Player;
|
using Code.Gameplay.Player;
|
||||||
using Code.Input;
|
using Code.Input;
|
||||||
using Code.Scenes;
|
using Code.Scenes;
|
||||||
@@ -24,6 +26,8 @@ namespace Code.App.AppStates
|
|||||||
private PlayerHealth _playerHealth;
|
private PlayerHealth _playerHealth;
|
||||||
private PlayerMoney _playerMoney;
|
private PlayerMoney _playerMoney;
|
||||||
|
|
||||||
|
private CharacterProvider _playerCharacter;
|
||||||
|
|
||||||
public GameplayState(AppStateMachineContext context) : base(context)
|
public GameplayState(AppStateMachineContext context) : base(context)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
@@ -33,50 +37,74 @@ namespace Code.App.AppStates
|
|||||||
Context.UIService.LoadingScreen.Show();
|
Context.UIService.LoadingScreen.Show();
|
||||||
|
|
||||||
_playerMoney = Context.PlayerFactory.CreatePlayerMoney();
|
_playerMoney = Context.PlayerFactory.CreatePlayerMoney();
|
||||||
_playerHealth = Context.PlayerFactory.CreatePlayerHealth();
|
|
||||||
|
//_playerHealth = Context.PlayerProvider.Health;
|
||||||
_playerHealth.OnDeath += EndGame;
|
//_playerHealth.OnDeath += EndGame;
|
||||||
|
|
||||||
Context.AudioService.TransitToSnapshot(AudioSnapshotState.Peaceful);
|
Context.AudioService.TransitToSnapshot(AudioSnapshotState.Peaceful);
|
||||||
|
|
||||||
|
Context.InputService.EnableMap(ActionMappings.Gameplay);
|
||||||
|
|
||||||
Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug1, GiveHealth);
|
Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug1, GiveHealth);
|
||||||
Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug3, GiveMoney);
|
Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug3, GiveMoney);
|
||||||
Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug2, LooseHealth);
|
Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug2, LooseHealth);
|
||||||
Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug4, LooseMoney);
|
Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug4, LooseMoney);
|
||||||
Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug5, PlayDebugSFX);
|
Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug5, PlayDebugSFX);
|
||||||
|
Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug6, PlayDebugDispatcher);
|
||||||
|
|
||||||
|
#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
|
||||||
WaitForSceneToLoad();
|
WaitForSceneToLoad();
|
||||||
|
#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async UniTask WaitForPlayerCharacterLoad() => _playerCharacter = await Context.PlayerFactory.CreatePlayer();
|
||||||
|
|
||||||
private async UniTaskVoid WaitForSceneToLoad()
|
private async UniTaskVoid WaitForSceneToLoad()
|
||||||
{
|
{
|
||||||
await UniTask.WhenAll(
|
await UniTask.WhenAll(
|
||||||
Context.SceneLoaderService.LoadSceneAsyncAwaitable((int)SceneIds.MovementDev),
|
Context.SceneLoaderService.LoadSceneAsyncAwaitable((int)SceneIds.Gameplay),
|
||||||
Context.UIService.AsyncSwitchPanelTo(UIPanel.Gameplay),
|
Context.UIService.AsyncSwitchPanelTo(UIPanel.Gameplay),
|
||||||
Context.AudioFactory.WarmGameplayMusic(),
|
Context.AudioFactory.WarmGameplayMusic(),
|
||||||
Context.AudioFactory.WarmSFX()
|
Context.AudioFactory.WarmSFX(),
|
||||||
);
|
WaitForPlayerCharacterLoad()
|
||||||
|
);
|
||||||
|
|
||||||
Context.AudioService.PlayRandomPeacefulMusicUntilHumanityWillBeDestroyedForTheySins();
|
_playerHealth = Context.PlayerProvider.Health;
|
||||||
Context.AudioService.PlayRandomActionMusicUntilHumanityWillBeDestroyedForTheySins();
|
_playerHealth.OnDeath += EndGame;
|
||||||
|
|
||||||
|
Context.AudioService.PlayRandomMusicUntilHumanityWillBeDestroyedForTheySins(MusicType.Peaceful);
|
||||||
|
Context.AudioService.PlayRandomMusicUntilHumanityWillBeDestroyedForTheySins(MusicType.Action);
|
||||||
|
|
||||||
var sceneEnvironment = ((GameplaySceneEnvironment)SceneManager.GetActiveScene()
|
var sceneEnvironment = ((GameplaySceneEnvironment)SceneManager.GetActiveScene()
|
||||||
.GetSceneContainer().Resolve<CurrentSceneEnvironment>());
|
.GetSceneContainer().Resolve<CurrentSceneEnvironment>());
|
||||||
|
|
||||||
_testSFXTransform = sceneEnvironment.debugSfxTarget;
|
_testSFXTransform = sceneEnvironment.debugSfxTarget;
|
||||||
|
|
||||||
|
_playerCharacter.Teleport(sceneEnvironment.playerSpawnPoint.position, sceneEnvironment.playerSpawnPoint.rotation);
|
||||||
|
|
||||||
((GameplayPanel)Context.UIService.CurrentPanel).Initialize(_playerMoney, _playerHealth);
|
((GameplayPanel)Context.UIService.CurrentPanel).Initialize(_playerMoney, _playerHealth);
|
||||||
|
|
||||||
Context.CameraStateMachine.SwitchState(CameraMode.FirstPerson);
|
Context.CameraStateMachine.SwitchState(CameraMode.FirstPerson);
|
||||||
|
|
||||||
|
((BaseCameraState)Context.CameraStateMachine.CurrentBaseState).SetFollowTransform(_playerCharacter.GetFollowTransform());
|
||||||
|
|
||||||
Context.InputService.EnableMap(ActionMappings.Gameplay);
|
Context.InputService.EnableMap(ActionMappings.Gameplay);
|
||||||
|
|
||||||
Context.UIService.LoadingScreen.Hide();
|
Context.UIService.LoadingScreen.Hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void OnCharacterSpawn(CharacterProvider characterProvider)
|
||||||
|
{
|
||||||
|
((BaseCameraState)Context.CameraStateMachine.CurrentBaseState).SetFollowTransform(_playerCharacter.GetFollowTransform());
|
||||||
|
}
|
||||||
private void PlayDebugSFX(InputAction.CallbackContext context)
|
private void PlayDebugSFX(InputAction.CallbackContext context)
|
||||||
{
|
{
|
||||||
Context.AudioService.PlaySFX(SFXSounds.Crowbar, _testSFXTransform.position);
|
Context.AudioService.PlaySFX(SFXSounds.Crowbar, _testSFXTransform.position);
|
||||||
}
|
}
|
||||||
|
private void PlayDebugDispatcher(InputAction.CallbackContext context)
|
||||||
|
{
|
||||||
|
Context.AudioService.PlayDispatcher(DispatcherSounds.AhFreeman);
|
||||||
|
}
|
||||||
private void GiveHealth(InputAction.CallbackContext context)
|
private void GiveHealth(InputAction.CallbackContext context)
|
||||||
{
|
{
|
||||||
_playerHealth.GetDamage(-1);
|
_playerHealth.GetDamage(-1);
|
||||||
@@ -114,14 +142,19 @@ namespace Code.App.AppStates
|
|||||||
_playerHealth = null;
|
_playerHealth = null;
|
||||||
_playerMoney = null;
|
_playerMoney = null;
|
||||||
|
|
||||||
|
Context.PlayerFactory.ReleasePlayer(_playerCharacter);
|
||||||
|
_playerCharacter = null;
|
||||||
|
|
||||||
Context.InputService.DisableMap(ActionMappings.Gameplay);
|
Context.InputService.DisableMap(ActionMappings.Gameplay);
|
||||||
Context.AudioService.GladlyAskToStopGameplayMusic(Context.AudioFactory.ReleaseGameplayMusic);
|
Context.AudioService.GladlyAskToStopMusic(MusicType.Action, callback: Context.AudioFactory.ReleaseActionMusic);
|
||||||
|
Context.AudioService.GladlyAskToStopMusic(MusicType.Peaceful, callback: Context.AudioFactory.ReleasePeacefulMusic);
|
||||||
|
|
||||||
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug1, GiveHealth);
|
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug1, GiveHealth);
|
||||||
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug3, GiveHealth);
|
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug3, GiveHealth);
|
||||||
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug2, LooseHealth);
|
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug2, LooseHealth);
|
||||||
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug4, LooseMoney);
|
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug4, LooseMoney);
|
||||||
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug5, PlayDebugSFX);
|
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug5, PlayDebugSFX);
|
||||||
|
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug6, PlayDebugDispatcher);
|
||||||
|
|
||||||
base.ExitState();
|
base.ExitState();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,11 +2,13 @@ using Code.App.StateMachine;
|
|||||||
using Code.Audio;
|
using Code.Audio;
|
||||||
using Code.Gameplay.Camera;
|
using Code.Gameplay.Camera;
|
||||||
using Code.Gameplay.Camera.CameraStates;
|
using Code.Gameplay.Camera.CameraStates;
|
||||||
|
using Code.Gameplay.Door;
|
||||||
using Code.Input;
|
using Code.Input;
|
||||||
using Code.Scenes;
|
using Code.Scenes;
|
||||||
using Code.Scenes.SceneEnvironments;
|
using Code.Scenes.SceneEnvironments;
|
||||||
using Code.StateMachine;
|
using Code.StateMachine;
|
||||||
using Code.UI;
|
using Code.UI;
|
||||||
|
using Code.UI.Panels;
|
||||||
using Cysharp.Threading.Tasks;
|
using Cysharp.Threading.Tasks;
|
||||||
using Reflex.Extensions;
|
using Reflex.Extensions;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
@@ -24,11 +26,14 @@ namespace Code.App.AppStates
|
|||||||
{
|
{
|
||||||
Context.UIService.LoadingScreen.Show();
|
Context.UIService.LoadingScreen.Show();
|
||||||
|
|
||||||
Context.CameraStateMachine.SwitchState(CameraMode.Static);
|
Context.CameraStateMachine.SwitchState(CameraMode.UltraStatic);
|
||||||
|
|
||||||
|
#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
|
||||||
WaitForSceneToLoad();
|
WaitForSceneToLoad();
|
||||||
|
#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private CinematicDoorOpening _damnDoor = new();
|
||||||
private async UniTaskVoid WaitForSceneToLoad()
|
private async UniTaskVoid WaitForSceneToLoad()
|
||||||
{
|
{
|
||||||
await UniTask.WhenAll(
|
await UniTask.WhenAll(
|
||||||
@@ -37,20 +42,23 @@ namespace Code.App.AppStates
|
|||||||
Context.AudioFactory.WarmMenuMusic()
|
Context.AudioFactory.WarmMenuMusic()
|
||||||
);
|
);
|
||||||
|
|
||||||
Context.AudioService.TransitToSnapshot(AudioSnapshotState.Peaceful);
|
Context.AudioService.TransitToSnapshot(AudioSnapshotState.Menu);
|
||||||
Context.AudioService.PlayRandomMenuMusicUntilHumanityWillBeDestroyedForTheySins();
|
Context.AudioService.PlayRandomMusicUntilHumanityWillBeDestroyedForTheySins(MusicType.Menu);
|
||||||
|
|
||||||
((MainMenuPanel)Context.UIService.CurrentPanel).startButton.onClick.AddListener(StartGame);
|
|
||||||
((MainMenuPanel)Context.UIService.CurrentPanel).exitButton.onClick.AddListener(ExitGame);
|
|
||||||
|
|
||||||
var hui = ((MainMenuEnvironment)SceneManager.GetActiveScene()
|
var hui = ((MainMenuEnvironment)SceneManager.GetActiveScene()
|
||||||
.GetSceneContainer().Resolve<CurrentSceneEnvironment>());
|
.GetSceneContainer().Resolve<CurrentSceneEnvironment>());
|
||||||
|
_damnDoor.DamnDoor = hui.damnDoor;
|
||||||
((StaticState)Context.CameraStateMachine.CurrentBaseState).LookTarget =
|
_damnDoor.DamnDoor.SetPhysics(false);
|
||||||
hui.cameraTarget;
|
_damnDoor.DoorLight = hui.doorLight;
|
||||||
|
|
||||||
((BaseCameraState)Context.CameraStateMachine.CurrentBaseState).SetFollowTransform(hui.cameraPosition);
|
|
||||||
|
|
||||||
|
var menuPanel = (MainMenuPanel)Context.UIService.CurrentPanel;
|
||||||
|
|
||||||
|
menuPanel.startButton.button.onClick.AddListener(StartGame);
|
||||||
|
menuPanel.exitButton.button.onClick.AddListener(ExitGame);
|
||||||
|
menuPanel.CinematicDoorOpening = _damnDoor;
|
||||||
|
|
||||||
|
((UltraStaticState)Context.CameraStateMachine.CurrentBaseState).SetFollowTransform(hui.cameraPosition);
|
||||||
|
|
||||||
Context.UIService.LoadingScreen.Hide();
|
Context.UIService.LoadingScreen.Hide();
|
||||||
|
|
||||||
Context.InputService.EnableMap(ActionMappings.MainMenu);
|
Context.InputService.EnableMap(ActionMappings.MainMenu);
|
||||||
@@ -74,7 +82,7 @@ namespace Code.App.AppStates
|
|||||||
public override void ExitState()
|
public override void ExitState()
|
||||||
{
|
{
|
||||||
Context.InputService.DisableMap(ActionMappings.MainMenu);
|
Context.InputService.DisableMap(ActionMappings.MainMenu);
|
||||||
Context.AudioService.GladlyAskToStopMenuMusic(Context.AudioFactory.ReleaseMenuMusic);
|
Context.AudioService.GladlyAskToStopMusic(MusicType.Menu, callback: Context.AudioFactory.ReleaseMenuMusic);
|
||||||
|
|
||||||
base.ExitState();
|
base.ExitState();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
using System.Threading.Tasks;
|
|
||||||
using Code.App.StateMachine;
|
using Code.App.StateMachine;
|
||||||
using Code.Audio;
|
using Code.Audio;
|
||||||
using Code.Configs;
|
using Code.Configs;
|
||||||
@@ -14,7 +13,6 @@ using Cysharp.Threading.Tasks;
|
|||||||
using Reflex.Core;
|
using Reflex.Core;
|
||||||
using Reflex.Injectors;
|
using Reflex.Injectors;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.AddressableAssets;
|
|
||||||
using UnityEngine.InputSystem;
|
using UnityEngine.InputSystem;
|
||||||
|
|
||||||
namespace Code.App
|
namespace Code.App
|
||||||
@@ -29,6 +27,7 @@ namespace Code.App
|
|||||||
|
|
||||||
containerBuilder.AddSingleton(typeof(InputService), typeof(IInputService));
|
containerBuilder.AddSingleton(typeof(InputService), typeof(IInputService));
|
||||||
containerBuilder.AddSingleton(typeof(PlayerFactory), typeof(IPlayerFactory));
|
containerBuilder.AddSingleton(typeof(PlayerFactory), typeof(IPlayerFactory));
|
||||||
|
containerBuilder.AddSingleton(typeof(PlayerProvider), typeof(IPlayerProvider));
|
||||||
|
|
||||||
InitializeCamera(containerBuilder, staticDataService);
|
InitializeCamera(containerBuilder, staticDataService);
|
||||||
containerBuilder.AddSingleton(typeof(UIFactory), typeof(IUIFactory));
|
containerBuilder.AddSingleton(typeof(UIFactory), typeof(IUIFactory));
|
||||||
@@ -68,12 +67,21 @@ namespace Code.App
|
|||||||
staticDataService.Load();
|
staticDataService.Load();
|
||||||
|
|
||||||
containerBuilder.AddSingleton(staticDataService, typeof(IStaticDataService));
|
containerBuilder.AddSingleton(staticDataService, typeof(IStaticDataService));
|
||||||
|
|
||||||
containerBuilder.AddSingleton(staticDataService.InputConfig.inputActionAsset, typeof(InputActionAsset));
|
containerBuilder.AddSingleton(staticDataService.InputConfig.inputActionAsset, typeof(InputActionAsset));
|
||||||
containerBuilder.AddSingleton(staticDataService.InputConfig, typeof(InputConfig));
|
containerBuilder.AddSingleton(staticDataService.InputConfig, typeof(InputConfig));
|
||||||
|
|
||||||
containerBuilder.AddSingleton(staticDataService.CameraConfig, typeof(CameraConfig));
|
containerBuilder.AddSingleton(staticDataService.CameraConfig, typeof(CameraConfig));
|
||||||
|
|
||||||
containerBuilder.AddSingleton(staticDataService.PlayerConfig, typeof(PlayerConfig));
|
containerBuilder.AddSingleton(staticDataService.PlayerConfig, typeof(PlayerConfig));
|
||||||
containerBuilder.AddSingleton(staticDataService.CharacterConfig, typeof(CharacterConfig));
|
containerBuilder.AddSingleton(staticDataService.CharacterConfig, typeof(CharacterConfig));
|
||||||
|
|
||||||
containerBuilder.AddSingleton(staticDataService.UIConfig, typeof(UIConfig));
|
containerBuilder.AddSingleton(staticDataService.UIConfig, typeof(UIConfig));
|
||||||
|
|
||||||
|
containerBuilder.AddSingleton(staticDataService.DrunkenGrandpaConfig, typeof(DrunkenGrandpaConfig));
|
||||||
|
containerBuilder.AddSingleton(staticDataService.CockroachConfig, typeof(CockroachConfig));
|
||||||
|
containerBuilder.AddSingleton(staticDataService.FogConfig, typeof(FogConfig));
|
||||||
|
|
||||||
containerBuilder.AddSingleton(staticDataService.AudioMixerConfig, typeof(AudioMixerConfig));
|
containerBuilder.AddSingleton(staticDataService.AudioMixerConfig, typeof(AudioMixerConfig));
|
||||||
containerBuilder.AddSingleton(staticDataService.SoundtrackListConfig, typeof(SoundtrackListConfig));
|
containerBuilder.AddSingleton(staticDataService.SoundtrackListConfig, typeof(SoundtrackListConfig));
|
||||||
containerBuilder.AddSingleton(staticDataService.SFXListConfig, typeof(SFXListConfig));
|
containerBuilder.AddSingleton(staticDataService.SFXListConfig, typeof(SFXListConfig));
|
||||||
@@ -81,7 +89,6 @@ namespace Code.App
|
|||||||
containerBuilder.AddSingleton(staticDataService.EnemiesSoundListConfig, typeof(EnemiesSoundListConfig));
|
containerBuilder.AddSingleton(staticDataService.EnemiesSoundListConfig, typeof(EnemiesSoundListConfig));
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool _onAudioLoaded;
|
|
||||||
private AppStateMachine _appStateMachine;
|
private AppStateMachine _appStateMachine;
|
||||||
|
|
||||||
private void Bootstrap(Container container)
|
private void Bootstrap(Container container)
|
||||||
@@ -94,12 +101,13 @@ namespace Code.App
|
|||||||
AttributeInjector.Inject(cameraStateMachine.StateMachineContext, container);
|
AttributeInjector.Inject(cameraStateMachine.StateMachineContext, container);
|
||||||
cameraStateMachine.Initialize();
|
cameraStateMachine.Initialize();
|
||||||
|
|
||||||
|
#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
|
||||||
BootstrapFinish(container);
|
BootstrapFinish(container);
|
||||||
|
|
||||||
|
#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
|
||||||
}
|
}
|
||||||
private async UniTaskVoid BootstrapFinish(Container container)
|
private async UniTaskVoid BootstrapFinish(Container container)
|
||||||
{
|
{
|
||||||
// container.Resolve<IAudioFactory>();
|
|
||||||
|
|
||||||
var loadingScreen = GameObject.FindWithTag(Tags.LoadingScreen);
|
var loadingScreen = GameObject.FindWithTag(Tags.LoadingScreen);
|
||||||
DontDestroyOnLoad(loadingScreen);
|
DontDestroyOnLoad(loadingScreen);
|
||||||
|
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ namespace Code.App.StateMachine
|
|||||||
[Inject] public CameraStateMachine CameraStateMachine { get; private set; }
|
[Inject] public CameraStateMachine CameraStateMachine { get; private set; }
|
||||||
[Inject] public IUIService UIService { get; private set; }
|
[Inject] public IUIService UIService { get; private set; }
|
||||||
[Inject] public IPlayerFactory PlayerFactory { get; private set; }
|
[Inject] public IPlayerFactory PlayerFactory { get; private set; }
|
||||||
|
[Inject] public IPlayerProvider PlayerProvider { get; private set; }
|
||||||
[Inject] public IAudioFactory AudioFactory { get; private set; }
|
[Inject] public IAudioFactory AudioFactory { get; private set; }
|
||||||
[Inject] public IAudioService AudioService { get; private set; }
|
[Inject] public IAudioService AudioService { get; private set; }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,9 +30,7 @@ namespace Code.Audio
|
|||||||
private AsyncOperationHandle<IList<AudioClip>> _enemiesHandle;
|
private AsyncOperationHandle<IList<AudioClip>> _enemiesHandle;
|
||||||
private AsyncOperationHandle<IList<AudioClip>> _dispatcherHandle;
|
private AsyncOperationHandle<IList<AudioClip>> _dispatcherHandle;
|
||||||
|
|
||||||
public List<AudioClip> PeacefulMusic { get; private set; } = new();
|
public Dictionary<MusicType, List<AudioClip>> MusicDictionary { get; private set; } = new();
|
||||||
public List<AudioClip> ActionMusic { get; private set; } = new();
|
|
||||||
public List<AudioClip> MenuMusic { get; private set; } = new();
|
|
||||||
public List<AudioClip> SFXAudios { get; private set; } = new();
|
public List<AudioClip> SFXAudios { get; private set; } = new();
|
||||||
public List<AudioClip> EnemiesAudios { get; private set; } = new();
|
public List<AudioClip> EnemiesAudios { get; private set; } = new();
|
||||||
public List<AudioClip> DispatcherAudios { get; private set; } = new();
|
public List<AudioClip> DispatcherAudios { get; private set; } = new();
|
||||||
@@ -41,7 +39,7 @@ namespace Code.Audio
|
|||||||
SoundtrackListConfig soundtrackListConfig,
|
SoundtrackListConfig soundtrackListConfig,
|
||||||
SFXListConfig sfxListConfig,
|
SFXListConfig sfxListConfig,
|
||||||
EnemiesSoundListConfig enemiesSoundListConfig,
|
EnemiesSoundListConfig enemiesSoundListConfig,
|
||||||
DispatcherSoundListConfig dispatcherSoundListConfig//, CharacterSoundListConfig characterSoundListConfig
|
DispatcherSoundListConfig dispatcherSoundListConfig
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
AudioMixer = audioMixerConfig.audioMixerAsset;
|
AudioMixer = audioMixerConfig.audioMixerAsset;
|
||||||
@@ -53,15 +51,11 @@ namespace Code.Audio
|
|||||||
_SFX = sfxListConfig.SFX;
|
_SFX = sfxListConfig.SFX;
|
||||||
_enemies = enemiesSoundListConfig.enemies;
|
_enemies = enemiesSoundListConfig.enemies;
|
||||||
_dispatcher = dispatcherSoundListConfig.dispatcher;
|
_dispatcher = dispatcherSoundListConfig.dispatcher;
|
||||||
// _character = characterSoundListConfig.character;
|
|
||||||
|
MusicDictionary.Add(MusicType.Menu, new ());
|
||||||
|
MusicDictionary.Add(MusicType.Peaceful, new ());
|
||||||
|
MusicDictionary.Add(MusicType.Action, new ());
|
||||||
}
|
}
|
||||||
|
|
||||||
// public async UniTask<AudioMixer> CreateMixer()
|
|
||||||
// {
|
|
||||||
// AudioMixer audioMixer = (await Addressables.InstantiateAsync(_audioMixerPrefab).ToUniTask()).GetComponent<AudioMixer>();
|
|
||||||
//
|
|
||||||
// return audioMixer;
|
|
||||||
// }
|
|
||||||
|
|
||||||
public async UniTask LoadAudioSourcePrefab(Action<GameObject> callback) =>
|
public async UniTask LoadAudioSourcePrefab(Action<GameObject> callback) =>
|
||||||
callback?.Invoke(await Addressables.LoadAssetAsync<GameObject>(_audioSourcePrefab));
|
callback?.Invoke(await Addressables.LoadAssetAsync<GameObject>(_audioSourcePrefab));
|
||||||
@@ -72,18 +66,17 @@ namespace Code.Audio
|
|||||||
_peacefulMusicHandle = Addressables.LoadAssetsAsync<AudioClip>(_peacefulSoundtrack, OnPeacefulTrackLoaded, Addressables.MergeMode.None);
|
_peacefulMusicHandle = Addressables.LoadAssetsAsync<AudioClip>(_peacefulSoundtrack, OnPeacefulTrackLoaded, Addressables.MergeMode.None);
|
||||||
|
|
||||||
await UniTask.WhenAll(_actionMusicHandle.ToUniTask(), _peacefulMusicHandle.ToUniTask());
|
await UniTask.WhenAll(_actionMusicHandle.ToUniTask(), _peacefulMusicHandle.ToUniTask());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
public void ReleaseActionMusic()
|
||||||
public void ReleaseGameplayMusic()
|
|
||||||
{
|
{
|
||||||
ActionMusic.Clear();
|
MusicDictionary[MusicType.Action].Clear();
|
||||||
_actionMusicHandle.Release();
|
_actionMusicHandle.Release();
|
||||||
|
}
|
||||||
PeacefulMusic.Clear();
|
public void ReleasePeacefulMusic()
|
||||||
|
{
|
||||||
|
MusicDictionary[MusicType.Peaceful].Clear();
|
||||||
_peacefulMusicHandle.Release();
|
_peacefulMusicHandle.Release();
|
||||||
}
|
}
|
||||||
|
|
||||||
public async UniTask WarmMenuMusic( )
|
public async UniTask WarmMenuMusic( )
|
||||||
{
|
{
|
||||||
_menuMusicHandle = Addressables.LoadAssetsAsync<AudioClip>(_menuSoundtrack, OnMenuTrackLoaded, Addressables.MergeMode.None);
|
_menuMusicHandle = Addressables.LoadAssetsAsync<AudioClip>(_menuSoundtrack, OnMenuTrackLoaded, Addressables.MergeMode.None);
|
||||||
@@ -91,10 +84,9 @@ namespace Code.Audio
|
|||||||
await _menuMusicHandle.ToUniTask();
|
await _menuMusicHandle.ToUniTask();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ReleaseMenuMusic()
|
public void ReleaseMenuMusic()
|
||||||
{
|
{
|
||||||
MenuMusic.Clear();
|
MusicDictionary[MusicType.Menu].Clear();
|
||||||
// foreach (var assetReference in _menuSoundtrack) assetReference.ReleaseAsset();
|
// foreach (var assetReference in _menuSoundtrack) assetReference.ReleaseAsset();
|
||||||
_menuMusicHandle.Release();
|
_menuMusicHandle.Release();
|
||||||
}
|
}
|
||||||
@@ -105,7 +97,6 @@ namespace Code.Audio
|
|||||||
await _SFXHandle.ToUniTask();
|
await _SFXHandle.ToUniTask();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ReleaseSFX()
|
public void ReleaseSFX()
|
||||||
{
|
{
|
||||||
SFXAudios.Clear();
|
SFXAudios.Clear();
|
||||||
@@ -139,17 +130,17 @@ namespace Code.Audio
|
|||||||
_dispatcherHandle.Release();
|
_dispatcherHandle.Release();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void OnMenuTrackLoaded(AudioClip audioClip)
|
||||||
|
{
|
||||||
|
MusicDictionary[MusicType.Menu].Add(audioClip);
|
||||||
|
}
|
||||||
private void OnActionTrackLoaded(AudioClip audioClip)
|
private void OnActionTrackLoaded(AudioClip audioClip)
|
||||||
{
|
{
|
||||||
ActionMusic.Add(audioClip);
|
MusicDictionary[MusicType.Action].Add(audioClip);
|
||||||
}
|
}
|
||||||
private void OnPeacefulTrackLoaded(AudioClip audioClip)
|
private void OnPeacefulTrackLoaded(AudioClip audioClip)
|
||||||
{
|
{
|
||||||
PeacefulMusic.Add(audioClip);
|
MusicDictionary[MusicType.Peaceful].Add(audioClip);
|
||||||
}
|
|
||||||
private void OnMenuTrackLoaded(AudioClip audioClip)
|
|
||||||
{
|
|
||||||
MenuMusic.Add(audioClip);
|
|
||||||
}
|
}
|
||||||
private void OnSFXLoaded(AudioClip audioClip)
|
private void OnSFXLoaded(AudioClip audioClip)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -22,9 +22,9 @@ namespace Code.Audio
|
|||||||
private AudioSource _peacefulMusicSource;
|
private AudioSource _peacefulMusicSource;
|
||||||
|
|
||||||
private AudioMixerGroup _masterGroup,
|
private AudioMixerGroup _masterGroup,
|
||||||
_musicGroup,
|
// _musicGroup,
|
||||||
_actionMusicGroup,
|
// _actionMusicGroup,
|
||||||
_peacefulMusicGroup,
|
// _peacefulMusicGroup,
|
||||||
_SFXGroup,
|
_SFXGroup,
|
||||||
_creaturesGroup,
|
_creaturesGroup,
|
||||||
_dispatcherGroup,
|
_dispatcherGroup,
|
||||||
@@ -34,7 +34,7 @@ namespace Code.Audio
|
|||||||
private readonly AudioSourcePool _audioSourcePool = new();
|
private readonly AudioSourcePool _audioSourcePool = new();
|
||||||
|
|
||||||
private Dictionary<AudioSnapshotState, AudioMixerSnapshot> _snapshots = new();
|
private Dictionary<AudioSnapshotState, AudioMixerSnapshot> _snapshots = new();
|
||||||
|
|
||||||
public AudioService(IAudioFactory audioFactory)
|
public AudioService(IAudioFactory audioFactory)
|
||||||
{
|
{
|
||||||
_audioFactory = audioFactory;
|
_audioFactory = audioFactory;
|
||||||
@@ -44,112 +44,94 @@ namespace Code.Audio
|
|||||||
{
|
{
|
||||||
// _mixer = await _audioFactory.CreateMixer();
|
// _mixer = await _audioFactory.CreateMixer();
|
||||||
_mixer = _audioFactory.AudioMixer;
|
_mixer = _audioFactory.AudioMixer;
|
||||||
|
|
||||||
_masterGroup = _mixer.FindMatchingGroups(AudioGroups.MasterGroup)[0];
|
_masterGroup = _mixer.FindMatchingGroups(AudioGroups.MasterGroup)[0];
|
||||||
_actionMusicGroup = _mixer.FindMatchingGroups(AudioGroups.ActionMusicGroup)[0];
|
// _actionMusicGroup = _mixer.FindMatchingGroups(AudioGroups.ActionMusicGroup)[0];
|
||||||
_peacefulMusicGroup = _mixer.FindMatchingGroups(AudioGroups.PeacefulMusicGroup)[0];
|
// _peacefulMusicGroup = _mixer.FindMatchingGroups(AudioGroups.PeacefulMusoup)[0];
|
||||||
|
// _musicGroup = _mixer.FindMatchingGroups(AudioGroups.MusicGroup)[0];
|
||||||
|
_musicAudioGroups.Add(MusicType.Menu, _mixer.FindMatchingGroups(AudioGroups.MenuMusicGroup)[0]);
|
||||||
|
_musicAudioGroups.Add(MusicType.Action, _mixer.FindMatchingGroups(AudioGroups.ActionMusicGroup)[0]);
|
||||||
|
_musicAudioGroups.Add(MusicType.Peaceful, _mixer.FindMatchingGroups(AudioGroups.PeacefulMusicGroup)[0]);
|
||||||
|
|
||||||
|
_cancellationTokenSources.Add(MusicType.Menu, new());
|
||||||
|
_cancellationTokenSources.Add(MusicType.Action, new());
|
||||||
|
_cancellationTokenSources.Add(MusicType.Peaceful, new());
|
||||||
|
|
||||||
|
_musicAudioSources.Add(MusicType.Menu, null);
|
||||||
|
_musicAudioSources.Add(MusicType.Action, null);
|
||||||
|
_musicAudioSources.Add(MusicType.Peaceful, null);
|
||||||
|
|
||||||
_SFXGroup = _mixer.FindMatchingGroups(AudioGroups.SFXGroup)[0];
|
_SFXGroup = _mixer.FindMatchingGroups(AudioGroups.SFXGroup)[0];
|
||||||
_musicGroup = _mixer.FindMatchingGroups(AudioGroups.MusicGroup)[0];
|
|
||||||
_creaturesGroup = _mixer.FindMatchingGroups(AudioGroups.CreaturesGroup)[0];
|
_creaturesGroup = _mixer.FindMatchingGroups(AudioGroups.CreaturesGroup)[0];
|
||||||
_dispatcherGroup = _mixer.FindMatchingGroups(AudioGroups.DispatcherMusicGroup)[0];
|
_dispatcherGroup = _mixer.FindMatchingGroups(AudioGroups.DispatcherMusicGroup)[0];
|
||||||
_courierGroup = _mixer.FindMatchingGroups(AudioGroups.CourierMusicGroup)[0];
|
_courierGroup = _mixer.FindMatchingGroups(AudioGroups.CourierMusicGroup)[0];
|
||||||
_enemiesGroup = _mixer.FindMatchingGroups(AudioGroups.EnemiesMusicGroup)[0];
|
_enemiesGroup = _mixer.FindMatchingGroups(AudioGroups.EnemiesMusicGroup)[0];
|
||||||
|
|
||||||
|
_snapshots[AudioSnapshotState.None] = _mixer.FindSnapshot(AudioGroups.NoneSnapshot);
|
||||||
_snapshots[AudioSnapshotState.Peaceful] = _mixer.FindSnapshot(AudioGroups.PeacefulSnapshot);
|
_snapshots[AudioSnapshotState.Peaceful] = _mixer.FindSnapshot(AudioGroups.PeacefulSnapshot);
|
||||||
_snapshots[AudioSnapshotState.Action] = _mixer.FindSnapshot(AudioGroups.ActionSnapshot);
|
_snapshots[AudioSnapshotState.Action] = _mixer.FindSnapshot(AudioGroups.ActionSnapshot);
|
||||||
_snapshots[AudioSnapshotState.None] = _mixer.FindSnapshot(AudioGroups.NoneSnapshot);
|
_snapshots[AudioSnapshotState.Menu] = _mixer.FindSnapshot(AudioGroups.MenuSnapshot);
|
||||||
|
|
||||||
await _audioFactory.LoadAudioSourcePrefab(_audioSourcePool.Initialize);
|
await _audioFactory.LoadAudioSourcePrefab(_audioSourcePool.Initialize);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
|
||||||
|
private Dictionary<MusicType, CancellationTokenSource> _cancellationTokenSources = new();
|
||||||
|
private Dictionary<MusicType, AudioSource> _musicAudioSources = new();
|
||||||
|
private Dictionary<MusicType, AudioMixerGroup> _musicAudioGroups = new();
|
||||||
|
|
||||||
|
public async UniTaskVoid PlayRandomMusicUntilHumanityWillBeDestroyedForTheySins(MusicType musicType)
|
||||||
|
{
|
||||||
|
if(!_musicAudioSources[musicType])
|
||||||
|
{
|
||||||
|
_musicAudioSources[musicType] = _audioSourcePool.GetSource();
|
||||||
|
_musicAudioSources[musicType].spatialBlend = 0f;
|
||||||
|
_musicAudioSources[musicType].outputAudioMixerGroup = _musicAudioGroups[musicType];
|
||||||
|
}
|
||||||
|
|
||||||
|
_musicAudioSources[musicType].resource =
|
||||||
|
_audioFactory.MusicDictionary[musicType][
|
||||||
|
Random.Range(0, _audioFactory.MusicDictionary[musicType].Count)];
|
||||||
|
|
||||||
|
_musicAudioSources[musicType].Play();
|
||||||
|
|
||||||
|
// await UniTask.WaitUntilValueChanged(_musicAudioSources[musicType],
|
||||||
|
// _ => !_musicAudioSources[musicType].isPlaying,
|
||||||
|
// cancellationToken: _cancellationTokenSources[musicType].Token);
|
||||||
|
await UniTask.NextFrame();
|
||||||
|
// Debug.Log($"Playing {musicType}");
|
||||||
|
var (isCanceled, _) = await UniTask.WaitUntilValueChanged(_musicAudioSources[musicType],
|
||||||
|
_ => !_musicAudioSources[musicType].isPlaying,
|
||||||
|
cancellationToken: _cancellationTokenSources[musicType].Token).SuppressCancellationThrow();
|
||||||
|
// Debug.Log($"Finished {musicType}");
|
||||||
|
|
||||||
|
if (isCanceled)
|
||||||
|
{
|
||||||
|
// Debug.Log($"Cancelled {musicType}");
|
||||||
|
_cancellationTokenSources[musicType].Dispose();
|
||||||
|
_cancellationTokenSources[musicType] = new();
|
||||||
|
|
||||||
|
_audioSourcePool.ReleaseSource(_musicAudioSources[musicType]);
|
||||||
|
_musicAudioSources[musicType] = null;
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
PlayRandomMusicUntilHumanityWillBeDestroyedForTheySins(musicType);
|
||||||
|
}
|
||||||
|
|
||||||
InitializeMusicSources();
|
public async UniTaskVoid GladlyAskToStopMusic(MusicType musicType, AudioSnapshotState audioSnapshotState = AudioSnapshotState.None, float time = 1f, Action callback = null)
|
||||||
}
|
|
||||||
|
|
||||||
private void InitializeMusicSources()
|
|
||||||
{
|
{
|
||||||
_actionMusicSource = _audioSourcePool.GetSource();
|
TransitToSnapshot(audioSnapshotState, time);
|
||||||
_actionMusicSource.outputAudioMixerGroup = _actionMusicGroup;
|
|
||||||
_actionMusicSource.spatialBlend = 0f;
|
await UniTask.WaitForSeconds(time);
|
||||||
|
|
||||||
_peacefulMusicSource = _audioSourcePool.GetSource();
|
_cancellationTokenSources[musicType].Cancel();
|
||||||
_peacefulMusicSource.outputAudioMixerGroup = _peacefulMusicGroup;
|
|
||||||
_peacefulMusicSource.spatialBlend = 0f;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void PlayRandomGameplayMusic()
|
callback?.Invoke();
|
||||||
{
|
|
||||||
_peacefulMusicSource.resource = _audioFactory.PeacefulMusic[Random.Range(0, _audioFactory.PeacefulMusic.Count)];
|
|
||||||
_actionMusicSource.resource =
|
|
||||||
_audioFactory.ActionMusic[Random.Range(0, _audioFactory.ActionMusic.Count)];
|
|
||||||
|
|
||||||
_peacefulMusicSource.Play();
|
|
||||||
_actionMusicSource.Play();
|
|
||||||
}
|
|
||||||
public void PlayRandomMenuMusic()
|
|
||||||
{
|
|
||||||
TransitToSnapshot(AudioSnapshotState.Peaceful);
|
|
||||||
|
|
||||||
_peacefulMusicSource.resource = _audioFactory.MenuMusic[Random.Range(0, _audioFactory.MenuMusic.Count)];
|
|
||||||
|
|
||||||
_peacefulMusicSource.Play();
|
|
||||||
}
|
|
||||||
|
|
||||||
private CancellationTokenSource _menuMusicTokenSource = new();
|
|
||||||
public async UniTaskVoid PlayRandomMenuMusicUntilHumanityWillBeDestroyedForTheySins()
|
|
||||||
{
|
|
||||||
TransitToSnapshot(AudioSnapshotState.Peaceful);
|
|
||||||
|
|
||||||
_peacefulMusicSource.resource = _audioFactory.MenuMusic[Random.Range(0, _audioFactory.MenuMusic.Count)];
|
|
||||||
|
|
||||||
_peacefulMusicSource.Play();
|
|
||||||
|
|
||||||
await UniTask.WaitUntilValueChanged(_peacefulMusicSource, _ => _peacefulMusicSource.isPlaying, cancellationToken: _menuMusicTokenSource.Token);
|
|
||||||
if (_menuMusicTokenSource.IsCancellationRequested)
|
|
||||||
{
|
|
||||||
_menuMusicTokenSource.Dispose();
|
|
||||||
_menuMusicTokenSource = new();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
PlayRandomMenuMusicUntilHumanityWillBeDestroyedForTheySins();
|
|
||||||
}
|
|
||||||
private CancellationTokenSource _peacefulMusicTokenSource = new();
|
|
||||||
public async UniTaskVoid PlayRandomPeacefulMusicUntilHumanityWillBeDestroyedForTheySins()
|
|
||||||
{
|
|
||||||
TransitToSnapshot(AudioSnapshotState.Peaceful);
|
|
||||||
|
|
||||||
_peacefulMusicSource.resource = _audioFactory.PeacefulMusic[Random.Range(0, _audioFactory.PeacefulMusic.Count)];
|
|
||||||
|
|
||||||
_peacefulMusicSource.Play();
|
|
||||||
|
|
||||||
await UniTask.WaitUntilValueChanged(_peacefulMusicSource, _ => _peacefulMusicSource.isPlaying, cancellationToken: _peacefulMusicTokenSource.Token);
|
|
||||||
if (_peacefulMusicTokenSource.IsCancellationRequested)
|
|
||||||
{
|
|
||||||
_peacefulMusicTokenSource.Dispose();
|
|
||||||
_peacefulMusicTokenSource = new();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
PlayRandomPeacefulMusicUntilHumanityWillBeDestroyedForTheySins();
|
|
||||||
}
|
|
||||||
private CancellationTokenSource _actionMusicTokenSource = new();
|
|
||||||
public async UniTaskVoid PlayRandomActionMusicUntilHumanityWillBeDestroyedForTheySins()
|
|
||||||
{
|
|
||||||
TransitToSnapshot(AudioSnapshotState.Action);
|
|
||||||
|
|
||||||
_actionMusicSource.resource = _audioFactory.ActionMusic[Random.Range(0, _audioFactory.ActionMusic.Count)];
|
|
||||||
|
|
||||||
_actionMusicSource.Play();
|
|
||||||
|
|
||||||
await UniTask.WaitUntilValueChanged(_actionMusicSource, _ => _actionMusicSource.isPlaying, cancellationToken: _actionMusicTokenSource.Token);
|
|
||||||
if (_actionMusicTokenSource.IsCancellationRequested)
|
|
||||||
{
|
|
||||||
_actionMusicTokenSource.Dispose();
|
|
||||||
_actionMusicTokenSource = new();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
PlayRandomActionMusicUntilHumanityWillBeDestroyedForTheySins();
|
|
||||||
}
|
}
|
||||||
|
#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
|
||||||
|
|
||||||
public void StopMusic()
|
public void StopMusic()
|
||||||
{
|
{
|
||||||
@@ -162,58 +144,7 @@ namespace Code.Audio
|
|||||||
TransitToSnapshot(AudioSnapshotState.None);
|
TransitToSnapshot(AudioSnapshotState.None);
|
||||||
_peacefulMusicSource.Stop();
|
_peacefulMusicSource.Stop();
|
||||||
_actionMusicSource.Stop();
|
_actionMusicSource.Stop();
|
||||||
|
|
||||||
callback?.Invoke();
|
|
||||||
}
|
|
||||||
public async UniTaskVoid GladlyAskToStopMenuMusic(Action callback = null)
|
|
||||||
{
|
|
||||||
TransitToSnapshot(AudioSnapshotState.None);
|
|
||||||
|
|
||||||
await UniTask.WaitForSeconds(1f);
|
|
||||||
|
|
||||||
_peacefulMusicSource.Stop();
|
|
||||||
|
|
||||||
_menuMusicTokenSource.Cancel();
|
|
||||||
|
|
||||||
callback?.Invoke();
|
|
||||||
}
|
|
||||||
|
|
||||||
public async UniTaskVoid GladlyAskToStopGameplayMusic(Action callback = null)
|
|
||||||
{
|
|
||||||
TransitToSnapshot(AudioSnapshotState.None);
|
|
||||||
|
|
||||||
await UniTask.WaitForSeconds(1f);
|
|
||||||
|
|
||||||
_actionMusicSource.Stop();
|
|
||||||
_peacefulMusicSource.Stop();
|
|
||||||
|
|
||||||
_actionMusicTokenSource.Cancel();
|
|
||||||
_peacefulMusicTokenSource.Cancel();
|
|
||||||
|
|
||||||
callback?.Invoke();
|
|
||||||
}
|
|
||||||
public async UniTaskVoid GladlyAskToStopActionMusic(Action callback = null)
|
|
||||||
{
|
|
||||||
TransitToSnapshot(AudioSnapshotState.None);
|
|
||||||
|
|
||||||
await UniTask.WaitForSeconds(1f);
|
|
||||||
|
|
||||||
_actionMusicSource.Stop();
|
|
||||||
|
|
||||||
_actionMusicTokenSource.Cancel();
|
|
||||||
|
|
||||||
callback?.Invoke();
|
|
||||||
}
|
|
||||||
public async UniTaskVoid GladlyAskToStopPeacefulMusic(Action callback = null)
|
|
||||||
{
|
|
||||||
TransitToSnapshot(AudioSnapshotState.None);
|
|
||||||
|
|
||||||
await UniTask.WaitForSeconds(1f);
|
|
||||||
|
|
||||||
_peacefulMusicSource.Stop();
|
|
||||||
|
|
||||||
_peacefulMusicTokenSource.Cancel();
|
|
||||||
|
|
||||||
callback?.Invoke();
|
callback?.Invoke();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -227,10 +158,12 @@ namespace Code.Audio
|
|||||||
{
|
{
|
||||||
_audioSourcePool.PlayOneShot(_audioFactory.SFXAudios[(int)sfxId], position, _SFXGroup);
|
_audioSourcePool.PlayOneShot(_audioFactory.SFXAudios[(int)sfxId], position, _SFXGroup);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void PlayEnemy(EnemiesSounds enemySoundId, Vector3 position)
|
public void PlayEnemy(EnemiesSounds enemySoundId, Vector3 position)
|
||||||
{
|
{
|
||||||
_audioSourcePool.PlayOneShot(_audioFactory.EnemiesAudios[(int)enemySoundId], position, _enemiesGroup);
|
_audioSourcePool.PlayOneShot(_audioFactory.EnemiesAudios[(int)enemySoundId], position, _enemiesGroup);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void PlayDispatcher(DispatcherSounds dispatcherSoundId)
|
public void PlayDispatcher(DispatcherSounds dispatcherSoundId)
|
||||||
{
|
{
|
||||||
_audioSourcePool.PlayShizo(_audioFactory.DispatcherAudios[(int)dispatcherSoundId], _dispatcherGroup);
|
_audioSourcePool.PlayShizo(_audioFactory.DispatcherAudios[(int)dispatcherSoundId], _dispatcherGroup);
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ namespace Code.Audio
|
|||||||
{
|
{
|
||||||
None,
|
None,
|
||||||
Peaceful,
|
Peaceful,
|
||||||
Action
|
Action,
|
||||||
|
Menu
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -19,7 +19,7 @@ namespace Code.Audio
|
|||||||
_pool = new ObjectPool<AudioSource>(
|
_pool = new ObjectPool<AudioSource>(
|
||||||
createFunc: CreateItem,
|
createFunc: CreateItem,
|
||||||
// actionOnGet: OnGet,
|
// actionOnGet: OnGet,
|
||||||
// actionOnRelease: OnRelease,
|
actionOnRelease: OnRelease,
|
||||||
actionOnDestroy: OnDestroyItem,
|
actionOnDestroy: OnDestroyItem,
|
||||||
collectionCheck: true, // helps catch double-release mistakes
|
collectionCheck: true, // helps catch double-release mistakes
|
||||||
defaultCapacity: 10,
|
defaultCapacity: 10,
|
||||||
@@ -45,6 +45,7 @@ namespace Code.Audio
|
|||||||
// Called when an item is returned to the pool.
|
// Called when an item is returned to the pool.
|
||||||
private void OnRelease(AudioSource source)
|
private void OnRelease(AudioSource source)
|
||||||
{
|
{
|
||||||
|
source.Stop();
|
||||||
//source.gameObject.SetActive(false);
|
//source.gameObject.SetActive(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,16 +8,14 @@ namespace Code.Audio
|
|||||||
{
|
{
|
||||||
public interface IAudioFactory
|
public interface IAudioFactory
|
||||||
{
|
{
|
||||||
List<AudioClip> PeacefulMusic { get; }
|
|
||||||
List<AudioClip> ActionMusic { get; }
|
|
||||||
List<AudioClip> MenuMusic { get; }
|
|
||||||
List<AudioClip> SFXAudios { get; }
|
List<AudioClip> SFXAudios { get; }
|
||||||
List<AudioClip> EnemiesAudios { get; }
|
List<AudioClip> EnemiesAudios { get; }
|
||||||
List<AudioClip> DispatcherAudios { get; }
|
List<AudioClip> DispatcherAudios { get; }
|
||||||
AudioMixer AudioMixer { get; }
|
AudioMixer AudioMixer { get; }
|
||||||
|
Dictionary<MusicType, List<AudioClip>> MusicDictionary { get; }
|
||||||
UniTask LoadAudioSourcePrefab(Action<GameObject> callback);
|
UniTask LoadAudioSourcePrefab(Action<GameObject> callback);
|
||||||
UniTask WarmGameplayMusic();
|
UniTask WarmGameplayMusic();
|
||||||
void ReleaseGameplayMusic();
|
void ReleaseActionMusic();
|
||||||
UniTask WarmMenuMusic();
|
UniTask WarmMenuMusic();
|
||||||
void ReleaseMenuMusic();
|
void ReleaseMenuMusic();
|
||||||
UniTask WarmSFX();
|
UniTask WarmSFX();
|
||||||
@@ -26,5 +24,6 @@ namespace Code.Audio
|
|||||||
void ReleaseEnemies();
|
void ReleaseEnemies();
|
||||||
UniTask WarmDispatcher();
|
UniTask WarmDispatcher();
|
||||||
void ReleaseDispatcher();
|
void ReleaseDispatcher();
|
||||||
|
void ReleasePeacefulMusic();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -7,20 +7,13 @@ namespace Code.Audio
|
|||||||
public interface IAudioService
|
public interface IAudioService
|
||||||
{
|
{
|
||||||
UniTask Initialize();
|
UniTask Initialize();
|
||||||
void PlayRandomGameplayMusic();
|
UniTaskVoid PlayRandomMusicUntilHumanityWillBeDestroyedForTheySins(MusicType musicType);
|
||||||
|
UniTaskVoid GladlyAskToStopMusic(MusicType musicType, AudioSnapshotState audioSnapshotState = AudioSnapshotState.None, float time = 1f, Action callback = null);
|
||||||
|
void StopMusic();
|
||||||
|
void GladlyAskToStopMusic(Action callback = null);
|
||||||
void TransitToSnapshot(AudioSnapshotState state, float time = 1f);
|
void TransitToSnapshot(AudioSnapshotState state, float time = 1f);
|
||||||
void PlaySFX(SFXSounds sfxId, Vector3 position);
|
void PlaySFX(SFXSounds sfxId, Vector3 position);
|
||||||
void PlayEnemy(EnemiesSounds enemySoundId, Vector3 position);
|
void PlayEnemy(EnemiesSounds enemySoundId, Vector3 position);
|
||||||
void PlayDispatcher(DispatcherSounds dispatcherSoundId);
|
void PlayDispatcher(DispatcherSounds dispatcherSoundId);
|
||||||
void PlayRandomMenuMusic();
|
|
||||||
UniTaskVoid PlayRandomMenuMusicUntilHumanityWillBeDestroyedForTheySins();
|
|
||||||
void StopMusic();
|
|
||||||
void GladlyAskToStopMusic(Action callback = null);
|
|
||||||
UniTaskVoid GladlyAskToStopMenuMusic(Action callback = null);
|
|
||||||
UniTaskVoid GladlyAskToStopActionMusic(Action callback = null);
|
|
||||||
UniTaskVoid GladlyAskToStopPeacefulMusic(Action callback = null);
|
|
||||||
UniTaskVoid PlayRandomPeacefulMusicUntilHumanityWillBeDestroyedForTheySins();
|
|
||||||
UniTaskVoid PlayRandomActionMusicUntilHumanityWillBeDestroyedForTheySins();
|
|
||||||
UniTaskVoid GladlyAskToStopGameplayMusic(Action callback = null);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
namespace Code.Audio
|
||||||
|
{
|
||||||
|
public enum MusicType
|
||||||
|
{
|
||||||
|
Menu,
|
||||||
|
Peaceful,
|
||||||
|
Action
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 74ff08d5f1b741f69e37fc06fb07ae8d
|
||||||
|
timeCreated: 1763151897
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.AddressableAssets;
|
||||||
|
|
||||||
|
namespace Code.Configs
|
||||||
|
{
|
||||||
|
[CreateAssetMenu(menuName = "Config/Enemies/Cockroach", fileName = "CockroachConfig")]
|
||||||
|
public class CockroachConfig : ScriptableObject
|
||||||
|
{
|
||||||
|
public AssetReference cockroachPrefab;
|
||||||
|
|
||||||
|
public int damage = 2;
|
||||||
|
public float attackCooldown = 1.5f;
|
||||||
|
|
||||||
|
public float detectionRange = 20f;
|
||||||
|
public float attackRange = 1.3f;
|
||||||
|
|
||||||
|
public float speed = 6f;
|
||||||
|
|
||||||
|
public bool isStunnable;
|
||||||
|
public float stunDuration;
|
||||||
|
|
||||||
|
public bool usesIdleMovement = true;
|
||||||
|
public float idleWanderRadius = 3f;
|
||||||
|
public float idleMoveDurationMin = 0.3f;
|
||||||
|
public float idleMoveDurationMax = 1f;
|
||||||
|
public float idlePauseDurationMin = 0.1f;
|
||||||
|
public float idlePauseDurationMax = 0.8f;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 7bc162d3127949aa950d0738beee99a4
|
||||||
|
timeCreated: 1763571220
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.AddressableAssets;
|
||||||
|
|
||||||
|
namespace Code.Configs
|
||||||
|
{
|
||||||
|
[CreateAssetMenu(menuName = "Config/Enemies/DrunkenGrandpa", fileName = "DrunkenGrandpaConfig")]
|
||||||
|
public class DrunkenGrandpaConfig : ScriptableObject
|
||||||
|
{
|
||||||
|
public AssetReference drunkenGrandpaPrefab;
|
||||||
|
|
||||||
|
public int damage = 2;
|
||||||
|
public float attackCooldown = 5f;
|
||||||
|
|
||||||
|
public float detectionRange = 10f;
|
||||||
|
public float attackRange = 1.5f;
|
||||||
|
|
||||||
|
public float speed = 3f;
|
||||||
|
|
||||||
|
public bool isStunnable = true;
|
||||||
|
public float stunDuration = 3f;
|
||||||
|
|
||||||
|
public bool usesIdleMovement = true;
|
||||||
|
public float idleWanderRadius = 5f;
|
||||||
|
public float idleMoveDurationMin = 1f;
|
||||||
|
public float idleMoveDurationMax = 5f;
|
||||||
|
public float idlePauseDurationMin = 3f;
|
||||||
|
public float idlePauseDurationMax = 5f;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 4d157e8891074b90957a7434cff0ae71
|
||||||
|
timeCreated: 1763569096
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.AddressableAssets;
|
||||||
|
|
||||||
|
namespace Code.Configs
|
||||||
|
{
|
||||||
|
[CreateAssetMenu(menuName = "Config/Enemies/Fog", fileName = "FogConfig")]
|
||||||
|
public class FogConfig : ScriptableObject
|
||||||
|
{
|
||||||
|
public AssetReference fogPrefab;
|
||||||
|
|
||||||
|
public int damage = int.MaxValue;
|
||||||
|
public float attackCooldown;
|
||||||
|
|
||||||
|
public float detectionRange;
|
||||||
|
public float attackRange = 5f;
|
||||||
|
|
||||||
|
public float speed = 1.5f;
|
||||||
|
|
||||||
|
public bool isStunnable;
|
||||||
|
public float stunDuration;
|
||||||
|
|
||||||
|
public bool usesIdleMovement;
|
||||||
|
public float idleWanderRadius;
|
||||||
|
public float idleMoveDurationMin;
|
||||||
|
public float idleMoveDurationMax;
|
||||||
|
public float idlePauseDurationMin;
|
||||||
|
public float idlePauseDurationMax;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: aa4dd2a5cce24902a2918488b5751f2f
|
||||||
|
timeCreated: 1763581410
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
using UnityEngine.AddressableAssets;
|
||||||
|
|
||||||
namespace Code.Configs
|
namespace Code.Configs
|
||||||
{
|
{
|
||||||
@@ -6,5 +7,7 @@ namespace Code.Configs
|
|||||||
public class PlayerConfig : ScriptableObject
|
public class PlayerConfig : ScriptableObject
|
||||||
{
|
{
|
||||||
public int maxHealth;
|
public int maxHealth;
|
||||||
|
|
||||||
|
public AssetReference characterPrefab;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -25,5 +25,7 @@ namespace Code.Constants
|
|||||||
public const string PeacefulSnapshot = "Peaceful";
|
public const string PeacefulSnapshot = "Peaceful";
|
||||||
public const string ActionSnapshot = "Action";
|
public const string ActionSnapshot = "Action";
|
||||||
public const string NoneSnapshot = "None";
|
public const string NoneSnapshot = "None";
|
||||||
|
public const string MenuSnapshot = "Menu";
|
||||||
|
public const string MenuMusicGroup = "Menu";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -12,6 +12,7 @@ namespace Code.Gameplay.Camera
|
|||||||
{
|
{
|
||||||
Bogdan,
|
Bogdan,
|
||||||
Static,
|
Static,
|
||||||
|
UltraStatic,
|
||||||
FirstPerson,
|
FirstPerson,
|
||||||
ThirdPerson,
|
ThirdPerson,
|
||||||
Cinematic
|
Cinematic
|
||||||
|
|||||||
@@ -10,10 +10,11 @@ namespace Code.Gameplay.Camera
|
|||||||
public override void Initialize()
|
public override void Initialize()
|
||||||
{
|
{
|
||||||
States.Add(CameraMode.Static, new StaticState(StateMachineContext));
|
States.Add(CameraMode.Static, new StaticState(StateMachineContext));
|
||||||
|
States.Add(CameraMode.UltraStatic, new UltraStaticState(StateMachineContext));
|
||||||
States.Add(CameraMode.FirstPerson, new FirstPersonState(StateMachineContext));
|
States.Add(CameraMode.FirstPerson, new FirstPersonState(StateMachineContext));
|
||||||
States.Add(CameraMode.ThirdPerson, new ThirdPersonState(StateMachineContext));
|
States.Add(CameraMode.ThirdPerson, new ThirdPersonState(StateMachineContext));
|
||||||
|
|
||||||
CurrentBaseState = States[CameraMode.Static];
|
CurrentBaseState = States[CameraMode.UltraStatic];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -117,7 +117,7 @@ namespace Code.Gameplay.Camera.CameraStates
|
|||||||
protected virtual void HandleRotationInput(float deltaTime, Vector3 rotationInput, out Quaternion targetRotation)
|
protected virtual void HandleRotationInput(float deltaTime, Vector3 rotationInput, out Quaternion targetRotation)
|
||||||
{
|
{
|
||||||
// Вращение вокруг вертикальной оси (горизонтальный поворот)
|
// Вращение вокруг вертикальной оси (горизонтальный поворот)
|
||||||
var rotationFromInput = Quaternion.Euler(FollowTransform.up * (rotationInput.x * RotationSpeed));
|
var rotationFromInput = Quaternion.Euler(Vector3.up * (rotationInput.x * RotationSpeed));
|
||||||
PlanarDirection = rotationFromInput * PlanarDirection;
|
PlanarDirection = rotationFromInput * PlanarDirection;
|
||||||
var planarRotation = Quaternion.LookRotation(PlanarDirection, FollowTransform.up);
|
var planarRotation = Quaternion.LookRotation(PlanarDirection, FollowTransform.up);
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Code.Gameplay.Camera.CameraStates
|
||||||
|
{
|
||||||
|
public class UltraStaticState : BaseCameraState, ICameraState
|
||||||
|
{
|
||||||
|
public UltraStaticState(CameraStateMachineContext context) : base(context) { }
|
||||||
|
|
||||||
|
public override void EnterState()
|
||||||
|
{
|
||||||
|
Debug.Log("Ultra static State Enter");
|
||||||
|
base.EnterState();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void HandlePosition(float deltaTime, float zoomInput, Quaternion targetRotation)
|
||||||
|
{
|
||||||
|
Camera.transform.position = FollowTransform.position;
|
||||||
|
}
|
||||||
|
|
||||||
|
public CameraMode GetCameraMode() => CameraMode.UltraStatic;
|
||||||
|
|
||||||
|
protected override void HandleRotationInput(float deltaTime, Vector3 rotationInput,
|
||||||
|
out Quaternion targetRotation)
|
||||||
|
{
|
||||||
|
if(FollowTransform) Camera.transform.rotation = FollowTransform.rotation;
|
||||||
|
targetRotation = Camera.transform.rotation;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 8e4b2fa3af4b4ba78ab79ca154f05fb4
|
||||||
|
timeCreated: 1763547110
|
||||||
+40
-3
@@ -15,6 +15,12 @@ namespace Code.Gameplay.Character.Controller.Abilities
|
|||||||
private readonly float _minWallClimbSpeed;
|
private readonly float _minWallClimbSpeed;
|
||||||
// Пороговый косинус стены
|
// Пороговый косинус стены
|
||||||
public float WallNormalThreshold { get; }
|
public float WallNormalThreshold { get; }
|
||||||
|
|
||||||
|
private bool _hasClimbedThisWallSession;
|
||||||
|
private float _wallClimbCooldownTimer;
|
||||||
|
private readonly float _wallClimbCooldownDuration = 1.5f;
|
||||||
|
|
||||||
|
public bool IsClimbingActive { get; private set; }
|
||||||
|
|
||||||
// Конструктор механики залазания на стену
|
// Конструктор механики залазания на стену
|
||||||
public WallClimbMechanic(float wallClimbSpeedFactor, float minWallClimbSpeed, float wallDetectionAngleThreshold)
|
public WallClimbMechanic(float wallClimbSpeedFactor, float minWallClimbSpeed, float wallDetectionAngleThreshold)
|
||||||
@@ -26,21 +32,32 @@ namespace Code.Gameplay.Character.Controller.Abilities
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Обработка столкновения при движении (вызывается при ударе о препятствие)
|
// Обработка столкновения при движении (вызывается при ударе о препятствие)
|
||||||
public void OnMovementHit(KinematicCharacterMotor motor, Vector3 hitNormal)
|
public bool TryClimbWall(KinematicCharacterMotor motor, Vector3 hitNormal)
|
||||||
{
|
{
|
||||||
// Проверяем, что это вертикальная или почти вертикальная поверхность (стена)
|
// Проверяем, что это вертикальная или почти вертикальная поверхность (стена)
|
||||||
var dotWithUp = Vector3.Dot(hitNormal, motor.CharacterUp);
|
var dotWithUp = Vector3.Dot(hitNormal, motor.CharacterUp);
|
||||||
if (Mathf.Abs(dotWithUp) > WallNormalThreshold) return; // Не стена — это пол или потолок
|
|
||||||
|
if (Mathf.Abs(dotWithUp) > WallNormalThreshold)
|
||||||
|
{
|
||||||
|
// Сбрасываем сессию, если коснулись пола/потолка → выход из "режима стены"
|
||||||
|
_hasClimbedThisWallSession = false;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Запрещаем повторное залазание в рамках одной сессии
|
||||||
|
if (_hasClimbedThisWallSession || _wallClimbCooldownTimer > 0f)
|
||||||
|
return false;
|
||||||
|
|
||||||
// Получаем текущую скорость персонажа
|
// Получаем текущую скорость персонажа
|
||||||
var currentVelocity = motor.Velocity;
|
var currentVelocity = motor.Velocity;
|
||||||
|
|
||||||
// Проекция скорости на направление к стене (отрицательная, если летим в стену)
|
// Проекция скорости на направление к стене (отрицательная, если летим в стену)
|
||||||
var velocityIntoWall = Vector3.Dot(currentVelocity, -hitNormal);
|
var velocityIntoWall = Vector3.Dot(currentVelocity, -hitNormal);
|
||||||
|
|
||||||
// Если движемся в стену с достаточной скоростью
|
// Если движемся в стену с достаточной скоростью
|
||||||
if (velocityIntoWall > _minWallClimbSpeed)
|
if (velocityIntoWall > _minWallClimbSpeed)
|
||||||
{
|
{
|
||||||
|
_wallClimbCooldownTimer = _wallClimbCooldownDuration;
|
||||||
// Преобразуем часть горизонтальной скорости в вертикальную
|
// Преобразуем часть горизонтальной скорости в вертикальную
|
||||||
var verticalBoost = velocityIntoWall * _wallClimbSpeedFactor;
|
var verticalBoost = velocityIntoWall * _wallClimbSpeedFactor;
|
||||||
|
|
||||||
@@ -49,6 +66,26 @@ namespace Code.Gameplay.Character.Controller.Abilities
|
|||||||
|
|
||||||
// Предотвращаем заземление и повторное применение в этом кадре
|
// Предотвращаем заземление и повторное применение в этом кадре
|
||||||
motor.ForceUnground();
|
motor.ForceUnground();
|
||||||
|
_hasClimbedThisWallSession = true;
|
||||||
|
IsClimbingActive = true;
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ResetWallClimbSession()
|
||||||
|
{
|
||||||
|
_hasClimbedThisWallSession = false;
|
||||||
|
IsClimbingActive = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void TickCooldown(float deltaTime)
|
||||||
|
{
|
||||||
|
if (_wallClimbCooldownTimer > 0f)
|
||||||
|
{
|
||||||
|
_wallClimbCooldownTimer -= deltaTime;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+84
-16
@@ -17,6 +17,12 @@ namespace Code.Gameplay.Character.Controller.Abilities
|
|||||||
private Vector3 _lastWallNormal;
|
private Vector3 _lastWallNormal;
|
||||||
private float _lastWallContactHeight;
|
private float _lastWallContactHeight;
|
||||||
private float _leanFactor;
|
private float _leanFactor;
|
||||||
|
private float _leanSign;
|
||||||
|
private Vector3 _leanDirection;
|
||||||
|
|
||||||
|
private Vector3 _lastWallContactPoint;
|
||||||
|
private bool _isLeaningOnWall;
|
||||||
|
private const float WallProximityThreshold = 0.6f;
|
||||||
|
|
||||||
public WallLeanMechanic(float maxLeanAngle, float leanSharpness, float heightScale)
|
public WallLeanMechanic(float maxLeanAngle, float leanSharpness, float heightScale)
|
||||||
{
|
{
|
||||||
@@ -32,29 +38,93 @@ namespace Code.Gameplay.Character.Controller.Abilities
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Вызывается из OnMovementHit
|
// Вызывается из OnMovementHit
|
||||||
public void OnWallContact(Vector3 wallNormal, float contactHeight)
|
public void OnWallContact(KinematicCharacterMotor motor, Vector3 wallNormal, float contactHeight)
|
||||||
{
|
{
|
||||||
|
// Только если это действительно стена (не пол/потолок)
|
||||||
|
var dotWithUp = Vector3.Dot(wallNormal, motor.CharacterUp);
|
||||||
|
if (Mathf.Abs(dotWithUp) > 0.7f) // ~45°, можно настроить
|
||||||
|
return;
|
||||||
|
|
||||||
_lastWallNormal = wallNormal;
|
_lastWallNormal = wallNormal;
|
||||||
_lastWallContactHeight = contactHeight; }
|
_lastWallContactHeight = contactHeight;
|
||||||
|
_lastWallContactPoint = motor.TransientPosition;
|
||||||
|
|
||||||
|
// Пересчитываем направление наклона
|
||||||
|
_leanDirection = -_lastWallNormal;
|
||||||
|
_leanDirection = Vector3.ProjectOnPlane(_leanDirection, motor.CharacterUp).normalized;
|
||||||
|
|
||||||
|
_leanSign = 1;
|
||||||
|
|
||||||
|
// what the fuck
|
||||||
|
if (_leanDirection.x != 0)
|
||||||
|
{
|
||||||
|
switch (_leanDirection.x)
|
||||||
|
{
|
||||||
|
case -1 or 1 when motor.CharacterRight.x > 0.1f:
|
||||||
|
_leanSign = -1;
|
||||||
|
break;
|
||||||
|
case -1 or 1 when Mathf.Abs(motor.CharacterRight.x) < 0.1f:
|
||||||
|
_leanDirection = new Vector3(0, 0, -1);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
switch (_leanDirection.z)
|
||||||
|
{
|
||||||
|
case 1 when Mathf.Abs(motor.CharacterRight.z) < 0.1f:
|
||||||
|
_leanSign = -1;
|
||||||
|
break;
|
||||||
|
case -1 when motor.CharacterRight.z < -0.1f:
|
||||||
|
case 1 when motor.CharacterRight.z > 0.1f:
|
||||||
|
_leanDirection = new Vector3(-1, 0, 0);
|
||||||
|
break;
|
||||||
|
case -1 when motor.CharacterRight.z > 0.1f:
|
||||||
|
case 1 when motor.CharacterRight.z < -0.1f:
|
||||||
|
_leanDirection = new Vector3(1, 0, 0);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
_isLeaningOnWall = true;
|
||||||
|
}
|
||||||
|
|
||||||
// Обновление каждый кадр
|
// Обновление каждый кадр
|
||||||
public void UpdateLean(KinematicCharacterMotor motor, float deltaTime)
|
public void UpdateLean(KinematicCharacterMotor motor, float deltaTime)
|
||||||
{
|
{
|
||||||
if (!_characterTransform) return;
|
if (!_characterTransform) return;
|
||||||
|
|
||||||
var isGrounded = motor.GroundingStatus.IsStableOnGround;
|
|
||||||
|
|
||||||
if (!isGrounded)
|
var currentPosition = motor.TransientPosition;
|
||||||
|
|
||||||
|
var isStillNearWall = false;
|
||||||
|
if (_isLeaningOnWall && _lastWallNormal != Vector3.zero)
|
||||||
{
|
{
|
||||||
var heightDelta = motor.TransientPosition.y - _lastWallContactHeight;
|
var toWall = currentPosition - _lastWallContactPoint;
|
||||||
var targetLeanFactor = Mathf.Clamp01(heightDelta * _heightScale);
|
var distanceToWallPlane = Mathf.Abs(Vector3.Dot(toWall, _lastWallNormal));
|
||||||
_leanFactor = Mathf.Lerp(_leanFactor, targetLeanFactor, 1f - Mathf.Exp(-_leanSharpness * deltaTime));
|
isStillNearWall = distanceToWallPlane <= WallProximityThreshold;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
|
if (_isLeaningOnWall)
|
||||||
|
{
|
||||||
|
var isBelowContactHeight = currentPosition.y < _lastWallContactHeight;
|
||||||
|
|
||||||
|
if (!isStillNearWall || isBelowContactHeight)
|
||||||
|
{
|
||||||
|
_isLeaningOnWall = false;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var heightDelta = currentPosition.y - _lastWallContactHeight;
|
||||||
|
var targetLeanFactor = Mathf.Clamp01(heightDelta * _heightScale);
|
||||||
|
_leanFactor = Mathf.Lerp(_leanFactor, targetLeanFactor, 1f - Mathf.Exp(-_leanSharpness * deltaTime));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!_isLeaningOnWall)
|
||||||
{
|
{
|
||||||
_leanFactor = Mathf.Lerp(_leanFactor, 0f, 1f - Mathf.Exp(-_leanSharpness * deltaTime));
|
_leanFactor = Mathf.Lerp(_leanFactor, 0f, 1f - Mathf.Exp(-_leanSharpness * deltaTime));
|
||||||
}
|
}
|
||||||
|
|
||||||
ApplyLeanRotation(motor);
|
ApplyLeanRotation(motor);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -66,13 +136,11 @@ namespace Code.Gameplay.Character.Controller.Abilities
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var leanDirection = -_lastWallNormal;
|
if (_leanDirection.sqrMagnitude < 0.01f) return;
|
||||||
leanDirection = Vector3.ProjectOnPlane(leanDirection, motor.CharacterUp).normalized;
|
|
||||||
|
|
||||||
if (leanDirection.sqrMagnitude < 0.01f) return;
|
var leanAngle = _leanSign * _leanFactor * _maxLeanAngle;
|
||||||
|
var leanAxis = Vector3.Cross(motor.CharacterUp, _leanDirection);
|
||||||
var leanAngle = _leanFactor * _maxLeanAngle;
|
var leanRotation = Quaternion.AngleAxis(leanAngle, leanAxis);
|
||||||
var leanRotation = Quaternion.AngleAxis(leanAngle, Vector3.Cross(motor.CharacterUp, leanDirection));
|
|
||||||
_characterTransform.localRotation = leanRotation;
|
_characterTransform.localRotation = leanRotation;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+82
-18
@@ -33,9 +33,48 @@ namespace Code.Gameplay.Character.Controller
|
|||||||
private GroundMovementSystem _groundMovement;
|
private GroundMovementSystem _groundMovement;
|
||||||
private AirMovementSystem _airMovement;
|
private AirMovementSystem _airMovement;
|
||||||
|
|
||||||
|
public bool IsSliding => _slideMechanic.IsSliding;
|
||||||
|
|
||||||
|
private float abilityBlockTimer;
|
||||||
|
private bool isAbilitiesBlocked;
|
||||||
|
|
||||||
|
public void SetPosition(Vector3 position) => motor.SetPosition(position);
|
||||||
|
public void SetRotation(Quaternion rotation) => motor.SetRotation(rotation);
|
||||||
|
|
||||||
// Инициализация контроллера
|
// Инициализация контроллера
|
||||||
private void Awake()
|
// private void Awake()
|
||||||
|
// {
|
||||||
|
// // Инициализация подсистем с параметрами из конфига
|
||||||
|
// _inputHandler = new CharacterInputHandler(
|
||||||
|
// _characterConfig.sprintAngleThreshold
|
||||||
|
// );
|
||||||
|
// _slideMechanic = new SlideMechanic(
|
||||||
|
// _characterConfig.slideSpeed,
|
||||||
|
// _characterConfig.slideDuration,
|
||||||
|
// _characterConfig.slideCooldown
|
||||||
|
// );
|
||||||
|
// _wallClimbMechanic = new WallClimbMechanic(
|
||||||
|
// _characterConfig.wallClimbSpeedFactor,
|
||||||
|
// _characterConfig.minWallClimbSpeed,
|
||||||
|
// _characterConfig.wallDetectionAngleThreshold
|
||||||
|
// );
|
||||||
|
// _wallLeanMechanic = new WallLeanMechanic(
|
||||||
|
// _characterConfig.maxWallLeanAngle,
|
||||||
|
// _characterConfig.wallLeanSharpness,
|
||||||
|
// _characterConfig.wallLeanHeightScale
|
||||||
|
// );
|
||||||
|
// _groundMovement = new GroundMovementSystem(
|
||||||
|
// _characterConfig.maxStableMoveSpeed,
|
||||||
|
// _characterConfig.sprintMoveSpeed,
|
||||||
|
// _characterConfig.stableMovementSharpness,
|
||||||
|
// _characterConfig.jumpSpeed
|
||||||
|
// );
|
||||||
|
// _airMovement = new AirMovementSystem(_characterConfig.gravity);
|
||||||
|
// }
|
||||||
|
[Inject]
|
||||||
|
private void Construct(CharacterConfig characterConfig)
|
||||||
{
|
{
|
||||||
|
_characterConfig = characterConfig;
|
||||||
// Инициализация подсистем с параметрами из конфига
|
// Инициализация подсистем с параметрами из конфига
|
||||||
_inputHandler = new CharacterInputHandler(
|
_inputHandler = new CharacterInputHandler(
|
||||||
_characterConfig.sprintAngleThreshold
|
_characterConfig.sprintAngleThreshold
|
||||||
@@ -62,25 +101,31 @@ namespace Code.Gameplay.Character.Controller
|
|||||||
_characterConfig.jumpSpeed
|
_characterConfig.jumpSpeed
|
||||||
);
|
);
|
||||||
_airMovement = new AirMovementSystem(_characterConfig.gravity);
|
_airMovement = new AirMovementSystem(_characterConfig.gravity);
|
||||||
}
|
|
||||||
|
|
||||||
// Текущий режим камеры для адаптации поведения
|
|
||||||
private CameraMode _currentCameraMode = CameraMode.FirstPerson;
|
|
||||||
|
|
||||||
// Инициализация контроллера
|
|
||||||
private void Start()
|
|
||||||
{
|
|
||||||
motor.CharacterController = this; // Регистрация этого контроллера в движке
|
motor.CharacterController = this; // Регистрация этого контроллера в движке
|
||||||
_inputHandler.FirstPersonCameraRotation =
|
_inputHandler.FirstPersonCameraRotation =
|
||||||
motor.Transform.rotation; // Начальное вращение совпадает с персонажемс
|
motor.Transform.rotation; // Начальное вращение совпадает с персонажемс
|
||||||
_wallLeanMechanic.SetCharacterTransform(characterTransform);
|
_wallLeanMechanic.SetCharacterTransform(characterTransform);
|
||||||
}
|
}
|
||||||
|
// Текущий режим камеры для адаптации поведения
|
||||||
|
private CameraMode _currentCameraMode = CameraMode.FirstPerson;
|
||||||
|
|
||||||
|
// Инициализация контроллера
|
||||||
|
// private void Start()
|
||||||
|
// {
|
||||||
|
// motor.CharacterController = this; // Регистрация этого контроллера в движке
|
||||||
|
// _inputHandler.FirstPersonCameraRotation =
|
||||||
|
// motor.Transform.rotation; // Начальное вращение совпадает с персонажемс
|
||||||
|
// _wallLeanMechanic.SetCharacterTransform(characterTransform);
|
||||||
|
// }
|
||||||
|
|
||||||
// Обработка и преобразование входных данных от персонажа
|
// Обработка и преобразование входных данных от персонажа
|
||||||
public void SetInputs(ref CharacterInputs inputs)
|
public void SetInputs(ref CharacterInputs inputs)
|
||||||
{
|
{
|
||||||
// Обновляем таймер перезарядки слайда
|
// Обновляем таймер перезарядки слайда
|
||||||
_slideMechanic.TickCooldown(Time.deltaTime);
|
_slideMechanic.TickCooldown(Time.deltaTime);
|
||||||
|
_wallClimbMechanic.TickCooldown(Time.deltaTime);
|
||||||
|
|
||||||
// Если активен слайд - игнорируем весь остальной ввод
|
// Если активен слайд - игнорируем весь остальной ввод
|
||||||
if (_slideMechanic.IsSliding)
|
if (_slideMechanic.IsSliding)
|
||||||
@@ -95,6 +140,20 @@ namespace Code.Gameplay.Character.Controller
|
|||||||
|
|
||||||
// Сохраняем текущий режим камеры
|
// Сохраняем текущий режим камеры
|
||||||
_currentCameraMode = inputs.CameraMode;
|
_currentCameraMode = inputs.CameraMode;
|
||||||
|
|
||||||
|
if (isAbilitiesBlocked)
|
||||||
|
{
|
||||||
|
abilityBlockTimer -= Time.deltaTime;
|
||||||
|
if (abilityBlockTimer <= 0)
|
||||||
|
{
|
||||||
|
isAbilitiesBlocked = false;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
inputs.SprintPressed = false;
|
||||||
|
inputs.SlidePressed = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Обработка слайда
|
// Обработка слайда
|
||||||
_slideMechanic.RequestSlide(inputs.SlidePressed);
|
_slideMechanic.RequestSlide(inputs.SlidePressed);
|
||||||
@@ -109,8 +168,7 @@ namespace Code.Gameplay.Character.Controller
|
|||||||
// Обновление вращения персонажа на основе входных данных
|
// Обновление вращения персонажа на основе входных данных
|
||||||
public void UpdateRotation(ref Quaternion currentRotation, float deltaTime)
|
public void UpdateRotation(ref Quaternion currentRotation, float deltaTime)
|
||||||
{
|
{
|
||||||
// ВО ВРЕМЯ СЛАЙДА НЕ ОБНОВЛЯЕМ ВРАЩЕНИЕ - ПЕРСОНАЖ СМОТРИТ ПРЯМО
|
if (_slideMechanic.IsSliding || _wallClimbMechanic.IsClimbingActive) return;
|
||||||
if (_slideMechanic.IsSliding) return;
|
|
||||||
|
|
||||||
switch (_currentCameraMode)
|
switch (_currentCameraMode)
|
||||||
{
|
{
|
||||||
@@ -182,6 +240,12 @@ namespace Code.Gameplay.Character.Controller
|
|||||||
_groundMovement.CancelJumpRequest();
|
_groundMovement.CancelJumpRequest();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void BlockAbilities(float duration)
|
||||||
|
{
|
||||||
|
isAbilitiesBlocked = true;
|
||||||
|
abilityBlockTimer = duration;
|
||||||
|
}
|
||||||
|
|
||||||
// Метод вызывается перед обновлением персонажа (можно использовать для подготовки)
|
// Метод вызывается перед обновлением персонажа (можно использовать для подготовки)
|
||||||
public void BeforeCharacterUpdate(float deltaTime)
|
public void BeforeCharacterUpdate(float deltaTime)
|
||||||
@@ -196,6 +260,11 @@ namespace Code.Gameplay.Character.Controller
|
|||||||
{
|
{
|
||||||
_slideMechanic.EndSlide();
|
_slideMechanic.EndSlide();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (motor.GroundingStatus.IsStableOnGround)
|
||||||
|
{
|
||||||
|
_wallClimbMechanic.ResetWallClimbSession();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Метод вызывается после обновления персонажа
|
// Метод вызывается после обновления персонажа
|
||||||
@@ -220,13 +289,8 @@ namespace Code.Gameplay.Character.Controller
|
|||||||
public void OnMovementHit(Collider hitCollider, Vector3 hitNormal, Vector3 hitPoint,
|
public void OnMovementHit(Collider hitCollider, Vector3 hitNormal, Vector3 hitPoint,
|
||||||
ref HitStabilityReport hitStabilityReport)
|
ref HitStabilityReport hitStabilityReport)
|
||||||
{
|
{
|
||||||
_wallClimbMechanic.OnMovementHit(motor, hitNormal);
|
if (_wallClimbMechanic.TryClimbWall(motor, hitNormal))
|
||||||
|
_wallLeanMechanic.OnWallContact(motor, hitNormal, motor.TransientPosition.y);
|
||||||
var dotWithUp = Vector3.Dot(hitNormal, motor.CharacterUp);
|
|
||||||
if (Mathf.Abs(dotWithUp) <= _wallClimbMechanic.WallNormalThreshold)
|
|
||||||
{
|
|
||||||
_wallLeanMechanic.OnWallContact(hitNormal, motor.TransientPosition.y);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Обработка отчета о стабильности столкновения
|
// Обработка отчета о стабильности столкновения
|
||||||
|
|||||||
+1
-1
@@ -113,7 +113,7 @@ namespace Code.Gameplay.Character.Controller.Input
|
|||||||
var cameraForward = cameraRotation * Vector3.forward;
|
var cameraForward = cameraRotation * Vector3.forward;
|
||||||
|
|
||||||
// Проецируем на горизонтальную плоскость
|
// Проецируем на горизонтальную плоскость
|
||||||
var horizontalForward = Vector3.ProjectOnPlane(cameraForward, motor.CharacterUp).normalized;
|
var horizontalForward = Vector3.ProjectOnPlane(cameraForward, Vector3.up).normalized;
|
||||||
|
|
||||||
// Если проекция вырождена, используем текущее направление персонажа
|
// Если проекция вырождена, используем текущее направление персонажа
|
||||||
if (horizontalForward.sqrMagnitude < 0.01f)
|
if (horizontalForward.sqrMagnitude < 0.01f)
|
||||||
|
|||||||
@@ -0,0 +1,56 @@
|
|||||||
|
using Code.Gameplay.Camera;
|
||||||
|
using Code.Gameplay.Camera.CameraStates;
|
||||||
|
using Code.Gameplay.Character.Controller;
|
||||||
|
using Code.Input;
|
||||||
|
using Reflex.Attributes;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Code.Gameplay.Character.Core
|
||||||
|
{
|
||||||
|
public class CharacterProvider : MonoBehaviour
|
||||||
|
{
|
||||||
|
[Inject] private CameraStateMachine _cameraStateMachine; // Стейт-машина камеры (нужна для транзакций и т.п.)
|
||||||
|
[SerializeField] private CustomCharacterController customCharacterController; // Компонент управления персонажем
|
||||||
|
public CustomCharacterController CustomCharacterController => customCharacterController;
|
||||||
|
|
||||||
|
[SerializeField] private Transform cameraFollowPoint; // Точка следования камеры (уровень глаз для FirstPerson)
|
||||||
|
public Transform GetFollowTransform() => cameraFollowPoint;
|
||||||
|
|
||||||
|
[Inject] private IInputService _inputService; // Сервис ввода через DI
|
||||||
|
|
||||||
|
public void Teleport(Vector3 position, Quaternion rotation)
|
||||||
|
{
|
||||||
|
customCharacterController.SetPosition(position);
|
||||||
|
customCharacterController.SetRotation(rotation);
|
||||||
|
}
|
||||||
|
// Обработка ввода для движения персонажа
|
||||||
|
private void HandleCharacterInput()
|
||||||
|
{
|
||||||
|
// Создаем структуру ввода с полной информацией о камере
|
||||||
|
var inputs = new CharacterInputs();
|
||||||
|
|
||||||
|
// Получаем данные движения из Input System
|
||||||
|
var moveInput = _inputService.MoveInput;
|
||||||
|
inputs.MoveAxisForward = moveInput.y; // Vertical ось (W/S или Up/Down)
|
||||||
|
inputs.MoveAxisRight = moveInput.x; // Horizontal ось (A/D или Left/Right)
|
||||||
|
inputs.JumpPressed = _inputService.JumpPressed; // Прыжки (Space)
|
||||||
|
inputs.SprintPressed = true;//_inputService.SprintPressed; // Спринт (Shift)
|
||||||
|
inputs.SlidePressed = _inputService.SlidePressed; // Слайд (Ctrl)
|
||||||
|
inputs.CameraMode = ((ICameraState)_cameraStateMachine.CurrentBaseState).GetCameraMode();
|
||||||
|
|
||||||
|
// Передаем информацию о камере для адаптивного поведения
|
||||||
|
inputs.CameraRotation = ((BaseCameraState)_cameraStateMachine.CurrentBaseState).GetCameraRotation();
|
||||||
|
inputs.CameraPlanarDirection = ((BaseCameraState)_cameraStateMachine.CurrentBaseState).GetPlanarDirection();
|
||||||
|
|
||||||
|
// Передаем ввод в контроллер персонажа
|
||||||
|
customCharacterController.SetInputs(ref inputs);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обновление логики каждый кадр
|
||||||
|
private void Update()
|
||||||
|
{
|
||||||
|
// Обработка ввода для движения в Update (физика)
|
||||||
|
HandleCharacterInput();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b2d4b8256c1f4b3facf6b8d0a7d5256b
|
||||||
|
timeCreated: 1763217123
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b7ba7b62b1aa47c48dc82ac8d8e8530e
|
||||||
|
timeCreated: 1763548306
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
using DG.Tweening;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Code.Gameplay.Door
|
||||||
|
{
|
||||||
|
public class CinematicDoorOpening
|
||||||
|
{
|
||||||
|
public DamnDoor DamnDoor;
|
||||||
|
public Light DoorLight;
|
||||||
|
|
||||||
|
public void PreOpen(bool start)
|
||||||
|
{
|
||||||
|
DoorLight.DOColor(start ? Color.yellow : Color.red, 0.2f);
|
||||||
|
|
||||||
|
DamnDoor.Petlya.DORotate(new Vector3(0, -40, 0), 1f);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Close()
|
||||||
|
{
|
||||||
|
DamnDoor.Petlya.DORotate(new Vector3(0, 0, 0), 1f);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: deda0339570d44609dd62eafd9c6215f
|
||||||
|
timeCreated: 1763548908
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Code.Gameplay.Door
|
||||||
|
{
|
||||||
|
public class DamnDoor : MonoBehaviour
|
||||||
|
{
|
||||||
|
[SerializeField] Rigidbody rigidbody;
|
||||||
|
[SerializeField] private Transform petlya;
|
||||||
|
public Transform Petlya => petlya;
|
||||||
|
|
||||||
|
public void SetPhysics(bool active)
|
||||||
|
{
|
||||||
|
rigidbody.isKinematic = active;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 50a6b5e332704611b19f5a209d4dbffe
|
||||||
|
timeCreated: 1763548314
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 3b36108558824d748620db29707cd2b1
|
||||||
|
timeCreated: 1763228467
|
||||||
@@ -0,0 +1,202 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.AI;
|
||||||
|
using Code.Gameplay.Player;
|
||||||
|
using Code.Gameplay.Character.Controller;
|
||||||
|
using Code.Gameplay.Character.Core;
|
||||||
|
using Reflex.Attributes;
|
||||||
|
using Reflex.Core;
|
||||||
|
using Reflex.Injectors;
|
||||||
|
|
||||||
|
namespace Code.Gameplay.Enemies
|
||||||
|
{
|
||||||
|
public abstract class BaseEnemy : MonoBehaviour
|
||||||
|
{
|
||||||
|
[SerializeField] protected NavMeshAgent agent;
|
||||||
|
[SerializeField] protected Collider enemyCollider;
|
||||||
|
|
||||||
|
protected int Damage;
|
||||||
|
protected float AttackCooldown;
|
||||||
|
|
||||||
|
protected float DetectionRange;
|
||||||
|
protected float AttackRange;
|
||||||
|
|
||||||
|
protected float Speed;
|
||||||
|
|
||||||
|
protected bool IsStunnable;
|
||||||
|
protected float StunDuration;
|
||||||
|
|
||||||
|
protected bool UsesIdleMovement;
|
||||||
|
protected float IdleWanderRadius;
|
||||||
|
protected float IdleMoveDurationMin;
|
||||||
|
protected float IdleMoveDurationMax;
|
||||||
|
protected float IdlePauseDurationMin;
|
||||||
|
protected float IdlePauseDurationMax;
|
||||||
|
|
||||||
|
private bool _isStunned;
|
||||||
|
private float _currentStunTimer;
|
||||||
|
|
||||||
|
private bool _canAttack = true;
|
||||||
|
private float _attackCooldownTimer;
|
||||||
|
|
||||||
|
private enum IdleState { Moving, Paused }
|
||||||
|
private IdleState _currentIdleState = IdleState.Paused;
|
||||||
|
private float _idleTimer;
|
||||||
|
private Vector3 _idleTargetPosition;
|
||||||
|
|
||||||
|
[Inject] private IPlayerProvider _playerProvider;
|
||||||
|
protected CharacterProvider Player => _playerProvider?.Character;
|
||||||
|
protected PlayerHealth PlayerHealth => _playerProvider?.Health;
|
||||||
|
protected CustomCharacterController PlayerController => Player?.CustomCharacterController;
|
||||||
|
|
||||||
|
protected virtual void Awake()
|
||||||
|
{
|
||||||
|
if (_playerProvider == null)
|
||||||
|
{
|
||||||
|
AttributeInjector.Inject(this, Container.ProjectContainer);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected virtual void Update()
|
||||||
|
{
|
||||||
|
if (!Player) return;
|
||||||
|
|
||||||
|
HandleStun();
|
||||||
|
HandleAttackCooldown();
|
||||||
|
if (_isStunned) return;
|
||||||
|
|
||||||
|
HandleMovement();
|
||||||
|
HandleAttack();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected virtual void HandleMovement()
|
||||||
|
{
|
||||||
|
if (!Player || !agent) return;
|
||||||
|
|
||||||
|
var distanceToPlayer = Vector3.Distance(transform.position, Player.transform.position);
|
||||||
|
|
||||||
|
if (distanceToPlayer <= DetectionRange)
|
||||||
|
{
|
||||||
|
agent.isStopped = false;
|
||||||
|
agent.SetDestination(Player.transform.position);
|
||||||
|
}
|
||||||
|
else if (UsesIdleMovement)
|
||||||
|
{
|
||||||
|
HandleIdleMovement();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
agent.isStopped = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected virtual void HandleIdleMovement()
|
||||||
|
{
|
||||||
|
_idleTimer -= Time.deltaTime;
|
||||||
|
|
||||||
|
switch (_currentIdleState)
|
||||||
|
{
|
||||||
|
case IdleState.Paused:
|
||||||
|
if (_idleTimer <= 0f)
|
||||||
|
{
|
||||||
|
// Start moving to a new random point
|
||||||
|
_currentIdleState = IdleState.Moving;
|
||||||
|
SetNewIdleDestination();
|
||||||
|
_idleTimer = Random.Range(IdleMoveDurationMin, IdleMoveDurationMax);
|
||||||
|
agent.isStopped = false;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case IdleState.Moving:
|
||||||
|
if (_idleTimer <= 0f || HasReachedIdleDestination())
|
||||||
|
{
|
||||||
|
// Stop and pause
|
||||||
|
_currentIdleState = IdleState.Paused;
|
||||||
|
_idleTimer = Random.Range(IdlePauseDurationMin, IdlePauseDurationMax);
|
||||||
|
agent.isStopped = true;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void SetNewIdleDestination()
|
||||||
|
{
|
||||||
|
Vector3 randomPoint = transform.position + Random.insideUnitSphere * IdleWanderRadius;
|
||||||
|
NavMeshHit hit;
|
||||||
|
if (NavMesh.SamplePosition(randomPoint, out hit, 3f, agent.areaMask))
|
||||||
|
{
|
||||||
|
_idleTargetPosition = hit.position;
|
||||||
|
agent.SetDestination(_idleTargetPosition);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Fallback: stay
|
||||||
|
_idleTargetPosition = transform.position;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private bool HasReachedIdleDestination()
|
||||||
|
{
|
||||||
|
return agent.remainingDistance <= agent.stoppingDistance;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected virtual void HandleAttack() { }
|
||||||
|
|
||||||
|
protected virtual void HandleStun()
|
||||||
|
{
|
||||||
|
if (!_isStunned || !IsStunnable) return;
|
||||||
|
|
||||||
|
_currentStunTimer -= Time.deltaTime;
|
||||||
|
|
||||||
|
if (!(_currentStunTimer <= 0)) return;
|
||||||
|
|
||||||
|
_isStunned = false;
|
||||||
|
agent.isStopped = false;
|
||||||
|
enemyCollider.enabled = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected virtual void ApplyStun()
|
||||||
|
{
|
||||||
|
_isStunned = true;
|
||||||
|
_currentStunTimer = StunDuration;
|
||||||
|
agent.isStopped = true;
|
||||||
|
enemyCollider.enabled = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected virtual void HandleAttackCooldown()
|
||||||
|
{
|
||||||
|
if (!_canAttack)
|
||||||
|
{
|
||||||
|
_attackCooldownTimer -= Time.deltaTime;
|
||||||
|
if (_attackCooldownTimer <= 0)
|
||||||
|
{
|
||||||
|
_canAttack = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected virtual void DealDamage()
|
||||||
|
{
|
||||||
|
if (!_canAttack || PlayerHealth == null) return;
|
||||||
|
|
||||||
|
PlayerHealth.GetDamage(Damage);
|
||||||
|
ApplyEffectsToPlayer();
|
||||||
|
|
||||||
|
_canAttack = false;
|
||||||
|
_attackCooldownTimer = AttackCooldown;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected virtual void ApplyEffectsToPlayer()
|
||||||
|
{
|
||||||
|
PlayerController.BlockAbilities(3f);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnDrawGizmosSelected()
|
||||||
|
{
|
||||||
|
Gizmos.color = Color.yellow;
|
||||||
|
Gizmos.DrawWireSphere(transform.position, DetectionRange);
|
||||||
|
|
||||||
|
Gizmos.color = new Color(0.3f, 0.3f, 0.8f, 0.4f);
|
||||||
|
Gizmos.DrawSphere(transform.position, AttackRange);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 691006ba0f69448787db8f350ecf32f4
|
||||||
|
timeCreated: 1763228480
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
using Code.Configs;
|
||||||
|
using Reflex.Attributes;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.AI;
|
||||||
|
|
||||||
|
namespace Code.Gameplay.Enemies
|
||||||
|
{
|
||||||
|
public class Cockroach : BaseEnemy
|
||||||
|
{
|
||||||
|
[Inject]
|
||||||
|
private void Construct(CockroachConfig cockroachConfig)
|
||||||
|
{
|
||||||
|
Damage = cockroachConfig.damage;
|
||||||
|
AttackCooldown = cockroachConfig.attackCooldown;
|
||||||
|
|
||||||
|
DetectionRange = cockroachConfig.detectionRange;
|
||||||
|
AttackRange = cockroachConfig.attackRange;
|
||||||
|
|
||||||
|
Speed = cockroachConfig.speed;
|
||||||
|
|
||||||
|
IsStunnable = cockroachConfig.isStunnable;
|
||||||
|
StunDuration = cockroachConfig.stunDuration;
|
||||||
|
|
||||||
|
UsesIdleMovement = cockroachConfig.usesIdleMovement;
|
||||||
|
IdleWanderRadius = cockroachConfig.idleWanderRadius;
|
||||||
|
IdleMoveDurationMin = cockroachConfig.idleMoveDurationMin;
|
||||||
|
IdleMoveDurationMax = cockroachConfig.idleMoveDurationMax;
|
||||||
|
IdleMoveDurationMin = cockroachConfig.idleMoveDurationMin;
|
||||||
|
IdleMoveDurationMax = cockroachConfig.idleMoveDurationMax;
|
||||||
|
IdlePauseDurationMin = cockroachConfig.idlePauseDurationMin;
|
||||||
|
IdlePauseDurationMax = cockroachConfig.idlePauseDurationMax;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void Awake()
|
||||||
|
{
|
||||||
|
base.Awake();
|
||||||
|
|
||||||
|
if (agent == null) return;
|
||||||
|
|
||||||
|
var walkableArea = NavMesh.GetAreaFromName("Cockroach");
|
||||||
|
agent.areaMask = 1 << walkableArea;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void HandleAttack()
|
||||||
|
{
|
||||||
|
if (!Player) return;
|
||||||
|
|
||||||
|
var distance = Vector3.Distance(transform.position, Player.transform.position);
|
||||||
|
|
||||||
|
if (!(distance <= AttackRange)) return;
|
||||||
|
|
||||||
|
DealDamage();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 119c0b675c944ed7ada6cdc8db4b04aa
|
||||||
|
timeCreated: 1763228933
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
using Code.Configs;
|
||||||
|
using Reflex.Attributes;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.AI;
|
||||||
|
|
||||||
|
namespace Code.Gameplay.Enemies
|
||||||
|
{
|
||||||
|
public class DrunkenGrandpa : BaseEnemy
|
||||||
|
{
|
||||||
|
[Inject]
|
||||||
|
private void Construct(DrunkenGrandpaConfig drunkenGrandpaConfig)
|
||||||
|
{
|
||||||
|
Damage = drunkenGrandpaConfig.damage;
|
||||||
|
AttackCooldown = drunkenGrandpaConfig.attackCooldown;
|
||||||
|
|
||||||
|
DetectionRange = drunkenGrandpaConfig.detectionRange;
|
||||||
|
AttackRange = drunkenGrandpaConfig.attackRange;
|
||||||
|
|
||||||
|
Speed = drunkenGrandpaConfig.speed;
|
||||||
|
|
||||||
|
IsStunnable = drunkenGrandpaConfig.isStunnable;
|
||||||
|
StunDuration = drunkenGrandpaConfig.stunDuration;
|
||||||
|
|
||||||
|
UsesIdleMovement = drunkenGrandpaConfig.usesIdleMovement;
|
||||||
|
IdleWanderRadius = drunkenGrandpaConfig.idleWanderRadius;
|
||||||
|
IdleMoveDurationMin = drunkenGrandpaConfig.idleMoveDurationMin;
|
||||||
|
IdleMoveDurationMax = drunkenGrandpaConfig.idleMoveDurationMax;
|
||||||
|
IdleMoveDurationMin = drunkenGrandpaConfig.idleMoveDurationMin;
|
||||||
|
IdleMoveDurationMax = drunkenGrandpaConfig.idleMoveDurationMax;
|
||||||
|
IdlePauseDurationMin = drunkenGrandpaConfig.idlePauseDurationMin;
|
||||||
|
IdlePauseDurationMax = drunkenGrandpaConfig.idlePauseDurationMax;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void Awake()
|
||||||
|
{
|
||||||
|
base.Awake();
|
||||||
|
|
||||||
|
if (agent == null) return;
|
||||||
|
|
||||||
|
var walkableArea = NavMesh.GetAreaFromName("Walkable");
|
||||||
|
agent.areaMask = 1 << walkableArea;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void HandleAttack()
|
||||||
|
{
|
||||||
|
if (!Player) return;
|
||||||
|
|
||||||
|
var distance = Vector3.Distance(transform.position, Player.transform.position);
|
||||||
|
|
||||||
|
if (!(distance <= AttackRange)) return;
|
||||||
|
|
||||||
|
if (Player.CustomCharacterController.IsSliding)
|
||||||
|
ApplyStun();
|
||||||
|
else
|
||||||
|
DealDamage();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5e77164596e249bca15e09cdfc9ddac2
|
||||||
|
timeCreated: 1763228910
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
using Code.Configs;
|
||||||
|
using Reflex.Attributes;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Code.Gameplay.Enemies
|
||||||
|
{
|
||||||
|
public class Fog : BaseEnemy
|
||||||
|
{
|
||||||
|
[Inject]
|
||||||
|
private void Construct(FogConfig fogConfig)
|
||||||
|
{
|
||||||
|
Damage = fogConfig.damage;
|
||||||
|
AttackCooldown = fogConfig.attackCooldown;
|
||||||
|
|
||||||
|
DetectionRange = fogConfig.detectionRange;
|
||||||
|
AttackRange = fogConfig.attackRange;
|
||||||
|
|
||||||
|
Speed = fogConfig.speed;
|
||||||
|
|
||||||
|
IsStunnable = fogConfig.isStunnable;
|
||||||
|
StunDuration = fogConfig.stunDuration;
|
||||||
|
|
||||||
|
UsesIdleMovement = fogConfig.usesIdleMovement;
|
||||||
|
IdleWanderRadius = fogConfig.idleWanderRadius;
|
||||||
|
IdleMoveDurationMin = fogConfig.idleMoveDurationMin;
|
||||||
|
IdleMoveDurationMax = fogConfig.idleMoveDurationMax;
|
||||||
|
IdleMoveDurationMin = fogConfig.idleMoveDurationMin;
|
||||||
|
IdleMoveDurationMax = fogConfig.idleMoveDurationMax;
|
||||||
|
IdlePauseDurationMin = fogConfig.idlePauseDurationMin;
|
||||||
|
IdlePauseDurationMax = fogConfig.idlePauseDurationMax;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void Awake()
|
||||||
|
{
|
||||||
|
base.Awake();
|
||||||
|
|
||||||
|
if (agent == null) return;
|
||||||
|
agent.enabled = false;
|
||||||
|
Destroy(agent);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void HandleMovement()
|
||||||
|
{
|
||||||
|
if (!Player) return;
|
||||||
|
|
||||||
|
var direction = (Player.transform.position - transform.position).normalized;
|
||||||
|
transform.position += direction * (Speed * Time.deltaTime);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void HandleAttack()
|
||||||
|
{
|
||||||
|
if (!Player || PlayerHealth == null) return;
|
||||||
|
|
||||||
|
var distance = Vector3.Distance(transform.position, Player.transform.position);
|
||||||
|
|
||||||
|
if (!(distance < AttackRange)) return;
|
||||||
|
|
||||||
|
PlayerHealth.GetDamage(PlayerHealth.MaxHealthPoints);
|
||||||
|
base.ApplyEffectsToPlayer();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnDrawGizmosSelected()
|
||||||
|
{
|
||||||
|
Gizmos.color = new Color(0.3f, 0.3f, 0.8f, 0.4f);
|
||||||
|
Gizmos.DrawSphere(transform.position, AttackRange);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 4c70370426e4457aa9a56c77689158ff
|
||||||
|
timeCreated: 1763228955
|
||||||
@@ -1,8 +1,15 @@
|
|||||||
|
using System;
|
||||||
|
using Code.Gameplay.Character.Core;
|
||||||
|
using Cysharp.Threading.Tasks;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
namespace Code.Gameplay.Player
|
namespace Code.Gameplay.Player
|
||||||
{
|
{
|
||||||
public interface IPlayerFactory
|
public interface IPlayerFactory
|
||||||
{
|
{
|
||||||
PlayerHealth CreatePlayerHealth(int count = -1);
|
PlayerHealth CreatePlayerHealth(int count = -1);
|
||||||
PlayerMoney CreatePlayerMoney(int count = 0);
|
PlayerMoney CreatePlayerMoney(int count = 0);
|
||||||
|
UniTask<CharacterProvider> CreatePlayer();
|
||||||
|
void ReleasePlayer(CharacterProvider characterProvider);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
using Code.Gameplay.Character.Core;
|
||||||
|
|
||||||
|
namespace Code.Gameplay.Player
|
||||||
|
{
|
||||||
|
public interface IPlayerProvider
|
||||||
|
{
|
||||||
|
CharacterProvider Character { get; }
|
||||||
|
PlayerHealth Health { get; }
|
||||||
|
bool IsSpawned { get; }
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 8fdfaa773e8645d5a2d400c0317b9894
|
||||||
|
timeCreated: 1763237368
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
using KinematicCharacterController;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Code.Gameplay.Player
|
||||||
|
{
|
||||||
|
public class PlayerAnimator : MonoBehaviour
|
||||||
|
{
|
||||||
|
private static readonly int Velocity = Animator.StringToHash("Velocity");
|
||||||
|
|
||||||
|
[SerializeField] private Animator playerAnimator;
|
||||||
|
[SerializeField] private KinematicCharacterMotor kinematicCharacterMotor;
|
||||||
|
|
||||||
|
private void SetVelocity(float velocity)
|
||||||
|
{
|
||||||
|
playerAnimator.SetFloat(Velocity, velocity);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Update()
|
||||||
|
{
|
||||||
|
SetVelocity(kinematicCharacterMotor.Velocity.magnitude);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 2f94efbea729423596ee5c6ee2366c98
|
||||||
|
timeCreated: 1763220863
|
||||||
@@ -1,13 +1,21 @@
|
|||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using Code.Configs;
|
using Code.Configs;
|
||||||
|
using Code.Gameplay.Character.Core;
|
||||||
|
using Cysharp.Threading.Tasks;
|
||||||
using Reflex.Attributes;
|
using Reflex.Attributes;
|
||||||
|
using Reflex.Core;
|
||||||
|
using Reflex.Extensions;
|
||||||
|
using Reflex.Injectors;
|
||||||
|
using UnityEngine.AddressableAssets;
|
||||||
|
using UnityEngine.SceneManagement;
|
||||||
|
|
||||||
namespace Code.Gameplay.Player
|
namespace Code.Gameplay.Player
|
||||||
{
|
{
|
||||||
public class PlayerFactory : IPlayerFactory
|
public class PlayerFactory : IPlayerFactory
|
||||||
{
|
{
|
||||||
[Inject] PlayerConfig _playerConfig;
|
[Inject] PlayerConfig _playerConfig;
|
||||||
|
[Inject] private IPlayerProvider _playerProvider;
|
||||||
|
|
||||||
public PlayerHealth CreatePlayerHealth(int count = -1)
|
public PlayerHealth CreatePlayerHealth(int count = -1)
|
||||||
{
|
{
|
||||||
if (count < 0) count = _playerConfig.maxHealth;
|
if (count < 0) count = _playerConfig.maxHealth;
|
||||||
@@ -15,5 +23,24 @@ namespace Code.Gameplay.Player
|
|||||||
return new(count);
|
return new(count);
|
||||||
}
|
}
|
||||||
public PlayerMoney CreatePlayerMoney(int count = 0) => new(count);
|
public PlayerMoney CreatePlayerMoney(int count = 0) => new(count);
|
||||||
|
|
||||||
|
public async UniTask<CharacterProvider> CreatePlayer()
|
||||||
|
{
|
||||||
|
var go = await Addressables.InstantiateAsync(_playerConfig.characterPrefab).ToUniTask();
|
||||||
|
var provider = go.GetComponent<CharacterProvider>();
|
||||||
|
|
||||||
|
AttributeInjector.Inject(provider, Container.ProjectContainer);
|
||||||
|
AttributeInjector.Inject(provider.CustomCharacterController, Container.ProjectContainer);
|
||||||
|
|
||||||
|
((PlayerProvider)_playerProvider).SetPlayer(provider, _playerConfig);
|
||||||
|
|
||||||
|
return provider;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ReleasePlayer(CharacterProvider characterProvider)
|
||||||
|
{
|
||||||
|
((PlayerProvider)_playerProvider).ClearPlayer();
|
||||||
|
Addressables.ReleaseInstance(characterProvider.gameObject);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
using Code.Configs;
|
||||||
|
using Code.Gameplay.Character.Core;
|
||||||
|
|
||||||
|
namespace Code.Gameplay.Player
|
||||||
|
{
|
||||||
|
public class PlayerProvider : IPlayerProvider
|
||||||
|
{
|
||||||
|
public CharacterProvider Character { get; private set; }
|
||||||
|
|
||||||
|
public PlayerHealth Health { get; private set; }
|
||||||
|
|
||||||
|
public bool IsSpawned => Character != null;
|
||||||
|
|
||||||
|
internal void SetPlayer(CharacterProvider character, PlayerConfig config)
|
||||||
|
{
|
||||||
|
Character = character;
|
||||||
|
Health = new PlayerHealth(config.maxHealth);
|
||||||
|
}
|
||||||
|
|
||||||
|
internal void ClearPlayer()
|
||||||
|
{
|
||||||
|
Character = null;
|
||||||
|
Health = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 0dbe29c5f0e9431db8c8da25eeb8fa95
|
||||||
|
timeCreated: 1763237388
|
||||||
@@ -7,10 +7,12 @@ namespace Code.Scenes.SceneEnvironments
|
|||||||
public class GameplaySceneEnvironment : CurrentSceneEnvironment
|
public class GameplaySceneEnvironment : CurrentSceneEnvironment
|
||||||
{
|
{
|
||||||
[FormerlySerializedAs("sfxTarget")] public Transform debugSfxTarget;
|
[FormerlySerializedAs("sfxTarget")] public Transform debugSfxTarget;
|
||||||
|
public Transform playerSpawnPoint;
|
||||||
|
|
||||||
public void TransitVariables(GameplaySceneEnvironment env)
|
public void TransitVariables(GameplaySceneEnvironment env)
|
||||||
{
|
{
|
||||||
debugSfxTarget = env.debugSfxTarget;
|
debugSfxTarget = env.debugSfxTarget;
|
||||||
|
playerSpawnPoint = env.playerSpawnPoint;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,18 +1,21 @@
|
|||||||
|
using Code.Gameplay.Door;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.Serialization;
|
using UnityEngine.Experimental.GlobalIllumination;
|
||||||
|
|
||||||
namespace Code.Scenes.SceneEnvironments
|
namespace Code.Scenes.SceneEnvironments
|
||||||
{
|
{
|
||||||
[System.Serializable]
|
[System.Serializable]
|
||||||
public class MainMenuEnvironment : CurrentSceneEnvironment
|
public class MainMenuEnvironment : CurrentSceneEnvironment
|
||||||
{
|
{
|
||||||
public Transform cameraTarget;
|
|
||||||
public Transform cameraPosition;
|
public Transform cameraPosition;
|
||||||
|
public DamnDoor damnDoor;
|
||||||
|
public Light doorLight;
|
||||||
|
|
||||||
public void TransitVariables(MainMenuEnvironment env)
|
public void TransitVariables(MainMenuEnvironment env)
|
||||||
{
|
{
|
||||||
cameraTarget = env.cameraTarget;
|
|
||||||
cameraPosition = env.cameraPosition;
|
cameraPosition = env.cameraPosition;
|
||||||
|
damnDoor = env.damnDoor;
|
||||||
|
doorLight = env.doorLight;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -21,6 +21,9 @@ namespace Code.StaticData
|
|||||||
SFXListConfig SFXListConfig { get; }
|
SFXListConfig SFXListConfig { get; }
|
||||||
DispatcherSoundListConfig DispatcherSoundListConfig { get; }
|
DispatcherSoundListConfig DispatcherSoundListConfig { get; }
|
||||||
EnemiesSoundListConfig EnemiesSoundListConfig { get; }
|
EnemiesSoundListConfig EnemiesSoundListConfig { get; }
|
||||||
|
DrunkenGrandpaConfig DrunkenGrandpaConfig { get; }
|
||||||
|
CockroachConfig CockroachConfig { get; }
|
||||||
|
FogConfig FogConfig { get; }
|
||||||
void Load();
|
void Load();
|
||||||
Task<T> InstantiateAsset<T>(AssetReference assetReference) where T : Behaviour;
|
Task<T> InstantiateAsset<T>(AssetReference assetReference) where T : Behaviour;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,6 +20,9 @@ namespace Code.StaticData
|
|||||||
public SFXListConfig SFXListConfig { get; private set; }
|
public SFXListConfig SFXListConfig { get; private set; }
|
||||||
public DispatcherSoundListConfig DispatcherSoundListConfig { get; private set; }
|
public DispatcherSoundListConfig DispatcherSoundListConfig { get; private set; }
|
||||||
public EnemiesSoundListConfig EnemiesSoundListConfig { get; private set; }
|
public EnemiesSoundListConfig EnemiesSoundListConfig { get; private set; }
|
||||||
|
public DrunkenGrandpaConfig DrunkenGrandpaConfig {get; private set;}
|
||||||
|
public CockroachConfig CockroachConfig { get; private set; }
|
||||||
|
public FogConfig FogConfig { get; private set; }
|
||||||
|
|
||||||
public void Load()
|
public void Load()
|
||||||
{
|
{
|
||||||
@@ -31,6 +34,7 @@ namespace Code.StaticData
|
|||||||
PlayerConfig = Resources.Load<PlayerConfig>(string.Format(StringPaths.ConfigSingle, "App", "PlayerConfig"));
|
PlayerConfig = Resources.Load<PlayerConfig>(string.Format(StringPaths.ConfigSingle, "App", "PlayerConfig"));
|
||||||
|
|
||||||
LoadAudioConfigs();
|
LoadAudioConfigs();
|
||||||
|
LoadEnemiesConfigs();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void LoadAudioConfigs()
|
private void LoadAudioConfigs()
|
||||||
@@ -42,6 +46,13 @@ namespace Code.StaticData
|
|||||||
EnemiesSoundListConfig = Resources.Load<EnemiesSoundListConfig>(string.Format(StringPaths.ConfigSingle, "Audio", "EnemiesSoundListConfig"));
|
EnemiesSoundListConfig = Resources.Load<EnemiesSoundListConfig>(string.Format(StringPaths.ConfigSingle, "Audio", "EnemiesSoundListConfig"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void LoadEnemiesConfigs()
|
||||||
|
{
|
||||||
|
DrunkenGrandpaConfig = Resources.Load<DrunkenGrandpaConfig>(string.Format(StringPaths.ConfigSingle, "Enemies", "DrunkenGrandpaConfig"));
|
||||||
|
CockroachConfig = Resources.Load<CockroachConfig>(string.Format(StringPaths.ConfigSingle, "Enemies", "CockroachConfig"));
|
||||||
|
FogConfig = Resources.Load<FogConfig>(string.Format(StringPaths.ConfigSingle, "Enemies", "FogConfig"));
|
||||||
|
}
|
||||||
|
|
||||||
public async Task<T> InstantiateAsset<T>(AssetReference assetReference) where T : Behaviour
|
public async Task<T> InstantiateAsset<T>(AssetReference assetReference) where T : Behaviour
|
||||||
{
|
{
|
||||||
return (await Addressables.InstantiateAsync(assetReference).ToUniTask()).GetComponent<T>();
|
return (await Addressables.InstantiateAsync(assetReference).ToUniTask()).GetComponent<T>();
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 14bf9dd380324bf49ea98fbeb8c94186
|
||||||
|
timeCreated: 1763550884
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
using System;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.EventSystems;
|
||||||
|
using UnityEngine.UI;
|
||||||
|
|
||||||
|
namespace Code.UI.Panels.Etc
|
||||||
|
{
|
||||||
|
public class HoverButton : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
|
||||||
|
{
|
||||||
|
public Button button;
|
||||||
|
public Action OnPointerEnterEvent, OnPointerExitEvent;
|
||||||
|
|
||||||
|
public void OnPointerEnter(PointerEventData eventData) => OnPointerEnterEvent?.Invoke();
|
||||||
|
public void OnPointerExit(PointerEventData eventData) => OnPointerExitEvent?.Invoke();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f97de34a1f6042128921ad728f153909
|
||||||
|
timeCreated: 1763550895
|
||||||
@@ -1,12 +1,22 @@
|
|||||||
using UnityEngine;
|
using Code.Gameplay.Door;
|
||||||
using UnityEngine.UI;
|
using Code.UI.Panels.Etc;
|
||||||
|
|
||||||
namespace Code.UI
|
namespace Code.UI.Panels
|
||||||
{
|
{
|
||||||
public class MainMenuPanel : UIElement
|
public class MainMenuPanel : UIElement
|
||||||
{
|
{
|
||||||
public Button startButton;
|
public HoverButton startButton;
|
||||||
public Button exitButton;
|
public HoverButton exitButton;
|
||||||
|
public CinematicDoorOpening CinematicDoorOpening;
|
||||||
|
|
||||||
|
public void Start()
|
||||||
|
{
|
||||||
|
startButton.OnPointerEnterEvent = OpenStart;
|
||||||
|
exitButton.OnPointerEnterEvent = OpenExit;
|
||||||
|
startButton.OnPointerExitEvent = CloseDoor;
|
||||||
|
exitButton.OnPointerExitEvent = CloseDoor;
|
||||||
|
}
|
||||||
|
|
||||||
public override void Show()
|
public override void Show()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
@@ -14,5 +24,18 @@ namespace Code.UI
|
|||||||
public override void Hide()
|
public override void Hide()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void OpenExit()
|
||||||
|
{
|
||||||
|
CinematicDoorOpening.PreOpen(false);
|
||||||
|
}
|
||||||
|
private void OpenStart()
|
||||||
|
{
|
||||||
|
CinematicDoorOpening.PreOpen(true);
|
||||||
|
}
|
||||||
|
private void CloseDoor()
|
||||||
|
{
|
||||||
|
CinematicDoorOpening.Close();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -52,6 +52,39 @@ AudioMixerEffectController:
|
|||||||
m_SendTarget: {fileID: 0}
|
m_SendTarget: {fileID: 0}
|
||||||
m_EnableWetMix: 0
|
m_EnableWetMix: 0
|
||||||
m_Bypass: 0
|
m_Bypass: 0
|
||||||
|
--- !u!245 &-5566153147845745614
|
||||||
|
AudioMixerSnapshotController:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: Menu
|
||||||
|
m_AudioMixer: {fileID: 24100000}
|
||||||
|
m_SnapshotID: ae02c0612d44bfd459883c67f6dab857
|
||||||
|
m_FloatValues:
|
||||||
|
b9fc0df121fe7134e9cbd35aa5a65755: 0.10800299
|
||||||
|
ddab7e07de3c686e296ff10b1cd77a47: -80
|
||||||
|
dd0b3fe80d006124baa36e791e6953f0: -80
|
||||||
|
m_TransitionOverrides: {}
|
||||||
|
--- !u!243 &-5282050360126310577
|
||||||
|
AudioMixerGroupController:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: Menu
|
||||||
|
m_AudioMixer: {fileID: 24100000}
|
||||||
|
m_GroupID: af6d3dead2e9e4848a2ca2fa55634108
|
||||||
|
m_Children: []
|
||||||
|
m_Volume: b9fc0df121fe7134e9cbd35aa5a65755
|
||||||
|
m_Pitch: 3cdebfce079b3864f93ef55f8bc453ae
|
||||||
|
m_Send: 00000000000000000000000000000000
|
||||||
|
m_Effects:
|
||||||
|
- {fileID: 5712107256638894671}
|
||||||
|
m_UserColorIndex: 0
|
||||||
|
m_Mute: 0
|
||||||
|
m_Solo: 0
|
||||||
|
m_BypassEffects: 0
|
||||||
--- !u!243 &-4235790927912365957
|
--- !u!243 &-4235790927912365957
|
||||||
AudioMixerGroupController:
|
AudioMixerGroupController:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -64,6 +97,7 @@ AudioMixerGroupController:
|
|||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 1469200815455588746}
|
- {fileID: 1469200815455588746}
|
||||||
- {fileID: 9214955797390454771}
|
- {fileID: 9214955797390454771}
|
||||||
|
- {fileID: -5282050360126310577}
|
||||||
m_Volume: 4c469b14481ac855fb9fb2989e6e6b94
|
m_Volume: 4c469b14481ac855fb9fb2989e6e6b94
|
||||||
m_Pitch: f5433a3ce2d2313f2b2d52521d9fa5bd
|
m_Pitch: f5433a3ce2d2313f2b2d52521d9fa5bd
|
||||||
m_Send: 00000000000000000000000000000000
|
m_Send: 00000000000000000000000000000000
|
||||||
@@ -119,6 +153,7 @@ AudioMixerSnapshotController:
|
|||||||
m_AudioMixer: {fileID: 24100000}
|
m_AudioMixer: {fileID: 24100000}
|
||||||
m_SnapshotID: 6d6b0cfa14637d5f0a34277934971c34
|
m_SnapshotID: 6d6b0cfa14637d5f0a34277934971c34
|
||||||
m_FloatValues:
|
m_FloatValues:
|
||||||
|
b9fc0df121fe7134e9cbd35aa5a65755: -80
|
||||||
ddab7e07de3c686e296ff10b1cd77a47: -80
|
ddab7e07de3c686e296ff10b1cd77a47: -80
|
||||||
m_TransitionOverrides: {}
|
m_TransitionOverrides: {}
|
||||||
--- !u!241 &24100000
|
--- !u!241 &24100000
|
||||||
@@ -134,6 +169,7 @@ AudioMixerController:
|
|||||||
- {fileID: 8341788112416184532}
|
- {fileID: 8341788112416184532}
|
||||||
- {fileID: -1214924791136564940}
|
- {fileID: -1214924791136564940}
|
||||||
- {fileID: 24500006}
|
- {fileID: 24500006}
|
||||||
|
- {fileID: -5566153147845745614}
|
||||||
m_StartSnapshot: {fileID: 8341788112416184532}
|
m_StartSnapshot: {fileID: 8341788112416184532}
|
||||||
m_SuspendThreshold: -80
|
m_SuspendThreshold: -80
|
||||||
m_EnableSuspend: 1
|
m_EnableSuspend: 1
|
||||||
@@ -150,9 +186,10 @@ AudioMixerController:
|
|||||||
- 9bd058bbb94358d33a130fd50e352c2d
|
- 9bd058bbb94358d33a130fd50e352c2d
|
||||||
- e04cdd7cb505ba69ea76a16038de727a
|
- e04cdd7cb505ba69ea76a16038de727a
|
||||||
- 9eb64ac0ca0e2f1098eafbba1f9633f5
|
- 9eb64ac0ca0e2f1098eafbba1f9633f5
|
||||||
|
- af6d3dead2e9e4848a2ca2fa55634108
|
||||||
name: View
|
name: View
|
||||||
m_CurrentViewIndex: 0
|
m_CurrentViewIndex: 0
|
||||||
m_TargetSnapshot: {fileID: -1214924791136564940}
|
m_TargetSnapshot: {fileID: -5566153147845745614}
|
||||||
--- !u!243 &24300002
|
--- !u!243 &24300002
|
||||||
AudioMixerGroupController:
|
AudioMixerGroupController:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -199,6 +236,7 @@ AudioMixerSnapshotController:
|
|||||||
m_AudioMixer: {fileID: 24100000}
|
m_AudioMixer: {fileID: 24100000}
|
||||||
m_SnapshotID: bdbaa2a61b8857f568cd42dafa5c4811
|
m_SnapshotID: bdbaa2a61b8857f568cd42dafa5c4811
|
||||||
m_FloatValues:
|
m_FloatValues:
|
||||||
|
b9fc0df121fe7134e9cbd35aa5a65755: -80
|
||||||
dd0b3fe80d006124baa36e791e6953f0: -80
|
dd0b3fe80d006124baa36e791e6953f0: -80
|
||||||
m_TransitionOverrides: {}
|
m_TransitionOverrides: {}
|
||||||
--- !u!244 &671806689151419646
|
--- !u!244 &671806689151419646
|
||||||
@@ -272,6 +310,20 @@ AudioMixerGroupController:
|
|||||||
m_Mute: 0
|
m_Mute: 0
|
||||||
m_Solo: 0
|
m_Solo: 0
|
||||||
m_BypassEffects: 0
|
m_BypassEffects: 0
|
||||||
|
--- !u!244 &5712107256638894671
|
||||||
|
AudioMixerEffectController:
|
||||||
|
m_ObjectHideFlags: 3
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name:
|
||||||
|
m_EffectID: 8d1dc8039a4095e439a61f34c4e7f3a6
|
||||||
|
m_EffectName: Attenuation
|
||||||
|
m_MixLevel: fdc182acd523a7247a98663cce44aca2
|
||||||
|
m_Parameters: []
|
||||||
|
m_SendTarget: {fileID: 0}
|
||||||
|
m_EnableWetMix: 0
|
||||||
|
m_Bypass: 0
|
||||||
--- !u!244 &5996723691131988381
|
--- !u!244 &5996723691131988381
|
||||||
AudioMixerEffectController:
|
AudioMixerEffectController:
|
||||||
m_ObjectHideFlags: 3
|
m_ObjectHideFlags: 3
|
||||||
|
|||||||
@@ -13,3 +13,9 @@ MonoBehaviour:
|
|||||||
m_Name: PlayerConfig
|
m_Name: PlayerConfig
|
||||||
m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.PlayerConfig
|
m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.PlayerConfig
|
||||||
maxHealth: 4
|
maxHealth: 4
|
||||||
|
characterPrefab:
|
||||||
|
m_AssetGUID: 81844a99f5b786b41b831174f8fb6d3a
|
||||||
|
m_SubObjectName:
|
||||||
|
m_SubObjectType:
|
||||||
|
m_SubObjectGUID:
|
||||||
|
m_EditorAssetChanged: 0
|
||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 9ce1e20f4ee9be6709bf9022546bcb07
|
guid: 9dec9aa8ce6e1be92b7f1daeffd7a9b6
|
||||||
folderAsset: yes
|
folderAsset: yes
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
%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: 7bc162d3127949aa950d0738beee99a4, type: 3}
|
||||||
|
m_Name: CockroachConfig
|
||||||
|
m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.CockroachConfig
|
||||||
|
cockroachPrefab:
|
||||||
|
m_AssetGUID:
|
||||||
|
m_SubObjectName:
|
||||||
|
m_SubObjectType:
|
||||||
|
m_SubObjectGUID:
|
||||||
|
m_EditorAssetChanged: 0
|
||||||
|
damage: 2
|
||||||
|
attackCooldown: 1.5
|
||||||
|
detectionRange: 20
|
||||||
|
attackRange: 1.3
|
||||||
|
speed: 6
|
||||||
|
isStunnable: 0
|
||||||
|
stunDuration: 0
|
||||||
|
usesIdleMovement: 1
|
||||||
|
idleWanderRadius: 3
|
||||||
|
idleMoveDurationMin: 0.3
|
||||||
|
idleMoveDurationMax: 1
|
||||||
|
idlePauseDurationMin: 0.1
|
||||||
|
idlePauseDurationMax: 0.8
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ac804127a406a864f8c178cd56e2b210
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
%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: 4d157e8891074b90957a7434cff0ae71, type: 3}
|
||||||
|
m_Name: DrunkenGrandpaConfig
|
||||||
|
m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.DrunkenGrandpaConfig
|
||||||
|
drunkenGrandpaPrefab:
|
||||||
|
m_AssetGUID:
|
||||||
|
m_SubObjectName:
|
||||||
|
m_SubObjectType:
|
||||||
|
m_SubObjectGUID:
|
||||||
|
m_EditorAssetChanged: 0
|
||||||
|
damage: 2
|
||||||
|
attackCooldown: 5
|
||||||
|
detectionRange: 10
|
||||||
|
attackRange: 1.5
|
||||||
|
speed: 3
|
||||||
|
isStunnable: 1
|
||||||
|
stunDuration: 3
|
||||||
|
usesIdleMovement: 1
|
||||||
|
idleWanderRadius: 5
|
||||||
|
idleMoveDurationMin: 1
|
||||||
|
idleMoveDurationMax: 5
|
||||||
|
idlePauseDurationMin: 3
|
||||||
|
idlePauseDurationMax: 5
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: fd5e843255fee395ea687b9d5ad5741d
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
%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: aa4dd2a5cce24902a2918488b5751f2f, type: 3}
|
||||||
|
m_Name: FogConfig
|
||||||
|
m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.FogConfig
|
||||||
|
fogPrefab:
|
||||||
|
m_AssetGUID:
|
||||||
|
m_SubObjectName:
|
||||||
|
m_SubObjectType:
|
||||||
|
m_SubObjectGUID:
|
||||||
|
m_EditorAssetChanged: 0
|
||||||
|
damage: 2147483647
|
||||||
|
attackCooldown: 0
|
||||||
|
detectionRange: 0
|
||||||
|
attackRange: 5
|
||||||
|
speed: 1.5
|
||||||
|
isStunnable: 0
|
||||||
|
stunDuration: 0
|
||||||
|
usesIdleMovement: 0
|
||||||
|
idleWanderRadius: 0
|
||||||
|
idleMoveDurationMin: 0
|
||||||
|
idleMoveDurationMax: 0
|
||||||
|
idlePauseDurationMin: 0
|
||||||
|
idlePauseDurationMax: 0
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 367017c1e176ddbbd9135cb82dbd94d2
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ea834c69fe90d8e49bad8e442f6c6c10
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,143 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &-6588756662626244699
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 11
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion
|
||||||
|
version: 10
|
||||||
|
--- !u!21 &2100000
|
||||||
|
Material:
|
||||||
|
serializedVersion: 8
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: BrokenGlass
|
||||||
|
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
|
||||||
|
m_Parent: {fileID: 0}
|
||||||
|
m_ModifiedSerializedProperties: 0
|
||||||
|
m_ValidKeywords:
|
||||||
|
- _ALPHAPREMULTIPLY_ON
|
||||||
|
- _METALLICSPECGLOSSMAP
|
||||||
|
- _NORMALMAP
|
||||||
|
- _SURFACE_TYPE_TRANSPARENT
|
||||||
|
m_InvalidKeywords: []
|
||||||
|
m_LightmapFlags: 4
|
||||||
|
m_EnableInstancingVariants: 0
|
||||||
|
m_DoubleSidedGI: 0
|
||||||
|
m_CustomRenderQueue: 3000
|
||||||
|
stringTagMap:
|
||||||
|
RenderType: Transparent
|
||||||
|
disabledShaderPasses:
|
||||||
|
- MOTIONVECTORS
|
||||||
|
- DepthOnly
|
||||||
|
- SHADOWCASTER
|
||||||
|
m_LockedProperties:
|
||||||
|
m_SavedProperties:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TexEnvs:
|
||||||
|
- _BaseMap:
|
||||||
|
m_Texture: {fileID: 2800000, guid: 99173a3d6c57b684092fd9337698a8ca, type: 3}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _BumpMap:
|
||||||
|
m_Texture: {fileID: 2800000, guid: 3509dc26fef37ae428cc161123fee273, type: 3}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailAlbedoMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailMask:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailNormalMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _EmissionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MainTex:
|
||||||
|
m_Texture: {fileID: 2800000, guid: 99173a3d6c57b684092fd9337698a8ca, type: 3}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MetallicGlossMap:
|
||||||
|
m_Texture: {fileID: 2800000, guid: 83f28ba9fdcc0b4409c68035e86b1ba7, type: 3}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _OcclusionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _ParallaxMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _SpecGlossMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- unity_Lightmaps:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- unity_LightmapsInd:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- unity_ShadowMasks:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
m_Ints: []
|
||||||
|
m_Floats:
|
||||||
|
- _AddPrecomputedVelocity: 0
|
||||||
|
- _AlphaClip: 0
|
||||||
|
- _AlphaToMask: 0
|
||||||
|
- _Blend: 0
|
||||||
|
- _BlendModePreserveSpecular: 1
|
||||||
|
- _BumpScale: 1
|
||||||
|
- _ClearCoatMask: 0
|
||||||
|
- _ClearCoatSmoothness: 0
|
||||||
|
- _Cull: 2
|
||||||
|
- _Cutoff: 0.5
|
||||||
|
- _DetailAlbedoMapScale: 1
|
||||||
|
- _DetailNormalMapScale: 1
|
||||||
|
- _DstBlend: 10
|
||||||
|
- _DstBlendAlpha: 10
|
||||||
|
- _EnvironmentReflections: 1
|
||||||
|
- _GlossMapScale: 0
|
||||||
|
- _Glossiness: 0
|
||||||
|
- _GlossyReflections: 0
|
||||||
|
- _Metallic: 0
|
||||||
|
- _OcclusionStrength: 1
|
||||||
|
- _Parallax: 0.005
|
||||||
|
- _QueueOffset: 0
|
||||||
|
- _ReceiveShadows: 1
|
||||||
|
- _Smoothness: 1
|
||||||
|
- _SmoothnessTextureChannel: 0
|
||||||
|
- _SpecularHighlights: 1
|
||||||
|
- _SrcBlend: 1
|
||||||
|
- _SrcBlendAlpha: 1
|
||||||
|
- _Surface: 1
|
||||||
|
- _WorkflowMode: 1
|
||||||
|
- _XRMotionVectorsPass: 1
|
||||||
|
- _ZWrite: 0
|
||||||
|
m_Colors:
|
||||||
|
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
|
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||||
|
m_BuildTextureStacks: []
|
||||||
|
m_AllowLocking: 1
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 81aeb792a79652a4eb63f1c13b35df81
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 2100000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
@@ -0,0 +1,117 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 99173a3d6c57b684092fd9337698a8ca
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 13
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 1
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
flipGreenChannel: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
vTOnly: 0
|
||||||
|
ignoreMipmapLimit: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 1
|
||||||
|
aniso: 1
|
||||||
|
mipBias: 0
|
||||||
|
wrapU: 0
|
||||||
|
wrapV: 0
|
||||||
|
wrapW: 0
|
||||||
|
nPOTScale: 1
|
||||||
|
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: 0
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 0
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
flipbookRows: 1
|
||||||
|
flipbookColumns: 1
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
ignorePngGamma: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
swizzle: 50462976
|
||||||
|
cookieLightType: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
customData:
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spriteCustomMetadata:
|
||||||
|
entries: []
|
||||||
|
nameFileIdTable: {}
|
||||||
|
mipmapLimitGroupName:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
+117
@@ -0,0 +1,117 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 83f28ba9fdcc0b4409c68035e86b1ba7
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 13
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 1
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
flipGreenChannel: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
vTOnly: 0
|
||||||
|
ignoreMipmapLimit: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 1
|
||||||
|
aniso: 1
|
||||||
|
mipBias: 0
|
||||||
|
wrapU: 0
|
||||||
|
wrapV: 0
|
||||||
|
wrapW: 0
|
||||||
|
nPOTScale: 1
|
||||||
|
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: 0
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 0
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
flipbookRows: 1
|
||||||
|
flipbookColumns: 1
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
ignorePngGamma: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
swizzle: 50462976
|
||||||
|
cookieLightType: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
customData:
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spriteCustomMetadata:
|
||||||
|
entries: []
|
||||||
|
nameFileIdTable: {}
|
||||||
|
mipmapLimitGroupName:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
@@ -0,0 +1,117 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 3509dc26fef37ae428cc161123fee273
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 13
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 1
|
||||||
|
sRGBTexture: 0
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
flipGreenChannel: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
vTOnly: 0
|
||||||
|
ignoreMipmapLimit: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 1
|
||||||
|
aniso: 1
|
||||||
|
mipBias: 0
|
||||||
|
wrapU: 0
|
||||||
|
wrapV: 0
|
||||||
|
wrapW: 0
|
||||||
|
nPOTScale: 1
|
||||||
|
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: 0
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 1
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
flipbookRows: 1
|
||||||
|
flipbookColumns: 1
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
ignorePngGamma: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
swizzle: 50462976
|
||||||
|
cookieLightType: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
customData:
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spriteCustomMetadata:
|
||||||
|
entries: []
|
||||||
|
nameFileIdTable: {}
|
||||||
|
mipmapLimitGroupName:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
@@ -0,0 +1,117 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 3ee47ed90e9fd6544a0d73d346d961bd
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 13
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 1
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
flipGreenChannel: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
vTOnly: 0
|
||||||
|
ignoreMipmapLimit: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 1
|
||||||
|
aniso: 1
|
||||||
|
mipBias: 0
|
||||||
|
wrapU: 0
|
||||||
|
wrapV: 0
|
||||||
|
wrapW: 0
|
||||||
|
nPOTScale: 1
|
||||||
|
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: 0
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 0
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
flipbookRows: 1
|
||||||
|
flipbookColumns: 1
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
ignorePngGamma: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
swizzle: 50462976
|
||||||
|
cookieLightType: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
customData:
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spriteCustomMetadata:
|
||||||
|
entries: []
|
||||||
|
nameFileIdTable: {}
|
||||||
|
mipmapLimitGroupName:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: d1a116be9de56ab478b336f2f9bf71fd
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,145 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &-7087650524991133240
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 11
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion
|
||||||
|
version: 10
|
||||||
|
--- !u!21 &2100000
|
||||||
|
Material:
|
||||||
|
serializedVersion: 8
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: CeilingLight
|
||||||
|
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
|
||||||
|
m_Parent: {fileID: 0}
|
||||||
|
m_ModifiedSerializedProperties: 0
|
||||||
|
m_ValidKeywords:
|
||||||
|
- _ALPHAPREMULTIPLY_ON
|
||||||
|
- _ALPHATEST_ON
|
||||||
|
- _EMISSION
|
||||||
|
- _METALLICSPECGLOSSMAP
|
||||||
|
- _NORMALMAP
|
||||||
|
- _SURFACE_TYPE_TRANSPARENT
|
||||||
|
m_InvalidKeywords: []
|
||||||
|
m_LightmapFlags: 1
|
||||||
|
m_EnableInstancingVariants: 0
|
||||||
|
m_DoubleSidedGI: 0
|
||||||
|
m_CustomRenderQueue: 3000
|
||||||
|
stringTagMap:
|
||||||
|
RenderType: Transparent
|
||||||
|
disabledShaderPasses:
|
||||||
|
- MOTIONVECTORS
|
||||||
|
- DepthOnly
|
||||||
|
- SHADOWCASTER
|
||||||
|
m_LockedProperties:
|
||||||
|
m_SavedProperties:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TexEnvs:
|
||||||
|
- _BaseMap:
|
||||||
|
m_Texture: {fileID: 2800000, guid: b881f58eda49f62478fc9af73b2e5c1c, type: 3}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _BumpMap:
|
||||||
|
m_Texture: {fileID: 2800000, guid: d2bfd34eeb9004547b0360fcbe07105e, type: 3}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailAlbedoMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailMask:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailNormalMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _EmissionMap:
|
||||||
|
m_Texture: {fileID: 2800000, guid: 7b926c2412eb5954496c1c8452d605a5, type: 3}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MainTex:
|
||||||
|
m_Texture: {fileID: 2800000, guid: b881f58eda49f62478fc9af73b2e5c1c, type: 3}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MetallicGlossMap:
|
||||||
|
m_Texture: {fileID: 2800000, guid: e5019b64e8028884c94845040087787a, type: 3}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _OcclusionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _ParallaxMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _SpecGlossMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- unity_Lightmaps:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- unity_LightmapsInd:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- unity_ShadowMasks:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
m_Ints: []
|
||||||
|
m_Floats:
|
||||||
|
- _AddPrecomputedVelocity: 0
|
||||||
|
- _AlphaClip: 1
|
||||||
|
- _AlphaToMask: 0
|
||||||
|
- _Blend: 0
|
||||||
|
- _BlendModePreserveSpecular: 1
|
||||||
|
- _BumpScale: 1
|
||||||
|
- _ClearCoatMask: 0
|
||||||
|
- _ClearCoatSmoothness: 0
|
||||||
|
- _Cull: 2
|
||||||
|
- _Cutoff: 0.5
|
||||||
|
- _DetailAlbedoMapScale: 1
|
||||||
|
- _DetailNormalMapScale: 1
|
||||||
|
- _DstBlend: 10
|
||||||
|
- _DstBlendAlpha: 10
|
||||||
|
- _EnvironmentReflections: 1
|
||||||
|
- _GlossMapScale: 0
|
||||||
|
- _Glossiness: 0
|
||||||
|
- _GlossyReflections: 0
|
||||||
|
- _Metallic: 0
|
||||||
|
- _OcclusionStrength: 1
|
||||||
|
- _Parallax: 0.005
|
||||||
|
- _QueueOffset: 0
|
||||||
|
- _ReceiveShadows: 1
|
||||||
|
- _Smoothness: 0.5
|
||||||
|
- _SmoothnessTextureChannel: 0
|
||||||
|
- _SpecularHighlights: 1
|
||||||
|
- _SrcBlend: 1
|
||||||
|
- _SrcBlendAlpha: 1
|
||||||
|
- _Surface: 1
|
||||||
|
- _WorkflowMode: 1
|
||||||
|
- _XRMotionVectorsPass: 1
|
||||||
|
- _ZWrite: 0
|
||||||
|
m_Colors:
|
||||||
|
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
- _EmissionColor: {r: 19.468575, g: 19.468575, b: 19.468575, a: 1}
|
||||||
|
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||||
|
m_BuildTextureStacks: []
|
||||||
|
m_AllowLocking: 1
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 2253ec50ce35f2049a05c74de63bac61
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 2100000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,141 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &-4673831484392324216
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 11
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion
|
||||||
|
version: 10
|
||||||
|
--- !u!21 &2100000
|
||||||
|
Material:
|
||||||
|
serializedVersion: 8
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: CeilingLightTransparency
|
||||||
|
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
|
||||||
|
m_Parent: {fileID: 0}
|
||||||
|
m_ModifiedSerializedProperties: 0
|
||||||
|
m_ValidKeywords:
|
||||||
|
- _ALPHAPREMULTIPLY_ON
|
||||||
|
- _SURFACE_TYPE_TRANSPARENT
|
||||||
|
m_InvalidKeywords: []
|
||||||
|
m_LightmapFlags: 4
|
||||||
|
m_EnableInstancingVariants: 0
|
||||||
|
m_DoubleSidedGI: 0
|
||||||
|
m_CustomRenderQueue: 3000
|
||||||
|
stringTagMap:
|
||||||
|
RenderType: Transparent
|
||||||
|
disabledShaderPasses:
|
||||||
|
- MOTIONVECTORS
|
||||||
|
- DepthOnly
|
||||||
|
- SHADOWCASTER
|
||||||
|
m_LockedProperties:
|
||||||
|
m_SavedProperties:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TexEnvs:
|
||||||
|
- _BaseMap:
|
||||||
|
m_Texture: {fileID: 2800000, guid: c648e149cc3e5a54d89c335b99ea8f76, type: 3}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _BumpMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailAlbedoMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailMask:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailNormalMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _EmissionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MainTex:
|
||||||
|
m_Texture: {fileID: 2800000, guid: c648e149cc3e5a54d89c335b99ea8f76, type: 3}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MetallicGlossMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _OcclusionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _ParallaxMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _SpecGlossMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- unity_Lightmaps:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- unity_LightmapsInd:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- unity_ShadowMasks:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
m_Ints: []
|
||||||
|
m_Floats:
|
||||||
|
- _AddPrecomputedVelocity: 0
|
||||||
|
- _AlphaClip: 0
|
||||||
|
- _AlphaToMask: 0
|
||||||
|
- _Blend: 0
|
||||||
|
- _BlendModePreserveSpecular: 1
|
||||||
|
- _BumpScale: 1
|
||||||
|
- _ClearCoatMask: 0
|
||||||
|
- _ClearCoatSmoothness: 0
|
||||||
|
- _Cull: 2
|
||||||
|
- _Cutoff: 0.5
|
||||||
|
- _DetailAlbedoMapScale: 1
|
||||||
|
- _DetailNormalMapScale: 1
|
||||||
|
- _DstBlend: 10
|
||||||
|
- _DstBlendAlpha: 10
|
||||||
|
- _EnvironmentReflections: 1
|
||||||
|
- _GlossMapScale: 0
|
||||||
|
- _Glossiness: 0
|
||||||
|
- _GlossyReflections: 0
|
||||||
|
- _Metallic: 0
|
||||||
|
- _OcclusionStrength: 1
|
||||||
|
- _Parallax: 0.005
|
||||||
|
- _QueueOffset: 0
|
||||||
|
- _ReceiveShadows: 1
|
||||||
|
- _Smoothness: 0.5
|
||||||
|
- _SmoothnessTextureChannel: 0
|
||||||
|
- _SpecularHighlights: 1
|
||||||
|
- _SrcBlend: 1
|
||||||
|
- _SrcBlendAlpha: 1
|
||||||
|
- _Surface: 1
|
||||||
|
- _WorkflowMode: 1
|
||||||
|
- _XRMotionVectorsPass: 1
|
||||||
|
- _ZWrite: 0
|
||||||
|
m_Colors:
|
||||||
|
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
|
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||||
|
m_BuildTextureStacks: []
|
||||||
|
m_AllowLocking: 1
|
||||||
+8
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 134fccd9aec5516499dfa45c5177e043
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 2100000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,10 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 65472b6e73d45554aa1bf30e20d1a512
|
||||||
|
ScriptedImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}
|
||||||
@@ -0,0 +1,153 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!21 &2100000
|
||||||
|
Material:
|
||||||
|
serializedVersion: 8
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: New Material
|
||||||
|
m_Shader: {fileID: -6465566751694194690, guid: 65472b6e73d45554aa1bf30e20d1a512, type: 3}
|
||||||
|
m_Parent: {fileID: 0}
|
||||||
|
m_ModifiedSerializedProperties: 0
|
||||||
|
m_ValidKeywords: []
|
||||||
|
m_InvalidKeywords: []
|
||||||
|
m_LightmapFlags: 4
|
||||||
|
m_EnableInstancingVariants: 0
|
||||||
|
m_DoubleSidedGI: 0
|
||||||
|
m_CustomRenderQueue: -1
|
||||||
|
stringTagMap: {}
|
||||||
|
disabledShaderPasses:
|
||||||
|
- MOTIONVECTORS
|
||||||
|
m_LockedProperties:
|
||||||
|
m_SavedProperties:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TexEnvs:
|
||||||
|
- _Albedo:
|
||||||
|
m_Texture: {fileID: 2800000, guid: b881f58eda49f62478fc9af73b2e5c1c, type: 3}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _BaseMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _BumpMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailAlbedoMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailMask:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailNormalMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _EmissionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MainTex:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MetallicGlossMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _Normal:
|
||||||
|
m_Texture: {fileID: 2800000, guid: d2bfd34eeb9004547b0360fcbe07105e, type: 3}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _OcclusionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _ParallaxMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _Smoothness_1:
|
||||||
|
m_Texture: {fileID: 2800000, guid: e5019b64e8028884c94845040087787a, type: 3}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _SpecGlossMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _Transparency:
|
||||||
|
m_Texture: {fileID: 2800000, guid: c648e149cc3e5a54d89c335b99ea8f76, type: 3}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- unity_Lightmaps:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- unity_LightmapsInd:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- unity_ShadowMasks:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
m_Ints: []
|
||||||
|
m_Floats:
|
||||||
|
- _AddPrecomputedVelocity: 0
|
||||||
|
- _AlphaClip: 0
|
||||||
|
- _AlphaToMask: 0
|
||||||
|
- _Blend: 0
|
||||||
|
- _BlendModePreserveSpecular: 1
|
||||||
|
- _BumpScale: 1
|
||||||
|
- _ClearCoatMask: 0
|
||||||
|
- _ClearCoatSmoothness: 0
|
||||||
|
- _Cull: 2
|
||||||
|
- _Cutoff: 0.5
|
||||||
|
- _DetailAlbedoMapScale: 1
|
||||||
|
- _DetailNormalMapScale: 1
|
||||||
|
- _DstBlend: 0
|
||||||
|
- _DstBlendAlpha: 0
|
||||||
|
- _EnvironmentReflections: 1
|
||||||
|
- _GlossMapScale: 0
|
||||||
|
- _Glossiness: 0
|
||||||
|
- _GlossyReflections: 0
|
||||||
|
- _Metallic: 0.62
|
||||||
|
- _OcclusionStrength: 1
|
||||||
|
- _Parallax: 0.005
|
||||||
|
- _QueueControl: 0
|
||||||
|
- _QueueOffset: 0
|
||||||
|
- _ReceiveShadows: 1
|
||||||
|
- _Smoothness: 1
|
||||||
|
- _SmoothnessTextureChannel: 0
|
||||||
|
- _SpecularHighlights: 1
|
||||||
|
- _SrcBlend: 1
|
||||||
|
- _SrcBlendAlpha: 1
|
||||||
|
- _Surface: 0
|
||||||
|
- _WorkflowMode: 1
|
||||||
|
- _XRMotionVectorsPass: 1
|
||||||
|
- _ZWrite: 1
|
||||||
|
m_Colors:
|
||||||
|
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
|
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||||
|
m_BuildTextureStacks: []
|
||||||
|
m_AllowLocking: 1
|
||||||
|
--- !u!114 &8864355107947855378
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 11
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion
|
||||||
|
version: 10
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 897c962e38321f3568f82aa97b84baeb
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 2100000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
@@ -0,0 +1,117 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b881f58eda49f62478fc9af73b2e5c1c
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 13
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 1
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
flipGreenChannel: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
vTOnly: 0
|
||||||
|
ignoreMipmapLimit: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 0
|
||||||
|
aniso: 1
|
||||||
|
mipBias: 0
|
||||||
|
wrapU: 0
|
||||||
|
wrapV: 0
|
||||||
|
wrapW: 0
|
||||||
|
nPOTScale: 1
|
||||||
|
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: 0
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
flipbookRows: 1
|
||||||
|
flipbookColumns: 1
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
ignorePngGamma: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
swizzle: 50462976
|
||||||
|
cookieLightType: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
customData:
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spriteCustomMetadata:
|
||||||
|
entries: []
|
||||||
|
nameFileIdTable: {}
|
||||||
|
mipmapLimitGroupName:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Binary file not shown.
+117
@@ -0,0 +1,117 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 7b926c2412eb5954496c1c8452d605a5
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 13
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 1
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
flipGreenChannel: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
vTOnly: 0
|
||||||
|
ignoreMipmapLimit: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 1
|
||||||
|
aniso: 1
|
||||||
|
mipBias: 0
|
||||||
|
wrapU: 0
|
||||||
|
wrapV: 0
|
||||||
|
wrapW: 0
|
||||||
|
nPOTScale: 1
|
||||||
|
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: 0
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 0
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
flipbookRows: 1
|
||||||
|
flipbookColumns: 1
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
ignorePngGamma: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
swizzle: 50462976
|
||||||
|
cookieLightType: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
customData:
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spriteCustomMetadata:
|
||||||
|
entries: []
|
||||||
|
nameFileIdTable: {}
|
||||||
|
mipmapLimitGroupName:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
+117
@@ -0,0 +1,117 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: d2bfd34eeb9004547b0360fcbe07105e
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 13
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 1
|
||||||
|
sRGBTexture: 0
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
flipGreenChannel: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
vTOnly: 0
|
||||||
|
ignoreMipmapLimit: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 0
|
||||||
|
aniso: 1
|
||||||
|
mipBias: 0
|
||||||
|
wrapU: 0
|
||||||
|
wrapV: 0
|
||||||
|
wrapW: 0
|
||||||
|
nPOTScale: 1
|
||||||
|
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: 0
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 1
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
flipbookRows: 1
|
||||||
|
flipbookColumns: 1
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
ignorePngGamma: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
swizzle: 50462976
|
||||||
|
cookieLightType: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
customData:
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spriteCustomMetadata:
|
||||||
|
entries: []
|
||||||
|
nameFileIdTable: {}
|
||||||
|
mipmapLimitGroupName:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: b9aa5d66f355ccd2fa78b5dcb8221a32
|
guid: c648e149cc3e5a54d89c335b99ea8f76
|
||||||
TextureImporter:
|
TextureImporter:
|
||||||
internalIDToNameTable: []
|
internalIDToNameTable: []
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
Loaded 100 of 354 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user