fit : scarecrow & boat integration

This commit is contained in:
Ferlat Thibaud
2026-06-02 15:28:13 +02:00
parent 155bb2a96a
commit b19c218962
24 changed files with 852 additions and 3993 deletions
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -36,6 +36,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
@@ -94,9 +98,12 @@ Material:
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DetailSize: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _FogMax: 15
- _FogMin: 0
- _GlossMapScale: 1
- _Glossiness: 0
- _GlossyReflections: 1
@@ -109,6 +116,7 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _ProjectionBlend: 0.1
- _QueueControl: 0
- _QueueOffset: 0
- _ReceiveShadows: 1
@@ -127,13 +135,15 @@ Material:
- _Test: 0
- _TriplanarBlend: 0
- _UVSec: 0
- _VertexColor: 0
- _WorkflowMode: 1
- _XRMotionVectorsPass: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.97132295, g: 0.9106005, b: 0.8322163, a: 1}
- _BaseColor: {r: 0.4056604, g: 0.25464317, b: 0.12437701, a: 1}
- _Color: {r: 0.97132295, g: 0.9106005, b: 0.8322163, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _FogColor: {r: 0.9921569, g: 0.6392157, b: 0.4117647, a: 0.3529412}
- _GrainColor: {r: 1, g: 1, b: 1, a: 0.09803922}
- _HighlightColor: {r: 2.118547, g: 2.118547, b: 2.118547, a: 1}
- _ShadowColor: {r: 0.14117646, g: 0.16862747, b: 0.16470587, a: 1}
@@ -36,6 +36,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
@@ -94,9 +98,12 @@ Material:
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DetailSize: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _FogMax: 15
- _FogMin: 0
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
@@ -108,6 +115,7 @@ Material:
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _ProjectionBlend: 0.1
- _QueueControl: 0
- _QueueOffset: 0
- _ReceiveShadows: 1
@@ -134,6 +142,7 @@ Material:
- _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}
- _FogColor: {r: 0.9921569, g: 0.6392157, b: 0.4117647, a: 0.3529412}
- _GrainColor: {r: 1, g: 1, b: 1, a: 0.09803922}
- _HighlightColor: {r: 2.118547, g: 2.118547, b: 2.118547, a: 1}
- _ShadowColor: {r: 0.14117646, g: 0.16862747, b: 0.16470587, a: 1}
@@ -8,19 +8,16 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: M_scarecrow
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Shader: {fileID: -6465566751694194690, guid: 10840deb9abeee9478cbbb5915f60f5c, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _METALLICSPECGLOSSMAP
- _NORMALMAP
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap:
RenderType: Opaque
stringTagMap: {}
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
@@ -28,17 +25,21 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: 81d2c182771dc8748a950b9f00003bff, type: 3}
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 2800000, guid: 5340ddacd6b531e4ab2dc121772f7a44, type: 3}
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMap:
m_Texture: {fileID: 2800000, guid: 2da59fbd756c92a4bb2018abf06c4e07, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
@@ -52,11 +53,11 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 81d2c182771dc8748a950b9f00003bff, type: 3}
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 2800000, guid: 7084536e46916194dbd938c5b42cd0fc, type: 3}
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
@@ -68,7 +69,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 2800000, guid: 7084536e46916194dbd938c5b42cd0fc, type: 3}
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
@@ -97,34 +98,44 @@ Material:
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DetailSize: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _FogMax: 15
- _FogMin: 0
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _MaskID: 0
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _ProjectionBlend: 0.1
- _QueueControl: 0
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.24
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Step: 6
- _Surface: 0
- _Test: 0
- _VertexColor: 0
- _WorkflowMode: 1
- _XRMotionVectorsPass: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _BaseColor: {r: 0.4716981, g: 0.4716981, b: 0.4716981, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _FogColor: {r: 0.9921569, g: 0.6392157, b: 0.4117647, a: 0.3529412}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &6353462740384473755
--- !u!114 &14066367245904882
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 73c2490dcb2d05a40bb425f9a63ba33d
guid: 027db02380abadc4aa829ee38a6ab27d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
@@ -0,0 +1,139 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: M_scarecrowTest
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _METALLICSPECGLOSSMAP
- _NORMALMAP
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: 2800000, guid: 81d2c182771dc8748a950b9f00003bff, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 2800000, guid: 5340ddacd6b531e4ab2dc121772f7a44, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
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: 2800000, guid: 81d2c182771dc8748a950b9f00003bff, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 2800000, guid: 7084536e46916194dbd938c5b42cd0fc, type: 3}
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: 2800000, guid: 7084536e46916194dbd938c5b42cd0fc, type: 3}
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.24
- _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
--- !u!114 &6353462740384473755
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
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 73c2490dcb2d05a40bb425f9a63ba33d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 539d123a02fef484a9ceeadaf548f38d
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,143 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: scarecrow_pasted__M_scarecrow
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _ALPHAPREMULTIPLY_ON
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses:
- MOTIONVECTORS
- DepthOnly
- SHADOWCASTER
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: 0}
m_Scale: {x: 1, y: 1}
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: 10
- _DstBlendAlpha: 10
- _EnvironmentReflections: 1
- _GlossMapScale: 1
- _Glossiness: 0
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 3
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 1
- _UVSec: 0
- _WorkflowMode: 1
- _XRMotionVectorsPass: 1
- _ZWrite: 0
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
--- !u!114 &2364405834310730961
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
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: efb0fafbfbc904f4294831fd012120d8
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: b1faef2ff7c540945bacc5a9b0bf468f
ModelImporter:
serializedVersion: 24200
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
generateMeshLods: 0
meshLodGenerationFlags: 0
maximumMeshLod: -1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:
File diff suppressed because one or more lines are too long
+131 -34
View File
@@ -134,7 +134,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalScale.x
value: 1.5384617
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalScale.y
@@ -146,15 +146,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalPosition.x
value: 12.866668
value: 13.2
objectReference: {fileID: 0}
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalPosition.y
value: 9.846155
value: 10.71
objectReference: {fileID: 0}
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalPosition.z
value: -1.5846155
value: -1.2
objectReference: {fileID: 0}
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalRotation.w
@@ -213,7 +213,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalScale.x
value: 1.5384617
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalScale.y
@@ -225,15 +225,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalPosition.x
value: 10.415385
value: 9.81
objectReference: {fileID: 0}
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalPosition.y
value: 9.16923
value: 11.08
objectReference: {fileID: 0}
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalPosition.z
value: -4.3435903
value: -5.03
objectReference: {fileID: 0}
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalRotation.w
@@ -1132,6 +1132,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 495415877}
- {fileID: 543450652873524166}
- {fileID: 1884628756}
- {fileID: 1527450886}
- {fileID: 498371833}
@@ -1290,15 +1291,15 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalScale.x
value: 1.246154
value: 1.7
objectReference: {fileID: 0}
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalScale.y
value: 3.471795
value: 4
objectReference: {fileID: 0}
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalScale.z
value: 1.246154
value: 1.7
objectReference: {fileID: 0}
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalPosition.x
@@ -1764,7 +1765,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalPosition.y
value: 9.820513
value: 12.21
objectReference: {fileID: 0}
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalPosition.z
@@ -1842,8 +1843,8 @@ Transform:
m_GameObject: {fileID: 611156248}
serializedVersion: 2
m_LocalRotation: {x: -0, y: 0.4105071, z: -0, w: 0.9118574}
m_LocalPosition: {x: -1.1111097, y: -1.1325, z: 2.6901307}
m_LocalScale: {x: 0.24999997, y: 0.25, z: 0.24999997}
m_LocalPosition: {x: -2.954164, y: -2.338375, z: 5.2608223}
m_LocalScale: {x: 0.48749995, y: 0.48749998, z: 0.48749995}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 379159063}
@@ -1854,7 +1855,7 @@ Transform:
- {fileID: 49904487}
- {fileID: 583824109}
- {fileID: 1715108806}
m_Father: {fileID: 1884628756}
m_Father: {fileID: 543450652873524166}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &620676192
PrefabInstance:
@@ -2551,7 +2552,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalScale.x
value: 1.5384617
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalScale.y
@@ -2563,15 +2564,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalPosition.x
value: 13.584616
value: 14.47
objectReference: {fileID: 0}
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalPosition.y
value: 9.384616
value: 10.92
objectReference: {fileID: 0}
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalPosition.z
value: -0.87692314
value: 0.12
objectReference: {fileID: 0}
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalRotation.w
@@ -2630,7 +2631,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalScale.x
value: 1.246154
value: 1.7
objectReference: {fileID: 0}
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalScale.y
@@ -2638,7 +2639,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalScale.z
value: 1.246154
value: 1.7
objectReference: {fileID: 0}
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalPosition.x
@@ -2933,7 +2934,7 @@ MonoBehaviour:
VFX: {fileID: 1746184118}
OriginalScale: {x: 0, y: 0, z: 0}
_growDuration: 6
_overlapFactor: 0.6
_overlapFactor: 0.2
_growCurve:
serializedVersion: 2
m_Curve:
@@ -3620,7 +3621,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalPosition.y
value: 8.44
value: 8.8
objectReference: {fileID: 0}
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalPosition.z
@@ -3898,8 +3899,16 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 2172329578528486458, guid: 3047690e5fa057a41ad3eab3ca9afffa, type: 3}
propertyPath: m_Name
value: Scarecrow
value: ScarecrowTest
objectReference: {fileID: 0}
- target: {fileID: 2172329578528486458, guid: 3047690e5fa057a41ad3eab3ca9afffa, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8426733722844351852, guid: 3047690e5fa057a41ad3eab3ca9afffa, type: 3}
propertyPath: m_Mesh
value:
objectReference: {fileID: -9156333443194545047, guid: b1faef2ff7c540945bacc5a9b0bf468f, type: 3}
- target: {fileID: 9023618703307500341, guid: 3047690e5fa057a41ad3eab3ca9afffa, type: 3}
propertyPath: m_LocalScale.x
value: 7.7999997
@@ -3914,11 +3923,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 9023618703307500341, guid: 3047690e5fa057a41ad3eab3ca9afffa, type: 3}
propertyPath: m_LocalPosition.x
value: -2.24
value: -3.15
objectReference: {fileID: 0}
- target: {fileID: 9023618703307500341, guid: 3047690e5fa057a41ad3eab3ca9afffa, type: 3}
propertyPath: m_LocalPosition.y
value: 0
value: 1.17
objectReference: {fileID: 0}
- target: {fileID: 9023618703307500341, guid: 3047690e5fa057a41ad3eab3ca9afffa, type: 3}
propertyPath: m_LocalPosition.z
@@ -3958,10 +3967,7 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 9023618703307500341, guid: 3047690e5fa057a41ad3eab3ca9afffa, type: 3}
insertIndex: -1
addedObject: {fileID: 611156249}
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3047690e5fa057a41ad3eab3ca9afffa, type: 3}
--- !u!4 &1884628756 stripped
@@ -4253,7 +4259,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalScale.x
value: 1.5384617
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalScale.y
@@ -4265,15 +4271,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalPosition.x
value: 11.353847
value: 11.05
objectReference: {fileID: 0}
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalPosition.y
value: 9.7846155
value: 10.65
objectReference: {fileID: 0}
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalPosition.z
value: -3.620513
value: -3.96
objectReference: {fileID: 0}
- target: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
propertyPath: m_LocalRotation.w
@@ -4322,6 +4328,97 @@ Transform:
m_CorrespondingSourceObject: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
m_PrefabInstance: {fileID: 1976921335}
m_PrefabAsset: {fileID: 0}
--- !u!4 &543450652873524166
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 919132148949801340}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 1.69, z: -3.53}
m_LocalScale: {x: 4, y: 4, z: 4}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 611156249}
m_Father: {fileID: 223669094}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &919132148949801340
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 543450652873524166}
- component: {fileID: 3469287836722924643}
- component: {fileID: 1711813855881263273}
m_Layer: 0
m_Name: Scarecrow
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!23 &1711813855881263273
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 919132148949801340}
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_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 027db02380abadc4aa829ee38a6ab27d, 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_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_MaskInteraction: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &3469287836722924643
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 919132148949801340}
m_Mesh: {fileID: -7557848429819244608, guid: fbf63652ddb5aea428242189408ab766, type: 3}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
@@ -62,7 +62,7 @@ namespace Unheimlich.Navigation.Debuging
{
if (index < 0 || index >= _scenes.Count)
{
UnityEngine.Debug.LogWarning($"[DebugNavigation] Index {index} out of range.");
Debug.LogWarning($"[DebugNavigation] Index {index} out of range.");
return;
}
@@ -76,7 +76,7 @@ namespace Unheimlich.Navigation.Debuging
if (scene == null)
{
UnityEngine.Debug.LogWarning($"[DebugNavigation] Scene at index {index} is null.");
Debug.LogWarning($"[DebugNavigation] Scene at index {index} is null.");
return;
}
@@ -84,7 +84,7 @@ namespace Unheimlich.Navigation.Debuging
if (OctoRef.Instance != null &&
OctoRef.Instance.Navigation.CurrentScene == scene)
{
UnityEngine.Debug.Log($"[DebugNavigation] Scene '{scene.SceneName}' is already loaded, skipping.");
Debug.Log($"[DebugNavigation] Scene '{scene.SceneName}' is already loaded, skipping.");
return;
}
@@ -93,7 +93,7 @@ namespace Unheimlich.Navigation.Debuging
if (OctoRef.Instance)
OctoRef.Instance.Navigation.LoadScene(scene);
else
UnityEngine.Debug.LogError("[DebugNavigation] OctoCore instance not found.");
Debug.LogError("[DebugNavigation] OctoCore instance not found.");
}
}
}
@@ -115,8 +115,6 @@ namespace Unheimlich.Navigation.Debuging
_keyboardNextAction.performed += _ => TryNext();
// Device detection — wildcard bindings
// Note: on exclut les triggers du anyGamepad pour éviter les faux positifs
// lors du relâchement après un hold unlock
_anyGamepadAction = new InputAction("AnyGamepad", InputActionType.PassThrough);
_anyGamepadAction.AddBinding("<Gamepad>/leftStick");
_anyGamepadAction.AddBinding("<Gamepad>/rightStick");
@@ -230,7 +228,7 @@ namespace Unheimlich.Navigation.Debuging
if (_holdTimer >= _holdDuration)
{
_holdFired = true; // marque comme fired AVANT le toggle pour bloquer OnR2Up/OnL2Up
_holdFired = true;
ToggleDebugMenu(true);
}
}
@@ -285,12 +283,12 @@ namespace Unheimlich.Navigation.Debuging
SyncDebugNavigation();
if (isGamepad) OnDebugMenuUnlockedGamepad?.Invoke();
else OnDebugMenuUnlockedKeyboard?.Invoke();
UnityEngine.Debug.Log($"[DebugMenuUnlocker] Unlocked ({(isGamepad ? "Gamepad" : "Keyboard")}).");
Debug.Log($"[DebugMenuUnlocker] Unlocked ({(isGamepad ? "Gamepad" : "Keyboard")}).");
}
else
{
OnDebugMenuLocked?.Invoke();
UnityEngine.Debug.Log("[DebugMenuUnlocker] Locked.");
Debug.Log("[DebugMenuUnlocker] Locked.");
}
}