diff --git a/Assets/Materials/Materials.meta b/Assets/Materials/Materials.meta new file mode 100644 index 0000000..38e710a --- /dev/null +++ b/Assets/Materials/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 06c4ad95b418dda4f8c82d68bd2db6df +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Materials/indictor 1.mat b/Assets/Materials/Materials/indictor 1.mat new file mode 100644 index 0000000..bef4e75 --- /dev/null +++ b/Assets/Materials/Materials/indictor 1.mat @@ -0,0 +1,79 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: indictor 1 + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _ALPHATEST_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2450 + stringTagMap: + RenderType: TransparentCutout + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _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: 2800000, guid: 364c08a93e5395d49a8e35fd72b7fe92, type: 3} + 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} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 1 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Materials/indictor 1.mat.meta b/Assets/Materials/Materials/indictor 1.mat.meta new file mode 100644 index 0000000..6fbfe29 --- /dev/null +++ b/Assets/Materials/Materials/indictor 1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aa1eec9c654548245a1d75ba943948bf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Materials/indictor.mat b/Assets/Materials/Materials/indictor.mat new file mode 100644 index 0000000..836045e --- /dev/null +++ b/Assets/Materials/Materials/indictor.mat @@ -0,0 +1,79 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: indictor + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _ALPHATEST_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2450 + stringTagMap: + RenderType: TransparentCutout + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _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: 2800000, guid: 8ac81344c649f0146ab5fa0f9a8799a2, type: 3} + 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} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 1 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Materials/indictor.mat.meta b/Assets/Materials/Materials/indictor.mat.meta new file mode 100644 index 0000000..830a5e9 --- /dev/null +++ b/Assets/Materials/Materials/indictor.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8234b6117673436409cdbb7d73149d35 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/indictor 1.png b/Assets/Materials/indictor 1.png new file mode 100644 index 0000000..c62cf08 Binary files /dev/null and b/Assets/Materials/indictor 1.png differ diff --git a/Assets/Materials/indictor 1.png.meta b/Assets/Materials/indictor 1.png.meta new file mode 100644 index 0000000..2f84fc6 --- /dev/null +++ b/Assets/Materials/indictor 1.png.meta @@ -0,0 +1,120 @@ +fileFormatVersion: 2 +guid: 364c08a93e5395d49a8e35fd72b7fe92 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MainGame.unity b/Assets/Scenes/MainGame.unity index 10c21e5..1555009 100644 --- a/Assets/Scenes/MainGame.unity +++ b/Assets/Scenes/MainGame.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.18028334, g: 0.2257134, b: 0.30692226, a: 1} + m_IndirectSpecularColor: {r: 0.18028334, g: 0.22571328, b: 0.3069217, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -1723,6 +1723,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 371749250} m_PrefabAsset: {fileID: 0} +--- !u!4 &372387525 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3224832258464791432, guid: cdbac44d9cb15a04684f19dd29e2f2db, + type: 3} + m_PrefabInstance: {fileID: 3224832256689880466} + m_PrefabAsset: {fileID: 0} --- !u!1001 &401855015 PrefabInstance: m_ObjectHideFlags: 0 @@ -3858,6 +3864,102 @@ Transform: type: 3} m_PrefabInstance: {fileID: 296603246} m_PrefabAsset: {fileID: 0} +--- !u!1 &866662310 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 866662311} + - component: {fileID: 866662314} + - component: {fileID: 866662313} + - component: {fileID: 866662312} + m_Layer: 0 + m_Name: Plane + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &866662311 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 866662310} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalPosition: {x: 0, y: -0.37, z: 0} + m_LocalScale: {x: 0.127872, y: 0.127872, z: 0.127872} + m_Children: [] + m_Father: {fileID: 372387525} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!64 &866662312 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 866662310} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &866662313 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 866662310} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + 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: aa1eec9c654548245a1d75ba943948bf, 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!33 &866662314 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 866662310} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &867679824 PrefabInstance: m_ObjectHideFlags: 0 @@ -10587,6 +10689,21 @@ PrefabInstance: propertyPath: nomDuJoueur value: objectReference: {fileID: 0} + - target: {fileID: 2391299249491222016, guid: cdbac44d9cb15a04684f19dd29e2f2db, + type: 3} + propertyPath: constSpeed + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2391299249491222016, guid: cdbac44d9cb15a04684f19dd29e2f2db, + type: 3} + propertyPath: constUpForce + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2391299249491222016, guid: cdbac44d9cb15a04684f19dd29e2f2db, + type: 3} + propertyPath: constRotation + value: 10 + objectReference: {fileID: 0} - target: {fileID: 3224832257380790144, guid: cdbac44d9cb15a04684f19dd29e2f2db, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scripts/JoyCon/JoyConMovement.cs b/Assets/Scripts/JoyCon/JoyConMovement.cs index 80694b7..0617cf1 100644 --- a/Assets/Scripts/JoyCon/JoyConMovement.cs +++ b/Assets/Scripts/JoyCon/JoyConMovement.cs @@ -1,4 +1,4 @@ -using Assets.Scripts.Movements; + using Assets.Scripts.Movements; using UnityEngine; namespace JoyCon @@ -31,8 +31,12 @@ namespace JoyCon private void Update() { - Joycon j = JoyConManager.GetJoycon(JcLegInd); - _playerDirection = j.GetButton(Joycon.Button.SHOULDER_2) ? Vector3.back : Vector3.forward; + + //Joycon j = JoyConManager.GetJoycon(JcLegInd); + //_playerDirection = j.GetButton(Joycon.Button.SHOULDER_2) ? Vector3.back : Vector3.forward; + + float moveHorizontal = Input.GetAxis("Horizontal"); + transform.Rotate(0.0f, moveHorizontal * constSpeed * 2, 0.0f); } private void FixedUpdate() diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index be6ca54..5d5aa35 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -15,19 +15,19 @@ EditorUserSettings: value: 22424703114646680e0b0227036c75191b1a011a20293f373f26083de6ae2136ebf32f flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c7b11001e1c1a20293f373f26083de6ae2136ebf32f + value: 22424703114646680e0b0227036c731500121465181b2e313d2c3e3cf0f23d3cedf578fce9332b25 flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c7315001214651f3c34312a210910edf22631e6e824a7f234362820 - flags: 0 - RecentlyUsedScenePath-5: value: 22424703114646680e0b0227036c7315001214651f1b2e313d2c3e3cf0f23d3cedf578fce9332b25 flags: 0 + RecentlyUsedScenePath-5: + value: 22424703114646680e0b0227036c7b11001e1c1a20293f373f26083de6ae2136ebf32f + flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c731500121465032a35242c2a1136cbee1931e6e33aeca92f31352d1b + value: 22424703114646680e0b0227036c7315001214651f3c34312a210910edf22631e6e824a7f234362820 flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c731500121465181b2e313d2c3e3cf0f23d3cedf578fce9332b25 + value: 22424703114646680e0b0227036c731500121465032a35242c2a1136cbee1931e6e33aeca92f31352d1b flags: 0 RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036c73150012146501293c35633c133af6f9