Звуки шагов, ядерный таракан, монстр дед
This commit is contained in:
1 parent
134adda787
commit
2897eb88bf
20 files changed
+79004
-690
No files matched your search
@@ -203,6 +203,11 @@ MonoBehaviour:
|
|||||||
m_ReadOnly: 0
|
m_ReadOnly: 0
|
||||||
m_SerializedLabels: []
|
m_SerializedLabels: []
|
||||||
FlaggedDuringContentUpdateRestriction: 0
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: bf87bc9ac43df86be8c818de81d44a54
|
||||||
|
m_Address: Assets/Resources_moved/Audio/SFX/pl_step1.wav
|
||||||
|
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
|
||||||
|
|||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: d36aab6707c518f5abfd60065165eb35
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -72,7 +72,9 @@ namespace Code.App.AppStates
|
|||||||
Context.UIService.AsyncSwitchPanelTo(UIPanel.Gameplay),
|
Context.UIService.AsyncSwitchPanelTo(UIPanel.Gameplay),
|
||||||
Context.AudioFactory.WarmGameplayMusic(),
|
Context.AudioFactory.WarmGameplayMusic(),
|
||||||
Context.AudioFactory.WarmSFX(),
|
Context.AudioFactory.WarmSFX(),
|
||||||
Context.AudioFactory.WarmDispatcher()
|
Context.AudioFactory.WarmDispatcher(),
|
||||||
|
Context.AudioFactory.WarmEnemies(),
|
||||||
|
Context.AudioFactory.WarmCourier()
|
||||||
);
|
);
|
||||||
|
|
||||||
Context.LoadingManager
|
Context.LoadingManager
|
||||||
@@ -207,6 +209,10 @@ namespace Code.App.AppStates
|
|||||||
Context.InputService.DisableMap(ActionMappings.Gameplay);
|
Context.InputService.DisableMap(ActionMappings.Gameplay);
|
||||||
Context.AudioService.GladlyAskToStopMusic(MusicType.Action, callback: Context.AudioFactory.ReleaseActionMusic);
|
Context.AudioService.GladlyAskToStopMusic(MusicType.Action, callback: Context.AudioFactory.ReleaseActionMusic);
|
||||||
Context.AudioService.GladlyAskToStopMusic(MusicType.Peaceful, callback: Context.AudioFactory.ReleasePeacefulMusic);
|
Context.AudioService.GladlyAskToStopMusic(MusicType.Peaceful, callback: Context.AudioFactory.ReleasePeacefulMusic);
|
||||||
|
Context.AudioFactory.ReleaseCourier();
|
||||||
|
Context.AudioFactory.ReleaseDispatcher();
|
||||||
|
Context.AudioFactory.ReleaseEnemies();
|
||||||
|
Context.AudioFactory.ReleaseSFX();
|
||||||
|
|
||||||
|
|
||||||
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug1, InstaKillDEBUG);
|
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug1, InstaKillDEBUG);
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ namespace Code.Audio
|
|||||||
List<AudioClip> SFXAudios { get; }
|
List<AudioClip> SFXAudios { get; }
|
||||||
List<AudioClip> EnemiesAudios { get; }
|
List<AudioClip> EnemiesAudios { get; }
|
||||||
List<AudioClip> DispatcherAudios { get; }
|
List<AudioClip> DispatcherAudios { get; }
|
||||||
|
List<AudioClip> CourierAudios { get; }
|
||||||
UniTask LoadAudioSourcePrefab(Action<GameObject> callback);
|
UniTask LoadAudioSourcePrefab(Action<GameObject> callback);
|
||||||
UniTask WarmGameplayMusic( );
|
UniTask WarmGameplayMusic( );
|
||||||
void ReleaseActionMusic();
|
void ReleaseActionMusic();
|
||||||
@@ -28,5 +29,7 @@ namespace Code.Audio
|
|||||||
void ReleaseEnemies();
|
void ReleaseEnemies();
|
||||||
UniTask WarmDispatcher( );
|
UniTask WarmDispatcher( );
|
||||||
void ReleaseDispatcher();
|
void ReleaseDispatcher();
|
||||||
|
UniTask WarmCourier();
|
||||||
|
void ReleaseCourier();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
using Code.Audio;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.AI;
|
using UnityEngine.AI;
|
||||||
using Code.Gameplay.Player;
|
using Code.Gameplay.Player;
|
||||||
@@ -14,6 +15,7 @@ namespace Code.Gameplay.Enemies
|
|||||||
{
|
{
|
||||||
[SerializeField] protected NavMeshAgent agent;
|
[SerializeField] protected NavMeshAgent agent;
|
||||||
[SerializeField] protected Collider enemyCollider;
|
[SerializeField] protected Collider enemyCollider;
|
||||||
|
[Inject] protected IAudioService audioService;
|
||||||
|
|
||||||
protected int Damage;
|
protected int Damage;
|
||||||
protected float AttackCooldown;
|
protected float AttackCooldown;
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
using Code.Audio;
|
||||||
using Code.Configs;
|
using Code.Configs;
|
||||||
using Reflex.Attributes;
|
using Reflex.Attributes;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
@@ -47,6 +48,7 @@ namespace Code.Gameplay.Enemies
|
|||||||
|
|
||||||
var distance = Vector3.Distance(transform.position, Player.transform.position);
|
var distance = Vector3.Distance(transform.position, Player.transform.position);
|
||||||
|
|
||||||
|
audioService.PlayEnemy(EnemiesSounds.Bravo,agent.transform.position);
|
||||||
if (!(distance <= AttackRange)) return;
|
if (!(distance <= AttackRange)) return;
|
||||||
|
|
||||||
DealDamage();
|
DealDamage();
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
using Code.Audio;
|
||||||
using Code.Configs;
|
using Code.Configs;
|
||||||
using Code.Gameplay.Enemies.Animators;
|
using Code.Gameplay.Enemies.Animators;
|
||||||
using Reflex.Attributes;
|
using Reflex.Attributes;
|
||||||
@@ -49,6 +50,8 @@ namespace Code.Gameplay.Enemies
|
|||||||
|
|
||||||
if (!(distance <= AttackRange)) return;
|
if (!(distance <= AttackRange)) return;
|
||||||
|
|
||||||
|
audioService.PlayEnemy(EnemiesSounds.Bastard,agent.transform.position);
|
||||||
|
|
||||||
if (Player.CustomCharacterController.IsSliding)
|
if (Player.CustomCharacterController.IsSliding)
|
||||||
ApplyStun();
|
ApplyStun();
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ namespace Code.Gameplay.Player
|
|||||||
|
|
||||||
public void PlayStep()
|
public void PlayStep()
|
||||||
{
|
{
|
||||||
// _audioSource.PlayOneShot();
|
_audioSource.PlayOneShot(_audioFactory.CourierAudios[(int)CourierSounds.Step]);
|
||||||
}
|
}
|
||||||
private void OnDestroy()
|
private void OnDestroy()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ namespace Code.Gameplay.Player
|
|||||||
if (count < 0) count = _playerConfig.maxHealth;
|
if (count < 0) count = _playerConfig.maxHealth;
|
||||||
|
|
||||||
return new(count);
|
return new(count);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async UniTask<CharacterProvider> CreatePlayer()
|
public async UniTask<CharacterProvider> CreatePlayer()
|
||||||
{
|
{
|
||||||
@@ -42,7 +42,13 @@ namespace Code.Gameplay.Player
|
|||||||
Addressables.ReleaseInstance(characterProvider.gameObject);
|
Addressables.ReleaseInstance(characterProvider.gameObject);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async UniTask<ArmsMeshProvider> CreateArms(Transform papochka) => (await Addressables.InstantiateAsync(_playerConfig.armsMeshPrefab, papochka).ToUniTask()).GetComponent<ArmsMeshProvider>();
|
public async UniTask<ArmsMeshProvider> CreateArms(Transform papochka)
|
||||||
|
{
|
||||||
|
var armsMesh = (await Addressables.InstantiateAsync(_playerConfig.armsMeshPrefab, papochka).ToUniTask());
|
||||||
|
GameObjectInjector.InjectRecursive(armsMesh, Container.ProjectContainer);
|
||||||
|
|
||||||
|
return armsMesh.GetComponent<ArmsMeshProvider>();
|
||||||
|
}
|
||||||
public void ReleaseArms(ArmsMeshProvider arms) => Addressables.ReleaseInstance(arms.gameObject);
|
public void ReleaseArms(ArmsMeshProvider arms) => Addressables.ReleaseInstance(arms.gameObject);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -43,3 +43,18 @@ MonoBehaviour:
|
|||||||
m_SubObjectType:
|
m_SubObjectType:
|
||||||
m_SubObjectGUID:
|
m_SubObjectGUID:
|
||||||
m_EditorAssetChanged: 1
|
m_EditorAssetChanged: 1
|
||||||
|
- m_AssetGUID: 144ab5188f8ad7a0a92c75703bd12e60
|
||||||
|
m_SubObjectName:
|
||||||
|
m_SubObjectType:
|
||||||
|
m_SubObjectGUID:
|
||||||
|
m_EditorAssetChanged: 0
|
||||||
|
- m_AssetGUID: a306df57f348ce7cf900d0b9431739ee
|
||||||
|
m_SubObjectName:
|
||||||
|
m_SubObjectType:
|
||||||
|
m_SubObjectGUID:
|
||||||
|
m_EditorAssetChanged: 0
|
||||||
|
- m_AssetGUID: f74a409bf11b25148ad305acc05b14f5
|
||||||
|
m_SubObjectName:
|
||||||
|
m_SubObjectType:
|
||||||
|
m_SubObjectGUID:
|
||||||
|
m_EditorAssetChanged: 1
|
||||||
@@ -12,4 +12,9 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: 83304a98bbdc4e7c9c7c643653ae1368, type: 3}
|
m_Script: {fileID: 11500000, guid: 83304a98bbdc4e7c9c7c643653ae1368, type: 3}
|
||||||
m_Name: CourierSoundListConfig
|
m_Name: CourierSoundListConfig
|
||||||
m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.CourierSoundListConfig
|
m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.CourierSoundListConfig
|
||||||
courierSounds: []
|
courierSounds:
|
||||||
|
- m_AssetGUID: bf87bc9ac43df86be8c818de81d44a54
|
||||||
|
m_SubObjectName:
|
||||||
|
m_SubObjectType:
|
||||||
|
m_SubObjectGUID:
|
||||||
|
m_EditorAssetChanged: 0
|
||||||
@@ -17,7 +17,7 @@ BlendTree:
|
|||||||
m_DirectBlendParameter: Velocity
|
m_DirectBlendParameter: Velocity
|
||||||
m_Mirror: 0
|
m_Mirror: 0
|
||||||
- serializedVersion: 2
|
- serializedVersion: 2
|
||||||
m_Motion: {fileID: -8280318352368864816, guid: 8e3e2305fe09b084da3c3d4384248abb, type: 3}
|
m_Motion: {fileID: 7400000, guid: 0963adebbe96b16789d89143045734ff, type: 2}
|
||||||
m_Threshold: 10
|
m_Threshold: 10
|
||||||
m_Position: {x: 0, y: 0}
|
m_Position: {x: 0, y: 0}
|
||||||
m_TimeScale: 1
|
m_TimeScale: 1
|
||||||
|
|||||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 0963adebbe96b16789d89143045734ff
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 7400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -12,9 +12,9 @@ Texture2D:
|
|||||||
Hash: 00000000000000000000000000000000
|
Hash: 00000000000000000000000000000000
|
||||||
m_IsAlphaChannelOptional: 0
|
m_IsAlphaChannelOptional: 0
|
||||||
serializedVersion: 4
|
serializedVersion: 4
|
||||||
m_Width: 1024
|
m_Width: 1
|
||||||
m_Height: 1024
|
m_Height: 1
|
||||||
m_CompleteImageSize: 1048576
|
m_CompleteImageSize: 1
|
||||||
m_MipsStripped: 0
|
m_MipsStripped: 0
|
||||||
m_TextureFormat: 1
|
m_TextureFormat: 1
|
||||||
m_MipCount: 1
|
m_MipCount: 1
|
||||||
@@ -39,8 +39,8 @@ Texture2D:
|
|||||||
m_LightmapFormat: 0
|
m_LightmapFormat: 0
|
||||||
m_ColorSpace: 1
|
m_ColorSpace: 1
|
||||||
m_PlatformBlob:
|
m_PlatformBlob:
|
||||||
image data: 1048576
|
image data: 1
|
||||||
_typelessdata: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010406070a0d0e0e0d0c0906050300000000000000000000000000000000010406070a0d0e0e0d0c0906050300000000000000000000000000000000010406070a0d0e0e0d0c090806030000000000000000000000000000000000020507080a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a08070502000000000000000000000000000000000000000000000000000000000000000000010406070809090a0a09090807060401000000000000000000000000000000000000000000000000000000000000000105090b0c13131313131313131313131312110e0904000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001050707090a0a09080706040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000105090b0c13131313131313131313131312110e09040000000000000000000000000205070813131313131313131313131310100d0a0500000000000000000000000000000000000000000000000000000000000005090d0f1013131313131313131313130f0e0c08040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000306070809090a0a09090806050300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001070d10131417191a1b1a191613120f0b0600000000000000000000000001070d11131417191a1b1a191613120f0b0600000000000000000000000001080d11131417191a1b1a191615130f0a040000000000000000000000000002090e1214151616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161514120e0902000000000000000000000000000000000000000000000000000002050708070d11131415151616171616151413110d070906050300000000000000000000000000000000000000000000000000060c111518182020202020202020202020201f1d1a150f08000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004060709080d11131416161616151413100c07060300000000000000000000000000000000000000000000000000000000000000000000000000000000000000060c111518182020202020202020202020201f1d1a150f0800000000000000000002090e1114142020202020202020202020201d1c1a16110a030000000000000000000000000000Line truncated
|
_typelessdata: 00
|
||||||
m_StreamData:
|
m_StreamData:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
offset: 0
|
offset: 0
|
||||||
@@ -106,293 +106,8 @@ MonoBehaviour:
|
|||||||
m_SourceFontFilePath:
|
m_SourceFontFilePath:
|
||||||
m_AtlasPopulationMode: 1
|
m_AtlasPopulationMode: 1
|
||||||
InternalDynamicOS: 0
|
InternalDynamicOS: 0
|
||||||
m_GlyphTable:
|
m_GlyphTable: []
|
||||||
- m_Index: 659
|
m_CharacterTable: []
|
||||||
m_Metrics:
|
|
||||||
m_Width: 74.265625
|
|
||||||
m_Height: 14.015625
|
|
||||||
m_HorizontalBearingX: 8.265625
|
|
||||||
m_HorizontalBearingY: 13.40625
|
|
||||||
m_HorizontalAdvance: 90.875
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 10
|
|
||||||
m_Y: 10
|
|
||||||
m_Width: 75
|
|
||||||
m_Height: 15
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 64
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 45.875
|
|
||||||
m_Height: 4.484375
|
|
||||||
m_HorizontalBearingX: -0.4375
|
|
||||||
m_HorizontalBearingY: -6.765625
|
|
||||||
m_HorizontalAdvance: 45
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 104
|
|
||||||
m_Y: 10
|
|
||||||
m_Width: 47
|
|
||||||
m_Height: 6
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 472
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 48.125
|
|
||||||
m_Height: 63.375
|
|
||||||
m_HorizontalBearingX: 1.453125
|
|
||||||
m_HorizontalBearingY: 62.09375
|
|
||||||
m_HorizontalAdvance: 53.484375
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 170
|
|
||||||
m_Y: 10
|
|
||||||
m_Width: 49
|
|
||||||
m_Height: 65
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 465
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 56.421875
|
|
||||||
m_Height: 60.828125
|
|
||||||
m_HorizontalBearingX: 1.1875
|
|
||||||
m_HorizontalBearingY: 60.828125
|
|
||||||
m_HorizontalAdvance: 58.75
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 10
|
|
||||||
m_Y: 44
|
|
||||||
m_Width: 57
|
|
||||||
m_Height: 61
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 468
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 39.421875
|
|
||||||
m_Height: 60.828125
|
|
||||||
m_HorizontalBearingX: 5.578125
|
|
||||||
m_HorizontalBearingY: 60.828125
|
|
||||||
m_HorizontalAdvance: 46.796875
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 104
|
|
||||||
m_Y: 35
|
|
||||||
m_Width: 40
|
|
||||||
m_Height: 61
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 481
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 44.421875
|
|
||||||
m_Height: 60.828125
|
|
||||||
m_HorizontalBearingX: 6.59375
|
|
||||||
m_HorizontalBearingY: 60.828125
|
|
||||||
m_HorizontalAdvance: 54.453125
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 238
|
|
||||||
m_Y: 10
|
|
||||||
m_Width: 46
|
|
||||||
m_Height: 61
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 484
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 53.1875
|
|
||||||
m_Height: 62.109375
|
|
||||||
m_HorizontalBearingX: 1.53125
|
|
||||||
m_HorizontalBearingY: 60.828125
|
|
||||||
m_HorizontalAdvance: 55.453125
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 303
|
|
||||||
m_Y: 10
|
|
||||||
m_Width: 54
|
|
||||||
m_Height: 63
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 475
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 46.3125
|
|
||||||
m_Height: 60.828125
|
|
||||||
m_HorizontalBearingX: 6.59375
|
|
||||||
m_HorizontalBearingY: 60.828125
|
|
||||||
m_HorizontalAdvance: 56.515625
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 376
|
|
||||||
m_Y: 10
|
|
||||||
m_Width: 47
|
|
||||||
m_Height: 61
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 483
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 49.84375
|
|
||||||
m_Height: 60.828125
|
|
||||||
m_HorizontalBearingX: 1.53125
|
|
||||||
m_HorizontalBearingY: 60.828125
|
|
||||||
m_HorizontalAdvance: 52.90625
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 442
|
|
||||||
m_Y: 10
|
|
||||||
m_Width: 51
|
|
||||||
m_Height: 61
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 479
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 52.375
|
|
||||||
m_Height: 63.375
|
|
||||||
m_HorizontalBearingX: 3.78125
|
|
||||||
m_HorizontalBearingY: 62.09375
|
|
||||||
m_HorizontalAdvance: 59.9375
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 512
|
|
||||||
m_Y: 10
|
|
||||||
m_Width: 54
|
|
||||||
m_Height: 65
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 490
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 76.03125
|
|
||||||
m_Height: 71.640625
|
|
||||||
m_HorizontalBearingX: 6.59375
|
|
||||||
m_HorizontalBearingY: 60.828125
|
|
||||||
m_HorizontalAdvance: 83.796875
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 376
|
|
||||||
m_Y: 90
|
|
||||||
m_Width: 77
|
|
||||||
m_Height: 72
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 470
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 39.5
|
|
||||||
m_Height: 60.828125
|
|
||||||
m_HorizontalBearingX: 6.59375
|
|
||||||
m_HorizontalBearingY: 60.828125
|
|
||||||
m_HorizontalAdvance: 50.5
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 238
|
|
||||||
m_Y: 90
|
|
||||||
m_Width: 41
|
|
||||||
m_Height: 61
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 478
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 48.78125
|
|
||||||
m_Height: 60.828125
|
|
||||||
m_HorizontalBearingX: 6.59375
|
|
||||||
m_HorizontalBearingY: 60.828125
|
|
||||||
m_HorizontalAdvance: 61.921875
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 163
|
|
||||||
m_Y: 94
|
|
||||||
m_Width: 50
|
|
||||||
m_Height: 61
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 1
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 0
|
|
||||||
m_Height: 0
|
|
||||||
m_HorizontalBearingX: 0
|
|
||||||
m_HorizontalBearingY: 0
|
|
||||||
m_HorizontalAdvance: 21.625
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 0
|
|
||||||
m_Y: 0
|
|
||||||
m_Width: 0
|
|
||||||
m_Height: 0
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
- m_Index: 15
|
|
||||||
m_Metrics:
|
|
||||||
m_Width: 14.328125
|
|
||||||
m_Height: 14.015625
|
|
||||||
m_HorizontalBearingX: 5.671875
|
|
||||||
m_HorizontalBearingY: 13.40625
|
|
||||||
m_HorizontalAdvance: 25.671875
|
|
||||||
m_GlyphRect:
|
|
||||||
m_X: 472
|
|
||||||
m_Y: 90
|
|
||||||
m_Width: 15
|
|
||||||
m_Height: 15
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
m_CharacterTable:
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 8230
|
|
||||||
m_GlyphIndex: 659
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 95
|
|
||||||
m_GlyphIndex: 64
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 1047
|
|
||||||
m_GlyphIndex: 472
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 1040
|
|
||||||
m_GlyphIndex: 465
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 1043
|
|
||||||
m_GlyphIndex: 468
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 1056
|
|
||||||
m_GlyphIndex: 481
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 1059
|
|
||||||
m_GlyphIndex: 484
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 1050
|
|
||||||
m_GlyphIndex: 475
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 1058
|
|
||||||
m_GlyphIndex: 483
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 1054
|
|
||||||
m_GlyphIndex: 479
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 1065
|
|
||||||
m_GlyphIndex: 490
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 1045
|
|
||||||
m_GlyphIndex: 470
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 1053
|
|
||||||
m_GlyphIndex: 478
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 32
|
|
||||||
m_GlyphIndex: 1
|
|
||||||
m_Scale: 1
|
|
||||||
- m_ElementType: 1
|
|
||||||
m_Unicode: 46
|
|
||||||
m_GlyphIndex: 15
|
|
||||||
m_Scale: 1
|
|
||||||
m_AtlasTextures:
|
m_AtlasTextures:
|
||||||
- {fileID: -680064802141868518}
|
- {fileID: -680064802141868518}
|
||||||
m_AtlasTextureIndex: 0
|
m_AtlasTextureIndex: 0
|
||||||
@@ -403,120 +118,12 @@ MonoBehaviour:
|
|||||||
m_AtlasHeight: 1024
|
m_AtlasHeight: 1024
|
||||||
m_AtlasPadding: 9
|
m_AtlasPadding: 9
|
||||||
m_AtlasRenderMode: 4165
|
m_AtlasRenderMode: 4165
|
||||||
m_UsedGlyphRects:
|
m_UsedGlyphRects: []
|
||||||
- m_X: 0
|
|
||||||
m_Y: 0
|
|
||||||
m_Width: 94
|
|
||||||
m_Height: 34
|
|
||||||
- m_X: 94
|
|
||||||
m_Y: 0
|
|
||||||
m_Width: 66
|
|
||||||
m_Height: 25
|
|
||||||
- m_X: 160
|
|
||||||
m_Y: 0
|
|
||||||
m_Width: 68
|
|
||||||
m_Height: 84
|
|
||||||
- m_X: 0
|
|
||||||
m_Y: 34
|
|
||||||
m_Width: 76
|
|
||||||
m_Height: 80
|
|
||||||
- m_X: 94
|
|
||||||
m_Y: 25
|
|
||||||
m_Width: 59
|
|
||||||
m_Height: 80
|
|
||||||
- m_X: 228
|
|
||||||
m_Y: 0
|
|
||||||
m_Width: 65
|
|
||||||
m_Height: 80
|
|
||||||
- m_X: 293
|
|
||||||
m_Y: 0
|
|
||||||
m_Width: 73
|
|
||||||
m_Height: 82
|
|
||||||
- m_X: 366
|
|
||||||
m_Y: 0
|
|
||||||
m_Width: 66
|
|
||||||
m_Height: 80
|
|
||||||
- m_X: 432
|
|
||||||
m_Y: 0
|
|
||||||
m_Width: 70
|
|
||||||
m_Height: 80
|
|
||||||
- m_X: 502
|
|
||||||
m_Y: 0
|
|
||||||
m_Width: 73
|
|
||||||
m_Height: 84
|
|
||||||
- m_X: 366
|
|
||||||
m_Y: 80
|
|
||||||
m_Width: 96
|
|
||||||
m_Height: 91
|
|
||||||
- m_X: 228
|
|
||||||
m_Y: 80
|
|
||||||
m_Width: 60
|
|
||||||
m_Height: 80
|
|
||||||
- m_X: 153
|
|
||||||
m_Y: 84
|
|
||||||
m_Width: 69
|
|
||||||
m_Height: 80
|
|
||||||
- m_X: 462
|
|
||||||
m_Y: 80
|
|
||||||
m_Width: 34
|
|
||||||
m_Height: 34
|
|
||||||
m_FreeGlyphRects:
|
m_FreeGlyphRects:
|
||||||
- m_X: 76
|
- m_X: 0
|
||||||
m_Y: 34
|
|
||||||
m_Width: 18
|
|
||||||
m_Height: 989
|
|
||||||
- m_X: 575
|
|
||||||
m_Y: 0
|
m_Y: 0
|
||||||
m_Width: 448
|
|
||||||
m_Height: 1023
|
|
||||||
- m_X: 0
|
|
||||||
m_Y: 171
|
|
||||||
m_Width: 1023
|
m_Width: 1023
|
||||||
m_Height: 852
|
m_Height: 1023
|
||||||
- m_X: 288
|
|
||||||
m_Y: 80
|
|
||||||
m_Width: 5
|
|
||||||
m_Height: 943
|
|
||||||
- m_X: 288
|
|
||||||
m_Y: 82
|
|
||||||
m_Width: 78
|
|
||||||
m_Height: 941
|
|
||||||
- m_X: 153
|
|
||||||
m_Y: 25
|
|
||||||
m_Width: 7
|
|
||||||
m_Height: 59
|
|
||||||
- m_X: 0
|
|
||||||
m_Y: 164
|
|
||||||
m_Width: 366
|
|
||||||
m_Height: 859
|
|
||||||
- m_X: 222
|
|
||||||
m_Y: 160
|
|
||||||
m_Width: 144
|
|
||||||
m_Height: 863
|
|
||||||
- m_X: 0
|
|
||||||
m_Y: 114
|
|
||||||
m_Width: 153
|
|
||||||
m_Height: 909
|
|
||||||
- m_X: 76
|
|
||||||
m_Y: 105
|
|
||||||
m_Width: 77
|
|
||||||
m_Height: 918
|
|
||||||
- m_X: 222
|
|
||||||
m_Y: 84
|
|
||||||
m_Width: 6
|
|
||||||
m_Height: 939
|
|
||||||
- m_X: 462
|
|
||||||
m_Y: 114
|
|
||||||
m_Width: 561
|
|
||||||
m_Height: 909
|
|
||||||
- m_X: 496
|
|
||||||
m_Y: 84
|
|
||||||
m_Width: 527
|
|
||||||
m_Height: 939
|
|
||||||
- m_X: 496
|
|
||||||
m_Y: 80
|
|
||||||
m_Width: 6
|
|
||||||
m_Height: 943
|
|
||||||
m_FontFeatureTable:
|
m_FontFeatureTable:
|
||||||
m_MultipleSubstitutionRecords: []
|
m_MultipleSubstitutionRecords: []
|
||||||
m_LigatureSubstitutionRecords: []
|
m_LigatureSubstitutionRecords: []
|
||||||
|
|||||||
BIN
Binary file not shown.
@@ -0,0 +1,23 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: bf87bc9ac43df86be8c818de81d44a54
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 8
|
||||||
|
defaultSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
preloadAudioData: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 0
|
||||||
|
normalize: 1
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -24,18 +24,18 @@
|
|||||||
"hash": "e644f1bb8ea190157aaea9c386f85cee4cd03bd9"
|
"hash": "e644f1bb8ea190157aaea9c386f85cee4cd03bd9"
|
||||||
},
|
},
|
||||||
"com.unity.addressables": {
|
"com.unity.addressables": {
|
||||||
"version": "2.7.4",
|
"version": "2.7.3",
|
||||||
"depth": 2,
|
"depth": 2,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"com.unity.scriptablebuildpipeline": "2.4.3",
|
|
||||||
"com.unity.modules.assetbundle": "1.0.0",
|
|
||||||
"com.unity.modules.imageconversion": "1.0.0",
|
|
||||||
"com.unity.modules.jsonserialize": "1.0.0",
|
|
||||||
"com.unity.modules.unitywebrequest": "1.0.0",
|
|
||||||
"com.unity.modules.unitywebrequestassetbundle": "1.0.0",
|
|
||||||
"com.unity.profiling.core": "1.0.2",
|
"com.unity.profiling.core": "1.0.2",
|
||||||
"com.unity.test-framework": "1.4.5"
|
"com.unity.test-framework": "1.4.5",
|
||||||
|
"com.unity.modules.assetbundle": "1.0.0",
|
||||||
|
"com.unity.modules.jsonserialize": "1.0.0",
|
||||||
|
"com.unity.modules.imageconversion": "1.0.0",
|
||||||
|
"com.unity.modules.unitywebrequest": "1.0.0",
|
||||||
|
"com.unity.scriptablebuildpipeline": "2.4.2",
|
||||||
|
"com.unity.modules.unitywebrequestassetbundle": "1.0.0"
|
||||||
},
|
},
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
@@ -66,11 +66,11 @@
|
|||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
"com.unity.collections": {
|
"com.unity.collections": {
|
||||||
"version": "2.6.2",
|
"version": "2.5.7",
|
||||||
"depth": 2,
|
"depth": 2,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"com.unity.burst": "1.8.23",
|
"com.unity.burst": "1.8.19",
|
||||||
"com.unity.mathematics": "1.3.2",
|
"com.unity.mathematics": "1.3.2",
|
||||||
"com.unity.test-framework": "1.4.6",
|
"com.unity.test-framework": "1.4.6",
|
||||||
"com.unity.nuget.mono-cecil": "1.11.5",
|
"com.unity.nuget.mono-cecil": "1.11.5",
|
||||||
@@ -112,11 +112,11 @@
|
|||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
"com.unity.localization": {
|
"com.unity.localization": {
|
||||||
"version": "1.5.8",
|
"version": "1.5.4",
|
||||||
"depth": 1,
|
"depth": 1,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"com.unity.addressables": "1.25.0",
|
"com.unity.addressables": "1.22.2",
|
||||||
"com.unity.nuget.newtonsoft-json": "3.0.2"
|
"com.unity.nuget.newtonsoft-json": "3.0.2"
|
||||||
},
|
},
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
@@ -201,7 +201,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"com.unity.scriptablebuildpipeline": {
|
"com.unity.scriptablebuildpipeline": {
|
||||||
"version": "2.4.3",
|
"version": "2.4.2",
|
||||||
"depth": 3,
|
"depth": 3,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
m_EditorVersion: 6000.2.14f1
|
m_EditorVersion: 6000.2.7f2
|
||||||
m_EditorVersionWithRevision: 6000.2.14f1 (589824c1fc31)
|
m_EditorVersionWithRevision: 6000.2.7f2 (2b518236b676)
|
||||||
Reference in new issue
Block a user