RevertionConsiquences
This commit is contained in:
ThomasCharester committed
1 parent
eb3be451b3
commit
c9f78af1cb
34 files changed
+6
-937
No files matched your search
@@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 65cf716f111fb36a19123f807ecdce25
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 2588e84eb64800d0781c574a37fa48d8
|
|
||||||
NativeFormatImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
mainObjectFileID: 11400000
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 1ac379942ee61a312a9830cb792d2871
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@@ -1,79 +0,0 @@
|
|||||||
%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
@@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 14909e654d6c7bd958ff44091773bd40
|
|
||||||
NativeFormatImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
mainObjectFileID: 11400000
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: a39981dbe6de5001397f5ca9a8a37e1a
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
%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
@@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 7c592a6445170e8379910601b962cb30
|
|
||||||
NativeFormatImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
mainObjectFileID: 11400000
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 25c8e3b4ddb778a6d84ae525564a7ee1
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
-48
@@ -1,48 +0,0 @@
|
|||||||
%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
@@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 75ffac7db08d9615c994048949431551
|
|
||||||
NativeFormatImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
mainObjectFileID: 11400000
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
-16
@@ -1,16 +0,0 @@
|
|||||||
%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
@@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 6d6fed27b8c8a3eebb9bc5289b7a6956
|
|
||||||
NativeFormatImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
mainObjectFileID: 11400000
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: d870ba11c395ba2d6b17a441e8e68cef
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
%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
@@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 1ac723026a19cb90d8d5dd77ce8c384b
|
|
||||||
NativeFormatImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
mainObjectFileID: 11400000
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
%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
@@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 1d3143f4a67a990fc9532b22a020137d
|
|
||||||
NativeFormatImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
mainObjectFileID: 11400000
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
-20
@@ -1,20 +0,0 @@
|
|||||||
%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
@@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: e628a9e942e45e1ca94ad90d02e9acdf
|
|
||||||
NativeFormatImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
mainObjectFileID: 11400000
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
%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
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 9338e51d1f2239ddbb8f2c6232a2b678
|
|
||||||
NativeFormatImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
mainObjectFileID: 11400000
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@@ -1,157 +0,0 @@
|
|||||||
using KinematicCharacterController;
|
|
||||||
using UnityEngine;
|
|
||||||
|
|
||||||
namespace Code.Gameplay.Player
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
* Скрипт, отвечающий за передвижения игрока
|
|
||||||
* Реализует физическое движение персонажа с использованием Kinematic Character Controller
|
|
||||||
* Обрабатывает ввод пользователя, применяет движение и вращение с учетом поверхности
|
|
||||||
*
|
|
||||||
* Источник: Tvtig, https://www.youtube.com/watch?v=9ibpY64wBYM
|
|
||||||
*/
|
|
||||||
|
|
||||||
// Структура для хранения входных данных от игрока
|
|
||||||
public struct PlayerInputs
|
|
||||||
{
|
|
||||||
public float MoveAxisForward; // Ввод движения вперед/назад (W/S или Up/Down)
|
|
||||||
public float MoveAxisRight; // Ввод движения влево/вправо (A/D или Left/Right)
|
|
||||||
public Quaternion CameraRotation; // Текущее вращение камеры для определения направления движения
|
|
||||||
}
|
|
||||||
|
|
||||||
public class CharacterController : MonoBehaviour, ICharacterController
|
|
||||||
{
|
|
||||||
[SerializeField]
|
|
||||||
private KinematicCharacterMotor motor; // Движок физического перемещения персонажа
|
|
||||||
|
|
||||||
[SerializeField]
|
|
||||||
private float
|
|
||||||
maxStableMoveSpeed = 10f, // Максимальная скорость движения по устойчивой поверхности
|
|
||||||
stableMovementSharpness = 15f, // Резкость изменения скорости движения (чем выше - тем резче)
|
|
||||||
orientationSharpness = 10f; // Резкость изменения вращения персонажа (чем выше - тем резче)
|
|
||||||
|
|
||||||
// Векторы движения и направления взгляда
|
|
||||||
private Vector3 _moveInputVector, _lookInputVector;
|
|
||||||
|
|
||||||
// Инициализация контроллера
|
|
||||||
private void Start()
|
|
||||||
{
|
|
||||||
motor.CharacterController = this; // Регистрация этого контроллера в движке
|
|
||||||
}
|
|
||||||
|
|
||||||
// Обработка и преобразование входных данных от игрока
|
|
||||||
public void SetInputs(ref PlayerInputs inputs)
|
|
||||||
{
|
|
||||||
// Нормализация вектора движения и ограничение его величины до 1
|
|
||||||
Vector3 moveInputVector =
|
|
||||||
Vector3.ClampMagnitude(new Vector3(inputs.MoveAxisRight, 0, inputs.MoveAxisForward), 1f);
|
|
||||||
|
|
||||||
// Получение направления камеры в горизонтальной плоскости (игнорируя наклон)
|
|
||||||
Vector3 cameraPlanarDirection =
|
|
||||||
Vector3.ProjectOnPlane(inputs.CameraRotation * Vector3.forward, motor.CharacterUp).normalized;
|
|
||||||
|
|
||||||
// Резервный расчет направления, если основное направление параллельно вертикали
|
|
||||||
if (cameraPlanarDirection.sqrMagnitude == 0f)
|
|
||||||
{
|
|
||||||
cameraPlanarDirection = Vector3.ProjectOnPlane(inputs.CameraRotation * Vector3.up, motor.CharacterUp);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Создание вращения на основе направления камеры
|
|
||||||
Quaternion cameraPlanarRotation = Quaternion.LookRotation(cameraPlanarDirection, motor.CharacterUp);
|
|
||||||
|
|
||||||
// Преобразование локального ввода в мировые координаты относительно камеры
|
|
||||||
_moveInputVector = cameraPlanarRotation * moveInputVector;
|
|
||||||
|
|
||||||
// Направление взгляда совпадает с направлением движения (нормализованное)
|
|
||||||
_lookInputVector = _moveInputVector.normalized;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Обновление вращения персонажа на основе входных данных
|
|
||||||
public void UpdateRotation(ref Quaternion currentRotation, float deltaTime)
|
|
||||||
{
|
|
||||||
// Вращение применяется только если есть направление движения и разрешена резкость вращения
|
|
||||||
if (_lookInputVector.sqrMagnitude > 0 && orientationSharpness > 0)
|
|
||||||
{
|
|
||||||
// Плавная интерполяция текущего направления к целевому с экспоненциальным сглаживанием
|
|
||||||
Vector3 smoothedLookInputDirection = Vector3.Slerp(
|
|
||||||
motor.CharacterForward,
|
|
||||||
_lookInputVector,
|
|
||||||
1f - Mathf.Exp(-orientationSharpness * deltaTime)
|
|
||||||
).normalized;
|
|
||||||
|
|
||||||
// Установка нового вращения смотря в сглаженном направлении
|
|
||||||
currentRotation = Quaternion.LookRotation(smoothedLookInputDirection, motor.CharacterUp);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Обновление скорости движения персонажа
|
|
||||||
public void UpdateVelocity(ref Vector3 currentVelocity, float deltaTime)
|
|
||||||
{
|
|
||||||
// Сохранение текущей величины скорости
|
|
||||||
float currentVelocityMagnitude = currentVelocity.magnitude;
|
|
||||||
|
|
||||||
// Получение нормали поверхности для корректного движения по наклонным плоскостям
|
|
||||||
Vector3 effectiveGroundNormal = motor.GroundingStatus.GroundNormal;
|
|
||||||
|
|
||||||
// Переориентация текущей скорости вдоль поверхности
|
|
||||||
currentVelocity = motor.GetDirectionTangentToSurface(currentVelocity, effectiveGroundNormal) * currentVelocityMagnitude;
|
|
||||||
|
|
||||||
// Переориентация входного вектора движения вдоль поверхности
|
|
||||||
Vector3 inputRight = Vector3.Cross(_moveInputVector, motor.CharacterUp);
|
|
||||||
Vector3 reorientedInput = Vector3.Cross(effectiveGroundNormal, inputRight).normalized * _moveInputVector.magnitude;
|
|
||||||
|
|
||||||
// Расчет целевой скорости движения с учетом ограничения максимальной скорости
|
|
||||||
Vector3 targetMovementVelocity = reorientedInput * maxStableMoveSpeed;
|
|
||||||
|
|
||||||
// Плавная интерполяция текущей скорости к целевой с экспоненциальным сглаживанием
|
|
||||||
currentVelocity = Vector3.Lerp(
|
|
||||||
currentVelocity,
|
|
||||||
targetMovementVelocity,
|
|
||||||
1f - Mathf.Exp(-stableMovementSharpness * deltaTime)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Метод вызывается перед обновлением персонажа (можно использовать для подготовки)
|
|
||||||
public void BeforeCharacterUpdate(float deltaTime)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
// Метод вызывается после обработки столкновения с землей
|
|
||||||
public void PostGroundingUpdate(float deltaTime)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
// Метод вызывается после обновления персонажа (можно использовать для пост-обработки)
|
|
||||||
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)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
// Обработка отчета о стабильности столкновения
|
|
||||||
public void ProcessHitStabilityReport(Collider hitCollider, Vector3 hitNormal, Vector3 hitPoint, Vector3 atCharacterPosition,
|
|
||||||
Quaternion atCharacterRotation, ref HitStabilityReport hitStabilityReport)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
// Обработка дискретных столкновений (для триггеров и специальных коллайдеров)
|
|
||||||
public void OnDiscreteCollisionDetected(Collider hitCollider)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: a6f74123648343c498c883d02909b499
|
|
||||||
timeCreated: 1760641740
|
|
||||||
@@ -2,15 +2,12 @@ using Code.Gameplay.Player;
|
|||||||
using Code.Input;
|
using Code.Input;
|
||||||
using Reflex.Attributes;
|
using Reflex.Attributes;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using CharacterController = Code.Gameplay.Player.CharacterController;
|
|
||||||
|
|
||||||
public class Player : MonoBehaviour
|
public class Player : MonoBehaviour
|
||||||
{
|
{
|
||||||
[SerializeField]
|
[SerializeField]
|
||||||
private PlayerCamera playerCamera;
|
private PlayerCamera playerCamera;
|
||||||
[SerializeField]
|
[SerializeField]
|
||||||
private CharacterController characterController;
|
|
||||||
[SerializeField]
|
|
||||||
private Transform cameraFollowPoint;
|
private Transform cameraFollowPoint;
|
||||||
[Inject] private IInputService _inputService;
|
[Inject] private IInputService _inputService;
|
||||||
|
|
||||||
@@ -30,24 +27,6 @@ public class Player : MonoBehaviour
|
|||||||
new Vector3(lookInput.x, lookInput.y, 0));
|
new Vector3(lookInput.x, lookInput.y, 0));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void HandleCharacterInput()
|
|
||||||
{
|
|
||||||
PlayerInputs inputs = new PlayerInputs();
|
|
||||||
|
|
||||||
Vector2 moveInput = _inputService.MoveInput;
|
|
||||||
inputs.MoveAxisForward = moveInput.y;
|
|
||||||
inputs.MoveAxisRight = moveInput.x;
|
|
||||||
|
|
||||||
inputs.CameraRotation = playerCamera.transform.rotation;
|
|
||||||
|
|
||||||
characterController.SetInputs(ref inputs);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void Update()
|
|
||||||
{
|
|
||||||
HandleCharacterInput();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void LateUpdate()
|
private void LateUpdate()
|
||||||
{
|
{
|
||||||
HandleCameraInput();
|
HandleCameraInput();
|
||||||
|
|||||||
@@ -9,6 +9,5 @@ namespace Code.Input
|
|||||||
|
|
||||||
Vector2 LookInput { get; }
|
Vector2 LookInput { get; }
|
||||||
float ZoomInput { get; }
|
float ZoomInput { get; }
|
||||||
Vector2 MoveInput { get; }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -13,7 +13,6 @@ namespace Code.Input
|
|||||||
// Для работы с камерой
|
// Для работы с камерой
|
||||||
public Vector2 LookInput { get; private set; }
|
public Vector2 LookInput { get; private set; }
|
||||||
public float ZoomInput { get; private set; }
|
public float ZoomInput { get; private set; }
|
||||||
public Vector2 MoveInput { get; private set; }
|
|
||||||
|
|
||||||
public InputService(InputActionAsset inputActionAsset)
|
public InputService(InputActionAsset inputActionAsset)
|
||||||
{
|
{
|
||||||
@@ -32,13 +31,6 @@ namespace Code.Input
|
|||||||
var zoomAction = gameplayMap.FindAction("Zoom");
|
var zoomAction = gameplayMap.FindAction("Zoom");
|
||||||
zoomAction.performed += OnZoomPerformed;
|
zoomAction.performed += OnZoomPerformed;
|
||||||
zoomAction.canceled += OnZoomCanceled;
|
zoomAction.canceled += OnZoomCanceled;
|
||||||
|
|
||||||
var moveAction = gameplayMap.FindAction("Move");
|
|
||||||
if (moveAction != null)
|
|
||||||
{
|
|
||||||
moveAction.performed += OnMovePerformed;
|
|
||||||
moveAction.canceled += OnMoveCanceled;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnLookPerformed(InputAction.CallbackContext context)
|
private void OnLookPerformed(InputAction.CallbackContext context)
|
||||||
@@ -60,16 +52,6 @@ namespace Code.Input
|
|||||||
{
|
{
|
||||||
ZoomInput = 0f;
|
ZoomInput = 0f;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnMovePerformed(InputAction.CallbackContext context)
|
|
||||||
{
|
|
||||||
MoveInput = context.ReadValue<Vector2>();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnMoveCanceled(InputAction.CallbackContext context)
|
|
||||||
{
|
|
||||||
MoveInput = Vector2.zero;
|
|
||||||
}
|
|
||||||
|
|
||||||
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();
|
||||||
@@ -88,8 +70,6 @@ namespace Code.Input
|
|||||||
gameplayMap.FindAction("Look").canceled -= OnLookCanceled;
|
gameplayMap.FindAction("Look").canceled -= OnLookCanceled;
|
||||||
gameplayMap.FindAction("Zoom").performed -= OnZoomPerformed;
|
gameplayMap.FindAction("Zoom").performed -= OnZoomPerformed;
|
||||||
gameplayMap.FindAction("Zoom").canceled -= OnZoomCanceled;
|
gameplayMap.FindAction("Zoom").canceled -= OnZoomCanceled;
|
||||||
gameplayMap.FindAction("Move").performed -= OnMovePerformed;
|
|
||||||
gameplayMap.FindAction("Move").canceled -= OnMoveCanceled;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: b1c9dc62b0eb2cfba9161205c17e150a
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@@ -1,138 +0,0 @@
|
|||||||
%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: TestMaterial
|
|
||||||
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
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 115fc1c80dafb04e0a00ffed85cfb715
|
|
||||||
NativeFormatImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
mainObjectFileID: 2100000
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
Binary file not shown.
@@ -1,130 +0,0 @@
|
|||||||
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:
|
|
||||||
@@ -146,7 +146,7 @@ Transform:
|
|||||||
m_GameObject: {fileID: 55880351}
|
m_GameObject: {fileID: 55880351}
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
m_LocalPosition: {x: 0, y: 0.4, z: 0.4}
|
m_LocalPosition: {x: 0.4, y: 0.4, z: 0}
|
||||||
m_LocalScale: {x: 0.5, y: 0.2, z: 0.4}
|
m_LocalScale: {x: 0.5, y: 0.2, z: 0.4}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children: []
|
||||||
@@ -358,8 +358,8 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: f1d98e6c5419411098391c07861e627e, type: 3}
|
m_Script: {fileID: 11500000, guid: f1d98e6c5419411098391c07861e627e, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier: Assembly-CSharp::Code.Gameplay.Player.PlayerCamera
|
m_EditorClassIdentifier: Assembly-CSharp::Code.Gameplay.Player.PlayerCamera
|
||||||
defaultDistance: 0
|
defaultDistance: 6
|
||||||
minDistance: 0
|
minDistance: 6
|
||||||
maxDistance: 10
|
maxDistance: 10
|
||||||
distanceMovementSpeed: 5
|
distanceMovementSpeed: 5
|
||||||
distanceMovementSharpness: 10000
|
distanceMovementSharpness: 10000
|
||||||
@@ -369,9 +369,6 @@ MonoBehaviour:
|
|||||||
minVerticalAngle: -45
|
minVerticalAngle: -45
|
||||||
maxVerticalAngle: 45
|
maxVerticalAngle: 45
|
||||||
defaultVerticalAngle: 10
|
defaultVerticalAngle: 10
|
||||||
minHorizontalAngle: -90
|
|
||||||
maxHorizontalAngle: 90
|
|
||||||
defaultHorizontalAngle: 0
|
|
||||||
--- !u!1 &453575297
|
--- !u!1 &453575297
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -397,7 +394,7 @@ Transform:
|
|||||||
m_GameObject: {fileID: 453575297}
|
m_GameObject: {fileID: 453575297}
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
m_LocalPosition: {x: -0, y: 1.395, z: 0.59}
|
m_LocalPosition: {x: 0.644, y: 1.395, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children: []
|
||||||
@@ -469,7 +466,7 @@ MeshRenderer:
|
|||||||
m_RenderingLayerMask: 1
|
m_RenderingLayerMask: 1
|
||||||
m_RendererPriority: 0
|
m_RendererPriority: 0
|
||||||
m_Materials:
|
m_Materials:
|
||||||
- {fileID: 2100000, guid: 115fc1c80dafb04e0a00ffed85cfb715, type: 2}
|
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
|
||||||
m_StaticBatchInfo:
|
m_StaticBatchInfo:
|
||||||
firstSubMesh: 0
|
firstSubMesh: 0
|
||||||
subMeshCount: 0
|
subMeshCount: 0
|
||||||
@@ -647,9 +644,6 @@ GameObject:
|
|||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 1696686254}
|
- component: {fileID: 1696686254}
|
||||||
- component: {fileID: 1696686255}
|
- component: {fileID: 1696686255}
|
||||||
- component: {fileID: 1696686257}
|
|
||||||
- component: {fileID: 1696686256}
|
|
||||||
- component: {fileID: 1696686258}
|
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: Player
|
m_Name: Player
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@@ -687,89 +681,7 @@ MonoBehaviour:
|
|||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier: Assembly-CSharp::Player
|
m_EditorClassIdentifier: Assembly-CSharp::Player
|
||||||
playerCamera: {fileID: 338454664}
|
playerCamera: {fileID: 338454664}
|
||||||
characterController: {fileID: 1696686258}
|
|
||||||
cameraFollowPoint: {fileID: 453575298}
|
cameraFollowPoint: {fileID: 453575298}
|
||||||
--- !u!114 &1696686256
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1696686253}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 4d1bc5515e3ab954e80599c538834774, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier: Assembly-CSharp::KinematicCharacterController.KinematicCharacterMotor
|
|
||||||
Capsule: {fileID: 1696686257}
|
|
||||||
CapsuleRadius: 0.5
|
|
||||||
CapsuleHeight: 2
|
|
||||||
CapsuleYOffset: 1
|
|
||||||
CapsulePhysicsMaterial: {fileID: 0}
|
|
||||||
GroundDetectionExtraDistance: 0
|
|
||||||
MaxStableSlopeAngle: 60
|
|
||||||
StableGroundLayers:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Bits: 4294967295
|
|
||||||
DiscreteCollisionEvents: 0
|
|
||||||
StepHandling: 1
|
|
||||||
MaxStepHeight: 0.5
|
|
||||||
AllowSteppingWithoutStableGrounding: 0
|
|
||||||
MinRequiredStepDepth: 0.1
|
|
||||||
LedgeAndDenivelationHandling: 1
|
|
||||||
MaxStableDistanceFromLedge: 0.5
|
|
||||||
MaxVelocityForLedgeSnap: 0
|
|
||||||
MaxStableDenivelationAngle: 180
|
|
||||||
InteractiveRigidbodyHandling: 1
|
|
||||||
RigidbodyInteractionType: 0
|
|
||||||
SimulatedCharacterMass: 1
|
|
||||||
PreserveAttachedRigidbodyMomentum: 1
|
|
||||||
HasPlanarConstraint: 0
|
|
||||||
PlanarConstraintAxis: {x: 0, y: 0, z: 1}
|
|
||||||
MaxMovementIterations: 5
|
|
||||||
MaxDecollisionIterations: 1
|
|
||||||
CheckMovementInitialOverlaps: 1
|
|
||||||
KillVelocityWhenExceedMaxMovementIterations: 1
|
|
||||||
KillRemainingMovementWhenExceedMaxMovementIterations: 1
|
|
||||||
--- !u!136 &1696686257
|
|
||||||
CapsuleCollider:
|
|
||||||
m_ObjectHideFlags: 8
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1696686253}
|
|
||||||
m_Material: {fileID: 0}
|
|
||||||
m_IncludeLayers:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Bits: 0
|
|
||||||
m_ExcludeLayers:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Bits: 0
|
|
||||||
m_LayerOverridePriority: 0
|
|
||||||
m_IsTrigger: 0
|
|
||||||
m_ProvidesContacts: 0
|
|
||||||
m_Enabled: 1
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Radius: 0.5
|
|
||||||
m_Height: 2
|
|
||||||
m_Direction: 1
|
|
||||||
m_Center: {x: 0, y: 1, z: 0}
|
|
||||||
--- !u!114 &1696686258
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1696686253}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: a6f74123648343c498c883d02909b499, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier: Assembly-CSharp::Code.Gameplay.Player.CharacterController
|
|
||||||
motor: {fileID: 1696686256}
|
|
||||||
maxStableMoveSpeed: 10
|
|
||||||
stableMovementSharpness: 15
|
|
||||||
orientationSharpness: 10
|
|
||||||
--- !u!1 &1959874989
|
--- !u!1 &1959874989
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@@ -17,6 +17,5 @@ EditorBuildSettings:
|
|||||||
- enabled: 1
|
- enabled: 1
|
||||||
path: Assets/Resources/Scenes/MovementDev.unity
|
path: Assets/Resources/Scenes/MovementDev.unity
|
||||||
guid: de5b9a1ae6b033560b88d00b149b86bd
|
guid: de5b9a1ae6b033560b88d00b149b86bd
|
||||||
m_configObjects:
|
m_configObjects: {}
|
||||||
com.unity.addressableassets: {fileID: 11400000, guid: 9338e51d1f2239ddbb8f2c6232a2b678, type: 2}
|
|
||||||
m_UseUCBPForAssetBundles: 0
|
m_UseUCBPForAssetBundles: 0
|
||||||
Reference in new issue
Block a user