Compare commits
14
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6148889fc1 | ||
|
|
7538ce81af | ||
|
|
a198d7fc00 | ||
|
|
7114f1136c | ||
|
|
5bf468673f | ||
|
|
9a3743988d | ||
|
|
e6879076a3 | ||
|
|
487331dc10 | ||
|
|
bada54c828 | ||
|
|
ff095526bd | ||
|
|
ee7771acd9 | ||
|
|
bd0cee77a6 | ||
|
|
8981457f2d | ||
|
|
86c9c126a6 |
No files matched your search
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 1f868f0def2d055488f673e6c72e2da4
|
guid: 65cf716f111fb36a19123f807ecdce25
|
||||||
folderAsset: yes
|
folderAsset: yes
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
@@ -0,0 +1,115 @@
|
|||||||
|
%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: 44f191e9f235d5420c20a51f93ead7da
|
||||||
|
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:
|
||||||
|
m_CustomContentStateBuildPath:
|
||||||
|
m_ContentStateBuildPath:
|
||||||
|
m_BuildAddressablesWithPlayerBuild: 0
|
||||||
|
m_overridePlayerVersion: '[UnityEditor.PlayerSettings.bundleVersion]'
|
||||||
|
m_GroupAssets:
|
||||||
|
- {fileID: 11400000, guid: 7c592a6445170e8379910601b962cb30, 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:
|
||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 1f868f0def2d055488f673e6c72e2da4
|
guid: 1ac379942ee61a312a9830cb792d2871
|
||||||
folderAsset: yes
|
folderAsset: yes
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
@@ -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:
|
||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 734be7954ca5a7a9cab22ef4e61eef29
|
guid: a39981dbe6de5001397f5ca9a8a37e1a
|
||||||
folderAsset: yes
|
folderAsset: yes
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
%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_ReadOnly: 0
|
||||||
|
m_Settings: {fileID: 11400000, guid: 2588e84eb64800d0781c574a37fa48d8, type: 2}
|
||||||
|
m_SchemaSet:
|
||||||
|
m_Schemas:
|
||||||
|
- {fileID: 11400000, guid: 75ffac7db08d9615c994048949431551, type: 2}
|
||||||
|
- {fileID: 11400000, guid: 6d6fed27b8c8a3eebb9bc5289b7a6956, type: 2}
|
||||||
+8
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 7c592a6445170e8379910601b962cb30
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 83c90ca1cd4ab13218311ab54352265c
|
guid: 25c8e3b4ddb778a6d84ae525564a7ee1
|
||||||
folderAsset: yes
|
folderAsset: yes
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
+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: 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,38 @@
|
|||||||
|
using Code.App.StateMachine;
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
|
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
|
||||||
@@ -2,10 +2,9 @@ using Code.App.StateMachine;
|
|||||||
using Code.Configs;
|
using Code.Configs;
|
||||||
using Code.Input;
|
using Code.Input;
|
||||||
using Code.Scenes;
|
using Code.Scenes;
|
||||||
using Configs;
|
using Code.StaticData;
|
||||||
using Reflex.Core;
|
using Reflex.Core;
|
||||||
using Reflex.Injectors;
|
using Reflex.Injectors;
|
||||||
using StaticData;
|
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.InputSystem;
|
using UnityEngine.InputSystem;
|
||||||
|
|
||||||
@@ -30,7 +29,7 @@ namespace Code.App
|
|||||||
{
|
{
|
||||||
GameObject infrastructureUnit = Instantiate(staticDataService.AppConfig.infrastructureUnitPrefab);
|
GameObject infrastructureUnit = Instantiate(staticDataService.AppConfig.infrastructureUnitPrefab);
|
||||||
DontDestroyOnLoad(infrastructureUnit);
|
DontDestroyOnLoad(infrastructureUnit);
|
||||||
AppConfig a;
|
|
||||||
containerBuilder.AddSingleton(infrastructureUnit);
|
containerBuilder.AddSingleton(infrastructureUnit);
|
||||||
containerBuilder.AddSingleton(infrastructureUnit.GetComponent<ICoroutineRunner>(),
|
containerBuilder.AddSingleton(infrastructureUnit.GetComponent<ICoroutineRunner>(),
|
||||||
typeof(ICoroutineRunner));
|
typeof(ICoroutineRunner));
|
||||||
@@ -53,9 +52,9 @@ namespace Code.App
|
|||||||
|
|
||||||
AttributeInjector.Inject(appStateMachine.StateMachineContext, container);
|
AttributeInjector.Inject(appStateMachine.StateMachineContext, container);
|
||||||
|
|
||||||
|
// TODO: поменяно для теста
|
||||||
appStateMachine
|
appStateMachine
|
||||||
.SwitchState(AppState.MainMenu)
|
.SwitchState(AppState.MovementDev);
|
||||||
.AllowStateTransition(AppState.Gameplay);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -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
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -10,9 +10,12 @@ namespace Code.App.StateMachine
|
|||||||
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override bool CheckTransitionAllowed(AppState nextState) => AllowedStates.HasFlag(nextState);
|
protected override bool CheckTransitionAllowed(AppState nextState) => AllowedStates.HasFlag(nextState);
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
using Generators;
|
|
||||||
using UnityEngine;
|
|
||||||
|
|
||||||
namespace Code.Configs
|
|
||||||
{
|
|
||||||
[SingleConfig]
|
|
||||||
public class App
|
|
||||||
{
|
|
||||||
[ToConfig] public GameObject infrastructureUnitPrefab;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Code.Configs
|
||||||
|
{
|
||||||
|
[CreateAssetMenu(menuName = "Config/AppConfig", fileName = "AppConfig")]
|
||||||
|
public class AppConfig : ScriptableObject
|
||||||
|
{
|
||||||
|
public GameObject infrastructureUnitPrefab;
|
||||||
|
}
|
||||||
|
}
|
||||||
File renamed without changes.
@@ -0,0 +1,38 @@
|
|||||||
|
using Code.Gameplay.Character.Core;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Code.Configs
|
||||||
|
{
|
||||||
|
[CreateAssetMenu(fileName = "CharacterCameraConfig", menuName = "Config/CharacterCameraConfig")]
|
||||||
|
public class CharacterCameraConfig : ScriptableObject
|
||||||
|
{
|
||||||
|
public float
|
||||||
|
// Расстояния от персонажа до камеры
|
||||||
|
defaultDistance = 6f, // Стандартное расстояние камеры от цели
|
||||||
|
minDistance = 3f, // Минимальное расстояние при зуме
|
||||||
|
maxDistance = 10f, // Максимальное расстояние при зуме
|
||||||
|
|
||||||
|
// Скорость зума камеры
|
||||||
|
distanceMovementSpeed = 5f, // Множитель скорости изменения дистанции при зуме
|
||||||
|
|
||||||
|
// Скорость поворота камеры
|
||||||
|
rotationSpeed = 0.3f, // Множитель скорости вращения камеры
|
||||||
|
|
||||||
|
// Скорость интерполяции текущее -> целевое вращение
|
||||||
|
rotationSharpness = 100f, // Коэффициент плавности вращения камеры (чем выше - тем резче)
|
||||||
|
|
||||||
|
// Резкость следования камеры за целью
|
||||||
|
followSharpness = 100f, // Коэффициент плавности следования за движущейся целью (чем выше - тем резче)
|
||||||
|
|
||||||
|
// Углы наклона камеры
|
||||||
|
minVerticalAngle = -70f, // Минимальный угол наклона камеры (вниз)
|
||||||
|
maxVerticalAngle = 70f, // Максимальный угол наклона камеры (вверх)
|
||||||
|
defaultVerticalAngle = 10f; // Стандартный угол наклона камеры
|
||||||
|
|
||||||
|
// Текущий режим камеры
|
||||||
|
public CameraMode defaultCameraMode = CameraMode.MainMenu;
|
||||||
|
|
||||||
|
// Позиция следования по умолчанию (для меню)
|
||||||
|
public Vector3 defaultFollowPosition = Vector3.zero;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 72fbf590e5fd4747acfdd32eb26bba3a
|
||||||
|
timeCreated: 1761637489
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
using Generators;
|
|
||||||
using UnityEngine.InputSystem;
|
|
||||||
|
|
||||||
namespace Code.Configs
|
|
||||||
{
|
|
||||||
[SingleConfig]
|
|
||||||
public class Input
|
|
||||||
{
|
|
||||||
[ToConfig] public InputActionAsset inputActionAsset;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.InputSystem;
|
||||||
|
|
||||||
|
namespace Code.Configs
|
||||||
|
{
|
||||||
|
[CreateAssetMenu(fileName = "InputConfig", menuName = "Config/InputConfig")]
|
||||||
|
public class InputConfig : ScriptableObject
|
||||||
|
{
|
||||||
|
public InputActionAsset inputActionAsset;
|
||||||
|
}
|
||||||
|
}
|
||||||
File renamed without changes.
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: e4901b413afd4d7da914edf2a1e51f8f
|
||||||
|
timeCreated: 1760627936
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f8a8f6d0b8744b4c981d87722e6bb7e8
|
||||||
|
timeCreated: 1760627963
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b36ec6a31fb74d608232394fd5df657c
|
||||||
|
timeCreated: 1761570832
|
||||||
@@ -0,0 +1,215 @@
|
|||||||
|
using System;
|
||||||
|
using Code.Gameplay.Character.Core;
|
||||||
|
using Code.StaticData;
|
||||||
|
using Reflex.Attributes;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Code.Gameplay.Character.Camera
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* Скрипт, отвечающий за поведение камеры при передвижении
|
||||||
|
* Поддерживает как 3rd-person, так и 1st-person режимы камеры
|
||||||
|
* Реализует плавное следование за персонажем, вращение и зум камеры
|
||||||
|
*
|
||||||
|
* Источник: Tvtig, https://www.youtube.com/watch?v=9ibpY64wBYM
|
||||||
|
*/
|
||||||
|
public class CharacterCamera : MonoBehaviour
|
||||||
|
{
|
||||||
|
// Параметры загружаются из CharacterCameraConfig
|
||||||
|
private float
|
||||||
|
_defaultDistance,
|
||||||
|
_minDistance,
|
||||||
|
_maxDistance,
|
||||||
|
_distanceMovementSpeed,
|
||||||
|
_rotationSpeed,
|
||||||
|
_rotationSharpness,
|
||||||
|
_followSharpness,
|
||||||
|
_minVerticalAngle,
|
||||||
|
_maxVerticalAngle,
|
||||||
|
_defaultVerticalAngle;
|
||||||
|
|
||||||
|
// Трансформ объекта, за которым следует камера (для 1st-person: уровень глаз)
|
||||||
|
private Transform _followTransform;
|
||||||
|
|
||||||
|
// Позиция следования: текущая сглаженная позиция и горизонтальное направление камеры
|
||||||
|
private Vector3 _currentFollowPosition;
|
||||||
|
|
||||||
|
// Fallback-позиция для режимов без цели (например, MainMenu)
|
||||||
|
private Vector3 _defaultFollowPosition;
|
||||||
|
|
||||||
|
// Целевой вертикальный угол камеры (наклон вверх/вниз)
|
||||||
|
private float _targetVerticalAngle;
|
||||||
|
|
||||||
|
// Текущая и целевая дистанция камеры от цели
|
||||||
|
private float _currentDistance, _targetDistance;
|
||||||
|
|
||||||
|
// Исходные значения дистанции для восстановления после FirstPerson режима
|
||||||
|
private float _originalDefaultDistance, _originalMinDistance, _originalMaxDistance;
|
||||||
|
|
||||||
|
// Горизонтальное направление камеры (проекция forward на плоскость)
|
||||||
|
public Vector3 PlanarDirection { get; private set; }
|
||||||
|
|
||||||
|
// Текущий режим работы камеры
|
||||||
|
public CameraMode CurrentMode { get; private set; }
|
||||||
|
|
||||||
|
// DI для загрузки конфига
|
||||||
|
[Inject] private IStaticDataService _staticDataService;
|
||||||
|
|
||||||
|
// Загрузка конфига для камеры
|
||||||
|
private void LoadConfig()
|
||||||
|
{
|
||||||
|
// Загрузка значений из конфигов
|
||||||
|
var config = _staticDataService.CharacterCameraConfig;
|
||||||
|
|
||||||
|
_defaultDistance = config.defaultDistance;
|
||||||
|
_minDistance = config.minDistance;
|
||||||
|
_maxDistance = config.maxDistance;
|
||||||
|
_distanceMovementSpeed = config.distanceMovementSpeed;
|
||||||
|
_rotationSpeed = config.rotationSpeed;
|
||||||
|
_rotationSharpness = config.rotationSharpness;
|
||||||
|
_followSharpness = config.followSharpness;
|
||||||
|
_minVerticalAngle = config.minVerticalAngle;
|
||||||
|
_maxVerticalAngle = config.maxVerticalAngle;
|
||||||
|
_defaultVerticalAngle = config.defaultVerticalAngle;
|
||||||
|
CurrentMode = config.defaultCameraMode;
|
||||||
|
_defaultFollowPosition = config.defaultFollowPosition;
|
||||||
|
|
||||||
|
// Валидация значений (на случай ручного редактирования конфига)
|
||||||
|
_defaultDistance = Mathf.Clamp(_defaultDistance, _minDistance, _maxDistance);
|
||||||
|
_defaultVerticalAngle = Mathf.Clamp(_defaultVerticalAngle, _minVerticalAngle, _maxVerticalAngle);
|
||||||
|
|
||||||
|
// Сохраняем оригинальные значения для восстановления
|
||||||
|
_originalDefaultDistance = _defaultDistance;
|
||||||
|
_originalMinDistance = _minDistance;
|
||||||
|
_originalMaxDistance = _maxDistance;
|
||||||
|
|
||||||
|
// Инициализация состояния камеры
|
||||||
|
_currentDistance = _defaultDistance;
|
||||||
|
_targetDistance = _currentDistance;
|
||||||
|
_targetVerticalAngle = _defaultVerticalAngle;
|
||||||
|
PlanarDirection = Vector3.forward; // Начальное направление - вперед по оси Z
|
||||||
|
_currentFollowPosition = _defaultFollowPosition;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Инициализация камеры при создании
|
||||||
|
private void Awake()
|
||||||
|
{
|
||||||
|
LoadConfig();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Установка цели для следования камеры
|
||||||
|
public void SetFollowTransform(Transform t)
|
||||||
|
{
|
||||||
|
_followTransform = t;
|
||||||
|
_currentFollowPosition = t.position;
|
||||||
|
PlanarDirection = t.forward; // Начальное направление совпадает с направлением цели
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обработка вращения камеры на основе пользовательского ввода
|
||||||
|
private void HandleRotationInput(float deltaTime, Vector3 rotationInput, out Quaternion targetRotation)
|
||||||
|
{
|
||||||
|
// Вращение вокруг вертикальной оси (горизонтальный поворот)
|
||||||
|
var rotationFromInput = Quaternion.Euler(_followTransform.up * (rotationInput.x * _rotationSpeed));
|
||||||
|
PlanarDirection = rotationFromInput * PlanarDirection;
|
||||||
|
var planarRotation = Quaternion.LookRotation(PlanarDirection, _followTransform.up);
|
||||||
|
|
||||||
|
// Вращение вокруг горизонтальной оси (вертикальный наклон)
|
||||||
|
_targetVerticalAngle -= rotationInput.y * _rotationSpeed;
|
||||||
|
_targetVerticalAngle = Math.Clamp(_targetVerticalAngle, _minVerticalAngle, _maxVerticalAngle);
|
||||||
|
var verticalRotation = Quaternion.Euler(_targetVerticalAngle, 0, 0);
|
||||||
|
|
||||||
|
// Интерполяция к целевому вращению для плавности
|
||||||
|
targetRotation = Quaternion.Slerp(transform.rotation, planarRotation * verticalRotation, deltaTime * _rotationSharpness);
|
||||||
|
|
||||||
|
// Применение финального вращения
|
||||||
|
transform.rotation = targetRotation;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обработка позиционирования камеры и зума с учетом текущего режима
|
||||||
|
private void HandlePosition(float deltaTime, float zoomInput, Quaternion targetRotation)
|
||||||
|
{
|
||||||
|
// В FirstPerson режиме зум отключается
|
||||||
|
if (CurrentMode != CameraMode.FirstPerson)
|
||||||
|
{
|
||||||
|
// Обновление целевой дистанции на основе ввода зума
|
||||||
|
_targetDistance += zoomInput * _distanceMovementSpeed;
|
||||||
|
_targetDistance = Mathf.Clamp(_targetDistance, _minDistance, _maxDistance);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Плавное следование за целью с использованием экспоненциального сглаживания
|
||||||
|
_currentFollowPosition = Vector3.Lerp(_currentFollowPosition, _followTransform.position, 1f - Mathf.Exp(-_followSharpness * deltaTime));
|
||||||
|
|
||||||
|
// Вычисление целевой позиции камеры с учетом текущего режима
|
||||||
|
Vector3 targetPosition;
|
||||||
|
if (CurrentMode == CameraMode.FirstPerson)
|
||||||
|
{
|
||||||
|
// В FirstPerson режиме камера находится прямо на позиции цели
|
||||||
|
targetPosition = _currentFollowPosition;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// В ThirdPerson режиме камера отодвинута на расстояние от цели
|
||||||
|
targetPosition = _currentFollowPosition - targetRotation * Vector3.forward * _currentDistance;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Плавное изменение текущей дистанции к целевой (только для ThirdPerson)
|
||||||
|
if (CurrentMode != CameraMode.FirstPerson)
|
||||||
|
{
|
||||||
|
_currentDistance = Mathf.Lerp(_currentDistance, _targetDistance, 1f - Mathf.Exp(-_distanceMovementSpeed * deltaTime));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Установка финальной позиции камеры
|
||||||
|
transform.position = targetPosition;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Основной метод обновления камеры, вызываемый извне каждый кадр
|
||||||
|
public void UpdateWithInput(float deltaTime, float zoomInput, Vector3 rotationInput)
|
||||||
|
{
|
||||||
|
// Проверка наличия цели для следования и проверка на режим главного меню
|
||||||
|
if (!_followTransform || CurrentMode == CameraMode.MainMenu) return;
|
||||||
|
|
||||||
|
// Обработка ввода и позиционирования
|
||||||
|
HandleRotationInput(deltaTime, rotationInput, out var targetRotation);
|
||||||
|
HandlePosition(deltaTime, zoomInput, targetRotation);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Смена режима камеры
|
||||||
|
public void SetCameraMode(CameraMode newMode)
|
||||||
|
{
|
||||||
|
if (CurrentMode == newMode) return;
|
||||||
|
CurrentMode = newMode;
|
||||||
|
|
||||||
|
// Применяем настройки специфичные для режима
|
||||||
|
ApplyModeSpecificSettings();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Применение настроек специфичных для текущего режима
|
||||||
|
private void ApplyModeSpecificSettings()
|
||||||
|
{
|
||||||
|
switch (CurrentMode)
|
||||||
|
{
|
||||||
|
case CameraMode.FirstPerson:
|
||||||
|
// В FirstPerson режиме дистанция всегда равна 0
|
||||||
|
_minDistance = 0f;
|
||||||
|
_maxDistance = 0f;
|
||||||
|
_defaultDistance = 0f;
|
||||||
|
_targetDistance = 0f;
|
||||||
|
_currentDistance = 0f;
|
||||||
|
break;
|
||||||
|
case CameraMode.ThirdPerson:
|
||||||
|
// Восстанавливаем исходные значения дистанции
|
||||||
|
_minDistance = _originalMinDistance;
|
||||||
|
_maxDistance = _originalMaxDistance;
|
||||||
|
_defaultDistance = _originalDefaultDistance;
|
||||||
|
_targetDistance = _defaultDistance;
|
||||||
|
break;
|
||||||
|
// Заготовка на будущее (если понадобится)
|
||||||
|
case CameraMode.MainMenu:
|
||||||
|
case CameraMode.Static:
|
||||||
|
case CameraMode.Cinematic:
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f1d98e6c5419411098391c07861e627e
|
||||||
|
timeCreated: 1760627986
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: fb497e2e267044a7a35f80b47c88c2c9
|
||||||
|
timeCreated: 1761570825
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: d3be946108b44b33b99d2e3e4a75d47f
|
||||||
|
timeCreated: 1761571338
|
||||||
@@ -0,0 +1,122 @@
|
|||||||
|
using KinematicCharacterController;
|
||||||
|
using UnityEngine;
|
||||||
|
using Code.Gameplay.Character.Core;
|
||||||
|
|
||||||
|
namespace Code.Gameplay.Character.Controller.Abilities
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* Механика слайда для персонажа
|
||||||
|
* Отвечает за управление состоянием, таймерами и скоростью слайда
|
||||||
|
*/
|
||||||
|
public class SlideMechanic
|
||||||
|
{
|
||||||
|
// Скорость слайда
|
||||||
|
private readonly float _slideSpeed;
|
||||||
|
// Длительность слайда в секундах
|
||||||
|
private readonly float _slideDuration;
|
||||||
|
// Время перезарядки слайда
|
||||||
|
private readonly float _slideCooldown;
|
||||||
|
|
||||||
|
// Таймер слайда
|
||||||
|
private float _slideTimer;
|
||||||
|
// Таймер перезарядки слайда
|
||||||
|
private float _slideCooldownTimer;
|
||||||
|
// Направление слайда
|
||||||
|
private Vector3 _slideDirection;
|
||||||
|
// Флаг запроса слайда
|
||||||
|
private bool _slideRequested;
|
||||||
|
|
||||||
|
// Свойство-флаг, активен ли слайд
|
||||||
|
public bool IsSliding { get; private set; }
|
||||||
|
|
||||||
|
// Конструктор механики слайда
|
||||||
|
public SlideMechanic(float slideSpeed, float slideDuration, float slideCooldown)
|
||||||
|
{
|
||||||
|
_slideSpeed = slideSpeed;
|
||||||
|
_slideDuration = slideDuration;
|
||||||
|
_slideCooldown = slideCooldown;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обновляем таймер перезарядки слайда
|
||||||
|
public void TickCooldown(float deltaTime)
|
||||||
|
{
|
||||||
|
if (_slideCooldownTimer > 0f)
|
||||||
|
{
|
||||||
|
_slideCooldownTimer -= deltaTime;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обработка слайда
|
||||||
|
public void RequestSlide(bool slidePressed)
|
||||||
|
{
|
||||||
|
if (slidePressed && !_slideRequested && _slideCooldownTimer <= 0f)
|
||||||
|
{
|
||||||
|
_slideRequested = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Начало слайда
|
||||||
|
public void TryStartSlide(KinematicCharacterMotor motor,
|
||||||
|
CameraMode currentCameraMode,
|
||||||
|
Quaternion firstPersonCameraRotation,
|
||||||
|
Vector3 lookInputVector)
|
||||||
|
{
|
||||||
|
// Проверяем условия для старта слайда
|
||||||
|
if (!_slideRequested || !motor.GroundingStatus.IsStableOnGround || _slideCooldownTimer > 0f)
|
||||||
|
{
|
||||||
|
_slideRequested = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
IsSliding = true;
|
||||||
|
_slideTimer = _slideDuration;
|
||||||
|
|
||||||
|
// НАПРАВЛЕНИЕ СЛАЙДА - ВСЕГДА ВПЕРЕД ПО КАМЕРЕ
|
||||||
|
// Используем направление камеры, но проецируем на горизонтальную плоскость
|
||||||
|
var slideDir = currentCameraMode == CameraMode.FirstPerson ?
|
||||||
|
firstPersonCameraRotation * Vector3.forward :
|
||||||
|
lookInputVector;
|
||||||
|
|
||||||
|
// Проецируем на горизонтальную плоскость и нормализуем
|
||||||
|
_slideDirection = Vector3.ProjectOnPlane(slideDir, motor.CharacterUp).normalized;
|
||||||
|
|
||||||
|
// Если направление нулевое (персонаж стоит на месте), используем направление вперед
|
||||||
|
if (_slideDirection.sqrMagnitude < 0.01f)
|
||||||
|
{
|
||||||
|
_slideDirection = motor.CharacterForward;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Устанавливаем перезарядку
|
||||||
|
_slideCooldownTimer = _slideCooldown;
|
||||||
|
_slideRequested = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обработка слайда
|
||||||
|
public void HandleSlide(ref Vector3 currentVelocity, float deltaTime, KinematicCharacterMotor motor)
|
||||||
|
{
|
||||||
|
// Уменьшаем таймер слайда
|
||||||
|
_slideTimer -= deltaTime;
|
||||||
|
|
||||||
|
// Если время слайда вышло, персонаж в воздухе - заканчиваем слайд
|
||||||
|
if (_slideTimer <= 0f || !motor.GroundingStatus.IsStableOnGround)
|
||||||
|
{
|
||||||
|
EndSlide();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Устанавливаем скорость слайда вперед
|
||||||
|
// Используем прямую установку скорости вместо сложных вычислений
|
||||||
|
currentVelocity = _slideDirection * _slideSpeed;
|
||||||
|
|
||||||
|
// Добавляем небольшую вертикальную компоненту для лучшего скольжения по неровностям
|
||||||
|
currentVelocity += motor.CharacterUp * 2f;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Завершение слайда
|
||||||
|
public void EndSlide()
|
||||||
|
{
|
||||||
|
IsSliding = false;
|
||||||
|
_slideTimer = 0f;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+3
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5904fa03346e4751967d57500ab3d1cf
|
||||||
|
timeCreated: 1761571347
|
||||||
+51
@@ -0,0 +1,51 @@
|
|||||||
|
using KinematicCharacterController;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Code.Gameplay.Character.Controller.Abilities
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* Механика залазания на стены
|
||||||
|
* Обрабатывает столкновения и применяет вертикальный импульс при ударе о стену с достаточной скоростью
|
||||||
|
*/
|
||||||
|
public class WallClimbMechanic
|
||||||
|
{
|
||||||
|
// Коэффициент преобразования горизонтальной скорости в вертикальную при залазании на стену
|
||||||
|
private readonly float _wallClimbSpeedFactor;
|
||||||
|
// Минимальная горизонтальная скорость для начала залазания на стену
|
||||||
|
private readonly float _minWallClimbSpeed;
|
||||||
|
|
||||||
|
// Конструктор механики залазания на стену
|
||||||
|
public WallClimbMechanic(float wallClimbSpeedFactor, float minWallClimbSpeed)
|
||||||
|
{
|
||||||
|
_wallClimbSpeedFactor = wallClimbSpeedFactor;
|
||||||
|
_minWallClimbSpeed = minWallClimbSpeed;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обработка столкновения при движении (вызывается при ударе о препятствие)
|
||||||
|
public void OnMovementHit(KinematicCharacterMotor motor, Vector3 hitNormal)
|
||||||
|
{
|
||||||
|
// Проверяем, что это вертикальная или почти вертикальная поверхность (стена)
|
||||||
|
var dotWithUp = Vector3.Dot(hitNormal, motor.CharacterUp);
|
||||||
|
if (Mathf.Abs(dotWithUp) > 0.1f) return; // Не стена — это пол или потолок
|
||||||
|
|
||||||
|
// Получаем текущую скорость персонажа
|
||||||
|
var currentVelocity = motor.Velocity;
|
||||||
|
|
||||||
|
// Проекция скорости на направление к стене (отрицательная, если летим в стену)
|
||||||
|
var velocityIntoWall = Vector3.Dot(currentVelocity, -hitNormal);
|
||||||
|
|
||||||
|
// Если движемся в стену с достаточной скоростью
|
||||||
|
if (velocityIntoWall > _minWallClimbSpeed)
|
||||||
|
{
|
||||||
|
// Преобразуем часть горизонтальной скорости в вертикальную
|
||||||
|
var verticalBoost = velocityIntoWall * _wallClimbSpeedFactor;
|
||||||
|
|
||||||
|
// Добавляем вертикальный импульс через BaseVelocity
|
||||||
|
motor.BaseVelocity += motor.CharacterUp * verticalBoost;
|
||||||
|
|
||||||
|
// Предотвращаем заземление и повторное применение в этом кадре
|
||||||
|
motor.ForceUnground();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+3
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: cfce19738ff34be286c953e33e515c46
|
||||||
|
timeCreated: 1761571364
|
||||||
+220
@@ -0,0 +1,220 @@
|
|||||||
|
using Code.Gameplay.Character.Controller.Abilities;
|
||||||
|
using Code.Gameplay.Character.Controller.Input;
|
||||||
|
using Code.Gameplay.Character.Controller.Movement;
|
||||||
|
using Code.Gameplay.Character.Core;
|
||||||
|
using KinematicCharacterController;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Code.Gameplay.Character.Controller
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* Скрипт, отвечающий за передвижение персонажа
|
||||||
|
* Реализует физическое движение персонажа с использованием Kinematic Character Controller
|
||||||
|
* Обрабатывает ввод пользователя, применяет движение и вращение с учетом поверхности
|
||||||
|
*
|
||||||
|
* Источник: Tvtig, https://www.youtube.com/watch?v=9ibpY64wBYM
|
||||||
|
*/
|
||||||
|
public class CustomCharacterController : MonoBehaviour, ICharacterController
|
||||||
|
{
|
||||||
|
[SerializeField]
|
||||||
|
private KinematicCharacterMotor motor; // Движок физического перемещения персонажа
|
||||||
|
|
||||||
|
[SerializeField]
|
||||||
|
private float
|
||||||
|
maxStableMoveSpeed = 8f, // Максимальная скорость движения по устойчивой поверхности
|
||||||
|
sprintMoveSpeed = 12f, // Максимальная скорость спринта
|
||||||
|
slideSpeed = 20f, // Скорость слайда
|
||||||
|
slideDuration = 0.8f, // Длительность слайда в секундах
|
||||||
|
slideCooldown = 1.5f, // Время перезарядки слайда
|
||||||
|
stableMovementSharpness = 15f, // Резкость изменения скорости движения (чем выше - тем резче)
|
||||||
|
orientationSharpness = 10f, // Резкость изменения вращения персонажа (чем выше - тем резче)
|
||||||
|
jumpSpeed = 10f, // Скорость прыжка
|
||||||
|
wallClimbSpeedFactor = 0.8f, // Коэффициент преобразования горизонтальной скорости в вертикальную при залазании на стену
|
||||||
|
minWallClimbSpeed = 9f; // Минимальная горизонтальная скорость для начала залазания на стену
|
||||||
|
|
||||||
|
[SerializeField]
|
||||||
|
private Vector3 gravity = new(0, -30f, 0); // Вектор, отвечающий за применение гравитации
|
||||||
|
|
||||||
|
// Подсистемы
|
||||||
|
private readonly CharacterInputHandler _inputHandler;
|
||||||
|
private readonly SlideMechanic _slideMechanic;
|
||||||
|
private readonly WallClimbMechanic _wallClimbMechanic;
|
||||||
|
private readonly GroundMovementSystem _groundMovement;
|
||||||
|
private readonly AirMovementSystem _airMovement;
|
||||||
|
|
||||||
|
// Конструктор без параметров, инициализирующий контроллер
|
||||||
|
public CustomCharacterController()
|
||||||
|
{
|
||||||
|
_inputHandler = new CharacterInputHandler();
|
||||||
|
_slideMechanic = new SlideMechanic(slideSpeed, slideDuration, slideCooldown);
|
||||||
|
_wallClimbMechanic = new WallClimbMechanic(wallClimbSpeedFactor, minWallClimbSpeed);
|
||||||
|
_groundMovement = new GroundMovementSystem(maxStableMoveSpeed, sprintMoveSpeed, stableMovementSharpness, jumpSpeed);
|
||||||
|
_airMovement = new AirMovementSystem(gravity);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Текущий режим камеры для адаптации поведения
|
||||||
|
private CameraMode _currentCameraMode = CameraMode.ThirdPerson;
|
||||||
|
|
||||||
|
// Инициализация контроллера
|
||||||
|
private void Start()
|
||||||
|
{
|
||||||
|
motor.CharacterController = this; // Регистрация этого контроллера в движке
|
||||||
|
_inputHandler.FirstPersonCameraRotation = motor.Transform.rotation; // Начальное вращение совпадает с персонажем
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обработка и преобразование входных данных от персонажа
|
||||||
|
public void SetInputs(ref CharacterInputs inputs)
|
||||||
|
{
|
||||||
|
// Обновляем таймер перезарядки слайда
|
||||||
|
_slideMechanic.TickCooldown(Time.deltaTime);
|
||||||
|
|
||||||
|
// Если активен слайд - игнорируем весь остальной ввод
|
||||||
|
if (_slideMechanic.IsSliding)
|
||||||
|
{
|
||||||
|
// Во время слайда не обрабатываем движение, прыжки и спринт
|
||||||
|
_inputHandler.MoveInputVector = Vector3.zero;
|
||||||
|
_inputHandler.LookInputVector = Vector3.one;
|
||||||
|
_inputHandler.IsSprinting = false;
|
||||||
|
_groundMovement.RequestJump(inputs.JumpPressed);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Сохраняем текущий режим камеры
|
||||||
|
_currentCameraMode = inputs.CameraMode;
|
||||||
|
|
||||||
|
// Обработка слайда
|
||||||
|
_slideMechanic.RequestSlide(inputs.SlidePressed);
|
||||||
|
|
||||||
|
// Обработка остального ввода
|
||||||
|
_inputHandler.ProcessInputs(ref inputs, motor);
|
||||||
|
|
||||||
|
// Передаём запрос прыжка напрямую в систему движения по земле
|
||||||
|
_groundMovement.RequestJump(inputs.JumpPressed);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обновление вращения персонажа на основе входных данных
|
||||||
|
public void UpdateRotation(ref Quaternion currentRotation, float deltaTime)
|
||||||
|
{
|
||||||
|
// ВО ВРЕМЯ СЛАЙДА НЕ ОБНОВЛЯЕМ ВРАЩЕНИЕ - ПЕРСОНАЖ СМОТРИТ ПРЯМО
|
||||||
|
if (_slideMechanic.IsSliding) return;
|
||||||
|
|
||||||
|
switch (_currentCameraMode)
|
||||||
|
{
|
||||||
|
// В FirstPerson режиме применяем вращение камеры напрямую к персонажу (только горизонталь)
|
||||||
|
case CameraMode.FirstPerson when _inputHandler.ShouldApplyCameraRotation:
|
||||||
|
// Немедленно применяем горизонтальное вращение камеры к персонажу
|
||||||
|
currentRotation = _inputHandler.FirstPersonCameraRotation;
|
||||||
|
break;
|
||||||
|
// В ThirdPerson режиме плавно поворачиваем персонаж в направлении движения
|
||||||
|
case CameraMode.ThirdPerson:
|
||||||
|
{
|
||||||
|
// Вращение применяется только если есть направление движения и разрешена резкость вращения
|
||||||
|
if (_inputHandler.LookInputVector.sqrMagnitude > 0 && orientationSharpness > 0)
|
||||||
|
{
|
||||||
|
// Плавная интерполяция текущего направления к целевому с экспоненциальным сглаживанием
|
||||||
|
var smoothedLookInputDirection = Vector3.Slerp(
|
||||||
|
motor.CharacterForward,
|
||||||
|
_inputHandler.LookInputVector,
|
||||||
|
1f - Mathf.Exp(-orientationSharpness * deltaTime)
|
||||||
|
).normalized;
|
||||||
|
|
||||||
|
// Установка нового вращения смотря в сглаженном направлении
|
||||||
|
currentRotation = Quaternion.LookRotation(smoothedLookInputDirection, motor.CharacterUp);
|
||||||
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
// Заготовка на будущее (если понадобится)
|
||||||
|
case CameraMode.Static:
|
||||||
|
case CameraMode.Cinematic:
|
||||||
|
case CameraMode.MainMenu: // Скорее всего юзлес, но пускай будет
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обновление скорости движения персонажа
|
||||||
|
public void UpdateVelocity(ref Vector3 currentVelocity, float deltaTime)
|
||||||
|
{
|
||||||
|
// Если во время слайда запрошен прыжок — прерываем слайд
|
||||||
|
if (_slideMechanic.IsSliding && _groundMovement.JumpRequested)
|
||||||
|
{
|
||||||
|
_slideMechanic.EndSlide();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Проверяем запрос слайда и запускаем его если можно
|
||||||
|
if (!_slideMechanic.IsSliding)
|
||||||
|
{
|
||||||
|
_slideMechanic.TryStartSlide(motor, _currentCameraMode, _inputHandler.FirstPersonCameraRotation, _inputHandler.LookInputVector);
|
||||||
|
}
|
||||||
|
// Если активен слайд - обрабатываем отдельно
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_slideMechanic.HandleSlide(ref currentVelocity, deltaTime, motor);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Если персонаж находится на земле
|
||||||
|
if (motor.GroundingStatus.IsStableOnGround)
|
||||||
|
{
|
||||||
|
_groundMovement.UpdateVelocity(ref currentVelocity, _inputHandler, motor, deltaTime);
|
||||||
|
}
|
||||||
|
// Если персонаж не находится на земле
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_airMovement.UpdateVelocity(ref currentVelocity, deltaTime);
|
||||||
|
// Отменяем прыжок (фикс проблемы с двойным прыжком после приземления)
|
||||||
|
_groundMovement.CancelJumpRequest();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Метод вызывается перед обновлением персонажа (можно использовать для подготовки)
|
||||||
|
public void BeforeCharacterUpdate(float deltaTime)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
// Метод вызывается после обработки столкновения с землей
|
||||||
|
public void PostGroundingUpdate(float deltaTime)
|
||||||
|
{
|
||||||
|
// Если во время слайда персонаж оторвался от земли - заканчиваем слайд
|
||||||
|
if (_slideMechanic.IsSliding && !motor.GroundingStatus.IsStableOnGround)
|
||||||
|
{
|
||||||
|
_slideMechanic.EndSlide();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Метод вызывается после обновления персонажа (можно использовать для пост-обработки)
|
||||||
|
public void AfterCharacterUpdate(float deltaTime)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
// Проверка валидности коллайдера для обработки столкновений
|
||||||
|
public bool IsColliderValidForCollisions(Collider coll)
|
||||||
|
{
|
||||||
|
return true; // Все коллайдеры считаются валидными для столкновений
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обработка столкновения с землей (вызывается при приземлении)
|
||||||
|
public void OnGroundHit(Collider hitCollider, Vector3 hitNormal, Vector3 hitPoint, ref HitStabilityReport hitStabilityReport)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обработка столкновения при движении (вызывается при ударе о препятствие)
|
||||||
|
public void OnMovementHit(Collider hitCollider, Vector3 hitNormal, Vector3 hitPoint,
|
||||||
|
ref HitStabilityReport hitStabilityReport)
|
||||||
|
{
|
||||||
|
_wallClimbMechanic.OnMovementHit(motor, hitNormal);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обработка отчета о стабильности столкновения
|
||||||
|
public void ProcessHitStabilityReport(Collider hitCollider, Vector3 hitNormal, Vector3 hitPoint, Vector3 atCharacterPosition,
|
||||||
|
Quaternion atCharacterRotation, ref HitStabilityReport hitStabilityReport)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обработка дискретных столкновений (для триггеров и специальных коллайдеров)
|
||||||
|
public void OnDiscreteCollisionDetected(Collider hitCollider)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+3
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: a6f74123648343c498c883d02909b499
|
||||||
|
timeCreated: 1760641740
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: e50ac1a55a4f4706b6385746eb9c6d1f
|
||||||
|
timeCreated: 1761571269
|
||||||
+115
@@ -0,0 +1,115 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
using Code.Gameplay.Character.Core;
|
||||||
|
using KinematicCharacterController;
|
||||||
|
|
||||||
|
namespace Code.Gameplay.Character.Controller.Input
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* Обработчик входных данных для персонажа
|
||||||
|
* Преобразует сырые данные ввода в векторы движения и направления взгляда
|
||||||
|
*/
|
||||||
|
public class CharacterInputHandler
|
||||||
|
{
|
||||||
|
// Векторы движения и направления взгляда
|
||||||
|
public Vector3 MoveInputVector { get; set; }
|
||||||
|
public Vector3 LookInputVector { get; set; }
|
||||||
|
|
||||||
|
// Флаг-свойство указывающий, что активен режим спринта
|
||||||
|
public bool IsSprinting { get; set; }
|
||||||
|
|
||||||
|
// Вращение камеры в FirstPerson режиме для синхронизации (только горизонтальная компонента)
|
||||||
|
public Quaternion FirstPersonCameraRotation { get; set; }
|
||||||
|
|
||||||
|
// Флаг-свойство указывающий, что нужно применить вращение камеры к персонажу
|
||||||
|
public bool ShouldApplyCameraRotation { get; private set; }
|
||||||
|
|
||||||
|
// Обработка и преобразование входных данных от персонажа
|
||||||
|
public void ProcessInputs(ref CharacterInputs inputs, KinematicCharacterMotor motor)
|
||||||
|
{
|
||||||
|
// Сохраняем текущий режим камеры
|
||||||
|
var currentCameraMode = inputs.CameraMode;
|
||||||
|
|
||||||
|
// Обработка спринта
|
||||||
|
IsSprinting = inputs is { SprintPressed: true, MoveAxisForward: > 0.1f }; // Спринт только при движении вперёд
|
||||||
|
|
||||||
|
// Нормализация вектора движения и ограничение его величины до 1
|
||||||
|
var moveInputVector =
|
||||||
|
Vector3.ClampMagnitude(new Vector3(inputs.MoveAxisRight, 0, inputs.MoveAxisForward), 1f);
|
||||||
|
|
||||||
|
// Раздельная обработка в зависимости от режима камеры
|
||||||
|
if (currentCameraMode == CameraMode.FirstPerson)
|
||||||
|
{
|
||||||
|
HandleFirstPersonInputs(ref inputs, moveInputVector, motor);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
HandleThirdPersonInputs(ref inputs, moveInputVector, motor);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обработка ввода для FirstPerson режима
|
||||||
|
private void HandleFirstPersonInputs(ref CharacterInputs inputs, Vector3 moveInputVector, KinematicCharacterMotor motor)
|
||||||
|
{
|
||||||
|
// Сохраняем вращение камеры для применения в UpdateRotation (только горизонтальная компонента)
|
||||||
|
FirstPersonCameraRotation = ExtractHorizontalRotation(inputs.CameraRotation, motor);
|
||||||
|
ShouldApplyCameraRotation = true;
|
||||||
|
|
||||||
|
// В FirstPerson режиме движение всегда относительно направления камеры
|
||||||
|
// Получаем направление камеры в горизонтальной плоскости
|
||||||
|
var cameraPlanarDirection = inputs.CameraPlanarDirection;
|
||||||
|
|
||||||
|
// Создание вращения на основе направления камеры
|
||||||
|
var cameraPlanarRotation = Quaternion.LookRotation(cameraPlanarDirection, motor.CharacterUp);
|
||||||
|
|
||||||
|
// Преобразование локального ввода в мировые координаты относительно камеры
|
||||||
|
MoveInputVector = cameraPlanarRotation * moveInputVector;
|
||||||
|
|
||||||
|
// В FirstPerson режиме направление взгляда всегда совпадает с направлением камеры (горизонтально)
|
||||||
|
LookInputVector = cameraPlanarDirection;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обработка ввода для ThirdPerson режима
|
||||||
|
private void HandleThirdPersonInputs(ref CharacterInputs inputs, Vector3 moveInputVector, KinematicCharacterMotor motor)
|
||||||
|
{
|
||||||
|
// Сбрасываем флаг применения вращения камеры
|
||||||
|
ShouldApplyCameraRotation = false;
|
||||||
|
|
||||||
|
// Получение направления камеры в горизонтальной плоскости (игнорируя наклон)
|
||||||
|
var cameraPlanarDirection = inputs.CameraPlanarDirection;
|
||||||
|
|
||||||
|
// Резервный расчет направления, если основное направление параллельно вертикали
|
||||||
|
if (cameraPlanarDirection.sqrMagnitude == 0f)
|
||||||
|
{
|
||||||
|
cameraPlanarDirection = Vector3.ProjectOnPlane(inputs.CameraRotation * Vector3.up, motor.CharacterUp);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Создание вращения на основе направления камеры
|
||||||
|
var cameraPlanarRotation = Quaternion.LookRotation(cameraPlanarDirection, motor.CharacterUp);
|
||||||
|
|
||||||
|
// Преобразование локального ввода в мировые координаты относительно камеры
|
||||||
|
MoveInputVector = cameraPlanarRotation * moveInputVector;
|
||||||
|
|
||||||
|
// Направление взгляда совпадает с направлением движения (нормализованное)
|
||||||
|
LookInputVector = MoveInputVector.normalized;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Извлечение только горизонтальной компоненты вращения (игнорируя наклон камеры)
|
||||||
|
private static Quaternion ExtractHorizontalRotation(Quaternion cameraRotation, KinematicCharacterMotor motor)
|
||||||
|
{
|
||||||
|
// Получаем вектор направления камеры
|
||||||
|
var cameraForward = cameraRotation * Vector3.forward;
|
||||||
|
|
||||||
|
// Проецируем на горизонтальную плоскость
|
||||||
|
var horizontalForward = Vector3.ProjectOnPlane(cameraForward, motor.CharacterUp).normalized;
|
||||||
|
|
||||||
|
// Если проекция вырождена, используем текущее направление персонажа
|
||||||
|
if (horizontalForward.sqrMagnitude < 0.01f)
|
||||||
|
{
|
||||||
|
horizontalForward = motor.CharacterForward;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Создаем вращение только по горизонтали
|
||||||
|
return Quaternion.LookRotation(horizontalForward, motor.CharacterUp);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+3
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 513b50847de24c619c380c15e084e932
|
||||||
|
timeCreated: 1761571281
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b3dfd8f0dbeb4e8690e11049cb7e2f55
|
||||||
|
timeCreated: 1761571298
|
||||||
+26
@@ -0,0 +1,26 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Code.Gameplay.Character.Controller.Movement
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* Система движения персонажа в воздухе
|
||||||
|
*/
|
||||||
|
public class AirMovementSystem
|
||||||
|
{
|
||||||
|
// Вектор, отвечающий за применение гравитации
|
||||||
|
private readonly Vector3 _gravity;
|
||||||
|
|
||||||
|
// Конструктор системы движения в воздухе
|
||||||
|
public AirMovementSystem(Vector3 gravity)
|
||||||
|
{
|
||||||
|
_gravity = gravity;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обновление скорости движения персонажа в воздухе
|
||||||
|
public void UpdateVelocity(ref Vector3 currentVelocity, float deltaTime)
|
||||||
|
{
|
||||||
|
// Применяем гравитацию
|
||||||
|
currentVelocity += _gravity * deltaTime;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+3
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5ea8841f02ff4e17ab8ebd8c7a949f6f
|
||||||
|
timeCreated: 1761571326
|
||||||
+88
@@ -0,0 +1,88 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
using Code.Gameplay.Character.Controller.Input;
|
||||||
|
using KinematicCharacterController;
|
||||||
|
|
||||||
|
namespace Code.Gameplay.Character.Controller.Movement
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* Система движения персонажа по устойчивой поверхности
|
||||||
|
*/
|
||||||
|
public class GroundMovementSystem
|
||||||
|
{
|
||||||
|
// Максимальная скорость движения по устойчивой поверхности
|
||||||
|
private readonly float _maxStableMoveSpeed;
|
||||||
|
// Максимальная скорость спринта
|
||||||
|
private readonly float _sprintMoveSpeed;
|
||||||
|
// Резкость изменения скорости движения (чем выше - тем резче)
|
||||||
|
private readonly float _stableMovementSharpness;
|
||||||
|
// Скорость прыжка
|
||||||
|
private readonly float _jumpSpeed;
|
||||||
|
|
||||||
|
// Свойство-флаг указывающий, что был запрошен прыжок
|
||||||
|
public bool JumpRequested { get; private set; }
|
||||||
|
|
||||||
|
// Конструктор системы движения на земле
|
||||||
|
public GroundMovementSystem(float maxStableMoveSpeed, float sprintMoveSpeed, float stableMovementSharpness, float jumpSpeed)
|
||||||
|
{
|
||||||
|
_maxStableMoveSpeed = maxStableMoveSpeed;
|
||||||
|
_sprintMoveSpeed = sprintMoveSpeed;
|
||||||
|
_stableMovementSharpness = stableMovementSharpness;
|
||||||
|
_jumpSpeed = jumpSpeed;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Метод для установки запроса на прыжок извне
|
||||||
|
public void RequestJump(bool jumpPressed)
|
||||||
|
{
|
||||||
|
if (jumpPressed)
|
||||||
|
JumpRequested = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Метод для отмены запроса на прыжок извне
|
||||||
|
public void CancelJumpRequest()
|
||||||
|
{
|
||||||
|
JumpRequested = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обновление скорости движения персонажа на земле
|
||||||
|
public void UpdateVelocity(
|
||||||
|
ref Vector3 currentVelocity,
|
||||||
|
CharacterInputHandler inputHandler,
|
||||||
|
KinematicCharacterMotor motor,
|
||||||
|
float deltaTime)
|
||||||
|
{
|
||||||
|
// Сохранение текущей величины скорости
|
||||||
|
var currentVelocityMagnitude = currentVelocity.magnitude;
|
||||||
|
|
||||||
|
// Получение нормали поверхности для корректного движения по наклонным плоскостям
|
||||||
|
var effectiveGroundNormal = motor.GroundingStatus.GroundNormal;
|
||||||
|
|
||||||
|
// Переориентация текущей скорости вдоль поверхности
|
||||||
|
currentVelocity = motor.GetDirectionTangentToSurface(currentVelocity, effectiveGroundNormal) *
|
||||||
|
currentVelocityMagnitude;
|
||||||
|
|
||||||
|
// Переориентация входного вектора движения вдоль поверхности
|
||||||
|
var inputRight = Vector3.Cross(inputHandler.MoveInputVector, motor.CharacterUp);
|
||||||
|
var reorientedInput = Vector3.Cross(effectiveGroundNormal, inputRight).normalized *
|
||||||
|
inputHandler.MoveInputVector.magnitude;
|
||||||
|
|
||||||
|
// Расчет целевой скорости движения с учетом ограничения максимальной скорости и спринта
|
||||||
|
var targetSpeed = inputHandler.IsSprinting ? _sprintMoveSpeed : _maxStableMoveSpeed;
|
||||||
|
var targetMovementVelocity = reorientedInput * targetSpeed;
|
||||||
|
|
||||||
|
// Плавная интерполяция текущей скорости к целевой с экспоненциальным сглаживанием
|
||||||
|
currentVelocity = Vector3.Lerp(
|
||||||
|
currentVelocity,
|
||||||
|
targetMovementVelocity,
|
||||||
|
1f - Mathf.Exp(-_stableMovementSharpness * deltaTime)
|
||||||
|
);
|
||||||
|
|
||||||
|
// Если запрошен прыжок
|
||||||
|
if (JumpRequested)
|
||||||
|
{
|
||||||
|
currentVelocity += motor.CharacterUp * _jumpSpeed - Vector3.Project(currentVelocity, motor.CharacterUp);
|
||||||
|
JumpRequested = false; // Сброс сразу после применения
|
||||||
|
motor.ForceUnground();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+3
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 21cd95513cd44d52b6ae014403f9e3d1
|
||||||
|
timeCreated: 1761571312
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 4028bee0a1774348bb81e0c56e400ddc
|
||||||
|
timeCreated: 1761570805
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
namespace Code.Gameplay.Character.Core
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* Перечисление режимов работы камеры
|
||||||
|
* MainMenu - статичная камера, смотрит на заданную позицию (то что надо в главном меню)
|
||||||
|
* Static - статичная камера без следования за целью
|
||||||
|
* FirstPerson - камера от первого лица (встроена в модель персонажа)
|
||||||
|
* ThirdPerson - камера от третьего лица (следует за персонажем на расстоянии)
|
||||||
|
* Cinematic - кинематографическая камера для скриптовых сцен
|
||||||
|
*/
|
||||||
|
public enum CameraMode
|
||||||
|
{
|
||||||
|
MainMenu,
|
||||||
|
Static,
|
||||||
|
FirstPerson,
|
||||||
|
ThirdPerson,
|
||||||
|
Cinematic
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5a49105845a7435b9179e402fa7b8e30
|
||||||
|
timeCreated: 1761570884
|
||||||
@@ -0,0 +1,118 @@
|
|||||||
|
using Code.Gameplay.Character.Camera;
|
||||||
|
using Code.Gameplay.Character.Controller;
|
||||||
|
using Code.Input;
|
||||||
|
using Reflex.Attributes;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Code.Gameplay.Character.Core
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* Главный скрипт персонажа, объединяющий камеру и контроллер персонажа
|
||||||
|
* Обрабатывает ввод пользователя и распределяет его между компонентами
|
||||||
|
* Синхронизирует состояние камеры и персонажа
|
||||||
|
* Управляет переключением режимов камеры через Input System
|
||||||
|
*/
|
||||||
|
public class Character : MonoBehaviour
|
||||||
|
{
|
||||||
|
[SerializeField] private CharacterCamera characterCamera; // Компонент камеры персонажа
|
||||||
|
[SerializeField] private CustomCharacterController customCharacterController; // Компонент управления персонажем
|
||||||
|
[SerializeField] private Transform cameraFollowPoint; // Точка следования камеры (уровень глаз для FirstPerson)
|
||||||
|
|
||||||
|
[Inject] private IInputService _inputService; // Сервис ввода через DI
|
||||||
|
|
||||||
|
// Флаг для отслеживания переключения режима камеры (чтобы избежать многократных срабатываний)
|
||||||
|
private bool _cameraModeToggleHandled;
|
||||||
|
|
||||||
|
// Инициализация персонажа
|
||||||
|
private void Start()
|
||||||
|
{
|
||||||
|
// Настройка камеры для следования за точкой камеры
|
||||||
|
characterCamera.SetFollowTransform(cameraFollowPoint);
|
||||||
|
characterCamera.SetCameraMode(CameraMode.FirstPerson);
|
||||||
|
|
||||||
|
// Включение Gameplay мапа ввода
|
||||||
|
_inputService.EnableMap(ActionMappings.Gameplay);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обработка ввода для камеры (вращение и зум)
|
||||||
|
private void HandleCameraInput()
|
||||||
|
{
|
||||||
|
// Получаем данные ввода из Input System
|
||||||
|
var lookInput = _inputService.LookInput;
|
||||||
|
var scrollInput = _inputService.ZoomInput;
|
||||||
|
|
||||||
|
// Передаем данные в камеру
|
||||||
|
characterCamera.UpdateWithInput(Time.deltaTime, scrollInput,
|
||||||
|
new Vector3(lookInput.x, lookInput.y, 0));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обработка ввода для движения персонажа
|
||||||
|
private void HandleCharacterInput()
|
||||||
|
{
|
||||||
|
// Создаем структуру ввода с полной информацией о камере
|
||||||
|
var inputs = new CharacterInputs();
|
||||||
|
|
||||||
|
// Получаем данные движения из Input System
|
||||||
|
var moveInput = _inputService.MoveInput;
|
||||||
|
inputs.MoveAxisForward = moveInput.y; // Vertical ось (W/S или Up/Down)
|
||||||
|
inputs.MoveAxisRight = moveInput.x; // Horizontal ось (A/D или Left/Right)
|
||||||
|
inputs.JumpPressed = _inputService.JumpPressed; // Прыжки (Space)
|
||||||
|
inputs.SprintPressed = _inputService.SprintPressed; // Спринт (Shift)
|
||||||
|
inputs.SlidePressed = _inputService.SlidePressed; // Слайд (Ctrl)
|
||||||
|
|
||||||
|
// Передаем информацию о камере для адаптивного поведения
|
||||||
|
inputs.CameraRotation = characterCamera.transform.rotation;
|
||||||
|
inputs.CameraMode = characterCamera.CurrentMode;
|
||||||
|
inputs.CameraPlanarDirection = characterCamera.PlanarDirection;
|
||||||
|
|
||||||
|
// Передаем ввод в контроллер персонажа
|
||||||
|
customCharacterController.SetInputs(ref inputs);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обработка переключения режима камеры через Input System
|
||||||
|
private void HandleCameraModeInput()
|
||||||
|
{
|
||||||
|
// Получаем состояние переключения режима камеры из Input System
|
||||||
|
var togglePressed = _inputService.ToggleCameraModePressed;
|
||||||
|
|
||||||
|
switch (togglePressed)
|
||||||
|
{
|
||||||
|
// Обрабатываем нажатие только один раз при первом обнаружении
|
||||||
|
case true when !_cameraModeToggleHandled:
|
||||||
|
ToggleCameraMode();
|
||||||
|
_cameraModeToggleHandled = true;
|
||||||
|
break;
|
||||||
|
// Сбрасываем флаг когда кнопка отпущена
|
||||||
|
case false:
|
||||||
|
_cameraModeToggleHandled = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Метод для переключения режимов камеры
|
||||||
|
private void ToggleCameraMode()
|
||||||
|
{
|
||||||
|
var currentMode = characterCamera.CurrentMode;
|
||||||
|
var newMode = currentMode == CameraMode.FirstPerson ? CameraMode.ThirdPerson : CameraMode.FirstPerson;
|
||||||
|
|
||||||
|
characterCamera.SetCameraMode(newMode);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обновление логики каждый кадр
|
||||||
|
private void Update()
|
||||||
|
{
|
||||||
|
// Обработка ввода для движения в Update (физика)
|
||||||
|
HandleCharacterInput();
|
||||||
|
|
||||||
|
// Обработка переключения режима камеры
|
||||||
|
HandleCameraModeInput();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обновление после всех вычислений (идеально для камеры)
|
||||||
|
private void LateUpdate()
|
||||||
|
{
|
||||||
|
// Обработка ввода для камеры в LateUpdate (после движения персонажа)
|
||||||
|
HandleCameraInput();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 9f2cdbe59523ace7ab0d8dfc36b4eb02
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Code.Gameplay.Character.Core
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* Структура для хранения входных данных от персонажа
|
||||||
|
* Содержит информацию о движении и состоянии камеры
|
||||||
|
*/
|
||||||
|
public struct CharacterInputs
|
||||||
|
{
|
||||||
|
public float MoveAxisForward; // Ввод движения вперед/назад (W/S или Up/Down)
|
||||||
|
public float MoveAxisRight; // Ввод движения влево/вправо (A/D или Left/Right)
|
||||||
|
public Quaternion CameraRotation; // Текущее вращение камеры для определения направления движения
|
||||||
|
public CameraMode CameraMode; // Текущий режим камеры для адаптации поведения
|
||||||
|
public Vector3 CameraPlanarDirection; // Направление камеры в горизонтальной плоскости
|
||||||
|
public bool JumpPressed; // Флаг указывающий, нажата ли кнопка прыжка
|
||||||
|
public bool SprintPressed; // Флаг указывающий, нажата ли кнопка спринта
|
||||||
|
public bool SlidePressed; // Флаг указывающий, нажата ли кнопка слайда
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: c3edde7108664ecc9b84a8096a3dec93
|
||||||
|
timeCreated: 1761570939
|
||||||
@@ -2,5 +2,8 @@ namespace Code.Input
|
|||||||
{
|
{
|
||||||
public enum GameplayActions
|
public enum GameplayActions
|
||||||
{
|
{
|
||||||
|
Move,
|
||||||
|
Look,
|
||||||
|
Zoom
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,4 @@
|
|||||||
using System;
|
using UnityEngine;
|
||||||
using UnityEngine.InputSystem;
|
|
||||||
|
|
||||||
namespace Code.Input
|
namespace Code.Input
|
||||||
{
|
{
|
||||||
@@ -7,5 +6,18 @@ namespace Code.Input
|
|||||||
{
|
{
|
||||||
void EnableMap(ActionMappings actionMap);
|
void EnableMap(ActionMappings actionMap);
|
||||||
void DisableMap(ActionMappings actionMap);
|
void DisableMap(ActionMappings actionMap);
|
||||||
|
|
||||||
|
// Для управления камерой
|
||||||
|
Vector2 LookInput { get; }
|
||||||
|
float ZoomInput { get; }
|
||||||
|
|
||||||
|
// Для управления движением персонажа
|
||||||
|
Vector2 MoveInput { get; }
|
||||||
|
bool JumpPressed { get; }
|
||||||
|
bool SprintPressed { get; }
|
||||||
|
bool SlidePressed { get; }
|
||||||
|
|
||||||
|
// Для переключения режима камеры
|
||||||
|
bool ToggleCameraModePressed { get; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using Reflex.Attributes;
|
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.InputSystem;
|
using UnityEngine.InputSystem;
|
||||||
|
|
||||||
@@ -8,7 +7,160 @@ namespace Code.Input
|
|||||||
public class InputService : IInputService, IDisposable
|
public class InputService : IInputService, IDisposable
|
||||||
{
|
{
|
||||||
|
|
||||||
private InputActionAsset _inputActionAsset;
|
private readonly InputActionAsset _inputActionAsset;
|
||||||
|
|
||||||
|
public Vector2 LookInput { get; private set; }
|
||||||
|
public float ZoomInput { get; private set; }
|
||||||
|
public Vector2 MoveInput { get; private set; }
|
||||||
|
public bool JumpPressed { get; private set; }
|
||||||
|
public bool SprintPressed { get; private set; }
|
||||||
|
public bool SlidePressed { get; private set; }
|
||||||
|
public bool ToggleCameraModePressed { get; private set; }
|
||||||
|
|
||||||
|
public InputService(InputActionAsset inputActionAsset)
|
||||||
|
{
|
||||||
|
_inputActionAsset = inputActionAsset;
|
||||||
|
SetupInputCallbacks();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обработка всех карт ввода
|
||||||
|
private void SetupInputCallbacks()
|
||||||
|
{
|
||||||
|
SetupGameplayInputCallbacks();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обработка геймплейной карты ввода
|
||||||
|
private void SetupGameplayInputCallbacks()
|
||||||
|
{
|
||||||
|
// Инициализация геймплейной карты ввода
|
||||||
|
var gameplayMap = _inputActionAsset.FindActionMap("Gameplay");
|
||||||
|
|
||||||
|
// Обработка взгляда (камера)
|
||||||
|
var lookAction = gameplayMap.FindAction("Look");
|
||||||
|
if (lookAction != null)
|
||||||
|
{
|
||||||
|
lookAction.performed += OnLookPerformed;
|
||||||
|
lookAction.canceled += OnLookCanceled;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обработка зума (камера)
|
||||||
|
var zoomAction = gameplayMap.FindAction("Zoom");
|
||||||
|
if (zoomAction != null)
|
||||||
|
{
|
||||||
|
zoomAction.performed += OnZoomPerformed;
|
||||||
|
zoomAction.canceled += OnZoomCanceled;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обработка движения (персонаж)
|
||||||
|
var moveAction = gameplayMap.FindAction("Move");
|
||||||
|
if (moveAction != null)
|
||||||
|
{
|
||||||
|
moveAction.performed += OnMovePerformed;
|
||||||
|
moveAction.canceled += OnMoveCanceled;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обработка прыжков (персонаж)
|
||||||
|
var jumpAction = gameplayMap.FindAction("Jump");
|
||||||
|
if (jumpAction != null)
|
||||||
|
{
|
||||||
|
jumpAction.performed += OnJumpPerformed;
|
||||||
|
jumpAction.canceled += OnJumpCanceled;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обработка спринта (персонаж)
|
||||||
|
var sprintAction = gameplayMap.FindAction("Sprint");
|
||||||
|
if (sprintAction != null)
|
||||||
|
{
|
||||||
|
sprintAction.performed += OnSprintPerformed;
|
||||||
|
sprintAction.canceled += OnSprintCanceled;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обработка слайда (персонаж)
|
||||||
|
var slideAction = gameplayMap.FindAction("Slide");
|
||||||
|
if (slideAction != null)
|
||||||
|
{
|
||||||
|
slideAction.performed += OnSlidePerformed;
|
||||||
|
slideAction.canceled += OnSlideCanceled;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обработка переключения режима камеры
|
||||||
|
var toggleCameraModeAction = gameplayMap.FindAction("ToggleCameraMode");
|
||||||
|
if (toggleCameraModeAction != null)
|
||||||
|
{
|
||||||
|
toggleCameraModeAction.performed += OnToggleCameraModePerformed;
|
||||||
|
toggleCameraModeAction.canceled += OnToggleCameraModeCanceled;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnLookPerformed(InputAction.CallbackContext context)
|
||||||
|
{
|
||||||
|
LookInput = context.ReadValue<Vector2>();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnLookCanceled(InputAction.CallbackContext context)
|
||||||
|
{
|
||||||
|
LookInput = Vector2.zero;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnZoomPerformed(InputAction.CallbackContext context)
|
||||||
|
{
|
||||||
|
ZoomInput = context.ReadValue<float>();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnZoomCanceled(InputAction.CallbackContext context)
|
||||||
|
{
|
||||||
|
ZoomInput = 0f;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnMovePerformed(InputAction.CallbackContext context)
|
||||||
|
{
|
||||||
|
MoveInput = context.ReadValue<Vector2>();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnMoveCanceled(InputAction.CallbackContext context)
|
||||||
|
{
|
||||||
|
MoveInput = Vector2.zero;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnJumpPerformed(InputAction.CallbackContext context)
|
||||||
|
{
|
||||||
|
JumpPressed = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnJumpCanceled(InputAction.CallbackContext context)
|
||||||
|
{
|
||||||
|
JumpPressed = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnSprintPerformed(InputAction.CallbackContext context)
|
||||||
|
{
|
||||||
|
SprintPressed = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnSprintCanceled(InputAction.CallbackContext context)
|
||||||
|
{
|
||||||
|
SprintPressed = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnSlidePerformed(InputAction.CallbackContext context)
|
||||||
|
{
|
||||||
|
SlidePressed = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnSlideCanceled(InputAction.CallbackContext context)
|
||||||
|
{
|
||||||
|
SlidePressed = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnToggleCameraModePerformed(InputAction.CallbackContext context)
|
||||||
|
{
|
||||||
|
ToggleCameraModePressed = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnToggleCameraModeCanceled(InputAction.CallbackContext context)
|
||||||
|
{
|
||||||
|
ToggleCameraModePressed = false;
|
||||||
|
}
|
||||||
|
|
||||||
public void EnableMap(ActionMappings actionMap) => _inputActionAsset.actionMaps[(int)actionMap].Enable();
|
public void EnableMap(ActionMappings actionMap) => _inputActionAsset.actionMaps[(int)actionMap].Enable();
|
||||||
public void DisableMap(ActionMappings actionMap) => _inputActionAsset.actionMaps[(int)actionMap].Disable();
|
public void DisableMap(ActionMappings actionMap) => _inputActionAsset.actionMaps[(int)actionMap].Disable();
|
||||||
@@ -20,13 +172,29 @@ namespace Code.Input
|
|||||||
_inputActionAsset
|
_inputActionAsset
|
||||||
.actionMaps[mapId].actions[actionId].performed -= action;
|
.actionMaps[mapId].actions[actionId].performed -= action;
|
||||||
|
|
||||||
public InputService(InputActionAsset inputActionAsset)
|
|
||||||
{
|
|
||||||
_inputActionAsset = inputActionAsset;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
|
var gameplayMap = _inputActionAsset.FindActionMap("Gameplay");
|
||||||
|
gameplayMap.FindAction("Look").performed -= OnLookPerformed;
|
||||||
|
gameplayMap.FindAction("Look").canceled -= OnLookCanceled;
|
||||||
|
|
||||||
|
gameplayMap.FindAction("Zoom").performed -= OnZoomPerformed;
|
||||||
|
gameplayMap.FindAction("Zoom").canceled -= OnZoomCanceled;
|
||||||
|
|
||||||
|
gameplayMap.FindAction("Move").performed -= OnMovePerformed;
|
||||||
|
gameplayMap.FindAction("Move").canceled -= OnMoveCanceled;
|
||||||
|
|
||||||
|
gameplayMap.FindAction("Jump").performed -= OnJumpPerformed;
|
||||||
|
gameplayMap.FindAction("Jump").canceled -= OnJumpCanceled;
|
||||||
|
|
||||||
|
gameplayMap.FindAction("Sprint").performed -= OnSprintPerformed;
|
||||||
|
gameplayMap.FindAction("Sprint").canceled -= OnSprintCanceled;
|
||||||
|
|
||||||
|
gameplayMap.FindAction("Slide").performed -= OnSlidePerformed;
|
||||||
|
gameplayMap.FindAction("Slide").canceled -= OnSlideCanceled;
|
||||||
|
|
||||||
|
gameplayMap.FindAction("ToggleCameraMode").performed -= OnToggleCameraModePerformed;
|
||||||
|
gameplayMap.FindAction("ToggleCameraMode").canceled -= OnToggleCameraModeCanceled;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -4,6 +4,8 @@ namespace Code.Scenes
|
|||||||
{
|
{
|
||||||
Initial,
|
Initial,
|
||||||
MainMenu,
|
MainMenu,
|
||||||
Gameplay
|
Gameplay,
|
||||||
|
// TODO: поменяно для теста
|
||||||
|
MovementDev
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,11 +1,13 @@
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using Code.Configs;
|
using Code.Configs;
|
||||||
|
|
||||||
namespace StaticData
|
namespace Code.StaticData
|
||||||
{
|
{
|
||||||
public partial interface IStaticDataService
|
public interface IStaticDataService
|
||||||
{
|
{
|
||||||
void Load();
|
void Load();
|
||||||
// InputConfig InputConfig { get; }
|
InputConfig InputConfig { get; }
|
||||||
|
AppConfig AppConfig { get; }
|
||||||
|
CharacterCameraConfig CharacterCameraConfig { get; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2,18 +2,19 @@ using Code.Configs;
|
|||||||
using Code.Constants;
|
using Code.Constants;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
namespace StaticData
|
namespace Code.StaticData
|
||||||
{
|
{
|
||||||
public partial class StaticDataService : IStaticDataService
|
public class StaticDataService : IStaticDataService
|
||||||
{
|
{
|
||||||
// public AppConfig AppConfig { get; private set; }
|
public AppConfig AppConfig { get; private set; }
|
||||||
// public InputConfig InputConfig { get; private set; }
|
public InputConfig InputConfig { get; private set; }
|
||||||
|
public CharacterCameraConfig CharacterCameraConfig { get; private set; }
|
||||||
|
|
||||||
public void Load()
|
public void Load()
|
||||||
{
|
{
|
||||||
// InputConfig = Resources.Load<InputConfig>(string.Format(StringPaths.ConfigSingle, "App", "InputConfig"));
|
InputConfig = Resources.Load<InputConfig>(string.Format(StringPaths.ConfigSingle, "App", "InputConfig"));
|
||||||
// AppConfig = Resources.Load<AppConfig>(string.Format(StringPaths.ConfigSingle, "App", "AppConfig"));
|
AppConfig = Resources.Load<AppConfig>(string.Format(StringPaths.ConfigSingle, "App", "AppConfig"));
|
||||||
|
CharacterCameraConfig = Resources.Load<CharacterCameraConfig>(string.Format(StringPaths.ConfigSingle, "App", "CharacterCameraConfig"));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
%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: 72fbf590e5fd4747acfdd32eb26bba3a, type: 3}
|
||||||
|
m_Name: CharacterCameraConfig
|
||||||
|
m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.CharacterCameraConfig
|
||||||
|
defaultDistance: 6
|
||||||
|
minDistance: 3
|
||||||
|
maxDistance: 10
|
||||||
|
distanceMovementSpeed: 5
|
||||||
|
rotationSpeed: 0.3
|
||||||
|
rotationSharpness: 100
|
||||||
|
followSharpness: 100
|
||||||
|
minVerticalAngle: -70
|
||||||
|
maxVerticalAngle: 70
|
||||||
|
defaultVerticalAngle: 10
|
||||||
|
defaultCameraMode: 0
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 6938984fc7d25285abb4922dd46d9272
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b1c9dc62b0eb2cfba9161205c17e150a
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,138 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &-8082666438668706547
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 11
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion
|
||||||
|
version: 10
|
||||||
|
--- !u!21 &2100000
|
||||||
|
Material:
|
||||||
|
serializedVersion: 8
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: GroundTestMaterial
|
||||||
|
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
|
||||||
|
m_Parent: {fileID: 0}
|
||||||
|
m_ModifiedSerializedProperties: 0
|
||||||
|
m_ValidKeywords:
|
||||||
|
- _DETAIL_MULX2
|
||||||
|
m_InvalidKeywords: []
|
||||||
|
m_LightmapFlags: 4
|
||||||
|
m_EnableInstancingVariants: 0
|
||||||
|
m_DoubleSidedGI: 0
|
||||||
|
m_CustomRenderQueue: -1
|
||||||
|
stringTagMap:
|
||||||
|
RenderType: Opaque
|
||||||
|
disabledShaderPasses:
|
||||||
|
- MOTIONVECTORS
|
||||||
|
m_LockedProperties:
|
||||||
|
m_SavedProperties:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TexEnvs:
|
||||||
|
- _BaseMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _BumpMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailAlbedoMap:
|
||||||
|
m_Texture: {fileID: 2800000, guid: 084980307d793717d9a5b1b4852db839, type: 3}
|
||||||
|
m_Scale: {x: 1000, y: 1000}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailMask:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailNormalMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _EmissionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MainTex:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MetallicGlossMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _OcclusionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _ParallaxMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _SpecGlossMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- unity_Lightmaps:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- unity_LightmapsInd:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- unity_ShadowMasks:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
m_Ints: []
|
||||||
|
m_Floats:
|
||||||
|
- _AddPrecomputedVelocity: 0
|
||||||
|
- _AlphaClip: 0
|
||||||
|
- _AlphaToMask: 0
|
||||||
|
- _Blend: 0
|
||||||
|
- _BlendModePreserveSpecular: 1
|
||||||
|
- _BumpScale: 1
|
||||||
|
- _ClearCoatMask: 0
|
||||||
|
- _ClearCoatSmoothness: 0
|
||||||
|
- _Cull: 2
|
||||||
|
- _Cutoff: 0.5
|
||||||
|
- _DetailAlbedoMapScale: 1
|
||||||
|
- _DetailNormalMapScale: 1
|
||||||
|
- _DstBlend: 0
|
||||||
|
- _DstBlendAlpha: 0
|
||||||
|
- _EnvironmentReflections: 1
|
||||||
|
- _GlossMapScale: 0
|
||||||
|
- _Glossiness: 0
|
||||||
|
- _GlossyReflections: 0
|
||||||
|
- _Metallic: 0
|
||||||
|
- _OcclusionStrength: 1
|
||||||
|
- _Parallax: 0.005
|
||||||
|
- _QueueOffset: 0
|
||||||
|
- _ReceiveShadows: 1
|
||||||
|
- _Smoothness: 0.5
|
||||||
|
- _SmoothnessTextureChannel: 0
|
||||||
|
- _SpecularHighlights: 1
|
||||||
|
- _SrcBlend: 1
|
||||||
|
- _SrcBlendAlpha: 1
|
||||||
|
- _Surface: 0
|
||||||
|
- _WorkflowMode: 1
|
||||||
|
- _XRMotionVectorsPass: 1
|
||||||
|
- _ZWrite: 1
|
||||||
|
m_Colors:
|
||||||
|
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
|
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||||
|
m_BuildTextureStacks: []
|
||||||
|
m_AllowLocking: 1
|
||||||
+3
-2
@@ -1,7 +1,8 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: a002d8e3561f9667f890a8821e86a1d4
|
guid: 115fc1c80dafb04e0a00ffed85cfb715
|
||||||
DefaultImporter:
|
NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 2100000
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName:
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,138 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &-8082666438668706547
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 11
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion
|
||||||
|
version: 10
|
||||||
|
--- !u!21 &2100000
|
||||||
|
Material:
|
||||||
|
serializedVersion: 8
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: WallsMateriall
|
||||||
|
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
|
||||||
|
m_Parent: {fileID: 0}
|
||||||
|
m_ModifiedSerializedProperties: 0
|
||||||
|
m_ValidKeywords:
|
||||||
|
- _DETAIL_MULX2
|
||||||
|
m_InvalidKeywords: []
|
||||||
|
m_LightmapFlags: 4
|
||||||
|
m_EnableInstancingVariants: 0
|
||||||
|
m_DoubleSidedGI: 0
|
||||||
|
m_CustomRenderQueue: -1
|
||||||
|
stringTagMap:
|
||||||
|
RenderType: Opaque
|
||||||
|
disabledShaderPasses:
|
||||||
|
- MOTIONVECTORS
|
||||||
|
m_LockedProperties:
|
||||||
|
m_SavedProperties:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TexEnvs:
|
||||||
|
- _BaseMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _BumpMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailAlbedoMap:
|
||||||
|
m_Texture: {fileID: 2800000, guid: 084980307d793717d9a5b1b4852db839, type: 3}
|
||||||
|
m_Scale: {x: 5, y: 5}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailMask:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailNormalMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _EmissionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MainTex:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MetallicGlossMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _OcclusionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _ParallaxMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _SpecGlossMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- unity_Lightmaps:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- unity_LightmapsInd:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- unity_ShadowMasks:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
m_Ints: []
|
||||||
|
m_Floats:
|
||||||
|
- _AddPrecomputedVelocity: 0
|
||||||
|
- _AlphaClip: 0
|
||||||
|
- _AlphaToMask: 0
|
||||||
|
- _Blend: 0
|
||||||
|
- _BlendModePreserveSpecular: 1
|
||||||
|
- _BumpScale: 1
|
||||||
|
- _ClearCoatMask: 0
|
||||||
|
- _ClearCoatSmoothness: 0
|
||||||
|
- _Cull: 2
|
||||||
|
- _Cutoff: 0.5
|
||||||
|
- _DetailAlbedoMapScale: 1
|
||||||
|
- _DetailNormalMapScale: 1
|
||||||
|
- _DstBlend: 0
|
||||||
|
- _DstBlendAlpha: 0
|
||||||
|
- _EnvironmentReflections: 1
|
||||||
|
- _GlossMapScale: 0
|
||||||
|
- _Glossiness: 0
|
||||||
|
- _GlossyReflections: 0
|
||||||
|
- _Metallic: 0
|
||||||
|
- _OcclusionStrength: 1
|
||||||
|
- _Parallax: 0.005
|
||||||
|
- _QueueOffset: 0
|
||||||
|
- _ReceiveShadows: 1
|
||||||
|
- _Smoothness: 0.5
|
||||||
|
- _SmoothnessTextureChannel: 0
|
||||||
|
- _SpecularHighlights: 1
|
||||||
|
- _SrcBlend: 1
|
||||||
|
- _SrcBlendAlpha: 1
|
||||||
|
- _Surface: 0
|
||||||
|
- _WorkflowMode: 1
|
||||||
|
- _XRMotionVectorsPass: 1
|
||||||
|
- _ZWrite: 1
|
||||||
|
m_Colors:
|
||||||
|
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
|
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||||
|
m_BuildTextureStacks: []
|
||||||
|
m_AllowLocking: 1
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b407164ea2464a05a97202efff71afc6
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 2100000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
@@ -0,0 +1,130 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 084980307d793717d9a5b1b4852db839
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 13
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 1
|
||||||
|
sRGBTexture: 0
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
flipGreenChannel: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
vTOnly: 0
|
||||||
|
ignoreMipmapLimit: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 0
|
||||||
|
aniso: 1
|
||||||
|
mipBias: 0
|
||||||
|
wrapU: 0
|
||||||
|
wrapV: 0
|
||||||
|
wrapW: 0
|
||||||
|
nPOTScale: 1
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 0
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 0
|
||||||
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
|
spritePixelsToUnits: 100
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
|
alphaUsage: 1
|
||||||
|
alphaIsTransparency: 0
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 0
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
flipbookRows: 1
|
||||||
|
flipbookColumns: 1
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
ignorePngGamma: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
swizzle: 50462976
|
||||||
|
cookieLightType: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: Android
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
customData:
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spriteCustomMetadata:
|
||||||
|
entries: []
|
||||||
|
nameFileIdTable: {}
|
||||||
|
mipmapLimitGroupName:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
File diff suppressed because it is too large.
Load diff
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 8d1c473ace2ded67e9cdc2d160de8895
|
guid: de5b9a1ae6b033560b88d00b149b86bd
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
@@ -547,28 +547,19 @@
|
|||||||
"initialStateCheck": true
|
"initialStateCheck": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Attack",
|
"name": "Zoom",
|
||||||
"type": "Button",
|
"type": "Value",
|
||||||
"id": "6c2ab1b8-8984-453a-af3d-a3c78ae1679a",
|
"id": "6a7a1c09-c0f8-4ffe-94e0-3dc5e9e279d4",
|
||||||
"expectedControlType": "Button",
|
"expectedControlType": "Axis",
|
||||||
"processors": "",
|
"processors": "",
|
||||||
"interactions": "",
|
"interactions": "",
|
||||||
"initialStateCheck": false
|
"initialStateCheck": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Interact",
|
"name": "ToggleCameraMode",
|
||||||
"type": "Button",
|
"type": "Button",
|
||||||
"id": "852140f2-7766-474d-8707-702459ba45f3",
|
"id": "53b8a816-6ab5-4c21-81e2-211187b50e95",
|
||||||
"expectedControlType": "Button",
|
"expectedControlType": "",
|
||||||
"processors": "",
|
|
||||||
"interactions": "Hold",
|
|
||||||
"initialStateCheck": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Crouch",
|
|
||||||
"type": "Button",
|
|
||||||
"id": "27c5f898-bc57-4ee1-8800-db469aca5fe3",
|
|
||||||
"expectedControlType": "Button",
|
|
||||||
"processors": "",
|
"processors": "",
|
||||||
"interactions": "",
|
"interactions": "",
|
||||||
"initialStateCheck": false
|
"initialStateCheck": false
|
||||||
@@ -577,29 +568,20 @@
|
|||||||
"name": "Jump",
|
"name": "Jump",
|
||||||
"type": "Button",
|
"type": "Button",
|
||||||
"id": "f1ba0d36-48eb-4cd5-b651-1c94a6531f70",
|
"id": "f1ba0d36-48eb-4cd5-b651-1c94a6531f70",
|
||||||
"expectedControlType": "Button",
|
|
||||||
"processors": "",
|
|
||||||
"interactions": "",
|
|
||||||
"initialStateCheck": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Previous",
|
|
||||||
"type": "Button",
|
|
||||||
"id": "2776c80d-3c14-4091-8c56-d04ced07a2b0",
|
|
||||||
"expectedControlType": "Button",
|
|
||||||
"processors": "",
|
|
||||||
"interactions": "",
|
|
||||||
"initialStateCheck": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Next",
|
|
||||||
"type": "Button",
|
|
||||||
"id": "b7230bb6-fc9b-4f52-8b25-f5e19cb2c2ba",
|
|
||||||
"expectedControlType": "",
|
"expectedControlType": "",
|
||||||
"processors": "",
|
"processors": "",
|
||||||
"interactions": "",
|
"interactions": "",
|
||||||
"initialStateCheck": false
|
"initialStateCheck": false
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "Interact",
|
||||||
|
"type": "Button",
|
||||||
|
"id": "852140f2-7766-474d-8707-702459ba45f3",
|
||||||
|
"expectedControlType": "",
|
||||||
|
"processors": "",
|
||||||
|
"interactions": "Hold",
|
||||||
|
"initialStateCheck": false
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "Sprint",
|
"name": "Sprint",
|
||||||
"type": "Button",
|
"type": "Button",
|
||||||
@@ -608,20 +590,18 @@
|
|||||||
"processors": "",
|
"processors": "",
|
||||||
"interactions": "",
|
"interactions": "",
|
||||||
"initialStateCheck": false
|
"initialStateCheck": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Slide",
|
||||||
|
"type": "Button",
|
||||||
|
"id": "27c5f898-bc57-4ee1-8800-db469aca5fe3",
|
||||||
|
"expectedControlType": "",
|
||||||
|
"processors": "",
|
||||||
|
"interactions": "",
|
||||||
|
"initialStateCheck": false
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"bindings": [
|
"bindings": [
|
||||||
{
|
|
||||||
"name": "",
|
|
||||||
"id": "978bfe49-cc26-4a3d-ab7b-7d7a29327403",
|
|
||||||
"path": "<Gamepad>/leftStick",
|
|
||||||
"interactions": "",
|
|
||||||
"processors": "",
|
|
||||||
"groups": ";Gamepad",
|
|
||||||
"action": "Move",
|
|
||||||
"isComposite": false,
|
|
||||||
"isPartOfComposite": false
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "WASD",
|
"name": "WASD",
|
||||||
"id": "00ca640b-d935-4593-8157-c05846ea39b3",
|
"id": "00ca640b-d935-4593-8157-c05846ea39b3",
|
||||||
@@ -723,144 +703,12 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "",
|
"name": "",
|
||||||
"id": "1635d3fe-58b6-4ba9-a4e2-f4b964f6b5c8",
|
"id": "f8ca1921-4be2-4067-8199-ffea9bcefeee",
|
||||||
"path": "<XRController>/{Primary2DAxis}",
|
"path": "<Mouse>/delta",
|
||||||
"interactions": "",
|
|
||||||
"processors": "",
|
|
||||||
"groups": "XR",
|
|
||||||
"action": "Move",
|
|
||||||
"isComposite": false,
|
|
||||||
"isPartOfComposite": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "",
|
|
||||||
"id": "3ea4d645-4504-4529-b061-ab81934c3752",
|
|
||||||
"path": "<Joystick>/stick",
|
|
||||||
"interactions": "",
|
|
||||||
"processors": "",
|
|
||||||
"groups": "Joystick",
|
|
||||||
"action": "Move",
|
|
||||||
"isComposite": false,
|
|
||||||
"isPartOfComposite": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "",
|
|
||||||
"id": "c1f7a91b-d0fd-4a62-997e-7fb9b69bf235",
|
|
||||||
"path": "<Gamepad>/rightStick",
|
|
||||||
"interactions": "",
|
|
||||||
"processors": "",
|
|
||||||
"groups": ";Gamepad",
|
|
||||||
"action": "Look",
|
|
||||||
"isComposite": false,
|
|
||||||
"isPartOfComposite": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "",
|
|
||||||
"id": "8c8e490b-c610-4785-884f-f04217b23ca4",
|
|
||||||
"path": "<Pointer>/delta",
|
|
||||||
"interactions": "",
|
|
||||||
"processors": "",
|
|
||||||
"groups": ";Keyboard&Mouse;Touch",
|
|
||||||
"action": "Look",
|
|
||||||
"isComposite": false,
|
|
||||||
"isPartOfComposite": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "",
|
|
||||||
"id": "3e5f5442-8668-4b27-a940-df99bad7e831",
|
|
||||||
"path": "<Joystick>/{Hatswitch}",
|
|
||||||
"interactions": "",
|
|
||||||
"processors": "",
|
|
||||||
"groups": "Joystick",
|
|
||||||
"action": "Look",
|
|
||||||
"isComposite": false,
|
|
||||||
"isPartOfComposite": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "",
|
|
||||||
"id": "143bb1cd-cc10-4eca-a2f0-a3664166fe91",
|
|
||||||
"path": "<Gamepad>/buttonWest",
|
|
||||||
"interactions": "",
|
|
||||||
"processors": "",
|
|
||||||
"groups": ";Gamepad",
|
|
||||||
"action": "Attack",
|
|
||||||
"isComposite": false,
|
|
||||||
"isPartOfComposite": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "",
|
|
||||||
"id": "05f6913d-c316-48b2-a6bb-e225f14c7960",
|
|
||||||
"path": "<Mouse>/leftButton",
|
|
||||||
"interactions": "",
|
"interactions": "",
|
||||||
"processors": "",
|
"processors": "",
|
||||||
"groups": ";Keyboard&Mouse",
|
"groups": ";Keyboard&Mouse",
|
||||||
"action": "Attack",
|
"action": "Look",
|
||||||
"isComposite": false,
|
|
||||||
"isPartOfComposite": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "",
|
|
||||||
"id": "886e731e-7071-4ae4-95c0-e61739dad6fd",
|
|
||||||
"path": "<Touchscreen>/primaryTouch/tap",
|
|
||||||
"interactions": "",
|
|
||||||
"processors": "",
|
|
||||||
"groups": ";Touch",
|
|
||||||
"action": "Attack",
|
|
||||||
"isComposite": false,
|
|
||||||
"isPartOfComposite": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "",
|
|
||||||
"id": "ee3d0cd2-254e-47a7-a8cb-bc94d9658c54",
|
|
||||||
"path": "<Joystick>/trigger",
|
|
||||||
"interactions": "",
|
|
||||||
"processors": "",
|
|
||||||
"groups": "Joystick",
|
|
||||||
"action": "Attack",
|
|
||||||
"isComposite": false,
|
|
||||||
"isPartOfComposite": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "",
|
|
||||||
"id": "8255d333-5683-4943-a58a-ccb207ff1dce",
|
|
||||||
"path": "<XRController>/{PrimaryAction}",
|
|
||||||
"interactions": "",
|
|
||||||
"processors": "",
|
|
||||||
"groups": "XR",
|
|
||||||
"action": "Attack",
|
|
||||||
"isComposite": false,
|
|
||||||
"isPartOfComposite": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "",
|
|
||||||
"id": "b3c1c7f0-bd20-4ee7-a0f1-899b24bca6d7",
|
|
||||||
"path": "<Keyboard>/enter",
|
|
||||||
"interactions": "",
|
|
||||||
"processors": "",
|
|
||||||
"groups": "Keyboard&Mouse",
|
|
||||||
"action": "Attack",
|
|
||||||
"isComposite": false,
|
|
||||||
"isPartOfComposite": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "",
|
|
||||||
"id": "cbac6039-9c09-46a1-b5f2-4e5124ccb5ed",
|
|
||||||
"path": "<Keyboard>/2",
|
|
||||||
"interactions": "",
|
|
||||||
"processors": "",
|
|
||||||
"groups": "Keyboard&Mouse",
|
|
||||||
"action": "Next",
|
|
||||||
"isComposite": false,
|
|
||||||
"isPartOfComposite": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "",
|
|
||||||
"id": "e15ca19d-e649-4852-97d5-7fe8ccc44e94",
|
|
||||||
"path": "<Gamepad>/dpad/right",
|
|
||||||
"interactions": "",
|
|
||||||
"processors": "",
|
|
||||||
"groups": "Gamepad",
|
|
||||||
"action": "Next",
|
|
||||||
"isComposite": false,
|
"isComposite": false,
|
||||||
"isPartOfComposite": false
|
"isPartOfComposite": false
|
||||||
},
|
},
|
||||||
@@ -875,28 +723,6 @@
|
|||||||
"isComposite": false,
|
"isComposite": false,
|
||||||
"isPartOfComposite": false
|
"isPartOfComposite": false
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "",
|
|
||||||
"id": "8cbb2f4b-a784-49cc-8d5e-c010b8c7f4e6",
|
|
||||||
"path": "<Gamepad>/leftStickPress",
|
|
||||||
"interactions": "",
|
|
||||||
"processors": "",
|
|
||||||
"groups": "Gamepad",
|
|
||||||
"action": "Sprint",
|
|
||||||
"isComposite": false,
|
|
||||||
"isPartOfComposite": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "",
|
|
||||||
"id": "d8bf24bf-3f2f-4160-a97c-38ec1eb520ba",
|
|
||||||
"path": "<XRController>/trigger",
|
|
||||||
"interactions": "",
|
|
||||||
"processors": "",
|
|
||||||
"groups": "XR",
|
|
||||||
"action": "Sprint",
|
|
||||||
"isComposite": false,
|
|
||||||
"isPartOfComposite": false
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "",
|
"name": "",
|
||||||
"id": "eb40bb66-4559-4dfa-9a2f-820438abb426",
|
"id": "eb40bb66-4559-4dfa-9a2f-820438abb426",
|
||||||
@@ -908,50 +734,6 @@
|
|||||||
"isComposite": false,
|
"isComposite": false,
|
||||||
"isPartOfComposite": false
|
"isPartOfComposite": false
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "",
|
|
||||||
"id": "daba33a1-ad0c-4742-a909-43ad1cdfbeb6",
|
|
||||||
"path": "<Gamepad>/buttonSouth",
|
|
||||||
"interactions": "",
|
|
||||||
"processors": "",
|
|
||||||
"groups": "Gamepad",
|
|
||||||
"action": "Jump",
|
|
||||||
"isComposite": false,
|
|
||||||
"isPartOfComposite": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "",
|
|
||||||
"id": "603f3daf-40bd-4854-8724-93e8017f59e3",
|
|
||||||
"path": "<XRController>/secondaryButton",
|
|
||||||
"interactions": "",
|
|
||||||
"processors": "",
|
|
||||||
"groups": "XR",
|
|
||||||
"action": "Jump",
|
|
||||||
"isComposite": false,
|
|
||||||
"isPartOfComposite": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "",
|
|
||||||
"id": "1534dc16-a6aa-499d-9c3a-22b47347b52a",
|
|
||||||
"path": "<Keyboard>/1",
|
|
||||||
"interactions": "",
|
|
||||||
"processors": "",
|
|
||||||
"groups": "Keyboard&Mouse",
|
|
||||||
"action": "Previous",
|
|
||||||
"isComposite": false,
|
|
||||||
"isPartOfComposite": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "",
|
|
||||||
"id": "25060bbd-a3a6-476e-8fba-45ae484aad05",
|
|
||||||
"path": "<Gamepad>/dpad/left",
|
|
||||||
"interactions": "",
|
|
||||||
"processors": "",
|
|
||||||
"groups": "Gamepad",
|
|
||||||
"action": "Previous",
|
|
||||||
"isComposite": false,
|
|
||||||
"isPartOfComposite": false
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "",
|
"name": "",
|
||||||
"id": "1c04ea5f-b012-41d1-a6f7-02e963b52893",
|
"id": "1c04ea5f-b012-41d1-a6f7-02e963b52893",
|
||||||
@@ -963,36 +745,36 @@
|
|||||||
"isComposite": false,
|
"isComposite": false,
|
||||||
"isPartOfComposite": false
|
"isPartOfComposite": false
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "",
|
|
||||||
"id": "b3f66d0b-7751-423f-908b-a11c5bd95930",
|
|
||||||
"path": "<Gamepad>/buttonNorth",
|
|
||||||
"interactions": "",
|
|
||||||
"processors": "",
|
|
||||||
"groups": "Gamepad",
|
|
||||||
"action": "Interact",
|
|
||||||
"isComposite": false,
|
|
||||||
"isPartOfComposite": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "",
|
|
||||||
"id": "4f4649ac-64a8-4a73-af11-b3faef356a4d",
|
|
||||||
"path": "<Gamepad>/buttonEast",
|
|
||||||
"interactions": "",
|
|
||||||
"processors": "",
|
|
||||||
"groups": "Gamepad",
|
|
||||||
"action": "Crouch",
|
|
||||||
"isComposite": false,
|
|
||||||
"isPartOfComposite": false
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "",
|
"name": "",
|
||||||
"id": "36e52cba-0905-478e-a818-f4bfcb9f3b9a",
|
"id": "36e52cba-0905-478e-a818-f4bfcb9f3b9a",
|
||||||
"path": "<Keyboard>/c",
|
"path": "<Keyboard>/leftCtrl",
|
||||||
"interactions": "",
|
"interactions": "",
|
||||||
"processors": "",
|
"processors": "",
|
||||||
"groups": "Keyboard&Mouse",
|
"groups": "Keyboard&Mouse",
|
||||||
"action": "Crouch",
|
"action": "Slide",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"id": "00080d14-7d66-4e81-9fe8-9c3c9a0bb647",
|
||||||
|
"path": "<Mouse>/scroll/y",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": ";Keyboard&Mouse",
|
||||||
|
"action": "Zoom",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"id": "2f4c687f-f66c-4cd8-93f5-28628df0b86f",
|
||||||
|
"path": "<Keyboard>/v",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": ";Keyboard&Mouse",
|
||||||
|
"action": "ToggleCameraMode",
|
||||||
"isComposite": false,
|
"isComposite": false,
|
||||||
"isPartOfComposite": false
|
"isPartOfComposite": false
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 92086eb0798f4ba0ab0c0a31d97c11f8
|
|
||||||
timeCreated: 1760964642
|
|
||||||
Binary file not shown.
@@ -1,52 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 4ed19f8ecd1da4abeb97d4be53b8915b
|
|
||||||
labels:
|
|
||||||
- RoslynAnalyzer
|
|
||||||
PluginImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
serializedVersion: 3
|
|
||||||
iconMap: {}
|
|
||||||
executionOrder: {}
|
|
||||||
defineConstraints: []
|
|
||||||
isPreloaded: 0
|
|
||||||
isOverridable: 0
|
|
||||||
isExplicitlyReferenced: 1
|
|
||||||
validateReferences: 0
|
|
||||||
platformData:
|
|
||||||
Any:
|
|
||||||
enabled: 0
|
|
||||||
settings:
|
|
||||||
Exclude Editor: 1
|
|
||||||
Exclude Linux64: 1
|
|
||||||
Exclude OSXUniversal: 1
|
|
||||||
Exclude Win: 1
|
|
||||||
Exclude Win64: 1
|
|
||||||
Editor:
|
|
||||||
enabled: 0
|
|
||||||
settings:
|
|
||||||
CPU: AnyCPU
|
|
||||||
DefaultValueInitialized: true
|
|
||||||
OS: AnyOS
|
|
||||||
Linux64:
|
|
||||||
enabled: 0
|
|
||||||
settings:
|
|
||||||
CPU: None
|
|
||||||
OSXUniversal:
|
|
||||||
enabled: 0
|
|
||||||
settings:
|
|
||||||
CPU: None
|
|
||||||
Win:
|
|
||||||
enabled: 0
|
|
||||||
settings:
|
|
||||||
CPU: None
|
|
||||||
Win64:
|
|
||||||
enabled: 0
|
|
||||||
settings:
|
|
||||||
CPU: None
|
|
||||||
WindowsStoreApps:
|
|
||||||
enabled: 0
|
|
||||||
settings:
|
|
||||||
CPU: AnyCPU
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
-6
@@ -1,6 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="VcsDirectoryMappings">
|
|
||||||
<mapping directory="$PROJECT_DIR$/../../../../.." vcs="Git" />
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
Generated
-105
@@ -1,105 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="AutoGeneratedRunConfigurationManager">
|
|
||||||
<projectFile profileName="DebugRoslynSourceGenerator">CodeGenerators/CodeGenerators/CodeGenerators.csproj</projectFile>
|
|
||||||
</component>
|
|
||||||
<component name="AutoImportSettings">
|
|
||||||
<option name="autoReloadType" value="SELECTIVE" />
|
|
||||||
</component>
|
|
||||||
<component name="ChangeListManager">
|
|
||||||
<list default="true" id="3248ee45-8a29-4268-80d4-87163bd5ff88" name="Changes" comment="">
|
|
||||||
<change afterPath="$PROJECT_DIR$/../../_Project.meta" afterDir="false" />
|
|
||||||
<change afterPath="$PROJECT_DIR$/../SourceGenerators~/CodeGenerators/.idea/.idea.CodeGenerators/.idea/.gitignore" afterDir="false" />
|
|
||||||
<change afterPath="$PROJECT_DIR$/../SourceGenerators~/CodeGenerators/.idea/.idea.CodeGenerators/.idea/indexLayout.xml" afterDir="false" />
|
|
||||||
<change afterPath="$PROJECT_DIR$/../SourceGenerators~/CodeGenerators/CodeGenerators/CodeGenerators/ConfigGenerator.cs" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/../../Code/Gameplay.meta" beforeDir="false" />
|
|
||||||
</list>
|
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
||||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
||||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
|
||||||
</component>
|
|
||||||
<component name="Git.Settings">
|
|
||||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../../../../.." />
|
|
||||||
</component>
|
|
||||||
<component name="ProblemsViewState">
|
|
||||||
<option name="selectedTabId" value="Toolset" />
|
|
||||||
</component>
|
|
||||||
<component name="ProjectColorInfo"><![CDATA[{
|
|
||||||
"associatedIndex": 6
|
|
||||||
}]]></component>
|
|
||||||
<component name="ProjectId" id="34KauyviZ56hhCr7tcEygR167mc" />
|
|
||||||
<component name="ProjectViewState">
|
|
||||||
<option name="hideEmptyMiddlePackages" value="true" />
|
|
||||||
<option name="showLibraryContents" value="true" />
|
|
||||||
</component>
|
|
||||||
<component name="PropertiesComponent"><![CDATA[{
|
|
||||||
"keyToString": {
|
|
||||||
"ModuleVcsDetector.initialDetectionPerformed": "true",
|
|
||||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
|
||||||
"RunOnceActivity.git.unshallow": "true",
|
|
||||||
"git-widget-placeholder": "ConfigCodeWriter",
|
|
||||||
"last_opened_file_path": "/home/blackknight/Projects/CourierOld/Game/CourierOld/Assets/_Project/SourceGenerators~/CodeGenerators",
|
|
||||||
"node.js.detected.package.eslint": "true",
|
|
||||||
"node.js.detected.package.tslint": "true",
|
|
||||||
"node.js.selected.package.eslint": "(autodetect)",
|
|
||||||
"node.js.selected.package.tslint": "(autodetect)",
|
|
||||||
"nodejs_package_manager_path": "npm",
|
|
||||||
"vue.rearranger.settings.migration": "true"
|
|
||||||
}
|
|
||||||
}]]></component>
|
|
||||||
<component name="RunManager">
|
|
||||||
<configuration name="CodeGenerators: DebugRoslynSourceGenerator" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
|
|
||||||
<option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/CodeGenerators/CodeGenerators/CodeGenerators.csproj" />
|
|
||||||
<option name="LAUNCH_PROFILE_TFM" value=".NETStandard,Version=v2.0" />
|
|
||||||
<option name="LAUNCH_PROFILE_NAME" value="DebugRoslynSourceGenerator" />
|
|
||||||
<option name="USE_EXTERNAL_CONSOLE" value="0" />
|
|
||||||
<option name="USE_MONO" value="0" />
|
|
||||||
<option name="RUNTIME_ARGUMENTS" value="" />
|
|
||||||
<option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
|
|
||||||
<option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
|
|
||||||
<option name="SEND_DEBUG_REQUEST" value="1" />
|
|
||||||
<option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
|
|
||||||
<option name="AUTO_ATTACH_CHILDREN" value="0" />
|
|
||||||
<method v="2">
|
|
||||||
<option name="Build" />
|
|
||||||
</method>
|
|
||||||
</configuration>
|
|
||||||
</component>
|
|
||||||
<component name="TaskManager">
|
|
||||||
<task active="true" id="Default" summary="Default task">
|
|
||||||
<changelist id="3248ee45-8a29-4268-80d4-87163bd5ff88" name="Changes" comment="" />
|
|
||||||
<created>1760964944152</created>
|
|
||||||
<option name="number" value="Default" />
|
|
||||||
<option name="presentableId" value="Default" />
|
|
||||||
<updated>1760964944152</updated>
|
|
||||||
<workItem from="1760964945251" duration="774000" />
|
|
||||||
</task>
|
|
||||||
<servers />
|
|
||||||
</component>
|
|
||||||
<component name="TypeScriptGeneratedFilesManager">
|
|
||||||
<option name="version" value="3" />
|
|
||||||
</component>
|
|
||||||
<component name="UnityProjectConfiguration" hasMinimizedUI="false" />
|
|
||||||
<component name="VcsManagerConfiguration">
|
|
||||||
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
|
|
||||||
</component>
|
|
||||||
<component name="XDebuggerManager">
|
|
||||||
<breakpoint-manager>
|
|
||||||
<breakpoints>
|
|
||||||
<breakpoint enabled="true" type="DotNet_Exception_Breakpoints">
|
|
||||||
<properties exception="System.OperationCanceledException" breakIfHandledByOtherCode="false" displayValue="System.OperationCanceledException" />
|
|
||||||
<option name="timeStamp" value="1" />
|
|
||||||
</breakpoint>
|
|
||||||
<breakpoint enabled="true" type="DotNet_Exception_Breakpoints">
|
|
||||||
<properties exception="System.Threading.Tasks.TaskCanceledException" breakIfHandledByOtherCode="false" displayValue="System.Threading.Tasks.TaskCanceledException" />
|
|
||||||
<option name="timeStamp" value="2" />
|
|
||||||
</breakpoint>
|
|
||||||
<breakpoint enabled="true" type="DotNet_Exception_Breakpoints">
|
|
||||||
<properties exception="System.Threading.ThreadAbortException" breakIfHandledByOtherCode="false" displayValue="System.Threading.ThreadAbortException" />
|
|
||||||
<option name="timeStamp" value="3" />
|
|
||||||
</breakpoint>
|
|
||||||
</breakpoints>
|
|
||||||
</breakpoint-manager>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
-13
@@ -1,13 +0,0 @@
|
|||||||
# Default ignored files
|
|
||||||
/shelf/
|
|
||||||
/workspace.xml
|
|
||||||
# Rider ignored files
|
|
||||||
/modules.xml
|
|
||||||
/.idea.CodeGenerators.iml
|
|
||||||
/contentModel.xml
|
|
||||||
/projectSettingsUpdater.xml
|
|
||||||
# Editor-based HTTP Client requests
|
|
||||||
/httpRequests/
|
|
||||||
# Datasource local storage ignored files
|
|
||||||
/dataSources/
|
|
||||||
/dataSources.local.xml
|
|
||||||
-8
@@ -1,8 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="UserContentModel">
|
|
||||||
<attachedFolders />
|
|
||||||
<explicitIncludes />
|
|
||||||
<explicitExcludes />
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
-6
@@ -1,6 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="VcsDirectoryMappings">
|
|
||||||
<mapping directory="$PROJECT_DIR$/../../../../../.." vcs="Git" />
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
-216
@@ -1,216 +0,0 @@
|
|||||||
using Microsoft.CodeAnalysis;
|
|
||||||
using Microsoft.CodeAnalysis.Text;
|
|
||||||
using System.Text;
|
|
||||||
using System.CodeDom.Compiler;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Collections.Immutable;
|
|
||||||
using System.IO;
|
|
||||||
using System.Linq;
|
|
||||||
using Microsoft.CodeAnalysis.CSharp.Syntax;
|
|
||||||
|
|
||||||
namespace ExampleGenerator
|
|
||||||
{
|
|
||||||
[Generator]
|
|
||||||
public class ConfigGenerator : IIncrementalGenerator
|
|
||||||
{
|
|
||||||
|
|
||||||
private const string Namespace = "Generators";
|
|
||||||
private const string SingleAttributeName = "SingleConfig";
|
|
||||||
private const string MultipleAttributeName = "MultipleConfig";
|
|
||||||
private const string AttributeFieldName = "ToConfig";
|
|
||||||
|
|
||||||
private const string AttributesSourceCode = $@"// <auto-generated/> Go Fuck Yourself. All rights reserved.
|
|
||||||
namespace {Namespace}
|
|
||||||
{{[System.AttributeUsage(System.AttributeTargets.Class | System.AttributeTargets.Struct)]
|
|
||||||
public class SingleConfig : System.Attribute
|
|
||||||
{{
|
|
||||||
}}
|
|
||||||
[System.AttributeUsage(System.AttributeTargets.Class | System.AttributeTargets.Struct)]
|
|
||||||
public class MultipleConfig : System.Attribute
|
|
||||||
{{
|
|
||||||
}}
|
|
||||||
[System.AttributeUsage(System.AttributeTargets.Field | System.AttributeTargets.Property)]
|
|
||||||
public class ToConfig : System.Attribute
|
|
||||||
{{
|
|
||||||
}}}}";
|
|
||||||
|
|
||||||
public void Initialize(IncrementalGeneratorInitializationContext context)
|
|
||||||
{
|
|
||||||
context.RegisterPostInitializationOutput(ctx => ctx.AddSource(
|
|
||||||
"ConfigAttribute.g.cs",
|
|
||||||
SourceText.From(AttributesSourceCode, Encoding.UTF8)));
|
|
||||||
|
|
||||||
// Filter classes annotated with the [Report] attribute. Only filtered Syntax Nodes can trigger code generation.
|
|
||||||
var provider = context.SyntaxProvider
|
|
||||||
.CreateSyntaxProvider(
|
|
||||||
(s, _) => s is ClassDeclarationSyntax,
|
|
||||||
(ctx, _) => GetClassDeclarationForSourceGen(ctx))
|
|
||||||
.Where(t => t.reportAttributeFound)
|
|
||||||
.Select((t, _) => t.Item1);
|
|
||||||
|
|
||||||
// var assemblyName = context.CompilationProvider.Select(static (compilation, _) => compilation.AssemblyName);
|
|
||||||
// context.RegisterSourceOutput(assemblyName, (spc, currentAssemblyName) =>
|
|
||||||
// {
|
|
||||||
// if (currentAssemblyName == "Assembly-CSharp")
|
|
||||||
// {
|
|
||||||
// spc.AddSource("ConfigGenerator.g.cs", GenerateSource());
|
|
||||||
// }
|
|
||||||
// });
|
|
||||||
List<string> loadMethods = null;
|
|
||||||
context.RegisterSourceOutput(context.CompilationProvider.Combine(provider.Collect()),
|
|
||||||
((ctx, t) => GenerateCode(ctx, t.Left, t.Right, out loadMethods)));
|
|
||||||
|
|
||||||
if(loadMethods == null) return;
|
|
||||||
|
|
||||||
var staticDataService = $@"// <auto-generated/> Go Load Yourself. All rights reserved.
|
|
||||||
|
|
||||||
using Configs;
|
|
||||||
|
|
||||||
namespace StaticData
|
|
||||||
{{
|
|
||||||
public partial class StaticDataService : IStaticDataService
|
|
||||||
{{
|
|
||||||
public void Load(){{
|
|
||||||
{string.Join("\n",loadMethods)}
|
|
||||||
}}
|
|
||||||
}}
|
|
||||||
}}";
|
|
||||||
context.RegisterPostInitializationOutput(ctx => ctx.AddSource(
|
|
||||||
"StaticDataService.g.cs",
|
|
||||||
SourceText.From(staticDataService, Encoding.UTF8)));
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Checks whether the Node is annotated with the [Report] attribute and maps syntax context to the specific node type (ClassDeclarationSyntax).
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="context">Syntax context, based on CreateSyntaxProvider predicate</param>
|
|
||||||
/// <returns>The specific cast and whether the attribute was found.</returns>
|
|
||||||
private static (ClassDeclarationSyntax, bool reportAttributeFound) GetClassDeclarationForSourceGen(
|
|
||||||
GeneratorSyntaxContext context)
|
|
||||||
{
|
|
||||||
var classDeclarationSyntax = (ClassDeclarationSyntax)context.Node;
|
|
||||||
|
|
||||||
// Go through all attributes of the class.
|
|
||||||
foreach (AttributeListSyntax attributeListSyntax in classDeclarationSyntax.AttributeLists)
|
|
||||||
foreach (AttributeSyntax attributeSyntax in attributeListSyntax.Attributes)
|
|
||||||
{
|
|
||||||
if (context.SemanticModel.GetSymbolInfo(attributeSyntax).Symbol is not IMethodSymbol attributeSymbol)
|
|
||||||
continue; // if we can't get the symbol, ignore it
|
|
||||||
|
|
||||||
string attributeName = attributeSymbol.ContainingType.ToDisplayString();
|
|
||||||
|
|
||||||
// Check the full name of the attribute.
|
|
||||||
if (attributeName is $"{Namespace}.{SingleAttributeName}" or $"{Namespace}.{MultipleAttributeName}")
|
|
||||||
return (classDeclarationSyntax, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (classDeclarationSyntax, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Generate code action.
|
|
||||||
/// It will be executed on specific nodes (ClassDeclarationSyntax annotated with the [Report] attribute) changed by the user.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="context">Source generation context used to add source files.</param>
|
|
||||||
/// <param name="compilation">Compilation used to provide access to the Semantic Model.</param>
|
|
||||||
/// <param name="classDeclarations">Nodes annotated with the [Report] attribute that trigger the generate action.</param>
|
|
||||||
private void GenerateCode(SourceProductionContext context, Compilation compilation,
|
|
||||||
ImmutableArray<ClassDeclarationSyntax> classDeclarations, out List<string> loadMethods)
|
|
||||||
{
|
|
||||||
loadMethods = new List<string>();
|
|
||||||
// Go through all filtered class declarations.
|
|
||||||
foreach (var classDeclarationSyntax in classDeclarations)
|
|
||||||
{
|
|
||||||
// We need to get semantic model of the class to retrieve metadata.
|
|
||||||
var semanticModel = compilation.GetSemanticModel(classDeclarationSyntax.SyntaxTree);
|
|
||||||
|
|
||||||
// Symbols allow us to get the compile-time information.
|
|
||||||
if (semanticModel.GetDeclaredSymbol(classDeclarationSyntax) is not INamedTypeSymbol classSymbol)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
var namespaceName = classSymbol.ContainingNamespace.ToDisplayString();
|
|
||||||
|
|
||||||
// 'Identifier' means the token of the node. Get class name from the syntax node.
|
|
||||||
var className = classDeclarationSyntax.Identifier.Text;
|
|
||||||
|
|
||||||
// Go through all class members with a particular type (property) to generate method lines.
|
|
||||||
// var methodBody = classSymbol.GetMembers()
|
|
||||||
// .OfType<IFieldSymbol>()
|
|
||||||
// .Where(p => p.GetAttributes().Any(a => a.AttributeClass?.ToString() == AttributeFieldName))
|
|
||||||
// .Select(p =>
|
|
||||||
// $@"public {p.Type} {p.Name} = {p.ConstantValue ?? 0};"); // e.g. yield return $"Id:{this.Id}";
|
|
||||||
var methodBody = classSymbol
|
|
||||||
.GetMembers()
|
|
||||||
.OfType<IFieldSymbol>()
|
|
||||||
.Where(field => field.GetAttributes()
|
|
||||||
.Any(attr => attr.AttributeClass?.ToDisplayString() == $"{Namespace}.{AttributeFieldName}"))
|
|
||||||
.Select(field =>
|
|
||||||
{
|
|
||||||
string typeName = field.Type.ToDisplayString(SymbolDisplayFormat.CSharpErrorMessageFormat);
|
|
||||||
// Безопасная подстановка значения по умолчанию
|
|
||||||
string defaultValue = field.Type.IsReferenceType
|
|
||||||
? "null"
|
|
||||||
: "default";
|
|
||||||
return $"public {typeName} {field.Name} = {defaultValue};";
|
|
||||||
});
|
|
||||||
// Build up the source code
|
|
||||||
var code = $@"// <auto-generated/> Go Fuck Yourself. All rights reserved.
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using UnityEngine;
|
|
||||||
using Code.Constants;
|
|
||||||
|
|
||||||
namespace Configs{{
|
|
||||||
[CreateAssetMenu(fileName = ""{className}Config"", menuName = ""Config/{className}"")]
|
|
||||||
public partial class {className}Config : ScriptableObject
|
|
||||||
{{
|
|
||||||
{string.Join("\n", methodBody)}
|
|
||||||
}}
|
|
||||||
}}";
|
|
||||||
bool isMultiple = classSymbol.GetAttributes().FirstOrDefault(attr =>
|
|
||||||
attr.AttributeClass?.ToDisplayString() == $"{Namespace}.{SingleAttributeName}") != null;
|
|
||||||
|
|
||||||
string staticDataService;
|
|
||||||
if (isMultiple)
|
|
||||||
staticDataService = $@"
|
|
||||||
|
|
||||||
// <auto-generated/> Go Load Yourself. All rights reserved.
|
|
||||||
|
|
||||||
namespace StaticData
|
|
||||||
{{
|
|
||||||
public partial interface IStaticDataService
|
|
||||||
{{
|
|
||||||
Configs.{className}Config {className}Config {{get;}}
|
|
||||||
}}
|
|
||||||
|
|
||||||
public partial class StaticDataService : IStaticDataService
|
|
||||||
{{
|
|
||||||
public Configs.{className}Config {className}Config {{get; private set;}}
|
|
||||||
|
|
||||||
private void Load{className}()
|
|
||||||
{{
|
|
||||||
{className}Config = Resources.Load<Configs.{className}Config>(string.Format(StringPaths.ConfigSingle, ""{className}"",""{className}Config""));
|
|
||||||
}}
|
|
||||||
}}
|
|
||||||
|
|
||||||
}}";
|
|
||||||
else
|
|
||||||
staticDataService = $@"// <auto-generated/> Go Load Yourself. All rights reserved.
|
|
||||||
|
|
||||||
using Code.Constants;
|
|
||||||
using Configs;
|
|
||||||
|
|
||||||
namespace StaticData
|
|
||||||
{{
|
|
||||||
public partial class StaticDataService
|
|
||||||
{{
|
|
||||||
|
|
||||||
}}
|
|
||||||
}}";
|
|
||||||
loadMethods.Add($"Load{className}Config();");
|
|
||||||
// Add the source code to the compilation.
|
|
||||||
context.AddSource($"{className}.g.cs", SourceText.From(code + staticDataService, Encoding.UTF8));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-2
@@ -1,2 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: eed97fc5e2d6e3cdb929d87a13bb379b
|
|
||||||
-8
@@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 9a51c7cfe4373818caaa0996997710a2
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
-9
@@ -1,9 +0,0 @@
|
|||||||
{
|
|
||||||
"$schema": "https://json.schemastore.org/launchsettings.json",
|
|
||||||
"profiles": {
|
|
||||||
"DebugRoslynSourceGenerator": {
|
|
||||||
"commandName": "DebugRoslynComponent",
|
|
||||||
"targetProject": "../CodeGenerators.Sample/CodeGenerators.Sample.csproj"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-7
@@ -1,7 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: d2efcc639b2ef4ca698f6604c72faf16
|
|
||||||
TextScriptImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
-8
@@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: cf04d5bdf022e9526a202f67902cd62a
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
-8
@@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 81c26039d2aec5742913b51aa32daed6
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
-8
@@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 3755e2fc933c38f6ab8bc271723cc6c2
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
-311
@@ -1,311 +0,0 @@
|
|||||||
{
|
|
||||||
"runtimeTarget": {
|
|
||||||
"name": ".NETStandard,Version=v2.0/",
|
|
||||||
"signature": ""
|
|
||||||
},
|
|
||||||
"compilationOptions": {},
|
|
||||||
"targets": {
|
|
||||||
".NETStandard,Version=v2.0": {},
|
|
||||||
".NETStandard,Version=v2.0/": {
|
|
||||||
"CodeGenerators/1.0.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.CodeAnalysis.Analyzers": "3.3.4",
|
|
||||||
"Microsoft.CodeAnalysis.CSharp": "4.3.0",
|
|
||||||
"Microsoft.CodeAnalysis.CSharp.Workspaces": "4.3.0",
|
|
||||||
"NETStandard.Library": "2.0.3"
|
|
||||||
},
|
|
||||||
"runtime": {
|
|
||||||
"CodeGenerators.dll": {}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Humanizer.Core/2.14.1": {},
|
|
||||||
"Microsoft.Bcl.AsyncInterfaces/6.0.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"System.Threading.Tasks.Extensions": "4.5.4"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.CodeAnalysis.Analyzers/3.3.4": {},
|
|
||||||
"Microsoft.CodeAnalysis.Common/4.3.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.CodeAnalysis.Analyzers": "3.3.4",
|
|
||||||
"System.Collections.Immutable": "6.0.0",
|
|
||||||
"System.Memory": "4.5.4",
|
|
||||||
"System.Reflection.Metadata": "5.0.0",
|
|
||||||
"System.Runtime.CompilerServices.Unsafe": "6.0.0",
|
|
||||||
"System.Text.Encoding.CodePages": "6.0.0",
|
|
||||||
"System.Threading.Tasks.Extensions": "4.5.4"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.CodeAnalysis.CSharp/4.3.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.CodeAnalysis.Common": "4.3.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.CodeAnalysis.CSharp.Workspaces/4.3.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"Humanizer.Core": "2.14.1",
|
|
||||||
"Microsoft.CodeAnalysis.CSharp": "4.3.0",
|
|
||||||
"Microsoft.CodeAnalysis.Common": "4.3.0",
|
|
||||||
"Microsoft.CodeAnalysis.Workspaces.Common": "4.3.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.CodeAnalysis.Workspaces.Common/4.3.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"Humanizer.Core": "2.14.1",
|
|
||||||
"Microsoft.Bcl.AsyncInterfaces": "6.0.0",
|
|
||||||
"Microsoft.CodeAnalysis.Common": "4.3.0",
|
|
||||||
"System.Composition": "6.0.0",
|
|
||||||
"System.IO.Pipelines": "6.0.3"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.NETCore.Platforms/1.1.0": {},
|
|
||||||
"NETStandard.Library/2.0.3": {
|
|
||||||
"dependencies": {
|
|
||||||
"Microsoft.NETCore.Platforms": "1.1.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"System.Buffers/4.5.1": {},
|
|
||||||
"System.Collections.Immutable/6.0.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"System.Memory": "4.5.4",
|
|
||||||
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"System.Composition/6.0.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"System.Composition.AttributedModel": "6.0.0",
|
|
||||||
"System.Composition.Convention": "6.0.0",
|
|
||||||
"System.Composition.Hosting": "6.0.0",
|
|
||||||
"System.Composition.Runtime": "6.0.0",
|
|
||||||
"System.Composition.TypedParts": "6.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"System.Composition.AttributedModel/6.0.0": {},
|
|
||||||
"System.Composition.Convention/6.0.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"System.Composition.AttributedModel": "6.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"System.Composition.Hosting/6.0.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"System.Composition.Runtime": "6.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"System.Composition.Runtime/6.0.0": {},
|
|
||||||
"System.Composition.TypedParts/6.0.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"System.Composition.AttributedModel": "6.0.0",
|
|
||||||
"System.Composition.Hosting": "6.0.0",
|
|
||||||
"System.Composition.Runtime": "6.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"System.IO.Pipelines/6.0.3": {
|
|
||||||
"dependencies": {
|
|
||||||
"System.Buffers": "4.5.1",
|
|
||||||
"System.Memory": "4.5.4",
|
|
||||||
"System.Threading.Tasks.Extensions": "4.5.4"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"System.Memory/4.5.4": {
|
|
||||||
"dependencies": {
|
|
||||||
"System.Buffers": "4.5.1",
|
|
||||||
"System.Numerics.Vectors": "4.4.0",
|
|
||||||
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"System.Numerics.Vectors/4.4.0": {},
|
|
||||||
"System.Reflection.Metadata/5.0.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"System.Collections.Immutable": "6.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"System.Runtime.CompilerServices.Unsafe/6.0.0": {},
|
|
||||||
"System.Text.Encoding.CodePages/6.0.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"System.Memory": "4.5.4",
|
|
||||||
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"System.Threading.Tasks.Extensions/4.5.4": {
|
|
||||||
"dependencies": {
|
|
||||||
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"libraries": {
|
|
||||||
"CodeGenerators/1.0.0": {
|
|
||||||
"type": "project",
|
|
||||||
"serviceable": false,
|
|
||||||
"sha512": ""
|
|
||||||
},
|
|
||||||
"Humanizer.Core/2.14.1": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-lQKvtaTDOXnoVJ20ibTuSIOf2i0uO0MPbDhd1jm238I+U/2ZnRENj0cktKZhtchBMtCUSRQ5v4xBCUbKNmyVMw==",
|
|
||||||
"path": "humanizer.core/2.14.1",
|
|
||||||
"hashPath": "humanizer.core.2.14.1.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"Microsoft.Bcl.AsyncInterfaces/6.0.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==",
|
|
||||||
"path": "microsoft.bcl.asyncinterfaces/6.0.0",
|
|
||||||
"hashPath": "microsoft.bcl.asyncinterfaces.6.0.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"Microsoft.CodeAnalysis.Analyzers/3.3.4": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-AxkxcPR+rheX0SmvpLVIGLhOUXAKG56a64kV9VQZ4y9gR9ZmPXnqZvHJnmwLSwzrEP6junUF11vuc+aqo5r68g==",
|
|
||||||
"path": "microsoft.codeanalysis.analyzers/3.3.4",
|
|
||||||
"hashPath": "microsoft.codeanalysis.analyzers.3.3.4.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"Microsoft.CodeAnalysis.Common/4.3.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-Hhaw6DKZHiR+vgOdIqvndfUntJhmDR7MjylUJ55EvWtDyJFLDf2eij8r9tcwXP35FLD+bVNNCO0+KIYuvJjNnA==",
|
|
||||||
"path": "microsoft.codeanalysis.common/4.3.0",
|
|
||||||
"hashPath": "microsoft.codeanalysis.common.4.3.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"Microsoft.CodeAnalysis.CSharp/4.3.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-0PU4a2h7L6N9SlF/oNHwj2A/+n0LK/7n6PEGvXyIZq8hc7r/TztB+47mhVLvapT6bWSV7nMT78cNxbQuC6tk6g==",
|
|
||||||
"path": "microsoft.codeanalysis.csharp/4.3.0",
|
|
||||||
"hashPath": "microsoft.codeanalysis.csharp.4.3.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"Microsoft.CodeAnalysis.CSharp.Workspaces/4.3.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-CH2kezeYUD9/+nGs7QZ6xpOqD6OH6000YkAyU8LbhqLp7W65Xb+HerBzDX9yfprmRwArlF887QhZd8nW6enHIg==",
|
|
||||||
"path": "microsoft.codeanalysis.csharp.workspaces/4.3.0",
|
|
||||||
"hashPath": "microsoft.codeanalysis.csharp.workspaces.4.3.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"Microsoft.CodeAnalysis.Workspaces.Common/4.3.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-oFF7lU3dQIeEbAVF6Qq/YEA4jvys3oQKkDezP8NcQTFgD8uRUiIA4NimRxANaWxK2n2PT4DAQspIOtrAE2hSdA==",
|
|
||||||
"path": "microsoft.codeanalysis.workspaces.common/4.3.0",
|
|
||||||
"hashPath": "microsoft.codeanalysis.workspaces.common.4.3.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"Microsoft.NETCore.Platforms/1.1.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==",
|
|
||||||
"path": "microsoft.netcore.platforms/1.1.0",
|
|
||||||
"hashPath": "microsoft.netcore.platforms.1.1.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"NETStandard.Library/2.0.3": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==",
|
|
||||||
"path": "netstandard.library/2.0.3",
|
|
||||||
"hashPath": "netstandard.library.2.0.3.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"System.Buffers/4.5.1": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==",
|
|
||||||
"path": "system.buffers/4.5.1",
|
|
||||||
"hashPath": "system.buffers.4.5.1.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"System.Collections.Immutable/6.0.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-l4zZJ1WU2hqpQQHXz1rvC3etVZN+2DLmQMO79FhOTZHMn8tDRr+WU287sbomD0BETlmKDn0ygUgVy9k5xkkJdA==",
|
|
||||||
"path": "system.collections.immutable/6.0.0",
|
|
||||||
"hashPath": "system.collections.immutable.6.0.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"System.Composition/6.0.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-d7wMuKQtfsxUa7S13tITC8n1cQzewuhD5iDjZtK2prwFfKVzdYtgrTHgjaV03Zq7feGQ5gkP85tJJntXwInsJA==",
|
|
||||||
"path": "system.composition/6.0.0",
|
|
||||||
"hashPath": "system.composition.6.0.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"System.Composition.AttributedModel/6.0.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-WK1nSDLByK/4VoC7fkNiFuTVEiperuCN/Hyn+VN30R+W2ijO1d0Z2Qm0ScEl9xkSn1G2MyapJi8xpf4R8WRa/w==",
|
|
||||||
"path": "system.composition.attributedmodel/6.0.0",
|
|
||||||
"hashPath": "system.composition.attributedmodel.6.0.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"System.Composition.Convention/6.0.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-XYi4lPRdu5bM4JVJ3/UIHAiG6V6lWWUlkhB9ab4IOq0FrRsp0F4wTyV4Dj+Ds+efoXJ3qbLqlvaUozDO7OLeXA==",
|
|
||||||
"path": "system.composition.convention/6.0.0",
|
|
||||||
"hashPath": "system.composition.convention.6.0.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"System.Composition.Hosting/6.0.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-w/wXjj7kvxuHPLdzZ0PAUt++qJl03t7lENmb2Oev0n3zbxyNULbWBlnd5J5WUMMv15kg5o+/TCZFb6lSwfaUUQ==",
|
|
||||||
"path": "system.composition.hosting/6.0.0",
|
|
||||||
"hashPath": "system.composition.hosting.6.0.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"System.Composition.Runtime/6.0.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-qkRH/YBaMPTnzxrS5RDk1juvqed4A6HOD/CwRcDGyPpYps1J27waBddiiq1y93jk2ZZ9wuA/kynM+NO0kb3PKg==",
|
|
||||||
"path": "system.composition.runtime/6.0.0",
|
|
||||||
"hashPath": "system.composition.runtime.6.0.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"System.Composition.TypedParts/6.0.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-iUR1eHrL8Cwd82neQCJ00MpwNIBs4NZgXzrPqx8NJf/k4+mwBO0XCRmHYJT4OLSwDDqh5nBLJWkz5cROnrGhRA==",
|
|
||||||
"path": "system.composition.typedparts/6.0.0",
|
|
||||||
"hashPath": "system.composition.typedparts.6.0.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"System.IO.Pipelines/6.0.3": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-ryTgF+iFkpGZY1vRQhfCzX0xTdlV3pyaTTqRu2ETbEv+HlV7O6y7hyQURnghNIXvctl5DuZ//Dpks6HdL/Txgw==",
|
|
||||||
"path": "system.io.pipelines/6.0.3",
|
|
||||||
"hashPath": "system.io.pipelines.6.0.3.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"System.Memory/4.5.4": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==",
|
|
||||||
"path": "system.memory/4.5.4",
|
|
||||||
"hashPath": "system.memory.4.5.4.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"System.Numerics.Vectors/4.4.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==",
|
|
||||||
"path": "system.numerics.vectors/4.4.0",
|
|
||||||
"hashPath": "system.numerics.vectors.4.4.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"System.Reflection.Metadata/5.0.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ==",
|
|
||||||
"path": "system.reflection.metadata/5.0.0",
|
|
||||||
"hashPath": "system.reflection.metadata.5.0.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"System.Runtime.CompilerServices.Unsafe/6.0.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==",
|
|
||||||
"path": "system.runtime.compilerservices.unsafe/6.0.0",
|
|
||||||
"hashPath": "system.runtime.compilerservices.unsafe.6.0.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"System.Text.Encoding.CodePages/6.0.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==",
|
|
||||||
"path": "system.text.encoding.codepages/6.0.0",
|
|
||||||
"hashPath": "system.text.encoding.codepages.6.0.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"System.Threading.Tasks.Extensions/4.5.4": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==",
|
|
||||||
"path": "system.threading.tasks.extensions/4.5.4",
|
|
||||||
"hashPath": "system.threading.tasks.extensions.4.5.4.nupkg.sha512"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-7
@@ -1,7 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 41e84519c0d0fb0e9829622911e0918d
|
|
||||||
TextScriptImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
Loaded 100 of 144 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user