Merge branch 'Dev' into Generator
This commit is contained in:
commit
abde1d5ba9
167 files changed
+22681
-826
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: f3899bd8b96717b1b70a2db310a9fcf2
|
Hash: 00000000000000000000000000000000
|
||||||
m_OptimizeCatalogSize: 0
|
m_OptimizeCatalogSize: 0
|
||||||
m_BuildRemoteCatalog: 0
|
m_BuildRemoteCatalog: 0
|
||||||
m_CatalogRequestsTimeout: 0
|
m_CatalogRequestsTimeout: 0
|
||||||
|
|||||||
@@ -62,6 +62,11 @@ MonoBehaviour:
|
|||||||
m_ReadOnly: 0
|
m_ReadOnly: 0
|
||||||
m_SerializedLabels: []
|
m_SerializedLabels: []
|
||||||
FlaggedDuringContentUpdateRestriction: 0
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 2ed2d93a9f39d4edba511cb7396c7bb6
|
||||||
|
m_Address: Assets/Resources_moved/Prefabs/Enemies/Cockroach.prefab
|
||||||
|
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
|
||||||
@@ -148,6 +153,11 @@ MonoBehaviour:
|
|||||||
m_ReadOnly: 0
|
m_ReadOnly: 0
|
||||||
m_SerializedLabels: []
|
m_SerializedLabels: []
|
||||||
FlaggedDuringContentUpdateRestriction: 0
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: b33855c694de89386a25c56cbe463a0e
|
||||||
|
m_Address: Assets/Resources_moved/Prefabs/Enemies/DrunkenGrandpa.prefab
|
||||||
|
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
|
||||||
@@ -168,6 +178,11 @@ MonoBehaviour:
|
|||||||
m_ReadOnly: 0
|
m_ReadOnly: 0
|
||||||
m_SerializedLabels: []
|
m_SerializedLabels: []
|
||||||
FlaggedDuringContentUpdateRestriction: 0
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: f3d7dc64b34919ad7b50a3dd307a935b
|
||||||
|
m_Address: Assets/Resources_moved/Prefabs/Enemies/Fog.prefab
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
- m_GUID: f74a409bf11b25148ad305acc05b14f5
|
- m_GUID: f74a409bf11b25148ad305acc05b14f5
|
||||||
m_Address: Audio/Dispatcher/take_damage2
|
m_Address: Audio/Dispatcher/take_damage2
|
||||||
m_ReadOnly: 0
|
m_ReadOnly: 0
|
||||||
|
|||||||
@@ -1,6 +1,3 @@
|
|||||||
using System.Globalization;
|
|
||||||
using System.Reflection.Emit;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Code.App.Loading;
|
using Code.App.Loading;
|
||||||
using Code.App.StateMachine;
|
using Code.App.StateMachine;
|
||||||
using Code.Audio;
|
using Code.Audio;
|
||||||
@@ -8,7 +5,6 @@ using Code.Gameplay.Camera;
|
|||||||
using Code.Gameplay.Camera.CameraStates;
|
using Code.Gameplay.Camera.CameraStates;
|
||||||
using Code.Gameplay.Character.Core;
|
using Code.Gameplay.Character.Core;
|
||||||
using Code.Gameplay.Orders.Order;
|
using Code.Gameplay.Orders.Order;
|
||||||
using Code.Gameplay.Orders.Order;
|
|
||||||
using Code.Gameplay.Player;
|
using Code.Gameplay.Player;
|
||||||
using Code.Input;
|
using Code.Input;
|
||||||
using Code.Scenes;
|
using Code.Scenes;
|
||||||
@@ -19,7 +15,6 @@ using Code.UI.Panels;
|
|||||||
using Cysharp.Threading.Tasks;
|
using Cysharp.Threading.Tasks;
|
||||||
using Reflex.Core;
|
using Reflex.Core;
|
||||||
using Reflex.Extensions;
|
using Reflex.Extensions;
|
||||||
using Reflex.Injectors;
|
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.InputSystem;
|
using UnityEngine.InputSystem;
|
||||||
using UnityEngine.SceneManagement;
|
using UnityEngine.SceneManagement;
|
||||||
@@ -28,30 +23,30 @@ namespace Code.App.AppStates
|
|||||||
{
|
{
|
||||||
public class GameplayState : BaseState<AppStateMachineContext>
|
public class GameplayState : BaseState<AppStateMachineContext>
|
||||||
{
|
{
|
||||||
|
|
||||||
private PlayerHealth _playerHealth;
|
private PlayerHealth _playerHealth;
|
||||||
private IPlayerScore _playerScore;
|
private IPlayerScore _playerScore;
|
||||||
|
|
||||||
private IOrderService _orderService;
|
private IOrderService _orderService;
|
||||||
|
|
||||||
private CharacterProvider _playerCharacter;
|
private CharacterProvider _playerCharacter;
|
||||||
|
|
||||||
public GameplayState(AppStateMachineContext context) : base(context)
|
public GameplayState(AppStateMachineContext context) : base(context)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void EnterState()
|
public override void EnterState()
|
||||||
{
|
{
|
||||||
|
Context.UIService.LoadingScreen.Show();
|
||||||
|
|
||||||
Context.LoadingManager
|
Context.LoadingManager
|
||||||
.RegisterLoading(LoadingWork.LoadScene)
|
.RegisterLoading(LoadingWork.LoadScene)
|
||||||
.RegisterLoading(LoadingWork.LoadUI)
|
.RegisterLoading(LoadingWork.LoadUI)
|
||||||
// .RegisterLoading(LoadingWork.LoadModelResource)
|
// .RegisterLoading(LoadingWork.LoadModelResource)
|
||||||
.RegisterLoading(LoadingWork.LoadAudio);
|
.RegisterLoading(LoadingWork.LoadAudio);
|
||||||
|
|
||||||
_playerHealth = Context.PlayerFactory.CreatePlayerHealth();
|
//_playerHealth = Context.PlayerFactory.CreatePlayerHealth();
|
||||||
|
|
||||||
_playerHealth.OnDamage += PlayerDamageTaken;
|
//_playerHealth.OnDamage += PlayerDamageTaken;
|
||||||
_playerHealth.OnDeath += EndGame;
|
//_playerHealth.OnDeath += EndGame;
|
||||||
|
|
||||||
Context.AudioService.TransitToSnapshot(AudioSnapshotState.None);
|
Context.AudioService.TransitToSnapshot(AudioSnapshotState.None);
|
||||||
|
|
||||||
@@ -78,7 +73,7 @@ namespace Code.App.AppStates
|
|||||||
Context.AudioFactory.WarmSFX(),
|
Context.AudioFactory.WarmSFX(),
|
||||||
Context.AudioFactory.WarmDispatcher()
|
Context.AudioFactory.WarmDispatcher()
|
||||||
);
|
);
|
||||||
|
|
||||||
Context.LoadingManager
|
Context.LoadingManager
|
||||||
.UnregisterLoading(LoadingWork.LoadUI)
|
.UnregisterLoading(LoadingWork.LoadUI)
|
||||||
.UnregisterLoading(LoadingWork.LoadAudio);
|
.UnregisterLoading(LoadingWork.LoadAudio);
|
||||||
@@ -101,6 +96,10 @@ namespace Code.App.AppStates
|
|||||||
WaitForPlayerCharacterLoad()
|
WaitForPlayerCharacterLoad()
|
||||||
);
|
);
|
||||||
|
|
||||||
|
_playerHealth = Context.PlayerProvider.Health;
|
||||||
|
_playerHealth.OnDamage += PlayerDamageTaken;
|
||||||
|
_playerHealth.OnDeath += EndGame;
|
||||||
|
|
||||||
Context.LoadingManager
|
Context.LoadingManager
|
||||||
.UnregisterLoading(LoadingWork.LoadModelResource);
|
.UnregisterLoading(LoadingWork.LoadModelResource);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -46,7 +46,8 @@ namespace Code.App.AppStates
|
|||||||
{
|
{
|
||||||
await UniTask.WhenAll(
|
await UniTask.WhenAll(
|
||||||
Context.UIService.AsyncSwitchPanelTo(UIPanel.MainMenu),
|
Context.UIService.AsyncSwitchPanelTo(UIPanel.MainMenu),
|
||||||
Context.AudioFactory.WarmMenuMusic()
|
Context.AudioFactory.WarmMenuMusic(),
|
||||||
|
Context.AudioFactory.WarmAudioTestClips()
|
||||||
);
|
);
|
||||||
Context.LoadingManager
|
Context.LoadingManager
|
||||||
.UnregisterLoading(LoadingWork.LoadUI)
|
.UnregisterLoading(LoadingWork.LoadUI)
|
||||||
@@ -98,6 +99,7 @@ namespace Code.App.AppStates
|
|||||||
menuPanel.exitButton.button.onClick.AddListener(ExitGame);
|
menuPanel.exitButton.button.onClick.AddListener(ExitGame);
|
||||||
|
|
||||||
mainMenuEnvironment.menuButtonsCanvas.worldCamera = Context.CameraStateMachine.Camera;
|
mainMenuEnvironment.menuButtonsCanvas.worldCamera = Context.CameraStateMachine.Camera;
|
||||||
|
mainMenuEnvironment.settingsCanvas.worldCamera = Context.CameraStateMachine.Camera;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void Tick()
|
public override void Tick()
|
||||||
@@ -120,6 +122,8 @@ namespace Code.App.AppStates
|
|||||||
Context.InputService.DisableMap(ActionMappings.MainMenu);
|
Context.InputService.DisableMap(ActionMappings.MainMenu);
|
||||||
Context.AudioService.GladlyAskToStopMusic(MusicType.Menu, callback: Context.AudioFactory.ReleaseMenuMusic);
|
Context.AudioService.GladlyAskToStopMusic(MusicType.Menu, callback: Context.AudioFactory.ReleaseMenuMusic);
|
||||||
|
|
||||||
|
Context.AudioFactory.ReleaseAudioTestClips();
|
||||||
|
Context.AudioFactory.ReleaseMenuMusic();
|
||||||
base.ExitState();
|
base.ExitState();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ using Code.Audio;
|
|||||||
using Code.Configs;
|
using Code.Configs;
|
||||||
using Code.Constants;
|
using Code.Constants;
|
||||||
using Code.Gameplay.Camera;
|
using Code.Gameplay.Camera;
|
||||||
|
using Code.Gameplay.Enemies;
|
||||||
using Code.Gameplay.Orders.Order;
|
using Code.Gameplay.Orders.Order;
|
||||||
using Code.Gameplay.Player;
|
using Code.Gameplay.Player;
|
||||||
using Code.Input;
|
using Code.Input;
|
||||||
@@ -31,8 +32,11 @@ namespace Code.App
|
|||||||
containerBuilder.AddSingleton(typeof(LoadingManager), typeof(ILoadingManager));
|
containerBuilder.AddSingleton(typeof(LoadingManager), typeof(ILoadingManager));
|
||||||
|
|
||||||
containerBuilder.AddSingleton(typeof(InputService), typeof(IInputService));
|
containerBuilder.AddSingleton(typeof(InputService), typeof(IInputService));
|
||||||
|
// Перенести нахуй в контейнер геймплея
|
||||||
containerBuilder.AddSingleton(typeof(PlayerFactory), typeof(IPlayerFactory));
|
containerBuilder.AddSingleton(typeof(PlayerFactory), typeof(IPlayerFactory));
|
||||||
|
containerBuilder.AddSingleton(typeof(EnemyFactory), typeof(IEnemyFactory));
|
||||||
|
containerBuilder.AddSingleton(typeof(PlayerProvider), typeof(IPlayerProvider));
|
||||||
|
//
|
||||||
InitializeCamera(containerBuilder, staticDataService);
|
InitializeCamera(containerBuilder, staticDataService);
|
||||||
|
|
||||||
containerBuilder.AddSingleton(typeof(UIFactory), typeof(IUIFactory));
|
containerBuilder.AddSingleton(typeof(UIFactory), typeof(IUIFactory));
|
||||||
@@ -84,8 +88,13 @@ namespace Code.App
|
|||||||
|
|
||||||
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.AudioTestClipsConfig, typeof(AudioTestClipsConfig));
|
||||||
containerBuilder.AddSingleton(staticDataService.SFXListConfig, typeof(SFXListConfig));
|
containerBuilder.AddSingleton(staticDataService.SFXListConfig, typeof(SFXListConfig));
|
||||||
containerBuilder.AddSingleton(staticDataService.DispatcherSoundListConfig, typeof(DispatcherSoundListConfig));
|
containerBuilder.AddSingleton(staticDataService.DispatcherSoundListConfig, typeof(DispatcherSoundListConfig));
|
||||||
containerBuilder.AddSingleton(staticDataService.EnemiesSoundListConfig, typeof(EnemiesSoundListConfig));
|
containerBuilder.AddSingleton(staticDataService.EnemiesSoundListConfig, typeof(EnemiesSoundListConfig));
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
using Code.App.Loading;
|
using Code.App.Loading;
|
||||||
using Code.Audio;
|
using Code.Audio;
|
||||||
using Code.Gameplay.Camera;
|
using Code.Gameplay.Camera;
|
||||||
|
using Code.Gameplay.Enemies;
|
||||||
using Code.Gameplay.Player;
|
using Code.Gameplay.Player;
|
||||||
using Code.Input;
|
using Code.Input;
|
||||||
using Code.Scenes;
|
using Code.Scenes;
|
||||||
@@ -18,7 +19,9 @@ 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; }
|
||||||
|
[Inject] public IEnemyFactory EnemyFactory { get; private set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
using Code.Configs;
|
using Code.Configs;
|
||||||
using Cysharp.Threading.Tasks;
|
using Cysharp.Threading.Tasks;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
@@ -15,6 +16,7 @@ namespace Code.Audio
|
|||||||
public AudioMixer AudioMixer { get; private set; }
|
public AudioMixer AudioMixer { get; private set; }
|
||||||
private AssetReference _audioSourcePrefab;
|
private AssetReference _audioSourcePrefab;
|
||||||
|
|
||||||
|
private AssetReference[] _audioTestClipsReferences;
|
||||||
private AssetReference[] _peacefulSoundtrack;
|
private AssetReference[] _peacefulSoundtrack;
|
||||||
private AssetReference[] _actionSoundtrack;
|
private AssetReference[] _actionSoundtrack;
|
||||||
private AssetReference[] _menuSoundtrack;
|
private AssetReference[] _menuSoundtrack;
|
||||||
@@ -23,6 +25,7 @@ namespace Code.Audio
|
|||||||
private AssetReference[] _dispatcher;
|
private AssetReference[] _dispatcher;
|
||||||
private AssetReference[] _character;
|
private AssetReference[] _character;
|
||||||
|
|
||||||
|
private AsyncOperationHandle<IList<AudioClip>> _audioTestClipsHandle;
|
||||||
private AsyncOperationHandle<IList<AudioClip>> _menuMusicHandle;
|
private AsyncOperationHandle<IList<AudioClip>> _menuMusicHandle;
|
||||||
private AsyncOperationHandle<IList<AudioClip>> _actionMusicHandle;
|
private AsyncOperationHandle<IList<AudioClip>> _actionMusicHandle;
|
||||||
private AsyncOperationHandle<IList<AudioClip>> _peacefulMusicHandle;
|
private AsyncOperationHandle<IList<AudioClip>> _peacefulMusicHandle;
|
||||||
@@ -30,6 +33,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 Dictionary<AudioType, AudioClip> AudioTestClips { get; private set; } = new();
|
||||||
public Dictionary<MusicType, List<AudioClip>> MusicDictionary { get; private set; } = new();
|
public Dictionary<MusicType, List<AudioClip>> MusicDictionary { 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();
|
||||||
@@ -39,7 +43,8 @@ namespace Code.Audio
|
|||||||
SoundtrackListConfig soundtrackListConfig,
|
SoundtrackListConfig soundtrackListConfig,
|
||||||
SFXListConfig sfxListConfig,
|
SFXListConfig sfxListConfig,
|
||||||
EnemiesSoundListConfig enemiesSoundListConfig,
|
EnemiesSoundListConfig enemiesSoundListConfig,
|
||||||
DispatcherSoundListConfig dispatcherSoundListConfig
|
DispatcherSoundListConfig dispatcherSoundListConfig,
|
||||||
|
AudioTestClipsConfig audioTestClipsConfig
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
AudioMixer = audioMixerConfig.audioMixerAsset;
|
AudioMixer = audioMixerConfig.audioMixerAsset;
|
||||||
@@ -51,6 +56,7 @@ namespace Code.Audio
|
|||||||
_SFX = sfxListConfig.SFX;
|
_SFX = sfxListConfig.SFX;
|
||||||
_enemies = enemiesSoundListConfig.enemies;
|
_enemies = enemiesSoundListConfig.enemies;
|
||||||
_dispatcher = dispatcherSoundListConfig.dispatcher;
|
_dispatcher = dispatcherSoundListConfig.dispatcher;
|
||||||
|
_audioTestClipsReferences = audioTestClipsConfig.audioTestClips;
|
||||||
|
|
||||||
MusicDictionary.Add(MusicType.Menu, new ());
|
MusicDictionary.Add(MusicType.Menu, new ());
|
||||||
MusicDictionary.Add(MusicType.Peaceful, new ());
|
MusicDictionary.Add(MusicType.Peaceful, new ());
|
||||||
@@ -77,12 +83,28 @@ namespace Code.Audio
|
|||||||
MusicDictionary[MusicType.Peaceful].Clear();
|
MusicDictionary[MusicType.Peaceful].Clear();
|
||||||
_peacefulMusicHandle.Release();
|
_peacefulMusicHandle.Release();
|
||||||
}
|
}
|
||||||
|
public async UniTask WarmAudioTestClips( )
|
||||||
|
{
|
||||||
|
// _audioTestClipCounter = 0;
|
||||||
|
_audioTestClipsHandle = Addressables.LoadAssetsAsync<AudioClip>(_audioTestClipsReferences, OnAudioTestClipLoaded, Addressables.MergeMode.Union);
|
||||||
|
|
||||||
|
// foreach (var assetReference in _menuSoundtrack) MenuMusic.Add(await assetReference.LoadAssetAsync<AudioClip>());
|
||||||
|
var clips = (await _audioTestClipsHandle.ToUniTask()).ToList();
|
||||||
|
|
||||||
|
for (int i = 0; i < clips.Count; i++)
|
||||||
|
AudioTestClips[(AudioType)i] = clips[i];
|
||||||
|
}
|
||||||
|
public void ReleaseAudioTestClips()
|
||||||
|
{
|
||||||
|
AudioTestClips.Clear();
|
||||||
|
// foreach (var assetReference in _menuSoundtrack) assetReference.ReleaseAsset();
|
||||||
|
_audioTestClipsHandle.Release();
|
||||||
|
}
|
||||||
public async UniTask WarmMenuMusic( )
|
public async UniTask WarmMenuMusic( )
|
||||||
{
|
{
|
||||||
_menuMusicHandle = Addressables.LoadAssetsAsync<AudioClip>(_menuSoundtrack, OnMenuTrackLoaded, Addressables.MergeMode.Union);
|
_menuMusicHandle = Addressables.LoadAssetsAsync<AudioClip>(_menuSoundtrack, OnMenuTrackLoaded, Addressables.MergeMode.Union);
|
||||||
// foreach (var assetReference in _menuSoundtrack) MenuMusic.Add(await assetReference.LoadAssetAsync<AudioClip>());
|
// foreach (var assetReference in _menuSoundtrack) MenuMusic.Add(await assetReference.LoadAssetAsync<AudioClip>());
|
||||||
await _menuMusicHandle.ToUniTask();
|
await _menuMusicHandle.ToUniTask();
|
||||||
|
|
||||||
}
|
}
|
||||||
public void ReleaseMenuMusic()
|
public void ReleaseMenuMusic()
|
||||||
{
|
{
|
||||||
@@ -134,6 +156,12 @@ namespace Code.Audio
|
|||||||
{
|
{
|
||||||
MusicDictionary[MusicType.Menu].Add(audioClip);
|
MusicDictionary[MusicType.Menu].Add(audioClip);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// private int _audioTestClipCounter;
|
||||||
|
private void OnAudioTestClipLoaded(AudioClip audioClip)
|
||||||
|
{
|
||||||
|
// AudioTestClips[(AudioType)_audioTestClipCounter] = audioClip;_audioTestClipCounter++;
|
||||||
|
}
|
||||||
private void OnActionTrackLoaded(AudioClip audioClip)
|
private void OnActionTrackLoaded(AudioClip audioClip)
|
||||||
{
|
{
|
||||||
MusicDictionary[MusicType.Action].Add(audioClip);
|
MusicDictionary[MusicType.Action].Add(audioClip);
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ using System.Threading;
|
|||||||
using Code.Configs;
|
using Code.Configs;
|
||||||
using Code.Constants;
|
using Code.Constants;
|
||||||
using Cysharp.Threading.Tasks;
|
using Cysharp.Threading.Tasks;
|
||||||
|
using DG.Tweening;
|
||||||
using Reflex.Attributes;
|
using Reflex.Attributes;
|
||||||
using Unity.VisualScripting;
|
using Unity.VisualScripting;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
@@ -23,8 +24,9 @@ namespace Code.Audio
|
|||||||
|
|
||||||
private AudioMixerGroup _masterGroup,
|
private AudioMixerGroup _masterGroup,
|
||||||
// _musicGroup,
|
// _musicGroup,
|
||||||
// _actionMusicGroup,
|
_actionMusicGroup,
|
||||||
// _peacefulMusicGroup,
|
_menuMusicGroup,
|
||||||
|
_peacefulMusicGroup,
|
||||||
_SFXGroup,
|
_SFXGroup,
|
||||||
_creaturesGroup,
|
_creaturesGroup,
|
||||||
_dispatcherGroup,
|
_dispatcherGroup,
|
||||||
@@ -35,35 +37,104 @@ namespace Code.Audio
|
|||||||
|
|
||||||
private Dictionary<AudioSnapshotState, AudioMixerSnapshot> _snapshots = new();
|
private Dictionary<AudioSnapshotState, AudioMixerSnapshot> _snapshots = new();
|
||||||
private Dictionary<AudioSourceType, AudioSourceSettingsConfig> _settings;
|
private Dictionary<AudioSourceType, AudioSourceSettingsConfig> _settings;
|
||||||
|
|
||||||
public AudioService(IAudioFactory audioFactory, Dictionary<AudioSourceType,AudioSourceSettingsConfig> settings)
|
public AudioService(IAudioFactory audioFactory, Dictionary<AudioSourceType, AudioSourceSettingsConfig> settings)
|
||||||
{
|
{
|
||||||
_audioFactory = audioFactory;
|
_audioFactory = audioFactory;
|
||||||
_audioSourcePool = new(settings);
|
_audioSourcePool = new(settings);
|
||||||
_settings = settings;
|
_settings = settings;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO Грязно, убрать снапшоты НАХУЙ
|
||||||
|
public float GetSetting(AudioType type)
|
||||||
|
{
|
||||||
|
float value;
|
||||||
|
switch (type)
|
||||||
|
{
|
||||||
|
case AudioType.SFX:
|
||||||
|
_snapshots[AudioSnapshotState.Peaceful].audioMixer.GetFloat(_SFXGroup.name, out value);
|
||||||
|
break;
|
||||||
|
case AudioType.Master:
|
||||||
|
_snapshots[AudioSnapshotState.Menu].audioMixer.GetFloat(_masterGroup.name, out value);
|
||||||
|
break;
|
||||||
|
case AudioType.Creatures:
|
||||||
|
_snapshots[AudioSnapshotState.Peaceful].audioMixer.GetFloat(_creaturesGroup.name, out value);
|
||||||
|
break;
|
||||||
|
case AudioType.GameplayMusic:
|
||||||
|
_snapshots[AudioSnapshotState.Peaceful].audioMixer.GetFloat(_peacefulMusicGroup.name, out value);
|
||||||
|
break;
|
||||||
|
case AudioType.MenuMusic:
|
||||||
|
_snapshots[AudioSnapshotState.Menu].audioMixer.GetFloat(_menuMusicGroup.name, out value);
|
||||||
|
break;
|
||||||
|
case AudioType.DispatcherSounds:
|
||||||
|
_snapshots[AudioSnapshotState.Action].audioMixer.GetFloat(_dispatcherGroup.name, out value);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
value = 1;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
value = Mathf.Pow(10f, value / 20);
|
||||||
|
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO Грязно, убрать снапшоты НАХУЙ
|
||||||
|
public void ChangeSetting(AudioType type, float value)
|
||||||
|
{
|
||||||
|
float volume = Mathf.Log10(value) * 20;
|
||||||
|
switch (type)
|
||||||
|
{
|
||||||
|
case AudioType.SFX:
|
||||||
|
_snapshots[AudioSnapshotState.Peaceful].audioMixer.SetFloat(_SFXGroup.name, volume);
|
||||||
|
_snapshots[AudioSnapshotState.Action].audioMixer.SetFloat(_SFXGroup.name, volume);
|
||||||
|
break;
|
||||||
|
case AudioType.Master:
|
||||||
|
_snapshots[AudioSnapshotState.Menu].audioMixer.SetFloat(_masterGroup.name, volume);
|
||||||
|
_snapshots[AudioSnapshotState.Peaceful].audioMixer.SetFloat(_masterGroup.name, volume);
|
||||||
|
_snapshots[AudioSnapshotState.Action].audioMixer.SetFloat(_masterGroup.name, volume);
|
||||||
|
break;
|
||||||
|
case AudioType.Creatures:
|
||||||
|
_snapshots[AudioSnapshotState.Peaceful].audioMixer.SetFloat(_creaturesGroup.name, volume);
|
||||||
|
_snapshots[AudioSnapshotState.Action].audioMixer.SetFloat(_creaturesGroup.name, volume);
|
||||||
|
break;
|
||||||
|
case AudioType.GameplayMusic:
|
||||||
|
_snapshots[AudioSnapshotState.Peaceful].audioMixer.SetFloat(_peacefulMusicGroup.name, volume);
|
||||||
|
_snapshots[AudioSnapshotState.Action].audioMixer.SetFloat(_actionMusicGroup.name, volume);
|
||||||
|
break;
|
||||||
|
case AudioType.MenuMusic:
|
||||||
|
_snapshots[AudioSnapshotState.Menu].audioMixer.SetFloat(_menuMusicGroup.name, volume);
|
||||||
|
break;
|
||||||
|
case AudioType.DispatcherSounds:
|
||||||
|
_snapshots[AudioSnapshotState.Peaceful].audioMixer.SetFloat(_dispatcherGroup.name, volume);
|
||||||
|
_snapshots[AudioSnapshotState.Action].audioMixer.SetFloat(_dispatcherGroup.name, volume);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
// _mixer.FindSnapshot("Action").audioMixer.SetFloat("music", volume);
|
||||||
|
}
|
||||||
|
|
||||||
public async UniTask Initialize()
|
public async UniTask Initialize()
|
||||||
{
|
{
|
||||||
// _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];
|
_menuMusicGroup = _mixer.FindMatchingGroups(AudioGroups.MenuMusicGroup)[0];
|
||||||
// _peacefulMusicGroup = _mixer.FindMatchingGroups(AudioGroups.PeacefulMusoup)[0];
|
_actionMusicGroup = _mixer.FindMatchingGroups(AudioGroups.ActionMusicGroup)[0];
|
||||||
|
_peacefulMusicGroup = _mixer.FindMatchingGroups(AudioGroups.PeacefulMusicGroup)[0];
|
||||||
// _musicGroup = _mixer.FindMatchingGroups(AudioGroups.MusicGroup)[0];
|
// _musicGroup = _mixer.FindMatchingGroups(AudioGroups.MusicGroup)[0];
|
||||||
_musicAudioGroups.Add(MusicType.Menu, _mixer.FindMatchingGroups(AudioGroups.MenuMusicGroup)[0]);
|
_musicAudioGroups.Add(MusicType.Menu, _mixer.FindMatchingGroups(AudioGroups.MenuMusicGroup)[0]);
|
||||||
_musicAudioGroups.Add(MusicType.Action, _mixer.FindMatchingGroups(AudioGroups.ActionMusicGroup)[0]);
|
_musicAudioGroups.Add(MusicType.Action, _mixer.FindMatchingGroups(AudioGroups.ActionMusicGroup)[0]);
|
||||||
_musicAudioGroups.Add(MusicType.Peaceful, _mixer.FindMatchingGroups(AudioGroups.PeacefulMusicGroup)[0]);
|
_musicAudioGroups.Add(MusicType.Peaceful, _mixer.FindMatchingGroups(AudioGroups.PeacefulMusicGroup)[0]);
|
||||||
|
|
||||||
_cancellationTokenSources.Add(MusicType.Menu, new());
|
_cancellationTokenSources.Add(MusicType.Menu, new());
|
||||||
_cancellationTokenSources.Add(MusicType.Action, new());
|
_cancellationTokenSources.Add(MusicType.Action, new());
|
||||||
_cancellationTokenSources.Add(MusicType.Peaceful, new());
|
_cancellationTokenSources.Add(MusicType.Peaceful, new());
|
||||||
|
|
||||||
_musicAudioSources.Add(MusicType.Menu, null);
|
_musicAudioSources.Add(MusicType.Menu, null);
|
||||||
_musicAudioSources.Add(MusicType.Action, null);
|
_musicAudioSources.Add(MusicType.Action, null);
|
||||||
_musicAudioSources.Add(MusicType.Peaceful, null);
|
_musicAudioSources.Add(MusicType.Peaceful, null);
|
||||||
|
|
||||||
_SFXGroup = _mixer.FindMatchingGroups(AudioGroups.SFXGroup)[0];
|
_SFXGroup = _mixer.FindMatchingGroups(AudioGroups.SFXGroup)[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];
|
||||||
@@ -76,7 +147,6 @@ namespace Code.Audio
|
|||||||
_snapshots[AudioSnapshotState.Menu] = _mixer.FindSnapshot(AudioGroups.MenuSnapshot);
|
_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
|
#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
|
||||||
@@ -86,50 +156,51 @@ namespace Code.Audio
|
|||||||
|
|
||||||
public async UniTaskVoid PlayRandomMusicUntilHumanityWillBeDestroyedForTheySins(MusicType musicType)
|
public async UniTaskVoid PlayRandomMusicUntilHumanityWillBeDestroyedForTheySins(MusicType musicType)
|
||||||
{
|
{
|
||||||
if(!_musicAudioSources[musicType])
|
if (!_musicAudioSources[musicType])
|
||||||
{
|
{
|
||||||
_musicAudioSources[musicType] = _audioSourcePool.GetSource();
|
_musicAudioSources[musicType] = _audioSourcePool.GetSource();
|
||||||
_musicAudioSources[musicType].spatialBlend = _settings[AudioSourceType.NoBlend].spatialBlend;
|
_musicAudioSources[musicType].spatialBlend = _settings[AudioSourceType.NoBlend].spatialBlend;
|
||||||
_musicAudioSources[musicType].outputAudioMixerGroup = _musicAudioGroups[musicType];
|
_musicAudioSources[musicType].outputAudioMixerGroup = _musicAudioGroups[musicType];
|
||||||
}
|
}
|
||||||
|
|
||||||
_musicAudioSources[musicType].resource =
|
_musicAudioSources[musicType].resource =
|
||||||
_audioFactory.MusicDictionary[musicType][
|
_audioFactory.MusicDictionary[musicType][
|
||||||
Random.Range(0, _audioFactory.MusicDictionary[musicType].Count)];
|
Random.Range(0, _audioFactory.MusicDictionary[musicType].Count)];
|
||||||
|
|
||||||
_musicAudioSources[musicType].Play();
|
_musicAudioSources[musicType].Play();
|
||||||
|
|
||||||
// await UniTask.WaitUntilValueChanged(_musicAudioSources[musicType],
|
// await UniTask.WaitUntilValueChanged(_musicAudioSources[musicType],
|
||||||
// _ => !_musicAudioSources[musicType].isPlaying,
|
// _ => !_musicAudioSources[musicType].isPlaying,
|
||||||
// cancellationToken: _cancellationTokenSources[musicType].Token);
|
// cancellationToken: _cancellationTokenSources[musicType].Token);
|
||||||
await UniTask.NextFrame();
|
await UniTask.NextFrame();
|
||||||
// Debug.Log($"Playing {musicType}");
|
// Debug.Log($"Playing {musicType}");
|
||||||
var (isCanceled, _) = await UniTask.WaitUntilValueChanged(_musicAudioSources[musicType],
|
var (isCanceled, _) = await UniTask.WaitUntilValueChanged(_musicAudioSources[musicType],
|
||||||
_ => !_musicAudioSources[musicType].isPlaying,
|
_ => !_musicAudioSources[musicType].isPlaying,
|
||||||
cancellationToken: _cancellationTokenSources[musicType].Token).SuppressCancellationThrow();
|
cancellationToken: _cancellationTokenSources[musicType].Token).SuppressCancellationThrow();
|
||||||
// Debug.Log($"Finished {musicType}");
|
// Debug.Log($"Finished {musicType}");
|
||||||
|
|
||||||
if (isCanceled)
|
if (isCanceled)
|
||||||
{
|
{
|
||||||
// Debug.Log($"Cancelled {musicType}");
|
// Debug.Log($"Cancelled {musicType}");
|
||||||
_cancellationTokenSources[musicType].Dispose();
|
_cancellationTokenSources[musicType].Dispose();
|
||||||
_cancellationTokenSources[musicType] = new();
|
_cancellationTokenSources[musicType] = new();
|
||||||
|
|
||||||
_audioSourcePool.ReleaseSource(_musicAudioSources[musicType]);
|
_audioSourcePool.ReleaseSource(_musicAudioSources[musicType]);
|
||||||
_musicAudioSources[musicType] = null;
|
_musicAudioSources[musicType] = null;
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
PlayRandomMusicUntilHumanityWillBeDestroyedForTheySins(musicType);
|
PlayRandomMusicUntilHumanityWillBeDestroyedForTheySins(musicType);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async UniTaskVoid GladlyAskToStopMusic(MusicType musicType, AudioSnapshotState audioSnapshotState = AudioSnapshotState.None, float time = 1f, Action callback = null)
|
public async UniTaskVoid GladlyAskToStopMusic(MusicType musicType,
|
||||||
|
AudioSnapshotState audioSnapshotState = AudioSnapshotState.None, float time = 1f, Action callback = null)
|
||||||
{
|
{
|
||||||
TransitToSnapshot(audioSnapshotState, time);
|
TransitToSnapshot(audioSnapshotState, time);
|
||||||
|
|
||||||
await UniTask.WaitForSeconds(time);
|
await UniTask.WaitForSeconds(time);
|
||||||
|
|
||||||
_cancellationTokenSources[musicType].Cancel();
|
_cancellationTokenSources[musicType].Cancel();
|
||||||
|
|
||||||
callback?.Invoke();
|
callback?.Invoke();
|
||||||
@@ -170,10 +241,112 @@ namespace Code.Audio
|
|||||||
// Чинить долго и дорого пусть Артёмов будет много, ведь он наш друг
|
// Чинить долго и дорого пусть Артёмов будет много, ведь он наш друг
|
||||||
public event IAudioService.OnAudioPlayingDelegate OnDispatcherStarted;
|
public event IAudioService.OnAudioPlayingDelegate OnDispatcherStarted;
|
||||||
public event IAudioService.OnAudioPlayingDelegate OnDispatcherEnded;
|
public event IAudioService.OnAudioPlayingDelegate OnDispatcherEnded;
|
||||||
|
|
||||||
public void PlayDispatcher(DispatcherSounds dispatcherSoundId)
|
public void PlayDispatcher(DispatcherSounds dispatcherSoundId)
|
||||||
{
|
{
|
||||||
OnDispatcherStarted?.Invoke();
|
OnDispatcherStarted?.Invoke();
|
||||||
_audioSourcePool.PlayOneShot(_audioFactory.DispatcherAudios[(int)dispatcherSoundId], _dispatcherGroup, AudioSourceType.NoBlend, () => OnDispatcherEnded?.Invoke());
|
_audioSourcePool.PlayOneShot(_audioFactory.DispatcherAudios[(int)dispatcherSoundId], _dispatcherGroup,
|
||||||
|
AudioSourceType.NoBlend, () => OnDispatcherEnded?.Invoke());
|
||||||
|
}
|
||||||
|
|
||||||
|
private CancellationTokenSource _testClipCancellationTokenSource = new();
|
||||||
|
private void ResetCurrentTestAudioSource() => _currentTestClipAudioType = AudioType.Master;
|
||||||
|
// TODO Засунуть в словарь
|
||||||
|
public void PlayTestClip(AudioType audioType)
|
||||||
|
{
|
||||||
|
if(_currentTestClipAudioType == audioType) return;
|
||||||
|
|
||||||
|
_testClipCancellationTokenSource.Cancel();
|
||||||
|
_testClipCancellationTokenSource = new();
|
||||||
|
|
||||||
|
_currentTestClipAudioType = audioType;
|
||||||
|
|
||||||
|
switch (audioType)
|
||||||
|
{
|
||||||
|
case AudioType.SFX:
|
||||||
|
_audioSourcePool.PlayOneShot(_audioFactory.AudioTestClips[audioType],
|
||||||
|
_SFXGroup, _testClipCancellationTokenSource,
|
||||||
|
AudioSourceType.NoBlend, ResetCurrentTestAudioSource);
|
||||||
|
break;
|
||||||
|
case AudioType.Master:
|
||||||
|
_audioSourcePool.PlayOneShot(_audioFactory.AudioTestClips[audioType],
|
||||||
|
_masterGroup, _testClipCancellationTokenSource,
|
||||||
|
AudioSourceType.NoBlend, ResetCurrentTestAudioSource);
|
||||||
|
break;
|
||||||
|
case AudioType.Creatures:
|
||||||
|
_audioSourcePool.PlayOneShot( _audioFactory.AudioTestClips[audioType],
|
||||||
|
_creaturesGroup, _testClipCancellationTokenSource,
|
||||||
|
AudioSourceType.NoBlend, ResetCurrentTestAudioSource);
|
||||||
|
break;
|
||||||
|
case AudioType.GameplayMusic:
|
||||||
|
_audioSourcePool.PlayOneShot(_audioFactory.AudioTestClips[audioType],
|
||||||
|
_actionMusicGroup, _testClipCancellationTokenSource,
|
||||||
|
AudioSourceType.NoBlend, ResetCurrentTestAudioSource);
|
||||||
|
break;
|
||||||
|
case AudioType.MenuMusic:
|
||||||
|
_audioSourcePool.PlayOneShot(_audioFactory.AudioTestClips[audioType],
|
||||||
|
_menuMusicGroup, _testClipCancellationTokenSource,
|
||||||
|
AudioSourceType.NoBlend, ResetCurrentTestAudioSource);
|
||||||
|
break;
|
||||||
|
case AudioType.DispatcherSounds:
|
||||||
|
_audioSourcePool.PlayOneShot(_audioFactory.AudioTestClips[audioType],
|
||||||
|
_dispatcherGroup, _testClipCancellationTokenSource,
|
||||||
|
AudioSourceType.NoBlend, ResetCurrentTestAudioSource);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private AudioSource _testClipAudioSource;
|
||||||
|
private AudioType _currentTestClipAudioType;
|
||||||
|
|
||||||
|
// Эффективно и просто, может не так хитровыебано
|
||||||
|
private void ReleaseTestAudioClipSource()
|
||||||
|
{
|
||||||
|
_testClipAudioSource = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO Засунуть в словарь
|
||||||
|
public void PlayTestClipDeprecated(AudioType audioType)
|
||||||
|
{
|
||||||
|
if (!_testClipAudioSource) _testClipAudioSource = _audioSourcePool.GetSource();
|
||||||
|
else if (_currentTestClipAudioType != audioType) _testClipAudioSource.Stop();
|
||||||
|
else return;
|
||||||
|
|
||||||
|
_currentTestClipAudioType = audioType;
|
||||||
|
|
||||||
|
switch (audioType)
|
||||||
|
{
|
||||||
|
case AudioType.SFX:
|
||||||
|
_audioSourcePool.PlayOneShot(_testClipAudioSource, _audioFactory.AudioTestClips[audioType],
|
||||||
|
_SFXGroup,
|
||||||
|
AudioSourceType.NoBlend, ReleaseTestAudioClipSource);
|
||||||
|
break;
|
||||||
|
case AudioType.Master:
|
||||||
|
_audioSourcePool.PlayOneShot(_testClipAudioSource, _audioFactory.AudioTestClips[audioType],
|
||||||
|
_masterGroup,
|
||||||
|
AudioSourceType.NoBlend, ReleaseTestAudioClipSource);
|
||||||
|
break;
|
||||||
|
case AudioType.Creatures:
|
||||||
|
_audioSourcePool.PlayOneShot(_testClipAudioSource, _audioFactory.AudioTestClips[audioType],
|
||||||
|
_creaturesGroup,
|
||||||
|
AudioSourceType.NoBlend, ReleaseTestAudioClipSource);
|
||||||
|
break;
|
||||||
|
case AudioType.GameplayMusic:
|
||||||
|
_audioSourcePool.PlayOneShot(_testClipAudioSource, _audioFactory.AudioTestClips[audioType],
|
||||||
|
_actionMusicGroup,
|
||||||
|
AudioSourceType.NoBlend, ReleaseTestAudioClipSource);
|
||||||
|
break;
|
||||||
|
case AudioType.MenuMusic:
|
||||||
|
_audioSourcePool.PlayOneShot(_testClipAudioSource, _audioFactory.AudioTestClips[audioType],
|
||||||
|
_menuMusicGroup,
|
||||||
|
AudioSourceType.NoBlend, ReleaseTestAudioClipSource);
|
||||||
|
break;
|
||||||
|
case AudioType.DispatcherSounds:
|
||||||
|
_audioSourcePool.PlayOneShot(_testClipAudioSource, _audioFactory.AudioTestClips[audioType],
|
||||||
|
_dispatcherGroup,
|
||||||
|
AudioSourceType.NoBlend, ReleaseTestAudioClipSource);
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Threading;
|
||||||
using Code.Configs;
|
using Code.Configs;
|
||||||
using Cysharp.Threading.Tasks;
|
using Cysharp.Threading.Tasks;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
@@ -86,6 +87,34 @@ namespace Code.Audio
|
|||||||
onComplete?.Invoke();
|
onComplete?.Invoke();
|
||||||
_pool.Release(source);
|
_pool.Release(source);
|
||||||
}
|
}
|
||||||
|
public async UniTaskVoid PlayOneShot(AudioSource audioSource, AudioClip clip, AudioMixerGroup audioMixerGroup, AudioSourceType audioSourceType = AudioSourceType.NoBlend, Action onComplete = null)
|
||||||
|
{
|
||||||
|
audioSource.PlayOneShot(clip);
|
||||||
|
audioSource.spatialBlend = _settings[audioSourceType].spatialBlend;
|
||||||
|
audioSource.outputAudioMixerGroup = audioMixerGroup;
|
||||||
|
|
||||||
|
// TODO Потом сделать. Можно с cancellation, но сейчас лень. Ну правда
|
||||||
|
await UniTask.WaitUntilValueChanged(audioSource, x => x.isPlaying);
|
||||||
|
|
||||||
|
if (!audioSource) return;
|
||||||
|
|
||||||
|
_pool.Release(audioSource);
|
||||||
|
onComplete?.Invoke();
|
||||||
|
}
|
||||||
|
public async UniTaskVoid PlayOneShot(AudioClip clip, AudioMixerGroup audioMixerGroup, CancellationTokenSource cancellationToken, AudioSourceType audioSourceType = AudioSourceType.NoBlend, Action onComplete = null)
|
||||||
|
{
|
||||||
|
AudioSource source = _pool.Get();
|
||||||
|
source.PlayOneShot(clip);
|
||||||
|
source.spatialBlend = _settings[audioSourceType].spatialBlend;
|
||||||
|
source.outputAudioMixerGroup = audioMixerGroup;
|
||||||
|
|
||||||
|
var (isCanceled, _) = await UniTask.WaitUntilValueChanged(source, x => x.isPlaying, cancellationToken: cancellationToken.Token).SuppressCancellationThrow();
|
||||||
|
|
||||||
|
_pool.Release(source);
|
||||||
|
|
||||||
|
if(!isCanceled) onComplete?.Invoke();
|
||||||
|
else cancellationToken.Dispose();
|
||||||
|
}
|
||||||
public AudioSource GetSource() => _pool.Get();
|
public AudioSource GetSource() => _pool.Get();
|
||||||
public void ReleaseSource(AudioSource source) => _pool.Release(source);
|
public void ReleaseSource(AudioSource source) => _pool.Release(source);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,22 +8,25 @@ namespace Code.Audio
|
|||||||
{
|
{
|
||||||
public interface IAudioFactory
|
public interface IAudioFactory
|
||||||
{
|
{
|
||||||
|
AudioMixer AudioMixer { get; }
|
||||||
|
Dictionary<AudioType, AudioClip> AudioTestClips { get; }
|
||||||
|
Dictionary<MusicType, List<AudioClip>> MusicDictionary { 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; }
|
|
||||||
Dictionary<MusicType, List<AudioClip>> MusicDictionary { get; }
|
|
||||||
UniTask LoadAudioSourcePrefab(Action<GameObject> callback);
|
UniTask LoadAudioSourcePrefab(Action<GameObject> callback);
|
||||||
UniTask WarmGameplayMusic();
|
UniTask WarmGameplayMusic( );
|
||||||
void ReleaseActionMusic();
|
void ReleaseActionMusic();
|
||||||
UniTask WarmMenuMusic();
|
|
||||||
void ReleaseMenuMusic();
|
|
||||||
UniTask WarmSFX();
|
|
||||||
void ReleaseSFX();
|
|
||||||
UniTask WarmEnemies();
|
|
||||||
void ReleaseEnemies();
|
|
||||||
UniTask WarmDispatcher();
|
|
||||||
void ReleaseDispatcher();
|
|
||||||
void ReleasePeacefulMusic();
|
void ReleasePeacefulMusic();
|
||||||
|
UniTask WarmAudioTestClips( );
|
||||||
|
void ReleaseAudioTestClips();
|
||||||
|
UniTask WarmMenuMusic( );
|
||||||
|
void ReleaseMenuMusic();
|
||||||
|
UniTask WarmSFX( );
|
||||||
|
void ReleaseSFX();
|
||||||
|
UniTask WarmEnemies( );
|
||||||
|
void ReleaseEnemies();
|
||||||
|
UniTask WarmDispatcher( );
|
||||||
|
void ReleaseDispatcher();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -20,5 +20,8 @@ namespace Code.Audio
|
|||||||
event OnAudioPlayingDelegate OnDispatcherStarted;
|
event OnAudioPlayingDelegate OnDispatcherStarted;
|
||||||
event OnAudioPlayingDelegate OnDispatcherEnded;
|
event OnAudioPlayingDelegate OnDispatcherEnded;
|
||||||
void PlayDispatcher(DispatcherSounds dispatcherSoundId);
|
void PlayDispatcher(DispatcherSounds dispatcherSoundId);
|
||||||
|
void ChangeSetting(AudioType type, float value);
|
||||||
|
float GetSetting(AudioType type);
|
||||||
|
void PlayTestClip(AudioType audioType);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -6,4 +6,13 @@ namespace Code.Audio
|
|||||||
Peaceful,
|
Peaceful,
|
||||||
Action
|
Action
|
||||||
}
|
}
|
||||||
|
public enum AudioType
|
||||||
|
{
|
||||||
|
Master,
|
||||||
|
MenuMusic,
|
||||||
|
GameplayMusic,
|
||||||
|
Creatures,
|
||||||
|
DispatcherSounds,
|
||||||
|
SFX
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.AddressableAssets;
|
||||||
|
|
||||||
|
namespace Code.Configs
|
||||||
|
{
|
||||||
|
[CreateAssetMenu(menuName = "Config/Audio/AudioTestClips", fileName = "AudioTestClipsConfig")]
|
||||||
|
public class AudioTestClipsConfig : ScriptableObject
|
||||||
|
{
|
||||||
|
public AssetReference[] audioTestClips;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f2f1c08a20a54a708336caf8ca6499e1
|
||||||
|
timeCreated: 1764263243
|
||||||
@@ -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
|
||||||
+25
@@ -33,6 +33,11 @@ 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 SetPosition(Vector3 position) => motor.SetPosition(position);
|
||||||
public void SetRotation(Quaternion rotation) => motor.SetRotation(rotation);
|
public void SetRotation(Quaternion rotation) => motor.SetRotation(rotation);
|
||||||
|
|
||||||
@@ -135,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);
|
||||||
@@ -220,6 +239,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)
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 3b36108558824d748620db29707cd2b1
|
||||||
|
timeCreated: 1763228467
|
||||||
@@ -0,0 +1,203 @@
|
|||||||
|
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()
|
||||||
|
{
|
||||||
|
if (PlayerController)
|
||||||
|
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,55 @@
|
|||||||
|
using System;
|
||||||
|
using Code.Configs;
|
||||||
|
using Cysharp.Threading.Tasks;
|
||||||
|
using Reflex.Attributes;
|
||||||
|
using Reflex.Core;
|
||||||
|
using Reflex.Injectors;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.AddressableAssets;
|
||||||
|
|
||||||
|
namespace Code.Gameplay.Enemies
|
||||||
|
{
|
||||||
|
public class EnemyFactory : IEnemyFactory
|
||||||
|
{
|
||||||
|
[Inject] private FogConfig _fogConfig;
|
||||||
|
[Inject] private DrunkenGrandpaConfig _drunkenGrandpaConfig;
|
||||||
|
[Inject] private CockroachConfig _cockroachConfig;
|
||||||
|
|
||||||
|
public async UniTask<BaseEnemy> CreateEnemy(EnemyType type, Vector3? position = null, Quaternion? rotation = null)
|
||||||
|
{
|
||||||
|
var prefabRef = GetEnemyPrefab(type);
|
||||||
|
|
||||||
|
var enemyObj = await Addressables
|
||||||
|
.InstantiateAsync(
|
||||||
|
prefabRef,
|
||||||
|
position: position ?? Vector3.zero,
|
||||||
|
rotation: rotation ?? Quaternion.identity
|
||||||
|
)
|
||||||
|
.ToUniTask();
|
||||||
|
|
||||||
|
AttributeInjector.Inject(enemyObj, Container.ProjectContainer);
|
||||||
|
|
||||||
|
return enemyObj.GetComponent<BaseEnemy>();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ReleaseEnemy(BaseEnemy enemy)
|
||||||
|
{
|
||||||
|
if (enemy == null) return;
|
||||||
|
|
||||||
|
enemy.gameObject.SetActive(false);
|
||||||
|
|
||||||
|
Addressables.ReleaseInstance(enemy.gameObject);
|
||||||
|
}
|
||||||
|
|
||||||
|
private AssetReference GetEnemyPrefab(EnemyType type)
|
||||||
|
{
|
||||||
|
return type switch
|
||||||
|
{
|
||||||
|
EnemyType.Fog => _fogConfig.fogPrefab,
|
||||||
|
EnemyType.DrunkenGrandpa => _drunkenGrandpaConfig.drunkenGrandpaPrefab,
|
||||||
|
EnemyType.Cockroach => _cockroachConfig.cockroachPrefab,
|
||||||
|
_ => throw new ArgumentOutOfRangeException(nameof(type), type, null)
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 2f9328c54d334b0c85ce44b0aa7add44
|
||||||
|
timeCreated: 1764168610
|
||||||
@@ -0,0 +1,84 @@
|
|||||||
|
using Code.Gameplay.Player;
|
||||||
|
using Cysharp.Threading.Tasks;
|
||||||
|
using Reflex.Attributes;
|
||||||
|
using Reflex.Core;
|
||||||
|
using Reflex.Injectors;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Code.Gameplay.Enemies
|
||||||
|
{
|
||||||
|
public class EnemySpawner : MonoBehaviour
|
||||||
|
{
|
||||||
|
[SerializeField] private EnemyType spawnerType;
|
||||||
|
[SerializeField] private float spawnRadius = 40f;
|
||||||
|
[SerializeField] private float despawnRadius = 50f;
|
||||||
|
|
||||||
|
[Inject] private IPlayerProvider _playerProvider;
|
||||||
|
[Inject] private IEnemyFactory _enemyFactory;
|
||||||
|
|
||||||
|
private BaseEnemy _spawnedEnemy;
|
||||||
|
private bool _isSpawning;
|
||||||
|
private bool _isPlayerInRange;
|
||||||
|
|
||||||
|
private void Awake()
|
||||||
|
{
|
||||||
|
if (_playerProvider == null || _enemyFactory == null)
|
||||||
|
{
|
||||||
|
AttributeInjector.Inject(this, Container.ProjectContainer);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Update()
|
||||||
|
{
|
||||||
|
if (!_playerProvider?.Character)
|
||||||
|
return;
|
||||||
|
|
||||||
|
var distanceToPlayer = Vector3.Distance(transform.position, _playerProvider.Character.transform.position);
|
||||||
|
|
||||||
|
var wasInRange = _isPlayerInRange;
|
||||||
|
_isPlayerInRange = distanceToPlayer <= spawnRadius;
|
||||||
|
|
||||||
|
switch (_isPlayerInRange)
|
||||||
|
{
|
||||||
|
case true when !_spawnedEnemy && !_isSpawning && !wasInRange:
|
||||||
|
Spawn().Forget();
|
||||||
|
break;
|
||||||
|
case false when _spawnedEnemy && distanceToPlayer > despawnRadius:
|
||||||
|
Despawn();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async UniTask Spawn()
|
||||||
|
{
|
||||||
|
if (_spawnedEnemy || _isSpawning) return;
|
||||||
|
|
||||||
|
_isSpawning = true;
|
||||||
|
var enemy = await _enemyFactory.CreateEnemy(
|
||||||
|
spawnerType,
|
||||||
|
transform.position,
|
||||||
|
transform.rotation
|
||||||
|
);
|
||||||
|
|
||||||
|
_spawnedEnemy = enemy;
|
||||||
|
_isSpawning = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Despawn()
|
||||||
|
{
|
||||||
|
if (_spawnedEnemy == null) return;
|
||||||
|
|
||||||
|
_enemyFactory.ReleaseEnemy(_spawnedEnemy);
|
||||||
|
_spawnedEnemy = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnDrawGizmosSelected()
|
||||||
|
{
|
||||||
|
Gizmos.color = new Color(0, 1, 0, 0.5f);
|
||||||
|
Gizmos.DrawSphere(transform.position, spawnRadius);
|
||||||
|
|
||||||
|
Gizmos.color = new Color(1, 0, 0, 0.2f);
|
||||||
|
Gizmos.DrawSphere(transform.position, despawnRadius);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: e87d9529de45409781ec5bfc356518c7
|
||||||
|
timeCreated: 1764225519
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
namespace Code.Gameplay.Enemies
|
||||||
|
{
|
||||||
|
public enum EnemyType
|
||||||
|
{
|
||||||
|
Fog,
|
||||||
|
DrunkenGrandpa,
|
||||||
|
Cockroach
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5430cad1a8c44516944259a428de641e
|
||||||
|
timeCreated: 1764168839
|
||||||
@@ -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
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
using Cysharp.Threading.Tasks;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Code.Gameplay.Enemies
|
||||||
|
{
|
||||||
|
public interface IEnemyFactory
|
||||||
|
{
|
||||||
|
UniTask<BaseEnemy> CreateEnemy(EnemyType type, Vector3? position, Quaternion? rotation);
|
||||||
|
void ReleaseEnemy(BaseEnemy enemy);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 68eb3027a07042b991aa1893ddd14368
|
||||||
|
timeCreated: 1764168497
|
||||||
@@ -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
|
||||||
@@ -14,6 +14,7 @@ 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)
|
||||||
{
|
{
|
||||||
@@ -24,14 +25,20 @@ namespace Code.Gameplay.Player
|
|||||||
|
|
||||||
public async UniTask<CharacterProvider> CreatePlayer()
|
public async UniTask<CharacterProvider> CreatePlayer()
|
||||||
{
|
{
|
||||||
CharacterProvider characterProvider = (await Addressables.InstantiateAsync(_playerConfig.characterPrefab).ToUniTask()).GetComponent<CharacterProvider>();
|
var go = await Addressables.InstantiateAsync(_playerConfig.characterPrefab).ToUniTask();
|
||||||
AttributeInjector.Inject(characterProvider, Container.ProjectContainer);
|
var provider = go.GetComponent<CharacterProvider>();
|
||||||
AttributeInjector.Inject(characterProvider.CustomCharacterController, Container.ProjectContainer);
|
|
||||||
return characterProvider;
|
AttributeInjector.Inject(provider, Container.ProjectContainer);
|
||||||
|
AttributeInjector.Inject(provider.CustomCharacterController, Container.ProjectContainer);
|
||||||
|
|
||||||
|
((PlayerProvider)_playerProvider).SetPlayer(provider, _playerConfig);
|
||||||
|
|
||||||
|
return provider;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ReleasePlayer(CharacterProvider characterProvider)
|
public void ReleasePlayer(CharacterProvider characterProvider)
|
||||||
{
|
{
|
||||||
|
((PlayerProvider)_playerProvider).ClearPlayer();
|
||||||
Addressables.ReleaseInstance(characterProvider.gameObject);
|
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,13 +7,11 @@ namespace Code.Scenes.SceneEnvironments
|
|||||||
[System.Serializable]
|
[System.Serializable]
|
||||||
public class GameplaySceneEnvironment : CurrentSceneEnvironment
|
public class GameplaySceneEnvironment : CurrentSceneEnvironment
|
||||||
{
|
{
|
||||||
[FormerlySerializedAs("sfxTarget")] public Transform debugSfxTarget;
|
|
||||||
public Transform playerSpawnPoint;
|
public Transform playerSpawnPoint;
|
||||||
public OrderDispenser debugTube;
|
public OrderDispenser debugTube;
|
||||||
|
|
||||||
public void TransitVariables(GameplaySceneEnvironment env)
|
public void TransitVariables(GameplaySceneEnvironment env)
|
||||||
{
|
{
|
||||||
debugSfxTarget = env.debugSfxTarget;
|
|
||||||
playerSpawnPoint = env.playerSpawnPoint;
|
playerSpawnPoint = env.playerSpawnPoint;
|
||||||
debugTube = env.debugTube;
|
debugTube = env.debugTube;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using Code.Gameplay.Door;
|
using Code.Gameplay.Door;
|
||||||
|
using Code.UI;
|
||||||
using Code.UI.Panels.Etc;
|
using Code.UI.Panels.Etc;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.Experimental.GlobalIllumination;
|
using UnityEngine.Experimental.GlobalIllumination;
|
||||||
@@ -15,6 +16,7 @@ namespace Code.Scenes.SceneEnvironments
|
|||||||
public MainMenuButton settingButton;
|
public MainMenuButton settingButton;
|
||||||
public MainMenuButton exitButton;
|
public MainMenuButton exitButton;
|
||||||
public Canvas menuButtonsCanvas;
|
public Canvas menuButtonsCanvas;
|
||||||
|
public Canvas settingsCanvas;
|
||||||
|
|
||||||
public void TransitVariables(MainMenuEnvironment env)
|
public void TransitVariables(MainMenuEnvironment env)
|
||||||
{
|
{
|
||||||
@@ -24,6 +26,7 @@ namespace Code.Scenes.SceneEnvironments
|
|||||||
settingButton = env.settingButton;
|
settingButton = env.settingButton;
|
||||||
exitButton = env.exitButton;
|
exitButton = env.exitButton;
|
||||||
menuButtonsCanvas = env.menuButtonsCanvas;
|
menuButtonsCanvas = env.menuButtonsCanvas;
|
||||||
|
settingsCanvas = env.settingsCanvas;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -23,10 +23,14 @@ 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; }
|
||||||
OrderServiceConfig OrderServiceConfig { get; }
|
OrderServiceConfig OrderServiceConfig { get; }
|
||||||
OrderBoxConfig OrderBoxConfig { get; }
|
OrderBoxConfig OrderBoxConfig { get; }
|
||||||
Dictionary<CameraMode, CameraSettingsConfig> CameraSettingsConfigs { get; }
|
Dictionary<CameraMode, CameraSettingsConfig> CameraSettingsConfigs { get; }
|
||||||
Dictionary<AudioSourceType, AudioSourceSettingsConfig> AudioSourceSettingsConfigs { get; }
|
Dictionary<AudioSourceType, AudioSourceSettingsConfig> AudioSourceSettingsConfigs { get; }
|
||||||
|
AudioTestClipsConfig AudioTestClipsConfig { get; }
|
||||||
void Load();
|
void Load();
|
||||||
Task<T> InstantiateAsset<T>(AssetReference assetReference) where T : Behaviour;
|
Task<T> InstantiateAsset<T>(AssetReference assetReference) where T : Behaviour;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,14 +16,23 @@ namespace Code.StaticData
|
|||||||
public AppConfig AppConfig { get; private set; }
|
public AppConfig AppConfig { get; private set; }
|
||||||
public InputConfig InputConfig { get; private set; }
|
public InputConfig InputConfig { get; private set; }
|
||||||
public CameraConfig CameraConfig { get; private set; }
|
public CameraConfig CameraConfig { get; private set; }
|
||||||
|
|
||||||
public CharacterConfig CharacterConfig { get; private set; }
|
public CharacterConfig CharacterConfig { get; private set; }
|
||||||
public UIConfig UIConfig { get; private set; }
|
|
||||||
public PlayerConfig PlayerConfig { get; private set; }
|
public PlayerConfig PlayerConfig { get; private set; }
|
||||||
|
|
||||||
|
public UIConfig UIConfig { get; private set; }
|
||||||
|
|
||||||
public AudioMixerConfig AudioMixerConfig { get; private set; }
|
public AudioMixerConfig AudioMixerConfig { get; private set; }
|
||||||
public SoundtrackListConfig SoundtrackListConfig { get; private set; }
|
public SoundtrackListConfig SoundtrackListConfig { get; private set; }
|
||||||
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 AudioTestClipsConfig AudioTestClipsConfig { get; private set; }
|
||||||
|
|
||||||
|
public DrunkenGrandpaConfig DrunkenGrandpaConfig {get; private set;}
|
||||||
|
public CockroachConfig CockroachConfig { get; private set; }
|
||||||
|
public FogConfig FogConfig { get; private set; }
|
||||||
|
|
||||||
public OrderServiceConfig OrderServiceConfig { get; private set; }
|
public OrderServiceConfig OrderServiceConfig { get; private set; }
|
||||||
public OrderBoxConfig OrderBoxConfig { get; private set; }
|
public OrderBoxConfig OrderBoxConfig { get; private set; }
|
||||||
|
|
||||||
@@ -47,12 +56,14 @@ namespace Code.StaticData
|
|||||||
.ToDictionary(x => x.cameraMode);
|
.ToDictionary(x => x.cameraMode);
|
||||||
|
|
||||||
LoadAudioConfigs();
|
LoadAudioConfigs();
|
||||||
|
LoadEnemiesConfigs();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void LoadAudioConfigs()
|
private void LoadAudioConfigs()
|
||||||
{
|
{
|
||||||
AudioMixerConfig = Resources.Load<AudioMixerConfig>(string.Format(StringPaths.ConfigSingle, "Audio", "AudioMixerConfig"));
|
AudioMixerConfig = Resources.Load<AudioMixerConfig>(string.Format(StringPaths.ConfigSingle, "Audio", "AudioMixerConfig"));
|
||||||
SoundtrackListConfig = Resources.Load<SoundtrackListConfig>(string.Format(StringPaths.ConfigSingle, "Audio", "SoundtrackListConfig"));
|
SoundtrackListConfig = Resources.Load<SoundtrackListConfig>(string.Format(StringPaths.ConfigSingle, "Audio", "SoundtrackListConfig"));
|
||||||
|
AudioTestClipsConfig = Resources.Load<AudioTestClipsConfig>(string.Format(StringPaths.ConfigSingle, "Audio", "AudioTestClipsConfig"));
|
||||||
SFXListConfig = Resources.Load<SFXListConfig>(string.Format(StringPaths.ConfigSingle, "Audio", "SFXListConfig"));
|
SFXListConfig = Resources.Load<SFXListConfig>(string.Format(StringPaths.ConfigSingle, "Audio", "SFXListConfig"));
|
||||||
DispatcherSoundListConfig = Resources.Load<DispatcherSoundListConfig>(string.Format(StringPaths.ConfigSingle, "Audio", "DispatcherSoundListConfig"));
|
DispatcherSoundListConfig = Resources.Load<DispatcherSoundListConfig>(string.Format(StringPaths.ConfigSingle, "Audio", "DispatcherSoundListConfig"));
|
||||||
EnemiesSoundListConfig = Resources.Load<EnemiesSoundListConfig>(string.Format(StringPaths.ConfigSingle, "Audio", "EnemiesSoundListConfig"));
|
EnemiesSoundListConfig = Resources.Load<EnemiesSoundListConfig>(string.Format(StringPaths.ConfigSingle, "Audio", "EnemiesSoundListConfig"));
|
||||||
@@ -61,6 +72,13 @@ namespace Code.StaticData
|
|||||||
.ToDictionary(x => x.sourceType);
|
.ToDictionary(x => x.sourceType);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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>();
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
using Code.Audio;
|
||||||
using Code.Gameplay.Door;
|
using Code.Gameplay.Door;
|
||||||
using Code.UI.Panels.Etc;
|
using Code.UI.Panels.Etc;
|
||||||
|
|
||||||
@@ -36,7 +37,7 @@ namespace Code.UI.Panels
|
|||||||
settingButton.OnPointerExitEvent = CloseDoor;
|
settingButton.OnPointerExitEvent = CloseDoor;
|
||||||
exitButton.OnPointerExitEvent = CloseDoor;
|
exitButton.OnPointerExitEvent = CloseDoor;
|
||||||
|
|
||||||
_cinematicDoorOpening = new(mainMenuUIVariables.MainMenuDoor, mainMenuUIVariables.DoorLight);
|
_cinematicDoorOpening = new(mainMenuUIVariables.MainMenuDoor, mainMenuUIVariables.DoorLight);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OpenStart() => _cinematicDoorOpening.PreOpen(0);
|
private void OpenStart() => _cinematicDoorOpening.PreOpen(0);
|
||||||
@@ -45,6 +46,6 @@ namespace Code.UI.Panels
|
|||||||
|
|
||||||
private void OpenExit() => _cinematicDoorOpening.PreOpen(2);
|
private void OpenExit() => _cinematicDoorOpening.PreOpen(2);
|
||||||
|
|
||||||
private void CloseDoor() => _cinematicDoorOpening.Close();
|
private void CloseDoor() => _cinematicDoorOpening.Close();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,29 +1,83 @@
|
|||||||
|
using System;
|
||||||
|
using Code.Audio;
|
||||||
|
using Reflex.Attributes;
|
||||||
using TMPro;
|
using TMPro;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
using UnityEngine.Serialization;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
|
using AudioType = Code.Audio.AudioType;
|
||||||
|
|
||||||
namespace Code.UI
|
namespace Code.UI
|
||||||
{
|
{
|
||||||
public class SettingsPanel : UIElement
|
public class SettingsPanel : UIElement
|
||||||
{
|
{
|
||||||
[SerializeField] private TMP_Text scoreText;
|
[SerializeField] private Slider master;
|
||||||
[SerializeField] private TMP_Text gameOverText;
|
[SerializeField] private Slider sfx;
|
||||||
[SerializeField] private Image _background;
|
[SerializeField] private Slider dispatcher;
|
||||||
|
[SerializeField] private Slider creatures;
|
||||||
public void UpdateScoreText(int score) => scoreText.text = score.ToString();
|
[SerializeField] private Slider menuMusic;
|
||||||
|
[SerializeField] private Slider gameplayMusic;
|
||||||
|
|
||||||
|
[Inject] IAudioService _audioService;
|
||||||
|
|
||||||
|
private void Start()
|
||||||
|
{
|
||||||
|
master.SetValueWithoutNotify(_audioService.GetSetting(AudioType.Master));
|
||||||
|
master.onValueChanged.AddListener(OnMasterUpdate);
|
||||||
|
|
||||||
|
sfx.value = _audioService.GetSetting(AudioType.SFX);
|
||||||
|
sfx.onValueChanged.AddListener(OnSFXUpdate);
|
||||||
|
|
||||||
|
dispatcher.value = _audioService.GetSetting(AudioType.DispatcherSounds);
|
||||||
|
dispatcher.onValueChanged.AddListener(OnDispatcherUpdate);
|
||||||
|
|
||||||
|
creatures.value = _audioService.GetSetting(AudioType.Creatures);
|
||||||
|
creatures.onValueChanged.AddListener(OnEnemiesUpdate);
|
||||||
|
|
||||||
|
menuMusic.value = _audioService.GetSetting(AudioType.MenuMusic);
|
||||||
|
menuMusic.onValueChanged.AddListener(OnMenuMusicUpdate);
|
||||||
|
|
||||||
|
gameplayMusic.value = _audioService.GetSetting(AudioType.GameplayMusic);
|
||||||
|
gameplayMusic.onValueChanged.AddListener(OnGameplayUpdate);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnMasterUpdate(float value)
|
||||||
|
{
|
||||||
|
_audioService.ChangeSetting(AudioType.Master, value);
|
||||||
|
// _audioService.PlayTestClip(AudioType.Master); XDXDXDXD TODO Убрать или придумать что-нибудь
|
||||||
|
}
|
||||||
|
private void OnSFXUpdate(float value)
|
||||||
|
{
|
||||||
|
_audioService.ChangeSetting(AudioType.SFX, value);
|
||||||
|
_audioService.PlayTestClip(AudioType.SFX);
|
||||||
|
}
|
||||||
|
private void OnDispatcherUpdate(float value)
|
||||||
|
{
|
||||||
|
_audioService.ChangeSetting(AudioType.DispatcherSounds, value);
|
||||||
|
_audioService.PlayTestClip(AudioType.DispatcherSounds);
|
||||||
|
}
|
||||||
|
private void OnEnemiesUpdate(float value)
|
||||||
|
{
|
||||||
|
_audioService.ChangeSetting(AudioType.Creatures, value);
|
||||||
|
_audioService.PlayTestClip(AudioType.Creatures);
|
||||||
|
}
|
||||||
|
private void OnMenuMusicUpdate(float value)
|
||||||
|
{
|
||||||
|
_audioService.ChangeSetting(AudioType.MenuMusic, value);
|
||||||
|
_audioService.PlayTestClip(AudioType.MenuMusic);
|
||||||
|
}
|
||||||
|
private void OnGameplayUpdate(float value)
|
||||||
|
{
|
||||||
|
_audioService.ChangeSetting(AudioType.GameplayMusic, value);
|
||||||
|
_audioService.PlayTestClip(AudioType.GameplayMusic);
|
||||||
|
}
|
||||||
|
|
||||||
public override void Hide()
|
public override void Hide()
|
||||||
{
|
{
|
||||||
_background.enabled = false;
|
|
||||||
scoreText.enabled = false;
|
|
||||||
gameOverText.enabled = false;
|
|
||||||
base.Hide();
|
base.Hide();
|
||||||
}
|
}
|
||||||
public override void Show()
|
public override void Show()
|
||||||
{
|
{
|
||||||
_background.enabled = true;
|
|
||||||
scoreText.enabled = true;
|
|
||||||
gameOverText.enabled = true;
|
|
||||||
base.Show();
|
base.Show();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -133,7 +133,6 @@ AudioMixerGroupController:
|
|||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: -6229038418282119915}
|
- {fileID: -6229038418282119915}
|
||||||
- {fileID: 4051589110822387517}
|
- {fileID: 4051589110822387517}
|
||||||
- {fileID: 2578226848385654679}
|
|
||||||
m_Volume: 5e2f5c7e3d526b9aaa68f56dfb7d553b
|
m_Volume: 5e2f5c7e3d526b9aaa68f56dfb7d553b
|
||||||
m_Pitch: ae94fcb7df36f4368a5d909499b1cf45
|
m_Pitch: ae94fcb7df36f4368a5d909499b1cf45
|
||||||
m_Send: 00000000000000000000000000000000
|
m_Send: 00000000000000000000000000000000
|
||||||
@@ -175,7 +174,21 @@ AudioMixerController:
|
|||||||
m_SuspendThreshold: -80
|
m_SuspendThreshold: -80
|
||||||
m_EnableSuspend: 1
|
m_EnableSuspend: 1
|
||||||
m_UpdateMode: 0
|
m_UpdateMode: 0
|
||||||
m_ExposedParameters: []
|
m_ExposedParameters:
|
||||||
|
- guid: ddab7e07de3c686e296ff10b1cd77a47
|
||||||
|
name: Action
|
||||||
|
- guid: 5e2f5c7e3d526b9aaa68f56dfb7d553b
|
||||||
|
name: Creatures
|
||||||
|
- guid: 19969023eed85c7999691c4897eebc2e
|
||||||
|
name: Dispatcher
|
||||||
|
- guid: 9823d3a409fe914cdbb45f92705c5186
|
||||||
|
name: Master
|
||||||
|
- guid: b9fc0df121fe7134e9cbd35aa5a65755
|
||||||
|
name: Menu
|
||||||
|
- guid: dd0b3fe80d006124baa36e791e6953f0
|
||||||
|
name: Peaceful
|
||||||
|
- guid: 8b55cf81ebbf71b7db1aeb9d32d1f6a1
|
||||||
|
name: SFX
|
||||||
m_AudioMixerGroupViews:
|
m_AudioMixerGroupViews:
|
||||||
- guids:
|
- guids:
|
||||||
- ddc760a902e7b5553952924aeaa5473e
|
- ddc760a902e7b5553952924aeaa5473e
|
||||||
@@ -190,7 +203,7 @@ AudioMixerController:
|
|||||||
- af6d3dead2e9e4848a2ca2fa55634108
|
- 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
|
||||||
@@ -201,6 +214,7 @@ AudioMixerGroupController:
|
|||||||
m_AudioMixer: {fileID: 24100000}
|
m_AudioMixer: {fileID: 24100000}
|
||||||
m_GroupID: ddc760a902e7b5553952924aeaa5473e
|
m_GroupID: ddc760a902e7b5553952924aeaa5473e
|
||||||
m_Children:
|
m_Children:
|
||||||
|
- {fileID: 2578226848385654679}
|
||||||
- {fileID: -2580822303892902013}
|
- {fileID: -2580822303892902013}
|
||||||
- {fileID: -6672183372375525094}
|
- {fileID: -6672183372375525094}
|
||||||
- {fileID: -4235790927912365957}
|
- {fileID: -4235790927912365957}
|
||||||
|
|||||||
@@ -0,0 +1,45 @@
|
|||||||
|
%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: f2f1c08a20a54a708336caf8ca6499e1, type: 3}
|
||||||
|
m_Name: AudioTestClipsConfig
|
||||||
|
m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.AudioTestClipsConfig
|
||||||
|
audioTestClips:
|
||||||
|
- m_AssetGUID: 803e40b883c823b89a91aa8b9d9fc483
|
||||||
|
m_SubObjectName:
|
||||||
|
m_SubObjectType:
|
||||||
|
m_SubObjectGUID:
|
||||||
|
m_EditorAssetChanged: 0
|
||||||
|
- m_AssetGUID: 1d7110a045075b22fa27d62bd5f2784e
|
||||||
|
m_SubObjectName:
|
||||||
|
m_SubObjectType:
|
||||||
|
m_SubObjectGUID:
|
||||||
|
m_EditorAssetChanged: 0
|
||||||
|
- m_AssetGUID: 2f6134357dc2a5641a846a7478ce4c2c
|
||||||
|
m_SubObjectName:
|
||||||
|
m_SubObjectType:
|
||||||
|
m_SubObjectGUID:
|
||||||
|
m_EditorAssetChanged: 0
|
||||||
|
- m_AssetGUID: 82c71411174bfa86ca1f676b9d389f94
|
||||||
|
m_SubObjectName:
|
||||||
|
m_SubObjectType:
|
||||||
|
m_SubObjectGUID:
|
||||||
|
m_EditorAssetChanged: 0
|
||||||
|
- m_AssetGUID: 8fa89a492fc3a3768a0f0ba1bb7080e0
|
||||||
|
m_SubObjectName:
|
||||||
|
m_SubObjectType:
|
||||||
|
m_SubObjectGUID:
|
||||||
|
m_EditorAssetChanged: 0
|
||||||
|
- m_AssetGUID: 3831a36e0c8e48f659517a6bb99378b6
|
||||||
|
m_SubObjectName:
|
||||||
|
m_SubObjectType:
|
||||||
|
m_SubObjectGUID:
|
||||||
|
m_EditorAssetChanged: 1
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 82027c2590e7a79428ed6569707e16c0
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 9dec9aa8ce6e1be92b7f1daeffd7a9b6
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
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: 7bc162d3127949aa950d0738beee99a4, type: 3}
|
||||||
|
m_Name: CockroachConfig
|
||||||
|
m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.CockroachConfig
|
||||||
|
cockroachPrefab:
|
||||||
|
m_AssetGUID: 2ed2d93a9f39d4edba511cb7396c7bb6
|
||||||
|
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: b33855c694de89386a25c56cbe463a0e
|
||||||
|
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: f3d7dc64b34919ad7b50a3dd307a935b
|
||||||
|
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: dd66bc1698bb3972b97125d4d6e4ea22
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,139 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &-2147114197879300112
|
||||||
|
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: DrunkenGrandpa
|
||||||
|
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
|
||||||
|
m_Parent: {fileID: 0}
|
||||||
|
m_ModifiedSerializedProperties: 0
|
||||||
|
m_ValidKeywords:
|
||||||
|
- _METALLICSPECGLOSSMAP
|
||||||
|
- _NORMALMAP
|
||||||
|
m_InvalidKeywords: []
|
||||||
|
m_LightmapFlags: 4
|
||||||
|
m_EnableInstancingVariants: 0
|
||||||
|
m_DoubleSidedGI: 0
|
||||||
|
m_CustomRenderQueue: -1
|
||||||
|
stringTagMap:
|
||||||
|
RenderType: Opaque
|
||||||
|
disabledShaderPasses:
|
||||||
|
- MOTIONVECTORS
|
||||||
|
m_LockedProperties:
|
||||||
|
m_SavedProperties:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TexEnvs:
|
||||||
|
- _BaseMap:
|
||||||
|
m_Texture: {fileID: 2800000, guid: 0a8ed27d17fe9b085834fba6972c0a8a, type: 3}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _BumpMap:
|
||||||
|
m_Texture: {fileID: 2800000, guid: 6c92883f2935443458f5dadf53dae100, 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: 0a8ed27d17fe9b085834fba6972c0a8a, type: 3}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MetallicGlossMap:
|
||||||
|
m_Texture: {fileID: 2800000, guid: bc57aa85d09f3b056ab86a1439ee1e00, 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: 0
|
||||||
|
- _DstBlendAlpha: 0
|
||||||
|
- _EnvironmentReflections: 1
|
||||||
|
- _GlossMapScale: 0
|
||||||
|
- _Glossiness: 0
|
||||||
|
- _GlossyReflections: 0
|
||||||
|
- _Metallic: 0
|
||||||
|
- _OcclusionStrength: 1
|
||||||
|
- _Parallax: 0.005
|
||||||
|
- _QueueOffset: 0
|
||||||
|
- _ReceiveShadows: 1
|
||||||
|
- _Smoothness: 0.5
|
||||||
|
- _SmoothnessTextureChannel: 0
|
||||||
|
- _SpecularHighlights: 1
|
||||||
|
- _SrcBlend: 1
|
||||||
|
- _SrcBlendAlpha: 1
|
||||||
|
- _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
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 3d74b98a8711ab75e813aea13cb6211e
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 2100000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
@@ -0,0 +1,130 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 0a8ed27d17fe9b085834fba6972c0a8a
|
||||||
|
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
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: Android
|
||||||
|
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.
+130
@@ -0,0 +1,130 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 6c92883f2935443458f5dadf53dae100
|
||||||
|
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
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: Android
|
||||||
|
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.
+130
@@ -0,0 +1,130 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: bc57aa85d09f3b056ab86a1439ee1e00
|
||||||
|
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
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: Android
|
||||||
|
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: d92e71a7177e01a44b5bd2b29769f873
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,139 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &-8724064313981675951
|
||||||
|
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: PlayerHandLeft
|
||||||
|
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
|
||||||
|
m_Parent: {fileID: 0}
|
||||||
|
m_ModifiedSerializedProperties: 0
|
||||||
|
m_ValidKeywords:
|
||||||
|
- _METALLICSPECGLOSSMAP
|
||||||
|
- _PARALLAXMAP
|
||||||
|
m_InvalidKeywords: []
|
||||||
|
m_LightmapFlags: 4
|
||||||
|
m_EnableInstancingVariants: 0
|
||||||
|
m_DoubleSidedGI: 0
|
||||||
|
m_CustomRenderQueue: -1
|
||||||
|
stringTagMap:
|
||||||
|
RenderType: Opaque
|
||||||
|
disabledShaderPasses:
|
||||||
|
- MOTIONVECTORS
|
||||||
|
m_LockedProperties:
|
||||||
|
m_SavedProperties:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TexEnvs:
|
||||||
|
- _BaseMap:
|
||||||
|
m_Texture: {fileID: 2800000, guid: e11b3901be78d6a4db30492e11bb456f, 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: e11b3901be78d6a4db30492e11bb456f, type: 3}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MetallicGlossMap:
|
||||||
|
m_Texture: {fileID: 2800000, guid: baf44137300aeb14a9e94dac28b1751f, 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: 2800000, guid: 18668cf8f8b7d9245b747ef442f9dac8, 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}
|
||||||
|
- 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
|
||||||
|
- _OcclusionStrength: 1
|
||||||
|
- _Parallax: 0.005
|
||||||
|
- _QueueOffset: 0
|
||||||
|
- _ReceiveShadows: 1
|
||||||
|
- _Smoothness: 0.024
|
||||||
|
- _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
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: e07188609b56bfb448d5dd8843fecb1e
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 2100000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,139 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &-8724064313981675951
|
||||||
|
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: PlayerHandRight
|
||||||
|
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
|
||||||
|
m_Parent: {fileID: 0}
|
||||||
|
m_ModifiedSerializedProperties: 0
|
||||||
|
m_ValidKeywords:
|
||||||
|
- _METALLICSPECGLOSSMAP
|
||||||
|
- _PARALLAXMAP
|
||||||
|
m_InvalidKeywords: []
|
||||||
|
m_LightmapFlags: 4
|
||||||
|
m_EnableInstancingVariants: 0
|
||||||
|
m_DoubleSidedGI: 0
|
||||||
|
m_CustomRenderQueue: -1
|
||||||
|
stringTagMap:
|
||||||
|
RenderType: Opaque
|
||||||
|
disabledShaderPasses:
|
||||||
|
- MOTIONVECTORS
|
||||||
|
m_LockedProperties:
|
||||||
|
m_SavedProperties:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TexEnvs:
|
||||||
|
- _BaseMap:
|
||||||
|
m_Texture: {fileID: 2800000, guid: 2014c6a01b49c9941bd696b1936e0629, 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: 2014c6a01b49c9941bd696b1936e0629, type: 3}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MetallicGlossMap:
|
||||||
|
m_Texture: {fileID: 2800000, guid: baf44137300aeb14a9e94dac28b1751f, 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: 2800000, guid: 18668cf8f8b7d9245b747ef442f9dac8, 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}
|
||||||
|
- 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
|
||||||
|
- _OcclusionStrength: 1
|
||||||
|
- _Parallax: 0.005
|
||||||
|
- _QueueOffset: 0
|
||||||
|
- _ReceiveShadows: 1
|
||||||
|
- _Smoothness: 0.024
|
||||||
|
- _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
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 406f7588c1f28134badd8bc2a535a21b
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 2100000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
@@ -0,0 +1,117 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 18668cf8f8b7d9245b747ef442f9dac8
|
||||||
|
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: e11b3901be78d6a4db30492e11bb456f
|
||||||
|
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: 2014c6a01b49c9941bd696b1936e0629
|
||||||
|
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: baf44137300aeb14a9e94dac28b1751f
|
||||||
|
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,110 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 89b8ea3befbb7ac3d9998f40fc1bb119
|
||||||
|
ModelImporter:
|
||||||
|
serializedVersion: 24200
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
materials:
|
||||||
|
materialImportMode: 2
|
||||||
|
materialName: 0
|
||||||
|
materialSearch: 1
|
||||||
|
materialLocation: 1
|
||||||
|
animations:
|
||||||
|
legacyGenerateAnimations: 4
|
||||||
|
bakeSimulation: 0
|
||||||
|
resampleCurves: 1
|
||||||
|
optimizeGameObjects: 0
|
||||||
|
removeConstantScaleCurves: 0
|
||||||
|
motionNodeName:
|
||||||
|
animationImportErrors:
|
||||||
|
animationImportWarnings:
|
||||||
|
animationRetargetingWarnings:
|
||||||
|
animationDoRetargetingWarnings: 0
|
||||||
|
importAnimatedCustomProperties: 0
|
||||||
|
importConstraints: 0
|
||||||
|
animationCompression: 1
|
||||||
|
animationRotationError: 0.5
|
||||||
|
animationPositionError: 0.5
|
||||||
|
animationScaleError: 0.5
|
||||||
|
animationWrapMode: 0
|
||||||
|
extraExposedTransformPaths: []
|
||||||
|
extraUserProperties: []
|
||||||
|
clipAnimations: []
|
||||||
|
isReadable: 0
|
||||||
|
meshes:
|
||||||
|
lODScreenPercentages: []
|
||||||
|
globalScale: 1
|
||||||
|
meshCompression: 0
|
||||||
|
addColliders: 0
|
||||||
|
useSRGBMaterialColor: 1
|
||||||
|
sortHierarchyByName: 1
|
||||||
|
importPhysicalCameras: 1
|
||||||
|
importVisibility: 1
|
||||||
|
importBlendShapes: 1
|
||||||
|
importCameras: 1
|
||||||
|
importLights: 1
|
||||||
|
nodeNameCollisionStrategy: 1
|
||||||
|
fileIdsGeneration: 2
|
||||||
|
swapUVChannels: 0
|
||||||
|
generateSecondaryUV: 0
|
||||||
|
useFileUnits: 1
|
||||||
|
keepQuads: 0
|
||||||
|
weldVertices: 1
|
||||||
|
bakeAxisConversion: 0
|
||||||
|
preserveHierarchy: 0
|
||||||
|
skinWeightsMode: 0
|
||||||
|
maxBonesPerVertex: 4
|
||||||
|
minBoneWeight: 0.001
|
||||||
|
optimizeBones: 1
|
||||||
|
generateMeshLods: 0
|
||||||
|
meshLodGenerationFlags: 0
|
||||||
|
maximumMeshLod: -1
|
||||||
|
meshOptimizationFlags: -1
|
||||||
|
indexFormat: 0
|
||||||
|
secondaryUVAngleDistortion: 8
|
||||||
|
secondaryUVAreaDistortion: 15.000001
|
||||||
|
secondaryUVHardAngle: 88
|
||||||
|
secondaryUVMarginMethod: 1
|
||||||
|
secondaryUVMinLightmapResolution: 40
|
||||||
|
secondaryUVMinObjectScale: 1
|
||||||
|
secondaryUVPackMargin: 4
|
||||||
|
useFileScale: 1
|
||||||
|
strictVertexDataChecks: 0
|
||||||
|
tangentSpace:
|
||||||
|
normalSmoothAngle: 60
|
||||||
|
normalImportMode: 0
|
||||||
|
tangentImportMode: 3
|
||||||
|
normalCalculationMode: 4
|
||||||
|
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
|
||||||
|
blendShapeNormalImportMode: 1
|
||||||
|
normalSmoothingSource: 0
|
||||||
|
referencedClips: []
|
||||||
|
importAnimation: 1
|
||||||
|
humanDescription:
|
||||||
|
serializedVersion: 3
|
||||||
|
human: []
|
||||||
|
skeleton: []
|
||||||
|
armTwist: 0.5
|
||||||
|
foreArmTwist: 0.5
|
||||||
|
upperLegTwist: 0.5
|
||||||
|
legTwist: 0.5
|
||||||
|
armStretch: 0.05
|
||||||
|
legStretch: 0.05
|
||||||
|
feetSpacing: 0
|
||||||
|
globalScale: 1
|
||||||
|
rootMotionBoneName:
|
||||||
|
hasTranslationDoF: 0
|
||||||
|
hasExtraRoot: 0
|
||||||
|
skeletonHasParents: 1
|
||||||
|
lastHumanDescriptionAvatarSource: {instanceID: 0}
|
||||||
|
autoGenerateAvatarMappingIfUnspecified: 1
|
||||||
|
animationType: 2
|
||||||
|
humanoidOversampling: 1
|
||||||
|
avatarSetup: 0
|
||||||
|
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
|
||||||
|
importBlendShapeDeformPercent: 1
|
||||||
|
remapMaterialsIfMaterialImportModeIsNone: 0
|
||||||
|
additionalBone: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
@@ -0,0 +1,125 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5bb08b8ca1ff8fd4ba5a49dc457faa4a
|
||||||
|
ModelImporter:
|
||||||
|
serializedVersion: 24200
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects:
|
||||||
|
- first:
|
||||||
|
type: UnityEngine:Material
|
||||||
|
assembly: UnityEngine.CoreModule
|
||||||
|
name: concretefloor01a
|
||||||
|
second: {fileID: 2100000, guid: f8c8c9015cc4df84fbbbe32a4f003660, type: 2}
|
||||||
|
- first:
|
||||||
|
type: UnityEngine:Material
|
||||||
|
assembly: UnityEngine.CoreModule
|
||||||
|
name: plasterwall01a
|
||||||
|
second: {fileID: 2100000, guid: 46c32c803fa6b354e927b3c37077003f, type: 2}
|
||||||
|
- first:
|
||||||
|
type: UnityEngine:Material
|
||||||
|
assembly: UnityEngine.CoreModule
|
||||||
|
name: plasterwall01b
|
||||||
|
second: {fileID: 2100000, guid: 826e07efb851b074080835cf3caee1fa, type: 2}
|
||||||
|
materials:
|
||||||
|
materialImportMode: 2
|
||||||
|
materialName: 0
|
||||||
|
materialSearch: 1
|
||||||
|
materialLocation: 1
|
||||||
|
animations:
|
||||||
|
legacyGenerateAnimations: 4
|
||||||
|
bakeSimulation: 0
|
||||||
|
resampleCurves: 1
|
||||||
|
optimizeGameObjects: 0
|
||||||
|
removeConstantScaleCurves: 0
|
||||||
|
motionNodeName:
|
||||||
|
animationImportErrors:
|
||||||
|
animationImportWarnings:
|
||||||
|
animationRetargetingWarnings:
|
||||||
|
animationDoRetargetingWarnings: 0
|
||||||
|
importAnimatedCustomProperties: 0
|
||||||
|
importConstraints: 0
|
||||||
|
animationCompression: 1
|
||||||
|
animationRotationError: 0.5
|
||||||
|
animationPositionError: 0.5
|
||||||
|
animationScaleError: 0.5
|
||||||
|
animationWrapMode: 0
|
||||||
|
extraExposedTransformPaths: []
|
||||||
|
extraUserProperties: []
|
||||||
|
clipAnimations: []
|
||||||
|
isReadable: 0
|
||||||
|
meshes:
|
||||||
|
lODScreenPercentages: []
|
||||||
|
globalScale: 1
|
||||||
|
meshCompression: 0
|
||||||
|
addColliders: 0
|
||||||
|
useSRGBMaterialColor: 1
|
||||||
|
sortHierarchyByName: 1
|
||||||
|
importPhysicalCameras: 1
|
||||||
|
importVisibility: 1
|
||||||
|
importBlendShapes: 1
|
||||||
|
importCameras: 0
|
||||||
|
importLights: 0
|
||||||
|
nodeNameCollisionStrategy: 1
|
||||||
|
fileIdsGeneration: 2
|
||||||
|
swapUVChannels: 0
|
||||||
|
generateSecondaryUV: 0
|
||||||
|
useFileUnits: 1
|
||||||
|
keepQuads: 0
|
||||||
|
weldVertices: 1
|
||||||
|
bakeAxisConversion: 0
|
||||||
|
preserveHierarchy: 0
|
||||||
|
skinWeightsMode: 0
|
||||||
|
maxBonesPerVertex: 4
|
||||||
|
minBoneWeight: 0.001
|
||||||
|
optimizeBones: 1
|
||||||
|
generateMeshLods: 0
|
||||||
|
meshLodGenerationFlags: 0
|
||||||
|
maximumMeshLod: -1
|
||||||
|
meshOptimizationFlags: -1
|
||||||
|
indexFormat: 0
|
||||||
|
secondaryUVAngleDistortion: 8
|
||||||
|
secondaryUVAreaDistortion: 15.000001
|
||||||
|
secondaryUVHardAngle: 88
|
||||||
|
secondaryUVMarginMethod: 1
|
||||||
|
secondaryUVMinLightmapResolution: 40
|
||||||
|
secondaryUVMinObjectScale: 1
|
||||||
|
secondaryUVPackMargin: 4
|
||||||
|
useFileScale: 1
|
||||||
|
strictVertexDataChecks: 0
|
||||||
|
tangentSpace:
|
||||||
|
normalSmoothAngle: 60
|
||||||
|
normalImportMode: 0
|
||||||
|
tangentImportMode: 3
|
||||||
|
normalCalculationMode: 4
|
||||||
|
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
|
||||||
|
blendShapeNormalImportMode: 1
|
||||||
|
normalSmoothingSource: 0
|
||||||
|
referencedClips: []
|
||||||
|
importAnimation: 0
|
||||||
|
humanDescription:
|
||||||
|
serializedVersion: 3
|
||||||
|
human: []
|
||||||
|
skeleton: []
|
||||||
|
armTwist: 0.5
|
||||||
|
foreArmTwist: 0.5
|
||||||
|
upperLegTwist: 0.5
|
||||||
|
legTwist: 0.5
|
||||||
|
armStretch: 0.05
|
||||||
|
legStretch: 0.05
|
||||||
|
feetSpacing: 0
|
||||||
|
globalScale: 1
|
||||||
|
rootMotionBoneName:
|
||||||
|
hasTranslationDoF: 0
|
||||||
|
hasExtraRoot: 0
|
||||||
|
skeletonHasParents: 1
|
||||||
|
lastHumanDescriptionAvatarSource: {instanceID: 0}
|
||||||
|
autoGenerateAvatarMappingIfUnspecified: 1
|
||||||
|
animationType: 0
|
||||||
|
humanoidOversampling: 1
|
||||||
|
avatarSetup: 0
|
||||||
|
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
|
||||||
|
importBlendShapeDeformPercent: 1
|
||||||
|
remapMaterialsIfMaterialImportModeIsNone: 0
|
||||||
|
additionalBone: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
@@ -0,0 +1,125 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 0b19932df4a705040a78a92607c25da7
|
||||||
|
ModelImporter:
|
||||||
|
serializedVersion: 24200
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects:
|
||||||
|
- first:
|
||||||
|
type: UnityEngine:Material
|
||||||
|
assembly: UnityEngine.CoreModule
|
||||||
|
name: concretefloor01a
|
||||||
|
second: {fileID: 2100000, guid: f8c8c9015cc4df84fbbbe32a4f003660, type: 2}
|
||||||
|
- first:
|
||||||
|
type: UnityEngine:Material
|
||||||
|
assembly: UnityEngine.CoreModule
|
||||||
|
name: plasterwall01a
|
||||||
|
second: {fileID: 2100000, guid: 46c32c803fa6b354e927b3c37077003f, type: 2}
|
||||||
|
- first:
|
||||||
|
type: UnityEngine:Material
|
||||||
|
assembly: UnityEngine.CoreModule
|
||||||
|
name: plasterwall01b
|
||||||
|
second: {fileID: 2100000, guid: 826e07efb851b074080835cf3caee1fa, type: 2}
|
||||||
|
materials:
|
||||||
|
materialImportMode: 2
|
||||||
|
materialName: 0
|
||||||
|
materialSearch: 1
|
||||||
|
materialLocation: 1
|
||||||
|
animations:
|
||||||
|
legacyGenerateAnimations: 4
|
||||||
|
bakeSimulation: 0
|
||||||
|
resampleCurves: 1
|
||||||
|
optimizeGameObjects: 0
|
||||||
|
removeConstantScaleCurves: 0
|
||||||
|
motionNodeName:
|
||||||
|
animationImportErrors:
|
||||||
|
animationImportWarnings:
|
||||||
|
animationRetargetingWarnings:
|
||||||
|
animationDoRetargetingWarnings: 0
|
||||||
|
importAnimatedCustomProperties: 0
|
||||||
|
importConstraints: 0
|
||||||
|
animationCompression: 1
|
||||||
|
animationRotationError: 0.5
|
||||||
|
animationPositionError: 0.5
|
||||||
|
animationScaleError: 0.5
|
||||||
|
animationWrapMode: 0
|
||||||
|
extraExposedTransformPaths: []
|
||||||
|
extraUserProperties: []
|
||||||
|
clipAnimations: []
|
||||||
|
isReadable: 0
|
||||||
|
meshes:
|
||||||
|
lODScreenPercentages: []
|
||||||
|
globalScale: 1
|
||||||
|
meshCompression: 0
|
||||||
|
addColliders: 0
|
||||||
|
useSRGBMaterialColor: 1
|
||||||
|
sortHierarchyByName: 1
|
||||||
|
importPhysicalCameras: 1
|
||||||
|
importVisibility: 1
|
||||||
|
importBlendShapes: 1
|
||||||
|
importCameras: 0
|
||||||
|
importLights: 0
|
||||||
|
nodeNameCollisionStrategy: 1
|
||||||
|
fileIdsGeneration: 2
|
||||||
|
swapUVChannels: 0
|
||||||
|
generateSecondaryUV: 0
|
||||||
|
useFileUnits: 1
|
||||||
|
keepQuads: 0
|
||||||
|
weldVertices: 1
|
||||||
|
bakeAxisConversion: 0
|
||||||
|
preserveHierarchy: 0
|
||||||
|
skinWeightsMode: 0
|
||||||
|
maxBonesPerVertex: 4
|
||||||
|
minBoneWeight: 0.001
|
||||||
|
optimizeBones: 1
|
||||||
|
generateMeshLods: 0
|
||||||
|
meshLodGenerationFlags: 0
|
||||||
|
maximumMeshLod: -1
|
||||||
|
meshOptimizationFlags: -1
|
||||||
|
indexFormat: 0
|
||||||
|
secondaryUVAngleDistortion: 8
|
||||||
|
secondaryUVAreaDistortion: 15.000001
|
||||||
|
secondaryUVHardAngle: 88
|
||||||
|
secondaryUVMarginMethod: 1
|
||||||
|
secondaryUVMinLightmapResolution: 40
|
||||||
|
secondaryUVMinObjectScale: 1
|
||||||
|
secondaryUVPackMargin: 4
|
||||||
|
useFileScale: 1
|
||||||
|
strictVertexDataChecks: 0
|
||||||
|
tangentSpace:
|
||||||
|
normalSmoothAngle: 60
|
||||||
|
normalImportMode: 0
|
||||||
|
tangentImportMode: 3
|
||||||
|
normalCalculationMode: 4
|
||||||
|
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
|
||||||
|
blendShapeNormalImportMode: 1
|
||||||
|
normalSmoothingSource: 0
|
||||||
|
referencedClips: []
|
||||||
|
importAnimation: 0
|
||||||
|
humanDescription:
|
||||||
|
serializedVersion: 3
|
||||||
|
human: []
|
||||||
|
skeleton: []
|
||||||
|
armTwist: 0.5
|
||||||
|
foreArmTwist: 0.5
|
||||||
|
upperLegTwist: 0.5
|
||||||
|
legTwist: 0.5
|
||||||
|
armStretch: 0.05
|
||||||
|
legStretch: 0.05
|
||||||
|
feetSpacing: 0
|
||||||
|
globalScale: 1
|
||||||
|
rootMotionBoneName:
|
||||||
|
hasTranslationDoF: 0
|
||||||
|
hasExtraRoot: 0
|
||||||
|
skeletonHasParents: 1
|
||||||
|
lastHumanDescriptionAvatarSource: {instanceID: 0}
|
||||||
|
autoGenerateAvatarMappingIfUnspecified: 1
|
||||||
|
animationType: 0
|
||||||
|
humanoidOversampling: 1
|
||||||
|
avatarSetup: 0
|
||||||
|
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
|
||||||
|
importBlendShapeDeformPercent: 1
|
||||||
|
remapMaterialsIfMaterialImportModeIsNone: 0
|
||||||
|
additionalBone: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 4a9288bd98374b64dbb6da7ae8e62252
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,254 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!206 &-8360733440207763925
|
||||||
|
BlendTree:
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: MovementBlendTree
|
||||||
|
m_Childs:
|
||||||
|
- serializedVersion: 2
|
||||||
|
m_Motion: {fileID: -3824630287048781337, guid: 4112c0d0844972641938ded51a28c923, type: 3}
|
||||||
|
m_Threshold: 0
|
||||||
|
m_Position: {x: 0, y: 0}
|
||||||
|
m_TimeScale: 1
|
||||||
|
m_CycleOffset: 0
|
||||||
|
m_DirectBlendParameter: Velocity
|
||||||
|
m_Mirror: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
m_Motion: {fileID: -8280318352368864816, guid: 8e3e2305fe09b084da3c3d4384248abb, type: 3}
|
||||||
|
m_Threshold: 10
|
||||||
|
m_Position: {x: 0, y: 0}
|
||||||
|
m_TimeScale: 1
|
||||||
|
m_CycleOffset: 0
|
||||||
|
m_DirectBlendParameter: Velocity
|
||||||
|
m_Mirror: 0
|
||||||
|
m_BlendParameter: Velocity
|
||||||
|
m_BlendParameterY: Blend
|
||||||
|
m_MinThreshold: 0
|
||||||
|
m_MaxThreshold: 10
|
||||||
|
m_UseAutomaticThresholds: 1
|
||||||
|
m_NormalizedBlendValues: 0
|
||||||
|
m_BlendType: 0
|
||||||
|
--- !u!1102 &-5629033588015665725
|
||||||
|
AnimatorState:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: mp_running
|
||||||
|
m_Speed: 1
|
||||||
|
m_CycleOffset: 0
|
||||||
|
m_Transitions: []
|
||||||
|
m_StateMachineBehaviours: []
|
||||||
|
m_Position: {x: 50, y: 50, z: 0}
|
||||||
|
m_IKOnFeet: 0
|
||||||
|
m_WriteDefaultValues: 1
|
||||||
|
m_Mirror: 0
|
||||||
|
m_SpeedParameterActive: 0
|
||||||
|
m_MirrorParameterActive: 0
|
||||||
|
m_CycleOffsetParameterActive: 0
|
||||||
|
m_TimeParameterActive: 0
|
||||||
|
m_Motion: {fileID: -8280318352368864816, guid: 8e3e2305fe09b084da3c3d4384248abb, type: 3}
|
||||||
|
m_Tag:
|
||||||
|
m_SpeedParameter:
|
||||||
|
m_MirrorParameter:
|
||||||
|
m_CycleOffsetParameter:
|
||||||
|
m_TimeParameter:
|
||||||
|
--- !u!1102 &-2916039630496587417
|
||||||
|
AnimatorState:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: mp_clapping
|
||||||
|
m_Speed: 1
|
||||||
|
m_CycleOffset: 0
|
||||||
|
m_Transitions: []
|
||||||
|
m_StateMachineBehaviours: []
|
||||||
|
m_Position: {x: 50, y: 50, z: 0}
|
||||||
|
m_IKOnFeet: 0
|
||||||
|
m_WriteDefaultValues: 1
|
||||||
|
m_Mirror: 0
|
||||||
|
m_SpeedParameterActive: 0
|
||||||
|
m_MirrorParameterActive: 0
|
||||||
|
m_CycleOffsetParameterActive: 0
|
||||||
|
m_TimeParameterActive: 0
|
||||||
|
m_Motion: {fileID: 3547499754263378043, guid: 7ff40260f4ccfc5428aab66857867476, type: 3}
|
||||||
|
m_Tag:
|
||||||
|
m_SpeedParameter:
|
||||||
|
m_MirrorParameter:
|
||||||
|
m_CycleOffsetParameter:
|
||||||
|
m_TimeParameter:
|
||||||
|
--- !u!1102 &-1802283029033093743
|
||||||
|
AnimatorState:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: mp_gun_volley_last
|
||||||
|
m_Speed: 1
|
||||||
|
m_CycleOffset: 0
|
||||||
|
m_Transitions: []
|
||||||
|
m_StateMachineBehaviours: []
|
||||||
|
m_Position: {x: 50, y: 50, z: 0}
|
||||||
|
m_IKOnFeet: 0
|
||||||
|
m_WriteDefaultValues: 1
|
||||||
|
m_Mirror: 0
|
||||||
|
m_SpeedParameterActive: 0
|
||||||
|
m_MirrorParameterActive: 0
|
||||||
|
m_CycleOffsetParameterActive: 0
|
||||||
|
m_TimeParameterActive: 0
|
||||||
|
m_Motion: {fileID: 6434803315060482142, guid: 5f281039932c06f43a2fce0397abaca7, type: 3}
|
||||||
|
m_Tag:
|
||||||
|
m_SpeedParameter:
|
||||||
|
m_MirrorParameter:
|
||||||
|
m_CycleOffsetParameter:
|
||||||
|
m_TimeParameter:
|
||||||
|
--- !u!1102 &-505518113766970177
|
||||||
|
AnimatorState:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: root|root_001|mp_gun_volley_2|Anima_Layer_remap
|
||||||
|
m_Speed: 1
|
||||||
|
m_CycleOffset: 0
|
||||||
|
m_Transitions: []
|
||||||
|
m_StateMachineBehaviours: []
|
||||||
|
m_Position: {x: 50, y: 50, z: 0}
|
||||||
|
m_IKOnFeet: 0
|
||||||
|
m_WriteDefaultValues: 1
|
||||||
|
m_Mirror: 0
|
||||||
|
m_SpeedParameterActive: 0
|
||||||
|
m_MirrorParameterActive: 0
|
||||||
|
m_CycleOffsetParameterActive: 0
|
||||||
|
m_TimeParameterActive: 0
|
||||||
|
m_Motion: {fileID: -74196703312679114, guid: 87594641bab469b4baa699dd3dfb3c02, type: 3}
|
||||||
|
m_Tag:
|
||||||
|
m_SpeedParameter:
|
||||||
|
m_MirrorParameter:
|
||||||
|
m_CycleOffsetParameter:
|
||||||
|
m_TimeParameter:
|
||||||
|
--- !u!91 &9100000
|
||||||
|
AnimatorController:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: PlayerAnimator2
|
||||||
|
serializedVersion: 5
|
||||||
|
m_AnimatorParameters:
|
||||||
|
- m_Name: Velocity
|
||||||
|
m_Type: 1
|
||||||
|
m_DefaultFloat: 0
|
||||||
|
m_DefaultInt: 0
|
||||||
|
m_DefaultBool: 0
|
||||||
|
m_Controller: {fileID: 9100000}
|
||||||
|
m_AnimatorLayers:
|
||||||
|
- serializedVersion: 5
|
||||||
|
m_Name: Base Layer
|
||||||
|
m_StateMachine: {fileID: 3883456281470089086}
|
||||||
|
m_Mask: {fileID: 0}
|
||||||
|
m_Motions: []
|
||||||
|
m_Behaviours: []
|
||||||
|
m_BlendingMode: 0
|
||||||
|
m_SyncedLayerIndex: -1
|
||||||
|
m_DefaultWeight: 0
|
||||||
|
m_IKPass: 0
|
||||||
|
m_SyncedLayerAffectsTiming: 0
|
||||||
|
m_Controller: {fileID: 9100000}
|
||||||
|
--- !u!1102 &896834492238172488
|
||||||
|
AnimatorState:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: MovementBlendTree
|
||||||
|
m_Speed: 0.78
|
||||||
|
m_CycleOffset: 0
|
||||||
|
m_Transitions: []
|
||||||
|
m_StateMachineBehaviours: []
|
||||||
|
m_Position: {x: 50, y: 50, z: 0}
|
||||||
|
m_IKOnFeet: 0
|
||||||
|
m_WriteDefaultValues: 1
|
||||||
|
m_Mirror: 0
|
||||||
|
m_SpeedParameterActive: 0
|
||||||
|
m_MirrorParameterActive: 0
|
||||||
|
m_CycleOffsetParameterActive: 0
|
||||||
|
m_TimeParameterActive: 0
|
||||||
|
m_Motion: {fileID: -8360733440207763925}
|
||||||
|
m_Tag:
|
||||||
|
m_SpeedParameter:
|
||||||
|
m_MirrorParameter:
|
||||||
|
m_CycleOffsetParameter:
|
||||||
|
m_TimeParameter:
|
||||||
|
--- !u!1107 &3883456281470089086
|
||||||
|
AnimatorStateMachine:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: Base Layer
|
||||||
|
m_ChildStates:
|
||||||
|
- serializedVersion: 1
|
||||||
|
m_State: {fileID: 8966126609557704461}
|
||||||
|
m_Position: {x: 620, y: -30, z: 0}
|
||||||
|
- serializedVersion: 1
|
||||||
|
m_State: {fileID: -5629033588015665725}
|
||||||
|
m_Position: {x: 270, y: 230, z: 0}
|
||||||
|
- serializedVersion: 1
|
||||||
|
m_State: {fileID: -1802283029033093743}
|
||||||
|
m_Position: {x: 317.64948, y: 353.36765, z: 0}
|
||||||
|
- serializedVersion: 1
|
||||||
|
m_State: {fileID: -505518113766970177}
|
||||||
|
m_Position: {x: 333.56128, y: 459.44626, z: 0}
|
||||||
|
- serializedVersion: 1
|
||||||
|
m_State: {fileID: -2916039630496587417}
|
||||||
|
m_Position: {x: 325.6054, y: 29.827988, z: 0}
|
||||||
|
- serializedVersion: 1
|
||||||
|
m_State: {fileID: 896834492238172488}
|
||||||
|
m_Position: {x: 290, y: 120, z: 0}
|
||||||
|
m_ChildStateMachines: []
|
||||||
|
m_AnyStateTransitions: []
|
||||||
|
m_EntryTransitions: []
|
||||||
|
m_StateMachineTransitions: {}
|
||||||
|
m_StateMachineBehaviours: []
|
||||||
|
m_AnyStatePosition: {x: 50, y: 20, z: 0}
|
||||||
|
m_EntryPosition: {x: 50, y: 120, z: 0}
|
||||||
|
m_ExitPosition: {x: 800, y: 120, z: 0}
|
||||||
|
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
|
||||||
|
m_DefaultState: {fileID: 896834492238172488}
|
||||||
|
--- !u!1102 &8966126609557704461
|
||||||
|
AnimatorState:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: idle_last
|
||||||
|
m_Speed: 1
|
||||||
|
m_CycleOffset: 0
|
||||||
|
m_Transitions: []
|
||||||
|
m_StateMachineBehaviours: []
|
||||||
|
m_Position: {x: 50, y: 50, z: 0}
|
||||||
|
m_IKOnFeet: 0
|
||||||
|
m_WriteDefaultValues: 1
|
||||||
|
m_Mirror: 0
|
||||||
|
m_SpeedParameterActive: 0
|
||||||
|
m_MirrorParameterActive: 0
|
||||||
|
m_CycleOffsetParameterActive: 0
|
||||||
|
m_TimeParameterActive: 0
|
||||||
|
m_Motion: {fileID: -3824630287048781337, guid: 4112c0d0844972641938ded51a28c923, type: 3}
|
||||||
|
m_Tag:
|
||||||
|
m_SpeedParameter:
|
||||||
|
m_MirrorParameter:
|
||||||
|
m_CycleOffsetParameter:
|
||||||
|
m_TimeParameter:
|
||||||
+8
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: fb981d7a34a97954a9a829276fa89005
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 9100000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
@@ -0,0 +1,110 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 7ff40260f4ccfc5428aab66857867476
|
||||||
|
ModelImporter:
|
||||||
|
serializedVersion: 24200
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
materials:
|
||||||
|
materialImportMode: 2
|
||||||
|
materialName: 0
|
||||||
|
materialSearch: 1
|
||||||
|
materialLocation: 1
|
||||||
|
animations:
|
||||||
|
legacyGenerateAnimations: 4
|
||||||
|
bakeSimulation: 0
|
||||||
|
resampleCurves: 1
|
||||||
|
optimizeGameObjects: 0
|
||||||
|
removeConstantScaleCurves: 0
|
||||||
|
motionNodeName:
|
||||||
|
animationImportErrors:
|
||||||
|
animationImportWarnings:
|
||||||
|
animationRetargetingWarnings:
|
||||||
|
animationDoRetargetingWarnings: 0
|
||||||
|
importAnimatedCustomProperties: 0
|
||||||
|
importConstraints: 0
|
||||||
|
animationCompression: 1
|
||||||
|
animationRotationError: 0.5
|
||||||
|
animationPositionError: 0.5
|
||||||
|
animationScaleError: 0.5
|
||||||
|
animationWrapMode: 0
|
||||||
|
extraExposedTransformPaths: []
|
||||||
|
extraUserProperties: []
|
||||||
|
clipAnimations: []
|
||||||
|
isReadable: 0
|
||||||
|
meshes:
|
||||||
|
lODScreenPercentages: []
|
||||||
|
globalScale: 1
|
||||||
|
meshCompression: 0
|
||||||
|
addColliders: 0
|
||||||
|
useSRGBMaterialColor: 1
|
||||||
|
sortHierarchyByName: 1
|
||||||
|
importPhysicalCameras: 1
|
||||||
|
importVisibility: 1
|
||||||
|
importBlendShapes: 1
|
||||||
|
importCameras: 1
|
||||||
|
importLights: 1
|
||||||
|
nodeNameCollisionStrategy: 1
|
||||||
|
fileIdsGeneration: 2
|
||||||
|
swapUVChannels: 0
|
||||||
|
generateSecondaryUV: 0
|
||||||
|
useFileUnits: 1
|
||||||
|
keepQuads: 0
|
||||||
|
weldVertices: 1
|
||||||
|
bakeAxisConversion: 0
|
||||||
|
preserveHierarchy: 0
|
||||||
|
skinWeightsMode: 0
|
||||||
|
maxBonesPerVertex: 4
|
||||||
|
minBoneWeight: 0.001
|
||||||
|
optimizeBones: 1
|
||||||
|
generateMeshLods: 0
|
||||||
|
meshLodGenerationFlags: 0
|
||||||
|
maximumMeshLod: -1
|
||||||
|
meshOptimizationFlags: -1
|
||||||
|
indexFormat: 0
|
||||||
|
secondaryUVAngleDistortion: 8
|
||||||
|
secondaryUVAreaDistortion: 15.000001
|
||||||
|
secondaryUVHardAngle: 88
|
||||||
|
secondaryUVMarginMethod: 1
|
||||||
|
secondaryUVMinLightmapResolution: 40
|
||||||
|
secondaryUVMinObjectScale: 1
|
||||||
|
secondaryUVPackMargin: 4
|
||||||
|
useFileScale: 1
|
||||||
|
strictVertexDataChecks: 0
|
||||||
|
tangentSpace:
|
||||||
|
normalSmoothAngle: 60
|
||||||
|
normalImportMode: 0
|
||||||
|
tangentImportMode: 3
|
||||||
|
normalCalculationMode: 4
|
||||||
|
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
|
||||||
|
blendShapeNormalImportMode: 1
|
||||||
|
normalSmoothingSource: 0
|
||||||
|
referencedClips: []
|
||||||
|
importAnimation: 1
|
||||||
|
humanDescription:
|
||||||
|
serializedVersion: 3
|
||||||
|
human: []
|
||||||
|
skeleton: []
|
||||||
|
armTwist: 0.5
|
||||||
|
foreArmTwist: 0.5
|
||||||
|
upperLegTwist: 0.5
|
||||||
|
legTwist: 0.5
|
||||||
|
armStretch: 0.05
|
||||||
|
legStretch: 0.05
|
||||||
|
feetSpacing: 0
|
||||||
|
globalScale: 1
|
||||||
|
rootMotionBoneName: root
|
||||||
|
hasTranslationDoF: 0
|
||||||
|
hasExtraRoot: 0
|
||||||
|
skeletonHasParents: 1
|
||||||
|
lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: 87594641bab469b4baa699dd3dfb3c02, type: 3}
|
||||||
|
autoGenerateAvatarMappingIfUnspecified: 1
|
||||||
|
animationType: 2
|
||||||
|
humanoidOversampling: 1
|
||||||
|
avatarSetup: 2
|
||||||
|
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
|
||||||
|
importBlendShapeDeformPercent: 1
|
||||||
|
remapMaterialsIfMaterialImportModeIsNone: 0
|
||||||
|
additionalBone: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
@@ -0,0 +1,120 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 87594641bab469b4baa699dd3dfb3c02
|
||||||
|
ModelImporter:
|
||||||
|
serializedVersion: 24200
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects:
|
||||||
|
- first:
|
||||||
|
type: UnityEngine:Material
|
||||||
|
assembly: UnityEngine.CoreModule
|
||||||
|
name: hand_left
|
||||||
|
second: {fileID: 2100000, guid: e07188609b56bfb448d5dd8843fecb1e, type: 2}
|
||||||
|
- first:
|
||||||
|
type: UnityEngine:Material
|
||||||
|
assembly: UnityEngine.CoreModule
|
||||||
|
name: hand_right
|
||||||
|
second: {fileID: 2100000, guid: 406f7588c1f28134badd8bc2a535a21b, type: 2}
|
||||||
|
materials:
|
||||||
|
materialImportMode: 2
|
||||||
|
materialName: 0
|
||||||
|
materialSearch: 1
|
||||||
|
materialLocation: 1
|
||||||
|
animations:
|
||||||
|
legacyGenerateAnimations: 4
|
||||||
|
bakeSimulation: 0
|
||||||
|
resampleCurves: 1
|
||||||
|
optimizeGameObjects: 0
|
||||||
|
removeConstantScaleCurves: 0
|
||||||
|
motionNodeName:
|
||||||
|
animationImportErrors:
|
||||||
|
animationImportWarnings:
|
||||||
|
animationRetargetingWarnings:
|
||||||
|
animationDoRetargetingWarnings: 0
|
||||||
|
importAnimatedCustomProperties: 0
|
||||||
|
importConstraints: 0
|
||||||
|
animationCompression: 1
|
||||||
|
animationRotationError: 0.5
|
||||||
|
animationPositionError: 0.5
|
||||||
|
animationScaleError: 0.5
|
||||||
|
animationWrapMode: 0
|
||||||
|
extraExposedTransformPaths: []
|
||||||
|
extraUserProperties: []
|
||||||
|
clipAnimations: []
|
||||||
|
isReadable: 0
|
||||||
|
meshes:
|
||||||
|
lODScreenPercentages: []
|
||||||
|
globalScale: 1
|
||||||
|
meshCompression: 0
|
||||||
|
addColliders: 0
|
||||||
|
useSRGBMaterialColor: 1
|
||||||
|
sortHierarchyByName: 1
|
||||||
|
importPhysicalCameras: 1
|
||||||
|
importVisibility: 1
|
||||||
|
importBlendShapes: 1
|
||||||
|
importCameras: 1
|
||||||
|
importLights: 1
|
||||||
|
nodeNameCollisionStrategy: 1
|
||||||
|
fileIdsGeneration: 2
|
||||||
|
swapUVChannels: 0
|
||||||
|
generateSecondaryUV: 0
|
||||||
|
useFileUnits: 1
|
||||||
|
keepQuads: 0
|
||||||
|
weldVertices: 1
|
||||||
|
bakeAxisConversion: 0
|
||||||
|
preserveHierarchy: 0
|
||||||
|
skinWeightsMode: 0
|
||||||
|
maxBonesPerVertex: 4
|
||||||
|
minBoneWeight: 0.001
|
||||||
|
optimizeBones: 1
|
||||||
|
generateMeshLods: 0
|
||||||
|
meshLodGenerationFlags: 0
|
||||||
|
maximumMeshLod: -1
|
||||||
|
meshOptimizationFlags: -1
|
||||||
|
indexFormat: 0
|
||||||
|
secondaryUVAngleDistortion: 8
|
||||||
|
secondaryUVAreaDistortion: 15.000001
|
||||||
|
secondaryUVHardAngle: 88
|
||||||
|
secondaryUVMarginMethod: 1
|
||||||
|
secondaryUVMinLightmapResolution: 40
|
||||||
|
secondaryUVMinObjectScale: 1
|
||||||
|
secondaryUVPackMargin: 4
|
||||||
|
useFileScale: 1
|
||||||
|
strictVertexDataChecks: 0
|
||||||
|
tangentSpace:
|
||||||
|
normalSmoothAngle: 60
|
||||||
|
normalImportMode: 0
|
||||||
|
tangentImportMode: 3
|
||||||
|
normalCalculationMode: 4
|
||||||
|
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
|
||||||
|
blendShapeNormalImportMode: 1
|
||||||
|
normalSmoothingSource: 0
|
||||||
|
referencedClips: []
|
||||||
|
importAnimation: 1
|
||||||
|
humanDescription:
|
||||||
|
serializedVersion: 3
|
||||||
|
human: []
|
||||||
|
skeleton: []
|
||||||
|
armTwist: 0.5
|
||||||
|
foreArmTwist: 0.5
|
||||||
|
upperLegTwist: 0.5
|
||||||
|
legTwist: 0.5
|
||||||
|
armStretch: 0.05
|
||||||
|
legStretch: 0.05
|
||||||
|
feetSpacing: 0
|
||||||
|
globalScale: 1
|
||||||
|
rootMotionBoneName: root
|
||||||
|
hasTranslationDoF: 0
|
||||||
|
hasExtraRoot: 0
|
||||||
|
skeletonHasParents: 1
|
||||||
|
lastHumanDescriptionAvatarSource: {instanceID: 0}
|
||||||
|
autoGenerateAvatarMappingIfUnspecified: 1
|
||||||
|
animationType: 2
|
||||||
|
humanoidOversampling: 1
|
||||||
|
avatarSetup: 1
|
||||||
|
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
|
||||||
|
importBlendShapeDeformPercent: 1
|
||||||
|
remapMaterialsIfMaterialImportModeIsNone: 0
|
||||||
|
additionalBone: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!1001 &2322717619858247799
|
||||||
|
PrefabInstance:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Modification:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TransformParent: {fileID: 0}
|
||||||
|
m_Modifications:
|
||||||
|
- target: {fileID: -8679921383154817045, guid: 87594641bab469b4baa699dd3dfb3c02, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: -8679921383154817045, guid: 87594641bab469b4baa699dd3dfb3c02, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: -8679921383154817045, guid: 87594641bab469b4baa699dd3dfb3c02, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: -8679921383154817045, guid: 87594641bab469b4baa699dd3dfb3c02, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.w
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: -8679921383154817045, guid: 87594641bab469b4baa699dd3dfb3c02, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: -8679921383154817045, guid: 87594641bab469b4baa699dd3dfb3c02, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: -8679921383154817045, guid: 87594641bab469b4baa699dd3dfb3c02, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: -8679921383154817045, guid: 87594641bab469b4baa699dd3dfb3c02, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: -8679921383154817045, guid: 87594641bab469b4baa699dd3dfb3c02, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: -8679921383154817045, guid: 87594641bab469b4baa699dd3dfb3c02, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 919132149155446097, guid: 87594641bab469b4baa699dd3dfb3c02, type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: mp_gun_volley_3
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5866666021909216657, guid: 87594641bab469b4baa699dd3dfb3c02, type: 3}
|
||||||
|
propertyPath: m_Controller
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 9100000, guid: fb981d7a34a97954a9a829276fa89005, type: 2}
|
||||||
|
m_RemovedComponents: []
|
||||||
|
m_RemovedGameObjects: []
|
||||||
|
m_AddedGameObjects: []
|
||||||
|
m_AddedComponents: []
|
||||||
|
m_SourcePrefab: {fileID: 100100000, guid: 87594641bab469b4baa699dd3dfb3c02, type: 3}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: cbae1b551f875e24e913964e5358651e
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
@@ -0,0 +1,110 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5f281039932c06f43a2fce0397abaca7
|
||||||
|
ModelImporter:
|
||||||
|
serializedVersion: 24200
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
materials:
|
||||||
|
materialImportMode: 2
|
||||||
|
materialName: 0
|
||||||
|
materialSearch: 1
|
||||||
|
materialLocation: 1
|
||||||
|
animations:
|
||||||
|
legacyGenerateAnimations: 4
|
||||||
|
bakeSimulation: 0
|
||||||
|
resampleCurves: 1
|
||||||
|
optimizeGameObjects: 0
|
||||||
|
removeConstantScaleCurves: 0
|
||||||
|
motionNodeName:
|
||||||
|
animationImportErrors:
|
||||||
|
animationImportWarnings:
|
||||||
|
animationRetargetingWarnings:
|
||||||
|
animationDoRetargetingWarnings: 0
|
||||||
|
importAnimatedCustomProperties: 0
|
||||||
|
importConstraints: 0
|
||||||
|
animationCompression: 1
|
||||||
|
animationRotationError: 0.5
|
||||||
|
animationPositionError: 0.5
|
||||||
|
animationScaleError: 0.5
|
||||||
|
animationWrapMode: 0
|
||||||
|
extraExposedTransformPaths: []
|
||||||
|
extraUserProperties: []
|
||||||
|
clipAnimations: []
|
||||||
|
isReadable: 0
|
||||||
|
meshes:
|
||||||
|
lODScreenPercentages: []
|
||||||
|
globalScale: 1
|
||||||
|
meshCompression: 0
|
||||||
|
addColliders: 0
|
||||||
|
useSRGBMaterialColor: 1
|
||||||
|
sortHierarchyByName: 1
|
||||||
|
importPhysicalCameras: 1
|
||||||
|
importVisibility: 1
|
||||||
|
importBlendShapes: 1
|
||||||
|
importCameras: 1
|
||||||
|
importLights: 1
|
||||||
|
nodeNameCollisionStrategy: 1
|
||||||
|
fileIdsGeneration: 2
|
||||||
|
swapUVChannels: 0
|
||||||
|
generateSecondaryUV: 0
|
||||||
|
useFileUnits: 1
|
||||||
|
keepQuads: 0
|
||||||
|
weldVertices: 1
|
||||||
|
bakeAxisConversion: 0
|
||||||
|
preserveHierarchy: 0
|
||||||
|
skinWeightsMode: 0
|
||||||
|
maxBonesPerVertex: 4
|
||||||
|
minBoneWeight: 0.001
|
||||||
|
optimizeBones: 1
|
||||||
|
generateMeshLods: 0
|
||||||
|
meshLodGenerationFlags: 0
|
||||||
|
maximumMeshLod: -1
|
||||||
|
meshOptimizationFlags: -1
|
||||||
|
indexFormat: 0
|
||||||
|
secondaryUVAngleDistortion: 8
|
||||||
|
secondaryUVAreaDistortion: 15.000001
|
||||||
|
secondaryUVHardAngle: 88
|
||||||
|
secondaryUVMarginMethod: 1
|
||||||
|
secondaryUVMinLightmapResolution: 40
|
||||||
|
secondaryUVMinObjectScale: 1
|
||||||
|
secondaryUVPackMargin: 4
|
||||||
|
useFileScale: 1
|
||||||
|
strictVertexDataChecks: 0
|
||||||
|
tangentSpace:
|
||||||
|
normalSmoothAngle: 60
|
||||||
|
normalImportMode: 0
|
||||||
|
tangentImportMode: 3
|
||||||
|
normalCalculationMode: 4
|
||||||
|
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
|
||||||
|
blendShapeNormalImportMode: 1
|
||||||
|
normalSmoothingSource: 0
|
||||||
|
referencedClips: []
|
||||||
|
importAnimation: 1
|
||||||
|
humanDescription:
|
||||||
|
serializedVersion: 3
|
||||||
|
human: []
|
||||||
|
skeleton: []
|
||||||
|
armTwist: 0.5
|
||||||
|
foreArmTwist: 0.5
|
||||||
|
upperLegTwist: 0.5
|
||||||
|
legTwist: 0.5
|
||||||
|
armStretch: 0.05
|
||||||
|
legStretch: 0.05
|
||||||
|
feetSpacing: 0
|
||||||
|
globalScale: 1
|
||||||
|
rootMotionBoneName: root
|
||||||
|
hasTranslationDoF: 0
|
||||||
|
hasExtraRoot: 0
|
||||||
|
skeletonHasParents: 1
|
||||||
|
lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: 87594641bab469b4baa699dd3dfb3c02, type: 3}
|
||||||
|
autoGenerateAvatarMappingIfUnspecified: 1
|
||||||
|
animationType: 2
|
||||||
|
humanoidOversampling: 1
|
||||||
|
avatarSetup: 2
|
||||||
|
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
|
||||||
|
importBlendShapeDeformPercent: 1
|
||||||
|
remapMaterialsIfMaterialImportModeIsNone: 0
|
||||||
|
additionalBone: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
@@ -0,0 +1,110 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 4112c0d0844972641938ded51a28c923
|
||||||
|
ModelImporter:
|
||||||
|
serializedVersion: 24200
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
materials:
|
||||||
|
materialImportMode: 2
|
||||||
|
materialName: 0
|
||||||
|
materialSearch: 1
|
||||||
|
materialLocation: 1
|
||||||
|
animations:
|
||||||
|
legacyGenerateAnimations: 4
|
||||||
|
bakeSimulation: 0
|
||||||
|
resampleCurves: 1
|
||||||
|
optimizeGameObjects: 0
|
||||||
|
removeConstantScaleCurves: 0
|
||||||
|
motionNodeName:
|
||||||
|
animationImportErrors:
|
||||||
|
animationImportWarnings:
|
||||||
|
animationRetargetingWarnings:
|
||||||
|
animationDoRetargetingWarnings: 0
|
||||||
|
importAnimatedCustomProperties: 0
|
||||||
|
importConstraints: 0
|
||||||
|
animationCompression: 1
|
||||||
|
animationRotationError: 0.5
|
||||||
|
animationPositionError: 0.5
|
||||||
|
animationScaleError: 0.5
|
||||||
|
animationWrapMode: 0
|
||||||
|
extraExposedTransformPaths: []
|
||||||
|
extraUserProperties: []
|
||||||
|
clipAnimations: []
|
||||||
|
isReadable: 0
|
||||||
|
meshes:
|
||||||
|
lODScreenPercentages: []
|
||||||
|
globalScale: 1
|
||||||
|
meshCompression: 0
|
||||||
|
addColliders: 0
|
||||||
|
useSRGBMaterialColor: 1
|
||||||
|
sortHierarchyByName: 1
|
||||||
|
importPhysicalCameras: 1
|
||||||
|
importVisibility: 1
|
||||||
|
importBlendShapes: 1
|
||||||
|
importCameras: 1
|
||||||
|
importLights: 1
|
||||||
|
nodeNameCollisionStrategy: 1
|
||||||
|
fileIdsGeneration: 2
|
||||||
|
swapUVChannels: 0
|
||||||
|
generateSecondaryUV: 0
|
||||||
|
useFileUnits: 1
|
||||||
|
keepQuads: 0
|
||||||
|
weldVertices: 1
|
||||||
|
bakeAxisConversion: 0
|
||||||
|
preserveHierarchy: 0
|
||||||
|
skinWeightsMode: 0
|
||||||
|
maxBonesPerVertex: 4
|
||||||
|
minBoneWeight: 0.001
|
||||||
|
optimizeBones: 1
|
||||||
|
generateMeshLods: 0
|
||||||
|
meshLodGenerationFlags: 0
|
||||||
|
maximumMeshLod: -1
|
||||||
|
meshOptimizationFlags: -1
|
||||||
|
indexFormat: 0
|
||||||
|
secondaryUVAngleDistortion: 8
|
||||||
|
secondaryUVAreaDistortion: 15.000001
|
||||||
|
secondaryUVHardAngle: 88
|
||||||
|
secondaryUVMarginMethod: 1
|
||||||
|
secondaryUVMinLightmapResolution: 40
|
||||||
|
secondaryUVMinObjectScale: 1
|
||||||
|
secondaryUVPackMargin: 4
|
||||||
|
useFileScale: 1
|
||||||
|
strictVertexDataChecks: 0
|
||||||
|
tangentSpace:
|
||||||
|
normalSmoothAngle: 60
|
||||||
|
normalImportMode: 0
|
||||||
|
tangentImportMode: 3
|
||||||
|
normalCalculationMode: 4
|
||||||
|
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
|
||||||
|
blendShapeNormalImportMode: 1
|
||||||
|
normalSmoothingSource: 0
|
||||||
|
referencedClips: []
|
||||||
|
importAnimation: 1
|
||||||
|
humanDescription:
|
||||||
|
serializedVersion: 3
|
||||||
|
human: []
|
||||||
|
skeleton: []
|
||||||
|
armTwist: 0.5
|
||||||
|
foreArmTwist: 0.5
|
||||||
|
upperLegTwist: 0.5
|
||||||
|
legTwist: 0.5
|
||||||
|
armStretch: 0.05
|
||||||
|
legStretch: 0.05
|
||||||
|
feetSpacing: 0
|
||||||
|
globalScale: 1
|
||||||
|
rootMotionBoneName: root
|
||||||
|
hasTranslationDoF: 0
|
||||||
|
hasExtraRoot: 0
|
||||||
|
skeletonHasParents: 1
|
||||||
|
lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: 87594641bab469b4baa699dd3dfb3c02, type: 3}
|
||||||
|
autoGenerateAvatarMappingIfUnspecified: 1
|
||||||
|
animationType: 2
|
||||||
|
humanoidOversampling: 1
|
||||||
|
avatarSetup: 2
|
||||||
|
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
|
||||||
|
importBlendShapeDeformPercent: 1
|
||||||
|
remapMaterialsIfMaterialImportModeIsNone: 0
|
||||||
|
additionalBone: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Loaded 100 of 167 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user