From 0d804a8ea2e357c9ed9b0325e7aaeece79566929 Mon Sep 17 00:00:00 2001 From: vinnicool Date: Thu, 19 Apr 2018 10:37:21 +0200 Subject: [PATCH 1/2] merge changes --- Assets/Models/Decorations/Materials/leverBase.mat | 2 +- Assets/Models/Decorations/Materials/leverHandle.mat | 2 +- Assets/Scripts/Photon/RoomManager.cs | 5 +++++ Assets/Scripts/Sound/SfxBehaviour.cs | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Assets/Models/Decorations/Materials/leverBase.mat b/Assets/Models/Decorations/Materials/leverBase.mat index 655038c..538bf9a 100644 --- a/Assets/Models/Decorations/Materials/leverBase.mat +++ b/Assets/Models/Decorations/Materials/leverBase.mat @@ -6,7 +6,7 @@ Material: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: lever-0Mat + m_Name: leverBase m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Assets/Models/Decorations/Materials/leverHandle.mat b/Assets/Models/Decorations/Materials/leverHandle.mat index 48cf1c0..3ffd509 100644 --- a/Assets/Models/Decorations/Materials/leverHandle.mat +++ b/Assets/Models/Decorations/Materials/leverHandle.mat @@ -6,7 +6,7 @@ Material: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: lever-1Mat + m_Name: leverHandle m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Assets/Scripts/Photon/RoomManager.cs b/Assets/Scripts/Photon/RoomManager.cs index 8e8162a..0c88370 100644 --- a/Assets/Scripts/Photon/RoomManager.cs +++ b/Assets/Scripts/Photon/RoomManager.cs @@ -227,7 +227,12 @@ public void StartExecution(PhotonMessageInfo info) public void StopExecution(PhotonMessageInfo info) { foreach(TGEPlayer p in gameManager.Players) + { p.Player.StopExecution(); + p.Player.IsReady = false; + EventManager.OnLevelReset(gameManager.LevelData, + gameManager.Players.Select(x => x.Player).ToList()); + } } private void PrintIfMultiplayer(object message) diff --git a/Assets/Scripts/Sound/SfxBehaviour.cs b/Assets/Scripts/Sound/SfxBehaviour.cs index bba2d57..2dbea8f 100644 --- a/Assets/Scripts/Sound/SfxBehaviour.cs +++ b/Assets/Scripts/Sound/SfxBehaviour.cs @@ -17,6 +17,7 @@ void Awake() void Initialize () { + print("audio init"); sfxPlayer = GetComponent(); prefabContainer = GameManager.GetInstance().PrefabContainer; From a8fcc3ca1e7ee53555d77e09af5c4cf3405a33ae Mon Sep 17 00:00:00 2001 From: vinnicool Date: Thu, 19 Apr 2018 10:38:04 +0200 Subject: [PATCH 2/2] merge --- .../Tiles/Materials/trackfield_middleMat.mat | 76 +++++++++++++++++++ .../Materials/trackfield_middleMat.mat.meta | 10 +++ 2 files changed, 86 insertions(+) create mode 100644 Assets/Models/Tiles/Materials/trackfield_middleMat.mat create mode 100644 Assets/Models/Tiles/Materials/trackfield_middleMat.mat.meta diff --git a/Assets/Models/Tiles/Materials/trackfield_middleMat.mat b/Assets/Models/Tiles/Materials/trackfield_middleMat.mat new file mode 100644 index 0000000..412de76 --- /dev/null +++ b/Assets/Models/Tiles/Materials/trackfield_middleMat.mat @@ -0,0 +1,76 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: trackfield_middleMat + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Models/Tiles/Materials/trackfield_middleMat.mat.meta b/Assets/Models/Tiles/Materials/trackfield_middleMat.mat.meta new file mode 100644 index 0000000..c47520d --- /dev/null +++ b/Assets/Models/Tiles/Materials/trackfield_middleMat.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 54d9f3ddbe4b9524b957db7cd5f1b001 +timeCreated: 1524122948 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: