Merge branch 'bugfix/merge02' into bugfix/Fit-It-All-Walkup

# Conflicts:
#	Assets/Scenes/BasicScene.unity

- Fixed overrides from prefab interactor to mav rig instead
- Yaml seemed to make the merge fine with no issues
This commit is contained in:
Kip Taylor 2024-02-01 12:11:08 -05:00
commit f227150895
24 changed files with 571 additions and 631 deletions

View File

@ -255,7 +255,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2802984800076200956}
m_Enabled: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 38f6bf3d943ac7945842268c9ef1dca6, type: 3}
m_Name:
@ -267,7 +267,7 @@ MonoBehaviour:
serializedVersion: 2
m_Bits: 4294967295
m_InteractionLayers:
m_Bits: 1
m_Bits: 2147483648
m_DistanceCalculationMode: 1
m_SelectMode: 1
m_FocusMode: 0

View File

@ -36,7 +36,7 @@ Transform:
- {fileID: 1024681846135835656}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &9066086382404825376
--- !u!1 &2982615903819941980
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -44,216 +44,82 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1678881905511186413}
- component: {fileID: 6438558524540458791}
- component: {fileID: 847489315207023048}
- component: {fileID: 3809377177572539599}
- component: {fileID: 3528166653513292799}
- component: {fileID: 1850494482842731851}
- component: {fileID: 1030684413208022846}
m_Layer: 0
m_Name: Cube.013
m_Name: Light Probe Group
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1678881905511186413
--- !u!4 &1850494482842731851
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9066086382404825376}
m_GameObject: {fileID: 2982615903819941980}
serializedVersion: 2
m_LocalRotation: {x: -0.50400484, y: 0.495963, z: 0.49596277, w: 0.5040047}
m_LocalPosition: {x: -0.048, y: 2.863, z: 2.8900015}
m_LocalScale: {x: 0.02, y: 0.05, z: 0.1147}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.096, y: -3.54, z: 6.55}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2121217650007080507}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 89.078}
--- !u!33 &6438558524540458791
MeshFilter:
m_Father: {fileID: 3221367315705239980}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!220 &1030684413208022846
LightProbeGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9066086382404825376}
m_Mesh: {fileID: 7807538432633192378, guid: b7eeb5ffffc3b0c43bfd21882ddf253c, type: 3}
--- !u!23 &847489315207023048
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9066086382404825376}
m_GameObject: {fileID: 2982615903819941980}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 12ac19f14d55a744ab15f80c99a4a90b, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!65 &3809377177572539599
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9066086382404825376}
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: 3
m_Size: {x: 53.427174, y: 53.427174, z: 3.7410493}
m_Center: {x: 0, y: 0, z: -26.870525}
--- !u!114 &3528166653513292799
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9066086382404825376}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 38f6bf3d943ac7945842268c9ef1dca6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_InteractionManager: {fileID: 0}
m_Colliders:
- {fileID: 3809377177572539599}
m_InteractionLayerMask:
serializedVersion: 2
m_Bits: 4294967295
m_InteractionLayers:
m_Bits: 1
m_DistanceCalculationMode: 1
m_SelectMode: 1
m_FocusMode: 0
m_CustomReticle: {fileID: 0}
m_AllowGazeInteraction: 0
m_AllowGazeSelect: 0
m_OverrideGazeTimeToSelect: 0
m_GazeTimeToSelect: 0.5
m_OverrideTimeToAutoDeselectGaze: 0
m_TimeToAutoDeselectGaze: 3
m_AllowGazeAssistance: 0
m_FirstHoverEntered:
m_PersistentCalls:
m_Calls: []
m_LastHoverExited:
m_PersistentCalls:
m_Calls: []
m_HoverEntered:
m_PersistentCalls:
m_Calls: []
m_HoverExited:
m_PersistentCalls:
m_Calls: []
m_FirstSelectEntered:
m_PersistentCalls:
m_Calls: []
m_LastSelectExited:
m_PersistentCalls:
m_Calls: []
m_SelectEntered:
m_PersistentCalls:
m_Calls: []
m_SelectExited:
m_PersistentCalls:
m_Calls: []
m_FirstFocusEntered:
m_PersistentCalls:
m_Calls: []
m_LastFocusExited:
m_PersistentCalls:
m_Calls: []
m_FocusEntered:
m_PersistentCalls:
m_Calls: []
m_FocusExited:
m_PersistentCalls:
m_Calls: []
m_Activated:
m_PersistentCalls:
m_Calls: []
m_Deactivated:
m_PersistentCalls:
m_Calls: []
m_StartingHoverFilters: []
m_StartingSelectFilters: []
m_StartingInteractionStrengthFilters: []
m_OnFirstHoverEntered:
m_PersistentCalls:
m_Calls: []
m_OnLastHoverExited:
m_PersistentCalls:
m_Calls: []
m_OnHoverEntered:
m_PersistentCalls:
m_Calls: []
m_OnHoverExited:
m_PersistentCalls:
m_Calls: []
m_OnSelectEntered:
m_PersistentCalls:
m_Calls: []
m_OnSelectExited:
m_PersistentCalls:
m_Calls: []
m_OnSelectCanceled:
m_PersistentCalls:
m_Calls: []
m_OnActivate:
m_PersistentCalls:
m_Calls: []
m_OnDeactivate:
m_PersistentCalls:
m_Calls: []
m_TeleportationProvider: {fileID: 0}
m_MatchOrientation: 0
m_MatchDirectionalInput: 1
m_TeleportTrigger: 0
m_FilterSelectionByHitNormal: 0
m_UpNormalToleranceDegrees: 30
m_Teleporting:
m_PersistentCalls:
m_Calls: []
m_SourcePositions:
- {x: 4.6667705, y: 1, z: 0.95842266}
- {x: 4.6192284, y: 1, z: -8.490435}
- {x: 4.6667705, y: -1, z: 0.95842266}
- {x: 4.6192284, y: -1, z: -8.490435}
- {x: -4.830219, y: 1, z: 0.9634237}
- {x: -4.824436, y: 1, z: -8.490621}
- {x: -4.830219, y: -1, z: 0.9634237}
- {x: -4.824436, y: -1, z: -8.490621}
- {x: 0, y: -1, z: -5.1316094}
- {x: 0.15140371, y: -1.1523767, z: -7.952371}
- {x: 1, y: 1, z: 1}
- {x: 1, y: 1, z: -1}
- {x: 1, y: -1, z: 1}
- {x: 1, y: -1, z: -1}
- {x: -1, y: 1, z: 1}
- {x: -1, y: 1, z: -1}
- {x: -1, y: -1, z: 1}
- {x: -1, y: -1, z: -1}
- {x: 0.02, y: -0.16894627, z: 0.46575165}
- {x: 0.02, y: -0.43960094, z: -0.08157635}
- {x: 0.6589702, y: -0.022574425, z: -0.26855946}
- {x: 0.019999996, y: 1.0115731, z: -0.054686546}
- {x: 0.019999996, y: -0.076304436, z: -0.15599251}
- {x: 0.019999996, y: -0.076304436, z: -0.7575507}
- {x: 0.15140371, y: 1, z: -7.952371}
- {x: 2.626775, y: -1, z: -3.1056967}
- {x: -2.6267748, y: -1, z: -4.2222567}
- {x: 2.626775, y: 1, z: -3.1056967}
- {x: -2.6267748, y: 1, z: -4.2222567}
- {x: 0, y: 1, z: -5.1316094}
- {x: 0, y: -1, z: -2.52115}
- {x: 0, y: 1, z: -2.52115}
- {x: 4.6192284, y: 4.0469327, z: -8.490435}
- {x: 0.15140371, y: 4.0469327, z: -7.952371}
- {x: -4.824436, y: 4.0469327, z: -8.490621}
- {x: -4.830219, y: 4.0469327, z: 0.9634237}
- {x: 4.6667705, y: 4.0469327, z: 0.95842266}
- {x: 4.6607966, y: 4.0469327, z: -3.1056967}
- {x: -4.8340964, y: 4.0469327, z: -4.2222567}
- {x: 0.019999996, y: 4.0585055, z: 0.96479034}
- {x: 0, y: 4.0469327, z: -2.52115}
- {x: 0, y: 4.0469327, z: -5.1316094}
m_Dering: 1
--- !u!1001 &1419866860439231652
PrefabInstance:
m_ObjectHideFlags: 0
@ -306,12 +172,13 @@ PrefabInstance:
propertyPath: m_Name
value: FortusRoom
objectReference: {fileID: 0}
- target: {fileID: 3544831050466297144, guid: 0127c4742e006344e81bbc27a7223f62, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 1064104423172711071, guid: 0127c4742e006344e81bbc27a7223f62, type: 3}
insertIndex: -1
addedObject: {fileID: 1678881905511186413}
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0127c4742e006344e81bbc27a7223f62, type: 3}
--- !u!4 &2121217650007080507 stripped
@ -549,7 +416,10 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 2230757397852504524, guid: b56b1fcbe50459d4bb738135015c4c83, type: 3}
insertIndex: -1
addedObject: {fileID: 1850494482842731851}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b56b1fcbe50459d4bb738135015c4c83, type: 3}
--- !u!4 &3221367315705239980 stripped
@ -691,7 +561,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6472885818669066066, guid: 6cb6a0ef3658959438f63da6056f4b95, type: 3}
propertyPath: m_LocalPosition.y
value: 0
value: -0.22
objectReference: {fileID: 0}
- target: {fileID: 6472885818669066066, guid: 6cb6a0ef3658959438f63da6056f4b95, type: 3}
propertyPath: m_LocalPosition.z

