diff --git a/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Zenject-ReflectionBaking.csproj.meta b/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Zenject-ReflectionBaking.csproj.meta new file mode 100644 index 0000000..172ff92 --- /dev/null +++ b/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Zenject-ReflectionBaking.csproj.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 91b0b4c77fdd1d24aa1af646e9d29960 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Zenject/OptionalExtras/Signals/Zenject-Signals.csproj.meta b/Assets/Plugins/Zenject/OptionalExtras/Signals/Zenject-Signals.csproj.meta new file mode 100644 index 0000000..4ec1270 --- /dev/null +++ b/Assets/Plugins/Zenject/OptionalExtras/Signals/Zenject-Signals.csproj.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: aebd7ef925dd4fe4690c3238e879f914 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Zenject/Source/Zenject.csproj.meta b/Assets/Plugins/Zenject/Source/Zenject.csproj.meta new file mode 100644 index 0000000..774fd7a --- /dev/null +++ b/Assets/Plugins/Zenject/Source/Zenject.csproj.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8645273165cb7f54290d6eaa1e10ab37 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AnimationHandler.cs b/Assets/Scripts/AnimationHandler.cs index 7446671..a2df6a7 100644 --- a/Assets/Scripts/AnimationHandler.cs +++ b/Assets/Scripts/AnimationHandler.cs @@ -12,6 +12,7 @@ public class AnimationHandler : MonoBehaviour [Inject] private Visualizer _visualizer; private Dictionary _scales; + private Vector3 _baseScale; private void Start() { @@ -40,4 +41,4 @@ public class AnimationHandler : MonoBehaviour foreach(var item in _objects) item.DOScale(isDetected ? _scales[item.name] : Vector3.zero, Random.Range(.2f, .8f)); } -} +} \ No newline at end of file diff --git a/Assets/Settings/URP-HighFidelity.asset b/Assets/Settings/URP-HighFidelity.asset index 6248100..b60a8bd 100644 --- a/Assets/Settings/URP-HighFidelity.asset +++ b/Assets/Settings/URP-HighFidelity.asset @@ -19,14 +19,17 @@ MonoBehaviour: m_RendererDataList: - {fileID: 11400000, guid: c40be3174f62c4acf8c1216858c64956, type: 2} m_DefaultRendererIndex: 0 - m_RequireDepthTexture: 0 - m_RequireOpaqueTexture: 0 - m_OpaqueDownsampling: 1 - m_SupportsTerrainHoles: 1 + m_RequireDepthTexture: 1 + m_RequireOpaqueTexture: 1 + m_OpaqueDownsampling: 3 + m_SupportsTerrainHoles: 0 m_StoreActionsOptimization: 0 m_SupportsHDR: 1 m_MSAA: 4 m_RenderScale: 1 + m_UpscalingFilter: 0 + m_FsrOverrideSharpness: 0 + m_FsrSharpness: 0.92 m_MainLightRenderingMode: 1 m_MainLightShadowsSupported: 1 m_MainLightShadowmapResolution: 4096 @@ -47,7 +50,10 @@ MonoBehaviour: m_CascadeBorder: 0.1 m_ShadowDepthBias: 1 m_ShadowNormalBias: 1 + m_AnyShadowsSupported: 1 m_SoftShadowsSupported: 1 + m_ConservativeEnclosingSphere: 0 + m_NumIterationsEnclosingSphere: 64 m_AdditionalLightsCookieResolution: 4096 m_AdditionalLightsCookieFormat: 4 m_UseSRPBatcher: 1 diff --git a/Assets/Texture/Ellipse.png.meta b/Assets/Texture/Ellipse.png.meta index 0e4385b..7ed55e8 100644 --- a/Assets/Texture/Ellipse.png.meta +++ b/Assets/Texture/Ellipse.png.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -69,7 +69,7 @@ TextureImporter: buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 4 + textureFormat: -1 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 @@ -81,12 +81,12 @@ TextureImporter: buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 74 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 diff --git a/Assets/Visualizer.unity b/Assets/Visualizer.unity index ce35b59..5828a6f 100644 --- a/Assets/Visualizer.unity +++ b/Assets/Visualizer.unity @@ -170,8 +170,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 76118465} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 1} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: 0, y: 0, z: -4.5} + m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 1411553311} @@ -182,8 +182,9 @@ Transform: - {fileID: 1668298059} - {fileID: 1931262041} - {fileID: 765044583} + - {fileID: 2081477939} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &117288100 PrefabInstance: @@ -222,11 +223,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7844659311714956426, guid: fd28e896e32b4a243bac1cd5acad35ca, type: 3} propertyPath: m_LocalPosition.y - value: -2.96 + value: -2.06 objectReference: {fileID: 0} - target: {fileID: 7844659311714956426, guid: fd28e896e32b4a243bac1cd5acad35ca, type: 3} propertyPath: m_LocalPosition.z - value: -4.24 + value: -8.12 objectReference: {fileID: 0} - target: {fileID: 7844659311714956426, guid: fd28e896e32b4a243bac1cd5acad35ca, type: 3} propertyPath: m_LocalRotation.w @@ -442,7 +443,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &208882823 RectTransform: m_ObjectHideFlags: 0 @@ -530,11 +531,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8133162165082314684, guid: 130a36d495dd83246b0a569d101f729b, type: 3} propertyPath: m_LocalPosition.y - value: 1.45 + value: 3.61 objectReference: {fileID: 0} - target: {fileID: 8133162165082314684, guid: 130a36d495dd83246b0a569d101f729b, type: 3} propertyPath: m_LocalPosition.z - value: -1.79 + value: -3.67 objectReference: {fileID: 0} - target: {fileID: 8133162165082314684, guid: 130a36d495dd83246b0a569d101f729b, type: 3} propertyPath: m_LocalRotation.w @@ -628,13 +629,13 @@ Light: m_Type: 1 m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 1 + m_Intensity: 0.4 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 m_CookieSize: 10 m_Shadows: - m_Type: 0 + m_Type: 2 m_Resolution: -1 m_CustomResolution: -1 m_Strength: 1 @@ -685,14 +686,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 276832158} - m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalRotation: {x: 0.065749116, y: -0.89527273, z: 0.4174719, w: 0.14100038} m_LocalPosition: {x: -0.81707263, y: 0.80853647, z: -0.444956} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 8 - m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} + m_LocalEulerAnglesHint: {x: 50, y: -162.1, z: 0} --- !u!1001 &382749110 PrefabInstance: m_ObjectHideFlags: 0 @@ -722,15 +723,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8254115072083277713, guid: 67feb7f912f760f4899360feb8232eba, type: 3} propertyPath: m_LocalPosition.x - value: 1.77 + value: 2.34 objectReference: {fileID: 0} - target: {fileID: 8254115072083277713, guid: 67feb7f912f760f4899360feb8232eba, type: 3} propertyPath: m_LocalPosition.y - value: -0.37 + value: 0.89 objectReference: {fileID: 0} - target: {fileID: 8254115072083277713, guid: 67feb7f912f760f4899360feb8232eba, type: 3} propertyPath: m_LocalPosition.z - value: -5.99 + value: -9.54 objectReference: {fileID: 0} - target: {fileID: 8254115072083277713, guid: 67feb7f912f760f4899360feb8232eba, type: 3} propertyPath: m_LocalRotation.w @@ -803,19 +804,19 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 487503261} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -5.675} + m_LocalScale: {x: 0.0047811815, y: 0.0047811815, z: 0.0047811815} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1726751038} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0.66} + m_SizeDelta: {x: 1920, y: 1152} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &487503263 MonoBehaviour: m_ObjectHideFlags: 0 @@ -855,7 +856,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 + m_PresetInfoIsWorld: 1 --- !u!223 &487503265 Canvas: m_ObjectHideFlags: 0 @@ -865,9 +866,9 @@ Canvas: m_GameObject: {fileID: 487503261} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 1 + m_RenderMode: 2 m_Camera: {fileID: 1011198372} - m_PlaneDistance: 100 + m_PlaneDistance: 4.77 m_PixelPerfect: 0 m_ReceivesEvents: 1 m_OverrideSorting: 0 @@ -1032,7 +1033,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &655642135 GameObject: @@ -1672,15 +1673,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1195519561456113479, guid: 85b0d0343e7d50b438432d5c816b1e79, type: 3} propertyPath: m_LocalPosition.x - value: -2.68 + value: -2.176 objectReference: {fileID: 0} - target: {fileID: 1195519561456113479, guid: 85b0d0343e7d50b438432d5c816b1e79, type: 3} propertyPath: m_LocalPosition.y - value: -0.74 + value: 0.47 objectReference: {fileID: 0} - target: {fileID: 1195519561456113479, guid: 85b0d0343e7d50b438432d5c816b1e79, type: 3} propertyPath: m_LocalPosition.z - value: -4.67 + value: -7.993 objectReference: {fileID: 0} - target: {fileID: 1195519561456113479, guid: 85b0d0343e7d50b438432d5c816b1e79, type: 3} propertyPath: m_LocalRotation.w @@ -1759,7 +1760,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.002746582, y: 0} + m_AnchoredPosition: {x: 0.0026855469, y: 0} m_SizeDelta: {x: 2363, y: 1417.8} m_Pivot: {x: 0.5, y: 0} --- !u!114 &850280840 @@ -1860,7 +1861,7 @@ Transform: m_Children: - {fileID: 1602212606} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &952775725 stripped Transform: @@ -1941,7 +1942,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1011198374 MonoBehaviour: @@ -2199,7 +2200,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1238847940 PrefabInstance: @@ -2226,15 +2227,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2343048560635973044, guid: 5ca948544be15b04282bb8fa7b9a284a, type: 3} propertyPath: m_LocalPosition.x - value: -1.14 + value: -4.12 objectReference: {fileID: 0} - target: {fileID: 2343048560635973044, guid: 5ca948544be15b04282bb8fa7b9a284a, type: 3} propertyPath: m_LocalPosition.y - value: 1.25 + value: 0.62 objectReference: {fileID: 0} - target: {fileID: 2343048560635973044, guid: 5ca948544be15b04282bb8fa7b9a284a, type: 3} propertyPath: m_LocalPosition.z - value: -5.34 + value: -7.82 objectReference: {fileID: 0} - target: {fileID: 2343048560635973044, guid: 5ca948544be15b04282bb8fa7b9a284a, type: 3} propertyPath: m_LocalRotation.w @@ -2437,6 +2438,229 @@ Transform: m_CorrespondingSourceObject: {fileID: 5415644659046812857, guid: 5762eccef0e3d794083b33c9ef867a7a, type: 3} m_PrefabInstance: {fileID: 2099466810} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1295093864 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2619375190389409606, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_Name + value: SM_Deckchair (1) + objectReference: {fileID: 0} + - target: {fileID: 2619375190389409606, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 3391830055927782908, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_RootOrder + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 3391830055927782908, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_LocalScale.x + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 3391830055927782908, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_LocalScale.y + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 3391830055927782908, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_LocalScale.z + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 3391830055927782908, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_LocalPosition.x + value: -1.3376579 + objectReference: {fileID: 0} + - target: {fileID: 3391830055927782908, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_LocalPosition.y + value: -1.807 + objectReference: {fileID: 0} + - target: {fileID: 3391830055927782908, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_LocalPosition.z + value: -7.9073253 + objectReference: {fileID: 0} + - target: {fileID: 3391830055927782908, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_LocalRotation.w + value: 0.8566677 + objectReference: {fileID: 0} + - target: {fileID: 3391830055927782908, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3391830055927782908, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_LocalRotation.y + value: -0.5158686 + objectReference: {fileID: 0} + - target: {fileID: 3391830055927782908, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3391830055927782908, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3391830055927782908, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -62.111 + objectReference: {fileID: 0} + - target: {fileID: 3391830055927782908, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3391830055927782908, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a9daae82a083fd5408afdcd18c755249, type: 3} +--- !u!1001 &1307672960 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4817759497810754015, guid: 7cb5953f2f8c4b342b0b0e6454774d53, type: 3} + propertyPath: m_RootOrder + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 4817759497810754015, guid: 7cb5953f2f8c4b342b0b0e6454774d53, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4817759497810754015, guid: 7cb5953f2f8c4b342b0b0e6454774d53, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4817759497810754015, guid: 7cb5953f2f8c4b342b0b0e6454774d53, type: 3} + propertyPath: m_LocalPosition.x + value: 0.63132095 + objectReference: {fileID: 0} + - target: {fileID: 4817759497810754015, guid: 7cb5953f2f8c4b342b0b0e6454774d53, type: 3} + propertyPath: m_LocalPosition.y + value: -1.86 + objectReference: {fileID: 0} + - target: {fileID: 4817759497810754015, guid: 7cb5953f2f8c4b342b0b0e6454774d53, type: 3} + propertyPath: m_LocalPosition.z + value: -7.034 + objectReference: {fileID: 0} + - target: {fileID: 4817759497810754015, guid: 7cb5953f2f8c4b342b0b0e6454774d53, type: 3} + propertyPath: m_LocalRotation.w + value: 0.89901227 + objectReference: {fileID: 0} + - target: {fileID: 4817759497810754015, guid: 7cb5953f2f8c4b342b0b0e6454774d53, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4817759497810754015, guid: 7cb5953f2f8c4b342b0b0e6454774d53, type: 3} + propertyPath: m_LocalRotation.y + value: 0.43792355 + objectReference: {fileID: 0} + - target: {fileID: 4817759497810754015, guid: 7cb5953f2f8c4b342b0b0e6454774d53, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4817759497810754015, guid: 7cb5953f2f8c4b342b0b0e6454774d53, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4817759497810754015, guid: 7cb5953f2f8c4b342b0b0e6454774d53, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 51.943 + objectReference: {fileID: 0} + - target: {fileID: 4817759497810754015, guid: 7cb5953f2f8c4b342b0b0e6454774d53, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5302933655490290533, guid: 7cb5953f2f8c4b342b0b0e6454774d53, type: 3} + propertyPath: m_Name + value: SM_Terrace + objectReference: {fileID: 0} + - target: {fileID: 5302933655490290533, guid: 7cb5953f2f8c4b342b0b0e6454774d53, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7cb5953f2f8c4b342b0b0e6454774d53, type: 3} +--- !u!1001 &1390881755 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2619375190389409606, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_Name + value: SM_Deckchair + objectReference: {fileID: 0} + - target: {fileID: 2619375190389409606, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 3391830055927782908, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_RootOrder + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 3391830055927782908, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_LocalScale.x + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 3391830055927782908, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_LocalScale.y + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 3391830055927782908, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_LocalScale.z + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 3391830055927782908, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_LocalPosition.x + value: 1.8575215 + objectReference: {fileID: 0} + - target: {fileID: 3391830055927782908, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_LocalPosition.y + value: -1.807 + objectReference: {fileID: 0} + - target: {fileID: 3391830055927782908, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_LocalPosition.z + value: -7.269 + objectReference: {fileID: 0} + - target: {fileID: 3391830055927782908, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_LocalRotation.w + value: 0.4365929 + objectReference: {fileID: 0} + - target: {fileID: 3391830055927782908, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3391830055927782908, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_LocalRotation.y + value: -0.89965916 + objectReference: {fileID: 0} + - target: {fileID: 3391830055927782908, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3391830055927782908, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3391830055927782908, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -128.227 + objectReference: {fileID: 0} + - target: {fileID: 3391830055927782908, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3391830055927782908, guid: a9daae82a083fd5408afdcd18c755249, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a9daae82a083fd5408afdcd18c755249, type: 3} --- !u!4 &1411553311 stripped Transform: m_CorrespondingSourceObject: {fileID: 6756128143651441156, guid: 2eb3d3c886097fd4babca68c00302dc2, type: 3} @@ -2467,15 +2691,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4809069469950407742, guid: 8b982c0087d04c248a2f9409564a6b30, type: 3} propertyPath: m_LocalPosition.x - value: 5.04 + value: 2.13 objectReference: {fileID: 0} - target: {fileID: 4809069469950407742, guid: 8b982c0087d04c248a2f9409564a6b30, type: 3} propertyPath: m_LocalPosition.y - value: -3.91 + value: -0.92 objectReference: {fileID: 0} - target: {fileID: 4809069469950407742, guid: 8b982c0087d04c248a2f9409564a6b30, type: 3} propertyPath: m_LocalPosition.z - value: 0.15266788 + value: -10 objectReference: {fileID: 0} - target: {fileID: 4809069469950407742, guid: 8b982c0087d04c248a2f9409564a6b30, type: 3} propertyPath: m_LocalRotation.w @@ -2718,9 +2942,9 @@ Canvas: m_GameObject: {fileID: 1527288308} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 1 + m_RenderMode: 0 m_Camera: {fileID: 1011198372} - m_PlaneDistance: 100 + m_PlaneDistance: 1 m_PixelPerfect: 0 m_ReceivesEvents: 1 m_OverrideSorting: 0 @@ -2728,7 +2952,7 @@ Canvas: m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 25 m_SortingLayerID: 0 - m_SortingOrder: -1 + m_SortingOrder: 1 m_TargetDisplay: 0 --- !u!224 &1527288312 RectTransform: @@ -2744,7 +2968,7 @@ RectTransform: m_Children: - {fileID: 208882823} m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2945,10 +3169,10 @@ GameObject: m_Component: - component: {fileID: 1726751038} - component: {fileID: 1726751041} - - component: {fileID: 1726751040} - - component: {fileID: 1726751039} + - component: {fileID: 1726751043} + - component: {fileID: 1726751042} m_Layer: 5 - m_Name: GameObject + m_Name: Mask m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2975,7 +3199,15 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: -400, y: -200} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1726751039 +--- !u!222 &1726751041 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1726751037} + m_CullTransparentMesh: 1 +--- !u!114 &1726751042 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2988,7 +3220,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 1 ---- !u!114 &1726751040 +--- !u!114 &1726751043 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3002,14 +3234,14 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: c147d87ca11aaba48be92cbbce43b5ed, type: 3} - m_Type: 3 + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -3018,14 +3250,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1726751041 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1726751037} - m_CullTransparentMesh: 1 --- !u!4 &1931262041 stripped Transform: m_CorrespondingSourceObject: {fileID: 7844659311714956426, guid: fd28e896e32b4a243bac1cd5acad35ca, type: 3} @@ -3099,7 +3323,7 @@ Canvas: m_GameObject: {fileID: 1947939811} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 1 + m_RenderMode: 0 m_Camera: {fileID: 1011198372} m_PlaneDistance: 100 m_PixelPerfect: 0 @@ -3125,7 +3349,7 @@ RectTransform: m_Children: - {fileID: 829390200} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -3165,7 +3389,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6756128143651441156, guid: 2eb3d3c886097fd4babca68c00302dc2, type: 3} propertyPath: m_LocalPosition.x - value: -1.68 + value: -2.61 objectReference: {fileID: 0} - target: {fileID: 6756128143651441156, guid: 2eb3d3c886097fd4babca68c00302dc2, type: 3} propertyPath: m_LocalPosition.y @@ -3173,7 +3397,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6756128143651441156, guid: 2eb3d3c886097fd4babca68c00302dc2, type: 3} propertyPath: m_LocalPosition.z - value: -4.39 + value: -9.666 objectReference: {fileID: 0} - target: {fileID: 6756128143651441156, guid: 2eb3d3c886097fd4babca68c00302dc2, type: 3} propertyPath: m_LocalRotation.w @@ -3209,6 +3433,121 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2eb3d3c886097fd4babca68c00302dc2, type: 3} +--- !u!1 &2081477938 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2081477939} + - component: {fileID: 2081477941} + - component: {fileID: 2081477940} + m_Layer: 0 + m_Name: Point Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2081477939 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2081477938} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.005, y: 2.43, z: -14.45} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 76118467} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2081477940 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2081477938} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 1 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} +--- !u!108 &2081477941 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2081477938} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 2 + m_Shape: 0 + m_Color: {r: 1, g: 0.94717956, b: 0.7971698, a: 1} + m_Intensity: 2 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 1 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 --- !u!1001 &2099466810 PrefabInstance: m_ObjectHideFlags: 0 @@ -3242,15 +3581,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5415644659046812857, guid: 5762eccef0e3d794083b33c9ef867a7a, type: 3} propertyPath: m_LocalPosition.x - value: -2.46 + value: 2.08 objectReference: {fileID: 0} - target: {fileID: 5415644659046812857, guid: 5762eccef0e3d794083b33c9ef867a7a, type: 3} propertyPath: m_LocalPosition.y - value: -3.92 + value: 1.47 objectReference: {fileID: 0} - target: {fileID: 5415644659046812857, guid: 5762eccef0e3d794083b33c9ef867a7a, type: 3} propertyPath: m_LocalPosition.z - value: -1.9663335 + value: -7.82 objectReference: {fileID: 0} - target: {fileID: 5415644659046812857, guid: 5762eccef0e3d794083b33c9ef867a7a, type: 3} propertyPath: m_LocalRotation.w diff --git a/Packages/manifest.json b/Packages/manifest.json index 3db702d..cf776aa 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -20,6 +20,7 @@ "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.5", "com.unity.ugui": "1.0.0", "com.unity.visualeffectgraph": "12.1.11", + "jp.keijiro.noiseshader": "1.0.0", "jp.keijiro.klak.testtools": "1.1.0" } } diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 6088a28..7358fec 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -275,6 +275,13 @@ }, "url": "https://registry.npmjs.com" }, + "jp.keijiro.noiseshader": { + "version": "1.0.0", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://registry.npmjs.com" + }, "jp.keijiro.ultraface": { "version": "file:jp.keijiro.ultraface", "depth": 0, diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index d9da35b..4553ce8 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -36,10 +36,11 @@ GraphicsSettings: - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 4800000, guid: d2fdc31d3b1e1934394f08a3e0b1921f, type: 3} m_PreloadedShaders: [] m_PreloadShadersBatchTimeLimit: -1 m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_CustomRenderPipeline: {fileID: 11400000, guid: e1260c1148f6143b28bae5ace5e9c5d1, type: 2} + m_CustomRenderPipeline: {fileID: 11400000, guid: 7b7fd9122c28c4d15b667c7040e3b3fd, type: 2} m_TransparencySortMode: 0 m_TransparencySortAxis: {x: 0, y: 0, z: 1} m_DefaultRenderingPath: 1 diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 1ccd18d..77170a9 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -7,7 +7,7 @@ QualitySettings: m_CurrentQuality: 0 m_QualitySettings: - serializedVersion: 2 - name: Medium + name: HighFidelity pixelLightCount: 1 shadows: 1 shadowResolution: 0 @@ -21,12 +21,12 @@ QualitySettings: skinWeights: 2 textureQuality: 0 anisotropicTextures: 1 - antiAliasing: 0 + antiAliasing: 4 softParticles: 0 softVegetation: 0 realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 - vSyncCount: 1 + vSyncCount: 0 lodBias: 0.7 maximumLODLevel: 0 streamingMipmapsActive: 0 @@ -40,7 +40,7 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 - customRenderPipeline: {fileID: 0} + customRenderPipeline: {fileID: 11400000, guid: 7b7fd9122c28c4d15b667c7040e3b3fd, type: 2} excludedTargetPlatforms: [] m_PerPlatformDefaultQuality: Android: 0