ThomasCharester/Infratest
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Миксер

Browse Source 
Почини интерфейс
This commit is contained in:
ThomasCharester committed 2026-03-23 23:59:32 +03:00
1 parent 1aceea1b79
commit 60c28f54f2
74 files changed
+8054 -1053
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.idea/.idea.Infratest/.idea/workspace.xml
Generated
+92 -10
View File
@@ -5,14 +5,62 @@
</component>
<component name="ChangeListManager">
<list default="true" id="ed1a3c4f-83ac-4211-ae32-004a26afd5d8" name="Changes" comment="">
<change afterPath="$PROJECT_DIR$/Assets/Code/Example/Platformer/Entity/EntityGUID.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Example/Platformer/Entity/EntityGUID.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Example/Platformer/Entity/Enemies/PlayerCollisionDamager.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Example/Platformer/Entity/Enemies/PlayerCollisionDamager.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Example/Platformer/Entity/Spawners.meta" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.idea.Infratest/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.Infratest/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/AddressableAssetsData/AddressableAssetSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/AddressableAssetsData/AddressableAssetSettings.asset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Example/Platformer/Entity/Enemies/Bee.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Example/Platformer/Entity/Enemies/Bee.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Example/Platformer/Entity/Enemies/Boar.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Example/Platformer/Entity/Enemies/Boar.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Example/Platformer/Entity/Enemies/Snail.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Example/Platformer/Entity/Enemies/Snail.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Example/Platformer/Entity/Entity.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Example/Platformer/Entity/Entity.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Example/Platformer/Entity/EntityHealth.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Example/Platformer/Entity/EntityHealth.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Resources_moved/Example/Platformer/Characters/Enemies/Boar.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources_moved/Example/Platformer/Characters/Enemies/Boar.prefab" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Example/Platformer/Entity/PlatformerEnemyFactory.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Example/Platformer/Entity/PlatformerEnemyFactory.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Example/Platformer/Entity/PlatformerPlayerFactory.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Example/Platformer/Entity/PlatformerPlayerFactory.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Example/Platformer/Entity/PlayerEntity.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Example/Platformer/Entity/PlayerEntity.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Example/Platformer/PlatformerState.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Example/Platformer/PlatformerState.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Example/Race/UI/PlayerScoreCounter.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Example/Race/UI/PlayerScoreCounter.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Example/Race/UI/PlayerScores.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Example/Race/UI/PlayerScores.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Example/Race/UI/WinScreen.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Example/Race/UI/WinScreen.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Infrastructure/App/PapaInstaller.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/App/PapaInstaller.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Infrastructure/App/States/BootstrapState.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/App/States/BootstrapState.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Infrastructure/App/States/MainMenuState.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/App/States/MainMenuState.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Infrastructure/Audio/AudioFactory.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Audio/AudioFactory.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Infrastructure/Audio/AudioGroupType.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Audio/AudioGroupType.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Infrastructure/Audio/AudioInfo.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Audio/AudioInfo.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Infrastructure/Audio/AudioService.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Audio/AudioService.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Infrastructure/Generators/Attributes.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Generators/Attributes.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Infrastructure/Generators/UIPanelEventsGenerator.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Generators/UIPanelEventsGenerator.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Infrastructure/Loadings/Loading.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Loadings/Loading.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Infrastructure/UI/Panels/LoadingPanel.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/UI/Panels/LoadingPanel.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Infrastructure/UI/Panels/LogoPanel.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/UI/Panels/LogoPanel.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Infrastructure/UI/Panels/MenuChoosePanel.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/UI/Panels/MenuChoosePanel.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Infrastructure/UI/UIPanel.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/UI/UIPanel.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Infrastructure/UI/UIService.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/UI/UIService.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Platformer.mixer" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Platformer.mixer.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Resources/Audio/MainMixer.mixer" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Audio/MainMixer.mixer" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Resources/Example/Platformer/Assets/Tiles.aseprite.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Example/Platformer/Assets/Tiles.aseprite.meta" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Resources/Example/Platformer/New Palette.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Example/Platformer/New Palette.prefab" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Resources/SystemConfigsReferences.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/SystemConfigsReferences.asset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Resources/UI/Fonts/Bebas Neue Cyrillic SDF.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/UI/Fonts/Bebas Neue Cyrillic SDF.asset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Resources_moved/Example/Platformer/Characters/Enemies/Snail.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources_moved/Example/Platformer/Characters/Enemies/Snail.prefab" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Resources_moved/Example/Platformer/Platformer 2.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources_moved/Example/Platformer/Platformer 2.unity" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Resources_moved/Example/Platformer/Platformer 3.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources_moved/Example/Platformer/Platformer 3.unity" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/UnityCodeGen.Generated/AudioMixer.Generated.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/UnityCodeGen.Generated/AudioMixer.Generated.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/UnityCodeGen.Generated/AudioSourcePrefabConfig.Generated.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/UnityCodeGen.Generated/AudioSourcePrefabConfig.Generated.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/UnityCodeGen.Generated/Code.Infrastructure.App.AppStateMachine.Generated.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/UnityCodeGen.Generated/Code.Infrastructure.App.AppStateMachine.Generated.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/UnityCodeGen.Generated/Code.Infrastructure.Camera.CameraStateMachine.Generated.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/UnityCodeGen.Generated/Code.Infrastructure.Camera.CameraStateMachine.Generated.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/UnityCodeGen.Generated/Code.Infrastructure.UI.Panels.LoadingPanelEvents.Generated.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/UnityCodeGen.Generated/Code.Infrastructure.UI.Panels.LoadingPanelEvents.Generated.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/UnityCodeGen.Generated/Code.Infrastructure.UI.Panels.LogoPanelEvents.Generated.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/UnityCodeGen.Generated/Code.Infrastructure.UI.Panels.LogoPanelEvents.Generated.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/UnityCodeGen.Generated/Code.Infrastructure.UI.Panels.MenuChoosePanelEvents.Generated.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/UnityCodeGen.Generated/Code.Infrastructure.UI.Panels.MenuChoosePanelEvents.Generated.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/UnityCodeGen.Generated/ConfigLocator.Generated.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/UnityCodeGen.Generated/ConfigLocator.Generated.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/UnityCodeGen.Generated/SystemConfigsReferences.Generated.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/UnityCodeGen.Generated/SystemConfigsReferences.Generated.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Packages/manifest.json" beforeDir="false" afterPath="$PROJECT_DIR$/Packages/manifest.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Packages/packages-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/Packages/packages-lock.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ProjectSettings/ProjectVersion.txt" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/ProjectVersion.txt" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -33,8 +81,11 @@
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/30cb9806a8774f11bb35ea6b11076cb4110400/9e/e04a9ad9/Enumerable.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/6a608067b36b43a4b2b9c2c9f46aac8b212200/95/3a3a110c/Vector3.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/6a608067b36b43a4b2b9c2c9f46aac8b212200/ed/c16ca097/Vector2.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/e605204d165a49d89ae7579f3d894429468c00/50/2dbfce57/Dictionary`2.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/e605204d165a49d89ae7579f3d894429468c00/c2/98fb18b9/List`1.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Code/Example/Platformer/Entity/Enemies/Bee.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Code/Example/Platformer/Entity/Enemies/BeeRadar.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Code/Example/Platformer/Entity/Enemies/PlayerCollisionDamager.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Code/Example/Platformer/Entity/Enemies/Snail.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Code/Example/Platformer/Entity/Entity.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Code/Example/Platformer/Entity/EntityGUID.cs" root0="FORCE_HIGHLIGHTING" />
@@ -88,6 +139,7 @@
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.gustavopsantos.reflex@fabfbc86f712/Core/Container.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.gustavopsantos.reflex@fabfbc86f712/Core/ContainerBuilder.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.gustavopsantos.reflex@fabfbc86f712/Core/IInstaller.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.gustavopsantos.reflex@fabfbc86f712/Generics/DisposableCollection.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.gustavopsantos.reflex@fabfbc86f712/Injectors/ConstructorInjector.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.gustavopsantos.reflex@fabfbc86f712/Injectors/MethodInjector.cs" root0="SKIP_HIGHLIGHTING" />
</component>
@@ -118,7 +170,7 @@
}</component>
<component name="RunManager" selected="Attach to Unity Editor.Attach to Unity Editor">
<configuration name="Start Unity" type="RunUnityExe" factoryName="Unity Executable">
<option name="EXE_PATH" value="$USER_HOME$/Unity/Hub/Editor/6000.3.10f1/Editor/Unity" />
<option name="EXE_PATH" value="$USER_HOME$/Unity/Hub/Editor/6000.3.11f1/Editor/Unity" />
<option name="PROGRAM_PARAMETERS" value="-projectPath A:\Projects\Infratest -debugCodeOptimization" />
<option name="WORKING_DIRECTORY" value="A:\Projects\Infratest" />
<option name="PASS_PARENT_ENVS" value="1" />
@@ -138,7 +190,7 @@
<method v="2" />
</configuration>
<configuration name="Unit Tests (batch mode)" type="RunUnityExe" factoryName="Unity Executable">
<option name="EXE_PATH" value="$USER_HOME$/Unity/Hub/Editor/6000.3.10f1/Editor/Unity" />
<option name="EXE_PATH" value="$USER_HOME$/Unity/Hub/Editor/6000.3.11f1/Editor/Unity" />
<option name="PROGRAM_PARAMETERS" value="-runTests -batchmode -projectPath A:\Projects\Infratest -testResults Logs/results.xml -logFile Logs/Editor.log -testPlatform EditMode -debugCodeOptimization" />
<option name="WORKING_DIRECTORY" value="A:\Projects\Infratest" />
<option name="PASS_PARENT_ENVS" value="1" />
@@ -183,13 +235,15 @@
</option>
<method v="2" />
</configuration>
<configuration name="Attach to Unity Editor" type="UNITY_DEBUG_RUN_CONFIGURATION" factoryName="Unity Debug" show_console_on_std_err="false" show_console_on_std_out="false" port="50000" address="localhost" useMixedMode="false">
<configuration name="Attach to Unity Editor" type="UNITY_DEBUG_RUN_CONFIGURATION" factoryName="Unity Debug" show_console_on_std_err="false" show_console_on_std_out="false" port="50000" address="localhost" useMixedMode="false" ignored-value-for-modified-check="4065">
<option name="allowRunningInParallel" value="false" />
<option name="listenPortForConnections" value="false" />
<option name="pid" />
<option name="pid" value="4065" />
<option name="projectPathOnTarget" />
<option name="runtimes">
<list />
<list>
<MonoRuntime />
</list>
</option>
<option name="selectedOptions">
<list />
@@ -295,6 +349,8 @@
<workItem from="1771433586006" duration="1485000" />
<workItem from="1773065611992" duration="4340000" />
<workItem from="1773758943752" duration="4321000" />
<workItem from="1774269975923" duration="8600000" />
<workItem from="1774282412199" duration="7290000" />
</task>
<servers />
</component>
@@ -331,14 +387,40 @@
<line>68</line>
<properties documentPath="$PROJECT_DIR$/Assets/Code/Example/Platformer/PlatformerSceneInstaller.cs" containingFunctionPresentation="Method 'Dispose'">
<startOffsets>
<option value="2442" />
<option value="1914" />
</startOffsets>
<endOffsets>
<option value="2491" />
<option value="1963" />
</endOffsets>
</properties>
<option name="timeStamp" value="77" />
</line-breakpoint>
<line-breakpoint enabled="true" type="DotNet Breakpoints">
<url>file://$PROJECT_DIR$/Assets/Code/Infrastructure/App/States/MainMenuState.cs</url>
<line>24</line>
<properties documentPath="$PROJECT_DIR$/Assets/Code/Infrastructure/App/States/MainMenuState.cs" containingFunctionPresentation="Method 'OnEnterState'">
<startOffsets>
<option value="857" />
</startOffsets>
<endOffsets>
<option value="882" />
</endOffsets>
</properties>
<option name="timeStamp" value="83" />
</line-breakpoint>
<line-breakpoint enabled="true" type="DotNet Breakpoints">
<url>file://$PROJECT_DIR$/Assets/Code/Example/Platformer/PlatformerState.cs</url>
<line>69</line>
<properties documentPath="$PROJECT_DIR$/Assets/Code/Example/Platformer/PlatformerState.cs" containingFunctionPresentation="Method 'OnExitState'">
<startOffsets>
<option value="2201" />
</startOffsets>
<endOffsets>
<option value="2254" />
</endOffsets>
</properties>
<option name="timeStamp" value="84" />
</line-breakpoint>
<breakpoint enabled="true" type="DotNet_Exception_Breakpoints">
<properties exception="System.OperationCanceledException" breakIfHandledByOtherCode="false" displayValue="System.OperationCanceledException" />
<option name="timeStamp" value="62" />
Assets/AddressableAssetsData/AddressableAssetSettings.asset
+1 -1
View File
@@ -15,7 +15,7 @@ MonoBehaviour:
m_DefaultGroup: d790534e015d692428ac5a9ce7d2ceb6
m_currentHash:
serializedVersion: 2
Hash: 63f5b0abd51db559520e61cb22c7ee3a
Hash: 00000000000000000000000000000000
m_OptimizeCatalogSize: 0
m_BuildRemoteCatalog: 0
m_CatalogRequestsTimeout: 0
Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
+33
View File
@@ -145,6 +145,17 @@ MonoBehaviour:
m_SerializedLabels:
- AudioInfoConfig
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 377250e1c2c80e20db7a825b90f8c4a1
m_Address: Assets/Resources_moved/Example/Platformer/Configs/Audio/Music1.asset
m_ReadOnly: 0
m_SerializedLabels:
- AudioInfoConfig
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 38081c3b5216d4c329cc1cec80b1818c
m_Address: Assets/Resources_moved/Configs/Audio/AudioMixerConfig.asset
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 3a4a23e1c0a57dd49b451aa86b9baa3a
m_Address: Assets/Resources_moved/Configs/Scenes/SoundTest.asset
m_ReadOnly: 0
@@ -157,6 +168,11 @@ MonoBehaviour:
m_SerializedLabels:
- LayerMaskConfig
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 4433c918bf5643cd9a4b83ccdd369779
m_Address: "Assets/Resources_moved/Example/Platformer/Audio/35. \u306F\u3063\u305F\u308C\u4E94\u53F3\u885B\u9580.mp3"
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 456d3ecaf92ca5a4a817184de151ad9f
m_Address: Assets/Resources_moved/Camera/CinemachineCameraCarFollow.prefab
m_ReadOnly: 0
@@ -252,6 +268,17 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 6d3fc61919b807d0da6d9625d6c7ccb8
m_Address: Assets/Resources_moved/Example/Platformer/Configs/Audio/GotDamage.asset
m_ReadOnly: 0
m_SerializedLabels:
- AudioInfoConfig
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 7247c8f09e5f00b889ed31f15a5099e6
m_Address: "Assets/Resources_moved/Example/Platformer/Audio/36. \u30D7\u30ED\u30B4\u30EB\u30D5\u30A1\u30FC\u733F\u7530\u5F66.mp3"
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 749408a9b44d2581783d04d903ec0f72
m_Address: Assets/Resources_moved/Audio/UI/valve_sound.wav
m_ReadOnly: 0
@@ -421,6 +448,12 @@ MonoBehaviour:
m_SerializedLabels:
- UIPanelConfig
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: d6dea95659be7f90294dfefb3c4c9791
m_Address: Assets/Resources_moved/Example/Platformer/Configs/Audio/Music2.asset
m_ReadOnly: 0
m_SerializedLabels:
- AudioInfoConfig
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: d7dd69cfadda3d6e18ec390724be0d80
m_Address: Assets/Resources_moved/Configs/Audio/AudioSourcePrefabConfig.asset
m_ReadOnly: 0
Assets/Code/Example/Platformer/Entity/Enemies/Bee.cs
+38
View File
@@ -1,5 +1,8 @@
using System.Collections.Generic;
using Code.Infrastructure.Audio;
using Cysharp.Threading.Tasks;
using PrimeTween;
using Reflex.Attributes;
using UnityEngine;
namespace Code.Example.Platformer.Entity.Enemies
@@ -14,7 +17,36 @@ namespace Code.Example.Platformer.Entity.Enemies
[SerializeField] private Transform _currentTarget;
private Tween _patrolAction;
private float _attackThreshold = 0.5f;
[Inject] private IAudioService _audioService;
[SerializeField] private EntityHealth health;
private void Start()
{
health.OnEntityDamage = OnEntityDamage;
health.OnEntityDeath = OnEntityDeath;
}
private void OnEntityDeath()
{
animator.SetBool(Died, true);
animator.SetTrigger(OnDeath);
Die().Forget();
}
private async UniTaskVoid Die()
{
await UniTask.WaitForSeconds(1);
_audioService.PlayOneShot(AudioNames.Platformer, 3 , AudioGroupType.SFX);
Destroy(gameObject);
}
private void OnEntityDamage(int obj)
{
_audioService.PlayOneShot(AudioNames.Platformer, 2, AudioGroupType.SFX);
UnityEngine.Debug.Log(gameObject.name + " damaged");
animator.SetTrigger(OnHit);
}
protected override void Move()
{
if (onPatrol && !_patrolAction.isAlive)
@@ -25,6 +57,7 @@ namespace Code.Example.Platformer.Entity.Enemies
}
else if(_currentTarget)
{
TryAttack();
var direction = _currentTarget.position - transform.position;
direction.Normalize();
@@ -39,6 +72,11 @@ namespace Code.Example.Platformer.Entity.Enemies
}
}
private void TryAttack()
{
if ((transform.position - _currentTarget.position).magnitude < _attackThreshold) _currentTarget.GetComponent<EntityHealth>().GiveDamage(1);
}
private void OnControlPointReached()
{
if (++_currentPatrolPoint >= partolPoints.Count) _currentPatrolPoint = 0;
Assets/Code/Example/Platformer/Entity/Enemies/Boar.cs
+7 -5
View File
@@ -18,6 +18,10 @@ namespace Code.Example.Platformer.Entity.Enemies
[SerializeField] private EntityHealth health;
[Inject] private IAudioService _audioService;
private Transform _target;
private float _attackThreshold = 0.5f;
private void Start()
{
health.OnEntityDamage = OnEntityDamage;
@@ -34,12 +38,12 @@ namespace Code.Example.Platformer.Entity.Enemies
private async UniTaskVoid Die()
{
await UniTask.WaitForSeconds(1);
_audioService.PlayOneShot(AudioNames.Platformer, 3 );
_audioService.PlayOneShot(AudioNames.Platformer, 3 , AudioGroupType.SFX);
Destroy(gameObject);
}
private void OnEntityDamage(int obj)
{
_audioService.PlayOneShot(AudioNames.Platformer, 2);
_audioService.PlayOneShot(AudioNames.Platformer, 2, AudioGroupType.SFX);
UnityEngine.Debug.Log(gameObject.name + " damaged");
animator.SetTrigger(OnHit);
}
@@ -83,11 +87,9 @@ namespace Code.Example.Platformer.Entity.Enemies
private void TryAttack()
{
if ((transform.position - _target.position).magnitude < attackThreshold) _target.GetComponent<EntityHealth>().GiveDamage(1);
if ((transform.position - _target.position).magnitude < _attackThreshold) _target.GetComponent<EntityHealth>().GiveDamage(1);
}
private Transform _target;
private float attackThreshold = 0.5f;
public void GotTarget(Transform target)
{
Assets/Code/Example/Platformer/Entity/Enemies/PlayerCollisionDamager.cs
+12
View File
@@ -0,0 +1,12 @@
using UnityEngine;
namespace Code.Example.Platformer.Entity.Enemies
{
public class PlayerCollisionDamager : MonoBehaviour
{
private void OnTriggerStay2D(Collider2D other)
{
other.GetComponent<EntityHealth>().GiveDamage(1);
}
}
}
Assets/Code/Example/Platformer/Entity/Enemies/PlayerCollisionDamager.cs.meta
+3
View File
@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 55c5190afe54409f89d7a16c315e48f9
timeCreated: 1774276433
Assets/Code/Example/Platformer/Entity/Enemies/Snail.cs
+32
View File
@@ -1,4 +1,7 @@
using Code.Infrastructure.Audio;
using Code.Infrastructure.Configs;
using Cysharp.Threading.Tasks;
using Reflex.Attributes;
using UnityEngine;
namespace Code.Example.Platformer.Entity.Enemies
@@ -9,6 +12,35 @@ namespace Code.Example.Platformer.Entity.Enemies
[SerializeField] private Vector2 groundRight;
[SerializeField] private bool _directionRight;
[SerializeField] private EntityHealth health;
[Inject] private IAudioService _audioService;
private void Start()
{
health.OnEntityDamage = OnEntityDamage;
health.OnEntityDeath = OnEntityDeath;
}
private void OnEntityDeath()
{
animator.SetBool(Died, true);
animator.SetTrigger(OnDeath);
Die().Forget();
}
private async UniTaskVoid Die()
{
await UniTask.WaitForSeconds(1);
_audioService.PlayOneShot(AudioNames.Platformer, 3 , AudioGroupType.SFX);
Destroy(gameObject);
}
private void OnEntityDamage(int obj)
{
_audioService.PlayOneShot(AudioNames.Platformer, 2, AudioGroupType.SFX);
UnityEngine.Debug.Log(gameObject.name + " damaged");
animator.SetTrigger(OnHit);
}
protected override void Move()
{
CheckupDirection();
Assets/Code/Example/Platformer/Entity/Entity.cs
+31 -3
View File
@@ -1,9 +1,16 @@
using Code.Infrastructure.Configs;
using Code.Infrastructure.EventBus;
using Reflex.Attributes;
using UnityEngine;
namespace Code.Example.Platformer.Entity
{
public abstract class Entity : MonoBehaviour
public interface IGameplayFreezeable : IGlobalSubscriber
{
void Freeze();
void UnFreeze();
}
public abstract class Entity : MonoBehaviour, IGameplayFreezeable
{
protected static readonly int VelocityY = Animator.StringToHash("VelocityY");
protected static readonly int VelocityX = Animator.StringToHash("VelocityX");
@@ -12,26 +19,47 @@ namespace Code.Example.Platformer.Entity
protected static readonly int OnDeath = Animator.StringToHash("OnDeath");
protected static readonly int Died = Animator.StringToHash("Died");
[SerializeField] protected Rigidbody2D rigidbody2D;
[SerializeField] protected new Rigidbody2D rigidbody2D;
[SerializeField] protected Animator animator;
[SerializeField] protected SpriteRenderer spriteRenderer;
[SerializeField] private Vector2 groundPoint;
private PlatformerEntityData _data; // TODO
protected bool isFreezed;
protected bool isFreezed = true;
protected bool onGround;
private EventBus _eventBus;
private Vector2 _frozenVelocity;
public void SetData(PlatformerEntityData data)
{
_data = data;
}
[Inject]
private void Construct(EventBus eventBus)
{
_eventBus = eventBus;
_eventBus.Subscribe(this);
}
protected virtual void OnDestroy()
{
_eventBus.Unsubscribe(this);
}
public void Freeze()
{
_frozenVelocity = rigidbody2D.linearVelocity;
rigidbody2D.linearVelocity = Vector2.zero;
rigidbody2D.bodyType = RigidbodyType2D.Kinematic;
isFreezed = true;
}
public void UnFreeze()
{
rigidbody2D.linearVelocity = _frozenVelocity;
rigidbody2D.bodyType = RigidbodyType2D.Dynamic;
isFreezed = false;
}
Assets/Code/Example/Platformer/Entity/EntityHealth.cs
-12
View File
@@ -48,8 +48,6 @@ namespace Code.Example.Platformer.Entity
OnEntityDeath?.Invoke();
}
_eventBus.RaiseEvent<IEntityDamagedHandler>(x=> x.EntityDamaged(gameObject, damage, IsDead));
WaitThreshold().Forget();
}
@@ -61,16 +59,6 @@ namespace Code.Example.Platformer.Entity
OnEntityHeal?.Invoke(_health);
_eventBus.RaiseEvent<IEntityHealedHandler>(x=> x.EntityHealed(gameObject, heal));
}
}
public interface IEntityDamagedHandler : IGlobalSubscriber
{
void EntityDamaged(GameObject entity, int damageCount, bool isDied);
}
public interface IEntityHealedHandler : IGlobalSubscriber
{
void EntityHealed(GameObject entity, int healCount);
}
}
Assets/Code/Example/Platformer/Entity/PlatformerEnemyFactory.cs
+6
View File
@@ -95,6 +95,8 @@ namespace Code.Example.Platformer.Entity
health.Setup(_enemyConfigs[enemyType].EntityData.maxHealth, _enemyConfigs[enemyType].EntityData.damageRecieveThreshold);
GameObjectInjector.InjectObject(gameObject, Container.RootContainer);
_eventBus.RaiseEvent<IPlatformerEnemySpawnedHandle>(x=>x.PlatformerEnemySpawned(entity));
}
public void Dispose()
@@ -118,4 +120,8 @@ namespace Code.Example.Platformer.Entity
{
public void PlatformerEnemyLoaded(PlatformerEntityType type, Entity entity);
}
public interface IPlatformerEnemySpawnedHandle : IGlobalSubscriber
{
public void PlatformerEnemySpawned(Entity entity);
}
}
Assets/Code/Example/Platformer/Entity/PlatformerPlayerFactory.cs
-3
View File
@@ -1,6 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Code.Infrastructure.Configs;
using Code.Infrastructure.EventBus;
using Cysharp.Threading.Tasks;
@@ -9,7 +7,6 @@ using Reflex.Injectors;
using UnityEngine;
using UnityEngine.AddressableAssets;
using UnityEngine.ResourceManagement.AsyncOperations;
using UnityEngine.SceneManagement;
using Object = UnityEngine.Object;
namespace Code.Example.Platformer.Entity
Assets/Code/Example/Platformer/Entity/PlayerEntity.cs
+33 -6
View File
@@ -1,7 +1,6 @@
using System;
using Code.Infrastructure.Audio;
using Code.Infrastructure.Camera;
using Code.Infrastructure.Configs;
using Code.Infrastructure.EventBus;
using Code.Infrastructure.Input;
using Reflex.Attributes;
using UnityEngine;
@@ -15,8 +14,9 @@ namespace Code.Example.Platformer.Entity
private IInputService _inputService;
[Inject]
private void Construct(IInputService inputService, IAudioService audioService)
private void Construct(IInputService inputService, IAudioService audioService, EventBus eventBus)
{
_eventBus = eventBus;
_audioService = audioService;
_inputService = inputService;
@@ -32,8 +32,9 @@ namespace Code.Example.Platformer.Entity
//cameraFactory.GetCinematicCamera(CameraMode.Platformer).Follow = transform; , CameraFactory cameraFactory
}
private void OnDestroy()
protected override void OnDestroy()
{
base.OnDestroy();
if(!health.IsDead) UnbindControls();
}
@@ -72,7 +73,7 @@ namespace Code.Example.Platformer.Entity
_acceleration = 1f;
_audioService.PlayOneShot(AudioNames.Platformer, 6);
_audioService.PlayOneShot(AudioNames.Platformer, 6, AudioGroupType.SFX);
}
[SerializeField] private Vector2 attackOffset;
@@ -83,7 +84,7 @@ namespace Code.Example.Platformer.Entity
//
//
_audioService.PlayOneShot(AudioNames.Platformer, 1);
_audioService.PlayOneShot(AudioNames.Platformer, 1, AudioGroupType.SFX);
animator.SetBool(OnAttack, true);
}
@@ -114,6 +115,7 @@ namespace Code.Example.Platformer.Entity
public void AttackEnd() => animator.SetBool(OnAttack, false);
[SerializeField] private EntityHealth health;
private EventBus _eventBus;
private void Start()
{
@@ -124,6 +126,19 @@ namespace Code.Example.Platformer.Entity
private void OnEntityDamage(int obj)
{
UnityEngine.Debug.Log("Player damaged");
_audioService.PlayOneShot(AudioNames.Platformer, 8, AudioGroupType.SFX);
_audioService.ApplyParameter(
"PlatformerDamage",
1f,
0.5f,
() => _audioService.ApplyParameter(
"PlatformerDamage",
5000f,
1f));
_eventBus.RaiseEvent<IPlayerDamagedHandle>(x=>x.PlayerDamaged());
}
private void OnEntityDeath()
@@ -133,7 +148,19 @@ namespace Code.Example.Platformer.Entity
animator.SetBool(Died, true);
UnbindControls();
_eventBus.RaiseEvent<IPlayerDiedHandle>(x=>x.PlayerDied());
// Destroy(gameObject, 1f);
}
}
public interface IPlayerDiedHandle : IGlobalSubscriber
{
void PlayerDied();
}
public interface IPlayerDamagedHandle : IGlobalSubscriber
{
void PlayerDamaged();
}
}
Assets/Code/Example/Platformer/Entity/Spawners.meta
+3
View File
@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: ab2cbe7f4c0142f980f9640c57d27030
timeCreated: 1774277361
Assets/Code/Example/Platformer/PlatformerState.cs
+105 -34
View File
@@ -9,12 +9,18 @@ using Code.Infrastructure.Input;
using Code.Infrastructure.Loadings;
using Code.Infrastructure.SceneLoader;
using Code.Infrastructure.UI;
using Code.Infrastructure.UI.Panels;
using Reflex.Core;
using Unity.Cinemachine;
using UnityEngine.SceneManagement;
namespace Code.Example.Platformer
{
public interface IPlayerReachedFinishHandle : IGlobalSubscriber
{
void PlayerReachedFinish();
}
[State(typeof(AppStates),typeof(AppStateMachineContext))]
[StateRaisingEvent]
public partial class PlatformerState :
@@ -26,7 +32,11 @@ namespace Code.Example.Platformer
IPlatformerPlayerLoadedHandle,
IPlatformerPlayerSpawnedHandle,
IReadyToPlayHandle,
IPlayerReachedFinishHandle
IPlayerReachedFinishHandle,
ILoadingPanelOpenedHandle,
ILoadingPanelClosedHandle,
IPlatformerEnemySpawnedHandle,
IPlayerDiedHandle
{
private IPlatformerEnemyFactory _enemyFactory;
private IPlatformerPlayerFactory _playerFactory;
@@ -49,30 +59,11 @@ namespace Code.Example.Platformer
{
EventBus.Subscribe(this);
// Dependency scene
// Level scene
// Camera
// Enemy snail
// Enemy bee
// Enemy boar
// Player
// Music
_loading = new(8, InitialLoadingCompleted);
// LoadingScreen
_loading = new(1, StartInitialLoading);
Context.UIService.OpenPanel(UIPanelType.Loading);
Context.SceneLoader.LoadSceneAsync(SceneId.Platformer, LoadSceneMode.Single).Forget();
Context.InputService.EnableMap(ActionMappings.Platformer);
Context.CameraFactory.LoadCinemachineCamera(CameraMode.Platformer).Forget();
}
private void InitialLoadingCompleted()
{
Context.UIService.ClosePanel(UIPanelType.Loading);
_enemyFactory.SpawnEnemy(PlatformerEntityType.Boar, _currentLevelData.enemySpawnPoints[0].position);
_playerFactory.SpawnPlayer(_currentLevelData.playerCheckPoints[0].position);
}
protected override void OnExitState()
{
@@ -83,10 +74,51 @@ namespace Code.Example.Platformer
_playerFactory.ReleasePlayer();
Context.CameraFactory.ReleaseCinemachineCamera(CameraMode.Platformer);
EventBus.Unsubscribe(this);
Context.InputService.DisableMap(ActionMappings.Platformer);
_audioFactory.ReleaseAudios(AudioNames.Platformer);
EventBus.Unsubscribe(this);
}
private void StartInitialLoading()
{
// Dependency scene
// Level scene
// Camera
// Enemy snail
// Enemy bee
// Enemy boar
// Player
// Music
_loading = new(8, InitialLoadingCompleted);
Context.AudioService.ChangeGroupVolume(
AudioGroupType.Music,
1f,
0.5f,
() => Context.AudioService.PlayRepeatedly(AudioNames.Platformer,0, AudioGroupType.Music));
Context.SceneLoader.LoadSceneAsync(SceneId.Platformer, LoadSceneMode.Single).Forget();
Context.InputService.EnableMap(ActionMappings.Platformer);
Context.CameraFactory.LoadCinemachineCamera(CameraMode.Platformer).Forget();
}
private void InitialLoadingCompleted()
{
_loading = new Loading(2, CloseLevel1LoadingScreen);
_enemyFactory.SpawnEnemy(PlatformerEntityType.Snail, _currentLevelData.enemySpawnPoints[0].position);
_playerFactory.SpawnPlayer(_currentLevelData.playerCheckPoints[0].position);
}
private void CloseLevel1LoadingScreen()
{
Context.UIService.ClosePanel(UIPanelType.Loading);
EventBus.RaiseEvent<IGameplayFreezeable>(x=> x.UnFreeze());
}
@@ -110,6 +142,13 @@ namespace Code.Example.Platformer
_playerEntity = entity;
Context.CameraFactory.GetCinematicCamera(CameraMode.Platformer).Follow = entity.transform;
_loading.DoProgress();
}
public void PlatformerEnemySpawned(Entity.Entity entity)
{
_loading.DoProgress();
}
public void OnReadyToPlay(AudioNames groupName)
@@ -119,25 +158,40 @@ namespace Code.Example.Platformer
public void PlayerReachedFinish()
{
_loading = new(1, Level2LoadingCompleted);
_loading = new Loading(1, StartLevel2Loading);
Context.AudioService.ChangeGroupVolume(
AudioGroupType.Music,
0f,
0.5f,
() => Context.AudioService.CancelMusic(AudioNames.Platformer, 0));
Context.UIService.OpenPanel(UIPanelType.Loading);
_playerEntity.Freeze();
EventBus.RaiseEvent<IGameplayFreezeable>(x=> x.Freeze());
SceneManager.MoveGameObjectToScene(_playerEntity.gameObject, Context.SceneLoader.GetScene(SceneId.Platformer));
}
private void StartLevel2Loading()
{
_loading = new(2, StartLevel2Gameplay);
Context.SceneLoader.UnloadSceneAsync(SceneId.Platformer2).Forget();
Context.SceneLoader.LoadSceneAsync(SceneId.Platformer3, LoadSceneMode.Additive).Forget();
}
private void Level2LoadingCompleted()
private void StartLevel2Gameplay()
{
Context.AudioService.ChangeGroupVolume(
AudioGroupType.Music,
1f,
0.5f,
() => Context.AudioService.PlayRepeatedly(AudioNames.Platformer,7, AudioGroupType.Music));
Context.UIService.ClosePanel(UIPanelType.Loading);
_enemyFactory.SpawnEnemy(PlatformerEntityType.Boar, _currentLevelData.enemySpawnPoints[0].position);
_playerEntity.transform.position = _currentLevelData.playerCheckPoints[0].position;
_playerEntity.UnFreeze();
EventBus.RaiseEvent<IGameplayFreezeable>(x=> x.UnFreeze());
}
public void OnPlatformerSceneLoaded()
@@ -179,6 +233,13 @@ namespace Code.Example.Platformer
public void OnPlatformer3SceneLoaded()
{
SceneManager.SetActiveScene(Context.SceneLoader.GetScene(SceneId.Platformer3));
_enemyFactory.SpawnEnemy(PlatformerEntityType.Boar, _currentLevelData.enemySpawnPoints[0].position);
_playerEntity.transform.position = _currentLevelData.playerCheckPoints[0].position;
_loading.DoProgress();
}
public void OnPlatformer3SceneInitialized(Container container)
@@ -187,10 +248,20 @@ namespace Code.Example.Platformer
_loading.DoProgress();
}
}
public interface IPlayerReachedFinishHandle : IGlobalSubscriber
{
void PlayerReachedFinish();
public void LoadingPanelOpened(UIPanel panel)
{
_loading.DoProgress();
}
public void LoadingPanelClosed()
{
}
public void PlayerDied()
{
Context.StateMachine.SwitchState(AppStates.MainMenu)
.AllowStateTransition(AppStates.Platformer);
}
}
}
Assets/Code/Example/Race/UI/PlayerScoreCounter.cs
+4 -4
View File
@@ -19,17 +19,17 @@ namespace Code.Example.Race.UI
_eventBus = eventBus;
_eventBus.Subscribe(this);
}
public override void Open(Action callback = null)
public override void Open()
{
playerScore.gameObject.SetActive(true);
callback?.Invoke();
// callback?.Invoke();
// image.DOColor(shownColor, 1f).onComplete = () => callback?.Invoke();
}
public override void Close(Action callback = null)
public override void Close()
{
playerScore.gameObject.SetActive(false);
callback?.Invoke();
// callback?.Invoke();
// image.DOColor(hiddenColor, 1f).onComplete += () => callback?.Invoke();
}
Assets/Code/Example/Race/UI/PlayerScores.cs
+4 -4
View File
@@ -24,16 +24,16 @@ namespace Code.Example.Race.UI
scoreText.text += $@"{score.place} место за {t:mm\:ss\:fff}\n";
}
}
public override void Open(Action callback = null)
public override void Open()
{
Tween.Color(image,shownColor, 1f);
Tween.Color(scoreText,shownColor, 1f).OnComplete( () => callback?.Invoke());
// Tween.Color(scoreText,shownColor, 1f).OnComplete( () => callback?.Invoke());
}
public override void Close(Action callback = null)
public override void Close()
{
Tween.Color(image,hiddenColor, 1f);
Tween.Color(scoreText,hiddenColor, 1f).OnComplete( () => callback?.Invoke());
// Tween.Color(scoreText,hiddenColor, 1f).OnComplete( () => callback?.Invoke());
}
}
Assets/Code/Example/Race/UI/WinScreen.cs
+4 -4
View File
@@ -15,16 +15,16 @@ namespace Code.Example.Race.UI
[SerializeField] private Color hiddenColor;
public void SetText(string text) => winText.text = text;
public override void Open(Action callback = null)
public override void Open()
{
Tween.Color(image,shownColor, 1f);
Tween.Color(winText,shownColor, 1f).OnComplete( () => callback?.Invoke());
// Tween.Color(winText,shownColor, 1f).OnComplete( () => callback?.Invoke());
}
public override void Close(Action callback = null)
public override void Close()
{
Tween.Color(image,hiddenColor, 1f);
Tween.Color(winText,hiddenColor, 1f).OnComplete( () => callback?.Invoke());
// Tween.Color(winText,hiddenColor, 1f).OnComplete( () => callback?.Invoke());
}
}
}
Assets/Code/Infrastructure/App/PapaInstaller.cs
+9 -2
View File
@@ -31,7 +31,8 @@ namespace Code.Infrastructure.App
IAudioSourcePoolInitializedHandle,
IAudioConfigsLoadedHandle,
ICinematicMachineHandle,
ILayerMasksInitializedHandle
ILayerMasksInitializedHandle,
IAudioServiceHandle
{
public void InstallBindings(ContainerBuilder containerBuilder)
{
@@ -86,7 +87,8 @@ namespace Code.Infrastructure.App
// Audio Pool
// Cinemachine Camera
// Layer masks
_initialLoading = new Loading(11, () => EssentialLoadEnded(_thatRightContainer));
// Audio Service
_initialLoading = new Loading(12, () => EssentialLoadEnded(_thatRightContainer));
_ui2CamLoading = new Loading(2,
() =>
@@ -208,5 +210,10 @@ namespace Code.Infrastructure.App
{
}
public void AudioServiceLoaded()
{
_initialLoading.DoProgress();
}
}
}
Assets/Code/Infrastructure/App/States/BootstrapState.cs
+9 -2
View File
@@ -30,13 +30,20 @@ namespace Code.Infrastructure.App.States
{
// Context.AudioFactory.ReleaseAudios(AudioNames.UISounds);
Context.UIService.TryRemovePanel(UIPanelType.DebugSceneChooser);
Context.AudioService.CancelMusic(AudioNames.UISounds,0);
Context.AudioService.ChangeGroupVolume(
AudioGroupType.Music,
0,
0.5f,
() => Context.AudioService.CancelMusic(AudioNames.UISounds,0));
_eventBus.Unsubscribe(this);
}
public void OnReadyToPlay(AudioNames groupName)
{
Context.AudioService.PlayRepeatedly(AudioNames.UISounds,0);
Context.AudioService.PlayRepeatedly(AudioNames.UISounds,0, AudioGroupType.Music);
}
public void MenuChoosePanelCreated(UIPanel panel)
Assets/Code/Infrastructure/App/States/MainMenuState.cs
+2 -2
View File
@@ -29,7 +29,7 @@ namespace Code.Infrastructure.App.States
Context.UIService.TryLoadCreatePanel(UIPanelType.DebugSceneChooser);
// Context.AudioFactory.LoadAudioClips(AudioNames.UISounds);
Context.SceneLoader.LoadSceneAsync(SceneId.MainMenu, LoadSceneMode.Single).Forget();
Context.AudioService.PlayRepeatedly(AudioNames.UISounds,0);
Context.AudioService.PlayRepeatedly(AudioNames.UISounds,0, AudioGroupType.Music);
}
protected override void OnExitState()
@@ -49,7 +49,7 @@ namespace Code.Infrastructure.App.States
public void OnReadyToPlay(AudioNames groupName)
{
_loading.DoProgress();
Context.AudioService.PlayRepeatedly(AudioNames.UISounds,0);
Context.AudioService.PlayRepeatedly(AudioNames.UISounds,0, AudioGroupType.Music);
}
public void OnMainMenuSceneLoaded()
Assets/Code/Infrastructure/Audio/AudioFactory.cs
+1 -1
View File
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using Code.Infrastructure.Configs;
using Code.Infrastructure.EventBus;
using Cysharp.Threading.Tasks;
@@ -102,5 +101,6 @@ namespace Code.Infrastructure.Audio
{
void AudioClipsLoaded(AudioNames groupName, Dictionary<int, AudioClip> toDictionary);
void AudioClipsUnLoaded(AudioNames groupName);
public void ApplyParameter(string effectName, float value, float time, Action callback = null);
}
}
Assets/Code/Infrastructure/Audio/AudioGroupType.cs
+3 -1
View File
@@ -6,6 +6,8 @@ namespace Code.Infrastructure.Audio
public enum AudioGroupType
{
Master,
SFX,
Music,
UIFX
}
}
Assets/Code/Infrastructure/Audio/AudioInfo.cs
+7 -2
View File
@@ -1,6 +1,6 @@
using Code.Infrastructure.Generators;
using UnityEngine;
using UnityEngine.AddressableAssets;
using UnityEngine.Audio;
namespace Code.Infrastructure.Audio
{
@@ -11,9 +11,14 @@ namespace Code.Infrastructure.Audio
[ToConfig] public int id;
[ToConfig] public AssetReference fileReference;
}
[Config("Configs/Audio/AudioSourceSettings")]
[Config("Configs/Audio/AudioSource")]
public class AudioSourcePrefab
{
[ToConfig] public AssetReference sourcePrefab;
}
[Config("Configs/Audio/AudioMixer")]
public class AudioMixerConfig
{
[ToConfig] public AudioMixer mixerAsset;
}
}
Assets/Code/Infrastructure/Audio/AudioService.cs
+42 -8
View File
@@ -1,8 +1,12 @@
using System;
using System.Collections.Generic;
using System.Threading;
using Code.Infrastructure.Configs;
using Code.Infrastructure.EventBus;
using Cysharp.Threading.Tasks;
using PrimeTween;
using UnityEngine;
using UnityEngine.AddressableAssets;
using UnityEngine.Audio;
namespace Code.Infrastructure.Audio
@@ -12,16 +16,18 @@ namespace Code.Infrastructure.Audio
AudioClip GetClip(AudioNames groupName, int id);
void PlayTest();
UniTaskVoid PlayOneShot(AudioNames groupName, int id, Vector3 position = new Vector3(),
UniTaskVoid PlayOneShot(AudioNames groupName, int id, AudioGroupType audioGroupType, Vector3 position = new Vector3(),
AudioSourceType sourceType = AudioSourceType.NoBlend,
AudioSource audioSource = null);
UniTaskVoid PlayRepeatedly(AudioNames groupName, int id,
UniTaskVoid PlayRepeatedly(AudioNames groupName, int id, AudioGroupType audioGroupType,
AudioSourceType sourceType = AudioSourceType.NoBlend, AudioSource audioSource = null, CancellationTokenSource cancellationTokenSource = null);
bool CheckClip(AudioNames groupName, int id);
void CancelMusic(AudioNames groupName, int id);
void ReleaseCancellationSource(AudioNames groupName, int id);
void ApplyParameter(string effectName, float value, float time, Action callback = null);
void ChangeGroupVolume(AudioGroupType groupType, float value, float time, Action callback = null);
}
public partial class AudioService : IAudioClipsEventHandle, IAudioService
@@ -33,7 +39,7 @@ namespace Code.Infrastructure.Audio
private AudioMixer _mixer;
private Dictionary<AudioGroupType, AudioMixerGroup> _audioMixerGroups = new();
public AudioService(EventBus.EventBus eventBus, IAudioFactory audioFactory, IAudioSourcePool pool)
public AudioService(EventBus.EventBus eventBus, IAudioFactory audioFactory, IAudioSourcePool pool, IConfigLocator configLocator)
{
_eventBus = eventBus;
_audioFactory = audioFactory;
@@ -44,16 +50,27 @@ namespace Code.Infrastructure.Audio
for (int i = 0; i < typeof(AudioNames).GetEnumValues().Length; i++)
_audioClips.Add((AudioNames)i, new Dictionary<int, AudioClip>());
//InitializeMixer();
LoadMixerAsset(configLocator.TryGetConfigAssetReference<AudioMixerConfigConfig>()).Forget();
}
private partial void InitializeMixer();
private async UniTaskVoid LoadMixerAsset(AssetReference audioMixerConfig)
{
var audioMixer = await Addressables.LoadAssetAsync<AudioMixerConfigConfig>(audioMixerConfig);
_mixer = audioMixer.mixerAsset;
InitializeMixer();
_eventBus.RaiseEvent<IAudioServiceHandle>(x=> x.AudioServiceLoaded());
}
public void PlayTest()
{
_pool.GetSource(AudioSourceType.NoBlend).PlayOneShot(GetClip(AudioNames.UISounds, 0));
}
public async UniTaskVoid PlayOneShot(AudioNames groupName, int id, Vector3 position = new Vector3(),
public async UniTaskVoid PlayOneShot(AudioNames groupName, int id, AudioGroupType audioGroupType, Vector3 position = new Vector3(),
AudioSourceType sourceType = AudioSourceType.NoBlend,
AudioSource audioSource = null)
{
@@ -62,6 +79,7 @@ namespace Code.Infrastructure.Audio
if (!audioSource) audioSource = _pool.GetSource(sourceType);
audioSource.transform.position = position;
audioSource.outputAudioMixerGroup = _audioMixerGroups[audioGroupType];
audioSource.PlayOneShot(GetClip(groupName, id));
await UniTask.NextFrame();
@@ -74,7 +92,7 @@ namespace Code.Infrastructure.Audio
public void CancelMusic(AudioNames groupName, int id) => _cancellationTokenSources[new KeyValuePair<AudioNames, int>(groupName, id)].Cancel();
public void ReleaseCancellationSource(AudioNames groupName, int id) => _cancellationTokenSources[new KeyValuePair<AudioNames, int>(groupName, id)] = null;
public async UniTaskVoid PlayRepeatedly(AudioNames groupName, int id,
public async UniTaskVoid PlayRepeatedly(AudioNames groupName, int id, AudioGroupType audioGroupType,
AudioSourceType sourceType = AudioSourceType.NoBlend, AudioSource audioSource = null, CancellationTokenSource cancellationTokenSource = null)
{
if (!CheckClip(groupName, id)) return;
@@ -87,7 +105,7 @@ namespace Code.Infrastructure.Audio
if (!audioSource) audioSource = _pool.GetSource(sourceType);
if(!audioSource.resource) audioSource.resource = GetClip(groupName, id);
audioSource.outputAudioMixerGroup = _audioMixerGroups[audioGroupType];
audioSource.Play();
await UniTask.NextFrame();
@@ -107,7 +125,7 @@ namespace Code.Infrastructure.Audio
return;
}
PlayRepeatedly(groupName, id, sourceType, audioSource, cancellationTokenSource).Forget();
PlayRepeatedly(groupName, id, AudioGroupType.Music, sourceType, audioSource, cancellationTokenSource).Forget();
}
public AudioClip GetClip(AudioNames groupName, int id) => _audioClips[groupName][id];
@@ -124,10 +142,26 @@ namespace Code.Infrastructure.Audio
_audioClips[groupName].Clear();
_audioClips[groupName] = null;
}
public void ApplyParameter(string effectName, float value, float time, Action callback = null)
{
_mixer.GetFloat(effectName, out float startValue);
Tween.Custom(startValue, value, time, newValue => {
_mixer.SetFloat(effectName, newValue);
}).OnComplete(callback);
}
public void ChangeGroupVolume(AudioGroupType groupType, float value, float time, Action callback = null)
{
ApplyParameter(_audioMixerGroups[groupType].name, Mathf.Log10(value == 0f ? 0.001f : value) * 20, time, callback);
}
}
public interface IReadyToPlayHandle : IGlobalSubscriber
{
void OnReadyToPlay(AudioNames groupName);
}
public interface IAudioServiceHandle : IGlobalSubscriber
{
void AudioServiceLoaded();
}
}
Assets/Code/Infrastructure/Generators/Attributes.cs
+1
View File
@@ -51,4 +51,5 @@ namespace Code.Infrastructure.Generators
public class AudioMixerEnum : Attribute
{
}
public class UIEventOpenClose : Attribute{}
}
Assets/Code/Infrastructure/Generators/UIPanelEventsGenerator.cs
+28
View File
@@ -1,5 +1,6 @@
#if UNITY_EDITOR
using Code.Infrastructure.UI;
using Unity.VisualScripting;
using UnityCodeGen;
using UnityEditor;
@@ -43,6 +44,33 @@ namespace Code.Infrastructure.Generators
}}
";
if(st.HasAttribute(typeof(UIEventOpenClose)))
{
fireStatesCode += $@"
protected override void FireOpenedEvent()
{{
_eventBus.RaiseEvent<I{st.Name}OpenedHandle>(h => h.{st.Name}Opened(this));
}}
protected override void FireClosedEvent()
{{
_eventBus.RaiseEvent<I{st.Name}ClosedHandle>(h => h.{st.Name}Closed());
base.FireClosedEvent();
}}
";
fireStatesInterfacesCode += $@"
public interface I{st.Name}OpenedHandle : IGlobalSubscriber
{{
void {st.Name}Opened(UIPanel panel);
}}
public interface I{st.Name}ClosedHandle : IGlobalSubscriber
{{
void {st.Name}Closed();
}}
";
}
var statesCode = $@"
// retard-generated
Assets/Code/Infrastructure/Loadings/Loading.cs
+1 -2
View File
@@ -1,5 +1,4 @@
using System;
using UnityEngine;
namespace Code.Infrastructure.Loadings
{
@@ -26,7 +25,7 @@ namespace Code.Infrastructure.Loadings
_progress--;
_loadProgress?.Invoke(this);
if(_progress <= 0) // Зачем инвертировать, если так читается лучше, райдер соси
if(_progress == 0) // Зачем инвертировать, если так читается лучше, райдер соси
{
Completed = true;
_completed();
Assets/Code/Infrastructure/UI/Panels/LoadingPanel.cs
+6 -4
View File
@@ -1,23 +1,25 @@
using System;
using Code.Infrastructure.Generators;
using PrimeTween;
using UnityEngine;
using UnityEngine.UI;
namespace Code.Infrastructure.UI.Panels
{
[UIEventOpenClose]
public partial class LoadingPanel : UIPanel
{
[SerializeField] private RawImage image;
[SerializeField] private Color shownColor;
[SerializeField] private Color hiddenColor;
public override void Open(Action callback = null)
public override void Open()
{
Tween.Color(image,shownColor, 1f).OnComplete( () => callback?.Invoke());
Tween.Color(image,shownColor, 1f).OnComplete(FireOpenedEvent);
}
public override void Close(Action callback = null)
public override void Close()
{
Tween.Color(image,hiddenColor, 1f).OnComplete( () => callback?.Invoke());
Tween.Color(image,hiddenColor, 1f).OnComplete(FireClosedEvent);
}
}
}
Assets/Code/Infrastructure/UI/Panels/LogoPanel.cs
+6 -5
View File
@@ -1,23 +1,24 @@
using System;
using Code.Infrastructure.Generators;
using PrimeTween;
using UnityEngine;
using UnityEngine.UI;
namespace Code.Infrastructure.UI.Panels
{
[UIEventOpenClose]
public partial class LogoPanel : UIPanel
{
[SerializeField] private Image image;
[SerializeField] private Color shownColor;
[SerializeField] private Color hiddenColor;
public override void Open(Action callback = null)
public override void Open()
{
Tween.Color(image,shownColor, 1f).OnComplete( () => callback?.Invoke());
Tween.Color(image,shownColor, 1f).OnComplete(FireOpenedEvent);
}
public override void Close(Action callback = null)
public override void Close()
{
Tween.Color(image,hiddenColor, 1f).OnComplete( () => callback?.Invoke());
Tween.Color(image,hiddenColor, 1f).OnComplete(FireClosedEvent);
}
}
}
Assets/Code/Infrastructure/UI/Panels/MenuChoosePanel.cs
+9 -9
View File
@@ -1,28 +1,28 @@
using System;
using Code.Debug;
using Code.Infrastructure.Audio;
using Code.Infrastructure.Generators;
using Reflex.Attributes;
using UnityEngine;
namespace Code.Infrastructure.UI.Panels
{
[UIEventOpenClose]
public partial class MenuChoosePanel : UIPanel
{
[Inject] IAudioService _audioService;
[SerializeField] private SceneChooser sceneChooser;
public void PlaySelectSound() => _audioService.PlayOneShot(AudioNames.UISounds, 7);
public void PlayDeselectSound() => _audioService.PlayOneShot(AudioNames.UISounds, 8);
public void PlayClickSound() => _audioService.PlayOneShot(AudioNames.UISounds, 1);
public override void Open(Action callback = null)
public void PlaySelectSound() => _audioService.PlayOneShot(AudioNames.UISounds, 7, AudioGroupType.UIFX);
public void PlayDeselectSound() => _audioService.PlayOneShot(AudioNames.UISounds, 8, AudioGroupType.UIFX);
public void PlayClickSound() => _audioService.PlayOneShot(AudioNames.UISounds, 1, AudioGroupType.UIFX);
public override void Open()
{
sceneChooser.EnableButtons();
callback?.Invoke();
FireOpenedEvent();
}
public override void Close(Action callback = null)
public override void Close()
{
callback?.Invoke();
FireClosedEvent();
}
}
}
Assets/Code/Infrastructure/UI/UIPanel.cs
+8 -3
View File
@@ -1,4 +1,3 @@
using System;
using Reflex.Attributes;
using UnityEngine;
@@ -11,11 +10,17 @@ namespace Code.Infrastructure.UI
[SerializeField] protected bool injectMeSenpai;
public bool InjectMeSenpai => injectMeSenpai;
[Inject] protected EventBus.EventBus _eventBus;
public abstract void Open(Action callback = null);
public abstract void Close(Action callback = null);
public abstract void Open();
public abstract void Close();
// Вызвать вручную \ добавить в коллбек для вызова ивента в EventBus
public virtual void FireCreatedEvent(){}
// Вызвать вручную \ добавить в коллбек для вызова ивента в EventBus
public virtual void FireRemovedEvent(){}
// Вызвать вручную \ добавить в коллбек для вызова ивента в EventBus
protected virtual void FireOpenedEvent(){}
// Вызвать вручную \ добавить в коллбек для вызова ивента в EventBus
protected virtual void FireClosedEvent(){gameObject.SetActive(false);}
}
}
Assets/Code/Infrastructure/UI/UIService.cs
+3 -15
View File
@@ -52,10 +52,7 @@ namespace Code.Infrastructure.UI
// TODO Close event
public void ClosePanel(UIPanelType uiPanelType)
{
_loadedSinglePanels[uiPanelType].Close(() =>
{
_loadedSinglePanels[uiPanelType].gameObject.SetActive(false);
});
_loadedSinglePanels[uiPanelType].Close();
}
public void TryLoadCreatePanel(UIPanelType uiPanelType, Transform parent = null) => _factory.LoadPanel(uiPanelType, parent);
@@ -89,20 +86,11 @@ namespace Code.Infrastructure.UI
UnityEngine.Debug.LogError("Это для единичных панелей олух");
return;
}
_loadedSinglePanels[uiPanelType].Close(() =>
{
_loadedSinglePanels[uiPanelType].gameObject.SetActive(false);
RemovePanel(uiPanelType);
});
_loadedSinglePanels[uiPanelType].Close();
}
public void TryRemovePanel(UIPanel panel)
{
panel.Close(() =>
{
panel.gameObject.SetActive(false);
RemovePanel(panel);
// _eventBus.RaiseEvent<IUIMultiplePanelHandle>(x=> x.UIMultiplePanelRemoved(panel));
});
panel.Close();
}
private void RemovePanel(UIPanelType panelType)
Assets/Platformer.mixer
-218
View File
@@ -1,218 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!243 &-4885867187619108525
AudioMixerGroupController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Enemies
m_AudioMixer: {fileID: 24100000}
m_GroupID: 2737d6f5b12f94040babd85f247f3222
m_Children: []
m_Volume: 4ee68e51764b8634989c42213d634ae2
m_Pitch: 0dca533d3dd14d44c90b58c4679f3cd4
m_Send: 00000000000000000000000000000000
m_Effects:
- {fileID: 6617966939821968642}
m_UserColorIndex: 0
m_Mute: 0
m_Solo: 0
m_BypassEffects: 0
--- !u!243 &-609011773278358017
AudioMixerGroupController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: SFX
m_AudioMixer: {fileID: 24100000}
m_GroupID: 427b0bc5b6d508d468596c610aa75f3d
m_Children:
- {fileID: 1253815002776095917}
- {fileID: -4885867187619108525}
m_Volume: 9bf27cc9ec201d74e87cc110fbc7e9bd
m_Pitch: 34349f555e0b4284a9adead0140ac43c
m_Send: 00000000000000000000000000000000
m_Effects:
- {fileID: 3004468802842572259}
m_UserColorIndex: 0
m_Mute: 0
m_Solo: 0
m_BypassEffects: 0
--- !u!241 &24100000
AudioMixerController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Platformer
m_OutputGroup: {fileID: 0}
m_MasterGroup: {fileID: 24300002}
m_Snapshots:
- {fileID: 24500006}
m_StartSnapshot: {fileID: 24500006}
m_SuspendThreshold: -80
m_EnableSuspend: 1
m_UpdateMode: 0
m_ExposedParameters:
- guid: 4ee68e51764b8634989c42213d634ae2
name: Enemies
- guid: 5d685056c555bc447bc0c777de745131
name: Master
- guid: db26c3e7dd1b4b7438224654f27219b0
name: Music
- guid: c63ce320545376244876a86528397264
name: Player
- guid: 9bf27cc9ec201d74e87cc110fbc7e9bd
name: SFX
m_AudioMixerGroupViews:
- guids:
- ed911f6795b8e2a4ea8f086f6bfaa1ef
- 427b0bc5b6d508d468596c610aa75f3d
- 0fac0087e15185941996f24d44ccda00
- 02d74d5e56719ea4f8122e6eb42732d8
- 2737d6f5b12f94040babd85f247f3222
name: View
m_CurrentViewIndex: 0
m_TargetSnapshot: {fileID: 24500006}
--- !u!243 &24300002
AudioMixerGroupController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Master
m_AudioMixer: {fileID: 24100000}
m_GroupID: ed911f6795b8e2a4ea8f086f6bfaa1ef
m_Children:
- {fileID: 1898730652868345154}
- {fileID: -609011773278358017}
m_Volume: 5d685056c555bc447bc0c777de745131
m_Pitch: 03b815b5efca35b42afad2645451e29e
m_Send: 00000000000000000000000000000000
m_Effects:
- {fileID: 24400004}
m_UserColorIndex: 0
m_Mute: 0
m_Solo: 0
m_BypassEffects: 0
--- !u!244 &24400004
AudioMixerEffectController:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_EffectID: b312fd15196355744bf5f37e6efc8c15
m_EffectName: Attenuation
m_MixLevel: dc9d62e0a4702f24a8fba062511a34fe
m_Parameters: []
m_SendTarget: {fileID: 0}
m_EnableWetMix: 0
m_Bypass: 0
--- !u!245 &24500006
AudioMixerSnapshotController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Snapshot
m_AudioMixer: {fileID: 24100000}
m_SnapshotID: 1f27f34254146ef439967d1c5a5ea278
m_FloatValues: {}
m_TransitionOverrides: {}
--- !u!243 &1253815002776095917
AudioMixerGroupController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Player
m_AudioMixer: {fileID: 24100000}
m_GroupID: 02d74d5e56719ea4f8122e6eb42732d8
m_Children: []
m_Volume: c63ce320545376244876a86528397264
m_Pitch: a7b3b43bfd8f34f43831e48f5d87a790
m_Send: 00000000000000000000000000000000
m_Effects:
- {fileID: 2298478056328136299}
m_UserColorIndex: 0
m_Mute: 0
m_Solo: 0
m_BypassEffects: 0
--- !u!243 &1898730652868345154
AudioMixerGroupController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Music
m_AudioMixer: {fileID: 24100000}
m_GroupID: 0fac0087e15185941996f24d44ccda00
m_Children: []
m_Volume: db26c3e7dd1b4b7438224654f27219b0
m_Pitch: 9a33428290c158045b36b1e8497952cb
m_Send: 00000000000000000000000000000000
m_Effects:
- {fileID: 3865688004085144149}
m_UserColorIndex: 0
m_Mute: 0
m_Solo: 0
m_BypassEffects: 0
--- !u!244 &2298478056328136299
AudioMixerEffectController:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_EffectID: b9fc91cd2bc38c7459bac9ce7a2d50a1
m_EffectName: Attenuation
m_MixLevel: 6c42c088b1b37954787a44c94565f988
m_Parameters: []
m_SendTarget: {fileID: 0}
m_EnableWetMix: 0
m_Bypass: 0
--- !u!244 &3004468802842572259
AudioMixerEffectController:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_EffectID: 66ee272b16cd093428e3c0ab0f3eca62
m_EffectName: Attenuation
m_MixLevel: 83d2952aeb0ce6e44ba516eb939b081e
m_Parameters: []
m_SendTarget: {fileID: 0}
m_EnableWetMix: 0
m_Bypass: 0
--- !u!244 &3865688004085144149
AudioMixerEffectController:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_EffectID: b9f3f755d4afab94abe46863f353b6fc
m_EffectName: Attenuation
m_MixLevel: 7a84913570a4ffd43b0a7a56f4be5409
m_Parameters: []
m_SendTarget: {fileID: 0}
m_EnableWetMix: 0
m_Bypass: 0
--- !u!244 &6617966939821968642
AudioMixerEffectController:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_EffectID: 8129d912cecf4cd4ebffeb7e78d82ab3
m_EffectName: Attenuation
m_MixLevel: 0b64308abd7b0a746b4ae5fcdbd151cd
m_Parameters: []
m_SendTarget: {fileID: 0}
m_EnableWetMix: 0
m_Bypass: 0
Assets/Resources/Audio/MainMixer.mixer
+134 -1
View File
@@ -33,6 +33,50 @@ AudioMixerGroupController:
m_Mute: 0
m_Solo: 0
m_BypassEffects: 0
--- !u!244 &-3047442594442701686
AudioMixerEffectController:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_EffectID: 435296a4f74697441a59fafbf85f5e41
m_EffectName: Duck Volume
m_MixLevel: 2a236a715b6f378978c74bb5333b6c06
m_Parameters:
- m_ParameterName: Threshold
m_GUID: baea3d64a9e32114bb42cb9b49746bce
- m_ParameterName: Ratio
m_GUID: f5a0bc732d40df7eaad7c3fbef708e1e
- m_ParameterName: Attack Time
m_GUID: e607e1e8bee2ac18594c14dd43ff73c7
- m_ParameterName: Release Time
m_GUID: cdd67d10b76aab1d5b5bc020f942101c
- m_ParameterName: Make-up Gain
m_GUID: ee8020b7b80ff8f729349481899b4a0d
- m_ParameterName: Knee
m_GUID: a1e9a8bb84a218bb9b9b489e8e5b91c1
- m_ParameterName: Sidechain Mix
m_GUID: f328c83fc652de149911c6d89a34b0c5
m_SendTarget: {fileID: 0}
m_EnableWetMix: 0
m_Bypass: 0
--- !u!244 &-2174726629147734615
AudioMixerEffectController:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_EffectID: 1a94af6faf7c80f25a19556423ddf724
m_EffectName: Lowpass Simple
m_MixLevel: d932ce66daf02bf078d6285e8caa8a95
m_Parameters:
- m_ParameterName: Cutoff freq
m_GUID: baa9f5e5aa93f01c99e9317391c81fb2
m_SendTarget: {fileID: 0}
m_EnableWetMix: 0
m_Bypass: 0
--- !u!244 &-1875565258025301087
AudioMixerEffectController:
m_ObjectHideFlags: 3
@@ -84,15 +128,20 @@ AudioMixerController:
m_ExposedParameters:
- guid: a9c562da7fa337e48a030c372ca8d508
name: Master
- guid: baa9f5e5aa93f01c99e9317391c81fb2
name: PlatformerDamage
- guid: 18f0cfbd05b07a44c82546ab713fac1d
name: Music
- guid: a52ad94d3f570a748b3832a440618943
name: SFX
- guid: 254c0c520baea186a8238aca41b2a313
name: UIFX
m_AudioMixerGroupViews:
- guids:
- d1c896df027b32049855870fa99dd50a
- 96e1e4002c892b3479987bdf7f9f3bd2
- d2b92001bc3425e4383166868ad51a30
- e16935ea7e588b98a937ce7a8c341171
name: View
m_CurrentViewIndex: 0
m_TargetSnapshot: {fileID: 24500006}
@@ -108,11 +157,13 @@ AudioMixerGroupController:
m_Children:
- {fileID: -6390533329811558162}
- {fileID: -809212676226627377}
- {fileID: 8183671088622660797}
m_Volume: a9c562da7fa337e48a030c372ca8d508
m_Pitch: f43de360fa9e633489bdb52d2ae24ccc
m_Send: 00000000000000000000000000000000
m_Effects:
- {fileID: 24400004}
- {fileID: -2174726629147734615}
m_UserColorIndex: 0
m_Mute: 0
m_Solo: 0
@@ -140,5 +191,87 @@ AudioMixerSnapshotController:
m_Name: Snapshot
m_AudioMixer: {fileID: 24100000}
m_SnapshotID: e50ade30777353e4c88cef48f660869e
m_FloatValues: {}
m_FloatValues:
64e3a733167a8c9b7b414657cfd0e4a4: 100
7c3d9be3b829f1167b75a7c2d5310e98: 20
eee6edc41cd4a2bd79e2891fe416acf2: 1
4b9ca5256a152aeaf9ca042a5776c8f5: 111
8f202a06e27be55e4ae3c6f5fe6c23b3: 0.76199996
d86370c6a0a8d4dfe9686216af7c4b9c: -15
45478b4a0416324e692da28ae9c4f321: 0
23d5866afae01f5b99d4bb2ab92f0d3d: 10
9521f1bddf74c8767893d00cc39568cf: 1
6846e83e0a2d50afa9801c218f6eaade: 0
5cc0ee9e200d9fb4cbdf365af21b3b9f: 0.475
4acd7a3fa50b3ca948aab0309c3e9478: 0
a47be4cfdf1ac62f3987859e7f563a5c: 0.97
m_TransitionOverrides: {}
--- !u!244 &308170612991108648
AudioMixerEffectController:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_EffectID: 0b512be6aeaccae9fb5be59315195d96
m_EffectName: Attenuation
m_MixLevel: e46143798d5673f6c82dc03a56086966
m_Parameters: []
m_SendTarget: {fileID: 0}
m_EnableWetMix: 0
m_Bypass: 0
--- !u!243 &8183671088622660797
AudioMixerGroupController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UIFX
m_AudioMixer: {fileID: 24100000}
m_GroupID: e16935ea7e588b98a937ce7a8c341171
m_Children: []
m_Volume: 254c0c520baea186a8238aca41b2a313
m_Pitch: 53b9bf210bcbb0da9b1fcd04db01e50a
m_Send: 00000000000000000000000000000000
m_Effects:
- {fileID: 308170612991108648}
m_UserColorIndex: 0
m_Mute: 0
m_Solo: 0
m_BypassEffects: 0
--- !u!244 &8397955365555990165
AudioMixerEffectController:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_EffectID: b870f534162579d7c968eefaea61b583
m_EffectName: Lowpass Simple
m_MixLevel: 17d23838a3360444883d54f98e84b4f7
m_Parameters:
- m_ParameterName: Cutoff freq
m_GUID: 5da0935ebfcf722a4a0ad431d66a4663
m_SendTarget: {fileID: 0}
m_EnableWetMix: 0
m_Bypass: 0
--- !u!244 &8773632370694560972
AudioMixerEffectController:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_EffectID: 4aa432b213d29b8f8a417d2c22ab7dae
m_EffectName: ParamEQ
m_MixLevel: 6bbb09bd055d17ae2aaed7095e45c27c
m_Parameters:
- m_ParameterName: Center freq
m_GUID: dba0f399f97908df7bc51d2847bbff72
- m_ParameterName: Octave range
m_GUID: 4d734f64afc613fbf8bad07b1c283fd6
- m_ParameterName: Frequency gain
m_GUID: c325e5a8139ac3ebaaa31b467b955a59
m_SendTarget: {fileID: 0}
m_EnableWetMix: 0
m_Bypass: 0
Assets/Resources/Example/Platformer/Assets/Buildings_27.asset
+36
View File
@@ -0,0 +1,36 @@
%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: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: Buildings_27
m_EditorClassIdentifier: UnityEngine.dll::UnityEngine.Tilemaps.Tile
m_Sprite: {fileID: 1585342268, guid: 6b7c943308e1fcdd5b986969ed12d0ae, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_InstancedGameObject: {fileID: 0}
m_Flags: 1
m_ColliderType: 1
Assets/Platformer.mixer.meta → Assets/Resources/Example/Platformer/Assets/Buildings_27.asset.meta
+2 -2
View File
@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: ae54a5f5e83d3d448a551d88338e6811
guid: e5e9c295b697769d8a668f15b0a2e694
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 24100000
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources/Example/Platformer/Assets/Tiles.aseprite.meta
+944 -5
View File
@@ -72,7 +72,7 @@ ScriptedImporter:
textureFormatSet: 0
applyGammaDecoding: 0
previousAsepriteImporterSettings:
fileImportMode: 1
fileImportMode: 0
importHiddenLayers: 0
layerImportMode: 1
defaultPivotSpace: 0
@@ -87,7 +87,7 @@ ScriptedImporter:
generateIndividualEvents: 1
generateSpriteAtlas: 1
asepriteImporterSettings:
fileImportMode: 1
fileImportMode: 0
importHiddenLayers: 0
layerImportMode: 1
defaultPivotSpace: 0
@@ -102,7 +102,7 @@ ScriptedImporter:
generateIndividualEvents: 1
generateSpriteAtlas: 1
importFileNodeState: 1
platformSettingsDirtyTick: 0
platformSettingsDirtyTick: 639098827495807220
textureAssetName:
singleSpriteImportData:
- name:
@@ -148,7 +148,910 @@ ScriptedImporter:
edges: []
tessellationDetail: 0
uvTransform: {x: 4, y: 4}
spriteSheetImportData: []
spriteSheetImportData:
- name: Tiles_0
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 5
y: 324
width: 78
height: 70
spriteID: 99de19d5ebee4f976971f38976287c74
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_1
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 278
y: 356
width: 124
height: 43
spriteID: 32258e59e3fd7bb49b4f25b2e0f9df05
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_2
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 278
y: 308
width: 124
height: 43
spriteID: 876a3578387d8e27b9213aece61ea127
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_3
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 278
y: 260
width: 124
height: 43
spriteID: 339e068637f700c52af87ea81ce135f2
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_4
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 278
y: 212
width: 124
height: 43
spriteID: 96345104ff751bf14b75b99a011f98e1
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_5
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 246
y: 149
width: 11
height: 14
spriteID: 3a7fd64fe7846f1638791a21675e1f34
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_6
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 261
y: 100
width: 30
height: 57
spriteID: 442dab8d594ccdb02a159d51abcdfc9d
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_7
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 278
y: 132
width: 124
height: 75
spriteID: 53d19e7d1339cfa3d858375e51fbef24
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_8
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 245
y: 99
width: 14
height: 48
spriteID: ac2016ddc476ad30791d8fa7a8fc94dc
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_9
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 293
y: 100
width: 30
height: 27
spriteID: bb3fbe81de71bd8c88111147fd5b7a7f
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_10
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 325
y: 68
width: 79
height: 61
spriteID: bb6f690bb3bf2e0aeb5258c5c3a66469
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_11
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 365
y: 122
width: 5
height: 8
spriteID: 1657261955f7ee623a2073353b59586f
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_12
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 250
y: 85
width: 4
height: 13
spriteID: f7f3ec47462ff812ca8c04acad4f2b01
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_13
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 261
y: 84
width: 15
height: 27
spriteID: 47402851278c0cb4e886d0781984e900
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_14
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 278
y: 52
width: 28
height: 37
spriteID: 25d4a350fd694f8479ec154ac80c9765
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_15
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 310
y: 52
width: 28
height: 42
spriteID: cc74ef1824b705d698329574e06fcbfd
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_16
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 246
y: 74
width: 12
height: 7
spriteID: 21a0f0caabefb62459ad2acc9494694f
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_17
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 261
y: 52
width: 15
height: 26
spriteID: 3529d1024c62e9d30932437eef2eea1a
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_18
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 249
y: 56
width: 6
height: 9
spriteID: 2937ded6de0d981afa941e7ef3efe813
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_19
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 246
y: 36
width: 12
height: 15
spriteID: f7a69f735dad818d8885d553a5724637
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_20
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 262
y: 36
width: 12
height: 15
spriteID: bd1123f8a9cb2e196bd26ae4f0d8aac1
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_21
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 278
y: 36
width: 12
height: 15
spriteID: 88bf9030f119b878581d938f8f9f3b0b
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_22
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 294
y: 36
width: 12
height: 15
spriteID: dd18a2cfe24f2f72ca8b57113cff62e3
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_23
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 310
y: 36
width: 12
height: 10
spriteID: 3b5baa69cc0794621b8114a9d9430939
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_24
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 324
y: 20
width: 32
height: 25
spriteID: 17c045057a9d6fd38b8c2efa5c534cdb
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_25
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 247
y: 20
width: 10
height: 11
spriteID: 881930d4e6243b6c883fbaf75eb8d53e
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_26
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 263
y: 20
width: 10
height: 11
spriteID: 7d9c382bbdd4f7eefa6da6ec4ee6761c
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_27
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 279
y: 20
width: 10
height: 11
spriteID: e6ac60d6083430971ab3241e3e978ab1
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_28
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 295
y: 20
width: 10
height: 11
spriteID: 24596a04591cad32cbf63b3d8437c8b8
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_29
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 311
y: 20
width: 10
height: 8
spriteID: efbe4fffcfb47da059b015244a62faaa
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_30
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 248
y: 4
width: 7
height: 11
spriteID: 4138c52f80eb46242b813a884c59aeb5
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_31
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 264
y: 4
width: 7
height: 11
spriteID: e89f8bd4fca9b4a2cb77bbaba5190f5b
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_32
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 280
y: 4
width: 7
height: 11
spriteID: 3ea7e0f3f2205e948bc948823f2afc91
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_33
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 296
y: 4
width: 7
height: 11
spriteID: b4a1a5555be9fc43887a0a835524c1c5
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_34
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 312
y: 4
width: 7
height: 6
spriteID: fd38119de7493619dbdf2ccaa1c02721
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_35
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 5
y: 244
width: 78
height: 69
spriteID: b7780e76ba9710672b4133fe227f0e46
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_36
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 4
y: 36
width: 80
height: 32
spriteID: a9f78570bf299ea709f880d04f0323e6
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_37
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 84
y: 36
width: 80
height: 32
spriteID: 706325aacf71a1c90af7725d0204d6a2
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_38
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 164
y: 36
width: 80
height: 32
spriteID: 469a4b11959fd5d5da55b63b06f6743f
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_39
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 83
y: 356
width: 33
height: 36
spriteID: 5e70c074c69a925f99a400c161a14f4d
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_40
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 116
y: 356
width: 32
height: 36
spriteID: 24c10e3fb99aa3b47a6707555f2f0212
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_41
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 68
y: 212
width: 32
height: 32
spriteID: 97e98d2c1322317ebbc37f28dbf4419e
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
- name: Tiles_42
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
customData:
rect:
serializedVersion: 2
x: 116
y: 324
width: 16
height: 21
spriteID: 0bf293fecca95419bbc7e6aaca7ac41e
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 0, y: 0}
tileSetImportData: []
asepriteLayers:
- layerIndex: 0
@@ -177,7 +1080,43 @@ ScriptedImporter:
tileSetIndex: 0
parentIndex: -1
tileSets: []
platformSettings: []
platformSettings:
- name: DefaultTexturePlatform
overridden: 0
ignorePlatformSupport: 0
maxTextureSize: 16384
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
forceMaximumCompressionQuality_BC6H_BC7: 0
crunchedCompression: 0
allowsAlphaSplitting: 0
androidETC2FallbackOverride: 0
- name: Standalone
overridden: 0
ignorePlatformSupport: 0
maxTextureSize: 16384
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
forceMaximumCompressionQuality_BC6H_BC7: 0
crunchedCompression: 0
allowsAlphaSplitting: 0
androidETC2FallbackOverride: 0
- name: Android
overridden: 0
ignorePlatformSupport: 0
maxTextureSize: 16384
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
forceMaximumCompressionQuality_BC6H_BC7: 0
crunchedCompression: 0
allowsAlphaSplitting: 0
androidETC2FallbackOverride: 0
generatePhysicsShape: 0
secondarySpriteTextures: []
spritePackingTag:
Assets/Resources/Example/Platformer/New Palette.prefab
+17 -3
View File
@@ -137,15 +137,29 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -2, y: 1, z: 0}
second:
serializedVersion: 2
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
m_AnimatedTiles: {}
m_TileAssetArray:
- m_RefCount: 5
m_Data: {fileID: 11400000, guid: bb0913ddc348c8d47b3da07d98b7a26a, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: e5e9c295b697769d8a668f15b0a2e694, type: 2}
m_TileSpriteArray:
- m_RefCount: 5
m_Data: {fileID: -1902027194, guid: 6b7c943308e1fcdd5b986969ed12d0ae, type: 3}
- m_RefCount: 1
m_Data: {fileID: 1585342268, guid: 6b7c943308e1fcdd5b986969ed12d0ae, type: 3}
m_TileMatrixArray:
- m_RefCount: 5
- m_RefCount: 6
m_Data:
e00: 1
e01: 0
@@ -164,7 +178,7 @@ Tilemap:
e32: 0
e33: 1
m_TileColorArray:
- m_RefCount: 5
- m_RefCount: 6
m_Data: {r: 1, g: 1, b: 1, a: 1}
m_TileObjectToInstantiateArray: []
m_AnimationFrameRate: 1
@@ -246,7 +260,7 @@ TilemapRenderer:
m_SortOrder: 0
m_Mode: 0
m_DetectChunkCullingBounds: 0
--- !u!114 &5465318034645326854
--- !u!114 &2977928790247914844
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Assets/Resources/SystemConfigsReferences.asset
+38 -32
View File
@@ -12,42 +12,48 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 728b0ad306a64bd28d47fc4d052c5e81, type: 3}
m_Name: SystemConfigsReferences
m_EditorClassIdentifier: Assembly-CSharp::Code.Infrastructure.Configs.SystemConfigsReferences
AudioInfo: AudioInfoConfig
PlatformerEntitySettings: PlatformerEntity
PlatformerPlayerSettings:
m_AssetGUID: f281706c5b7913f43891c237c5210d40
m_SubObjectName:
m_SubObjectType:
m_SubObjectGUID:
m_EditorAssetChanged: 0
VolumeSettings: PostProccessVolume
GameCamera:
m_AssetGUID: c42e39e2fb64cdd45b2ebc4b723d9d0c
m_SubObjectName:
m_SubObjectType:
m_SubObjectGUID:
m_EditorAssetChanged: 1
UIPanelSettings: UIPanelConfig
RacerSettings: RacerConfig
LayerMasksConfig: LayerMaskConfig
AudioSourceSettings: AudioSettingsConfig
AudioSourcePrefab:
m_AssetGUID: d7dd69cfadda3d6e18ec390724be0d80
m_SubObjectName:
m_SubObjectType:
m_SubObjectGUID:
m_EditorAssetChanged: 1
CanvasSettings:
m_AssetGUID: 17c5e56eb6c99db40b6093c9d543bb4f
m_SubObjectName:
m_SubObjectType:
m_SubObjectGUID:
m_EditorAssetChanged: 0
SceneInfo: SceneConfig
CameraSettings: CameraConfig
InputService:
m_AssetGUID: eab71c0cf90c4b94294e497d3734cfe1
m_SubObjectName:
m_SubObjectType:
m_SubObjectGUID:
m_EditorAssetChanged: 0
AudioSourcePrefab:
m_AssetGUID: d7dd69cfadda3d6e18ec390724be0d80
m_SubObjectName:
m_SubObjectType:
m_SubObjectGUID:
m_EditorAssetChanged: 1
VolumeSettings: PostProccessVolume
UIPanelSettings: UIPanelConfig
AudioInfo: AudioInfoConfig
AudioSourceSettings: AudioSettingsConfig
SceneInfo: SceneConfig
RacerSettings: RacerConfig
CameraSettings: CameraConfig
GameCamera:
m_AssetGUID: c42e39e2fb64cdd45b2ebc4b723d9d0c
m_SubObjectName:
m_SubObjectType:
m_SubObjectGUID:
m_EditorAssetChanged: 1
PlatformerPlayerSettings:
m_AssetGUID: f281706c5b7913f43891c237c5210d40
m_SubObjectName:
m_SubObjectType:
m_SubObjectGUID:
m_EditorAssetChanged: 0
CanvasSettings:
m_AssetGUID: 17c5e56eb6c99db40b6093c9d543bb4f
m_SubObjectName:
m_SubObjectType:
m_SubObjectGUID:
m_EditorAssetChanged: 0
LayerMasksConfig: LayerMaskConfig
AudioMixerConfig:
m_AssetGUID: 38081c3b5216d4c329cc1cec80b1818c
m_SubObjectName:
m_SubObjectType:
m_SubObjectGUID:
m_EditorAssetChanged: 0
Assets/Resources_moved/Configs/Audio/AudioMixerConfig.asset
+15
View File
@@ -0,0 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0f979b3faf3a08153b7fcb2350141017, type: 3}
m_Name: AudioMixerConfig
m_EditorClassIdentifier: Assembly-CSharp::Code.Infrastructure.Audio.AudioMixerConfigConfig
mixerAsset: {fileID: 24100000, guid: c64b0b8c066584d4b92a2adde2258a00, type: 2}
Assets/Resources_moved/Configs/Audio/AudioMixerConfig.asset.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 38081c3b5216d4c329cc1cec80b1818c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources_moved/Example/Platformer/Audio/35. はったれ五右衛門.mp3
LFS
BIN
View File
Binary file not shown.
Assets/Resources_moved/Example/Platformer/Audio/35. はったれ五右衛門.mp3.meta
+23
View File
@@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: 4433c918bf5643cd9a4b83ccdd369779
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:
Assets/Resources_moved/Example/Platformer/Audio/36. プロゴルファー猿田彦.mp3
LFS
BIN
View File
Binary file not shown.
Assets/Resources_moved/Example/Platformer/Audio/36. プロゴルファー猿田彦.mp3.meta
+23
View File
@@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: 7247c8f09e5f00b889ed31f15a5099e6
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:
Assets/Resources_moved/Example/Platformer/Characters/Enemies/Snail.prefab
+94 -1
View File
@@ -34,7 +34,8 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Children:
- {fileID: 2785710779708791236}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &200530768292093389
@@ -210,6 +211,7 @@ MonoBehaviour:
groundLeft: {x: -0.3, y: -0.2}
groundRight: {x: 0.3, y: -0.2}
_directionRight: 1
health: {fileID: 6540176975630265631}
--- !u!114 &6540176975630265631
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -222,3 +224,94 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a3078030faef42b5bddd46a7c5c91d95, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Code.Example.Platformer.Entity.EntityHealth
--- !u!1 &6796039909030473191
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2785710779708791236}
- component: {fileID: 4840516702014287326}
- component: {fileID: 6174594429560262786}
m_Layer: 12
m_Name: Damager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2785710779708791236
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6796039909030473191}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4330041015761084350}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &4840516702014287326
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6796039909030473191}
m_Enabled: 1
serializedVersion: 3
m_Density: 1
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_ForceSendLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ForceReceiveLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ContactCaptureLayers:
serializedVersion: 2
m_Bits: 4294967295
m_CallbackLayers:
serializedVersion: 2
m_Bits: 4294967295
m_IsTrigger: 1
m_UsedByEffector: 0
m_CompositeOperation: 0
m_CompositeOrder: 0
m_Offset: {x: 0, y: -0.048663437}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Size: {x: 0.31905928, y: 0.24655005}
m_EdgeRadius: 0
--- !u!114 &6174594429560262786
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6796039909030473191}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 55c5190afe54409f89d7a16c315e48f9, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Code.Example.Platformer.Entity.Enemies.PlayerCollisionDamager
Assets/Resources_moved/Example/Platformer/Configs/Audio/GotDamage.asset
+22
View File
@@ -0,0 +1,22 @@
%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: a8b089dd854c0a084ba749d31f8b399f, type: 3}
m_Name: GotDamage
m_EditorClassIdentifier: Assembly-CSharp::Code.Infrastructure.Audio.AudioInfoConfig
GroupName: 1
id: 8
fileReference:
m_AssetGUID: ee1bcba8581e635469885eb08401a519
m_SubObjectName:
m_SubObjectType:
m_SubObjectGUID:
m_EditorAssetChanged: 0
Assets/Resources_moved/Example/Platformer/Configs/Audio/GotDamage.asset.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 6d3fc61919b807d0da6d9625d6c7ccb8
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources_moved/Example/Platformer/Configs/Audio/Music1.asset
+22
View File
@@ -0,0 +1,22 @@
%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: a8b089dd854c0a084ba749d31f8b399f, type: 3}
m_Name: Music1
m_EditorClassIdentifier: Assembly-CSharp::Code.Infrastructure.Audio.AudioInfoConfig
GroupName: 1
id: 0
fileReference:
m_AssetGUID: 4433c918bf5643cd9a4b83ccdd369779
m_SubObjectName:
m_SubObjectType:
m_SubObjectGUID:
m_EditorAssetChanged: 0
Assets/Resources_moved/Example/Platformer/Configs/Audio/Music1.asset.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 377250e1c2c80e20db7a825b90f8c4a1
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources_moved/Example/Platformer/Configs/Audio/Music2.asset
+22
View File
@@ -0,0 +1,22 @@
%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: a8b089dd854c0a084ba749d31f8b399f, type: 3}
m_Name: Music2
m_EditorClassIdentifier: Assembly-CSharp::Code.Infrastructure.Audio.AudioInfoConfig
GroupName: 1
id: 7
fileReference:
m_AssetGUID: 7247c8f09e5f00b889ed31f15a5099e6
m_SubObjectName:
m_SubObjectType:
m_SubObjectGUID:
m_EditorAssetChanged: 0
Assets/Resources_moved/Example/Platformer/Configs/Audio/Music2.asset.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d6dea95659be7f90294dfefb3c4c9791
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources_moved/Example/Platformer/Platformer 2.unity
+1031 -50
View File
File diff suppressed because it is too large. Load diff
Assets/Resources_moved/Example/Platformer/Platformer 3.unity
+740 -536
View File
File diff suppressed because it is too large. Load diff
Assets/Settings/UniversalRenderPipelineGlobalSettings.asset
+33 -1
View File
@@ -149,7 +149,39 @@ MonoBehaviour:
- rid: 5565511524147789828
type: {class: PostProcessData/TextureResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
blueNoise16LTex: []
blueNoise16LTex:
- {fileID: 2800000, guid: 81200413a40918d4d8702e94db29911c, type: 3}
- {fileID: 2800000, guid: d50c5e07c9911a74982bddf7f3075e7b, type: 3}
- {fileID: 2800000, guid: 1134690bf9216164dbc75050e35b7900, type: 3}
- {fileID: 2800000, guid: 7ce2118f74614a94aa8a0cdf2e6062c3, type: 3}
- {fileID: 2800000, guid: 2ca97df9d1801e84a8a8f2c53cb744f0, type: 3}
- {fileID: 2800000, guid: e63eef8f54aa9dc4da9a5ac094b503b5, type: 3}
- {fileID: 2800000, guid: 39451254daebd6d40b52899c1f1c0c1b, type: 3}
- {fileID: 2800000, guid: c94ad916058dff743b0f1c969ddbe660, type: 3}
- {fileID: 2800000, guid: ed5ea7ce59ca8ec4f9f14bf470a30f35, type: 3}
- {fileID: 2800000, guid: 071e954febf155243a6c81e48f452644, type: 3}
- {fileID: 2800000, guid: 96aaab9cc247d0b4c98132159688c1af, type: 3}
- {fileID: 2800000, guid: fc3fa8f108657e14486697c9a84ccfc5, type: 3}
- {fileID: 2800000, guid: bfed3e498947fcb4890b7f40f54d85b9, type: 3}
- {fileID: 2800000, guid: d512512f4af60a442ab3458489412954, type: 3}
- {fileID: 2800000, guid: 47a45908f6db0cb44a0d5e961143afec, type: 3}
- {fileID: 2800000, guid: 4dcc0502f8586f941b5c4a66717205e8, type: 3}
- {fileID: 2800000, guid: 9d92991794bb5864c8085468b97aa067, type: 3}
- {fileID: 2800000, guid: 14381521ff11cb74abe3fe65401c23be, type: 3}
- {fileID: 2800000, guid: d36f0fe53425e08499a2333cf423634c, type: 3}
- {fileID: 2800000, guid: d4044ea2490d63b43aa1765f8efbf8a9, type: 3}
- {fileID: 2800000, guid: c9bd74624d8070f429e3f46d161f9204, type: 3}
- {fileID: 2800000, guid: d5c9b274310e5524ebe32a4e4da3df1f, type: 3}
- {fileID: 2800000, guid: f69770e54f2823f43badf77916acad83, type: 3}
- {fileID: 2800000, guid: 10b6c6d22e73dea46a8ab36b6eebd629, type: 3}
- {fileID: 2800000, guid: a2ec5cbf5a9b64345ad3fab0912ddf7b, type: 3}
- {fileID: 2800000, guid: 1c3c6d69a645b804fa232004b96b7ad3, type: 3}
- {fileID: 2800000, guid: d18a24d7b4ed50f4387993566d9d3ae2, type: 3}
- {fileID: 2800000, guid: c989e1ed85cf7154caa922fec53e6af6, type: 3}
- {fileID: 2800000, guid: ff47e5a0f105eb34883b973e51f4db62, type: 3}
- {fileID: 2800000, guid: fa042edbfc40fbd4bad0ab9d505b1223, type: 3}
- {fileID: 2800000, guid: 896d9004736809c4fb5973b7c12eb8b9, type: 3}
- {fileID: 2800000, guid: 179f794063d2a66478e6e726f84a65bc, type: 3}
filmGrainTex:
- {fileID: 2800000, guid: 654c582f7f8a5a14dbd7d119cbde215d, type: 3}
- {fileID: 2800000, guid: dd77ffd079630404e879388999033049, type: 3}
Assets/UnityCodeGen.Generated/AudioMixer.Generated.cs
+9
View File
@@ -12,6 +12,15 @@ private partial void InitializeMixer(){
_audioMixerGroups.Add(Code.Infrastructure.Audio.AudioGroupType.Master, _mixer.FindMatchingGroups("Master")[0]);
_audioMixerGroups.Add(Code.Infrastructure.Audio.AudioGroupType.SFX, _mixer.FindMatchingGroups("SFX")[0]);
_audioMixerGroups.Add(Code.Infrastructure.Audio.AudioGroupType.Music, _mixer.FindMatchingGroups("Music")[0]);
_audioMixerGroups.Add(Code.Infrastructure.Audio.AudioGroupType.UIFX, _mixer.FindMatchingGroups("UIFX")[0]);
}
}
}
Assets/UnityCodeGen.Generated/AudioMixerConfigConfig.Generated.cs
+18
View File
@@ -0,0 +1,18 @@
#pragma warning disable CS0105
using UnityEngine.Audio;
using UnityEngine;
using UnityEngine.AddressableAssets;
namespace Code.Infrastructure.Audio{
#pragma warning restore CS0105
[CreateAssetMenu(fileName = "AudioMixerConfigConfig", menuName = "Configs/Audio/AudioMixer")]
public class AudioMixerConfigConfig : ScriptableObject
{
public UnityEngine.Audio.AudioMixer mixerAsset;
}
}
Assets/UnityCodeGen.Generated/AudioMixerConfigConfig.Generated.cs.meta
+2
View File
@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 0f979b3faf3a08153b7fcb2350141017
Assets/UnityCodeGen.Generated/AudioSourcePrefabConfig.Generated.cs
+1 -1
View File
@@ -8,7 +8,7 @@ using UnityEngine.AddressableAssets;
namespace Code.Infrastructure.Audio{
#pragma warning restore CS0105
[CreateAssetMenu(fileName = "AudioSourcePrefabConfig", menuName = "Configs/Audio/AudioSourceSettings")]
[CreateAssetMenu(fileName = "AudioSourcePrefabConfig", menuName = "Configs/Audio/AudioSource")]
public class AudioSourcePrefabConfig : ScriptableObject
{
Assets/UnityCodeGen.Generated/Code.Infrastructure.App.AppStateMachine.Generated.cs
+5 -5
View File
@@ -3,14 +3,14 @@
#pragma warning disable CS0105
using Code.Infrastructure.StateMachine;
using Code.Infrastructure.App.States;
using Code.Example.Platformer;
using Code.Infrastructure.App.States;
using Code.Infrastructure.App.States;
using Code.Infrastructure.App.States;
#pragma warning restore CS0105
namespace Code.Infrastructure.App
{
@@ -21,12 +21,12 @@ public partial class AppStateMachine : AbstractStateMachine<Code.Infrastructure.
public AppStateMachine(Code.Infrastructure.App.AppStateMachineContext context, EventBus.EventBus eventBus) : base(context)
{
var stateMainMenuState = new MainMenuState(StateMachineContext,eventBus);
States.Add(stateMainMenuState.myState, stateMainMenuState);
var statePlatformerState = new PlatformerState(StateMachineContext,eventBus);
States.Add(statePlatformerState.myState, statePlatformerState);
var stateMainMenuState = new MainMenuState(StateMachineContext,eventBus);
States.Add(stateMainMenuState.myState, stateMainMenuState);
var stateGameplayState = new GameplayState(StateMachineContext,eventBus);
States.Add(stateGameplayState.myState, stateGameplayState);
Assets/UnityCodeGen.Generated/Code.Infrastructure.Camera.CameraStateMachine.Generated.cs
+3 -3
View File
@@ -17,12 +17,12 @@ public partial class CameraStateMachine : AbstractStateMachine<Code.Infrastructu
public CameraStateMachine(Code.Infrastructure.Camera.CameraStateMachineContext context, EventBus.EventBus eventBus) : base(context)
{
var stateThirdPersonState = new ThirdPersonState(StateMachineContext,eventBus);
States.Add(stateThirdPersonState.myState, stateThirdPersonState);
var stateNoneCameraState = new NoneCameraState(StateMachineContext,eventBus);
States.Add(stateNoneCameraState.myState, stateNoneCameraState);
var stateThirdPersonState = new ThirdPersonState(StateMachineContext,eventBus);
States.Add(stateThirdPersonState.myState, stateThirdPersonState);
}
protected override bool CheckTransitionAllowed(Code.Infrastructure.Camera.CameraMode nextState) => AllowedStates.HasFlag(nextState);
Assets/UnityCodeGen.Generated/Code.Infrastructure.UI.Panels.LoadingPanelEvents.Generated.cs
+22
View File
@@ -21,6 +21,17 @@ namespace Code.Infrastructure.UI.Panels
_eventBus.RaiseEvent<ILoadingPanelRemovedHandle>(h => h.LoadingPanelRemoved());
}
protected override void FireOpenedEvent()
{
_eventBus.RaiseEvent<ILoadingPanelOpenedHandle>(h => h.LoadingPanelOpened(this));
}
protected override void FireClosedEvent()
{
_eventBus.RaiseEvent<ILoadingPanelClosedHandle>(h => h.LoadingPanelClosed());
base.FireClosedEvent();
}
}
@@ -35,4 +46,15 @@ namespace Code.Infrastructure.UI.Panels
void LoadingPanelRemoved();
}
public interface ILoadingPanelOpenedHandle : IGlobalSubscriber
{
void LoadingPanelOpened(UIPanel panel);
}
public interface ILoadingPanelClosedHandle : IGlobalSubscriber
{
void LoadingPanelClosed();
}
}
Assets/UnityCodeGen.Generated/Code.Infrastructure.UI.Panels.LogoPanelEvents.Generated.cs
+22
View File
@@ -21,6 +21,17 @@ namespace Code.Infrastructure.UI.Panels
_eventBus.RaiseEvent<ILogoPanelRemovedHandle>(h => h.LogoPanelRemoved());
}
protected override void FireOpenedEvent()
{
_eventBus.RaiseEvent<ILogoPanelOpenedHandle>(h => h.LogoPanelOpened(this));
}
protected override void FireClosedEvent()
{
_eventBus.RaiseEvent<ILogoPanelClosedHandle>(h => h.LogoPanelClosed());
base.FireClosedEvent();
}
}
@@ -35,4 +46,15 @@ namespace Code.Infrastructure.UI.Panels
void LogoPanelRemoved();
}
public interface ILogoPanelOpenedHandle : IGlobalSubscriber
{
void LogoPanelOpened(UIPanel panel);
}
public interface ILogoPanelClosedHandle : IGlobalSubscriber
{
void LogoPanelClosed();
}
}
Assets/UnityCodeGen.Generated/Code.Infrastructure.UI.Panels.MenuChoosePanelEvents.Generated.cs
+22
View File
@@ -21,6 +21,17 @@ namespace Code.Infrastructure.UI.Panels
_eventBus.RaiseEvent<IMenuChoosePanelRemovedHandle>(h => h.MenuChoosePanelRemoved());
}
protected override void FireOpenedEvent()
{
_eventBus.RaiseEvent<IMenuChoosePanelOpenedHandle>(h => h.MenuChoosePanelOpened(this));
}
protected override void FireClosedEvent()
{
_eventBus.RaiseEvent<IMenuChoosePanelClosedHandle>(h => h.MenuChoosePanelClosed());
base.FireClosedEvent();
}
}
@@ -35,4 +46,15 @@ namespace Code.Infrastructure.UI.Panels
void MenuChoosePanelRemoved();
}
public interface IMenuChoosePanelOpenedHandle : IGlobalSubscriber
{
void MenuChoosePanelOpened(UIPanel panel);
}
public interface IMenuChoosePanelClosedHandle : IGlobalSubscriber
{
void MenuChoosePanelClosed();
}
}
Assets/UnityCodeGen.Generated/ConfigLocator.Generated.cs
+24 -21
View File
@@ -1,19 +1,20 @@
#pragma warning disable CS0105
using Code.Example.Platformer.Entity;
using Code.Infrastructure.Input;
using Code.Example.Race.Racer;
using Code.Infrastructure.Audio;
using Code.Infrastructure.Volume;
using Code.Infrastructure.Camera;
using Code.Infrastructure.UI;
using Code.Example.Race.Racer;
using Code.Infrastructure.Configs;
using Code.Infrastructure.Audio;
using Code.Example.Platformer.Entity;
using Code.Infrastructure.Audio;
using Code.Infrastructure.UI;
using Code.Infrastructure.SceneLoader;
using Code.Infrastructure.Camera;
using Code.Infrastructure.Input;
using Code.Infrastructure.Camera;
using Code.Example.Platformer.Entity;
using Code.Infrastructure.UI;
using Code.Infrastructure.Configs;
using Code.Infrastructure.Audio;
using UnityEngine;
#pragma warning restore CS0105
@@ -27,33 +28,35 @@ using Code.Infrastructure.Input;
{
SystemConfigsReferences systemConfigsReferences = Resources.Load<SystemConfigsReferences>("SystemConfigsReferences");
_multipleConfigReferences.Add(typeof(Code.Example.Platformer.Entity.PlatformerEntitySettingsConfig), systemConfigsReferences.PlatformerEntitySettings);
_singleConfigReferences.Add(typeof(Code.Example.Platformer.Entity.PlatformerPlayerSettingsConfig), systemConfigsReferences.PlatformerPlayerSettings);
_multipleConfigReferences.Add(typeof(Code.Infrastructure.Audio.AudioInfoConfig), systemConfigsReferences.AudioInfo);
_multipleConfigReferences.Add(typeof(Code.Infrastructure.Volume.VolumeSettingsConfig), systemConfigsReferences.VolumeSettings);
_singleConfigReferences.Add(typeof(Code.Infrastructure.Camera.GameCameraConfig), systemConfigsReferences.GameCamera);
_multipleConfigReferences.Add(typeof(Code.Infrastructure.UI.UIPanelSettingsConfig), systemConfigsReferences.UIPanelSettings);
_singleConfigReferences.Add(typeof(Code.Infrastructure.Input.InputServiceConfig), systemConfigsReferences.InputService);
_multipleConfigReferences.Add(typeof(Code.Example.Race.Racer.RacerSettingsConfig), systemConfigsReferences.RacerSettings);
_multipleConfigReferences.Add(typeof(Code.Infrastructure.Configs.LayerMasksConfigConfig), systemConfigsReferences.LayerMasksConfig);
_singleConfigReferences.Add(typeof(Code.Infrastructure.Audio.AudioSourcePrefabConfig), systemConfigsReferences.AudioSourcePrefab);
_multipleConfigReferences.Add(typeof(Code.Infrastructure.Volume.VolumeSettingsConfig), systemConfigsReferences.VolumeSettings);
_multipleConfigReferences.Add(typeof(Code.Infrastructure.UI.UIPanelSettingsConfig), systemConfigsReferences.UIPanelSettings);
_multipleConfigReferences.Add(typeof(Code.Infrastructure.Audio.AudioSourceSettingsConfig), systemConfigsReferences.AudioSourceSettings);
_singleConfigReferences.Add(typeof(Code.Example.Platformer.Entity.PlatformerPlayerSettingsConfig), systemConfigsReferences.PlatformerPlayerSettings);
_singleConfigReferences.Add(typeof(Code.Infrastructure.Audio.AudioSourcePrefabConfig), systemConfigsReferences.AudioSourcePrefab);
_singleConfigReferences.Add(typeof(Code.Infrastructure.UI.CanvasSettingsConfig), systemConfigsReferences.CanvasSettings);
_multipleConfigReferences.Add(typeof(Code.Infrastructure.Audio.AudioInfoConfig), systemConfigsReferences.AudioInfo);
_multipleConfigReferences.Add(typeof(Code.Infrastructure.SceneLoader.SceneInfoConfig), systemConfigsReferences.SceneInfo);
_multipleConfigReferences.Add(typeof(Code.Infrastructure.Camera.CameraSettingsConfig), systemConfigsReferences.CameraSettings);
_singleConfigReferences.Add(typeof(Code.Infrastructure.Input.InputServiceConfig), systemConfigsReferences.InputService);
_singleConfigReferences.Add(typeof(Code.Infrastructure.Camera.GameCameraConfig), systemConfigsReferences.GameCamera);
_multipleConfigReferences.Add(typeof(Code.Example.Platformer.Entity.PlatformerEntitySettingsConfig), systemConfigsReferences.PlatformerEntitySettings);
_singleConfigReferences.Add(typeof(Code.Infrastructure.UI.CanvasSettingsConfig), systemConfigsReferences.CanvasSettings);
_multipleConfigReferences.Add(typeof(Code.Infrastructure.Configs.LayerMasksConfigConfig), systemConfigsReferences.LayerMasksConfig);
_singleConfigReferences.Add(typeof(Code.Infrastructure.Audio.AudioMixerConfigConfig), systemConfigsReferences.AudioMixerConfig);
}
}
Assets/UnityCodeGen.Generated/SystemConfigsReferences.Generated.cs
+18 -16
View File
@@ -1,19 +1,20 @@
#pragma warning disable CS0105
using Code.Example.Platformer.Entity;
using Code.Infrastructure.Input;
using Code.Example.Race.Racer;
using Code.Infrastructure.Audio;
using Code.Infrastructure.Volume;
using Code.Infrastructure.Camera;
using Code.Infrastructure.UI;
using Code.Example.Race.Racer;
using Code.Infrastructure.Configs;
using Code.Infrastructure.Audio;
using Code.Example.Platformer.Entity;
using Code.Infrastructure.Audio;
using Code.Infrastructure.UI;
using Code.Infrastructure.SceneLoader;
using Code.Infrastructure.Camera;
using Code.Infrastructure.Input;
using Code.Infrastructure.Camera;
using Code.Example.Platformer.Entity;
using Code.Infrastructure.UI;
using Code.Infrastructure.Configs;
using Code.Infrastructure.Audio;
using UnityEngine.AddressableAssets;
#pragma warning restore CS0105
@@ -21,20 +22,21 @@ using Code.Infrastructure.Input;
namespace Code.Infrastructure.Configs{
public partial class SystemConfigsReferences
{
public string PlatformerEntitySettings;
public string AudioInfo;
public string VolumeSettings;
public AssetReference GameCamera;
public string UIPanelSettings;
public AssetReference PlatformerPlayerSettings;
public AssetReference InputService;
public string RacerSettings;
public string LayerMasksConfig;
public string AudioSourceSettings;
public AssetReference PlatformerPlayerSettings;
public AssetReference AudioSourcePrefab;
public AssetReference CanvasSettings;
public string VolumeSettings;
public string UIPanelSettings;
public string AudioSourceSettings;
public string AudioInfo;
public string SceneInfo;
public string CameraSettings;
public AssetReference InputService;
public AssetReference GameCamera;
public string PlatformerEntitySettings;
public AssetReference CanvasSettings;
public string LayerMasksConfig;
public AssetReference AudioMixerConfig;
}
}
Assets/_Recovery/0 (1).unity
+1616
View File
File diff suppressed because it is too large. Load diff
Assets/_Recovery/0 (1).unity.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 01a9ba2a94fdfba1b97a31fcf4ecb710
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/_Recovery/0 (2).unity
+2485
View File
File diff suppressed because it is too large. Load diff
Assets/_Recovery/0 (2).unity.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: e586ecc9aa23702d8a589ce32f17c804
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Packages/manifest.json
+6 -6
View File
@@ -5,20 +5,20 @@
"com.gustavopsantos.reflex": "https://github.com/gustavopsantos/reflex.git?path=/Assets/Reflex/#14.1.0",
"com.kyrylokuzyk.primetween": "file:../Assets/Plugins/PrimeTween/internal/com.kyrylokuzyk.primetween.tgz",
"com.unity.2d.sprite": "1.0.0",
"com.unity.addressables": "2.9.0",
"com.unity.ai.navigation": "2.0.10",
"com.unity.addressables": "2.9.1",
"com.unity.ai.navigation": "2.0.11",
"com.unity.cinemachine": "3.1.5",
"com.unity.collab-proxy": "2.11.3",
"com.unity.collab-proxy": "2.11.4",
"com.unity.feature.2d": "2.0.2",
"com.unity.ide.rider": "3.0.39",
"com.unity.inputsystem": "1.18.0",
"com.unity.inputsystem": "1.19.0",
"com.unity.multiplayer.center": "1.0.1",
"com.unity.nuget.newtonsoft-json": "3.2.2",
"com.unity.render-pipelines.universal": "17.3.0",
"com.unity.test-framework": "1.6.0",
"com.unity.timeline": "1.8.10",
"com.unity.timeline": "1.8.11",
"com.unity.ugui": "2.0.0",
"com.unity.visualscripting": "1.9.9",
"com.unity.visualscripting": "1.9.10",
"com.unity.modules.accessibility": "1.0.0",
"com.unity.modules.adaptiveperformance": "1.0.0",
"com.unity.modules.ai": "1.0.0",
Packages/packages-lock.json
+8 -8
View File
@@ -136,7 +136,7 @@
"url": "https://packages.unity.com"
},
"com.unity.addressables": {
"version": "2.9.0",
"version": "2.9.1",
"depth": 0,
"source": "registry",
"dependencies": {
@@ -146,13 +146,13 @@
"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.6.0",
"com.unity.scriptablebuildpipeline": "2.6.1",
"com.unity.modules.unitywebrequestassetbundle": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.ai.navigation": {
"version": "2.0.10",
"version": "2.0.11",
"depth": 0,
"source": "registry",
"dependencies": {
@@ -181,7 +181,7 @@
"url": "https://packages.unity.com"
},
"com.unity.collab-proxy": {
"version": "2.11.3",
"version": "2.11.4",
"depth": 0,
"source": "registry",
"dependencies": {},
@@ -232,7 +232,7 @@
"url": "https://packages.unity.com"
},
"com.unity.inputsystem": {
"version": "1.18.0",
"version": "1.19.0",
"depth": 0,
"source": "registry",
"dependencies": {
@@ -309,7 +309,7 @@
}
},
"com.unity.scriptablebuildpipeline": {
"version": "2.6.0",
"version": "2.6.1",
"depth": 1,
"source": "registry",
"dependencies": {
@@ -373,7 +373,7 @@
"url": "https://packages.unity.com"
},
"com.unity.timeline": {
"version": "1.8.10",
"version": "1.8.11",
"depth": 0,
"source": "registry",
"dependencies": {
@@ -394,7 +394,7 @@
}
},
"com.unity.visualscripting": {
"version": "1.9.9",
"version": "1.9.10",
"depth": 0,
"source": "registry",
"dependencies": {
ProjectSettings/ProjectVersion.txt
+2 -2
View File
@@ -1,2 +1,2 @@
m_EditorVersion: 6000.3.10f1
m_EditorVersionWithRevision: 6000.3.10f1 (e35f0c77bd8e)
m_EditorVersion: 6000.3.11f1
m_EditorVersionWithRevision: 6000.3.11f1 (3000ef702840)