From 9830b4b3791ee21f78609a0731734af9af1c424b Mon Sep 17 00:00:00 2001 From: ipodtouch0218 Date: Sun, 10 Oct 2021 01:23:54 -0400 Subject: [PATCH] Changes n stuff. --- .gitignore | 1 + .vscode/settings.json | 57 - Assets/Materials/2d.meta | 8 + Assets/Materials/{ => 2d}/mat_Background.mat | 0 .../{ => 2d}/mat_Background.mat.meta | 0 Assets/Materials/{ => 2d}/mat_Powerup.mat | 0 .../Materials/{ => 2d}/mat_Powerup.mat.meta | 0 Assets/Materials/2d/mat_bobomb.mat | 127 ++ Assets/Materials/2d/mat_bobomb.mat.meta | 8 + Assets/Materials/{ => 2d}/mat_tiles.mat | 0 Assets/Materials/{ => 2d}/mat_tiles.mat.meta | 0 .../Materials/{ => mario}/OutlineMaterial.mat | 0 .../{ => mario}/OutlineMaterial.mat.meta | 0 Assets/Models/blue_shell/mat_shell.png.meta | 50 +- Assets/Models/mario_small/Mario.controller | 12 +- Assets/Resources/Bobomb.prefab | 2 +- Assets/Resources/PiranhaPlant.prefab | 2 +- Assets/Scenes/ChrisLevel.unity | 10 +- Assets/Scenes/DefaultBrickLevel.unity | 10 +- Assets/Scenes/DefaultCastle.unity | 48 +- Assets/Scenes/DefaultGrassLevel.unity | 6 +- Assets/Scenes/DefaultSnow.unity | 10 +- Assets/Scenes/MainMenu.unity | 505 +++--- Assets/Scripts/Entity/Enemy/BobombWalk.cs | 6 +- Assets/Scripts/Entity/Enemy/KoopaWalk.cs | 2 +- Assets/Scripts/Entity/PlayerController.cs | 109 +- Assets/Shaders/BobombShader.shadergraph | 1369 +++++++++++++++++ Assets/Shaders/BobombShader.shadergraph.meta | 10 + ProjectSettings/ProjectSettings.asset | 1 + 29 files changed, 1952 insertions(+), 401 deletions(-) delete mode 100644 .vscode/settings.json create mode 100644 Assets/Materials/2d.meta rename Assets/Materials/{ => 2d}/mat_Background.mat (100%) rename Assets/Materials/{ => 2d}/mat_Background.mat.meta (100%) rename Assets/Materials/{ => 2d}/mat_Powerup.mat (100%) rename Assets/Materials/{ => 2d}/mat_Powerup.mat.meta (100%) create mode 100644 Assets/Materials/2d/mat_bobomb.mat create mode 100644 Assets/Materials/2d/mat_bobomb.mat.meta rename Assets/Materials/{ => 2d}/mat_tiles.mat (100%) rename Assets/Materials/{ => 2d}/mat_tiles.mat.meta (100%) rename Assets/Materials/{ => mario}/OutlineMaterial.mat (100%) rename Assets/Materials/{ => mario}/OutlineMaterial.mat.meta (100%) create mode 100644 Assets/Shaders/BobombShader.shadergraph create mode 100644 Assets/Shaders/BobombShader.shadergraph.meta diff --git a/.gitignore b/.gitignore index c48b6e2153..25be03fe75 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ # Visual Studio cache directory .vs/ +.vscode/ # Gradle cache directory .gradle/ diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index cf20c8a3a5..0000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "files.exclude": - { - "**/.DS_Store":true, - "**/.git":true, - "**/.gitignore":true, - "**/.gitmodules":true, - "**/*.booproj":true, - "**/*.pidb":true, - "**/*.suo":true, - "**/*.user":true, - "**/*.userprefs":true, - "**/*.unityproj":true, - "**/*.dll":true, - "**/*.exe":true, - "**/*.pdf":true, - "**/*.mid":true, - "**/*.midi":true, - "**/*.wav":true, - "**/*.gif":true, - "**/*.ico":true, - "**/*.jpg":true, - "**/*.jpeg":true, - "**/*.png":true, - "**/*.psd":true, - "**/*.tga":true, - "**/*.tif":true, - "**/*.tiff":true, - "**/*.3ds":true, - "**/*.3DS":true, - "**/*.fbx":true, - "**/*.FBX":true, - "**/*.lxo":true, - "**/*.LXO":true, - "**/*.ma":true, - "**/*.MA":true, - "**/*.obj":true, - "**/*.OBJ":true, - "**/*.asset":true, - "**/*.cubemap":true, - "**/*.flare":true, - "**/*.mat":true, - "**/*.meta":true, - "**/*.prefab":true, - "**/*.unity":true, - "build/":true, - "Build/":true, - "Library/":true, - "library/":true, - "obj/":true, - "Obj/":true, - "ProjectSettings/":true, - "temp/":true, - "Temp/":true - }, - "git.ignoreLimitWarning": true -} \ No newline at end of file diff --git a/Assets/Materials/2d.meta b/Assets/Materials/2d.meta new file mode 100644 index 0000000000..332b377d79 --- /dev/null +++ b/Assets/Materials/2d.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b05f5c41dc29a5348bdd9b8abb7a041f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/mat_Background.mat b/Assets/Materials/2d/mat_Background.mat similarity index 100% rename from Assets/Materials/mat_Background.mat rename to Assets/Materials/2d/mat_Background.mat diff --git a/Assets/Materials/mat_Background.mat.meta b/Assets/Materials/2d/mat_Background.mat.meta similarity index 100% rename from Assets/Materials/mat_Background.mat.meta rename to Assets/Materials/2d/mat_Background.mat.meta diff --git a/Assets/Materials/mat_Powerup.mat b/Assets/Materials/2d/mat_Powerup.mat similarity index 100% rename from Assets/Materials/mat_Powerup.mat rename to Assets/Materials/2d/mat_Powerup.mat diff --git a/Assets/Materials/mat_Powerup.mat.meta b/Assets/Materials/2d/mat_Powerup.mat.meta similarity index 100% rename from Assets/Materials/mat_Powerup.mat.meta rename to Assets/Materials/2d/mat_Powerup.mat.meta diff --git a/Assets/Materials/2d/mat_bobomb.mat b/Assets/Materials/2d/mat_bobomb.mat new file mode 100644 index 0000000000..7624a22cd7 --- /dev/null +++ b/Assets/Materials/2d/mat_bobomb.mat @@ -0,0 +1,127 @@ +%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: mat_bobomb + m_Shader: {fileID: -6465566751694194690, guid: f2001a3d11841104cb9ecf04e250b73f, + type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + 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: 2800000, guid: 044577968aa8cbd42a6330af35c59d85, 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} + - _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: + - FlashAmount: 0 + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - FlashColor: {r: 1, g: 0, b: 0, a: 0} + - _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: [] +--- !u!114 &9024204515094923810 +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: + version: 4 diff --git a/Assets/Materials/2d/mat_bobomb.mat.meta b/Assets/Materials/2d/mat_bobomb.mat.meta new file mode 100644 index 0000000000..2494f82446 --- /dev/null +++ b/Assets/Materials/2d/mat_bobomb.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 10963cc4a7b41094fb22281d05e482a8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/mat_tiles.mat b/Assets/Materials/2d/mat_tiles.mat similarity index 100% rename from Assets/Materials/mat_tiles.mat rename to Assets/Materials/2d/mat_tiles.mat diff --git a/Assets/Materials/mat_tiles.mat.meta b/Assets/Materials/2d/mat_tiles.mat.meta similarity index 100% rename from Assets/Materials/mat_tiles.mat.meta rename to Assets/Materials/2d/mat_tiles.mat.meta diff --git a/Assets/Materials/OutlineMaterial.mat b/Assets/Materials/mario/OutlineMaterial.mat similarity index 100% rename from Assets/Materials/OutlineMaterial.mat rename to Assets/Materials/mario/OutlineMaterial.mat diff --git a/Assets/Materials/OutlineMaterial.mat.meta b/Assets/Materials/mario/OutlineMaterial.mat.meta similarity index 100% rename from Assets/Materials/OutlineMaterial.mat.meta rename to Assets/Materials/mario/OutlineMaterial.mat.meta diff --git a/Assets/Models/blue_shell/mat_shell.png.meta b/Assets/Models/blue_shell/mat_shell.png.meta index ab9d1aebda..676451eb6d 100644 --- a/Assets/Models/blue_shell/mat_shell.png.meta +++ b/Assets/Models/blue_shell/mat_shell.png.meta @@ -32,7 +32,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -75,6 +75,54 @@ TextureImporter: 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: iPhone + 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 + - serializedVersion: 3 + buildTarget: WebGL + 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: [] diff --git a/Assets/Models/mario_small/Mario.controller b/Assets/Models/mario_small/Mario.controller index 7b45f3e358..7920c6db4f 100644 --- a/Assets/Models/mario_small/Mario.controller +++ b/Assets/Models/mario_small/Mario.controller @@ -376,9 +376,6 @@ AnimatorStateTransition: - m_ConditionMode: 1 m_ConditionEvent: turnaround m_EventTreshold: 0 - - m_ConditionMode: 4 - m_ConditionEvent: velocityX - m_EventTreshold: 0.2 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 2789775162410364499} m_Solo: 0 @@ -3326,6 +3323,9 @@ AnimatorStateTransition: - m_ConditionMode: 2 m_ConditionEvent: holding m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: crouching + m_EventTreshold: 0 m_DstStateMachine: {fileID: -5603602828417527585} m_DstState: {fileID: 0} m_Solo: 0 @@ -5033,9 +5033,6 @@ AnimatorStateTransition: - m_ConditionMode: 1 m_ConditionEvent: turnaround m_EventTreshold: 0 - - m_ConditionMode: 4 - m_ConditionEvent: velocityX - m_EventTreshold: 0.2 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -8460236727417704342} m_Solo: 0 @@ -6304,6 +6301,9 @@ AnimatorStateTransition: - m_ConditionMode: 2 m_ConditionEvent: holding m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: crouching + m_EventTreshold: 0 m_DstStateMachine: {fileID: -5095662353818382087} m_DstState: {fileID: 0} m_Solo: 0 diff --git a/Assets/Resources/Bobomb.prefab b/Assets/Resources/Bobomb.prefab index beede9a22f..7593452b13 100644 --- a/Assets/Resources/Bobomb.prefab +++ b/Assets/Resources/Bobomb.prefab @@ -63,7 +63,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 10963cc4a7b41094fb22281d05e482a8, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Resources/PiranhaPlant.prefab b/Assets/Resources/PiranhaPlant.prefab index 2cdbaf681a..a7ff376995 100644 --- a/Assets/Resources/PiranhaPlant.prefab +++ b/Assets/Resources/PiranhaPlant.prefab @@ -277,7 +277,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: dead: 0 - playerDetectSize: {x: 2, y: 2} + playerDetectSize: {x: 1, y: 1.5} popupTimerRequirement: 5.5 popupTimer: 0 --- !u!114 &3416259037201337410 diff --git a/Assets/Scenes/ChrisLevel.unity b/Assets/Scenes/ChrisLevel.unity index fe5987d6ca..2788835815 100644 --- a/Assets/Scenes/ChrisLevel.unity +++ b/Assets/Scenes/ChrisLevel.unity @@ -408,7 +408,7 @@ Camera: far clip plane: 1000 field of view: 35.971092 orthographic: 1 - orthographic size: 4.6982813 + orthographic size: 4.7 m_Depth: -3 m_CullingMask: serializedVersion: 2 @@ -789,11 +789,11 @@ Camera: far clip plane: 1000 field of view: 35.971092 orthographic: 1 - orthographic size: 4.6982813 + orthographic size: 4.7 m_Depth: -2 m_CullingMask: serializedVersion: 2 - m_Bits: 7957 + m_Bits: 8085 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -1884,11 +1884,11 @@ Camera: far clip plane: 1000 field of view: 35.971092 orthographic: 1 - orthographic size: 4.6982813 + orthographic size: 4.7 m_Depth: -2 m_CullingMask: serializedVersion: 2 - m_Bits: 7957 + m_Bits: 8085 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 diff --git a/Assets/Scenes/DefaultBrickLevel.unity b/Assets/Scenes/DefaultBrickLevel.unity index aaab75a2fa..8ae774263d 100644 --- a/Assets/Scenes/DefaultBrickLevel.unity +++ b/Assets/Scenes/DefaultBrickLevel.unity @@ -4465,11 +4465,11 @@ Camera: far clip plane: 1000 field of view: 35.971092 orthographic: 1 - orthographic size: 4.6982813 + orthographic size: 4.7 m_Depth: -2 m_CullingMask: serializedVersion: 2 - m_Bits: 7957 + m_Bits: 8085 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -6381,11 +6381,11 @@ Camera: far clip plane: 1000 field of view: 35.971092 orthographic: 1 - orthographic size: 4.6982813 + orthographic size: 4.7 m_Depth: -2 m_CullingMask: serializedVersion: 2 - m_Bits: 7957 + m_Bits: 8085 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -6668,7 +6668,7 @@ Camera: far clip plane: 1000 field of view: 35.971092 orthographic: 1 - orthographic size: 4.6982813 + orthographic size: 4.7 m_Depth: -3 m_CullingMask: serializedVersion: 2 diff --git a/Assets/Scenes/DefaultCastle.unity b/Assets/Scenes/DefaultCastle.unity index 13b429f139..12c59107db 100644 --- a/Assets/Scenes/DefaultCastle.unity +++ b/Assets/Scenes/DefaultCastle.unity @@ -345,7 +345,15 @@ CompositeCollider2D: Y: -42187500 - X: 55000000 Y: -42187500 - - - X: 125000000 + - - X: 50000000 + Y: -55000000 + - X: 55000000 + Y: -55000000 + - X: 55000000 + Y: -60000000 + - X: 125000000 + Y: -60000000 + - X: 125000000 Y: -35000000 - X: 115000000 Y: -35000000 @@ -379,7 +387,7 @@ CompositeCollider2D: Y: -25000000 - X: -80000000 Y: -60000000 - - X: 125000000 + - X: 50000000 Y: -60000000 - - X: -195000000 Y: -35000000 @@ -419,7 +427,11 @@ CompositeCollider2D: - {x: 1.5, y: -2.5} - {x: 1.5, y: -4.21875} - {x: 5.5, y: -4.21875} - - - {x: 12.5, y: -3.5} + - - {x: 5, y: -5.5} + - {x: 5.5, y: -5.5} + - {x: 5.5, y: -6} + - {x: 12.5, y: -6} + - {x: 12.5, y: -3.5} - {x: 11.5, y: -3.5} - {x: 11.5, y: -4} - {x: 9, y: -4} @@ -436,7 +448,7 @@ CompositeCollider2D: - {x: -5, y: -2.5} - {x: -8, y: -2.5} - {x: -8, y: -6} - - {x: 12.5, y: -6} + - {x: 5, y: -6} - - {x: -19.5, y: -3.5} - {x: -20.5, y: -3.5} - {x: -20.5, y: -6} @@ -1008,16 +1020,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 10, y: -12, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 49 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: 11, y: -12, z: 0} second: serializedVersion: 2 @@ -3927,13 +3929,13 @@ Tilemap: m_Data: {fileID: 11400000, guid: 548b2361c4ec03f4eb8731ed1ca190b4, type: 2} - m_RefCount: 52 m_Data: {fileID: 11400000, guid: 26e52e89fe127414687cd02a3f00e501, type: 2} - - m_RefCount: 188 + - m_RefCount: 187 m_Data: {fileID: 11400000, guid: 5d9aeb95c0fd9ac4398aa941fb3707ba, type: 2} m_TileSpriteArray: - m_RefCount: 20 m_Data: {fileID: -3566987879499669825, guid: a4f9db535870eae41abdc512667ac3d3, type: 3} - - m_RefCount: 188 + - m_RefCount: 187 m_Data: {fileID: 6420436966992209846, guid: a4f9db535870eae41abdc512667ac3d3, type: 3} - m_RefCount: 18 @@ -3957,7 +3959,7 @@ Tilemap: m_Data: {fileID: 6088895996261290297, guid: f4b7221be8b79c94c9c8919163014cb0, type: 3} m_TileMatrixArray: - - m_RefCount: 320 + - m_RefCount: 319 m_Data: e00: 1 e01: 0 @@ -3976,7 +3978,7 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 320 + - m_RefCount: 319 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 @@ -17564,7 +17566,7 @@ Camera: far clip plane: 1000 field of view: 35.971092 orthographic: 1 - orthographic size: 4.6982813 + orthographic size: 4.7 m_Depth: -3 m_CullingMask: serializedVersion: 2 @@ -18524,11 +18526,11 @@ Camera: far clip plane: 1000 field of view: 35.971092 orthographic: 1 - orthographic size: 4.6982813 + orthographic size: 4.7 m_Depth: -2 m_CullingMask: serializedVersion: 2 - m_Bits: 7957 + m_Bits: 8085 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -19175,11 +19177,11 @@ Camera: far clip plane: 1000 field of view: 35.971092 orthographic: 1 - orthographic size: 4.6982813 + orthographic size: 4.7 m_Depth: -2 m_CullingMask: serializedVersion: 2 - m_Bits: 7957 + m_Bits: 8085 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 diff --git a/Assets/Scenes/DefaultGrassLevel.unity b/Assets/Scenes/DefaultGrassLevel.unity index 9f36538afa..70bdc9fb98 100644 --- a/Assets/Scenes/DefaultGrassLevel.unity +++ b/Assets/Scenes/DefaultGrassLevel.unity @@ -439,7 +439,7 @@ Camera: m_Depth: -2 m_CullingMask: serializedVersion: 2 - m_Bits: 7957 + m_Bits: 8085 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -842,7 +842,7 @@ Camera: m_Depth: -2 m_CullingMask: serializedVersion: 2 - m_Bits: 7957 + m_Bits: 8085 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -4988,7 +4988,7 @@ PrefabInstance: - target: {fileID: 5500062339093502114, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} propertyPath: levelMinTileY - value: -16 + value: -15 objectReference: {fileID: 0} - target: {fileID: 5500062339093502114, guid: 43d56bd18d06e9b4abe323618a20a228, type: 3} diff --git a/Assets/Scenes/DefaultSnow.unity b/Assets/Scenes/DefaultSnow.unity index a6e033713d..5b9a3b3471 100644 --- a/Assets/Scenes/DefaultSnow.unity +++ b/Assets/Scenes/DefaultSnow.unity @@ -2385,11 +2385,11 @@ Camera: far clip plane: 1000 field of view: 41.913692 orthographic: 1 - orthographic size: 4.6982813 + orthographic size: 4.7 m_Depth: -2 m_CullingMask: serializedVersion: 2 - m_Bits: 7957 + m_Bits: 8085 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -3032,11 +3032,11 @@ Camera: far clip plane: 1000 field of view: 41.913692 orthographic: 1 - orthographic size: 4.6982813 + orthographic size: 4.7 m_Depth: -2 m_CullingMask: serializedVersion: 2 - m_Bits: 7957 + m_Bits: 8085 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -3423,7 +3423,7 @@ Camera: far clip plane: 1000 field of view: 41.913692 orthographic: 1 - orthographic size: 4.6982813 + orthographic size: 4.7 m_Depth: -3 m_CullingMask: serializedVersion: 2 diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index a81daff1f8..c9422177f5 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -2704,7 +2704,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: b9613c05d3fefe04bba18c8c977b4368, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -4064,7 +4064,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: -2 + m_SortingOrder: -3 m_Sprite: {fileID: -7911245505332286977, guid: f351c60507a4a554c964ec121f8ed891, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -5523,7 +5523,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: b9613c05d3fefe04bba18c8c977b4368, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -11756,7 +11756,7 @@ GameObject: - component: {fileID: 1384138637} - component: {fileID: 1384138638} m_Layer: 0 - m_Name: bg-cave (1) + m_Name: pillars m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -13365,6 +13365,46 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -122, y: -11, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 48 + m_TileSpriteIndex: 44 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -121, y: -11, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 48 + m_TileSpriteIndex: 44 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -120, y: -11, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 48 + m_TileSpriteIndex: 44 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -119, y: -11, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 48 + m_TileSpriteIndex: 44 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -111, y: -11, z: 0} second: serializedVersion: 2 @@ -14315,6 +14355,46 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -122, y: -10, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 48 + m_TileSpriteIndex: 44 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -121, y: -10, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 48 + m_TileSpriteIndex: 44 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -120, y: -10, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 48 + m_TileSpriteIndex: 44 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -119, y: -10, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 48 + m_TileSpriteIndex: 44 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -111, y: -10, z: 0} second: serializedVersion: 2 @@ -15505,6 +15585,46 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -122, y: -9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 43 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -121, y: -9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 43 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -120, y: -9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 48 + m_TileSpriteIndex: 44 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -119, y: -9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 49 + m_TileSpriteIndex: 45 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -103, y: -9, z: 0} second: serializedVersion: 2 @@ -16325,6 +16445,26 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -120, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 45 + m_TileSpriteIndex: 42 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -119, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 62 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -102, y: -8, z: 0} second: serializedVersion: 2 @@ -23657,7 +23797,7 @@ Tilemap: m_AnimationTimeOffset: 0 m_IsLooping: 1 m_TileAssetArray: - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 11400000, guid: c9830da7fdd9ef047ae5914c34cab654, type: 2} - m_RefCount: 3 m_Data: {fileID: 11400000, guid: bb7cd6f47291e854eb32eecd1843da76, type: 2} @@ -23743,19 +23883,19 @@ Tilemap: m_Data: {fileID: 11400000, guid: 1529f6c7643d3e74ab6489e36ae77254, type: 2} - m_RefCount: 5 m_Data: {fileID: 11400000, guid: 055a37ede3f2f064f9d664292642636e, type: 2} - - m_RefCount: 27 + - m_RefCount: 29 m_Data: {fileID: 11400000, guid: 26e52e89fe127414687cd02a3f00e501, type: 2} - m_RefCount: 5 m_Data: {fileID: 11400000, guid: 990eb662ef6ac814fbb085f4acccc19d, type: 2} - - m_RefCount: 2 + - m_RefCount: 3 m_Data: {fileID: 11400000, guid: 7d40f838289ada44e9f3e8154a9865bd, type: 2} - m_RefCount: 2 m_Data: {fileID: 11400000, guid: 83967642f9f9c094d80716f4be10867f, type: 2} - m_RefCount: 20 m_Data: {fileID: 11400000, guid: ad5ca29e808c91c44be18ba4a687fe41, type: 2} - - m_RefCount: 26 + - m_RefCount: 35 m_Data: {fileID: 11400000, guid: 5d9aeb95c0fd9ac4398aa941fb3707ba, type: 2} - - m_RefCount: 5 + - m_RefCount: 6 m_Data: {fileID: 11400000, guid: 548b2361c4ec03f4eb8731ed1ca190b4, type: 2} - m_RefCount: 4 m_Data: {fileID: 11400000, guid: 2e0e04143a71a56458c370e77b5853aa, type: 2} @@ -23798,7 +23938,7 @@ Tilemap: - m_RefCount: 4 m_Data: {fileID: -8917260427315313510, guid: f4b7221be8b79c94c9c8919163014cb0, type: 3} - - m_RefCount: 27 + - m_RefCount: 29 m_Data: {fileID: -2204218097580962714, guid: a4f9db535870eae41abdc512667ac3d3, type: 3} - m_RefCount: 4 @@ -23916,16 +24056,16 @@ Tilemap: - m_RefCount: 5 m_Data: {fileID: 3036753812775530641, guid: 0370724d18844184d950a518e4daf31d, type: 3} - - m_RefCount: 2 + - m_RefCount: 3 m_Data: {fileID: 7542390983593812097, guid: a4f9db535870eae41abdc512667ac3d3, type: 3} - m_RefCount: 1 m_Data: {fileID: 3894684780014457245, guid: 18672b4e92026df448d06fc811e08fc3, type: 3} - - m_RefCount: 26 + - m_RefCount: 35 m_Data: {fileID: 6420436966992209846, guid: a4f9db535870eae41abdc512667ac3d3, type: 3} - - m_RefCount: 5 + - m_RefCount: 6 m_Data: {fileID: -3566987879499669825, guid: a4f9db535870eae41abdc512667ac3d3, type: 3} - m_RefCount: 4 @@ -23975,7 +24115,7 @@ Tilemap: - m_RefCount: 1 m_Data: {fileID: 1571344320749704877, guid: c55eba81d441d3f439e8289699cf72c8, type: 3} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 464114312144006252, guid: a4f9db535870eae41abdc512667ac3d3, type: 3} - m_RefCount: 1 m_Data: {fileID: -2851182035262950775, guid: 5f97a3adca3c1c04e9b3eb9c5bc49eae, @@ -24014,7 +24154,7 @@ Tilemap: m_Data: {fileID: 5242519309527336308, guid: f4b7221be8b79c94c9c8919163014cb0, type: 3} m_TileMatrixArray: - - m_RefCount: 799 + - m_RefCount: 813 m_Data: e00: 1 e01: 0 @@ -24051,7 +24191,7 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 800 + - m_RefCount: 814 m_Data: {r: 1, g: 1, b: 1, a: 1} - m_RefCount: 0 m_Data: {r: 8e-45, g: 8e-45, b: 8e-45, a: 8e-45} @@ -24465,23 +24605,23 @@ CompositeCollider2D: Y: -35000000 - X: -70000000 Y: -35000000 - - - X: -995000000 - Y: -35000000 - - X: -1070000000 - Y: -35000000 - - X: -1070000000 - Y: -40000000 - - X: -1115000064 - Y: -40000000 - - X: -1115000064 - Y: -45000000 - - X: -1140000000 - Y: -45000000 - - X: -1140000000 - Y: -55000000 - - X: -995000000 - Y: -55000000 - - - X: -610000000 + - - X: -589999900 + Y: -55000041 + - X: -589999900 + Y: -34999959 + - X: -589999959 + Y: -34999900 + - X: -600000041 + Y: -34999900 + - X: -600000100 + Y: -34999959 + - X: -600000100 + Y: -39999900 + - X: -610000041 + Y: -39999900 + - X: -610000100 + Y: -39999959 + - X: -610000100 Y: -40000000 - X: -615000000 Y: -40000000 @@ -24499,7 +24639,29 @@ CompositeCollider2D: Y: -45000000 - X: -710000000 Y: -55000000 - - X: -610000000 + - X: -610000100 + Y: -55000000 + - X: -610000100 + Y: -55000041 + - X: -610000041 + Y: -55000100 + - X: -589999959 + Y: -55000100 + - - X: -995000000 + Y: -35000000 + - X: -1070000000 + Y: -35000000 + - X: -1070000000 + Y: -40000000 + - X: -1115000064 + Y: -40000000 + - X: -1115000064 + Y: -45000000 + - X: -1140000000 + Y: -45000000 + - X: -1140000000 + Y: -55000000 + - X: -995000000 Y: -55000000 m_CompositePaths: m_Paths: @@ -24571,6 +24733,10 @@ CompositeCollider2D: - {x: -4.500029, y: 1} - {x: -9.5, y: 0.99997073} - {x: -9.49997, y: 0.5} + - - {x: -45.50003, y: 0} + - {x: -45.50003, y: 0.5} + - {x: -46.5, y: 0.4999707} + - {x: -46.499973, y: 0} - - {x: -112.50002, y: -2} - {x: -112.49997, y: -1} - {x: -111.50001, y: -0.99997073} @@ -24581,10 +24747,6 @@ CompositeCollider2D: - {x: -109.50003, y: 0.5} - {x: -113.50001, y: 0.4999707} - {x: -113.499985, y: -2} - - - {x: -45.50003, y: 0} - - {x: -45.50003, y: 0.5} - - {x: -46.5, y: 0.4999707} - - {x: -46.499973, y: 0} - - {x: -101.50003, y: -1.5} - {x: -101.50003, y: -1} - {x: -104, y: -0.9999706} @@ -24631,36 +24793,6 @@ CompositeCollider2D: - {x: -24.500029, y: -2} - {x: -25, y: -2.0000293} - {x: -24.999971, y: -2.5} - - - {x: -65.00003, y: -4.21875} - - {x: -64.99997, y: -2.71875} - - {x: -63, y: -2.7187793} - - {x: -62.99997, y: -4.21875} - - {x: -62, y: -4.218721} - - {x: -61.99997, y: -3} - - {x: -61, y: -2.999971} - - {x: -61.000034, y: -2.5} - - {x: -66, y: -2.5000293} - - {x: -66.00003, y: -3.5} - - {x: -68, y: -3.4999704} - - {x: -68.00003, y: -2.5} - - {x: -69, y: -2.5000293} - - {x: -68.99997, y: -4.21875} - - - {x: -54.000034, y: -2.71875} - - {x: -54.000034, y: -2.5} - - {x: -55.5, y: -2.5000293} - - {x: -55.49997, y: -2.71875} - - - {x: -22.500029, y: -5} - - {x: -22.500029, y: -2.5} - - {x: -23, y: -2.5000293} - - {x: -23.000029, y: -4} - - {x: -31, y: -3.9999704} - - {x: -31.000029, y: -3.5} - - {x: -31.5, y: -3.4999704} - - {x: -31.500029, y: -3} - - {x: -32, y: -2.9999707} - - {x: -32.00003, y: -2.5} - - {x: -32.5, y: -2.5000293} - - {x: -32.499973, y: -5} - - {x: 0.4999707, y: -5} - {x: 0.4999707, y: -2.5} - {x: -3, y: -2.5000293} @@ -24679,20 +24811,44 @@ CompositeCollider2D: - {x: -6.0000296, y: -4.5} - {x: -9.5, y: -4.500029} - {x: -9.49997, y: -5} + - - {x: -22.500029, y: -5} + - {x: -22.500029, y: -2.5} + - {x: -23, y: -2.5000293} + - {x: -23.000029, y: -4} + - {x: -31, y: -3.9999704} + - {x: -31.000029, y: -3.5} + - {x: -31.5, y: -3.4999704} + - {x: -31.500029, y: -3} + - {x: -32, y: -2.9999707} + - {x: -32.00003, y: -2.5} + - {x: -32.5, y: -2.5000293} + - {x: -32.499973, y: -5} + - - {x: -54.000034, y: -2.71875} + - {x: -54.000034, y: -2.5} + - {x: -55.5, y: -2.5000293} + - {x: -55.49997, y: -2.71875} + - - {x: -65.00003, y: -4.21875} + - {x: -64.99997, y: -2.71875} + - {x: -63, y: -2.7187793} + - {x: -62.99997, y: -4.21875} + - {x: -62, y: -4.218721} + - {x: -61.99997, y: -3} + - {x: -61, y: -2.999971} + - {x: -61.000034, y: -2.5} + - {x: -66, y: -2.5000293} + - {x: -66.00003, y: -3.5} + - {x: -68, y: -3.4999704} + - {x: -68.00003, y: -2.5} + - {x: -69, y: -2.5000293} + - {x: -68.99997, y: -4.21875} - - {x: -7.0000296, y: -3.5} - {x: -7.0000296, y: -3} - {x: -9, y: -3.0000293} - {x: -8.99997, y: -3.5} - - - {x: -99.50003, y: -5.5} - - {x: -99.50003, y: -3.5} - - {x: -107, y: -3.5000293} - - {x: -107.00003, y: -4} - - {x: -111.50001, y: -4.000029} - - {x: -111.50003, y: -4.5} - - {x: -114, y: -4.500029} - - {x: -113.99998, y: -5.5} - - - {x: -61.000034, y: -5.5} - - {x: -61.000034, y: -4} + - - {x: -59.000027, y: -5.50001} + - {x: -59.000027, y: -3.49999} + - {x: -60.000015, y: -3.5000253} + - {x: -60.00004, y: -3.99999} - {x: -61.5, y: -4.000029} - {x: -61.500034, y: -4.5} - {x: -69.5, y: -4.4999704} @@ -24701,6 +24857,14 @@ CompositeCollider2D: - {x: -70.50003, y: -4.5} - {x: -71, y: -4.500029} - {x: -70.99997, y: -5.5} + - - {x: -99.50003, y: -5.5} + - {x: -99.50003, y: -3.5} + - {x: -107, y: -3.5000293} + - {x: -107.00003, y: -4} + - {x: -111.50001, y: -4.000029} + - {x: -111.50003, y: -4.5} + - {x: -114, y: -4.500029} + - {x: -113.99998, y: -5.5} m_VertexDistance: 0.0005 m_OffsetDistance: 0.00005 --- !u!50 &1499739428 @@ -27643,146 +27807,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -122, y: -17, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 2 - m_TileSpriteIndex: 2 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: -121, y: -17, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 2 - m_TileSpriteIndex: 2 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: -120, y: -17, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 2 - m_TileSpriteIndex: 2 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: -119, y: -17, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 2 - m_TileSpriteIndex: 2 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: -122, y: -16, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 2 - m_TileSpriteIndex: 2 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: -121, y: -16, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 2 - m_TileSpriteIndex: 2 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: -120, y: -16, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 2 - m_TileSpriteIndex: 2 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: -119, y: -16, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 2 - m_TileSpriteIndex: 2 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: -122, y: -15, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 3 - m_TileSpriteIndex: 3 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: -121, y: -15, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 3 - m_TileSpriteIndex: 3 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: -120, y: -15, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 2 - m_TileSpriteIndex: 2 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: -119, y: -15, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 6 - m_TileSpriteIndex: 6 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: -120, y: -14, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 5 - m_TileSpriteIndex: 5 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: -119, y: -14, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 7 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: -146, y: -5, z: 0} second: serializedVersion: 2 @@ -32589,18 +32613,18 @@ Tilemap: m_Data: {fileID: 11400000, guid: b2d196090f1886e46b3dc28de0a50055, type: 2} - m_RefCount: 450 m_Data: {fileID: 11400000, guid: 91cb14224f421c94bb84a5b11696b0d0, type: 2} - - m_RefCount: 10 + - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 5d9aeb95c0fd9ac4398aa941fb3707ba, type: 2} - - m_RefCount: 2 - m_Data: {fileID: 11400000, guid: 26e52e89fe127414687cd02a3f00e501, type: 2} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: 7d40f838289ada44e9f3e8154a9865bd, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: 548b2361c4ec03f4eb8731ed1ca190b4, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: c9830da7fdd9ef047ae5914c34cab654, type: 2} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} m_TileSpriteArray: - m_RefCount: 30 m_Data: {fileID: -4555241164079809555, guid: 437a8c91bf200d54b838bc8c861ba57c, @@ -32608,24 +32632,21 @@ Tilemap: - m_RefCount: 450 m_Data: {fileID: -5379535959924532667, guid: 437a8c91bf200d54b838bc8c861ba57c, type: 3} - - m_RefCount: 10 + - m_RefCount: 1 m_Data: {fileID: 6420436966992209846, guid: a4f9db535870eae41abdc512667ac3d3, type: 3} - - m_RefCount: 2 - m_Data: {fileID: -2204218097580962714, guid: a4f9db535870eae41abdc512667ac3d3, - type: 3} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 1 - m_Data: {fileID: 7542390983593812097, guid: a4f9db535870eae41abdc512667ac3d3, - type: 3} - - m_RefCount: 1 - m_Data: {fileID: -3566987879499669825, guid: a4f9db535870eae41abdc512667ac3d3, - type: 3} - - m_RefCount: 1 - m_Data: {fileID: 464114312144006252, guid: a4f9db535870eae41abdc512667ac3d3, type: 3} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} m_TileMatrixArray: - - m_RefCount: 495 + - m_RefCount: 481 m_Data: e00: 1 e01: 0 @@ -32662,7 +32683,7 @@ Tilemap: e32: 4.5905e-41 e33: 0 m_TileColorArray: - - m_RefCount: 495 + - m_RefCount: 481 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 @@ -32727,7 +32748,7 @@ PrefabInstance: - target: {fileID: 7426856683177255955, guid: 8cf8f49ac0882ed44953ea53ff901f11, type: 3} propertyPath: m_LocalPosition.y - value: 0.95 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7426856683177255955, guid: 8cf8f49ac0882ed44953ea53ff901f11, type: 3} diff --git a/Assets/Scripts/Entity/Enemy/BobombWalk.cs b/Assets/Scripts/Entity/Enemy/BobombWalk.cs index 467efcf2f7..cb88aeac21 100644 --- a/Assets/Scripts/Entity/Enemy/BobombWalk.cs +++ b/Assets/Scripts/Entity/Enemy/BobombWalk.cs @@ -31,12 +31,16 @@ void FixedUpdate() { HandleCollision(); if (lit && !detonated && !dead) { + if ((detonateCount -= Time.fixedDeltaTime) < 0) { - if (photonView.IsMine) photonView.RPC("Detonate", RpcTarget.All); return; } + float redOverlayPercent = (5.39f/(detonateCount+2.695f))*10f % 1f; + MaterialPropertyBlock block = new MaterialPropertyBlock(); + block.SetFloat("FlashAmount", redOverlayPercent); + renderer.SetPropertyBlock(block); } } [PunRPC] diff --git a/Assets/Scripts/Entity/Enemy/KoopaWalk.cs b/Assets/Scripts/Entity/Enemy/KoopaWalk.cs index 07be521cdb..b440cacb83 100644 --- a/Assets/Scripts/Entity/Enemy/KoopaWalk.cs +++ b/Assets/Scripts/Entity/Enemy/KoopaWalk.cs @@ -100,7 +100,7 @@ public void EnterShell() { } void OnTriggerEnter2D(Collider2D collider) { - if ((photonView && !photonView.IsMine) || !shell || IsStationary() || putdown) { + if ((photonView && !photonView.IsMine) || !shell || IsStationary() || putdown || holder) { return; } GameObject obj = collider.gameObject; diff --git a/Assets/Scripts/Entity/PlayerController.cs b/Assets/Scripts/Entity/PlayerController.cs index 9a5533ff29..a59e9274eb 100644 --- a/Assets/Scripts/Entity/PlayerController.cs +++ b/Assets/Scripts/Entity/PlayerController.cs @@ -51,9 +51,7 @@ void Awake() { starDirection = Random.value < 0.5; PlayerInput input = GetComponent(); input.enabled = !photonView || photonView.IsMine; - } - void Start() { if (photonView) { playerId = System.Array.IndexOf(PhotonNetwork.PlayerList, photonView.Owner); if (!photonView.IsMine) { @@ -63,6 +61,7 @@ void Start() { } } + void HandleGroundCollision() { if (!photonView.IsMine) { return; @@ -541,8 +540,8 @@ void OnTriggerEnter2D(Collider2D collider) { } case "piranhaplant": { PiranhaPlantController piranha = collider.gameObject.GetComponentInParent(); - if (inShell || invincible > 0 || (groundpound && state != PlayerState.Mini)) { - collider.gameObject.GetPhotonView().RPC("Kill", RpcTarget.All, body.velocity.x > 0); + if (inShell || invincible > 0) { + collider.gameObject.GetPhotonView().RPC("Kill", RpcTarget.All); } else { if (holding) { piranha.photonView.RPC("Kill", RpcTarget.All); @@ -709,6 +708,9 @@ void Death(bool deathplane) { PhotonNetwork.Destroy(holding.photonView); holding = null; } + if (deathplane && photonView.IsMine) { + transform.Translate(0, -4, 0); + } } void SpawnStar() { @@ -770,7 +772,7 @@ public void Respawn() { groundpound = false; inShell = false; landing = 0f; - hitInvincibilityCounter = 5f; + hitInvincibilityCounter = 3f; GameObject.Instantiate(Resources.Load("PuffParticle"), transform.position, Quaternion.identity); } @@ -1122,8 +1124,16 @@ void HandleAnimation(bool orig) { } //hit flash - if ((hitInvincibilityCounter -= Time.fixedDeltaTime) > 0 && (hitInvincibilityCounter * 2f) % (blinkingSpeed*2) < blinkingSpeed) { - models.SetActive(false); + if (hitInvincibilityCounter >= 0) { + hitInvincibilityCounter -= Time.fixedDeltaTime; + + bool invisible; + if (hitInvincibilityCounter <= 0.75f) { + invisible = ((hitInvincibilityCounter * 3f) % (blinkingSpeed*2f) < blinkingSpeed); + } else { + invisible = (hitInvincibilityCounter * 2f) % (blinkingSpeed*2) < blinkingSpeed; + } + models.SetActive(!invisible); } else { models.SetActive(true); } @@ -1134,15 +1144,15 @@ void HandleAnimation(bool orig) { largeMarioModel.SetActive(large && !luigi); smallMarioModel.SetActive(!large && !luigi); marioBlueShell.SetActive(state == PlayerState.Shell && !luigi); - largeLuigiModel.SetActive(large && luigi); - smallLuigiModel.SetActive(!large && luigi); - luigiBlueShell.SetActive(state == PlayerState.Shell && luigi); + // largeLuigiModel.SetActive(large && luigi); + // smallLuigiModel.SetActive(!large && luigi); + // luigiBlueShell.SetActive(state == PlayerState.Shell && luigi); - if (luigi) { - animator.avatar = large ? largeLuigiAvatar : smallLuigiAvatar; - } else { + // if (luigi) { + // animator.avatar = large ? largeLuigiAvatar : smallLuigiAvatar; + // } else { animator.avatar = large ? largeMarioAvatar : smallMarioAvatar; - } + // } } void FakeOnGroundCheck() { @@ -1225,38 +1235,36 @@ void UpwardsPipeCheck() { } void HandleWallslide(bool leftWall, bool jump, bool holdingDirection) { - if (body.velocity.y <= wallslideSpeed) { - triplejump = false; - doublejump = false; - singlejump = false; + triplejump = false; + doublejump = false; + singlejump = false; - if (!holdingDirection) { - transform.position += new Vector3(0.05f * (leftWall ? 1 : -1), 0, 0); - onLeft = false; - onRight = false; - } + if (!holdingDirection) { + transform.position += new Vector3(0.05f * (leftWall ? 1 : -1), 0, 0); + onLeft = false; + onRight = false; + } - body.velocity = new Vector2(0, wallslideSpeed); - dust.transform.localPosition = new Vector3(0.075f * (leftWall ? 1 : -1), 0.075f * (state >= PlayerState.Large ? 4 : 1), dust.transform.localPosition.z); - dust.transform.rotation = Quaternion.Euler(-90f, 0, 0); + body.velocity = new Vector2(0, Mathf.Max(body.velocity.y, wallslideSpeed)); + dust.transform.localPosition = new Vector3(0.075f * (leftWall ? 1 : -1), 0.075f * (state >= PlayerState.Large ? 4 : 1), dust.transform.localPosition.z); + dust.transform.rotation = Quaternion.Euler(-90f, 0, 0); - if (jump) { - onLeft = false; - onRight = false; - body.velocity = new Vector2((runningMaxSpeed + walkingMaxSpeed)/2f * (leftWall ? 1 : -1), walljumpVelocity); - walljumping = 0.5f; - facingRight = leftWall; - singlejump = true; - doublejump = false; - triplejump = false; - onGround = false; - onGroundLastFrame = false; - photonView.RPC("PlaySound", RpcTarget.All, "player/walljump"); - if (Random.value < 0.5) { - photonView.RPC("PlaySound", RpcTarget.All, "mario/walljump_1"); - } else { - photonView.RPC("PlaySound", RpcTarget.All, "mario/walljump_2"); - } + if (jump) { + onLeft = false; + onRight = false; + body.velocity = new Vector2((runningMaxSpeed + walkingMaxSpeed)/2f * (leftWall ? 1 : -1), walljumpVelocity); + walljumping = 0.5f; + facingRight = leftWall; + singlejump = true; + doublejump = false; + triplejump = false; + onGround = false; + onGroundLastFrame = false; + photonView.RPC("PlaySound", RpcTarget.All, "player/walljump"); + if (Random.value < 0.5) { + photonView.RPC("PlaySound", RpcTarget.All, "mario/walljump_1"); + } else { + photonView.RPC("PlaySound", RpcTarget.All, "mario/walljump_2"); } } } @@ -1334,7 +1342,7 @@ void HandleWalkingRunning(bool left, bool right) { turnaround = false; } - if (Mathf.Abs(body.velocity.x) < 0.2f) { + if (Mathf.Abs(body.velocity.x) < 0.5f) { skidding = false; if (!left && !right) { turnaround = false; @@ -1356,6 +1364,7 @@ void HandleWalkingRunning(bool left, bool right) { float walkSpeedTotal = walkingMaxSpeed * invincibleSpeedBoost; bool reverseBonus = onGround && (((left && body.velocity.x > 0) || (right && body.velocity.x < 0))); float reverseFloat = (reverseBonus ? (ice ? icePenalty : 2) : 1); + float turnaroundSpeedBoost = (turnaround && !reverseBonus ? 2 : 1); if ((crouching && !onGround && !inShell) || !crouching) { @@ -1364,15 +1373,15 @@ void HandleWalkingRunning(bool left, bool right) { skidding = false; turnaround = false; if (xVel > -runSpeedTotal) { - float change = invincibleSpeedBoost * invincibleSpeedBoost * runningAcceleration * airPenalty * Time.fixedDeltaTime; + float change = invincibleSpeedBoost * invincibleSpeedBoost * turnaroundSpeedBoost * runningAcceleration * airPenalty * Time.fixedDeltaTime; body.velocity += new Vector2(change * -1, 0); } } else { if (xVel > -walkSpeedTotal) { - float change = invincibleSpeedBoost * reverseFloat * walkingAcceleration * Time.fixedDeltaTime; + float change = invincibleSpeedBoost * reverseFloat * turnaroundSpeedBoost * walkingAcceleration * Time.fixedDeltaTime; body.velocity += new Vector2(change * -1, 0); - if (state != PlayerState.Giant && reverseBonus && xVel > runSpeedTotal - 1) { + if (state != PlayerState.Giant && reverseBonus && xVel > runSpeedTotal - 2) { skidding = true; models.transform.eulerAngles = new Vector3(0,100,0); turnaround = true; @@ -1390,15 +1399,15 @@ void HandleWalkingRunning(bool left, bool right) { skidding = false; turnaround = false; if (xVel < runSpeedTotal) { - float change = invincibleSpeedBoost * invincibleSpeedBoost * runningAcceleration * airPenalty * Time.fixedDeltaTime; + float change = invincibleSpeedBoost * invincibleSpeedBoost * turnaroundSpeedBoost * runningAcceleration * airPenalty * Time.fixedDeltaTime; body.velocity += new Vector2(change * 1, 0); } } else { if (xVel < walkSpeedTotal) { - float change = invincibleSpeedBoost * reverseFloat * walkingAcceleration * Time.fixedDeltaTime; + float change = invincibleSpeedBoost * reverseFloat * turnaroundSpeedBoost * walkingAcceleration * Time.fixedDeltaTime; body.velocity += new Vector2(change * 1, 0); - if (state != PlayerState.Giant && reverseBonus && xVel < -runSpeedTotal + 1) { + if (state != PlayerState.Giant && reverseBonus && xVel < -runSpeedTotal + 2) { skidding = true; models.transform.eulerAngles = new Vector3(0,-100,0); turnaround = true; diff --git a/Assets/Shaders/BobombShader.shadergraph b/Assets/Shaders/BobombShader.shadergraph new file mode 100644 index 0000000000..a04a8bc3a3 --- /dev/null +++ b/Assets/Shaders/BobombShader.shadergraph @@ -0,0 +1,1369 @@ +{ + "m_SGVersion": 2, + "m_Type": "UnityEditor.ShaderGraph.GraphData", + "m_ObjectId": "227f86904125465b8b696ad2dd7e564a", + "m_Properties": [ + { + "m_Id": "bf445c16c9dc49e08f279d4ee7d08a6b" + }, + { + "m_Id": "ab39127c711744289e5a21771f8fc100" + }, + { + "m_Id": "4faf50e1c985418db57c15b99800b67c" + } + ], + "m_Keywords": [], + "m_Nodes": [ + { + "m_Id": "82f52cd62e5247d29fe5b641d2092e57" + }, + { + "m_Id": "17368eef94d34604bb574894e175412b" + }, + { + "m_Id": "0bb0d0419f44404aa6281aacb776de34" + }, + { + "m_Id": "ce3fa7349b5e4314aeaf3356fbad2334" + }, + { + "m_Id": "c8d31c6370154524ab3c62cf562158db" + }, + { + "m_Id": "c9727568dec5429f85bc445151a59998" + }, + { + "m_Id": "78f19ba323d94bfdb45abc9733f6af72" + }, + { + "m_Id": "de7b5c98aa5a45439e075f4c76235195" + }, + { + "m_Id": "d327cf26e01c4d0baa1da4d1d6924bbe" + }, + { + "m_Id": "5710aecd3bb74e9e82bb54371d97366b" + }, + { + "m_Id": "a06175f40efa4cb08124bb0e19294e8c" + }, + { + "m_Id": "deb379fe2c2b41a8ab783d3b72958d2e" + } + ], + "m_GroupDatas": [], + "m_StickyNoteDatas": [], + "m_Edges": [ + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "5710aecd3bb74e9e82bb54371d97366b" + }, + "m_SlotId": 4 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "c8d31c6370154524ab3c62cf562158db" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "78f19ba323d94bfdb45abc9733f6af72" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "5710aecd3bb74e9e82bb54371d97366b" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "78f19ba323d94bfdb45abc9733f6af72" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "ce3fa7349b5e4314aeaf3356fbad2334" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "a06175f40efa4cb08124bb0e19294e8c" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "deb379fe2c2b41a8ab783d3b72958d2e" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "c9727568dec5429f85bc445151a59998" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "78f19ba323d94bfdb45abc9733f6af72" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "d327cf26e01c4d0baa1da4d1d6924bbe" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "c9727568dec5429f85bc445151a59998" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "de7b5c98aa5a45439e075f4c76235195" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "deb379fe2c2b41a8ab783d3b72958d2e" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "deb379fe2c2b41a8ab783d3b72958d2e" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "78f19ba323d94bfdb45abc9733f6af72" + }, + "m_SlotId": 0 + } + } + ], + "m_VertexContext": { + "m_Position": { + "x": 14.40000057220459, + "y": 1.6000018119812012 + }, + "m_Blocks": [ + { + "m_Id": "82f52cd62e5247d29fe5b641d2092e57" + }, + { + "m_Id": "17368eef94d34604bb574894e175412b" + }, + { + "m_Id": "0bb0d0419f44404aa6281aacb776de34" + } + ] + }, + "m_FragmentContext": { + "m_Position": { + "x": 14.400012016296387, + "y": 264.0000305175781 + }, + "m_Blocks": [ + { + "m_Id": "ce3fa7349b5e4314aeaf3356fbad2334" + }, + { + "m_Id": "c8d31c6370154524ab3c62cf562158db" + } + ] + }, + "m_PreviewData": { + "serializedMesh": { + "m_SerializedMesh": "{\"mesh\":{\"fileID\":10210,\"guid\":\"0000000000000000e000000000000000\",\"type\":0}}", + "m_Guid": "" + } + }, + "m_Path": "Shader Graphs", + "m_ConcretePrecision": 0, + "m_PreviewMode": 2, + "m_OutputNode": { + "m_Id": "" + }, + "m_ActiveTargets": [ + { + "m_Id": "9a3e7144fb284556ae9078cd73ac0bec" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", + "m_ObjectId": "0316cacdfed64f7a939fdd3b06f86704", + "m_Id": 2, + "m_DisplayName": "UV", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "UV", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [], + "m_Channel": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "0bb0d0419f44404aa6281aacb776de34", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Tangent", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "2ffb5b7c22cc4869aec6a873bd7e693e" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Tangent" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "17368eef94d34604bb574894e175412b", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Normal", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "f080a4e6d991408aa059ad98b255f5de" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Normal" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "19e18f9f96334c01a042152fe2895a3e", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "1e2639cd55f04c498b9b49a19afb514e", + "m_Id": 0, + "m_DisplayName": "Base Color", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "BaseColor", + "m_StageCapability": 2, + "m_Value": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_ColorMode": 0, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "2b7f631739c14a51a60d0d4e7cb4d65c", + "m_Id": 2, + "m_DisplayName": "G", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "G", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot", + "m_ObjectId": "2ffb5b7c22cc4869aec6a873bd7e693e", + "m_Id": 0, + "m_DisplayName": "Tangent", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Tangent", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "3a10cc16d1dd46be94f36122a2026287", + "m_Id": 1, + "m_DisplayName": "R", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "R", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "3b03b47adc534862893082240bfbd94b", + "m_Id": 5, + "m_DisplayName": "G", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "G", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "4faf50e1c985418db57c15b99800b67c", + "m_Guid": { + "m_GuidSerialized": "0feb7804-212a-4dd3-a8fd-d9734b86459d" + }, + "m_Name": "FlashAmount", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "FlashAmount", + "m_DefaultReferenceName": "FlashAmount", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": 0.0, + "m_FloatType": 0, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "501b71a6fe9841cfb13ad8d497746f6a", + "m_Id": 4, + "m_DisplayName": "R", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "R", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalSpriteUnlitSubTarget", + "m_ObjectId": "522d527e4b0a4f418d2e22a83ff19289" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SplitNode", + "m_ObjectId": "5710aecd3bb74e9e82bb54371d97366b", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Split", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -118.40000915527344, + "y": 406.4000244140625, + "width": 120.80001068115235, + "height": 148.79998779296876 + } + }, + "m_Slots": [ + { + "m_Id": "582921d4d25745518c4ed5750415a5a1" + }, + { + "m_Id": "3a10cc16d1dd46be94f36122a2026287" + }, + { + "m_Id": "2b7f631739c14a51a60d0d4e7cb4d65c" + }, + { + "m_Id": "7f9b65509d6b4b308aa4328761b2d088" + }, + { + "m_Id": "cd18f510111f408d87e20cfebb64a5cf" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "582921d4d25745518c4ed5750415a5a1", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "5bf930126beb45f9a4be49c2509731ca", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", + "m_ObjectId": "6ed1bb99a86f465685bc869b60de87eb", + "m_Id": 3, + "m_DisplayName": "Sampler", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Sampler", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.AddNode", + "m_ObjectId": "78f19ba323d94bfdb45abc9733f6af72", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Add", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -351.2000732421875, + "y": 261.60003662109377, + "width": 208.00001525878907, + "height": 301.5999755859375 + } + }, + "m_Slots": [ + { + "m_Id": "ec0e0dc7e4334dd8a76c69c6a613f1c3" + }, + { + "m_Id": "5bf930126beb45f9a4be49c2509731ca" + }, + { + "m_Id": "7a79c319cb7843faa8ea2a85ddd47545" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "7a79c319cb7843faa8ea2a85ddd47545", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "7f9b65509d6b4b308aa4328761b2d088", + "m_Id": 3, + "m_DisplayName": "B", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "82ba3aaf48454e2aa243427b29e63e53", + "m_Id": 0, + "m_DisplayName": "RGBA", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "RGBA", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "82f52cd62e5247d29fe5b641d2092e57", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Position", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "dde5332fd01344458a8ac92e475b64f3" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Position" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "96f80c31c0d14b3eb6e0332e9471f5ea", + "m_Id": 0, + "m_DisplayName": "FlashAmount", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "988016fdc3454380bd32565a832c5634", + "m_Id": 0, + "m_DisplayName": "Alpha", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Alpha", + "m_StageCapability": 2, + "m_Value": 1.0, + "m_DefaultValue": 1.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", + "m_ObjectId": "9a3e7144fb284556ae9078cd73ac0bec", + "m_ActiveSubTarget": { + "m_Id": "522d527e4b0a4f418d2e22a83ff19289" + }, + "m_SurfaceType": 0, + "m_AlphaMode": 0, + "m_TwoSided": false, + "m_AlphaClip": false, + "m_CustomEditorGUI": "" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "a06175f40efa4cb08124bb0e19294e8c", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -668.7999877929688, + "y": 294.3999938964844, + "width": 147.20001220703126, + "height": 33.600006103515628 + } + }, + "m_Slots": [ + { + "m_Id": "96f80c31c0d14b3eb6e0332e9471f5ea" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "4faf50e1c985418db57c15b99800b67c" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "a5f8be7b17b44fe9acc4614604dcb952", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", + "m_ObjectId": "ab39127c711744289e5a21771f8fc100", + "m_Guid": { + "m_GuidSerialized": "62a5eedc-4d4c-4720-b894-b21d6207ed1b" + }, + "m_Name": "FlashColor", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "FlashColor", + "m_DefaultReferenceName": "FlashColor", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "r": 1.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "m_ColorMode": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "b20ff757e6bb445a83087e9e69f50c3c", + "m_Id": 6, + "m_DisplayName": "B", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "b429e4a25aaf4d71af1e0da75e9be069", + "m_Id": 1, + "m_DisplayName": "Texture", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Texture", + "m_StageCapability": 3, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "m_DefaultType": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "b9fe519309ec48e2b4521ac470b8229d", + "m_Id": 7, + "m_DisplayName": "A", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", + "m_ObjectId": "bf445c16c9dc49e08f279d4ee7d08a6b", + "m_Guid": { + "m_GuidSerialized": "ccb3bd78-9d2a-4bfe-b215-69e246d856c5" + }, + "m_Name": "_MainTex", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "_MainTex", + "m_DefaultReferenceName": "_MainTex", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"044577968aa8cbd42a6330af35c59d85\",\"type\":3}}", + "m_Guid": "" + }, + "m_Modifiable": true, + "m_DefaultType": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "c8d31c6370154524ab3c62cf562158db", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Alpha", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "988016fdc3454380bd32565a832c5634" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Alpha" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode", + "m_ObjectId": "c9727568dec5429f85bc445151a59998", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Sample Texture 2D", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -583.2000732421875, + "y": 347.20001220703127, + "width": 208.0, + "height": 434.4000549316406 + } + }, + "m_Slots": [ + { + "m_Id": "82ba3aaf48454e2aa243427b29e63e53" + }, + { + "m_Id": "501b71a6fe9841cfb13ad8d497746f6a" + }, + { + "m_Id": "3b03b47adc534862893082240bfbd94b" + }, + { + "m_Id": "b20ff757e6bb445a83087e9e69f50c3c" + }, + { + "m_Id": "b9fe519309ec48e2b4521ac470b8229d" + }, + { + "m_Id": "b429e4a25aaf4d71af1e0da75e9be069" + }, + { + "m_Id": "0316cacdfed64f7a939fdd3b06f86704" + }, + { + "m_Id": "6ed1bb99a86f465685bc869b60de87eb" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_TextureType": 0, + "m_NormalMapSpace": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "cd18f510111f408d87e20cfebb64a5cf", + "m_Id": 4, + "m_DisplayName": "A", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "ce3fa7349b5e4314aeaf3356fbad2334", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.BaseColor", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "1e2639cd55f04c498b9b49a19afb514e" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.BaseColor" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "d327cf26e01c4d0baa1da4d1d6924bbe", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -736.7999877929688, + "y": 356.79998779296877, + "width": 136.0, + "height": 34.399993896484378 + } + }, + "m_Slots": [ + { + "m_Id": "ffa26ec4a7b745b5a8ee71eecfd2bf10" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "bf445c16c9dc49e08f279d4ee7d08a6b" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", + "m_ObjectId": "dde5332fd01344458a8ac92e475b64f3", + "m_Id": 0, + "m_DisplayName": "Position", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Position", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "de7b5c98aa5a45439e075f4c76235195", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -657.5999755859375, + "y": 248.79998779296876, + "width": 136.79998779296876, + "height": 33.600006103515628 + } + }, + "m_Slots": [ + { + "m_Id": "ea31b9d0f3544ba0b9ee3af1fba4ed6b" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "ab39127c711744289e5a21771f8fc100" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "deb379fe2c2b41a8ab783d3b72958d2e", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -506.39996337890627, + "y": 208.7999725341797, + "width": 130.39999389648438, + "height": 117.60000610351563 + } + }, + "m_Slots": [ + { + "m_Id": "a5f8be7b17b44fe9acc4614604dcb952" + }, + { + "m_Id": "eeaa7b80c2744a5a88ca2ef98a47df95" + }, + { + "m_Id": "19e18f9f96334c01a042152fe2895a3e" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "ea31b9d0f3544ba0b9ee3af1fba4ed6b", + "m_Id": 0, + "m_DisplayName": "FlashColor", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "ec0e0dc7e4334dd8a76c69c6a613f1c3", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "x": 0.5799999833106995, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "eeaa7b80c2744a5a88ca2ef98a47df95", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "f080a4e6d991408aa059ad98b255f5de", + "m_Id": 0, + "m_DisplayName": "Normal", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Normal", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "ffa26ec4a7b745b5a8ee71eecfd2bf10", + "m_Id": 0, + "m_DisplayName": "_MainTex", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_BareResource": false +} + diff --git a/Assets/Shaders/BobombShader.shadergraph.meta b/Assets/Shaders/BobombShader.shadergraph.meta new file mode 100644 index 0000000000..7dbe1756ed --- /dev/null +++ b/Assets/Shaders/BobombShader.shadergraph.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: f2001a3d11841104cb9ecf04e250b73f +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 6d9d70874a..ac8610b9fb 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -138,6 +138,7 @@ PlayerSettings: - {fileID: 0} - {fileID: 0} - {fileID: 0} + - {fileID: 0} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1