View File

@ -3682,10 +3682,18 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 7893157575433883934}
m_Modifications:
- target: {fileID: 2761784063978902503, guid: c1800acf6366418a9b5f610249000331, type: 3}
propertyPath: m_LineType
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2761784063978902503, guid: c1800acf6366418a9b5f610249000331, type: 3}
propertyPath: m_TranslateSpeed
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: 2761784063978902503, guid: c1800acf6366418a9b5f610249000331, type: 3}
propertyPath: m_EndPointDistance
value: 100
objectReference: {fileID: 0}
- target: {fileID: 2761784063978902506, guid: c1800acf6366418a9b5f610249000331, type: 3}
propertyPath: m_LocalPosition.x
value: 0
@ -3770,7 +3778,7 @@ MonoBehaviour:
m_ModelSelectTransition:
m_ModelDeSelectTransition:
m_PositionAction:
m_UseReference: 0
m_UseReference: 1
m_Action:
m_Name: Position
m_Type: 0
@ -3780,9 +3788,9 @@ MonoBehaviour:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: 0}
m_Reference: {fileID: 9126875591944302883, guid: c348712bda248c246b8c49b3db54643f, type: 3}
m_RotationAction:
m_UseReference: 0
m_UseReference: 1
m_Action:
m_Name: Rotation
m_Type: 0
@ -3792,9 +3800,9 @@ MonoBehaviour:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: 0}
m_Reference: {fileID: -3870559572202308136, guid: c348712bda248c246b8c49b3db54643f, type: 3}
m_IsTrackedAction:
m_UseReference: 0
m_UseReference: 1
m_Action:
m_Name: Is Tracked
m_Type: 1
@ -3804,9 +3812,9 @@ MonoBehaviour:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 1
m_Reference: {fileID: 0}
m_Reference: {fileID: -7044516463258014562, guid: c348712bda248c246b8c49b3db54643f, type: 3}
m_TrackingStateAction:
m_UseReference: 0
m_UseReference: 1
m_Action:
m_Name: Tracking State
m_Type: 0
@ -3816,7 +3824,7 @@ MonoBehaviour:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: 0}
m_Reference: {fileID: -1277054153949319361, guid: c348712bda248c246b8c49b3db54643f, type: 3}
m_SelectAction:
m_UseReference: 1
m_Action:

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d9ac8349e36465843b744a5a7c4baad0
guid: c2d119f6e4d97b840a435aeb2619c2fc
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 112000000

