Compare commits
211
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
52b0a8a6e5 | ||
|
|
e66cb2b8f6 | ||
|
|
d97be67d94 | ||
|
|
cd236a3ba8 | ||
|
|
2d660252d6 | ||
|
|
f224ed36c5 | ||
|
|
d737797f11 | ||
|
|
185b955125 | ||
|
|
dd492b8e77 | ||
|
|
9d0dda506a | ||
|
|
edff0ce0d4 | ||
|
|
d29053d408 | ||
|
|
a82cb3ce7d | ||
|
|
00f99f05ab | ||
|
|
349ac8a771 | ||
|
|
1a30853147 | ||
|
|
a3e847b63f | ||
|
|
616696e366 | ||
|
|
e055f99caf | ||
|
|
2bac10c113 | ||
|
|
f6b892449a | ||
|
|
99f17852f4 | ||
|
|
7bec2545ba | ||
|
|
7868911929 | ||
|
|
6f777ba8a3 | ||
|
|
bffbf2db3b | ||
|
|
fbe22108e6 | ||
|
|
a997a0682f | ||
|
|
072d785345 | ||
|
|
047ea36ab9 | ||
|
|
d7cca83268 | ||
|
|
5fc70e1db6 | ||
|
|
f67d3972a9 | ||
|
|
bea394d022 | ||
|
|
2c6877cb3f | ||
|
|
019e3a053e | ||
|
|
727e9a3c17 | ||
|
|
48e11dd3b0 | ||
|
|
4b98ec0129 | ||
|
|
304bfc6e1f | ||
|
|
db6eb219c8 | ||
|
|
d2c5c45604 | ||
|
|
0fca1a32f9 | ||
|
|
9103cb0a5a | ||
|
|
4770499d97 | ||
|
|
f6e8131d22 | ||
|
|
7e1f7cecc2 | ||
|
|
6732aef384 | ||
|
|
ecff1e69cd | ||
|
|
eb4dff803e | ||
|
|
fea9d3586f | ||
|
|
79593877a7 | ||
|
|
a5ce6e3165 | ||
|
|
d9a1271262 | ||
|
|
4c16a63abd | ||
|
|
b4de41894f | ||
|
|
77fd9af29d | ||
|
|
a1c2c5fd18 | ||
|
|
485d54f272 | ||
|
|
0d0787b887 | ||
|
|
5d856ae162 | ||
|
|
dd1399e015 | ||
|
|
2b656412d5 | ||
|
|
36e6bc3bc2 | ||
|
|
1e31e1e8b1 | ||
|
|
2897eb88bf | ||
|
|
134adda787 | ||
|
|
2f56a5758d | ||
|
|
fb9510a6b2 | ||
|
|
aa4a9e69dd | ||
|
|
34d7fa3791 | ||
|
|
26804e08f7 | ||
|
|
e96dcf3e0d | ||
|
|
94f0522f89 | ||
|
|
eefcf6eabc | ||
|
|
c85638fda0 | ||
|
|
1de117622e | ||
|
|
e2f8984e6f | ||
|
|
32c6e0630a | ||
|
|
870a4743c6 | ||
|
|
2fc8e249f5 | ||
|
|
280eb3754c | ||
|
|
6eff3ef9a9 | ||
|
|
6b4792393a | ||
|
|
a547c39db7 | ||
|
|
0cab2eda74 | ||
|
|
5d075034b5 | ||
|
|
7f7ba0d9c5 | ||
|
|
ab0b41a318 | ||
|
|
a5ce8522ab | ||
|
|
97aea0fde1 | ||
|
|
e9e8e091b2 | ||
|
|
9e1c1177e0 | ||
|
|
07535982ba | ||
|
|
df0c2b3157 | ||
|
|
d51527b7f3 | ||
|
|
13aca5a86f | ||
|
|
9cc77d5c67 | ||
|
|
c1a0e94fe3 | ||
|
|
acd9cc1a32 | ||
|
|
d14f9c2a9f | ||
|
|
4b6909fe84 | ||
|
|
766609489d | ||
|
|
b7e9a26462 | ||
|
|
3782a0b568 | ||
|
|
000985ee9b | ||
|
|
abde1d5ba9 | ||
|
|
52b18967a1 | ||
|
|
d10d2cdca6 | ||
|
|
79d03528f6 | ||
|
|
01d3b0adec | ||
|
|
b271042137 | ||
|
|
4a547f1348 | ||
|
|
7130513471 | ||
|
|
ee7cf3946f | ||
|
|
175567e4dd | ||
|
|
97c60c0925 | ||
|
|
bd495a644f | ||
|
|
cea36c0cda | ||
|
|
ff8ed96138 | ||
|
|
95cb51db79 | ||
|
|
2b9fd70c85 | ||
|
|
cd384239ff | ||
|
|
f3a83eb909 | ||
|
|
35f703a8d2 | ||
|
|
e5f4f292c2 | ||
|
|
efad72b4d9 | ||
|
|
855108d88b | ||
|
|
388773129d | ||
|
|
e654a0daf4 | ||
|
|
cfe5b39cc9 | ||
|
|
c14880457d | ||
|
|
344470978d | ||
|
|
dab970737a | ||
|
|
afdd523682 | ||
|
|
575e66425a | ||
|
|
c470f63409 | ||
|
|
5da64a7b3d | ||
|
|
c4ab11488b | ||
|
|
cb968d782b | ||
|
|
522f51be3f | ||
|
|
01505de4c3 | ||
|
|
7024e1daf0 | ||
|
|
020934e07f | ||
|
|
52edef92e3 | ||
|
|
d3fbd4c5c3 | ||
|
|
5b09068b0c | ||
|
|
ddb76a5b93 | ||
|
|
c6b097a879 | ||
|
|
0f708ff4cb | ||
|
|
721d5ebf9c | ||
|
|
3bb99aaf1e | ||
|
|
a2acea39dc | ||
|
|
5c1fd1510d | ||
|
|
e128ee59f9 | ||
|
|
5c81bde5db | ||
|
|
05449642d5 | ||
|
|
3020140360 | ||
|
|
e67fea2051 | ||
|
|
d1aad440f5 | ||
|
|
0e1c274677 | ||
|
|
346dc97fef | ||
|
|
557c4c3dee | ||
|
|
dbabd847c1 | ||
|
|
a243ad53d6 | ||
|
|
874280741c | ||
|
|
b13cf8cfc0 | ||
|
|
177464cc09 | ||
|
|
f8448ba922 | ||
|
|
85a07065d9 | ||
|
|
0f8a629e4b | ||
|
|
7bc15cc03d | ||
|
|
d861e06caf | ||
|
|
f940cbffe0 | ||
|
|
6b1f24b72e | ||
|
|
1ad87e7432 | ||
|
|
09219d9091 | ||
|
|
37f5d15410 | ||
|
|
019da8cfd3 | ||
|
|
edf3821c0d | ||
|
|
45fe19be24 | ||
|
|
bea109175b | ||
|
|
b214bb0f63 | ||
|
|
0ac5ba1e1c | ||
|
|
ab9d444072 | ||
|
|
2335908a90 | ||
|
|
ae76edb0d0 | ||
|
|
6f2b063700 | ||
|
|
0e188efe59 | ||
|
|
c6d1c3bffd | ||
|
|
07ce27618c | ||
|
|
fb85b22e96 | ||
|
|
665114b7dc | ||
|
|
4549617275 | ||
|
|
db541fed8a | ||
|
|
085429d5ca | ||
|
|
981d081bed | ||
|
|
6148889fc1 | ||
|
|
7538ce81af | ||
|
|
a198d7fc00 | ||
|
|
7114f1136c | ||
|
|
5bf468673f | ||
|
|
9a3743988d | ||
|
|
e6879076a3 | ||
|
|
487331dc10 | ||
|
|
bada54c828 | ||
|
|
ff095526bd | ||
|
|
ee7771acd9 | ||
|
|
bd0cee77a6 | ||
|
|
8981457f2d | ||
|
|
86c9c126a6 |
No files matched your search
Generated
+13
@@ -0,0 +1,13 @@
|
|||||||
|
# Default ignored files
|
||||||
|
/shelf/
|
||||||
|
/workspace.xml
|
||||||
|
# Rider ignored files
|
||||||
|
/contentModel.xml
|
||||||
|
/projectSettingsUpdater.xml
|
||||||
|
/modules.xml
|
||||||
|
/.idea.CourierOldRe.iml
|
||||||
|
# Editor-based HTTP Client requests
|
||||||
|
/httpRequests/
|
||||||
|
# Datasource local storage ignored files
|
||||||
|
/dataSources/
|
||||||
|
/dataSources.local.xml
|
||||||
Generated
+8
@@ -0,0 +1,8 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="UserContentModel">
|
||||||
|
<attachedFolders />
|
||||||
|
<explicitIncludes />
|
||||||
|
<explicitExcludes />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
Generated
+6
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="VcsDirectoryMappings">
|
||||||
|
<mapping directory="" vcs="Git" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
"version": "1.0",
|
||||||
|
"components": [
|
||||||
|
"Microsoft.VisualStudio.Workload.ManagedGame"
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 65cf716f111fb36a19123f807ecdce25
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
%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: dea69d41f90c6ea4fa55c27c1d60c145, type: 3}
|
||||||
|
m_Name: AddressableAssetGroupSortSettings
|
||||||
|
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.GroupSchemas.AddressableAssetGroupSortSettings
|
||||||
|
sortOrder:
|
||||||
|
- 3f67261f611d8cd43a09d4d5cf638d8d
|
||||||
|
- 1e9bc7e1e4087c0488fccf896b0ed49f
|
||||||
|
- d7e4a8c4f2a42c64587c34ab7446f091
|
||||||
|
- 7e9d70e73e500eb9287683466ebf646f
|
||||||
|
- d447fc60305c17a17bf20948ab295a45
|
||||||
+8
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 88c15d5f41d582974a9b7218c493e4a7
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,119 @@
|
|||||||
|
%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: 468a46d0ae32c3544b7d98094e6448a9, type: 3}
|
||||||
|
m_Name: AddressableAssetSettings
|
||||||
|
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.AddressableAssetSettings
|
||||||
|
m_DefaultGroup: d447fc60305c17a17bf20948ab295a45
|
||||||
|
m_currentHash:
|
||||||
|
serializedVersion: 2
|
||||||
|
Hash: 930ada413b95e006f8d8a8635b833074
|
||||||
|
m_OptimizeCatalogSize: 0
|
||||||
|
m_BuildRemoteCatalog: 0
|
||||||
|
m_CatalogRequestsTimeout: 0
|
||||||
|
m_DisableCatalogUpdateOnStart: 0
|
||||||
|
m_InternalIdNamingMode: 0
|
||||||
|
m_InternalBundleIdMode: 1
|
||||||
|
m_AssetLoadMode: 0
|
||||||
|
m_BundledAssetProviderType:
|
||||||
|
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
|
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
|
||||||
|
m_AssetBundleProviderType:
|
||||||
|
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
|
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
|
||||||
|
m_IgnoreUnsupportedFilesInBuild: 0
|
||||||
|
m_UniqueBundleIds: 0
|
||||||
|
m_EnableJsonCatalog: 0
|
||||||
|
m_NonRecursiveBuilding: 1
|
||||||
|
m_AllowNestedBundleFolders: 0
|
||||||
|
m_CCDEnabled: 0
|
||||||
|
m_maxConcurrentWebRequests: 3
|
||||||
|
m_UseUWRForLocalBundles: 0
|
||||||
|
m_BundleTimeout: 0
|
||||||
|
m_BundleRetryCount: 0
|
||||||
|
m_BundleRedirectLimit: -1
|
||||||
|
m_SharedBundleSettings: 0
|
||||||
|
m_SharedBundleSettingsCustomGroupIndex: 0
|
||||||
|
m_ContiguousBundles: 1
|
||||||
|
m_StripUnityVersionFromBundleBuild: 0
|
||||||
|
m_DisableVisibleSubAssetRepresentations: 0
|
||||||
|
m_BuiltInBundleNaming: 0
|
||||||
|
mBuiltInBundleCustomNaming:
|
||||||
|
m_MonoScriptBundleNaming: 0
|
||||||
|
m_CheckForContentUpdateRestrictionsOption: 0
|
||||||
|
m_MonoScriptBundleCustomNaming:
|
||||||
|
m_RemoteCatalogBuildPath:
|
||||||
|
m_Id:
|
||||||
|
m_RemoteCatalogLoadPath:
|
||||||
|
m_Id:
|
||||||
|
m_ContentStateBuildPathProfileVariableName: <default settings path>
|
||||||
|
m_CustomContentStateBuildPath:
|
||||||
|
m_ContentStateBuildPath:
|
||||||
|
m_BuildAddressablesWithPlayerBuild: 0
|
||||||
|
m_overridePlayerVersion: '[UnityEditor.PlayerSettings.bundleVersion]'
|
||||||
|
m_GroupAssets:
|
||||||
|
- {fileID: 11400000, guid: df8f8d52915542e49a11fbc177f3cf2c, type: 2}
|
||||||
|
- {fileID: 11400000, guid: 3eb9af1699b33ee4fa3ddeb0a1a9f793, type: 2}
|
||||||
|
- {fileID: 11400000, guid: ba51c0b85beab267d8f41a72df4fb657, type: 2}
|
||||||
|
- {fileID: 11400000, guid: 7c592a6445170e8379910601b962cb30, type: 2}
|
||||||
|
- {fileID: 11400000, guid: 6334e9a905fd7634a8c646d57a23968d, type: 2}
|
||||||
|
m_BuildSettings:
|
||||||
|
m_LogResourceManagerExceptions: 1
|
||||||
|
m_BundleBuildPath: Temp/com.unity.addressables/AssetBundles
|
||||||
|
m_ProfileSettings:
|
||||||
|
m_Profiles:
|
||||||
|
- m_InheritedParent:
|
||||||
|
m_Id: 27da1d7d9f959ba49a362cf69a3fd39a
|
||||||
|
m_ProfileName: Default
|
||||||
|
m_Values:
|
||||||
|
- m_Id: 1c16dd3f2d89b2375b66c8f065c7a694
|
||||||
|
m_Value: '[UnityEditor.EditorUserBuildSettings.activeBuildTarget]'
|
||||||
|
- m_Id: 3dfc1a15d30236e7a8856b2164e14280
|
||||||
|
m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]'
|
||||||
|
- m_Id: 6c794a757c731a0319b43709731ad88b
|
||||||
|
m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]'
|
||||||
|
- m_Id: 74b04ebc3f202c2f9b6f1e8fb0470bd2
|
||||||
|
m_Value: 'ServerData/[BuildTarget]'
|
||||||
|
- m_Id: 9ccf5e6cc7ba2d421a1c573d8a7ebcd7
|
||||||
|
m_Value: <undefined>
|
||||||
|
m_ProfileEntryNames:
|
||||||
|
- m_Id: 1c16dd3f2d89b2375b66c8f065c7a694
|
||||||
|
m_Name: BuildTarget
|
||||||
|
m_InlineUsage: 0
|
||||||
|
- m_Id: 3dfc1a15d30236e7a8856b2164e14280
|
||||||
|
m_Name: Local.BuildPath
|
||||||
|
m_InlineUsage: 0
|
||||||
|
- m_Id: 6c794a757c731a0319b43709731ad88b
|
||||||
|
m_Name: Local.LoadPath
|
||||||
|
m_InlineUsage: 0
|
||||||
|
- m_Id: 74b04ebc3f202c2f9b6f1e8fb0470bd2
|
||||||
|
m_Name: Remote.BuildPath
|
||||||
|
m_InlineUsage: 0
|
||||||
|
- m_Id: 9ccf5e6cc7ba2d421a1c573d8a7ebcd7
|
||||||
|
m_Name: Remote.LoadPath
|
||||||
|
m_InlineUsage: 0
|
||||||
|
m_ProfileVersion: 1
|
||||||
|
m_LabelTable:
|
||||||
|
m_LabelNames:
|
||||||
|
- default
|
||||||
|
m_SchemaTemplates: []
|
||||||
|
m_GroupTemplateObjects:
|
||||||
|
- {fileID: 11400000, guid: 14909e654d6c7bd958ff44091773bd40, type: 2}
|
||||||
|
m_InitializationObjects: []
|
||||||
|
m_CertificateHandlerType:
|
||||||
|
m_AssemblyName:
|
||||||
|
m_ClassName:
|
||||||
|
m_ActivePlayerDataBuilderIndex: 2
|
||||||
|
m_DataBuilders:
|
||||||
|
- {fileID: 11400000, guid: 1ac723026a19cb90d8d5dd77ce8c384b, type: 2}
|
||||||
|
- {fileID: 11400000, guid: e628a9e942e45e1ca94ad90d02e9acdf, type: 2}
|
||||||
|
- {fileID: 11400000, guid: 1d3143f4a67a990fc9532b22a020137d, type: 2}
|
||||||
|
m_ActiveProfileId: 27da1d7d9f959ba49a362cf69a3fd39a
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 2588e84eb64800d0781c574a37fa48d8
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 1ac379942ee61a312a9830cb792d2871
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,79 @@
|
|||||||
|
%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: 1a3c5d64ac83548c09dd1678b9f6f1cd, type: 3}
|
||||||
|
m_Name: Packed Assets
|
||||||
|
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.AddressableAssetGroupTemplate
|
||||||
|
m_SchemaObjects:
|
||||||
|
- {fileID: 8850813396489121111}
|
||||||
|
- {fileID: 3451013361182384685}
|
||||||
|
m_Description: Pack assets into asset bundles.
|
||||||
|
m_Settings: {fileID: 11400000, guid: 2588e84eb64800d0781c574a37fa48d8, type: 2}
|
||||||
|
--- !u!114 &3451013361182384685
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
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: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
|
||||||
|
m_Name: ContentUpdateGroupSchema
|
||||||
|
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.GroupSchemas.ContentUpdateGroupSchema
|
||||||
|
m_Group: {fileID: 0}
|
||||||
|
m_StaticContent: 0
|
||||||
|
--- !u!114 &8850813396489121111
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
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: e5d17a21594effb4e9591490b009e7aa, type: 3}
|
||||||
|
m_Name: BundledAssetGroupSchema
|
||||||
|
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.GroupSchemas.BundledAssetGroupSchema
|
||||||
|
m_Group: {fileID: 0}
|
||||||
|
m_InternalBundleIdMode: 1
|
||||||
|
m_Compression: 1
|
||||||
|
m_IncludeAddressInCatalog: 1
|
||||||
|
m_IncludeGUIDInCatalog: 1
|
||||||
|
m_IncludeLabelsInCatalog: 1
|
||||||
|
m_InternalIdNamingMode: 0
|
||||||
|
m_CacheClearBehavior: 0
|
||||||
|
m_IncludeInBuild: 1
|
||||||
|
m_BundledAssetProviderType:
|
||||||
|
m_AssemblyName:
|
||||||
|
m_ClassName:
|
||||||
|
m_StripDownloadOptions: 0
|
||||||
|
m_ForceUniqueProvider: 0
|
||||||
|
m_UseAssetBundleCache: 1
|
||||||
|
m_UseAssetBundleCrc: 1
|
||||||
|
m_UseAssetBundleCrcForCachedBundles: 1
|
||||||
|
m_UseUWRForLocalBundles: 0
|
||||||
|
m_Timeout: 0
|
||||||
|
m_ChunkedTransfer: 0
|
||||||
|
m_RedirectLimit: -1
|
||||||
|
m_RetryCount: 0
|
||||||
|
m_BuildPath:
|
||||||
|
m_Id:
|
||||||
|
m_LoadPath:
|
||||||
|
m_Id:
|
||||||
|
m_BundleMode: 0
|
||||||
|
m_AssetBundleProviderType:
|
||||||
|
m_AssemblyName:
|
||||||
|
m_ClassName:
|
||||||
|
m_UseDefaultSchemaSettings: 0
|
||||||
|
m_SelectedPathPairIndex: 0
|
||||||
|
m_BundleNaming: 0
|
||||||
|
m_AssetLoadMode: 0
|
||||||
+8
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 14909e654d6c7bd958ff44091773bd40
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: a39981dbe6de5001397f5ca9a8a37e1a
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,132 @@
|
|||||||
|
%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: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
|
||||||
|
m_Name: Audio
|
||||||
|
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.AddressableAssetGroup
|
||||||
|
m_GroupName: Audio
|
||||||
|
m_GUID: 7e9d70e73e500eb9287683466ebf646f
|
||||||
|
m_SerializeEntries:
|
||||||
|
- m_GUID: 087d498be2e5a044f97f313a3fc0ae05
|
||||||
|
m_Address: Assets/Resources_moved/Audio/Enemies/ded_step.ogg
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 144ab5188f8ad7a0a92c75703bd12e60
|
||||||
|
m_Address: launch_upmenu1
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 1f79c7b1e492a4ea2a8d666cdead0c52
|
||||||
|
m_Address: Assets/Resources_moved/Audio/Dispatcher/take_damage4.ogg
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 21c2eaf85c31d604395153b364970a7d
|
||||||
|
m_Address: Assets/Resources_moved/Audio/SFX/pl_plain2.ogg
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 29bff8011973e4e519906b9da8fca0fc
|
||||||
|
m_Address: Assets/Resources_moved/Audio/Dispatcher/late3.ogg
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 29ee630aab7bbef8799dc76ed0c239f7
|
||||||
|
m_Address: Assets/Resources_moved/Audio/Dispatcher/late4.ogg
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 2ef564b38a3c6fb4a85c16adb33d095c
|
||||||
|
m_Address: Assets/Resources_moved/Audio/Enemies/rch_walk.ogg
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 31f16c866d3224ab8a7e0fabf3745ec5
|
||||||
|
m_Address: Assets/Resources_moved/Audio/Dispatcher/late5.ogg
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 4bd64d1fcecc9c6b09d81e78b7dcfebe
|
||||||
|
m_Address: Assets/Resources_moved/Audio/Dispatcher/take_damage1.ogg
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 4c9661de6f76e8c48a0116840b1ac7fd
|
||||||
|
m_Address: Assets/Resources_moved/Audio/UI/launch_upmenu1 1.wav
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 735f38402ea347fa381408293503a24e
|
||||||
|
m_Address: Assets/Resources_moved/Audio/Dispatcher/receiving_an_order1.ogg
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 7accc805b4e5f404d9e777c0a662ede4
|
||||||
|
m_Address: Assets/Resources_moved/Audio/UI/launch_upmenu1 2.wav
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 7c5caf3ceee44f71588860c5c1fbdbe0
|
||||||
|
m_Address: Assets/Resources_moved/Audio/Dispatcher/take_damage3.ogg
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 8c2be26d359d54063825fedfad7a493b
|
||||||
|
m_Address: Assets/Resources_moved/Audio/Dispatcher/late2.ogg
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 8fa89a492fc3a3768a0f0ba1bb7080e0
|
||||||
|
m_Address: Assets/Resources_moved/Audio/Dispatcher/late1.ogg
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: a306df57f348ce7cf900d0b9431739ee
|
||||||
|
m_Address: launch_selectmenu
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: aa138b2e21adfbf4bbbfa5bf9d54b8f2
|
||||||
|
m_Address: Assets/Resources_moved/Audio/UI/buttonclickrelease.wav
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: beea6ce1de81706478a700993b273000
|
||||||
|
m_Address: Assets/Resources_moved/Audio/Enemies/bc_bite2.ogg
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: cab4b1ff78dd6b1fba61aa165aa17b4d
|
||||||
|
m_Address: Assets/Resources_moved/Audio/Dispatcher/receiving_an_order2.ogg
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: e54541120fe1c5a4799a4698a689bb5c
|
||||||
|
m_Address: Assets/Resources_moved/Audio/SFX/pl_step1.ogg
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: f74a409bf11b25148ad305acc05b14f5
|
||||||
|
m_Address: Assets/Resources_moved/Audio/Dispatcher/take_damage2.ogg
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: fb8972b33f4c43749add9d98b439b447
|
||||||
|
m_Address: Assets/Resources_moved/Audio/SFX/pl_plain5.ogg
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_Settings: {fileID: 11400000, guid: 2588e84eb64800d0781c574a37fa48d8, type: 2}
|
||||||
|
m_SchemaSet:
|
||||||
|
m_Schemas:
|
||||||
|
- {fileID: 11400000, guid: 5a1eefed8456ba0479d7c04e6a5f4122, type: 2}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ba51c0b85beab267d8f41a72df4fb657
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,102 @@
|
|||||||
|
%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: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
|
||||||
|
m_Name: Default Local Group
|
||||||
|
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.AddressableAssetGroup
|
||||||
|
m_GroupName: Default Local Group
|
||||||
|
m_GUID: d447fc60305c17a17bf20948ab295a45
|
||||||
|
m_SerializeEntries:
|
||||||
|
- m_GUID: 17d698710813e8641b32abec11387c5a
|
||||||
|
m_Address: Prefabs/Levels/Level6
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 1d4767c722c05b5d6b96bb226d378c65
|
||||||
|
m_Address: Assets/Resources_moved/Prefabs/Player/ArmsMesh.prefab
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 24959d51467fd0d4f957ed6e846f73a5
|
||||||
|
m_Address: Assets/Resources_moved/Audio/Enemies/ded_attack1.ogg
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 2ed2d93a9f39d4edba511cb7396c7bb6
|
||||||
|
m_Address: Assets/Resources_moved/Prefabs/Enemies/Cockroach.prefab
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 37a29c1efe8bfff4c82f1bb435e8a4df
|
||||||
|
m_Address: Prefabs/Levels/Level2
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 38e345d8030c71943ac60b74d9114a54
|
||||||
|
m_Address: Prefabs/Levels/Level5
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 67a7498e77a75a640af19501dd6f2d70
|
||||||
|
m_Address: Prefabs/Levels/Level1
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 77d78f571ad0a008c81c4f1ee75168cf
|
||||||
|
m_Address: Assets/Resources_moved/Audio/Music/death.ogg
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 81844a99f5b786b41b831174f8fb6d3a
|
||||||
|
m_Address: Prefabs/Player/CharacterController
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 86abe613c186eff408e836a701f6f7e1
|
||||||
|
m_Address: Prefabs/Levels/Level3
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 9293380a88bf6736889be29722b94269
|
||||||
|
m_Address: Audio/AudioSource
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: b33855c694de89386a25c56cbe463a0e
|
||||||
|
m_Address: Assets/Resources_moved/Prefabs/Enemies/DrunkenGrandpa.prefab
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: c0fab6d79b220b34db7f2cd81acef171
|
||||||
|
m_Address: Prefabs/Levels/Save2
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: c1781548816d15d4e85f4bcb2f7dcf3e
|
||||||
|
m_Address: Prefabs/Levels/Level4
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: c805f5be6ffa99d41bd31f3ae17ba66b
|
||||||
|
m_Address: Prefabs/Levels/Level8
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: f3d7dc64b34919ad7b50a3dd307a935b
|
||||||
|
m_Address: Assets/Resources_moved/Prefabs/Enemies/Fog.prefab
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_Settings: {fileID: 11400000, guid: 2588e84eb64800d0781c574a37fa48d8, type: 2}
|
||||||
|
m_SchemaSet:
|
||||||
|
m_Schemas:
|
||||||
|
- {fileID: 11400000, guid: 75ffac7db08d9615c994048949431551, type: 2}
|
||||||
+8
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 7c592a6445170e8379910601b962cb30
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
%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: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
|
||||||
|
m_Name: Levels
|
||||||
|
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.AddressableAssetGroup
|
||||||
|
m_GroupName: Levels
|
||||||
|
m_GUID: d7e4a8c4f2a42c64587c34ab7446f091
|
||||||
|
m_SerializeEntries:
|
||||||
|
- m_GUID: 28a6c7a4124141341ab7c2b7dfd3e95b
|
||||||
|
m_Address: Assets/Resources_moved/Prefabs/Levels/Level1 2.prefab
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 7067a5248027e74478f4f0f53ddf06a4
|
||||||
|
m_Address: Prefabs/Rooms/Save1
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 9d78f017876abed4c9cd8957f1e140cb
|
||||||
|
m_Address: Prefabs/Rooms/Level1_2
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: c938de3174f184741925c407a43a47f2
|
||||||
|
m_Address: Prefabs/Rooms/Level1
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: e3a3840a7963bf841872cddb02e90151
|
||||||
|
m_Address: Prefabs/Levels/MainMenu 1
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_Settings: {fileID: 11400000, guid: 2588e84eb64800d0781c574a37fa48d8, type: 2}
|
||||||
|
m_SchemaSet:
|
||||||
|
m_Schemas:
|
||||||
|
- {fileID: 11400000, guid: 41705eee932aeb341b6921d8a793acc3, type: 2}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 6334e9a905fd7634a8c646d57a23968d
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
%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: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
|
||||||
|
m_Name: Music
|
||||||
|
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.AddressableAssetGroup
|
||||||
|
m_GroupName: Music
|
||||||
|
m_GUID: 1e9bc7e1e4087c0488fccf896b0ed49f
|
||||||
|
m_SerializeEntries:
|
||||||
|
- m_GUID: 00fdbd3ed3fad234e8ef2098495f4896
|
||||||
|
m_Address: Assets/Resources_moved/Audio/Music/hostiles.ogg
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 16562a5c87213914cad415f10c65a3b0
|
||||||
|
m_Address: "Assets/Resources_moved/Audio/Music/LASKX3I - \u041F\u0440\u043E\u0442\u0438\u0432
|
||||||
|
\u0446\u0430\u0440\u044F (\u041A\u0430\u0440\u0430\u043E\u043A\u0435).mp3"
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 170b1a70ddee4d948abea041b9b805e4
|
||||||
|
m_Address: Assets/Resources_moved/Audio/Music/Half Life Original Soundtrack -
|
||||||
|
Track 8 - Diabolical Adrenaline Guitar.mp3
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 3b741bfff0e13ec43a88a3e0fec256f1
|
||||||
|
m_Address: Assets/Resources_moved/Audio/Music/razormind.ogg
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 803e40b883c823b89a91aa8b9d9fc483
|
||||||
|
m_Address: valve_sound
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 8187ea542d6ed824d81230966a3b7499
|
||||||
|
m_Address: Assets/Resources_moved/Audio/Music/Bauhaus - Bela Lugosi's Dead (No
|
||||||
|
Vocals Remix).mp3
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: c81995afbd1412f4593771bd47358c3f
|
||||||
|
m_Address: Assets/Resources_moved/Audio/Music/non_ai.ogg
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: ebe18293a5ef86704b23dad3a1786476
|
||||||
|
m_Address: Half-Life01
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_Settings: {fileID: 11400000, guid: 2588e84eb64800d0781c574a37fa48d8, type: 2}
|
||||||
|
m_SchemaSet:
|
||||||
|
m_Schemas:
|
||||||
|
- {fileID: 11400000, guid: ad1eba3497492f54c8ca95e03d446775, type: 2}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: df8f8d52915542e49a11fbc177f3cf2c
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 25c8e3b4ddb778a6d84ae525564a7ee1
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
+48
@@ -0,0 +1,48 @@
|
|||||||
|
%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: e5d17a21594effb4e9591490b009e7aa, type: 3}
|
||||||
|
m_Name: Audio_BundledAssetGroupSchema
|
||||||
|
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.GroupSchemas.BundledAssetGroupSchema
|
||||||
|
m_Group: {fileID: 11400000, guid: ba51c0b85beab267d8f41a72df4fb657, type: 2}
|
||||||
|
m_InternalBundleIdMode: 1
|
||||||
|
m_Compression: 1
|
||||||
|
m_IncludeAddressInCatalog: 1
|
||||||
|
m_IncludeGUIDInCatalog: 1
|
||||||
|
m_IncludeLabelsInCatalog: 1
|
||||||
|
m_InternalIdNamingMode: 0
|
||||||
|
m_CacheClearBehavior: 0
|
||||||
|
m_IncludeInBuild: 1
|
||||||
|
m_BundledAssetProviderType:
|
||||||
|
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
|
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
|
||||||
|
m_StripDownloadOptions: 0
|
||||||
|
m_ForceUniqueProvider: 0
|
||||||
|
m_UseAssetBundleCache: 1
|
||||||
|
m_UseAssetBundleCrc: 1
|
||||||
|
m_UseAssetBundleCrcForCachedBundles: 1
|
||||||
|
m_UseUWRForLocalBundles: 0
|
||||||
|
m_Timeout: 0
|
||||||
|
m_ChunkedTransfer: 0
|
||||||
|
m_RedirectLimit: -1
|
||||||
|
m_RetryCount: 0
|
||||||
|
m_BuildPath:
|
||||||
|
m_Id: 3dfc1a15d30236e7a8856b2164e14280
|
||||||
|
m_LoadPath:
|
||||||
|
m_Id: 6c794a757c731a0319b43709731ad88b
|
||||||
|
m_BundleMode: 0
|
||||||
|
m_AssetBundleProviderType:
|
||||||
|
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
|
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
|
||||||
|
m_UseDefaultSchemaSettings: 0
|
||||||
|
m_SelectedPathPairIndex: 0
|
||||||
|
m_BundleNaming: 0
|
||||||
|
m_AssetLoadMode: 0
|
||||||
+8
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5a1eefed8456ba0479d7c04e6a5f4122
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
+48
@@ -0,0 +1,48 @@
|
|||||||
|
%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: e5d17a21594effb4e9591490b009e7aa, type: 3}
|
||||||
|
m_Name: Default Local Group_BundledAssetGroupSchema
|
||||||
|
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.GroupSchemas.BundledAssetGroupSchema
|
||||||
|
m_Group: {fileID: 11400000, guid: 7c592a6445170e8379910601b962cb30, type: 2}
|
||||||
|
m_InternalBundleIdMode: 1
|
||||||
|
m_Compression: 1
|
||||||
|
m_IncludeAddressInCatalog: 1
|
||||||
|
m_IncludeGUIDInCatalog: 1
|
||||||
|
m_IncludeLabelsInCatalog: 1
|
||||||
|
m_InternalIdNamingMode: 0
|
||||||
|
m_CacheClearBehavior: 0
|
||||||
|
m_IncludeInBuild: 1
|
||||||
|
m_BundledAssetProviderType:
|
||||||
|
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
|
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
|
||||||
|
m_StripDownloadOptions: 0
|
||||||
|
m_ForceUniqueProvider: 0
|
||||||
|
m_UseAssetBundleCache: 1
|
||||||
|
m_UseAssetBundleCrc: 1
|
||||||
|
m_UseAssetBundleCrcForCachedBundles: 1
|
||||||
|
m_UseUWRForLocalBundles: 0
|
||||||
|
m_Timeout: 0
|
||||||
|
m_ChunkedTransfer: 0
|
||||||
|
m_RedirectLimit: -1
|
||||||
|
m_RetryCount: 0
|
||||||
|
m_BuildPath:
|
||||||
|
m_Id: 3dfc1a15d30236e7a8856b2164e14280
|
||||||
|
m_LoadPath:
|
||||||
|
m_Id: 6c794a757c731a0319b43709731ad88b
|
||||||
|
m_BundleMode: 0
|
||||||
|
m_AssetBundleProviderType:
|
||||||
|
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
|
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
|
||||||
|
m_UseDefaultSchemaSettings: 0
|
||||||
|
m_SelectedPathPairIndex: 0
|
||||||
|
m_BundleNaming: 0
|
||||||
|
m_AssetLoadMode: 0
|
||||||
+8
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 75ffac7db08d9615c994048949431551
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
+16
@@ -0,0 +1,16 @@
|
|||||||
|
%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: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
|
||||||
|
m_Name: Default Local Group_ContentUpdateGroupSchema
|
||||||
|
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.GroupSchemas.ContentUpdateGroupSchema
|
||||||
|
m_Group: {fileID: 11400000, guid: 7c592a6445170e8379910601b962cb30, type: 2}
|
||||||
|
m_StaticContent: 0
|
||||||
+8
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 6d6fed27b8c8a3eebb9bc5289b7a6956
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
+48
@@ -0,0 +1,48 @@
|
|||||||
|
%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: e5d17a21594effb4e9591490b009e7aa, type: 3}
|
||||||
|
m_Name: Levels_BundledAssetGroupSchema
|
||||||
|
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.GroupSchemas.BundledAssetGroupSchema
|
||||||
|
m_Group: {fileID: 11400000, guid: 6334e9a905fd7634a8c646d57a23968d, type: 2}
|
||||||
|
m_InternalBundleIdMode: 1
|
||||||
|
m_Compression: 1
|
||||||
|
m_IncludeAddressInCatalog: 1
|
||||||
|
m_IncludeGUIDInCatalog: 1
|
||||||
|
m_IncludeLabelsInCatalog: 1
|
||||||
|
m_InternalIdNamingMode: 0
|
||||||
|
m_CacheClearBehavior: 0
|
||||||
|
m_IncludeInBuild: 1
|
||||||
|
m_BundledAssetProviderType:
|
||||||
|
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
|
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
|
||||||
|
m_StripDownloadOptions: 0
|
||||||
|
m_ForceUniqueProvider: 0
|
||||||
|
m_UseAssetBundleCache: 1
|
||||||
|
m_UseAssetBundleCrc: 1
|
||||||
|
m_UseAssetBundleCrcForCachedBundles: 1
|
||||||
|
m_UseUWRForLocalBundles: 0
|
||||||
|
m_Timeout: 0
|
||||||
|
m_ChunkedTransfer: 0
|
||||||
|
m_RedirectLimit: -1
|
||||||
|
m_RetryCount: 0
|
||||||
|
m_BuildPath:
|
||||||
|
m_Id: 3dfc1a15d30236e7a8856b2164e14280
|
||||||
|
m_LoadPath:
|
||||||
|
m_Id: 6c794a757c731a0319b43709731ad88b
|
||||||
|
m_BundleMode: 0
|
||||||
|
m_AssetBundleProviderType:
|
||||||
|
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
|
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
|
||||||
|
m_UseDefaultSchemaSettings: 0
|
||||||
|
m_SelectedPathPairIndex: 0
|
||||||
|
m_BundleNaming: 0
|
||||||
|
m_AssetLoadMode: 0
|
||||||
+8
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 41705eee932aeb341b6921d8a793acc3
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
+48
@@ -0,0 +1,48 @@
|
|||||||
|
%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: e5d17a21594effb4e9591490b009e7aa, type: 3}
|
||||||
|
m_Name: Music_BundledAssetGroupSchema
|
||||||
|
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.GroupSchemas.BundledAssetGroupSchema
|
||||||
|
m_Group: {fileID: 11400000, guid: df8f8d52915542e49a11fbc177f3cf2c, type: 2}
|
||||||
|
m_InternalBundleIdMode: 1
|
||||||
|
m_Compression: 1
|
||||||
|
m_IncludeAddressInCatalog: 1
|
||||||
|
m_IncludeGUIDInCatalog: 1
|
||||||
|
m_IncludeLabelsInCatalog: 1
|
||||||
|
m_InternalIdNamingMode: 0
|
||||||
|
m_CacheClearBehavior: 0
|
||||||
|
m_IncludeInBuild: 1
|
||||||
|
m_BundledAssetProviderType:
|
||||||
|
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
|
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
|
||||||
|
m_StripDownloadOptions: 0
|
||||||
|
m_ForceUniqueProvider: 0
|
||||||
|
m_UseAssetBundleCache: 1
|
||||||
|
m_UseAssetBundleCrc: 1
|
||||||
|
m_UseAssetBundleCrcForCachedBundles: 1
|
||||||
|
m_UseUWRForLocalBundles: 0
|
||||||
|
m_Timeout: 0
|
||||||
|
m_ChunkedTransfer: 0
|
||||||
|
m_RedirectLimit: -1
|
||||||
|
m_RetryCount: 0
|
||||||
|
m_BuildPath:
|
||||||
|
m_Id: 3dfc1a15d30236e7a8856b2164e14280
|
||||||
|
m_LoadPath:
|
||||||
|
m_Id: 6c794a757c731a0319b43709731ad88b
|
||||||
|
m_BundleMode: 0
|
||||||
|
m_AssetBundleProviderType:
|
||||||
|
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
|
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
|
||||||
|
m_UseDefaultSchemaSettings: 0
|
||||||
|
m_SelectedPathPairIndex: 0
|
||||||
|
m_BundleNaming: 0
|
||||||
|
m_AssetLoadMode: 0
|
||||||
+8
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ad1eba3497492f54c8ca95e03d446775
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
+48
@@ -0,0 +1,48 @@
|
|||||||
|
%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: e5d17a21594effb4e9591490b009e7aa, type: 3}
|
||||||
|
m_Name: UI_BundledAssetGroupSchema
|
||||||
|
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.GroupSchemas.BundledAssetGroupSchema
|
||||||
|
m_Group: {fileID: 11400000, guid: 3eb9af1699b33ee4fa3ddeb0a1a9f793, type: 2}
|
||||||
|
m_InternalBundleIdMode: 1
|
||||||
|
m_Compression: 1
|
||||||
|
m_IncludeAddressInCatalog: 1
|
||||||
|
m_IncludeGUIDInCatalog: 1
|
||||||
|
m_IncludeLabelsInCatalog: 1
|
||||||
|
m_InternalIdNamingMode: 0
|
||||||
|
m_CacheClearBehavior: 0
|
||||||
|
m_IncludeInBuild: 1
|
||||||
|
m_BundledAssetProviderType:
|
||||||
|
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
|
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
|
||||||
|
m_StripDownloadOptions: 0
|
||||||
|
m_ForceUniqueProvider: 0
|
||||||
|
m_UseAssetBundleCache: 1
|
||||||
|
m_UseAssetBundleCrc: 1
|
||||||
|
m_UseAssetBundleCrcForCachedBundles: 1
|
||||||
|
m_UseUWRForLocalBundles: 0
|
||||||
|
m_Timeout: 0
|
||||||
|
m_ChunkedTransfer: 0
|
||||||
|
m_RedirectLimit: -1
|
||||||
|
m_RetryCount: 0
|
||||||
|
m_BuildPath:
|
||||||
|
m_Id: 3dfc1a15d30236e7a8856b2164e14280
|
||||||
|
m_LoadPath:
|
||||||
|
m_Id: 6c794a757c731a0319b43709731ad88b
|
||||||
|
m_BundleMode: 0
|
||||||
|
m_AssetBundleProviderType:
|
||||||
|
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
|
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
|
||||||
|
m_UseDefaultSchemaSettings: 0
|
||||||
|
m_SelectedPathPairIndex: 0
|
||||||
|
m_BundleNaming: 0
|
||||||
|
m_AssetLoadMode: 0
|
||||||
+8
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5b0e1794b785fb54988037373b6bb1f3
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
%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: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
|
||||||
|
m_Name: UI
|
||||||
|
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.AddressableAssetGroup
|
||||||
|
m_GroupName: UI
|
||||||
|
m_GUID: 3f67261f611d8cd43a09d4d5cf638d8d
|
||||||
|
m_SerializeEntries:
|
||||||
|
- m_GUID: 23e11d2c8a4f12f4ea9a7a43d1118464
|
||||||
|
m_Address: Gameplay
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: 48aebfe8826dc0df79d047b5afbf8f5b
|
||||||
|
m_Address: Canvas
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: b2e8dc2aeb0311cd8a826b51cf8e94dc
|
||||||
|
m_Address: GameOver
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: c566fc932edefbbee9e53271eac3c560
|
||||||
|
m_Address: MainMenu
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
- m_GUID: f23b9fce9594618e5b75845f1cae50de
|
||||||
|
m_Address: LoadingScreen
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_SerializedLabels: []
|
||||||
|
FlaggedDuringContentUpdateRestriction: 0
|
||||||
|
m_ReadOnly: 0
|
||||||
|
m_Settings: {fileID: 11400000, guid: 2588e84eb64800d0781c574a37fa48d8, type: 2}
|
||||||
|
m_SchemaSet:
|
||||||
|
m_Schemas:
|
||||||
|
- {fileID: 11400000, guid: 5b0e1794b785fb54988037373b6bb1f3, type: 2}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 3eb9af1699b33ee4fa3ddeb0a1a9f793
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: d870ba11c395ba2d6b17a441e8e68cef
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
%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: 88d21199f5d473f4db36845f2318f180, type: 3}
|
||||||
|
m_Name: BuildScriptFastMode
|
||||||
|
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Build.DataBuilders.BuildScriptFastMode
|
||||||
|
instanceProviderType:
|
||||||
|
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
|
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider
|
||||||
|
sceneProviderType:
|
||||||
|
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
|
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.SceneProvider
|
||||||
+8
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 1ac723026a19cb90d8d5dd77ce8c384b
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
%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: 3e2e0ffa088c91d41a086d0b8cb16bdc, type: 3}
|
||||||
|
m_Name: BuildScriptPackedMode
|
||||||
|
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Build.DataBuilders.BuildScriptPackedMode
|
||||||
|
instanceProviderType:
|
||||||
|
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
|
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider
|
||||||
|
sceneProviderType:
|
||||||
|
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
|
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.SceneProvider
|
||||||
+8
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 1d3143f4a67a990fc9532b22a020137d
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
+20
@@ -0,0 +1,20 @@
|
|||||||
|
%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: ad8c280d42ee0ed41a27db23b43dd2bf, type: 3}
|
||||||
|
m_Name: BuildScriptPackedPlayMode
|
||||||
|
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Build.DataBuilders.BuildScriptPackedPlayMode
|
||||||
|
instanceProviderType:
|
||||||
|
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
|
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider
|
||||||
|
sceneProviderType:
|
||||||
|
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
|
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.SceneProvider
|
||||||
+8
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: e628a9e942e45e1ca94ad90d02e9acdf
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -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: 3a189bb168d8d90478a09ea08c2f3d72, type: 3}
|
||||||
|
m_Name: DefaultObject
|
||||||
|
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.AddressableAssetSettingsDefaultObject
|
||||||
|
m_AddressableAssetSettingsGuid: 2588e84eb64800d0781c574a37fa48d8
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 9338e51d1f2239ddbb8f2c6232a2b678
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: d36aab6707c518f5abfd60065165eb35
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
%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: 7e3976da977cb49238499ea3b4c237ae, type: 3}
|
||||||
|
m_Name: ProfileDataSourceSettings
|
||||||
|
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.ProfileDataSourceSettings
|
||||||
|
profileGroupTypes:
|
||||||
|
- m_GroupTypePrefix: Built-In
|
||||||
|
m_Variables:
|
||||||
|
- m_Suffix: BuildPath
|
||||||
|
m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]'
|
||||||
|
- m_Suffix: LoadPath
|
||||||
|
m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]'
|
||||||
|
environments: []
|
||||||
|
currentEnvironment:
|
||||||
|
id:
|
||||||
|
projectId:
|
||||||
|
projectGenesisId:
|
||||||
|
name:
|
||||||
|
isDefault: 0
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 7e2b0e48c9649284a9541c4d1dad59c2
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: d982316b2b4c99747b9e953ae7b9b42f
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
using Code.App.StateMachine;
|
||||||
|
using Code.StateMachine;
|
||||||
|
|
||||||
|
namespace Code.App.AppStates
|
||||||
|
{
|
||||||
|
public class BootstrapState : BaseState<AppStateMachineContext>
|
||||||
|
{
|
||||||
|
public BootstrapState(AppStateMachineContext context) : base(context)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 0183e73a08c64332babded3df3d06b95
|
||||||
|
timeCreated: 1762122962
|
||||||
@@ -1,23 +1,85 @@
|
|||||||
using Code.App.StateMachine;
|
using Code.App.StateMachine;
|
||||||
|
using Code.Audio;
|
||||||
|
using Code.Gameplay.Player;
|
||||||
|
using Code.Input;
|
||||||
|
using Code.Scenes;
|
||||||
|
using Code.Scenes.SceneEnvironments;
|
||||||
using Code.StateMachine;
|
using Code.StateMachine;
|
||||||
|
using Code.UI;
|
||||||
|
using Cysharp.Threading.Tasks;
|
||||||
|
using Reflex.Core;
|
||||||
|
using Reflex.Extensions;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.InputSystem;
|
||||||
|
using UnityEngine.SceneManagement;
|
||||||
|
|
||||||
namespace Code.App.AppStates
|
namespace Code.App.AppStates
|
||||||
{
|
{
|
||||||
public class GameOverState : BaseState<AppStateMachineContext>
|
public class GameOverState : BaseState<AppStateMachineContext>
|
||||||
{
|
{
|
||||||
public GameOverState(AppStateMachineContext context) : base(context)
|
public GameOverState(AppStateMachineContext context) : base(context)
|
||||||
{ }
|
{
|
||||||
|
}
|
||||||
|
private IPlayerScore _playerScore;
|
||||||
|
|
||||||
|
private GameOverPanel _gameOverPanel;
|
||||||
|
|
||||||
public override void EnterState()
|
public override void EnterState()
|
||||||
{
|
{
|
||||||
|
Container sceneContainer = SceneManager.GetActiveScene().GetSceneContainer();
|
||||||
|
_playerScore = sceneContainer.Resolve<IPlayerScore>();
|
||||||
|
_scoreCounter = 0;
|
||||||
|
|
||||||
|
Context.InputService.EnableMap(ActionMappings.UI);
|
||||||
|
Context.InputService.DebugBindAction((int)ActionMappings.UI,(int)UIActions.Continue, TryToExit);
|
||||||
|
|
||||||
|
Context.AudioService.PlayRandomMusicUntilHumanityWillBeDestroyedForTheySins(MusicType.Death);
|
||||||
|
|
||||||
|
Context.AudioService.ApplyStun(5000,0.5f);
|
||||||
|
|
||||||
|
GameOver().Forget();
|
||||||
|
|
||||||
base.EnterState();
|
base.EnterState();
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void Tick()
|
private void TryToExit(InputAction.CallbackContext context)
|
||||||
{ }
|
|
||||||
|
|
||||||
public override void ExitState()
|
|
||||||
{
|
{
|
||||||
|
ToMainMenu();
|
||||||
|
}
|
||||||
|
|
||||||
|
private async UniTaskVoid GameOver()
|
||||||
|
{
|
||||||
|
await Context.UIService.AsyncSwitchPanelTo(UIPanel.GameOver);
|
||||||
|
|
||||||
|
_gameOverPanel = (GameOverPanel)Context.UIService.CurrentPanel;
|
||||||
|
_gameOverPanel.Show();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ToMainMenu()
|
||||||
|
{
|
||||||
|
Context.StateMachine.SwitchState(AppState.MainMenu)
|
||||||
|
.AllowStateTransition(AppState.Gameplay);
|
||||||
|
}
|
||||||
|
private float _scoreCounter;
|
||||||
|
public override void Tick()
|
||||||
|
{
|
||||||
|
if (!_gameOverPanel) return;
|
||||||
|
|
||||||
|
_scoreCounter += Time.deltaTime * 100;
|
||||||
|
// UnityEngine.Debug.Log($"Score: {_scoreCounter}");
|
||||||
|
if((int)_scoreCounter >= _playerScore.Score)
|
||||||
|
{
|
||||||
|
_gameOverPanel.UpdateScoreText(_playerScore.Score);
|
||||||
|
}
|
||||||
|
else _gameOverPanel.UpdateScoreText((int)_scoreCounter);
|
||||||
|
}
|
||||||
|
public override void ExitState()
|
||||||
|
{
|
||||||
|
Context.InputService.DisableMap(ActionMappings.UI);
|
||||||
|
Context.InputService.DebugUnbindAction((int)ActionMappings.UI,(int)UIActions.Continue, TryToExit);
|
||||||
|
|
||||||
|
Context.AudioService.GladlyAskToStopMusic(MusicType.Death, time: 0f, callback: Context.AudioFactory.ReleaseDeathMusic);
|
||||||
|
Context.AudioService.TransitToSnapshot(AudioSnapshotState.None);
|
||||||
base.ExitState();
|
base.ExitState();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,38 +1,280 @@
|
|||||||
|
using Code.App.Loading;
|
||||||
using Code.App.StateMachine;
|
using Code.App.StateMachine;
|
||||||
|
using Code.Audio;
|
||||||
|
using Code.Gameplay.Camera;
|
||||||
|
using Code.Gameplay.Camera.CameraStates;
|
||||||
|
using Code.Gameplay.Character.Core;
|
||||||
|
using Code.Gameplay.Orders.Order;
|
||||||
|
using Code.Gameplay.Player;
|
||||||
using Code.Input;
|
using Code.Input;
|
||||||
using Code.Scenes;
|
using Code.Scenes;
|
||||||
|
using Code.Scenes.SceneEnvironments;
|
||||||
using Code.StateMachine;
|
using Code.StateMachine;
|
||||||
|
using Code.UI;
|
||||||
|
using Code.UI.Panels;
|
||||||
|
using Cysharp.Threading.Tasks;
|
||||||
|
using DG.Tweening;
|
||||||
|
using Reflex.Core;
|
||||||
|
using Reflex.Extensions;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
using UnityEngine.InputSystem;
|
||||||
|
using UnityEngine.Rendering;
|
||||||
|
using UnityEngine.SceneManagement;
|
||||||
|
|
||||||
namespace Code.App.AppStates
|
namespace Code.App.AppStates
|
||||||
{
|
{
|
||||||
public class GameplayState : BaseState<AppStateMachineContext>
|
public class GameplayState : BaseState<AppStateMachineContext>
|
||||||
{
|
{
|
||||||
|
private PlayerHealth _playerHealth;
|
||||||
|
private IPlayerScore _playerScore;
|
||||||
|
|
||||||
|
private IOrderService _orderService;
|
||||||
|
|
||||||
|
private CharacterProvider _playerCharacter;
|
||||||
public GameplayState(AppStateMachineContext context) : base(context)
|
public GameplayState(AppStateMachineContext context) : base(context)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void EnterState()
|
public override void EnterState()
|
||||||
{
|
{
|
||||||
Context.SceneLoaderService.LoadScene((int)SceneIds.Gameplay, SceneLoaded);
|
Context.UIService.LoadingScreen.Show();
|
||||||
|
|
||||||
|
Context.LoadingManager
|
||||||
|
.RegisterLoading(LoadingWork.LoadScene)
|
||||||
|
.RegisterLoading(LoadingWork.LoadUI)
|
||||||
|
.RegisterLoading(LoadingWork.LoadModelResource)
|
||||||
|
.RegisterLoading(LoadingWork.LoadAudio);
|
||||||
|
|
||||||
|
Context.AudioService.TransitToSnapshot(AudioSnapshotState.None);
|
||||||
|
|
||||||
Context.InputService.EnableMap(ActionMappings.Gameplay);
|
Context.InputService.EnableMap(ActionMappings.Gameplay);
|
||||||
|
|
||||||
|
Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug1, InstaKillDEBUG);
|
||||||
|
Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug4, TakeGamageDEBUG);
|
||||||
|
|
||||||
|
Context.SceneLoaderService.LoadSceneAsyncAwaitable((int)SceneIds.DevGen);
|
||||||
|
Context.LoadingManager.OnLoadingEnded += AfterSceneLoaded;
|
||||||
|
|
||||||
|
WaitForLoad().Forget();
|
||||||
|
}
|
||||||
|
private async UniTask WaitForPlayerCharacterLoad() => _playerCharacter = await Context.PlayerFactory.CreatePlayer();
|
||||||
|
|
||||||
|
private async UniTaskVoid WaitForLoad()
|
||||||
|
{
|
||||||
|
await UniTask.WhenAll(
|
||||||
|
Context.UIService.AsyncSwitchPanelTo(UIPanel.Gameplay),
|
||||||
|
Context.AudioFactory.WarmGameplayMusic(),
|
||||||
|
Context.AudioFactory.WarmDeathMusic(),
|
||||||
|
// Context.AudioFactory.WarmSFX(),
|
||||||
|
Context.AudioFactory.WarmDispatcher(),
|
||||||
|
Context.AudioFactory.WarmEnemies(),
|
||||||
|
Context.AudioFactory.WarmCourier()
|
||||||
|
);
|
||||||
|
|
||||||
|
Context.LoadingManager
|
||||||
|
.UnregisterLoading(LoadingWork.LoadUI)
|
||||||
|
.UnregisterLoading(LoadingWork.LoadAudio);
|
||||||
|
|
||||||
|
InputServiceInitialize();
|
||||||
|
|
||||||
|
MusicInitialize();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SceneLoaded()
|
private async void AfterSceneLoaded()
|
||||||
{
|
{
|
||||||
|
Context.LoadingManager
|
||||||
|
.RegisterLoading(LoadingWork.LoadModelResource);
|
||||||
|
|
||||||
|
Context.LoadingManager.OnLoadingEnded -= AfterSceneLoaded;
|
||||||
|
Context.LoadingManager.OnLoadingEnded += AfterPlayerLoaded;
|
||||||
|
|
||||||
|
Context.PlayerProvider = SceneManager.GetActiveScene().GetSceneContainer().Resolve<IPlayerProvider>();
|
||||||
|
Context.PlayerFactory = SceneManager.GetActiveScene().GetSceneContainer().Resolve<IPlayerFactory>();
|
||||||
|
|
||||||
base.EnterState();
|
await UniTask.WhenAll(
|
||||||
|
WaitForPlayerArmsToInitialize(),
|
||||||
|
WaitForPlayerCharacterLoad()
|
||||||
|
);
|
||||||
|
|
||||||
|
_playerHealth = Context.PlayerProvider.Health;
|
||||||
|
_playerHealth.OnDamage += PlayerDamageTaken;
|
||||||
|
_playerHealth.OnDeath += EndGame;
|
||||||
|
|
||||||
|
Context.LoadingManager
|
||||||
|
.UnregisterLoading(LoadingWork.LoadModelResource);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void AfterPlayerLoaded()
|
||||||
|
{
|
||||||
|
Container sceneContainer = SceneManager.GetActiveScene().GetSceneContainer();
|
||||||
|
|
||||||
|
_playerScore = sceneContainer.Resolve<IPlayerScore>();
|
||||||
|
|
||||||
|
GameplaySceneEnvironment sceneEnvironment = SceneEnvironmentVariables(sceneContainer);
|
||||||
|
|
||||||
|
_volume = sceneEnvironment.volume;
|
||||||
|
|
||||||
|
PlayerInitialize(sceneEnvironment);
|
||||||
|
|
||||||
|
CameraInitialize();
|
||||||
|
|
||||||
|
GameplayServicesInitialize(sceneContainer);
|
||||||
|
|
||||||
|
UIInitialize();
|
||||||
|
|
||||||
|
Context.LoadingManager.OnLoadingEnded -= AfterPlayerLoaded;
|
||||||
|
|
||||||
|
_tickEnabled = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private async UniTask WaitForPlayerArmsToInitialize() => _armsMesh = await Context.PlayerFactory.CreateArms(Context.CameraStateMachine.Camera.transform);
|
||||||
|
|
||||||
|
private void OrderGiven(float time)
|
||||||
|
{
|
||||||
|
_gameplayPanel.ShowTimer();
|
||||||
|
Context.AudioService.TransitToSnapshot(AudioSnapshotState.Action);
|
||||||
|
}
|
||||||
|
private void OrderFailure()
|
||||||
|
{
|
||||||
|
_playerHealth.InstaKill();
|
||||||
|
}
|
||||||
|
private void OrderRecieved(float time)
|
||||||
|
{
|
||||||
|
Context.AudioService.PlayDispatcher((DispatcherSounds)Random.Range((int)DispatcherSounds.Recieve1,(int)DispatcherSounds.Recieve2 + 1));
|
||||||
|
}
|
||||||
|
private void OrderDelivered(int score, float time)
|
||||||
|
{
|
||||||
|
_gameplayPanel.HideTimer();
|
||||||
|
|
||||||
|
if(time < 0f) Context.AudioService.PlayDispatcher((DispatcherSounds)Random.Range((int)DispatcherSounds.Late1,(int)DispatcherSounds.Late2 + 1));
|
||||||
|
_playerScore.UpdateScore(score);
|
||||||
|
|
||||||
|
Context.AudioService.TransitToSnapshot(AudioSnapshotState.Peaceful);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void PlayerDamageTaken(int damage, PlayerHealth health)
|
||||||
|
{
|
||||||
|
Context.AudioService.PlayDispatcher((DispatcherSounds)Random.Range((int)DispatcherSounds.TakeDamage1,(int)DispatcherSounds.TakeDamage4 + 1));
|
||||||
|
Context.AudioService.PlayCourier((CourierSounds)Random.Range((int)CourierSounds.Damage1,(int)CourierSounds.Damage2 + 1));
|
||||||
|
DamageEffectProcess().Forget();
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO В конфиг
|
||||||
|
private async UniTaskVoid DamageEffectProcess()
|
||||||
|
{
|
||||||
|
_damagePanel.Show();
|
||||||
|
Context.AudioService.ApplyStun(200, 0.5f);
|
||||||
|
|
||||||
|
DOTween.To(() => _volume.weight, x => _volume.weight = x, 1f, 0.5f);
|
||||||
|
await UniTask.WaitForSeconds(3f);
|
||||||
|
DOTween.To(() => _volume.weight, x => _volume.weight = x, 0f, 1f);
|
||||||
|
Context.AudioService.ApplyStun(5000, 1f);
|
||||||
|
_damagePanel.Hide();
|
||||||
|
}
|
||||||
|
// DEBUG
|
||||||
|
private void InstaKillDEBUG(InputAction.CallbackContext context)
|
||||||
|
{
|
||||||
|
_playerHealth.InstaKill();
|
||||||
|
}
|
||||||
|
private void TakeGamageDEBUG(InputAction.CallbackContext context)
|
||||||
|
{
|
||||||
|
_playerHealth.GetDamage(1);
|
||||||
|
}
|
||||||
|
// DEBUG
|
||||||
|
private bool _tickEnabled;
|
||||||
public override void Tick()
|
public override void Tick()
|
||||||
{
|
{
|
||||||
|
if (!_tickEnabled) return;
|
||||||
|
|
||||||
|
_orderService.DecreaseTimer(Time.deltaTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void EndGame()
|
||||||
|
{
|
||||||
|
Context.StateMachine.SwitchState(AppState.GameOver)
|
||||||
|
.AllowStateTransition(AppState.MainMenu);
|
||||||
|
}
|
||||||
|
|
||||||
public override void ExitState()
|
public override void ExitState()
|
||||||
{
|
{
|
||||||
|
_playerHealth = null;
|
||||||
|
_playerScore = null;
|
||||||
|
|
||||||
|
_tickEnabled = false;
|
||||||
|
|
||||||
|
Context.PlayerFactory.ReleasePlayer(_playerCharacter);
|
||||||
|
_playerCharacter = null;
|
||||||
|
Context.PlayerFactory.ReleaseArms(_armsMesh);
|
||||||
|
_armsMesh = null;
|
||||||
|
_orderService = null;
|
||||||
|
|
||||||
|
Context.AudioService.OnDispatcherStarted -= _gameplayPanel.SummonDispatcher;
|
||||||
|
Context.AudioService.OnDispatcherEnded -= _gameplayPanel.CloseDispatcher;
|
||||||
|
|
||||||
Context.InputService.DisableMap(ActionMappings.Gameplay);
|
Context.InputService.DisableMap(ActionMappings.Gameplay);
|
||||||
|
Context.AudioService.GladlyAskToStopMusic(MusicType.Action, time: 0f, callback: Context.AudioFactory.ReleaseActionMusic);
|
||||||
|
Context.AudioService.GladlyAskToStopMusic(MusicType.Peaceful, time: 0f, callback: Context.AudioFactory.ReleasePeacefulMusic);
|
||||||
|
Context.AudioFactory.ReleaseCourier();
|
||||||
|
Context.AudioFactory.ReleaseDispatcher();
|
||||||
|
Context.AudioFactory.ReleaseEnemies();
|
||||||
|
// Context.AudioFactory.ReleaseSFX();
|
||||||
|
|
||||||
|
|
||||||
|
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug1, InstaKillDEBUG);
|
||||||
|
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug4, TakeGamageDEBUG);
|
||||||
|
|
||||||
base.ExitState();
|
base.ExitState();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void InputServiceInitialize()
|
||||||
|
{
|
||||||
|
Context.InputService.EnableMap(ActionMappings.Gameplay);
|
||||||
|
}
|
||||||
|
private void CameraInitialize()
|
||||||
|
{
|
||||||
|
Context.CameraStateMachine.SwitchState(CameraMode.FirstPerson);
|
||||||
|
((BaseCameraState)Context.CameraStateMachine.CurrentBaseState).SetFollowTransform(_playerCharacter.GetFollowTransform());
|
||||||
|
}
|
||||||
|
|
||||||
|
private GameplayPanel _gameplayPanel;
|
||||||
|
private ArmsMeshProvider _armsMesh;
|
||||||
|
private DamagePanel _damagePanel;
|
||||||
|
private void UIInitialize()
|
||||||
|
{
|
||||||
|
_gameplayPanel = (GameplayPanel)Context.UIService.CurrentPanel;
|
||||||
|
_gameplayPanel.Initialize(_playerScore, _playerHealth, _orderService);
|
||||||
|
Context.AudioService.OnDispatcherStarted += _gameplayPanel.SummonDispatcher;
|
||||||
|
Context.AudioService.OnDispatcherEnded += _gameplayPanel.CloseDispatcher;
|
||||||
|
|
||||||
|
_damagePanel = _gameplayPanel.DamagePanel;
|
||||||
|
}
|
||||||
|
private void MusicInitialize()
|
||||||
|
{
|
||||||
|
Context.AudioService.PlayRandomMusicUntilHumanityWillBeDestroyedForTheySins(MusicType.Peaceful);
|
||||||
|
Context.AudioService.PlayRandomMusicUntilHumanityWillBeDestroyedForTheySins(MusicType.Action);
|
||||||
|
Context.AudioService.TransitToSnapshot(AudioSnapshotState.Peaceful);
|
||||||
|
}
|
||||||
|
private void PlayerInitialize(GameplaySceneEnvironment sceneEnvironment)
|
||||||
|
{
|
||||||
|
_playerCharacter.Teleport(sceneEnvironment.playerSpawnPoint.position, sceneEnvironment.playerSpawnPoint.rotation);
|
||||||
|
_playerCharacter.PlayerAnimator.SetAnimator(_armsMesh.ArmsAnimator);
|
||||||
|
}
|
||||||
|
private void GameplayServicesInitialize(Container sceneContainer)
|
||||||
|
{
|
||||||
|
_orderService = sceneContainer.Resolve<IOrderService>();
|
||||||
|
|
||||||
|
_orderService.OnOrderGiven += OrderGiven;
|
||||||
|
_orderService.OnOrderRecieved += OrderRecieved;
|
||||||
|
_orderService.OnOrderDelivered += OrderDelivered;
|
||||||
|
_orderService.OnOrderFailure += OrderFailure;
|
||||||
|
}
|
||||||
|
|
||||||
|
private Volume _volume;
|
||||||
|
private GameplaySceneEnvironment SceneEnvironmentVariables(Container sceneContainer)
|
||||||
|
{
|
||||||
|
var sceneEnvironment = (GameplaySceneEnvironment)sceneContainer.Resolve<CurrentSceneEnvironment>();
|
||||||
|
|
||||||
|
return sceneEnvironment;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,34 +1,126 @@
|
|||||||
|
using Code.App.Loading;
|
||||||
using Code.App.StateMachine;
|
using Code.App.StateMachine;
|
||||||
|
using Code.Audio;
|
||||||
|
using Code.Gameplay.Camera;
|
||||||
|
using Code.Gameplay.Camera.CameraStates;
|
||||||
|
using Code.Gameplay.Door;
|
||||||
using Code.Input;
|
using Code.Input;
|
||||||
using Code.Scenes;
|
using Code.Scenes;
|
||||||
|
using Code.Scenes.SceneEnvironments;
|
||||||
using Code.StateMachine;
|
using Code.StateMachine;
|
||||||
|
using Code.UI;
|
||||||
|
using Code.UI.Panels;
|
||||||
|
using Cysharp.Threading.Tasks;
|
||||||
|
using Reflex.Extensions;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.SceneManagement;
|
||||||
|
|
||||||
namespace Code.App.AppStates
|
namespace Code.App.AppStates
|
||||||
{
|
{
|
||||||
public class MainMenuState : BaseState<AppStateMachineContext>
|
public class MainMenuState : BaseState<AppStateMachineContext>
|
||||||
{
|
{
|
||||||
public MainMenuState(AppStateMachineContext context) : base(context)
|
public MainMenuState(AppStateMachineContext context) : base(context)
|
||||||
{ }
|
{
|
||||||
|
}
|
||||||
|
|
||||||
public override void EnterState()
|
public override void EnterState()
|
||||||
{
|
{
|
||||||
Context.SceneLoaderService.LoadScene((int)SceneIds.MainMenu, SceneLoaded);
|
Context.LoadingManager
|
||||||
|
.RegisterLoading(LoadingWork.LoadScene)
|
||||||
|
.RegisterLoading(LoadingWork.LoadUI)
|
||||||
|
.RegisterLoading(LoadingWork.LoadAudio);
|
||||||
|
|
||||||
|
Context.AudioService.TransitToSnapshot(AudioSnapshotState.Menu);
|
||||||
|
|
||||||
|
Context.CameraStateMachine.SwitchState(CameraMode.MainMenu);
|
||||||
|
|
||||||
|
Context.SceneLoaderService.LoadSceneAsyncAwaitable((int)SceneIds.MainMenu);
|
||||||
|
Context.LoadingManager.OnLoadingEnded += AfterSceneLoaded;
|
||||||
|
|
||||||
|
WaitForLoad().Forget();
|
||||||
|
}
|
||||||
|
|
||||||
|
private async UniTaskVoid WaitForLoad()
|
||||||
|
{
|
||||||
|
await UniTask.WhenAll(
|
||||||
|
Context.UIService.AsyncSwitchPanelTo(UIPanel.MainMenu),
|
||||||
|
Context.AudioFactory.WarmMenuMusic(),
|
||||||
|
Context.AudioFactory.WarmAudioTestClips()
|
||||||
|
);
|
||||||
|
Context.LoadingManager
|
||||||
|
.UnregisterLoading(LoadingWork.LoadUI)
|
||||||
|
.UnregisterLoading(LoadingWork.LoadAudio);
|
||||||
|
|
||||||
|
InitializeUI((MainMenuEnvironment)SceneManager.GetActiveScene()
|
||||||
|
.GetSceneContainer().Resolve<CurrentSceneEnvironment>());
|
||||||
|
|
||||||
|
InitializeAudio();
|
||||||
|
|
||||||
|
InitializeInput();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void AfterSceneLoaded()
|
||||||
|
{
|
||||||
|
var mainMenuEnvironment = (MainMenuEnvironment)SceneManager.GetActiveScene()
|
||||||
|
.GetSceneContainer().Resolve<CurrentSceneEnvironment>();
|
||||||
|
|
||||||
|
InitializeCamera(mainMenuEnvironment);
|
||||||
|
|
||||||
|
Context.LoadingManager.OnLoadingEnded -= AfterSceneLoaded;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void InitializeCamera(MainMenuEnvironment mainMenuEnvironment)
|
||||||
|
{
|
||||||
|
((Gameplay.Camera.CameraStates.MainMenuState)Context.CameraStateMachine.CurrentBaseState).SetFollowTransform(mainMenuEnvironment
|
||||||
|
.cameraPosition);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void InitializeInput()
|
||||||
|
{
|
||||||
Context.InputService.EnableMap(ActionMappings.MainMenu);
|
Context.InputService.EnableMap(ActionMappings.MainMenu);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SceneLoaded()
|
private void InitializeAudio()
|
||||||
{
|
{
|
||||||
|
Context.AudioService.PlayRandomMusicUntilHumanityWillBeDestroyedForTheySins(MusicType.Menu);
|
||||||
|
|
||||||
base.EnterState();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void InitializeUI(MainMenuEnvironment mainMenuEnvironment)
|
||||||
|
{
|
||||||
|
var menuPanel = (MainMenuPanel)Context.UIService.CurrentPanel;
|
||||||
|
menuPanel.Initialize(mainMenuEnvironment.uiVariables,
|
||||||
|
mainMenuEnvironment.startButton,
|
||||||
|
mainMenuEnvironment.settingButton,
|
||||||
|
mainMenuEnvironment.exitButton);
|
||||||
|
|
||||||
|
menuPanel.startButton.button.onClick.AddListener(StartGame);
|
||||||
|
menuPanel.exitButton.button.onClick.AddListener(ExitGame);
|
||||||
|
|
||||||
|
mainMenuEnvironment.menuButtonsCanvas.worldCamera = Context.CameraStateMachine.Camera;
|
||||||
|
mainMenuEnvironment.settingsCanvas.worldCamera = Context.CameraStateMachine.Camera;
|
||||||
|
}
|
||||||
|
|
||||||
public override void Tick()
|
public override void Tick()
|
||||||
{ }
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
private void StartGame()
|
||||||
|
{
|
||||||
|
Context.StateMachine.SwitchState(AppState.Gameplay)
|
||||||
|
.AllowStateTransition(AppState.GameOver);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ExitGame()
|
||||||
|
{
|
||||||
|
Application.Quit();
|
||||||
|
}
|
||||||
|
|
||||||
public override void ExitState()
|
public override void ExitState()
|
||||||
{
|
{
|
||||||
Context.InputService.DisableMap(ActionMappings.MainMenu);
|
Context.InputService.DisableMap(ActionMappings.MainMenu);
|
||||||
|
Context.AudioService.GladlyAskToStopMusic(MusicType.Menu, time: 0f, callback: Context.AudioFactory.ReleaseMenuMusic);
|
||||||
|
|
||||||
|
Context.AudioFactory.ReleaseAudioTestClips();
|
||||||
base.ExitState();
|
base.ExitState();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,41 @@
|
|||||||
|
using Code.App.StateMachine;
|
||||||
|
using Code.Gameplay.Camera;
|
||||||
|
using Code.Input;
|
||||||
|
using Code.Scenes;
|
||||||
|
using Code.StateMachine;
|
||||||
|
|
||||||
|
namespace Code.App.AppStates
|
||||||
|
{
|
||||||
|
//TODO: поменяно для теста
|
||||||
|
public class MovementDevState: BaseState<AppStateMachineContext>
|
||||||
|
{
|
||||||
|
public MovementDevState(AppStateMachineContext context) : base(context)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void EnterState()
|
||||||
|
{
|
||||||
|
// Context.SceneLoaderService.LoadScene((int)SceneIds.MovementDev, SceneLoaded);
|
||||||
|
Context.InputService.EnableMap(ActionMappings.Gameplay);
|
||||||
|
|
||||||
|
Context.CameraStateMachine.SwitchState(CameraMode.FirstPerson);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void SceneLoaded()
|
||||||
|
{
|
||||||
|
|
||||||
|
base.EnterState();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void Tick()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void ExitState()
|
||||||
|
{
|
||||||
|
Context.InputService.DisableMap(ActionMappings.Gameplay);
|
||||||
|
|
||||||
|
base.ExitState();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 395d8d3979124f10897c28bae62b288a
|
||||||
|
timeCreated: 1760638654
|
||||||
@@ -1,8 +1,20 @@
|
|||||||
|
using System.Collections.Generic;
|
||||||
|
using Code.App.Loading;
|
||||||
using Code.App.StateMachine;
|
using Code.App.StateMachine;
|
||||||
|
using Code.Audio;
|
||||||
using Code.Configs;
|
using Code.Configs;
|
||||||
|
using Code.Constants;
|
||||||
|
using Code.Gameplay.Camera;
|
||||||
|
using Code.Gameplay.Enemies;
|
||||||
|
using Code.Gameplay.Orders.Order;
|
||||||
|
using Code.Gameplay.Player;
|
||||||
|
using Code.Generator;
|
||||||
using Code.Input;
|
using Code.Input;
|
||||||
using Code.Scenes;
|
using Code.Scenes;
|
||||||
using Code.StaticData;
|
using Code.StaticData;
|
||||||
|
using Code.UI;
|
||||||
|
using Code.UI.Panels;
|
||||||
|
using Cysharp.Threading.Tasks;
|
||||||
using Reflex.Core;
|
using Reflex.Core;
|
||||||
using Reflex.Injectors;
|
using Reflex.Injectors;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
@@ -12,47 +24,122 @@ namespace Code.App
|
|||||||
{
|
{
|
||||||
public class BootstrapInstaller : MonoBehaviour, IInstaller
|
public class BootstrapInstaller : MonoBehaviour, IInstaller
|
||||||
{
|
{
|
||||||
|
|
||||||
public void InstallBindings(ContainerBuilder containerBuilder)
|
public void InstallBindings(ContainerBuilder containerBuilder)
|
||||||
{
|
{
|
||||||
InstallStaticData(containerBuilder, out IStaticDataService staticDataService);
|
InstallStaticData(containerBuilder, out IStaticDataService staticDataService);
|
||||||
|
|
||||||
InstallInfrastructureUnit(containerBuilder, staticDataService);
|
InstallInfrastructureUnit(containerBuilder, staticDataService);
|
||||||
|
|
||||||
|
containerBuilder.AddSingleton(typeof(LoadingManager), typeof(ILoadingManager));
|
||||||
|
|
||||||
containerBuilder.AddSingleton(typeof(InputService), typeof(IInputService));
|
containerBuilder.AddSingleton(typeof(InputService), typeof(IInputService));
|
||||||
|
|
||||||
|
InitializeCamera(containerBuilder, staticDataService);
|
||||||
|
|
||||||
|
containerBuilder.AddSingleton(typeof(UIFactory), typeof(IUIFactory));
|
||||||
|
containerBuilder.AddSingleton(typeof(UIService), typeof(IUIService));
|
||||||
|
|
||||||
|
containerBuilder.AddSingleton(typeof(AudioFactory), typeof(IAudioFactory));
|
||||||
|
containerBuilder.AddSingleton(typeof(AudioService), typeof(IAudioService));
|
||||||
|
|
||||||
containerBuilder.AddSingleton(typeof(SceneLoaderService), typeof(ISceneLoaderService));
|
containerBuilder.AddSingleton(typeof(SceneLoaderService), typeof(ISceneLoaderService));
|
||||||
|
|
||||||
containerBuilder.OnContainerBuilt += Bootstrap;
|
containerBuilder.OnContainerBuilt += Bootstrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void InitializeCamera(ContainerBuilder containerBuilder, IStaticDataService staticDataService)
|
||||||
|
{
|
||||||
|
Camera camera = Instantiate(staticDataService.CameraConfig.cameraPrefab);
|
||||||
|
|
||||||
|
DontDestroyOnLoad(camera);
|
||||||
|
containerBuilder.AddSingleton(camera);
|
||||||
|
}
|
||||||
|
|
||||||
private void InstallInfrastructureUnit(ContainerBuilder containerBuilder, IStaticDataService staticDataService)
|
private void InstallInfrastructureUnit(ContainerBuilder containerBuilder, IStaticDataService staticDataService)
|
||||||
{
|
{
|
||||||
GameObject infrastructureUnit = Instantiate(staticDataService.AppConfig.infrastructureUnitPrefab);
|
GameObject infrastructureUnit = Instantiate(staticDataService.AppConfig.infrastructureUnitPrefab);
|
||||||
DontDestroyOnLoad(infrastructureUnit);
|
DontDestroyOnLoad(infrastructureUnit);
|
||||||
|
|
||||||
containerBuilder.AddSingleton(infrastructureUnit);
|
containerBuilder.AddSingleton(infrastructureUnit);
|
||||||
containerBuilder.AddSingleton(infrastructureUnit.GetComponent<ICoroutineRunner>(),
|
containerBuilder.AddSingleton(infrastructureUnit.AddComponent<CoroutineRunner>(),
|
||||||
typeof(ICoroutineRunner));
|
typeof(ICoroutineRunner));
|
||||||
containerBuilder.AddSingleton(infrastructureUnit.AddComponent<AppStateMachine>());
|
containerBuilder.AddSingleton(infrastructureUnit.AddComponent<AppStateMachine>());
|
||||||
|
containerBuilder.AddSingleton(infrastructureUnit.AddComponent<CameraStateMachine>());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO Часть в сцены
|
||||||
private void InstallStaticData(ContainerBuilder containerBuilder, out IStaticDataService staticDataService)
|
private void InstallStaticData(ContainerBuilder containerBuilder, out IStaticDataService staticDataService)
|
||||||
{
|
{
|
||||||
staticDataService = new StaticDataService();
|
staticDataService = new StaticDataService();
|
||||||
staticDataService.Load();
|
staticDataService.Load();
|
||||||
|
|
||||||
containerBuilder.AddSingleton(staticDataService, typeof(IStaticDataService));
|
containerBuilder.AddSingleton(staticDataService, typeof(IStaticDataService));
|
||||||
|
|
||||||
containerBuilder.AddSingleton(staticDataService.InputConfig.inputActionAsset, typeof(InputActionAsset));
|
containerBuilder.AddSingleton(staticDataService.InputConfig.inputActionAsset, typeof(InputActionAsset));
|
||||||
|
containerBuilder.AddSingleton(staticDataService.InputConfig, typeof(InputConfig));
|
||||||
|
|
||||||
|
containerBuilder.AddSingleton(staticDataService.CameraConfig, typeof(CameraConfig));
|
||||||
|
containerBuilder.AddSingleton(staticDataService.CameraSettingsConfigs, typeof(Dictionary<CameraMode,CameraSettingsConfig>));
|
||||||
|
|
||||||
|
containerBuilder.AddSingleton(staticDataService.PlayerConfig, typeof(PlayerConfig));
|
||||||
|
containerBuilder.AddSingleton(staticDataService.CharacterConfig, typeof(CharacterConfig));
|
||||||
|
|
||||||
|
containerBuilder.AddSingleton(staticDataService.UIConfig, typeof(UIConfig));
|
||||||
|
|
||||||
|
containerBuilder.AddSingleton(staticDataService.DrunkenGrandpaConfig, typeof(DrunkenGrandpaConfig));
|
||||||
|
containerBuilder.AddSingleton(staticDataService.CockroachConfig, typeof(CockroachConfig));
|
||||||
|
containerBuilder.AddSingleton(staticDataService.FogConfig, typeof(FogConfig));
|
||||||
|
|
||||||
|
containerBuilder.AddSingleton(staticDataService.AudioMixerConfig, typeof(AudioMixerConfig));
|
||||||
|
containerBuilder.AddSingleton(staticDataService.SoundtrackListConfig, typeof(SoundtrackListConfig));
|
||||||
|
containerBuilder.AddSingleton(staticDataService.AudioTestClipsConfig, typeof(AudioTestClipsConfig));
|
||||||
|
containerBuilder.AddSingleton(staticDataService.SFXListConfig, typeof(SFXListConfig));
|
||||||
|
containerBuilder.AddSingleton(staticDataService.CourierSoundListConfig, typeof(CourierSoundListConfig));
|
||||||
|
containerBuilder.AddSingleton(staticDataService.DispatcherSoundListConfig, typeof(DispatcherSoundListConfig));
|
||||||
|
containerBuilder.AddSingleton(staticDataService.EnemiesSoundListConfig, typeof(EnemiesSoundListConfig));
|
||||||
|
containerBuilder.AddSingleton(staticDataService.AudioSourceSettingsConfigs, typeof(Dictionary<AudioSourceType, AudioSourceSettingsConfig>));
|
||||||
|
|
||||||
|
containerBuilder.AddSingleton(staticDataService.DefaultAudioSettingsConfig, typeof(DefaultAudioSettingsConfig));
|
||||||
|
|
||||||
|
containerBuilder.AddSingleton(staticDataService.OrderServiceConfig, typeof(OrderServiceConfig));
|
||||||
|
containerBuilder.AddSingleton(staticDataService.OrderBoxConfig, typeof(OrderBoxConfig));
|
||||||
|
|
||||||
|
containerBuilder.AddSingleton(staticDataService.GeneratorConfig, typeof(GeneratorConfig));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private AppStateMachine _appStateMachine;
|
||||||
|
|
||||||
private void Bootstrap(Container container)
|
private void Bootstrap(Container container)
|
||||||
{
|
{
|
||||||
AppStateMachine appStateMachine = container.Resolve<AppStateMachine>();
|
_appStateMachine = container.Resolve<AppStateMachine>();
|
||||||
appStateMachine.Initialize();
|
_appStateMachine.Initialize();
|
||||||
|
AttributeInjector.Inject(_appStateMachine.StateMachineContext, container);
|
||||||
|
|
||||||
|
CameraStateMachine cameraStateMachine = container.Resolve<CameraStateMachine>();
|
||||||
|
AttributeInjector.Inject(cameraStateMachine.StateMachineContext, container);
|
||||||
|
cameraStateMachine.Initialize();
|
||||||
|
|
||||||
AttributeInjector.Inject(appStateMachine.StateMachineContext, container);
|
BootstrapFinish(container).Forget();
|
||||||
|
}
|
||||||
|
private async UniTaskVoid BootstrapFinish(Container container)
|
||||||
|
{
|
||||||
|
var loadingScreen = GameObject.FindWithTag(Tags.LoadingScreen).GetComponent<LoadingScreen>();
|
||||||
|
DontDestroyOnLoad(loadingScreen.gameObject);
|
||||||
|
|
||||||
appStateMachine
|
ILoadingManager loadingManager = container.Resolve<ILoadingManager>();
|
||||||
|
loadingManager.OnLoadingStarted += loadingScreen.Show;
|
||||||
|
loadingManager.OnLoadingEnded += loadingScreen.Hide;
|
||||||
|
|
||||||
|
loadingManager.RegisterLoading(LoadingWork.Bootstrap);
|
||||||
|
|
||||||
|
await UniTask.WhenAll(
|
||||||
|
container.Resolve<IUIService>().Initialize(loadingScreen),
|
||||||
|
container.Resolve<IAudioService>().Initialize()
|
||||||
|
);
|
||||||
|
|
||||||
|
loadingManager.UnregisterLoading(LoadingWork.Bootstrap);
|
||||||
|
|
||||||
|
_appStateMachine
|
||||||
.SwitchState(AppState.MainMenu)
|
.SwitchState(AppState.MainMenu)
|
||||||
.AllowStateTransition(AppState.Gameplay);
|
.AllowStateTransition(AppState.Gameplay);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,42 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Code.App.Debug
|
||||||
|
{
|
||||||
|
public class Logger : MonoBehaviour
|
||||||
|
{
|
||||||
|
//#if !UNITY_EDITOR
|
||||||
|
static string myLog = "";
|
||||||
|
private string output;
|
||||||
|
private string stack;
|
||||||
|
|
||||||
|
void OnEnable()
|
||||||
|
{
|
||||||
|
Application.logMessageReceived += Log;
|
||||||
|
}
|
||||||
|
|
||||||
|
void OnDisable()
|
||||||
|
{
|
||||||
|
Application.logMessageReceived -= Log;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Log(string logString, string stackTrace, LogType type)
|
||||||
|
{
|
||||||
|
output = logString;
|
||||||
|
stack = stackTrace;
|
||||||
|
myLog = output + " " + myLog;
|
||||||
|
if (myLog.Length > 5000)
|
||||||
|
{
|
||||||
|
myLog = myLog.Substring(0, 4000);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void OnGUI()
|
||||||
|
{
|
||||||
|
//if (!Application.isEditor) //Do not display in editor ( or you can use the UNITY_EDITOR macro to also disable the rest)
|
||||||
|
{
|
||||||
|
myLog = GUI.TextArea(new Rect(10, 10, Screen.width - 10, Screen.height - 10), myLog);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: dc474668ede54a9aa1e0f29c59f067f5
|
||||||
|
timeCreated: 1764915992
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 08b54658296d4279b85a2bfc3cf10e62
|
||||||
|
timeCreated: 1763842256
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
using System.Collections.ObjectModel;
|
||||||
|
using Cysharp.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace Code.App.Loading
|
||||||
|
{
|
||||||
|
public interface ILoadingManager
|
||||||
|
{
|
||||||
|
delegate void OnLoadingDelegate();
|
||||||
|
|
||||||
|
event OnLoadingDelegate OnLoadingStarted;
|
||||||
|
event OnLoadingDelegate OnLoadingEnded;
|
||||||
|
ReadOnlyCollection<LoadingWork> LoadingThings { get; }
|
||||||
|
LoadingManager RegisterLoading(LoadingWork loadingThingName);
|
||||||
|
LoadingManager UnregisterLoading(LoadingWork loadingThingName);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: bfb3837590d04da3b04ca8b0f0aca437
|
||||||
|
timeCreated: 1763842985
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Collections.ObjectModel;
|
||||||
|
using Cysharp.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace Code.App.Loading
|
||||||
|
{
|
||||||
|
public class LoadingManager : ILoadingManager
|
||||||
|
{
|
||||||
|
public event ILoadingManager.OnLoadingDelegate OnLoadingStarted;
|
||||||
|
public event ILoadingManager.OnLoadingDelegate OnLoadingEnded;
|
||||||
|
|
||||||
|
private List<LoadingWork> _loadingThings = new();
|
||||||
|
public ReadOnlyCollection<LoadingWork> LoadingThings => _loadingThings.AsReadOnly();
|
||||||
|
|
||||||
|
public LoadingManager RegisterLoading(LoadingWork loadingThingName)
|
||||||
|
{
|
||||||
|
if(_loadingThings.Count == 0) OnLoadingStarted?.Invoke();
|
||||||
|
|
||||||
|
_loadingThings.Add(loadingThingName);
|
||||||
|
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
public LoadingManager UnregisterLoading(LoadingWork loadingThingName)
|
||||||
|
{
|
||||||
|
_loadingThings.Remove(loadingThingName);
|
||||||
|
|
||||||
|
if(_loadingThings.Count == 0) OnLoadingEnded?.Invoke();
|
||||||
|
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// public static class LoadingManagerExtensions
|
||||||
|
// {
|
||||||
|
// public static LoadingManager AddLoading(this LoadingManager manager, LoadingWork loadingThingName)
|
||||||
|
// {
|
||||||
|
// manager.RegisterLoading(loadingThingName);
|
||||||
|
// return manager;
|
||||||
|
// }
|
||||||
|
// public static LoadingManager RemoveLoading(this LoadingManager manager, LoadingWork loadingThingName)
|
||||||
|
// {
|
||||||
|
// manager.UnregisterLoading(loadingThingName);
|
||||||
|
// return manager;
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 185988ac74a24a39864238cd7f5cb626
|
||||||
|
timeCreated: 1763842268
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
namespace Code.App.Loading
|
||||||
|
{
|
||||||
|
public enum LoadingWork
|
||||||
|
{
|
||||||
|
Bootstrap,
|
||||||
|
LoadUI,
|
||||||
|
LoadAudio,
|
||||||
|
LoadScene,
|
||||||
|
LoadModelResource,
|
||||||
|
WaitingForTime
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 318d1b29b41d4b96bc09334acbf36506
|
||||||
|
timeCreated: 1763843934
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: c7a271c6319540abb78d561f392e1396
|
||||||
|
timeCreated: 1761743570
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
using Code.App.Loading;
|
||||||
|
using Code.Gameplay.Enemies;
|
||||||
|
using Code.Gameplay.Orders.Order;
|
||||||
|
using Code.Gameplay.Player;
|
||||||
|
using Code.Generator;
|
||||||
|
using Code.Scenes;
|
||||||
|
using Code.Scenes.SceneEnvironments;
|
||||||
|
using Cysharp.Threading.Tasks;
|
||||||
|
using Reflex.Core;
|
||||||
|
using UnityEngine;
|
||||||
|
using IPlayerScore = Code.Gameplay.Player.IPlayerScore;
|
||||||
|
|
||||||
|
namespace Code.App.SceneInstallers
|
||||||
|
{
|
||||||
|
public class GameplaySceneInstaller : MonoBehaviour, IInstaller
|
||||||
|
{
|
||||||
|
[SerializeField] private GameplaySceneEnvironment _gameplaySceneEnvironment;
|
||||||
|
|
||||||
|
public void InstallBindings(ContainerBuilder containerBuilder)
|
||||||
|
{
|
||||||
|
containerBuilder.AddScoped(typeof(GameplaySceneEnvironment), typeof(CurrentSceneEnvironment));
|
||||||
|
containerBuilder.AddScoped(typeof(PlayerScore), typeof(IPlayerScore));
|
||||||
|
containerBuilder.AddScoped(typeof(OrderService), typeof(IOrderService));
|
||||||
|
containerBuilder.AddScoped(typeof(RoomGeneratorFactory), typeof(IRoomGeneratorFactory));
|
||||||
|
containerBuilder.AddScoped(typeof(PlayerProvider), typeof(IPlayerProvider));
|
||||||
|
containerBuilder.AddScoped(typeof(PlayerFactory), typeof(IPlayerFactory));
|
||||||
|
containerBuilder.AddScoped(typeof(EnemyFactory), typeof(IEnemyFactory));
|
||||||
|
containerBuilder.AddScoped(typeof(RoomGenerator));
|
||||||
|
|
||||||
|
containerBuilder.OnContainerBuilt += Initialize;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Initialize(Container container)
|
||||||
|
{
|
||||||
|
ILoadingManager loadingManager = container.Resolve<ILoadingManager>();
|
||||||
|
|
||||||
|
GameplaySceneEnvironment env = (GameplaySceneEnvironment)container.Resolve<CurrentSceneEnvironment>();
|
||||||
|
|
||||||
|
env.TransitVariables(_gameplaySceneEnvironment);
|
||||||
|
|
||||||
|
loadingManager
|
||||||
|
.UnregisterLoading(LoadingWork.LoadScene);
|
||||||
|
|
||||||
|
LoadRooms(container,loadingManager).Forget();
|
||||||
|
}
|
||||||
|
|
||||||
|
private async UniTaskVoid LoadRooms(Container container, ILoadingManager loadingManager)
|
||||||
|
{
|
||||||
|
await container.Resolve<IRoomGeneratorFactory>().PreloadRooms(container.Resolve<IOrderService>());
|
||||||
|
|
||||||
|
container.Resolve<RoomGenerator>().Initialize();
|
||||||
|
|
||||||
|
loadingManager.UnregisterLoading(LoadingWork.LoadModelResource);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 88584fd4361b46f6a7326440cd95ce69
|
||||||
|
timeCreated: 1763144580
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
using Code.App.Loading;
|
||||||
|
using Code.Scenes;
|
||||||
|
using Code.Scenes.SceneEnvironments;
|
||||||
|
using Reflex.Core;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Code.App.SceneInstallers
|
||||||
|
{
|
||||||
|
public class MainMenuSceneInstaller : MonoBehaviour, IInstaller
|
||||||
|
{
|
||||||
|
[SerializeField] private MainMenuEnvironment _mainMenuEnvironment;
|
||||||
|
|
||||||
|
public void InstallBindings(ContainerBuilder containerBuilder)
|
||||||
|
{
|
||||||
|
containerBuilder.AddScoped(typeof(MainMenuEnvironment), typeof(CurrentSceneEnvironment));
|
||||||
|
|
||||||
|
containerBuilder.OnContainerBuilt += Initialize;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Initialize(Container container)
|
||||||
|
{
|
||||||
|
MainMenuEnvironment env = (MainMenuEnvironment)container.Resolve<CurrentSceneEnvironment>();
|
||||||
|
|
||||||
|
env.TransitVariables(_mainMenuEnvironment);
|
||||||
|
|
||||||
|
ILoadingManager loadingManager = container.Resolve<ILoadingManager>();
|
||||||
|
|
||||||
|
loadingManager
|
||||||
|
.UnregisterLoading(LoadingWork.LoadScene);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 04145a046c584b66818ca25745652e66
|
||||||
|
timeCreated: 1761743587
|
||||||
@@ -8,6 +8,8 @@ namespace Code.App.StateMachine
|
|||||||
Bootstrap = 1,
|
Bootstrap = 1,
|
||||||
MainMenu = 2,
|
MainMenu = 2,
|
||||||
Gameplay = 4,
|
Gameplay = 4,
|
||||||
GameOver = 8
|
GameOver = 8,
|
||||||
|
// TODO: поменяно для теста
|
||||||
|
MovementDev = 52
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -7,12 +7,18 @@ namespace Code.App.StateMachine
|
|||||||
{
|
{
|
||||||
public override void Initialize()
|
public override void Initialize()
|
||||||
{
|
{
|
||||||
|
States.Add(AppState.Bootstrap, new BootstrapState(StateMachineContext));
|
||||||
States.Add(AppState.MainMenu, new MainMenuState(StateMachineContext));
|
States.Add(AppState.MainMenu, new MainMenuState(StateMachineContext));
|
||||||
States.Add(AppState.Gameplay, new GameplayState(StateMachineContext));
|
States.Add(AppState.Gameplay, new GameplayState(StateMachineContext));
|
||||||
States.Add(AppState.GameOver, new GameOverState(StateMachineContext));
|
States.Add(AppState.GameOver, new GameOverState(StateMachineContext));
|
||||||
|
//TODO: Для теста
|
||||||
|
States.Add(AppState.MovementDev, new MovementDevState(StateMachineContext));
|
||||||
|
|
||||||
AllowedStates |= AppState.MainMenu;
|
AllowedStates |= AppState.MainMenu;
|
||||||
AllowedStates |= AppState.Gameplay;
|
AllowedStates |= AppState.Gameplay;
|
||||||
|
AllowedStates |= AppState.MovementDev;
|
||||||
|
|
||||||
|
CurrentBaseState = States[AppState.Bootstrap];
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override bool CheckTransitionAllowed(AppState nextState) => AllowedStates.HasFlag(nextState);
|
protected override bool CheckTransitionAllowed(AppState nextState) => AllowedStates.HasFlag(nextState);
|
||||||
|
|||||||
@@ -1,12 +1,28 @@
|
|||||||
|
using Code.App.Loading;
|
||||||
|
using Code.Audio;
|
||||||
|
using Code.Gameplay.Camera;
|
||||||
|
using Code.Gameplay.Enemies;
|
||||||
|
using Code.Gameplay.Player;
|
||||||
|
using Code.Generator;
|
||||||
using Code.Input;
|
using Code.Input;
|
||||||
using Code.Scenes;
|
using Code.Scenes;
|
||||||
|
using Code.UI;
|
||||||
using Reflex.Attributes;
|
using Reflex.Attributes;
|
||||||
|
|
||||||
namespace Code.App.StateMachine
|
namespace Code.App.StateMachine
|
||||||
{
|
{
|
||||||
public class AppStateMachineContext
|
public class AppStateMachineContext
|
||||||
{
|
{
|
||||||
[Inject] public ISceneLoaderService SceneLoaderService;
|
[Inject] public ILoadingManager LoadingManager { get; private set; }
|
||||||
[Inject] public IInputService InputService;
|
[Inject] public ISceneLoaderService SceneLoaderService { get; private set; }
|
||||||
|
[Inject] public IInputService InputService { get; private set; }
|
||||||
|
[Inject] public AppStateMachine StateMachine { get; private set; }
|
||||||
|
[Inject] public CameraStateMachine CameraStateMachine { get; private set; }
|
||||||
|
[Inject] public IUIService UIService { get; private set; }
|
||||||
|
[Inject] public IAudioFactory AudioFactory { get; private set; }
|
||||||
|
[Inject] public IAudioService AudioService { get; private set; }
|
||||||
|
/*[Inject]*/public IPlayerFactory PlayerFactory { get; set; }
|
||||||
|
/*[Inject]*/public IPlayerProvider PlayerProvider { get; set; }
|
||||||
|
// [Inject] public IEnemyFactory EnemyFactory { get; private set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: a1937581573e47844bb593bd62310b89
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
namespace Code.Audio
|
||||||
|
{
|
||||||
|
public enum SFXSounds
|
||||||
|
{
|
||||||
|
}
|
||||||
|
public enum UISounds
|
||||||
|
{
|
||||||
|
}
|
||||||
|
public enum EnemiesSounds
|
||||||
|
{
|
||||||
|
GrandpaAttack,
|
||||||
|
GrandpaStep,
|
||||||
|
RoachAttack,
|
||||||
|
RoachStep
|
||||||
|
}
|
||||||
|
public enum DispatcherSounds
|
||||||
|
{
|
||||||
|
Recieve1,
|
||||||
|
Recieve2,
|
||||||
|
TakeDamage1,
|
||||||
|
TakeDamage2,
|
||||||
|
TakeDamage3,
|
||||||
|
TakeDamage4,
|
||||||
|
Late1,
|
||||||
|
Late2,
|
||||||
|
Late3,
|
||||||
|
Late4,
|
||||||
|
Late5
|
||||||
|
}
|
||||||
|
public enum CourierSounds
|
||||||
|
{
|
||||||
|
Step,
|
||||||
|
Damage1,
|
||||||
|
Damage2
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 907b506ceac843ebb509a8e5298af540
|
||||||
|
timeCreated: 1762888870
|
||||||
@@ -0,0 +1,225 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using Code.Configs;
|
||||||
|
using Cysharp.Threading.Tasks;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.AddressableAssets;
|
||||||
|
using UnityEngine.Audio;
|
||||||
|
using UnityEngine.ResourceManagement.AsyncOperations;
|
||||||
|
using Object = UnityEngine.Object;
|
||||||
|
|
||||||
|
namespace Code.Audio
|
||||||
|
{
|
||||||
|
public class AudioFactory : IAudioFactory
|
||||||
|
{
|
||||||
|
public AudioMixer AudioMixer { get; private set; }
|
||||||
|
private AssetReference _audioSourcePrefab;
|
||||||
|
|
||||||
|
private AssetReference[] _audioTestClipsReferences;
|
||||||
|
private AssetReference[] _peacefulSoundtrack;
|
||||||
|
private AssetReference[] _actionSoundtrack;
|
||||||
|
private AssetReference[] _deathSoundtrack;
|
||||||
|
private AssetReference[] _menuSoundtrack;
|
||||||
|
private AssetReference[] _SFX;
|
||||||
|
private AssetReference[] _enemies;
|
||||||
|
private AssetReference[] _dispatcher;
|
||||||
|
private AssetReference[] _courier;
|
||||||
|
|
||||||
|
private AsyncOperationHandle<IList<AudioClip>> _audioTestClipsHandle;
|
||||||
|
private AsyncOperationHandle<IList<AudioClip>> _menuMusicHandle;
|
||||||
|
private AsyncOperationHandle<IList<AudioClip>> _deathMusicHandle;
|
||||||
|
private AsyncOperationHandle<IList<AudioClip>> _actionMusicHandle;
|
||||||
|
private AsyncOperationHandle<IList<AudioClip>> _peacefulMusicHandle;
|
||||||
|
private AsyncOperationHandle<IList<AudioClip>> _SFXHandle;
|
||||||
|
private AsyncOperationHandle<IList<AudioClip>> _enemiesHandle;
|
||||||
|
private AsyncOperationHandle<IList<AudioClip>> _dispatcherHandle;
|
||||||
|
private AsyncOperationHandle<IList<AudioClip>> _courierHandle;
|
||||||
|
|
||||||
|
public Dictionary<AudioType, AudioClip> AudioTestClips { get; private set; } = new();
|
||||||
|
public Dictionary<MusicType, List<AudioClip>> MusicDictionary { get; private set; } = new();
|
||||||
|
public List<AudioClip> SFXAudios { get; private set; } = new();
|
||||||
|
public List<AudioClip> EnemiesAudios { get; private set; } = new();
|
||||||
|
public List<AudioClip> CourierAudios { get; private set; } = new();
|
||||||
|
public List<AudioClip> DispatcherAudios { get; private set; } = new();
|
||||||
|
|
||||||
|
public AudioFactory(AudioMixerConfig audioMixerConfig,
|
||||||
|
SoundtrackListConfig soundtrackListConfig,
|
||||||
|
SFXListConfig sfxListConfig,
|
||||||
|
EnemiesSoundListConfig enemiesSoundListConfig,
|
||||||
|
DispatcherSoundListConfig dispatcherSoundListConfig,
|
||||||
|
AudioTestClipsConfig audioTestClipsConfig,
|
||||||
|
CourierSoundListConfig courierSoundListConfig
|
||||||
|
)
|
||||||
|
{
|
||||||
|
AudioMixer = audioMixerConfig.audioMixerAsset;
|
||||||
|
_audioSourcePrefab = audioMixerConfig.audioSourcePrefab;
|
||||||
|
|
||||||
|
_peacefulSoundtrack = soundtrackListConfig.peacefulSoundtrack;
|
||||||
|
_actionSoundtrack = soundtrackListConfig.actionSoundtrack;
|
||||||
|
_deathSoundtrack = soundtrackListConfig.deathSoundtrack;
|
||||||
|
_menuSoundtrack = soundtrackListConfig.menuSoundtrack;
|
||||||
|
_SFX = sfxListConfig.SFX;
|
||||||
|
_enemies = enemiesSoundListConfig.enemies;
|
||||||
|
_dispatcher = dispatcherSoundListConfig.dispatcher;
|
||||||
|
_courier = courierSoundListConfig.courierSounds;
|
||||||
|
_audioTestClipsReferences = audioTestClipsConfig.audioTestClips;
|
||||||
|
|
||||||
|
MusicDictionary.Add(MusicType.Menu, new ());
|
||||||
|
MusicDictionary.Add(MusicType.Death, new ());
|
||||||
|
MusicDictionary.Add(MusicType.Action, new ());
|
||||||
|
MusicDictionary.Add(MusicType.Peaceful, new ());
|
||||||
|
}
|
||||||
|
|
||||||
|
public async UniTask LoadAudioSourcePrefab(Action<GameObject> callback) =>
|
||||||
|
callback?.Invoke(await Addressables.LoadAssetAsync<GameObject>(_audioSourcePrefab));
|
||||||
|
|
||||||
|
public async UniTask WarmGameplayMusic( )
|
||||||
|
{
|
||||||
|
_actionMusicHandle = Addressables.LoadAssetsAsync<AudioClip>(_actionSoundtrack, OnActionTrackLoaded, Addressables.MergeMode.Union);
|
||||||
|
_peacefulMusicHandle = Addressables.LoadAssetsAsync<AudioClip>(_peacefulSoundtrack, OnPeacefulTrackLoaded, Addressables.MergeMode.Union);
|
||||||
|
|
||||||
|
await UniTask.WhenAll(_actionMusicHandle.ToUniTask(), _peacefulMusicHandle.ToUniTask());
|
||||||
|
}
|
||||||
|
public void ReleaseActionMusic()
|
||||||
|
{
|
||||||
|
MusicDictionary[MusicType.Action].Clear();
|
||||||
|
_actionMusicHandle.Release();
|
||||||
|
}
|
||||||
|
public void ReleasePeacefulMusic()
|
||||||
|
{
|
||||||
|
MusicDictionary[MusicType.Peaceful].Clear();
|
||||||
|
_peacefulMusicHandle.Release();
|
||||||
|
}
|
||||||
|
public async UniTask WarmAudioTestClips( )
|
||||||
|
{
|
||||||
|
// _audioTestClipCounter = 0;
|
||||||
|
_audioTestClipsHandle = Addressables.LoadAssetsAsync<AudioClip>(_audioTestClipsReferences, OnAudioTestClipLoaded, Addressables.MergeMode.Union);
|
||||||
|
|
||||||
|
// foreach (var assetReference in _menuSoundtrack) MenuMusic.Add(await assetReference.LoadAssetAsync<AudioClip>());
|
||||||
|
var clips = (await _audioTestClipsHandle.ToUniTask()).ToList();
|
||||||
|
|
||||||
|
for (int i = 0; i < clips.Count; i++)
|
||||||
|
AudioTestClips[(AudioType)i] = clips[i];
|
||||||
|
}
|
||||||
|
public void ReleaseAudioTestClips()
|
||||||
|
{
|
||||||
|
AudioTestClips.Clear();
|
||||||
|
// foreach (var assetReference in _menuSoundtrack) assetReference.ReleaseAsset();
|
||||||
|
_audioTestClipsHandle.Release();
|
||||||
|
}
|
||||||
|
public async UniTask WarmMenuMusic( )
|
||||||
|
{
|
||||||
|
_menuMusicHandle = Addressables.LoadAssetsAsync<AudioClip>(_menuSoundtrack, OnMenuTrackLoaded, Addressables.MergeMode.Union);
|
||||||
|
// foreach (var assetReference in _menuSoundtrack) MenuMusic.Add(await assetReference.LoadAssetAsync<AudioClip>());
|
||||||
|
await _menuMusicHandle.ToUniTask();
|
||||||
|
}
|
||||||
|
public void ReleaseMenuMusic()
|
||||||
|
{
|
||||||
|
MusicDictionary[MusicType.Menu].Clear();
|
||||||
|
// foreach (var assetReference in _menuSoundtrack) assetReference.ReleaseAsset();
|
||||||
|
_menuMusicHandle.Release();
|
||||||
|
}
|
||||||
|
public async UniTask WarmCourier()
|
||||||
|
{
|
||||||
|
// _courierHandle = Addressables.LoadAssetsAsync<AudioClip>(_courier, OnCourierLoaded, Addressables.MergeMode.Union);
|
||||||
|
foreach (var assetReference in _courier) CourierAudios.Add(await Addressables.LoadAssetAsync<AudioClip>(assetReference));
|
||||||
|
// await _courierHandle.ToUniTask();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ReleaseCourier()
|
||||||
|
{
|
||||||
|
foreach (var assetReference in CourierAudios) Addressables.Release(assetReference);
|
||||||
|
CourierAudios.Clear();
|
||||||
|
// _courierHandle.Release();
|
||||||
|
}
|
||||||
|
public async UniTask WarmDeathMusic()
|
||||||
|
{
|
||||||
|
_deathMusicHandle = Addressables.LoadAssetsAsync<AudioClip>(_deathSoundtrack, OnDeathTrackLoaded, Addressables.MergeMode.Union);
|
||||||
|
await _deathMusicHandle.ToUniTask();
|
||||||
|
}
|
||||||
|
public void ReleaseDeathMusic()
|
||||||
|
{
|
||||||
|
MusicDictionary[MusicType.Death].Clear();
|
||||||
|
_deathMusicHandle.Release();
|
||||||
|
}
|
||||||
|
public async UniTask WarmSFX( )
|
||||||
|
{
|
||||||
|
_SFXHandle = Addressables.LoadAssetsAsync<AudioClip>(_SFX, OnSFXLoaded, Addressables.MergeMode.Union);
|
||||||
|
|
||||||
|
await _SFXHandle.ToUniTask();
|
||||||
|
|
||||||
|
}
|
||||||
|
public void ReleaseSFX()
|
||||||
|
{
|
||||||
|
SFXAudios.Clear();
|
||||||
|
_SFXHandle.Release();
|
||||||
|
}
|
||||||
|
public async UniTask WarmEnemies( )
|
||||||
|
{
|
||||||
|
_enemiesHandle = Addressables.LoadAssetsAsync<AudioClip>(_enemies, OnEnemiesLoaded, Addressables.MergeMode.Union);
|
||||||
|
|
||||||
|
await _enemiesHandle.ToUniTask();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ReleaseEnemies()
|
||||||
|
{
|
||||||
|
EnemiesAudios.Clear();
|
||||||
|
_enemiesHandle.Release();
|
||||||
|
}
|
||||||
|
|
||||||
|
public async UniTask WarmDispatcher( )
|
||||||
|
{
|
||||||
|
_dispatcherHandle = Addressables.LoadAssetsAsync<AudioClip>(_dispatcher, OnDispatcherLoaded, Addressables.MergeMode.Union);
|
||||||
|
|
||||||
|
await _dispatcherHandle.ToUniTask();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ReleaseDispatcher()
|
||||||
|
{
|
||||||
|
DispatcherAudios.Clear();
|
||||||
|
_dispatcherHandle.Release();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnMenuTrackLoaded(AudioClip audioClip)
|
||||||
|
{
|
||||||
|
MusicDictionary[MusicType.Menu].Add(audioClip);
|
||||||
|
}
|
||||||
|
private void OnDeathTrackLoaded(AudioClip audioClip)
|
||||||
|
{
|
||||||
|
MusicDictionary[MusicType.Death].Add(audioClip);
|
||||||
|
}
|
||||||
|
|
||||||
|
// private int _audioTestClipCounter;
|
||||||
|
private void OnAudioTestClipLoaded(AudioClip audioClip)
|
||||||
|
{
|
||||||
|
// AudioTestClips[(AudioType)_audioTestClipCounter] = audioClip;_audioTestClipCounter++;
|
||||||
|
}
|
||||||
|
private void OnActionTrackLoaded(AudioClip audioClip)
|
||||||
|
{
|
||||||
|
MusicDictionary[MusicType.Action].Add(audioClip);
|
||||||
|
}
|
||||||
|
private void OnPeacefulTrackLoaded(AudioClip audioClip)
|
||||||
|
{
|
||||||
|
MusicDictionary[MusicType.Peaceful].Add(audioClip);
|
||||||
|
}
|
||||||
|
private void OnSFXLoaded(AudioClip audioClip)
|
||||||
|
{
|
||||||
|
SFXAudios.Add(audioClip);
|
||||||
|
}
|
||||||
|
private void OnEnemiesLoaded(AudioClip audioClip)
|
||||||
|
{
|
||||||
|
EnemiesAudios.Add(audioClip);
|
||||||
|
}
|
||||||
|
private void OnDispatcherLoaded(AudioClip audioClip)
|
||||||
|
{
|
||||||
|
DispatcherAudios.Add(audioClip);
|
||||||
|
}
|
||||||
|
private void OnCourierLoaded(AudioClip audioClip)
|
||||||
|
{
|
||||||
|
CourierAudios.Add(audioClip);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5a4b48740d194d4dafa1732f96d71687
|
||||||
|
timeCreated: 1762626915
|
||||||
@@ -0,0 +1,260 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Threading;
|
||||||
|
using Code.Configs;
|
||||||
|
using Code.Constants;
|
||||||
|
using Cysharp.Threading.Tasks;
|
||||||
|
using DG.Tweening;
|
||||||
|
using Reflex.Attributes;
|
||||||
|
using Unity.VisualScripting;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.AddressableAssets;
|
||||||
|
using UnityEngine.Audio;
|
||||||
|
using Random = UnityEngine.Random;
|
||||||
|
|
||||||
|
namespace Code.Audio
|
||||||
|
{
|
||||||
|
public class AudioService : IAudioService
|
||||||
|
{
|
||||||
|
private IAudioFactory _audioFactory;
|
||||||
|
|
||||||
|
private AudioMixer _mixer;
|
||||||
|
private AudioSource _actionMusicSource;
|
||||||
|
private AudioSource _peacefulMusicSource;
|
||||||
|
|
||||||
|
private Dictionary<AudioType, AudioMixerGroup> _audioMixerGroups = new();
|
||||||
|
private readonly AudioSourcePool _audioSourcePool;
|
||||||
|
|
||||||
|
// Юнити не может - говнокод поможет.
|
||||||
|
private Dictionary<AudioSnapshotState, Dictionary<AudioType, float>> _snapshotsVolumes = new();
|
||||||
|
private Dictionary<AudioSourceType, AudioSourceSettingsConfig> _settings;
|
||||||
|
|
||||||
|
public AudioService(IAudioFactory audioFactory,
|
||||||
|
Dictionary<AudioSourceType, AudioSourceSettingsConfig> settings,
|
||||||
|
DefaultAudioSettingsConfig defaultAudioSettingsConfig)
|
||||||
|
{
|
||||||
|
_audioFactory = audioFactory;
|
||||||
|
_audioSourcePool = new(settings);
|
||||||
|
_settings = settings;
|
||||||
|
|
||||||
|
_snapshotsVolumes.Add(AudioSnapshotState.None,defaultAudioSettingsConfig.noneVolume);
|
||||||
|
_snapshotsVolumes.Add(AudioSnapshotState.Menu,defaultAudioSettingsConfig.menuVolume);
|
||||||
|
_snapshotsVolumes.Add(AudioSnapshotState.Action,defaultAudioSettingsConfig.actionVolume);
|
||||||
|
_snapshotsVolumes.Add(AudioSnapshotState.Peaceful,defaultAudioSettingsConfig.peacefulVolume);
|
||||||
|
}
|
||||||
|
|
||||||
|
public float GetSetting(AudioType type)
|
||||||
|
{
|
||||||
|
_mixer.GetFloat(_audioMixerGroups[type].name, out float value);
|
||||||
|
|
||||||
|
value = Mathf.Pow(10f, value / 20);
|
||||||
|
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ChangeSetting(AudioType type, float value)
|
||||||
|
{
|
||||||
|
float volume = Mathf.Log10(value) * 20;
|
||||||
|
switch (type)
|
||||||
|
{
|
||||||
|
case AudioType.DeathMusic:
|
||||||
|
case AudioType.Master:
|
||||||
|
_snapshotsVolumes[AudioSnapshotState.Menu][type] = value;
|
||||||
|
_snapshotsVolumes[AudioSnapshotState.Action][type] = value;
|
||||||
|
_snapshotsVolumes[AudioSnapshotState.Peaceful][type] = value;
|
||||||
|
_mixer.SetFloat(_audioMixerGroups[type].name, volume);
|
||||||
|
break;
|
||||||
|
case AudioType.ActionMusic:
|
||||||
|
_snapshotsVolumes[AudioSnapshotState.Action][type] = value;
|
||||||
|
_mixer.SetFloat(_audioMixerGroups[type].name, volume);
|
||||||
|
break;
|
||||||
|
case AudioType.PeacefulMusic:
|
||||||
|
_snapshotsVolumes[AudioSnapshotState.Peaceful][type] = value;
|
||||||
|
_mixer.SetFloat(_audioMixerGroups[type].name, volume);
|
||||||
|
break;
|
||||||
|
case AudioType.MenuMusic:
|
||||||
|
_snapshotsVolumes[AudioSnapshotState.Menu][type] = value;
|
||||||
|
_mixer.SetFloat(_audioMixerGroups[type].name, volume);
|
||||||
|
break;
|
||||||
|
case AudioType.SFX:
|
||||||
|
case AudioType.Dispatcher:
|
||||||
|
case AudioType.Courier:
|
||||||
|
case AudioType.Enemies:
|
||||||
|
_snapshotsVolumes[AudioSnapshotState.Action][type] = value;
|
||||||
|
_snapshotsVolumes[AudioSnapshotState.Peaceful][type] = value;
|
||||||
|
_mixer.SetFloat(_audioMixerGroups[type].name, volume);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async UniTask Initialize()
|
||||||
|
{
|
||||||
|
_mixer = _audioFactory.AudioMixer;
|
||||||
|
|
||||||
|
_musicAudioGroups.Add(MusicType.Menu, _mixer.FindMatchingGroups(AudioGroups.MenuMusicGroup)[0]);
|
||||||
|
_musicAudioGroups.Add(MusicType.Death, _mixer.FindMatchingGroups(AudioGroups.DeathMusicGroup)[0]);
|
||||||
|
_musicAudioGroups.Add(MusicType.Action, _mixer.FindMatchingGroups(AudioGroups.ActionMusicGroup)[0]);
|
||||||
|
_musicAudioGroups.Add(MusicType.Peaceful, _mixer.FindMatchingGroups(AudioGroups.PeacefulMusicGroup)[0]);
|
||||||
|
|
||||||
|
_cancellationTokenSources.Add(MusicType.Menu, new());
|
||||||
|
_cancellationTokenSources.Add(MusicType.Death, new());
|
||||||
|
_cancellationTokenSources.Add(MusicType.Action, new());
|
||||||
|
_cancellationTokenSources.Add(MusicType.Peaceful, new());
|
||||||
|
|
||||||
|
_musicAudioSources.Add(MusicType.Menu, null);
|
||||||
|
_musicAudioSources.Add(MusicType.Death, null);
|
||||||
|
_musicAudioSources.Add(MusicType.Action, null);
|
||||||
|
_musicAudioSources.Add(MusicType.Peaceful, null);
|
||||||
|
|
||||||
|
_audioMixerGroups.Add(AudioType.Master, _mixer.FindMatchingGroups(AudioGroups.MasterGroup)[0]);
|
||||||
|
_audioMixerGroups.Add(AudioType.SFX, _mixer.FindMatchingGroups(AudioGroups.SFXGroup)[0]);
|
||||||
|
_audioMixerGroups.Add(AudioType.Dispatcher, _mixer.FindMatchingGroups(AudioGroups.DispatcherMusicGroup)[0]);
|
||||||
|
_audioMixerGroups.Add(AudioType.Courier, _mixer.FindMatchingGroups(AudioGroups.CourierGroup)[0]);
|
||||||
|
_audioMixerGroups.Add(AudioType.Enemies, _mixer.FindMatchingGroups(AudioGroups.EnemiesGroup)[0]);
|
||||||
|
_audioMixerGroups.Add(AudioType.MenuMusic, _musicAudioGroups[MusicType.Menu]);
|
||||||
|
_audioMixerGroups.Add(AudioType.DeathMusic, _musicAudioGroups[MusicType.Death]);
|
||||||
|
_audioMixerGroups.Add(AudioType.ActionMusic, _musicAudioGroups[MusicType.Action]);
|
||||||
|
_audioMixerGroups.Add(AudioType.PeacefulMusic, _musicAudioGroups[MusicType.Peaceful]);
|
||||||
|
|
||||||
|
|
||||||
|
await _audioFactory.LoadAudioSourcePrefab(_audioSourcePool.Initialize);
|
||||||
|
}
|
||||||
|
|
||||||
|
private Dictionary<MusicType, CancellationTokenSource> _cancellationTokenSources = new();
|
||||||
|
private Dictionary<MusicType, AudioSource> _musicAudioSources = new();
|
||||||
|
private Dictionary<MusicType, AudioMixerGroup> _musicAudioGroups = new();
|
||||||
|
|
||||||
|
public async UniTaskVoid PlayRandomMusicUntilHumanityWillBeDestroyedForTheySins(MusicType musicType)
|
||||||
|
{
|
||||||
|
if (!_musicAudioSources[musicType])
|
||||||
|
{
|
||||||
|
_musicAudioSources[musicType] = _audioSourcePool.GetSource();
|
||||||
|
_musicAudioSources[musicType].spatialBlend = _settings[AudioSourceType.NoBlend].spatialBlend;
|
||||||
|
_musicAudioSources[musicType].outputAudioMixerGroup = _musicAudioGroups[musicType];
|
||||||
|
}
|
||||||
|
|
||||||
|
_musicAudioSources[musicType].resource =
|
||||||
|
_audioFactory.MusicDictionary[musicType][
|
||||||
|
Random.Range(0, _audioFactory.MusicDictionary[musicType].Count)];
|
||||||
|
|
||||||
|
_musicAudioSources[musicType].Play();
|
||||||
|
|
||||||
|
await UniTask.NextFrame();
|
||||||
|
var (isCanceled, _) = await UniTask.WaitUntilValueChanged(_musicAudioSources[musicType],
|
||||||
|
_ => !_musicAudioSources[musicType].isPlaying,
|
||||||
|
cancellationToken: _cancellationTokenSources[musicType].Token).SuppressCancellationThrow();
|
||||||
|
Debug.LogError("Music skipping");
|
||||||
|
if (isCanceled)
|
||||||
|
{
|
||||||
|
_cancellationTokenSources[musicType].Dispose();
|
||||||
|
_cancellationTokenSources[musicType] = new();
|
||||||
|
|
||||||
|
_audioSourcePool.ReleaseSource(_musicAudioSources[musicType]);
|
||||||
|
_musicAudioSources[musicType] = null;
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
PlayRandomMusicUntilHumanityWillBeDestroyedForTheySins(musicType).Forget();
|
||||||
|
}
|
||||||
|
|
||||||
|
public async UniTaskVoid GladlyAskToStopMusic(MusicType musicType,
|
||||||
|
AudioSnapshotState audioSnapshotState = AudioSnapshotState.None, float time = 1f, Action callback = null)
|
||||||
|
{
|
||||||
|
//TransitToSnapshot(audioSnapshotState, time);
|
||||||
|
|
||||||
|
await UniTask.WaitForSeconds(time);
|
||||||
|
|
||||||
|
_cancellationTokenSources[musicType].Cancel();
|
||||||
|
|
||||||
|
callback?.Invoke();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void StopMusic()
|
||||||
|
{
|
||||||
|
_peacefulMusicSource.Stop();
|
||||||
|
_actionMusicSource.Stop();
|
||||||
|
_cancellationTokenSources[MusicType.Peaceful].Cancel();
|
||||||
|
_cancellationTokenSources[MusicType.Action].Cancel();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void GladlyAskToStopMusic(Action callback = null)
|
||||||
|
{
|
||||||
|
// TransitToSnapshot(AudioSnapshotState.None);
|
||||||
|
_peacefulMusicSource.Stop();
|
||||||
|
_actionMusicSource.Stop();
|
||||||
|
|
||||||
|
callback?.Invoke();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void TransitToSnapshot(AudioSnapshotState state, float time = 1)
|
||||||
|
{
|
||||||
|
foreach (var key in _audioMixerGroups.Keys)
|
||||||
|
_mixer.DOSetFloat(_audioMixerGroups[key].name, Mathf.Log10(_snapshotsVolumes[state][key]) * 20, time);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public void PlaySFX(SFXSounds sfxId, Vector3 position)
|
||||||
|
{
|
||||||
|
_audioSourcePool
|
||||||
|
.PlayOneShot(_audioFactory.SFXAudios[(int)sfxId], position, _audioMixerGroups[AudioType.SFX]).Forget();
|
||||||
|
}
|
||||||
|
public void ApplyStun(float value, float time)
|
||||||
|
{
|
||||||
|
_mixer.DOSetFloat("Stun", value, time);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void PlayEnemy(EnemiesSounds enemySoundId, Vector3 position)
|
||||||
|
{
|
||||||
|
_audioSourcePool.PlayOneShot(_audioFactory.EnemiesAudios[(int)enemySoundId], position,
|
||||||
|
_audioMixerGroups[AudioType.Enemies]).Forget();
|
||||||
|
}
|
||||||
|
|
||||||
|
public AudioSource GetSourceOfGroup(AudioType group)
|
||||||
|
{
|
||||||
|
AudioSource source = _audioSourcePool.GetSource();
|
||||||
|
source.outputAudioMixerGroup = _audioMixerGroups[group];
|
||||||
|
return source;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ReleaseSourceOfGroup(AudioSource source) => _audioSourcePool.ReleaseSource(source);
|
||||||
|
|
||||||
|
// Чинить долго и дорого пусть Артёмов будет много, ведь он наш друг
|
||||||
|
public event IAudioService.OnAudioPlayingDelegate OnDispatcherStarted;
|
||||||
|
public event IAudioService.OnAudioPlayingDelegate OnDispatcherEnded;
|
||||||
|
|
||||||
|
public void PlayDispatcher(DispatcherSounds dispatcherSoundId)
|
||||||
|
{
|
||||||
|
OnDispatcherStarted?.Invoke();
|
||||||
|
_audioSourcePool.PlayOneShot(_audioFactory.DispatcherAudios[(int)dispatcherSoundId],
|
||||||
|
_audioMixerGroups[AudioType.Dispatcher],
|
||||||
|
AudioSourceType.NoBlend, () => OnDispatcherEnded?.Invoke()).Forget();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void PlayCourier(CourierSounds courierSounds)
|
||||||
|
{
|
||||||
|
_audioSourcePool.PlayOneShot(_audioFactory.CourierAudios[(int)courierSounds],
|
||||||
|
_audioMixerGroups[AudioType.Courier],
|
||||||
|
AudioSourceType.NoBlend).Forget();
|
||||||
|
}
|
||||||
|
private CancellationTokenSource _testClipCancellationTokenSource = new();
|
||||||
|
private void ResetCurrentTestAudioSource() => _currentTestClipAudioType = AudioType.Master;
|
||||||
|
|
||||||
|
private AudioType _currentTestClipAudioType;
|
||||||
|
|
||||||
|
// TODO Засунуть в словарь
|
||||||
|
public void PlayTestClip(AudioType audioType)
|
||||||
|
{
|
||||||
|
if (_currentTestClipAudioType == audioType) return;
|
||||||
|
|
||||||
|
_testClipCancellationTokenSource.Cancel();
|
||||||
|
_testClipCancellationTokenSource = new();
|
||||||
|
|
||||||
|
_currentTestClipAudioType = audioType;
|
||||||
|
|
||||||
|
_audioSourcePool.PlayOneShot(_audioFactory.AudioTestClips[audioType],
|
||||||
|
_audioMixerGroups[audioType], _testClipCancellationTokenSource,
|
||||||
|
AudioSourceType.NoBlend, ResetCurrentTestAudioSource).Forget();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: bf44cb051308463494bd930f2a3d31e4
|
||||||
|
timeCreated: 1762625073
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
namespace Code.Audio
|
||||||
|
{
|
||||||
|
public enum AudioSnapshotState
|
||||||
|
{
|
||||||
|
None,
|
||||||
|
Peaceful,
|
||||||
|
Action,
|
||||||
|
Menu
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 29adaf8e912649d9b91c09735e36840a
|
||||||
|
timeCreated: 1762808301
|
||||||
@@ -0,0 +1,121 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Threading;
|
||||||
|
using Code.Configs;
|
||||||
|
using Cysharp.Threading.Tasks;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.Audio;
|
||||||
|
using UnityEngine.Pool;
|
||||||
|
using Object = UnityEngine.Object;
|
||||||
|
|
||||||
|
namespace Code.Audio
|
||||||
|
{
|
||||||
|
public class AudioSourcePool
|
||||||
|
{
|
||||||
|
// The pool holds plain GameObjects (you can swap this for any component type).
|
||||||
|
private IObjectPool<AudioSource> _pool;
|
||||||
|
private GameObject _sourcePrefab;
|
||||||
|
|
||||||
|
private Dictionary<AudioSourceType, AudioSourceSettingsConfig> _settings;
|
||||||
|
|
||||||
|
public AudioSourcePool(Dictionary<AudioSourceType, AudioSourceSettingsConfig> settings) => _settings = settings;
|
||||||
|
|
||||||
|
public void Initialize(GameObject sourcePrefab)
|
||||||
|
{
|
||||||
|
_sourcePrefab = sourcePrefab;
|
||||||
|
|
||||||
|
// Create a pool with the four core callbacks.
|
||||||
|
_pool = new ObjectPool<AudioSource>(
|
||||||
|
createFunc: CreateItem,
|
||||||
|
// actionOnGet: OnGet,
|
||||||
|
actionOnRelease: OnRelease,
|
||||||
|
actionOnDestroy: OnDestroyItem,
|
||||||
|
collectionCheck: true, // helps catch double-release mistakes
|
||||||
|
defaultCapacity: 10,
|
||||||
|
maxSize: 20
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Creates a new pooled GameObject the first time (and whenever the pool needs more).
|
||||||
|
private AudioSource CreateItem()
|
||||||
|
{
|
||||||
|
AudioSource audioSource = Object.Instantiate(_sourcePrefab).GetComponent<AudioSource>();
|
||||||
|
audioSource.name = "PooledAudioSource";
|
||||||
|
Object.DontDestroyOnLoad(audioSource);
|
||||||
|
return audioSource;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Called when an item is taken from the pool.
|
||||||
|
private void OnGet(AudioSource source)
|
||||||
|
{
|
||||||
|
//source.gameObject.SetActive(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Called when an item is returned to the pool.
|
||||||
|
private void OnRelease(AudioSource source)
|
||||||
|
{
|
||||||
|
source.Stop();
|
||||||
|
//source.gameObject.SetActive(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Called when the pool decides to destroy an item (e.g., above max size).
|
||||||
|
private void OnDestroyItem(AudioSource source)
|
||||||
|
{
|
||||||
|
Object.Destroy(source.gameObject);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async UniTaskVoid PlayOneShot(AudioClip clip, Vector3 position, AudioMixerGroup audioMixerGroup, AudioSourceType audioSourceType = AudioSourceType.NoBlend, Action onComplete = null)
|
||||||
|
{
|
||||||
|
AudioSource source = _pool.Get();
|
||||||
|
source.PlayOneShot(clip);
|
||||||
|
source.spatialBlend = _settings[audioSourceType].spatialBlend;
|
||||||
|
source.transform.position = position;
|
||||||
|
source.outputAudioMixerGroup = audioMixerGroup;
|
||||||
|
|
||||||
|
await UniTask.WaitUntilValueChanged(source, x => x.isPlaying);
|
||||||
|
onComplete?.Invoke();
|
||||||
|
_pool.Release(source);
|
||||||
|
}
|
||||||
|
public async UniTaskVoid PlayOneShot(AudioClip clip, AudioMixerGroup audioMixerGroup, AudioSourceType audioSourceType = AudioSourceType.NoBlend, Action onComplete = null)
|
||||||
|
{
|
||||||
|
AudioSource source = _pool.Get();
|
||||||
|
source.PlayOneShot(clip);
|
||||||
|
source.spatialBlend = _settings[audioSourceType].spatialBlend;
|
||||||
|
source.outputAudioMixerGroup = audioMixerGroup;
|
||||||
|
|
||||||
|
await UniTask.WaitUntilValueChanged(source, x => x.isPlaying);
|
||||||
|
onComplete?.Invoke();
|
||||||
|
_pool.Release(source);
|
||||||
|
}
|
||||||
|
public async UniTaskVoid PlayOneShot(AudioSource audioSource, AudioClip clip, AudioMixerGroup audioMixerGroup, AudioSourceType audioSourceType = AudioSourceType.NoBlend, Action onComplete = null)
|
||||||
|
{
|
||||||
|
audioSource.PlayOneShot(clip);
|
||||||
|
audioSource.spatialBlend = _settings[audioSourceType].spatialBlend;
|
||||||
|
audioSource.outputAudioMixerGroup = audioMixerGroup;
|
||||||
|
|
||||||
|
// TODO Потом сделать. Можно с cancellation, но сейчас лень. Ну правда
|
||||||
|
await UniTask.WaitUntilValueChanged(audioSource, x => x.isPlaying);
|
||||||
|
|
||||||
|
if (!audioSource) return;
|
||||||
|
|
||||||
|
_pool.Release(audioSource);
|
||||||
|
onComplete?.Invoke();
|
||||||
|
}
|
||||||
|
public async UniTaskVoid PlayOneShot(AudioClip clip, AudioMixerGroup audioMixerGroup, CancellationTokenSource cancellationToken, AudioSourceType audioSourceType = AudioSourceType.NoBlend, Action onComplete = null)
|
||||||
|
{
|
||||||
|
AudioSource source = _pool.Get();
|
||||||
|
source.PlayOneShot(clip);
|
||||||
|
source.spatialBlend = _settings[audioSourceType].spatialBlend;
|
||||||
|
source.outputAudioMixerGroup = audioMixerGroup;
|
||||||
|
|
||||||
|
var (isCanceled, _) = await UniTask.WaitUntilValueChanged(source, x => x.isPlaying, cancellationToken: cancellationToken.Token).SuppressCancellationThrow();
|
||||||
|
|
||||||
|
_pool.Release(source);
|
||||||
|
|
||||||
|
if(!isCanceled) onComplete?.Invoke();
|
||||||
|
else cancellationToken.Dispose();
|
||||||
|
}
|
||||||
|
public AudioSource GetSource() => _pool.Get();
|
||||||
|
public void ReleaseSource(AudioSource source) => _pool.Release(source);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 370b6a43a74744ff9d90a99991b104f7
|
||||||
|
timeCreated: 1762852042
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
namespace Code.Audio
|
||||||
|
{
|
||||||
|
public enum AudioSourceType
|
||||||
|
{
|
||||||
|
Full3D,
|
||||||
|
NoBlend
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 260bbb19b55049928b9ab4d55b32fc3f
|
||||||
|
timeCreated: 1763849966
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using Cysharp.Threading.Tasks;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.Audio;
|
||||||
|
|
||||||
|
namespace Code.Audio
|
||||||
|
{
|
||||||
|
public interface IAudioFactory
|
||||||
|
{
|
||||||
|
AudioMixer AudioMixer { get; }
|
||||||
|
Dictionary<AudioType, AudioClip> AudioTestClips { get; }
|
||||||
|
Dictionary<MusicType, List<AudioClip>> MusicDictionary { get; }
|
||||||
|
List<AudioClip> SFXAudios { get; }
|
||||||
|
List<AudioClip> EnemiesAudios { get; }
|
||||||
|
List<AudioClip> DispatcherAudios { get; }
|
||||||
|
List<AudioClip> CourierAudios { get; }
|
||||||
|
UniTask LoadAudioSourcePrefab(Action<GameObject> callback);
|
||||||
|
UniTask WarmGameplayMusic( );
|
||||||
|
void ReleaseActionMusic();
|
||||||
|
void ReleasePeacefulMusic();
|
||||||
|
UniTask WarmAudioTestClips( );
|
||||||
|
void ReleaseAudioTestClips();
|
||||||
|
UniTask WarmMenuMusic( );
|
||||||
|
void ReleaseMenuMusic();
|
||||||
|
UniTask WarmSFX( );
|
||||||
|
void ReleaseSFX();
|
||||||
|
UniTask WarmEnemies( );
|
||||||
|
void ReleaseEnemies();
|
||||||
|
UniTask WarmDispatcher( );
|
||||||
|
void ReleaseDispatcher();
|
||||||
|
UniTask WarmCourier();
|
||||||
|
void ReleaseCourier();
|
||||||
|
UniTask WarmDeathMusic( );
|
||||||
|
void ReleaseDeathMusic();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ea837e1ca08a4846b7f4ce2df771bf65
|
||||||
|
timeCreated: 1762804793
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
using System;
|
||||||
|
using Cysharp.Threading.Tasks;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Code.Audio
|
||||||
|
{
|
||||||
|
public interface IAudioService
|
||||||
|
{
|
||||||
|
UniTask Initialize();
|
||||||
|
UniTaskVoid PlayRandomMusicUntilHumanityWillBeDestroyedForTheySins(MusicType musicType);
|
||||||
|
UniTaskVoid GladlyAskToStopMusic(MusicType musicType, AudioSnapshotState audioSnapshotState = AudioSnapshotState.None, float time = 1f, Action callback = null);
|
||||||
|
void StopMusic();
|
||||||
|
void GladlyAskToStopMusic(Action callback = null);
|
||||||
|
void TransitToSnapshot(AudioSnapshotState state, float time = 1f);
|
||||||
|
void PlaySFX(SFXSounds sfxId, Vector3 position);
|
||||||
|
void PlayEnemy(EnemiesSounds enemySoundId, Vector3 position);
|
||||||
|
|
||||||
|
delegate void OnAudioPlayingDelegate();
|
||||||
|
|
||||||
|
event OnAudioPlayingDelegate OnDispatcherStarted;
|
||||||
|
event OnAudioPlayingDelegate OnDispatcherEnded;
|
||||||
|
void PlayDispatcher(DispatcherSounds dispatcherSoundId);
|
||||||
|
void ChangeSetting(AudioType type, float value);
|
||||||
|
float GetSetting(AudioType type);
|
||||||
|
void PlayTestClip(AudioType audioType);
|
||||||
|
AudioSource GetSourceOfGroup(AudioType group);
|
||||||
|
void ReleaseSourceOfGroup(AudioSource source);
|
||||||
|
void PlayCourier(CourierSounds range);
|
||||||
|
void ApplyStun(float value, float time);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 30521fadcce84848ae88363e915bceb4
|
||||||
|
timeCreated: 1762804728
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
namespace Code.Audio
|
||||||
|
{
|
||||||
|
public enum MusicType
|
||||||
|
{
|
||||||
|
Menu,
|
||||||
|
Peaceful,
|
||||||
|
Action,
|
||||||
|
Death
|
||||||
|
}
|
||||||
|
public enum AudioType
|
||||||
|
{
|
||||||
|
Master,
|
||||||
|
MenuMusic,
|
||||||
|
Dispatcher,
|
||||||
|
SFX,
|
||||||
|
Courier,
|
||||||
|
Enemies,
|
||||||
|
ActionMusic,
|
||||||
|
PeacefulMusic,
|
||||||
|
DeathMusic
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 74ff08d5f1b741f69e37fc06fb07ae8d
|
||||||
|
timeCreated: 1763151897
|
||||||
@@ -2,7 +2,7 @@ using UnityEngine;
|
|||||||
|
|
||||||
namespace Code.Configs
|
namespace Code.Configs
|
||||||
{
|
{
|
||||||
[CreateAssetMenu(menuName = "Config/AppConfig", fileName = "AppConfig")]
|
[CreateAssetMenu(menuName = "Config/App", fileName = "AppConfig")]
|
||||||
public class AppConfig : ScriptableObject
|
public class AppConfig : ScriptableObject
|
||||||
{
|
{
|
||||||
public GameObject infrastructureUnitPrefab;
|
public GameObject infrastructureUnitPrefab;
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.AddressableAssets;
|
||||||
|
using UnityEngine.Audio;
|
||||||
|
|
||||||
|
namespace Code.Configs
|
||||||
|
{
|
||||||
|
[CreateAssetMenu(menuName = "Config/Audio/Mixer", fileName = "AudioMixerConfig")]
|
||||||
|
public class AudioMixerConfig : ScriptableObject
|
||||||
|
{
|
||||||
|
public AudioMixer audioMixerAsset;
|
||||||
|
public AssetReference audioSourcePrefab;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 353cee8946ca43efbbcda905d7b32ae1
|
||||||
|
timeCreated: 1762624627
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
using Code.Audio;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Code.Configs
|
||||||
|
{
|
||||||
|
[CreateAssetMenu(fileName = "AudioSourceSettingsConfig", menuName = "Audio/AudioSourceSettingsConfig")]
|
||||||
|
public class AudioSourceSettingsConfig : ScriptableObject
|
||||||
|
{
|
||||||
|
// Дополнять по мере необходимости
|
||||||
|
public float spatialBlend;
|
||||||
|
|
||||||
|
public AudioSourceType sourceType;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: e6406ab390b74d5ca336d7d4d0e1a732
|
||||||
|
timeCreated: 1763850008
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.AddressableAssets;
|
||||||
|
|
||||||
|
namespace Code.Configs
|
||||||
|
{
|
||||||
|
[CreateAssetMenu(menuName = "Config/Audio/AudioTestClips", fileName = "AudioTestClipsConfig")]
|
||||||
|
public class AudioTestClipsConfig : ScriptableObject
|
||||||
|
{
|
||||||
|
public AssetReference[] audioTestClips;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f2f1c08a20a54a708336caf8ca6499e1
|
||||||
|
timeCreated: 1764263243
|
||||||
Loaded 100 of 1633 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user