From 58934433f3ce22b80f65ccc11c340c868d4e5807 Mon Sep 17 00:00:00 2001 From: Hazim Bin Ijaz Date: Fri, 11 Apr 2025 18:12:40 +0500 Subject: [PATCH] Added platform outlining and increased player speeds by 10% --- .../Materials/Custom_TransparentOutline.mat | 2 +- Assets/Materials/OutlinesForPlatform.meta | 8 +++ .../OutlinesForPlatform/BlueViolet.mat | 51 +++++++++++++++++++ .../OutlinesForPlatform/BlueViolet.mat.meta | 8 +++ .../OutlinesForPlatform/DarkTurquoise.mat | 51 +++++++++++++++++++ .../DarkTurquoise.mat.meta | 8 +++ .../OutlinesForPlatform/DodgerBlue.mat | 51 +++++++++++++++++++ .../OutlinesForPlatform/DodgerBlue.mat.meta | 8 +++ Assets/Materials/OutlinesForPlatform/Gold.mat | 51 +++++++++++++++++++ .../OutlinesForPlatform/Gold.mat.meta | 8 +++ .../Materials/OutlinesForPlatform/HotPink.mat | 51 +++++++++++++++++++ .../OutlinesForPlatform/HotPink.mat.meta | 8 +++ .../OutlinesForPlatform/LimeGreen.mat | 51 +++++++++++++++++++ .../OutlinesForPlatform/LimeGreen.mat.meta | 8 +++ .../OutlinesForPlatform/OrangeRed.mat | 51 +++++++++++++++++++ .../OutlinesForPlatform/OrangeRed.mat.meta | 8 +++ Assets/Prefabs/Character/PlayerAvatar.prefab | 13 +++-- Assets/Scenes/BossRoom.unity | 5 +- Assets/Scenes/BossRoom/DungeonEntrance.unity | 42 ++++++++++----- .../Character/ServerCharacter.cs | 50 ++++++++++++++++++ Assets/Scripts/Gameplay/Platform.cs | 5 +- 21 files changed, 515 insertions(+), 23 deletions(-) create mode 100644 Assets/Materials/OutlinesForPlatform.meta create mode 100644 Assets/Materials/OutlinesForPlatform/BlueViolet.mat create mode 100644 Assets/Materials/OutlinesForPlatform/BlueViolet.mat.meta create mode 100644 Assets/Materials/OutlinesForPlatform/DarkTurquoise.mat create mode 100644 Assets/Materials/OutlinesForPlatform/DarkTurquoise.mat.meta create mode 100644 Assets/Materials/OutlinesForPlatform/DodgerBlue.mat create mode 100644 Assets/Materials/OutlinesForPlatform/DodgerBlue.mat.meta create mode 100644 Assets/Materials/OutlinesForPlatform/Gold.mat create mode 100644 Assets/Materials/OutlinesForPlatform/Gold.mat.meta create mode 100644 Assets/Materials/OutlinesForPlatform/HotPink.mat create mode 100644 Assets/Materials/OutlinesForPlatform/HotPink.mat.meta create mode 100644 Assets/Materials/OutlinesForPlatform/LimeGreen.mat create mode 100644 Assets/Materials/OutlinesForPlatform/LimeGreen.mat.meta create mode 100644 Assets/Materials/OutlinesForPlatform/OrangeRed.mat create mode 100644 Assets/Materials/OutlinesForPlatform/OrangeRed.mat.meta diff --git a/Assets/Materials/Custom_TransparentOutline.mat b/Assets/Materials/Custom_TransparentOutline.mat index 8d4755f9..b7fe3689 100644 --- a/Assets/Materials/Custom_TransparentOutline.mat +++ b/Assets/Materials/Custom_TransparentOutline.mat @@ -47,5 +47,5 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _MainColor: {r: 1, g: 1, b: 1, a: 0.46666667} - - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _OutlineColor: {r: 0.9622642, g: 0.9622642, b: 0.9622642, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Materials/OutlinesForPlatform.meta b/Assets/Materials/OutlinesForPlatform.meta new file mode 100644 index 00000000..e17d8c9b --- /dev/null +++ b/Assets/Materials/OutlinesForPlatform.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7ac16848d1c909b4284a5f1a50467627 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/OutlinesForPlatform/BlueViolet.mat b/Assets/Materials/OutlinesForPlatform/BlueViolet.mat new file mode 100644 index 00000000..1c90ed00 --- /dev/null +++ b/Assets/Materials/OutlinesForPlatform/BlueViolet.mat @@ -0,0 +1,51 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BlueViolet + m_Shader: {fileID: 4800000, guid: c5e3d1e5fc8764c42a7765d7200e531e, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 1 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Texture2DAsset_ed5845bdef6b4ba39ae420b153b33345_Out_0_Texture2D: + m_Texture: {fileID: 2800000, guid: 4a53678acb2214c7aa104d85906b0982, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _OutlineWidth: 0.05 + - _QueueControl: 0 + - _QueueOffset: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _MainColor: {r: 1, g: 1, b: 1, a: 0.46666667} + - _OutlineColor: {r: 0.5411765, g: 0.16862746, b: 0.8862745, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/OutlinesForPlatform/BlueViolet.mat.meta b/Assets/Materials/OutlinesForPlatform/BlueViolet.mat.meta new file mode 100644 index 00000000..890628e1 --- /dev/null +++ b/Assets/Materials/OutlinesForPlatform/BlueViolet.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 80406dffbe7e253489eac829b9605b8c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/OutlinesForPlatform/DarkTurquoise.mat b/Assets/Materials/OutlinesForPlatform/DarkTurquoise.mat new file mode 100644 index 00000000..5284a2a4 --- /dev/null +++ b/Assets/Materials/OutlinesForPlatform/DarkTurquoise.mat @@ -0,0 +1,51 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DarkTurquoise + m_Shader: {fileID: 4800000, guid: c5e3d1e5fc8764c42a7765d7200e531e, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 1 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Texture2DAsset_ed5845bdef6b4ba39ae420b153b33345_Out_0_Texture2D: + m_Texture: {fileID: 2800000, guid: 4a53678acb2214c7aa104d85906b0982, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _OutlineWidth: 0.05 + - _QueueControl: 0 + - _QueueOffset: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _MainColor: {r: 1, g: 1, b: 1, a: 0.46666667} + - _OutlineColor: {r: 0, g: 0.80784315, b: 0.81960785, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/OutlinesForPlatform/DarkTurquoise.mat.meta b/Assets/Materials/OutlinesForPlatform/DarkTurquoise.mat.meta new file mode 100644 index 00000000..6f40ef10 --- /dev/null +++ b/Assets/Materials/OutlinesForPlatform/DarkTurquoise.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 12de8d2e575c70f4483940208dfe9b00 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/OutlinesForPlatform/DodgerBlue.mat b/Assets/Materials/OutlinesForPlatform/DodgerBlue.mat new file mode 100644 index 00000000..6b8908c7 --- /dev/null +++ b/Assets/Materials/OutlinesForPlatform/DodgerBlue.mat @@ -0,0 +1,51 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DodgerBlue + m_Shader: {fileID: 4800000, guid: c5e3d1e5fc8764c42a7765d7200e531e, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 1 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Texture2DAsset_ed5845bdef6b4ba39ae420b153b33345_Out_0_Texture2D: + m_Texture: {fileID: 2800000, guid: 4a53678acb2214c7aa104d85906b0982, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _OutlineWidth: 0.05 + - _QueueControl: 0 + - _QueueOffset: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _MainColor: {r: 1, g: 1, b: 1, a: 0.46666667} + - _OutlineColor: {r: 0.11764706, g: 0.5647059, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/OutlinesForPlatform/DodgerBlue.mat.meta b/Assets/Materials/OutlinesForPlatform/DodgerBlue.mat.meta new file mode 100644 index 00000000..ef8e27e2 --- /dev/null +++ b/Assets/Materials/OutlinesForPlatform/DodgerBlue.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 276bb15b37ba5154093741bc3676ba39 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/OutlinesForPlatform/Gold.mat b/Assets/Materials/OutlinesForPlatform/Gold.mat new file mode 100644 index 00000000..a51344de --- /dev/null +++ b/Assets/Materials/OutlinesForPlatform/Gold.mat @@ -0,0 +1,51 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Gold + m_Shader: {fileID: 4800000, guid: c5e3d1e5fc8764c42a7765d7200e531e, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 1 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Texture2DAsset_ed5845bdef6b4ba39ae420b153b33345_Out_0_Texture2D: + m_Texture: {fileID: 2800000, guid: 4a53678acb2214c7aa104d85906b0982, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _OutlineWidth: 0.05 + - _QueueControl: 0 + - _QueueOffset: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _MainColor: {r: 1, g: 1, b: 1, a: 0.46666667} + - _OutlineColor: {r: 1, g: 0.84313726, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/OutlinesForPlatform/Gold.mat.meta b/Assets/Materials/OutlinesForPlatform/Gold.mat.meta new file mode 100644 index 00000000..887053c9 --- /dev/null +++ b/Assets/Materials/OutlinesForPlatform/Gold.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5015bd1b706b426449e4efec20c68a3d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/OutlinesForPlatform/HotPink.mat b/Assets/Materials/OutlinesForPlatform/HotPink.mat new file mode 100644 index 00000000..843316e5 --- /dev/null +++ b/Assets/Materials/OutlinesForPlatform/HotPink.mat @@ -0,0 +1,51 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HotPink + m_Shader: {fileID: 4800000, guid: c5e3d1e5fc8764c42a7765d7200e531e, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 1 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Texture2DAsset_ed5845bdef6b4ba39ae420b153b33345_Out_0_Texture2D: + m_Texture: {fileID: 2800000, guid: 4a53678acb2214c7aa104d85906b0982, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _OutlineWidth: 0.05 + - _QueueControl: 0 + - _QueueOffset: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _MainColor: {r: 1, g: 1, b: 1, a: 0.46666667} + - _OutlineColor: {r: 1, g: 0.4117647, b: 0.7058824, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/OutlinesForPlatform/HotPink.mat.meta b/Assets/Materials/OutlinesForPlatform/HotPink.mat.meta new file mode 100644 index 00000000..ea533a52 --- /dev/null +++ b/Assets/Materials/OutlinesForPlatform/HotPink.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5a01e7926e1a930418909b4b525c072c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/OutlinesForPlatform/LimeGreen.mat b/Assets/Materials/OutlinesForPlatform/LimeGreen.mat new file mode 100644 index 00000000..3c783399 --- /dev/null +++ b/Assets/Materials/OutlinesForPlatform/LimeGreen.mat @@ -0,0 +1,51 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LimeGreen + m_Shader: {fileID: 4800000, guid: c5e3d1e5fc8764c42a7765d7200e531e, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 1 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Texture2DAsset_ed5845bdef6b4ba39ae420b153b33345_Out_0_Texture2D: + m_Texture: {fileID: 2800000, guid: 4a53678acb2214c7aa104d85906b0982, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _OutlineWidth: 0.05 + - _QueueControl: 0 + - _QueueOffset: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _MainColor: {r: 1, g: 1, b: 1, a: 0.46666667} + - _OutlineColor: {r: 0.19607843, g: 0.8039216, b: 0.19607843, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/OutlinesForPlatform/LimeGreen.mat.meta b/Assets/Materials/OutlinesForPlatform/LimeGreen.mat.meta new file mode 100644 index 00000000..c0bf84a7 --- /dev/null +++ b/Assets/Materials/OutlinesForPlatform/LimeGreen.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: de6cc42cc9db8e1499bda7f912a49e59 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/OutlinesForPlatform/OrangeRed.mat b/Assets/Materials/OutlinesForPlatform/OrangeRed.mat new file mode 100644 index 00000000..1ba4dcb6 --- /dev/null +++ b/Assets/Materials/OutlinesForPlatform/OrangeRed.mat @@ -0,0 +1,51 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: OrangeRed + m_Shader: {fileID: 4800000, guid: c5e3d1e5fc8764c42a7765d7200e531e, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 1 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Texture2DAsset_ed5845bdef6b4ba39ae420b153b33345_Out_0_Texture2D: + m_Texture: {fileID: 2800000, guid: 4a53678acb2214c7aa104d85906b0982, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _OutlineWidth: 0.05 + - _QueueControl: 0 + - _QueueOffset: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _MainColor: {r: 1, g: 1, b: 1, a: 0.46666667} + - _OutlineColor: {r: 1, g: 0.27058825, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/OutlinesForPlatform/OrangeRed.mat.meta b/Assets/Materials/OutlinesForPlatform/OrangeRed.mat.meta new file mode 100644 index 00000000..fb72696c --- /dev/null +++ b/Assets/Materials/OutlinesForPlatform/OrangeRed.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6a3de0664fb55d443b4957bbbfc87be1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Character/PlayerAvatar.prefab b/Assets/Prefabs/Character/PlayerAvatar.prefab index 94ef519f..2b94b614 100644 --- a/Assets/Prefabs/Character/PlayerAvatar.prefab +++ b/Assets/Prefabs/Character/PlayerAvatar.prefab @@ -260,7 +260,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1306469665054868494, guid: 7d7c60d0862566a418c1bf240918a58b, type: 3} propertyPath: GlobalObjectIdHash - value: 3177087589 + value: 2574694909 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -695,7 +695,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5109095020609682098, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3} propertyPath: GlobalObjectIdHash - value: 3177087589 + value: 3937158934 objectReference: {fileID: 0} - target: {fileID: 5935320730402577130, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3} propertyPath: m_Name @@ -707,7 +707,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7760591836692130632, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3} propertyPath: GlobalObjectIdHash - value: 3177087589 + value: 689616533 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -842,6 +842,10 @@ PrefabInstance: propertyPath: m_NetworkAnimator value: objectReference: {fileID: 4639653625902786935} + - target: {fileID: 745390554272530562, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3} + propertyPath: m_Speed + value: 4 + objectReference: {fileID: 0} - target: {fileID: 745390554272530562, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3} propertyPath: m_Radius value: 0.01 @@ -876,7 +880,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4600110157238723790, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3} propertyPath: GlobalObjectIdHash - value: 3177087589 + value: 3737985212 objectReference: {fileID: 0} - target: {fileID: 4600110157238723790, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3} propertyPath: PrefabHashGenerator @@ -1485,6 +1489,7 @@ MonoBehaviour: - {fileID: 11400000, guid: f58030efba278b040be08a2bb92abb0b, type: 2} - {fileID: 11400000, guid: 6b4485e4bc8be814db7fc22a6778fbd5, type: 2} abilitiesUI: [] + isAbilityActive: 0 currentAbilityIndicator: {fileID: 92142163933926358} wallIndicator: {fileID: 1257869342993333690} radiusIndicator: {fileID: 5777075014631279474} diff --git a/Assets/Scenes/BossRoom.unity b/Assets/Scenes/BossRoom.unity index 08511099..a8395dbe 100644 --- a/Assets/Scenes/BossRoom.unity +++ b/Assets/Scenes/BossRoom.unity @@ -19212,11 +19212,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1676734515771252668, guid: 0193228de87741d40a42e561901c9083, type: 3} propertyPath: m_LocalRotation.y - value: 0.28987607 + value: 0.28987613 objectReference: {fileID: 0} - target: {fileID: 1676734515771252668, guid: 0193228de87741d40a42e561901c9083, type: 3} propertyPath: m_LocalRotation.z - value: -0.18152031 + value: -0.18152039 objectReference: {fileID: 0} - target: {fileID: 1676734516302391364, guid: 0193228de87741d40a42e561901c9083, type: 3} propertyPath: m_UpdateMethod @@ -19441,6 +19441,7 @@ MonoBehaviour: panSpeed: 10 resetSpeed: 7 panLimit: {x: 7, y: 7} + freeRoamSpeed: 10 --- !u!114 &1060857737 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/BossRoom/DungeonEntrance.unity b/Assets/Scenes/BossRoom/DungeonEntrance.unity index 5d1ae03d..2d98a31c 100644 --- a/Assets/Scenes/BossRoom/DungeonEntrance.unity +++ b/Assets/Scenes/BossRoom/DungeonEntrance.unity @@ -200,8 +200,8 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 18, y: 0.05624998, z: 18} - m_ConstrainProportionsScale: 1 + m_LocalScale: {x: 16, y: 0.05624998, z: 16} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3169561862507413951} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -521,8 +521,8 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 18, y: 0.05624998, z: 18} - m_ConstrainProportionsScale: 1 + m_LocalScale: {x: 16, y: 0.05624998, z: 16} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 249976107358570836} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -812,8 +812,8 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 18, y: 0.05624998, z: 18} - m_ConstrainProportionsScale: 1 + m_LocalScale: {x: 16, y: 0.05624998, z: 16} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5195700795859028913} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1269,8 +1269,8 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 18, y: 0.05624998, z: 18} - m_ConstrainProportionsScale: 1 + m_LocalScale: {x: 16, y: 0.05624998, z: 16} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6996768595326639848} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2032,8 +2032,8 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 18, y: 0.05624998, z: 18} - m_ConstrainProportionsScale: 1 + m_LocalScale: {x: 16, y: 0.05624998, z: 16} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5590359088119101749} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2233,8 +2233,8 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 18, y: 0.05624998, z: 18} - m_ConstrainProportionsScale: 1 + m_LocalScale: {x: 16, y: 0.05624998, z: 16} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1326862948614608678} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2386,8 +2386,8 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 18, y: 0.05624998, z: 18} - m_ConstrainProportionsScale: 1 + m_LocalScale: {x: 16, y: 0.05624998, z: 16} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1223475210011116500} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2540,6 +2540,7 @@ MeshRenderer: m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 97d69db8b5df6bf4da2c90aab0053087, type: 2} + - {fileID: 2100000, guid: de6cc42cc9db8e1499bda7f912a49e59, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2642,6 +2643,7 @@ MonoBehaviour: barrierObject: {fileID: 586197736} AuraObj: {fileID: 1123007381} TimerObject: {fileID: 403260884} + outlineMaterial: {fileID: 2100000, guid: de6cc42cc9db8e1499bda7f912a49e59, type: 2} --- !u!114 &249976107358570840 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2774,6 +2776,7 @@ MeshRenderer: m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 97d69db8b5df6bf4da2c90aab0053087, type: 2} + - {fileID: 2100000, guid: 5015bd1b706b426449e4efec20c68a3d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2891,6 +2894,7 @@ MonoBehaviour: barrierObject: {fileID: 1889561963} AuraObj: {fileID: 407725661} TimerObject: {fileID: 1962636493} + outlineMaterial: {fileID: 2100000, guid: 5015bd1b706b426449e4efec20c68a3d, type: 2} --- !u!114 &1223475210011116504 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3039,6 +3043,7 @@ MeshRenderer: m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 97d69db8b5df6bf4da2c90aab0053087, type: 2} + - {fileID: 2100000, guid: 12de8d2e575c70f4483940208dfe9b00, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3141,6 +3146,7 @@ MonoBehaviour: barrierObject: {fileID: 1006116859} AuraObj: {fileID: 1565156258} TimerObject: {fileID: 1845327947} + outlineMaterial: {fileID: 2100000, guid: 12de8d2e575c70f4483940208dfe9b00, type: 2} --- !u!114 &1326862948614608682 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3273,6 +3279,7 @@ MeshRenderer: m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 97d69db8b5df6bf4da2c90aab0053087, type: 2} + - {fileID: 2100000, guid: 80406dffbe7e253489eac829b9605b8c, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3374,6 +3381,7 @@ MonoBehaviour: barrierObject: {fileID: 1727201760} AuraObj: {fileID: 1681270113} TimerObject: {fileID: 54039276} + outlineMaterial: {fileID: 2100000, guid: 80406dffbe7e253489eac829b9605b8c, type: 2} --- !u!114 &3169561862507413955 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3510,6 +3518,7 @@ MeshRenderer: m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 97d69db8b5df6bf4da2c90aab0053087, type: 2} + - {fileID: 2100000, guid: 5a01e7926e1a930418909b4b525c072c, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3577,6 +3586,7 @@ MonoBehaviour: barrierObject: {fileID: 23828395} AuraObj: {fileID: 226924659} TimerObject: {fileID: 566881364} + outlineMaterial: {fileID: 2100000, guid: 5a01e7926e1a930418909b4b525c072c, type: 2} --- !u!114 &5215249593494578417 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3744,6 +3754,7 @@ MeshRenderer: m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 97d69db8b5df6bf4da2c90aab0053087, type: 2} + - {fileID: 2100000, guid: 6a3de0664fb55d443b4957bbbfc87be1, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3811,6 +3822,7 @@ MonoBehaviour: barrierObject: {fileID: 1799421583} AuraObj: {fileID: 652972897} TimerObject: {fileID: 1699078070} + outlineMaterial: {fileID: 2100000, guid: 6a3de0664fb55d443b4957bbbfc87be1, type: 2} --- !u!114 &5615547279758710381 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3978,6 +3990,7 @@ MeshRenderer: m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 97d69db8b5df6bf4da2c90aab0053087, type: 2} + - {fileID: 2100000, guid: 276bb15b37ba5154093741bc3676ba39, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -4045,6 +4058,7 @@ MonoBehaviour: barrierObject: {fileID: 477647222} AuraObj: {fileID: 1648781169} TimerObject: {fileID: 1065926027} + outlineMaterial: {fileID: 2100000, guid: 276bb15b37ba5154093741bc3676ba39, type: 2} --- !u!114 &7017483914677023160 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Gameplay/GameplayObjects/Character/ServerCharacter.cs b/Assets/Scripts/Gameplay/GameplayObjects/Character/ServerCharacter.cs index b105dd1e..084431f3 100644 --- a/Assets/Scripts/Gameplay/GameplayObjects/Character/ServerCharacter.cs +++ b/Assets/Scripts/Gameplay/GameplayObjects/Character/ServerCharacter.cs @@ -343,15 +343,65 @@ namespace Unity.BossRoom.Gameplay.GameplayObjects.Character { Debug.Log($"[ServerChar] Setting CurrentPlatformId = {platformId}"); CurrentPlatformId = platformId; + ToggleOutlinerMaterial(true, PlatformManager.Instance.GetPlatformById(platformId).OutlineMaterial); + //PlatformManager.Instance.GetPlatformById(platformId).OutlineMaterial; } else { Debug.Log($"[ServerChar] Setting PreviousPlatformId = {platformId}"); + ToggleOutlinerMaterial(false, PlatformManager.Instance.GetPlatformById(platformId).OutlineMaterial); PreviousPlatformId = platformId; CurrentPlatformId = null; } } + // Toggles the outliner material on or off. + public void ToggleOutlinerMaterial(bool enable, Material outlinerMaterial) + { + SkinnedMeshRenderer meshRenderer = GetComponentInChildren(); + if (meshRenderer == null || outlinerMaterial == null) + { + Debug.LogWarning("MeshRenderer or Outliner Material is missing."); + return; + } + + // Retrieve the current materials. + List materials = new List(meshRenderer.materials); + + if (enable) + { + // Only add if not already present (compare names, ignoring possible instance suffix) + bool found = materials.Exists(mat => RemoveInstanceSuffix(mat.name) == outlinerMaterial.name); + if (!found) + { + materials.Add(outlinerMaterial); + Debug.Log("Enabling the outline."); + } + else + { + Debug.Log("Outline already enabled."); + } + } + else + { + // Remove all materials that match our outliner (by name) + int removedCount = materials.RemoveAll(mat => RemoveInstanceSuffix(mat.name) == outlinerMaterial.name); + Debug.Log("Disabling the outline. Removed count: " + removedCount); + } + + // Apply the updated materials. + meshRenderer.materials = materials.ToArray(); + } + + private string RemoveInstanceSuffix(string materialName) + { + if (materialName.EndsWith(" (Instance)")) + return materialName.Substring(0, materialName.LastIndexOf(" (Instance)")); + return materialName; + } + + + public void Freeze(float duration) { StartCoroutine(FreezeCoroutine(duration)); diff --git a/Assets/Scripts/Gameplay/Platform.cs b/Assets/Scripts/Gameplay/Platform.cs index ed7b0b8d..1c5d9a7e 100644 --- a/Assets/Scripts/Gameplay/Platform.cs +++ b/Assets/Scripts/Gameplay/Platform.cs @@ -24,10 +24,11 @@ namespace Unity.Multiplayer.Samples.BossRoom [SerializeField] private GameObject barrierObject; [SerializeField] private GameObject AuraObj; [SerializeField] private GameObject TimerObject; - + [SerializeField] private Material outlineMaterial; + public Material OutlineMaterial => outlineMaterial; private Material timerMaterial; private float maxTime = 10f; - + private void Awake() { platformCollider = GetComponent();