Binary file not shown.

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 446871f9378b8d946b71eab8b7e36ec0
guid: 913307ec53fbbad4f8692c9c3110d8c6
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@ -93,32 +93,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
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
- serializedVersion: 3
buildTarget: Windows Store Apps
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: 3
buildTarget: Server
maxTextureSize: 2048

Binary file not shown.

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 18e31141222989147bd5ede84ace0496
guid: 49023172d5d14d642a2af36311385ea0
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@ -93,32 +93,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
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
- serializedVersion: 3
buildTarget: Windows Store Apps
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: 3
buildTarget: Server
maxTextureSize: 2048

Binary file not shown.

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d4218b27e4650f84cae65d455d750ccc
guid: d2c9eb5c3dfc6e34ba3a5afa31086eea
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@ -93,32 +93,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
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
- serializedVersion: 3
buildTarget: Windows Store Apps
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: 3
buildTarget: Server
maxTextureSize: 2048

Binary file not shown.

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: f1eb34e43cc377640b0676d5743dec78
guid: b3f15a0db9f324e48b66ef503a6c7b07
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@ -93,32 +93,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
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
- serializedVersion: 3
buildTarget: Windows Store Apps
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: 3
buildTarget: Server
maxTextureSize: 2048

Binary file not shown.

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 9da1c98ba605c09479150afaab70504f
guid: e14af41537ae05a4992264ce88cafb42
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@ -93,32 +93,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
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
- serializedVersion: 3
buildTarget: Windows Store Apps
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: 3
buildTarget: Server
maxTextureSize: 2048

Binary file not shown.

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 93f1684a1e7686a43b0b5d524a610b20
guid: 7441ff9c41bb5bc4e96da739cedab41d
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@ -93,32 +93,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
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
- serializedVersion: 3
buildTarget: Windows Store Apps
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: 3
buildTarget: Server
maxTextureSize: 2048

Binary file not shown.

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 2ce5fcb29d1201d4cabdddf40cb71f36
guid: 8957561b24fb0c744ae649a9f91d4ca2
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@ -93,32 +93,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
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
- serializedVersion: 3
buildTarget: Windows Store Apps
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: 3
buildTarget: Server
maxTextureSize: 2048

Binary file not shown.

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 284b08b15362a6348a2c65104420db52
guid: c5591dc8e0a203244aa6f4cdfdeb6dff
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@ -93,32 +93,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
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
- serializedVersion: 3
buildTarget: Windows Store Apps
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: 3
buildTarget: Server
maxTextureSize: 2048

View File

@ -66,6 +66,10 @@ MonoBehaviour:
locomotion.
preview: {fileID: -7201468737772367373}
dependencies:
- dependency: {fileID: 112000000, guid: c2d119f6e4d97b840a435aeb2619c2fc, type: 2}
instantiationMode: 0
- dependency: {fileID: 2800000, guid: b3f15a0db9f324e48b66ef503a6c7b07, type: 3}
instantiationMode: 0
- dependency: {fileID: 4323489679071539380, guid: 244067333e027cd4dbdc6fcb5101cdb6, type: 3}
instantiationMode: 0
- dependency: {fileID: 444216130953527922, guid: f3b94972e02b56a42b9522d1fb63f7d6, type: 3}
@ -114,6 +118,8 @@ MonoBehaviour:
instantiationMode: 0
- dependency: {fileID: 7351372378840521304, guid: dc1413687d1c2d445b8a2b16ccb03143, type: 3}
instantiationMode: 0
- dependency: {fileID: 8900000, guid: c5591dc8e0a203244aa6f4cdfdeb6dff, type: 3}
instantiationMode: 0
- dependency: {fileID: 2100000, guid: 054e3e2146f382c44b6d7dc2a5c7e69b, type: 2}
instantiationMode: 0
- dependency: {fileID: 4300000, guid: 8a46a18674a4b8e42b093cfbf4d1ab9d, type: 2}
@ -228,8 +234,6 @@ MonoBehaviour:
instantiationMode: 0
- dependency: {fileID: 2800000, guid: d46e6feabba694b159f5681438c9d38f, type: 3}
instantiationMode: 0
- dependency: {fileID: 2800000, guid: 9da1c98ba605c09479150afaab70504f, type: 3}
instantiationMode: 0
- dependency: {fileID: 9005634231249057721, guid: b56b1fcbe50459d4bb738135015c4c83, type: 3}
instantiationMode: 0
- dependency: {fileID: 2100000, guid: ec46d2188d4b8774e847e75f1e12a8db, type: 2}
@ -244,6 +248,8 @@ MonoBehaviour:
instantiationMode: 0
- dependency: {fileID: 2800000, guid: 3e215f548ed4046fcb0a3812524cfd89, type: 3}
instantiationMode: 0
- dependency: {fileID: 2800000, guid: 913307ec53fbbad4f8692c9c3110d8c6, type: 3}
instantiationMode: 0
- dependency: {fileID: 919132149155446097, guid: a73f1c765c3888b438ce7f3cb52b4eed, type: 3}
instantiationMode: 0
- dependency: {fileID: 919132149155446097, guid: 8c04a999ac4a1414a801ae64a0905752, type: 3}
@ -284,6 +290,8 @@ MonoBehaviour:
instantiationMode: 0
- dependency: {fileID: 1787346994484839025, guid: ad818c36731146e994540a1896ad8f24, type: 3}
instantiationMode: 0
- dependency: {fileID: 2800000, guid: 7441ff9c41bb5bc4e96da739cedab41d, type: 3}
instantiationMode: 0
- dependency: {fileID: 2800000, guid: d2deb022800250b4fa2236bfd901f50a, type: 3}
instantiationMode: 0
- dependency: {fileID: 2800000, guid: b4a6a940cbbba1546b33cee87d4a323c, type: 3}
@ -298,14 +306,14 @@ MonoBehaviour:
instantiationMode: 0
- dependency: {fileID: 7400000, guid: 457d727e05cd56d449249d7dfe9f69f4, type: 2}
instantiationMode: 0
- dependency: {fileID: 6375084645804915083, guid: 438b66bbe420dbe4890742c3ed1a6b25, type: 3}
instantiationMode: 0
- dependency: {fileID: 3369527167708781622, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3}
instantiationMode: 0
- dependency: {fileID: 2746493918707896725, guid: 89e80c47615e4f043926d66492d3ca5f, type: 3}
instantiationMode: 0
- dependency: {fileID: 11400000, guid: f06581b6a2676704cbac6d816ed881e1, type: 2}
instantiationMode: 1
- dependency: {fileID: 6375084645804915083, guid: 438b66bbe420dbe4890742c3ed1a6b25, type: 3}
instantiationMode: 0
- dependency: {fileID: 3177232254315139758, guid: a3fde713df4d99042a0403c4be9eea32, type: 3}
instantiationMode: 0
- dependency: {fileID: 7400000, guid: 872f9edd63e161c45bd07fbe0734680c, type: 2}
@ -332,8 +340,6 @@ MonoBehaviour:
instantiationMode: 0
- dependency: {fileID: 919132149155446097, guid: 5e6bd60789d80f54b8a01c805d07ecd3, type: 3}
instantiationMode: 0
- dependency: {fileID: 8900000, guid: 284b08b15362a6348a2c65104420db52, type: 3}
instantiationMode: 0
- dependency: {fileID: 2800000, guid: a4bff8316c1bf004c926d589e0d3e29f, type: 3}
instantiationMode: 0
- dependency: {fileID: 2800000, guid: 333c89c1261c647feb9643ab9024a7de, type: 3}
@ -342,8 +348,6 @@ MonoBehaviour:
instantiationMode: 1
- dependency: {fileID: 2100000, guid: 727f87098255ad04987a60f5f08390bc, type: 2}
instantiationMode: 0
- dependency: {fileID: 2800000, guid: 93f1684a1e7686a43b0b5d524a610b20, type: 3}
instantiationMode: 0
- dependency: {fileID: 919132149155446097, guid: 9ab71472b5bb94890a03b7ca5ec138fa, type: 3}
instantiationMode: 0
- dependency: {fileID: 2800000, guid: 4d98098c07b475d438730e0175e472e5, type: 3}
@ -402,10 +406,14 @@ MonoBehaviour:
instantiationMode: 0
- dependency: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
instantiationMode: 0
- dependency: {fileID: 8900000, guid: 8957561b24fb0c744ae649a9f91d4ca2, type: 3}
instantiationMode: 0
- dependency: {fileID: 2800000, guid: 1aeae93672718ba4ca82c27e22183965, type: 3}
instantiationMode: 0
- dependency: {fileID: 2800000, guid: 43ab3caa9db31417abb055b874f705ca, type: 3}
instantiationMode: 0
- dependency: {fileID: 2800000, guid: d2c9eb5c3dfc6e34ba3a5afa31086eea, type: 3}
instantiationMode: 0
- dependency: {fileID: 2800000, guid: 709f8bf3a326a452b99a3f2bb2cca80a, type: 3}
instantiationMode: 0
- dependency: {fileID: 2800000, guid: e03c7d6c988f9ef449ce4240c1e334a1, type: 3}
@ -432,12 +440,8 @@ MonoBehaviour:
instantiationMode: 0
- dependency: {fileID: 919132149155446097, guid: 5ee9c2cbc54db5d4d819553a34d2bfec, type: 3}
instantiationMode: 0
- dependency: {fileID: 2800000, guid: d4218b27e4650f84cae65d455d750ccc, type: 3}
instantiationMode: 0
- dependency: {fileID: 2100000, guid: c6dbf5322c0f40e4ca89651f5f01640f, type: 2}
instantiationMode: 0
- dependency: {fileID: 8900000, guid: 2ce5fcb29d1201d4cabdddf40cb71f36, type: 3}
instantiationMode: 0
- dependency: {fileID: 11400000, guid: d1c3fee5a7e29bf49b295b270071caac, type: 2}
instantiationMode: 1
- dependency: {fileID: 919132149155446097, guid: ab3a79eba4de4be0ad5fead9fb858190, type: 3}
@ -480,8 +484,6 @@ MonoBehaviour:
instantiationMode: 0
- dependency: {fileID: 2800000, guid: affa059594145a843b81788037b4ee21, type: 3}
instantiationMode: 0
- dependency: {fileID: 2800000, guid: 446871f9378b8d946b71eab8b7e36ec0, type: 3}
instantiationMode: 0
- dependency: {fileID: 2100000, guid: c3474c208278e814cb8d1c29aa806e81, type: 2}
instantiationMode: 0
- dependency: {fileID: 5536342803307029701, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
@ -522,12 +524,10 @@ MonoBehaviour:
instantiationMode: 0
- dependency: {fileID: 2800000, guid: 8d19b3f6a715cfa40bc862139074a365, type: 3}
instantiationMode: 0
- dependency: {fileID: 2800000, guid: 18e31141222989147bd5ede84ace0496, type: 3}
- dependency: {fileID: 919132149155446097, guid: 153511fbcba98f74d9ff5c476b31ed9e, type: 3}
instantiationMode: 0
- dependency: {fileID: 919132149155446097, guid: 6d6afc9c23eb00846a1a78c667f92f80, type: 3}
instantiationMode: 0
- dependency: {fileID: 919132149155446097, guid: 153511fbcba98f74d9ff5c476b31ed9e, type: 3}
instantiationMode: 0
- dependency: {fileID: 11400000, guid: 6c553b2061cda804f9e834c322d027ce, type: 2}
instantiationMode: 1
- dependency: {fileID: 6507399986997092475, guid: 254b742d65a15d14b9df756ae77de868, type: 3}
@ -548,8 +548,6 @@ MonoBehaviour:
instantiationMode: 0
- dependency: {fileID: 11400000, guid: 41578b197ccb3f647b4025e8dafa94df, type: 2}
instantiationMode: 1
- dependency: {fileID: 2800000, guid: f1eb34e43cc377640b0676d5743dec78, type: 3}
instantiationMode: 0
- dependency: {fileID: 2800000, guid: 323e734c56102e643a829e6f33533314, type: 3}
instantiationMode: 0
- dependency: {fileID: 11400000, guid: 81bccf987f6432e4996a24813147cbcb, type: 2}
@ -610,18 +608,20 @@ MonoBehaviour:
instantiationMode: 0
- dependency: {fileID: 2800000, guid: 7b8bfaee8f8631c4789ac62373cbc2d4, type: 3}
instantiationMode: 1
- dependency: {fileID: 2800000, guid: e14af41537ae05a4992264ce88cafb42, type: 3}
instantiationMode: 0
- dependency: {fileID: 11400000, guid: a2ad816fb5e06f142a29e4cf5d7b4bb2, type: 2}
instantiationMode: 1
- dependency: {fileID: 8804103959432347581, guid: dac63b28ab647e04f8b52d6327767894, type: 3}
instantiationMode: 0
- dependency: {fileID: 2800000, guid: 49023172d5d14d642a2af36311385ea0, type: 3}
instantiationMode: 0
- dependency: {fileID: 2800000, guid: b7bad1260586fa746a0b67e930892936, type: 3}
instantiationMode: 0
- dependency: {fileID: 7785151267686525225, guid: 048249d9a15aa3c459399751e860bde7, type: 3}
instantiationMode: 0
- dependency: {fileID: 7400000, guid: b4ef022d97927445dae7b277a476ea8e, type: 2}
instantiationMode: 0
- dependency: {fileID: 112000000, guid: d9ac8349e36465843b744a5a7c4baad0, type: 2}
instantiationMode: 0
- dependency: {fileID: 11400000, guid: ef02a96baf5803f46909da53ed378fc2, type: 2}
instantiationMode: 1
templatePipeline: {fileID: 0}

View File

@ -12,5 +12,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: de02f9e1d18f588468e474319d09a723, type: 3}
m_Name:
m_EditorClassIdentifier:
shaderVariantLimit: 128
customInterpolatorErrorThreshold: 32
customInterpolatorWarningThreshold: 16