diff --git a/Assets/Mirror/Examples/TopDownShooter/Materials/DeathSplatter.mat b/Assets/Mirror/Examples/TopDownShooter/Materials/DeathSplatter.mat index 9ad55758e..bbc257052 100644 --- a/Assets/Mirror/Examples/TopDownShooter/Materials/DeathSplatter.mat +++ b/Assets/Mirror/Examples/TopDownShooter/Materials/DeathSplatter.mat @@ -2,18 +2,14 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: DeathSplatter m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _ALPHABLEND_ON - m_InvalidKeywords: [] + m_ShaderKeywords: _ALPHABLEND_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -21,7 +17,6 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -61,7 +56,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 @@ -82,4 +76,3 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Mirror/Examples/TopDownShooter/Materials/Enemy.mat b/Assets/Mirror/Examples/TopDownShooter/Materials/Enemy.mat index f4e8ab2ce..77da41574 100644 --- a/Assets/Mirror/Examples/TopDownShooter/Materials/Enemy.mat +++ b/Assets/Mirror/Examples/TopDownShooter/Materials/Enemy.mat @@ -2,18 +2,14 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Enemy m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _ALPHABLEND_ON - m_InvalidKeywords: [] + m_ShaderKeywords: _ALPHABLEND_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -21,7 +17,6 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -61,7 +56,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 @@ -82,4 +76,3 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Mirror/Examples/TopDownShooter/Materials/EnemyHand1.mat b/Assets/Mirror/Examples/TopDownShooter/Materials/EnemyHand1.mat index 92d3d30ad..e6fd78631 100644 --- a/Assets/Mirror/Examples/TopDownShooter/Materials/EnemyHand1.mat +++ b/Assets/Mirror/Examples/TopDownShooter/Materials/EnemyHand1.mat @@ -2,18 +2,14 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: EnemyHand1 m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _ALPHABLEND_ON - m_InvalidKeywords: [] + m_ShaderKeywords: _ALPHABLEND_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -21,7 +17,6 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -61,7 +56,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 @@ -82,4 +76,3 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Mirror/Examples/TopDownShooter/Materials/EnemyHand2.mat b/Assets/Mirror/Examples/TopDownShooter/Materials/EnemyHand2.mat index fb3a8029e..96da6fd12 100644 --- a/Assets/Mirror/Examples/TopDownShooter/Materials/EnemyHand2.mat +++ b/Assets/Mirror/Examples/TopDownShooter/Materials/EnemyHand2.mat @@ -2,18 +2,14 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: EnemyHand2 m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _ALPHABLEND_ON - m_InvalidKeywords: [] + m_ShaderKeywords: _ALPHABLEND_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -21,7 +17,6 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -61,7 +56,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 @@ -82,4 +76,3 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Mirror/Examples/TopDownShooter/Materials/Flash.mat b/Assets/Mirror/Examples/TopDownShooter/Materials/Flash.mat index 82a042505..384d4d847 100644 --- a/Assets/Mirror/Examples/TopDownShooter/Materials/Flash.mat +++ b/Assets/Mirror/Examples/TopDownShooter/Materials/Flash.mat @@ -2,18 +2,14 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Flash m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _ALPHABLEND_ON - m_InvalidKeywords: [] + m_ShaderKeywords: _ALPHABLEND_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -21,7 +17,6 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -61,7 +56,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 @@ -82,4 +76,3 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Mirror/Examples/TopDownShooter/Materials/HitPoint.mat b/Assets/Mirror/Examples/TopDownShooter/Materials/HitPoint.mat index d0cd1fc7f..286766ab2 100644 --- a/Assets/Mirror/Examples/TopDownShooter/Materials/HitPoint.mat +++ b/Assets/Mirror/Examples/TopDownShooter/Materials/HitPoint.mat @@ -2,18 +2,14 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: HitPoint m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _ALPHABLEND_ON - m_InvalidKeywords: [] + m_ShaderKeywords: _ALPHABLEND_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -21,7 +17,6 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -61,7 +56,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 @@ -82,4 +76,3 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Mirror/Examples/TopDownShooter/Materials/Player.mat b/Assets/Mirror/Examples/TopDownShooter/Materials/Player.mat index 395c869e5..6e264d966 100644 --- a/Assets/Mirror/Examples/TopDownShooter/Materials/Player.mat +++ b/Assets/Mirror/Examples/TopDownShooter/Materials/Player.mat @@ -2,18 +2,14 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Player m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _ALPHABLEND_ON - m_InvalidKeywords: [] + m_ShaderKeywords: _ALPHABLEND_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -21,7 +17,6 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -61,7 +56,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 @@ -82,4 +76,3 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Mirror/Examples/TopDownShooter/Materials/PlayerLF.mat b/Assets/Mirror/Examples/TopDownShooter/Materials/PlayerLF.mat index ec3c40955..2f2eb77ad 100644 --- a/Assets/Mirror/Examples/TopDownShooter/Materials/PlayerLF.mat +++ b/Assets/Mirror/Examples/TopDownShooter/Materials/PlayerLF.mat @@ -2,18 +2,14 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: PlayerLF m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _ALPHABLEND_ON - m_InvalidKeywords: [] + m_ShaderKeywords: _ALPHABLEND_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -21,7 +17,6 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -61,7 +56,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 @@ -82,4 +76,3 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Mirror/Examples/TopDownShooter/Materials/PlayerRF.mat b/Assets/Mirror/Examples/TopDownShooter/Materials/PlayerRF.mat index 894d99ba8..d806c6633 100644 --- a/Assets/Mirror/Examples/TopDownShooter/Materials/PlayerRF.mat +++ b/Assets/Mirror/Examples/TopDownShooter/Materials/PlayerRF.mat @@ -2,18 +2,14 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: PlayerRF m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _ALPHABLEND_ON - m_InvalidKeywords: [] + m_ShaderKeywords: _ALPHABLEND_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -21,7 +17,6 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -61,7 +56,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 @@ -82,4 +76,3 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Mirror/Examples/TopDownShooter/Materials/RespawnPortal.mat b/Assets/Mirror/Examples/TopDownShooter/Materials/RespawnPortal.mat index 7d412858d..1bb45703a 100644 --- a/Assets/Mirror/Examples/TopDownShooter/Materials/RespawnPortal.mat +++ b/Assets/Mirror/Examples/TopDownShooter/Materials/RespawnPortal.mat @@ -2,18 +2,14 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: RespawnPortal m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _ALPHABLEND_ON - m_InvalidKeywords: [] + m_ShaderKeywords: _ALPHABLEND_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -21,7 +17,6 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -61,7 +56,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 @@ -82,4 +76,3 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Mirror/Examples/TopDownShooter/Scenes/MirrorTopDownShooter.unity b/Assets/Mirror/Examples/TopDownShooter/Scenes/MirrorTopDownShooter.unity index d3e59210d..498ca5c86 100644 --- a/Assets/Mirror/Examples/TopDownShooter/Scenes/MirrorTopDownShooter.unity +++ b/Assets/Mirror/Examples/TopDownShooter/Scenes/MirrorTopDownShooter.unity @@ -97,7 +97,8 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 112000000, guid: 104e4838c7ef6a441a546bb94af41b1e, + type: 2} m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: @@ -565,6 +566,7 @@ GameObject: - component: {fileID: 246108694} - component: {fileID: 246108693} - component: {fileID: 246108696} + - component: {fileID: 246108697} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -635,7 +637,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!114 &246108696 MonoBehaviour: @@ -652,6 +654,23 @@ MonoBehaviour: playerTransform: {fileID: 0} offset: {x: 0, y: 5, z: 0} followSpeed: 2 +--- !u!114 &246108697 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 246108692} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9021b6cc314944290986ab6feb48db79, type: 3} + m_Name: + m_EditorClassIdentifier: + height: 80 + offsetY: 40 + maxLogCount: 50 + showInEditor: 0 + hotKey: 96 --- !u!1 &253648116 GameObject: m_ObjectHideFlags: 0 @@ -954,7 +973,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &306139850 GameObject: @@ -1252,7 +1271,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &565189159 GameObject: @@ -1403,102 +1422,9 @@ Transform: - {fileID: 1564395501} - {fileID: 1586139301} - {fileID: 1744596716} - - {fileID: 816513755} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &816513753 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 816513755} - - component: {fileID: 816513754} - m_Layer: 0 - m_Name: Directional Light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!108 &816513754 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 816513753} - m_Enabled: 1 - serializedVersion: 10 - m_Type: 1 - m_Shape: 0 - m_Color: {r: 0.8392157, g: 0.91414016, b: 1, a: 1} - m_Intensity: 0.2 - m_Range: 10 - m_SpotAngle: 30 - m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_CullingMatrixOverride: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_UseCullingMatrixOverride: 0 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingLayerMask: 1 - m_Lightmapping: 4 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_ShadowRadius: 0 - m_ShadowAngle: 0 ---- !u!4 &816513755 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 816513753} - m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 2.37, y: 3, z: -1.69} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 776456717} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &994685605 GameObject: m_ObjectHideFlags: 0 @@ -1910,7 +1836,7 @@ Transform: - {fileID: 1711422809} - {fileID: 1456990462} m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1189392547 GameObject: @@ -2086,7 +2012,7 @@ RectTransform: - {fileID: 1008973583} - {fileID: 7103134652980701223} m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2655,7 +2581,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1414968432 GameObject: @@ -5370,7 +5296,7 @@ MonoBehaviour: m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 - m_MaxSize: 40 + m_MaxSize: 137 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 0 @@ -5474,7 +5400,7 @@ MonoBehaviour: m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 - m_MaxSize: 40 + m_MaxSize: 58 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 diff --git a/Assets/Mirror/Examples/TopDownShooter/Scenes/MirrorTopDownShooter/LightingData.asset b/Assets/Mirror/Examples/TopDownShooter/Scenes/MirrorTopDownShooter/LightingData.asset new file mode 100644 index 000000000..7cba37cfe Binary files /dev/null and b/Assets/Mirror/Examples/TopDownShooter/Scenes/MirrorTopDownShooter/LightingData.asset differ diff --git a/Assets/Mirror/Examples/TopDownShooter/Scenes/MirrorTopDownShooter/LightingData.asset.meta b/Assets/Mirror/Examples/TopDownShooter/Scenes/MirrorTopDownShooter/LightingData.asset.meta new file mode 100644 index 000000000..fbd2b41cd --- /dev/null +++ b/Assets/Mirror/Examples/TopDownShooter/Scenes/MirrorTopDownShooter/LightingData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 104e4838c7ef6a441a546bb94af41b1e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 112000000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mirror/Examples/TopDownShooter/Scenes/MirrorTopDownShooter/ReflectionProbe-0.exr b/Assets/Mirror/Examples/TopDownShooter/Scenes/MirrorTopDownShooter/ReflectionProbe-0.exr new file mode 100644 index 000000000..c5ff2d190 Binary files /dev/null and b/Assets/Mirror/Examples/TopDownShooter/Scenes/MirrorTopDownShooter/ReflectionProbe-0.exr differ diff --git a/Assets/Mirror/Examples/TopDownShooter/Scenes/MirrorTopDownShooter/ReflectionProbe-0.exr.meta b/Assets/Mirror/Examples/TopDownShooter/Scenes/MirrorTopDownShooter/ReflectionProbe-0.exr.meta new file mode 100644 index 000000000..4f6babca9 --- /dev/null +++ b/Assets/Mirror/Examples/TopDownShooter/Scenes/MirrorTopDownShooter/ReflectionProbe-0.exr.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 1437562f0faedd047a03e83bf4df0186 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 2 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mirror/Examples/TopDownShooter/Scripts/PlayerTopDown.cs b/Assets/Mirror/Examples/TopDownShooter/Scripts/PlayerTopDown.cs index 197ad408e..afffdee0c 100644 --- a/Assets/Mirror/Examples/TopDownShooter/Scripts/PlayerTopDown.cs +++ b/Assets/Mirror/Examples/TopDownShooter/Scripts/PlayerTopDown.cs @@ -103,7 +103,7 @@ void Update() RotatePlayerToMouse(); - if (Input.GetKeyDown(KeyCode.F)) + if (Input.GetKeyUp(KeyCode.F)) { // We could optionally call this locally too, to avoid minor delay in the command->sync var hook result CmdFlashLight(); @@ -190,6 +190,7 @@ public void CmdFlashLight() void OnFlashLightChanged(bool _Old, bool _New) { #if !UNITY_SERVER + Debug.Log($"OnFlashLightChanged: {_New}"); flashLight.enabled = _New; soundFlashLight.Play(); #endif