From 25ed1891688c8ed3c5637df87641509ed019f15b Mon Sep 17 00:00:00 2001 From: mxssw Date: Sat, 20 Sep 2025 20:16:48 +0300 Subject: [PATCH 01/11] Reconfigured elevator reflections, added additional teleportable areas, resized box colliders and meddled with corrupted elements. --- .../NetworkDiscoveryCanvasUI.cs | 8 +- .../Elevator/Materials/Elevator green.mat | 46 +++++ .../Materials/Elevator green.mat.meta | 8 + .../Elevator/Materials/Elevator onix.mat | 46 +++++ .../Elevator/Materials/Elevator onix.mat.meta | 8 + .../Materials/elevator Variant 10.mat | 48 ++++++ .../Materials/elevator Variant 10.mat.meta | 8 + .../Elevator/Materials/elevator Variant 3.mat | 4 +- .../Elevator/Materials/elevator Variant 5.mat | 4 +- .../Elevator/Materials/elevator Variant 7.mat | 6 +- .../Elevator/Materials/elevator Variant.mat | 2 +- .../Barrier sign yellow Variant 1.mat | 2 +- .../Overlay UI/NetworkManagerUI.prefab | 91 +--------- .../Aleksandra_s_Models/M-04K Variant.mat | 5 +- .../Trascans/floor trashcan 1 (1).prefab | 4 +- .../Trascans/floor trashcan 2.prefab | 2 +- .../_PROJECT/Scenes/DeltaBuilding_base.unity | 4 +- .../DeltaBuilding_base/LightingData.asset | 4 +- .../DeltaBuilding_base/ReflectionProbe-13.exr | 4 +- .../DeltaBuilding_base/ReflectionProbe-16.exr | 4 +- .../DeltaBuilding_base/ReflectionProbe-22.exr | 4 +- .../DeltaBuilding_base/ReflectionProbe-29.exr | 3 + .../ReflectionProbe-29.exr.meta | 160 ++++++++++++++++++ .../DeltaBuilding_base/ReflectionProbe-30.exr | 3 + .../ReflectionProbe-30.exr.meta | 160 ++++++++++++++++++ .../DeltaBuilding_base/ReflectionProbe-31.exr | 3 + .../ReflectionProbe-31.exr.meta | 160 ++++++++++++++++++ .../DeltaBuilding_base/ReflectionProbe-32.exr | 3 + .../ReflectionProbe-32.exr.meta | 160 ++++++++++++++++++ .../DeltaBuilding_base/ReflectionProbe-33.exr | 3 + .../ReflectionProbe-33.exr.meta | 160 ++++++++++++++++++ .../DeltaBuilding_base/ReflectionProbe-34.exr | 3 + .../ReflectionProbe-34.exr.meta | 160 ++++++++++++++++++ .../DeltaBuilding_base/ReflectionProbe-35.exr | 3 + .../ReflectionProbe-35.exr.meta | 160 ++++++++++++++++++ ProjectSettings/TagManager.asset | 4 +- highscore.json | 2 +- highscores.json | 8 + 38 files changed, 1349 insertions(+), 118 deletions(-) create mode 100644 Assets/_PROJECT/Components/Elevator/Materials/Elevator green.mat create mode 100644 Assets/_PROJECT/Components/Elevator/Materials/Elevator green.mat.meta create mode 100644 Assets/_PROJECT/Components/Elevator/Materials/Elevator onix.mat create mode 100644 Assets/_PROJECT/Components/Elevator/Materials/Elevator onix.mat.meta create mode 100644 Assets/_PROJECT/Components/Elevator/Materials/elevator Variant 10.mat create mode 100644 Assets/_PROJECT/Components/Elevator/Materials/elevator Variant 10.mat.meta create mode 100644 Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-29.exr create mode 100644 Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-29.exr.meta create mode 100644 Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-30.exr create mode 100644 Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-30.exr.meta create mode 100644 Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-31.exr create mode 100644 Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-31.exr.meta create mode 100644 Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-32.exr create mode 100644 Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-32.exr.meta create mode 100644 Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-33.exr create mode 100644 Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-33.exr.meta create mode 100644 Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-34.exr create mode 100644 Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-34.exr.meta create mode 100644 Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-35.exr create mode 100644 Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-35.exr.meta diff --git a/Assets/Fish-Networking-Discovery-main/NetworkDiscoveryCanvasUI.cs b/Assets/Fish-Networking-Discovery-main/NetworkDiscoveryCanvasUI.cs index 10582956..5e85f671 100644 --- a/Assets/Fish-Networking-Discovery-main/NetworkDiscoveryCanvasUI.cs +++ b/Assets/Fish-Networking-Discovery-main/NetworkDiscoveryCanvasUI.cs @@ -19,7 +19,7 @@ public class NetworkMenuUI : MonoBehaviour [Header("Networking")] public NetworkDiscovery networkDiscovery; public Camera uiCamera; // Optional, disable if connecting - public Image coverImage; + //public Image coverImage; private readonly List foundServers = new(); @@ -61,7 +61,7 @@ public class NetworkMenuUI : MonoBehaviour networkDiscovery.StopSearchingForServers(); uiCamera.enabled = false; - coverImage.gameObject.SetActive(false); + //coverImage.gameObject.SetActive(false); InstanceFinder.ClientManager.StartConnection("192.168.42.212"); statusText.text = $"Joined server: {endPoint.Address}"; @@ -78,7 +78,7 @@ public class NetworkMenuUI : MonoBehaviour { networkDiscovery.StopSearchingForServers(); if (uiCamera != null) uiCamera.enabled = false; - coverImage.gameObject.SetActive(false); + //coverImage.gameObject.SetActive(false); InstanceFinder.ClientManager.StartConnection(endPoint.Address.ToString()); statusText.text = $"Joined server: {endPoint.Address}"; }); @@ -124,7 +124,7 @@ public class NetworkMenuUI : MonoBehaviour networkDiscovery.StopSearchingForServers(); InstanceFinder.ClientManager.StartConnection(firstServer.Address.ToString()); statusText.text = $"Joined server: {firstServer.Address}"; - coverImage.gameObject.SetActive(false); + //coverImage.gameObject.SetActive(false); yield break; } diff --git a/Assets/_PROJECT/Components/Elevator/Materials/Elevator green.mat b/Assets/_PROJECT/Components/Elevator/Materials/Elevator green.mat new file mode 100644 index 00000000..924095aa --- /dev/null +++ b/Assets/_PROJECT/Components/Elevator/Materials/Elevator green.mat @@ -0,0 +1,46 @@ +%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: Elevator green + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: -3662675362899972033, guid: e2815ed7e4ba71345aba4539e8e4b07e, + type: 3} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: + - _Metallic: 0 + - _Smoothness: 0.813 + m_Colors: [] + m_BuildTextureStacks: [] +--- !u!114 &4693570598692250363 +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: 7 diff --git a/Assets/_PROJECT/Components/Elevator/Materials/Elevator green.mat.meta b/Assets/_PROJECT/Components/Elevator/Materials/Elevator green.mat.meta new file mode 100644 index 00000000..544d9c46 --- /dev/null +++ b/Assets/_PROJECT/Components/Elevator/Materials/Elevator green.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6f7b6a4d3d024d44e8e2e36971f20608 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Components/Elevator/Materials/Elevator onix.mat b/Assets/_PROJECT/Components/Elevator/Materials/Elevator onix.mat new file mode 100644 index 00000000..a55aa279 --- /dev/null +++ b/Assets/_PROJECT/Components/Elevator/Materials/Elevator onix.mat @@ -0,0 +1,46 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7238917887056890196 +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: 7 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Elevator onix + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: -7066142231535911449, guid: e2815ed7e4ba71345aba4539e8e4b07e, + type: 3} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: + - _Smoothness: 1 + m_Colors: + - _Color: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/_PROJECT/Components/Elevator/Materials/Elevator onix.mat.meta b/Assets/_PROJECT/Components/Elevator/Materials/Elevator onix.mat.meta new file mode 100644 index 00000000..62c4616a --- /dev/null +++ b/Assets/_PROJECT/Components/Elevator/Materials/Elevator onix.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: edfad2a641ebab94b979d15dda340e47 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Components/Elevator/Materials/elevator Variant 10.mat b/Assets/_PROJECT/Components/Elevator/Materials/elevator Variant 10.mat new file mode 100644 index 00000000..c0096316 --- /dev/null +++ b/Assets/_PROJECT/Components/Elevator/Materials/elevator Variant 10.mat @@ -0,0 +1,48 @@ +%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: elevator Variant 10 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: -7541896574184445266, guid: e2815ed7e4ba71345aba4539e8e4b07e, + type: 3} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: + - _Metallic: 1 + - _Smoothness: 0.84 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &2295209440632225023 +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: 7 diff --git a/Assets/_PROJECT/Components/Elevator/Materials/elevator Variant 10.mat.meta b/Assets/_PROJECT/Components/Elevator/Materials/elevator Variant 10.mat.meta new file mode 100644 index 00000000..0a36187e --- /dev/null +++ b/Assets/_PROJECT/Components/Elevator/Materials/elevator Variant 10.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a76a2443287e41643bc6d11e73ca6cba +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Components/Elevator/Materials/elevator Variant 3.mat b/Assets/_PROJECT/Components/Elevator/Materials/elevator Variant 3.mat index f91d5fe8..91ba1aa9 100644 --- a/Assets/_PROJECT/Components/Elevator/Materials/elevator Variant 3.mat +++ b/Assets/_PROJECT/Components/Elevator/Materials/elevator Variant 3.mat @@ -30,8 +30,8 @@ Material: - _Metallic: 0.84 - _Smoothness: 0.707 m_Colors: - - _BaseColor: {r: 0.9245283, g: 0.9245283, b: 0.9245283, a: 1} - - _Color: {r: 0.9245283, g: 0.9245283, b: 0.9245283, a: 1} + - _BaseColor: {r: 0.7169812, g: 0.7169812, b: 0.7169812, a: 1} + - _Color: {r: 0.7169812, g: 0.7169812, b: 0.7169812, a: 1} m_BuildTextureStacks: [] --- !u!114 &2295209440632225023 MonoBehaviour: diff --git a/Assets/_PROJECT/Components/Elevator/Materials/elevator Variant 5.mat b/Assets/_PROJECT/Components/Elevator/Materials/elevator Variant 5.mat index 178e32e3..3dffd860 100644 --- a/Assets/_PROJECT/Components/Elevator/Materials/elevator Variant 5.mat +++ b/Assets/_PROJECT/Components/Elevator/Materials/elevator Variant 5.mat @@ -30,8 +30,8 @@ Material: - _Metallic: 0.84 - _Smoothness: 0.707 m_Colors: - - _BaseColor: {r: 0.8584906, g: 0.8584906, b: 0.8584906, a: 1} - - _Color: {r: 0.8584906, g: 0.8584906, b: 0.8584906, a: 1} + - _BaseColor: {r: 0.6603774, g: 0.6603774, b: 0.6603774, a: 1} + - _Color: {r: 0.6603774, g: 0.6603774, b: 0.6603774, a: 1} m_BuildTextureStacks: [] --- !u!114 &2295209440632225023 MonoBehaviour: diff --git a/Assets/_PROJECT/Components/Elevator/Materials/elevator Variant 7.mat b/Assets/_PROJECT/Components/Elevator/Materials/elevator Variant 7.mat index 70e6f9a7..c6c318c9 100644 --- a/Assets/_PROJECT/Components/Elevator/Materials/elevator Variant 7.mat +++ b/Assets/_PROJECT/Components/Elevator/Materials/elevator Variant 7.mat @@ -27,11 +27,11 @@ Material: m_TexEnvs: [] m_Ints: [] m_Floats: - - _Metallic: 0.84 + - _Metallic: 0.906 - _Smoothness: 0.707 m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _BaseColor: {r: 0.6698113, g: 0.6698113, b: 0.6698113, a: 1} + - _Color: {r: 0.6698113, g: 0.6698113, b: 0.6698113, a: 1} m_BuildTextureStacks: [] --- !u!114 &2295209440632225023 MonoBehaviour: diff --git a/Assets/_PROJECT/Components/Elevator/Materials/elevator Variant.mat b/Assets/_PROJECT/Components/Elevator/Materials/elevator Variant.mat index 04970d7e..de2f0c29 100644 --- a/Assets/_PROJECT/Components/Elevator/Materials/elevator Variant.mat +++ b/Assets/_PROJECT/Components/Elevator/Materials/elevator Variant.mat @@ -47,7 +47,7 @@ Material: m_Floats: - _AlphaClip: 1 - _AlphaToMask: 1 - - _Metallic: 0.437 + - _Metallic: 1 - _Smoothness: 1 m_Colors: [] m_BuildTextureStacks: [] diff --git a/Assets/_PROJECT/Components/Guardian/Guardian Barriers/Barrier sign yellow Variant 1.mat b/Assets/_PROJECT/Components/Guardian/Guardian Barriers/Barrier sign yellow Variant 1.mat index b44c3dd8..2a766992 100644 --- a/Assets/_PROJECT/Components/Guardian/Guardian Barriers/Barrier sign yellow Variant 1.mat +++ b/Assets/_PROJECT/Components/Guardian/Guardian Barriers/Barrier sign yellow Variant 1.mat @@ -41,7 +41,7 @@ Material: m_Ints: [] m_Floats: - _Metallic: 0.798 - - _Smoothness: 0.463 + - _Smoothness: 0.689 m_Colors: - _Color: {r: 0.39999408, g: 0.39999408, b: 0.39999408, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/_PROJECT/Components/Overlay UI/NetworkManagerUI.prefab b/Assets/_PROJECT/Components/Overlay UI/NetworkManagerUI.prefab index 9333c694..1c9e9895 100644 --- a/Assets/_PROJECT/Components/Overlay UI/NetworkManagerUI.prefab +++ b/Assets/_PROJECT/Components/Overlay UI/NetworkManagerUI.prefab @@ -1,81 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &619964516551198318 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6335977382530845251} - - component: {fileID: 8799156128864553530} - - component: {fileID: 2321574730561363645} - m_Layer: 0 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6335977382530845251 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 619964516551198318} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4970116510055866465} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 41.54, y: 0} - m_SizeDelta: {x: 1378.9, y: 758} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8799156128864553530 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 619964516551198318} - m_CullTransparentMesh: 1 ---- !u!114 &2321574730561363645 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 619964516551198318} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8f5576a5c3edb8e479f6b6dc11dbc861, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &742480761205081698 GameObject: m_ObjectHideFlags: 0 @@ -1294,7 +1218,6 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6335977382530845251} - {fileID: 1938936874169646409} m_Father: {fileID: 0} m_RootOrder: 0 @@ -1375,14 +1298,10 @@ MonoBehaviour: m_GameObject: {fileID: 8920648335286241163} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4848e79c70427c147b06522b44dfab1d, type: 3} + m_Script: {fileID: 11500000, guid: 98cc0a7a6d6d7314c8e390e45a9e1483, type: 3} m_Name: m_EditorClassIdentifier: - startPlayingButton: {fileID: 4409105029378525441} - joinMultiplayerButton: {fileID: 4409105029378525441} - serverListContainer: {fileID: 1182580605524482518} - serverListItemPrefab: {fileID: 8799561993934626415} - statusText: {fileID: 2762709333159616741} - networkDiscovery: {fileID: 0} - uiCamera: {fileID: 0} - coverImage: {fileID: 2321574730561363645} + secret: deltaVR + port: 1 + discoveryInterval: 0 + automatic: 0 diff --git a/Assets/_PROJECT/Models/Furniture/Aleksandra_s_Models/M-04K Variant.mat b/Assets/_PROJECT/Models/Furniture/Aleksandra_s_Models/M-04K Variant.mat index 3a5cde5a..63a623e7 100644 --- a/Assets/_PROJECT/Models/Furniture/Aleksandra_s_Models/M-04K Variant.mat +++ b/Assets/_PROJECT/Models/Furniture/Aleksandra_s_Models/M-04K Variant.mat @@ -22,8 +22,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: M-04K Variant m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: -3846018093981099296, guid: 5e4114bab34acd94784e62ff2ce4bcb5, - type: 3} + m_Parent: {fileID: 2100000, guid: bf2b321af58dec742b8443c9444fe66c, type: 2} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] @@ -41,5 +40,5 @@ Material: m_Ints: [] m_Floats: [] m_Colors: - - _Color: {r: 0.27382442, g: 0.27382442, b: 0.27382442, a: 1} + - _Color: {r: 0.39999408, g: 0.39999408, b: 0.39999408, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson/Trascans/floor trashcan 1 (1).prefab b/Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson/Trascans/floor trashcan 1 (1).prefab index f5f41f4e..e5a36d53 100644 --- a/Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson/Trascans/floor trashcan 1 (1).prefab +++ b/Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson/Trascans/floor trashcan 1 (1).prefab @@ -370,7 +370,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 1484177509601320512, guid: ca5de6183cde4e54ebf581fdd9591ee5, type: 3} + - {fileID: 2100000, guid: 52519cefb543bbd4fa8c60a613d1a278, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -518,7 +518,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 566333643588706412, guid: ca5de6183cde4e54ebf581fdd9591ee5, type: 3} + - {fileID: 2100000, guid: 52519cefb543bbd4fa8c60a613d1a278, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson/Trascans/floor trashcan 2.prefab b/Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson/Trascans/floor trashcan 2.prefab index 67e58e88..aba58f04 100644 --- a/Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson/Trascans/floor trashcan 2.prefab +++ b/Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson/Trascans/floor trashcan 2.prefab @@ -398,7 +398,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 1484177509601320512, guid: ca5de6183cde4e54ebf581fdd9591ee5, type: 3} + - {fileID: 2100000, guid: 52519cefb543bbd4fa8c60a613d1a278, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index 39a8d609..40736e8a 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a29b676afc818f1b67349ef6eebef339588d914565313316fa4b58c330b45b8c -size 62912014 +oid sha256:991c6a3ee2163ea71a541839a1318f2b68eb7c6d4571e079152c8cf2af249476 +size 63200694 diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base/LightingData.asset b/Assets/_PROJECT/Scenes/DeltaBuilding_base/LightingData.asset index 3c16b0e8..02e7dd99 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base/LightingData.asset +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base/LightingData.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b1ff9c77ce8fb72927f30e3e90d30c08a44ea684dbbdbc2c65281e47e2cab5e -size 217332712 +oid sha256:7737e76b3df41f62a368051b25ce7a6622cff084c92a7f942c16c6b6349afcd6 +size 217333068 diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-13.exr b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-13.exr index d71ebecd..5d45942a 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-13.exr +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-13.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:54c763003109684a8a46c7a8a322660ac8759f6f7d55da49ea8eb0a0b28ffe3e -size 332815 +oid sha256:5ac27d10fb4957be52e94c50ceb0d14a3d2cbeaa86ee53fbf85faaa2dd9eaf78 +size 332819 diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-16.exr b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-16.exr index 9dc77bac..2d444ad8 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-16.exr +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-16.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:75850ccc0f564772d944f801842d8ba2dc54401f0797da78e8087afdeb93ec78 -size 336245 +oid sha256:3176941f9edb84d50c6c758552cc3ae2c97e76a55df82b6067b2839d2cd8375b +size 336822 diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-22.exr b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-22.exr index e0539ffc..14bf4dc6 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-22.exr +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-22.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70f31aeff54d57ebb76c9ab7a4156c6ffb64ce8f7d3ae23f81e9689df4750edd -size 293100 +oid sha256:68dc9b5c4bc66d1a3da9bb84948e7048f61de9b0149cef102bb3e8d20180c450 +size 295353 diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-29.exr b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-29.exr new file mode 100644 index 00000000..c500af64 --- /dev/null +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-29.exr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:947c833e2a36e34a4bfa28519df2fce9de89849877b1c3560f420f91e8bae684 +size 298115 diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-29.exr.meta b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-29.exr.meta new file mode 100644 index 00000000..d24f3920 --- /dev/null +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-29.exr.meta @@ -0,0 +1,160 @@ +fileFormatVersion: 2 +guid: 9e9643dd524364144812f76a54af7a20 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 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 + - 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: Server + 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 + - serializedVersion: 3 + buildTarget: Windows Store Apps + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-30.exr b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-30.exr new file mode 100644 index 00000000..5be227b1 --- /dev/null +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-30.exr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e284968d7727881a3c8b27b660efdcc8c38b92791a19578c2af1688cb90f5e4 +size 302908 diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-30.exr.meta b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-30.exr.meta new file mode 100644 index 00000000..8b38998d --- /dev/null +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-30.exr.meta @@ -0,0 +1,160 @@ +fileFormatVersion: 2 +guid: 96808a4d52778e44f962b46d5c25f776 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 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 + - 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: Server + 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 + - serializedVersion: 3 + buildTarget: Windows Store Apps + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-31.exr b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-31.exr new file mode 100644 index 00000000..504b59d2 --- /dev/null +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-31.exr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a3f379804685de16489a9acbdc10ddba04540b3cb67b7ff6f04b11ced5cd164 +size 278183 diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-31.exr.meta b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-31.exr.meta new file mode 100644 index 00000000..a8e02440 --- /dev/null +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-31.exr.meta @@ -0,0 +1,160 @@ +fileFormatVersion: 2 +guid: a38a0fb5079a8104098eb6d0f5f9bc86 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 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 + - 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: Server + 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 + - serializedVersion: 3 + buildTarget: Windows Store Apps + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-32.exr b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-32.exr new file mode 100644 index 00000000..99b81cbd --- /dev/null +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-32.exr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b4c64a9cbd0d77f4f5cbbccf1b86bd8f26cc81861fe8fa74c05ad142ce5d369 +size 275737 diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-32.exr.meta b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-32.exr.meta new file mode 100644 index 00000000..f042bb11 --- /dev/null +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-32.exr.meta @@ -0,0 +1,160 @@ +fileFormatVersion: 2 +guid: 009060c55303fcf4080a94c0c3e69625 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 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 + - 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: Server + 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 + - serializedVersion: 3 + buildTarget: Windows Store Apps + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-33.exr b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-33.exr new file mode 100644 index 00000000..3576dca9 --- /dev/null +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-33.exr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2e4bc10befc88af8ae68026f500b67f72ddf6e79d268698433d64732bc0da5d +size 232962 diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-33.exr.meta b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-33.exr.meta new file mode 100644 index 00000000..bcb8b915 --- /dev/null +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-33.exr.meta @@ -0,0 +1,160 @@ +fileFormatVersion: 2 +guid: 77fb223a2e2605e4ab3c532f7bf89703 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 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 + - 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: Server + 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 + - serializedVersion: 3 + buildTarget: Windows Store Apps + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-34.exr b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-34.exr new file mode 100644 index 00000000..d765553e --- /dev/null +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-34.exr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3451414dfefc9a8a02550f9a4c22c6ef7060cdb786fb219d71c2b14e3717df4c +size 207530 diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-34.exr.meta b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-34.exr.meta new file mode 100644 index 00000000..39b5a474 --- /dev/null +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-34.exr.meta @@ -0,0 +1,160 @@ +fileFormatVersion: 2 +guid: 1dfc19627cf66604eba6b1b432cede35 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 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 + - 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: Server + 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 + - serializedVersion: 3 + buildTarget: Windows Store Apps + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-35.exr b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-35.exr new file mode 100644 index 00000000..4f2cdf34 --- /dev/null +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-35.exr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3fa0370d91b9786774267e7de3dc337f241ed28e4b3a2e48a4ae7d6bb8cdba5e +size 385810 diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-35.exr.meta b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-35.exr.meta new file mode 100644 index 00000000..f4448e62 --- /dev/null +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-35.exr.meta @@ -0,0 +1,160 @@ +fileFormatVersion: 2 +guid: be459cfcb2659a349a216ad6b0d5a2fb +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 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 + - 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: Server + 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 + - serializedVersion: 3 + buildTarget: Windows Store Apps + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index c92ccc7c..24a29e9a 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5dda2b392a097d2b3fbad936951cf2a9e801f8520f1bacd603b51a25cb469848 -size 873 +oid sha256:56052b3166cd154b2467f49230f5a19a298e6b6d6e27d0fd55f862201ebcdc10 +size 881 diff --git a/highscore.json b/highscore.json index bef25353..1f71286d 100644 --- a/highscore.json +++ b/highscore.json @@ -1 +1 @@ -{"HighScore":332.0} \ No newline at end of file +{"HighScore":451.0} \ No newline at end of file diff --git a/highscores.json b/highscores.json index 9d6daf42..e65a8dbf 100644 --- a/highscores.json +++ b/highscores.json @@ -1,5 +1,13 @@ { "entries": [ + { + "name": "DABESTEST", + "score": 451.0 + }, + { + "name": "Dabest", + "score": 407.0 + }, { "name": "destro", "score": 332.0 From 4f0e84caaec401a78b61a2726bc709ad355b2953 Mon Sep 17 00:00:00 2001 From: mxssw Date: Sat, 20 Sep 2025 20:26:40 +0300 Subject: [PATCH 02/11] Fixed lone elevator reflections (forgot to re-assign materials) --- Assets/_PROJECT/Scenes/DeltaBuilding_base.unity | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index 40736e8a..8c22d5ac 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:991c6a3ee2163ea71a541839a1318f2b68eb7c6d4571e079152c8cf2af249476 -size 63200694 +oid sha256:2b587056a95d79722022928571a15b52eeab95a9b49feca00479f3dbaa90538f +size 63206187 From eadbd139e4ba4f5f9ea3bfe253eae9c50ce2883e Mon Sep 17 00:00:00 2001 From: mxssw Date: Sun, 21 Sep 2025 18:54:35 +0300 Subject: [PATCH 03/11] Fixed invisible car and tutorial text. Did some minor cosmetic improvements. --- .../Components/Elevator/Materials/Elevator green.mat | 7 ++++--- .../Components/Elevator/Materials/elevator Variant 10.mat | 4 ++-- .../Components/Elevator/Materials/elevator fbx Variant.mat | 6 ++++-- .../Components/NewHandPresence/Prefabs/Billboard.prefab | 5 +++-- Assets/_PROJECT/Scenes/DeltaBuilding_base.unity | 4 ++-- .../Scenes/DeltaBuilding_base/ReflectionProbe-15.exr | 4 ++-- 6 files changed, 17 insertions(+), 13 deletions(-) diff --git a/Assets/_PROJECT/Components/Elevator/Materials/Elevator green.mat b/Assets/_PROJECT/Components/Elevator/Materials/Elevator green.mat index 924095aa..9f8f227b 100644 --- a/Assets/_PROJECT/Components/Elevator/Materials/Elevator green.mat +++ b/Assets/_PROJECT/Components/Elevator/Materials/Elevator green.mat @@ -27,9 +27,10 @@ Material: m_TexEnvs: [] m_Ints: [] m_Floats: - - _Metallic: 0 - - _Smoothness: 0.813 - m_Colors: [] + - _Metallic: 0.194 + - _Smoothness: 0.824 + m_Colors: + - _Color: {r: 0.8006929, g: 0.8843955, b: 0.90648174, a: 1} m_BuildTextureStacks: [] --- !u!114 &4693570598692250363 MonoBehaviour: diff --git a/Assets/_PROJECT/Components/Elevator/Materials/elevator Variant 10.mat b/Assets/_PROJECT/Components/Elevator/Materials/elevator Variant 10.mat index c0096316..cdb6e323 100644 --- a/Assets/_PROJECT/Components/Elevator/Materials/elevator Variant 10.mat +++ b/Assets/_PROJECT/Components/Elevator/Materials/elevator Variant 10.mat @@ -30,8 +30,8 @@ Material: - _Metallic: 1 - _Smoothness: 0.84 m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _BaseColor: {r: 0.6698113, g: 0.6698113, b: 0.6698113, a: 1} + - _Color: {r: 0.6698113, g: 0.6698113, b: 0.6698113, a: 1} m_BuildTextureStacks: [] --- !u!114 &2295209440632225023 MonoBehaviour: diff --git a/Assets/_PROJECT/Components/Elevator/Materials/elevator fbx Variant.mat b/Assets/_PROJECT/Components/Elevator/Materials/elevator fbx Variant.mat index 4d19a78d..0c247198 100644 --- a/Assets/_PROJECT/Components/Elevator/Materials/elevator fbx Variant.mat +++ b/Assets/_PROJECT/Components/Elevator/Materials/elevator fbx Variant.mat @@ -11,7 +11,7 @@ Material: m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 6046567473251282981, guid: e2815ed7e4ba71345aba4539e8e4b07e, type: 3} - m_ModifiedSerializedProperties: 0 + m_ModifiedSerializedProperties: 2 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,7 +30,9 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] - m_Floats: [] + m_Floats: + - _ReceiveShadows: 1 + - _Smoothness: 1 m_Colors: - _BaseColor: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 1} - _Color: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 1} diff --git a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Billboard.prefab b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Billboard.prefab index a9a9f0f1..69ea877e 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Billboard.prefab +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Billboard.prefab @@ -394,8 +394,9 @@ MonoBehaviour: ' m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: d564a6b9a8a781b438125b614edcc297, type: 2} + m_sharedMaterial: {fileID: 2467261418627247352, guid: d564a6b9a8a781b438125b614edcc297, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index 8c22d5ac..b1198c21 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b587056a95d79722022928571a15b52eeab95a9b49feca00479f3dbaa90538f -size 63206187 +oid sha256:62a98ad6509abf5c45a4764920808f3c1db504c7b6c10ad7d4c4d79757bced0b +size 63208552 diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-15.exr b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-15.exr index 9f081de7..94660ec0 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-15.exr +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base/ReflectionProbe-15.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8525bd1f673a9adc4113000a612bec2fe5bb2543756e74b0d55d224244367d3b -size 320680 +oid sha256:62d253de250bab23e0efe8063f34756f116d30a3dedd19f179cd4627a54e49f1 +size 320677 From a8568685abe557156f5a905411c023fec338dc41 Mon Sep 17 00:00:00 2001 From: mxssw Date: Tue, 23 Sep 2025 15:16:55 +0300 Subject: [PATCH 04/11] made skywalk teleportation istructions flip according to the rotation of the entered player. --- .../NewHandPresence/Prefabs/Scripts/Menu.cs | 4 ++-- .../Portals2/Space enter Collider.cs | 22 +++++++++++++++++++ .../_PROJECT/Scenes/DeltaBuilding_base.unity | 4 ++-- Build.zip | 4 ++-- 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/Menu.cs b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/Menu.cs index d063cbad..bbb20e1e 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/Menu.cs +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/Menu.cs @@ -323,12 +323,12 @@ public class Menu : MonoBehaviour if (PlayericonFloor1Parent.activeSelf) { PlayericonFloor1.GetComponent().anchoredPosition = IMG_Player; - Debug.Log(IMG_Player); + //Debug.Log(IMG_Player); } if (PlayericonFloor2Parent.activeSelf) { PlayericonFloor2.GetComponent().anchoredPosition = IMG_Player; - Debug.Log(IMG_Player); + //Debug.Log(IMG_Player); } /* diff --git a/Assets/_PROJECT/Components/Portals2/Space enter Collider.cs b/Assets/_PROJECT/Components/Portals2/Space enter Collider.cs index 79d45d14..f8e2e647 100644 --- a/Assets/_PROJECT/Components/Portals2/Space enter Collider.cs +++ b/Assets/_PROJECT/Components/Portals2/Space enter Collider.cs @@ -1,11 +1,30 @@ using System.Collections; using System.Collections.Generic; +using Unity.XR.CoreUtils; using UnityEngine; public class SpaceEnterCollider : MonoBehaviour { + public GameObject InstructionText; private void OnTriggerEnter(Collider other) { + XROrigin player = other.GetComponent(); + if (player == null) return; + + // Get player's Z rotation (in degrees) + float playerZ = player.transform.rotation.eulerAngles.z; + + if (Mathf.Approximately(playerZ, 0f)) + { + InstructionText.transform.rotation = Quaternion.Euler(0f, 0f, 0f); + //Debug.Log("Instruction text rotation" + InstructionText.transform.rotation); + } + else + { + InstructionText.transform.rotation = Quaternion.Euler(0f, 0f, -180f); + //Debug.Log("Instruction text rotation" + InstructionText.transform.rotation); + } + GravityHandler playerGravity = other.GetComponent(); if (playerGravity != null) { @@ -16,6 +35,9 @@ public class SpaceEnterCollider : MonoBehaviour private void OnTriggerExit(Collider other) { + XROrigin Player = other.GetComponent(); + if (Player == null) return; + GravityHandler playerGravity = other.GetComponent(); if (playerGravity != null) { diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index b1198c21..acf0830a 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62a98ad6509abf5c45a4764920808f3c1db504c7b6c10ad7d4c4d79757bced0b -size 63208552 +oid sha256:388db76fdb18aac982c6a9e7b0d69993e85ae3cab0d4d72411f7cfe0814a5234 +size 63207051 diff --git a/Build.zip b/Build.zip index 4080c439..5cac4aa6 100644 --- a/Build.zip +++ b/Build.zip @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d69e2d173376ebbca4e930e1e09ad5845dc31ca71495368630795e04bcc16150 -size 606286550 +oid sha256:7b514b5e5b2b79cdf54ab46999ea7c914eb79c0be9b22956d4c7f042e5bd92ee +size 606923902 From bad94ab62808c8f967659763602baa6b92cb82c1 Mon Sep 17 00:00:00 2001 From: mxssw Date: Thu, 25 Sep 2025 18:53:36 +0300 Subject: [PATCH 05/11] Updated the UI. Refresh button is disabled for now and multiplayer needs testing. Added quit button. --- .../NetworkDiscoveryCanvasUI.cs | 51 +++++- .../Components/Overlay UI/UI refresh icon.png | 3 + .../Overlay UI/UI refresh icon.png.meta | 160 ++++++++++++++++++ .../_PROJECT/Scenes/DeltaBuilding_base.unity | 4 +- highscores.json | 4 + 5 files changed, 218 insertions(+), 4 deletions(-) create mode 100644 Assets/_PROJECT/Components/Overlay UI/UI refresh icon.png create mode 100644 Assets/_PROJECT/Components/Overlay UI/UI refresh icon.png.meta diff --git a/Assets/Fish-Networking-Discovery-main/NetworkDiscoveryCanvasUI.cs b/Assets/Fish-Networking-Discovery-main/NetworkDiscoveryCanvasUI.cs index 5e85f671..4d35ddf1 100644 --- a/Assets/Fish-Networking-Discovery-main/NetworkDiscoveryCanvasUI.cs +++ b/Assets/Fish-Networking-Discovery-main/NetworkDiscoveryCanvasUI.cs @@ -1,5 +1,6 @@ using FishNet; using FishNet.Discovery; +using FishNet.Managing.Scened; using System.Collections; using System.Collections.Generic; using System.Net; @@ -10,15 +11,21 @@ using UnityEngine.UI; public class NetworkMenuUI : MonoBehaviour { [Header("UI References")] + public Toggle VRToggle; + public Button startPlayingButton; + public Button reloadButton; public Button joinMultiplayerButton; public Transform serverListContainer; public GameObject serverListItemPrefab; public TMP_Text statusText; + public Button quitButton; [Header("Networking")] public NetworkDiscovery networkDiscovery; - public Camera uiCamera; // Optional, disable if connecting + public Camera uiCamera; + public AudioListener placeholderAudioListener; + private bool _useVR; //public Image coverImage; private readonly List foundServers = new(); @@ -28,8 +35,22 @@ public class NetworkMenuUI : MonoBehaviour if (networkDiscovery == null) networkDiscovery = FindObjectOfType(); + _useVR = PlayerPrefs.GetInt("UseVR", 0) == 1; + VRToggle.isOn = _useVR; + + // React to UI toggle changes + VRToggle.onValueChanged.AddListener((isOn) => + { + _useVR = isOn; + PlayerPrefs.SetInt("UseVR", _useVR ? 1 : 0); + PlayerPrefs.Save(); + Debug.Log($"UseVR set to {_useVR}"); + }); + startPlayingButton.onClick.AddListener(OnStartPlaying); + reloadButton.onClick.AddListener(OnReload); joinMultiplayerButton.onClick.AddListener(OnJoinMultiplayer); + quitButton.onClick.AddListener(OnQuit); networkDiscovery.ServerFoundCallback += OnServerFound; } @@ -40,6 +61,14 @@ public class NetworkMenuUI : MonoBehaviour StartCoroutine(HostAndSearchRoutine()); } + private void OnReload() + { + + //UnityEngine.SceneManagement.Scene currentScene = UnityEngine.SceneManagement.SceneManager.GetActiveScene(); + //UnityEngine.SceneManagement.SceneManager.LoadScene(currentScene.name); + + + } private void OnJoinMultiplayer() { @@ -49,6 +78,12 @@ public class NetworkMenuUI : MonoBehaviour networkDiscovery.StartSearchingForServers(); } + private void OnQuit() + { + Debug.Log("Quitting application"); + Application.Quit(); + } + private void OnServerFound(IPEndPoint endPoint) { if (foundServers.Contains(endPoint)) return; @@ -61,9 +96,11 @@ public class NetworkMenuUI : MonoBehaviour networkDiscovery.StopSearchingForServers(); uiCamera.enabled = false; + Debug.Log("Disabled placeholder audio source"); + placeholderAudioListener.enabled = false; //coverImage.gameObject.SetActive(false); - InstanceFinder.ClientManager.StartConnection("192.168.42.212"); + InstanceFinder.ClientManager.StartConnection(endPoint.Address.ToString()); statusText.text = $"Joined server: {endPoint.Address}"; return; } @@ -78,6 +115,10 @@ public class NetworkMenuUI : MonoBehaviour { networkDiscovery.StopSearchingForServers(); if (uiCamera != null) uiCamera.enabled = false; + if (placeholderAudioListener != null) { + Debug.Log("Disabled placeholder audio source"); + placeholderAudioListener.enabled = false; + } //coverImage.gameObject.SetActive(false); InstanceFinder.ClientManager.StartConnection(endPoint.Address.ToString()); statusText.text = $"Joined server: {endPoint.Address}"; @@ -121,6 +162,12 @@ public class NetworkMenuUI : MonoBehaviour { var firstServer = foundServers[0]; //networkDiscovery.StopAdvertisingServer(); + if (uiCamera != null) uiCamera.enabled = false; + if (placeholderAudioListener != null) + { + Debug.Log("Disabled placeholder audio source"); + placeholderAudioListener.enabled = false; + } networkDiscovery.StopSearchingForServers(); InstanceFinder.ClientManager.StartConnection(firstServer.Address.ToString()); statusText.text = $"Joined server: {firstServer.Address}"; diff --git a/Assets/_PROJECT/Components/Overlay UI/UI refresh icon.png b/Assets/_PROJECT/Components/Overlay UI/UI refresh icon.png new file mode 100644 index 00000000..bb37e42d --- /dev/null +++ b/Assets/_PROJECT/Components/Overlay UI/UI refresh icon.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:988a8998b9a8c577138c197f667926c3f308828738da1c98da49a5fcfcb5dc23 +size 219691 diff --git a/Assets/_PROJECT/Components/Overlay UI/UI refresh icon.png.meta b/Assets/_PROJECT/Components/Overlay UI/UI refresh icon.png.meta new file mode 100644 index 00000000..0514cfd6 --- /dev/null +++ b/Assets/_PROJECT/Components/Overlay UI/UI refresh icon.png.meta @@ -0,0 +1,160 @@ +fileFormatVersion: 2 +guid: 7d929b603389e5b41a32bc6ea11e38ee +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + 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: 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: Server + 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 + - serializedVersion: 3 + buildTarget: Windows Store Apps + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index acf0830a..b1407023 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:388db76fdb18aac982c6a9e7b0d69993e85ae3cab0d4d72411f7cfe0814a5234 -size 63207051 +oid sha256:7dd7badbe55c6c5d293126f548bdaf3a2270c5b9602872c7ace191e998a6d05d +size 63238193 diff --git a/highscores.json b/highscores.json index e65a8dbf..3e5446d3 100644 --- a/highscores.json +++ b/highscores.json @@ -8,6 +8,10 @@ "name": "Dabest", "score": 407.0 }, + { + "name": "henri", + "score": 333.0 + }, { "name": "destro", "score": 332.0 From 6479d850e99a38506177481ce246007ecb9adece Mon Sep 17 00:00:00 2001 From: mxssw Date: Fri, 26 Sep 2025 12:21:08 +0300 Subject: [PATCH 06/11] Worked on restart button. Unsuccessful, left it disabled. --- .../NetworkDiscoveryCanvasUI.cs | 33 ++++++++++++++++-- .../NewHandPresence/TutorialController.cs | 34 +++++++++---------- .../_PROJECT/Scenes/DeltaBuilding_base.unity | 4 +-- ProjectSettings/ProjectSettings.asset | 4 +-- 4 files changed, 51 insertions(+), 24 deletions(-) diff --git a/Assets/Fish-Networking-Discovery-main/NetworkDiscoveryCanvasUI.cs b/Assets/Fish-Networking-Discovery-main/NetworkDiscoveryCanvasUI.cs index 4d35ddf1..8ad28405 100644 --- a/Assets/Fish-Networking-Discovery-main/NetworkDiscoveryCanvasUI.cs +++ b/Assets/Fish-Networking-Discovery-main/NetworkDiscoveryCanvasUI.cs @@ -1,10 +1,13 @@ +using _PROJECT.NewHandPresence; using FishNet; using FishNet.Discovery; using FishNet.Managing.Scened; +using FishNet.Object; using System.Collections; using System.Collections.Generic; using System.Net; using TMPro; +using Unity.XR.CoreUtils; using UnityEngine; using UnityEngine.UI; @@ -61,13 +64,37 @@ public class NetworkMenuUI : MonoBehaviour StartCoroutine(HostAndSearchRoutine()); } + private void OnReload() { + /*if (!InstanceFinder.IsClient) + { + Debug.LogWarning("Reload can only be called from a client!"); + return; + } - //UnityEngine.SceneManagement.Scene currentScene = UnityEngine.SceneManagement.SceneManager.GetActiveScene(); - //UnityEngine.SceneManagement.SceneManager.LoadScene(currentScene.name); - + // Use the ClientManager.Objects dictionary + foreach (NetworkObject obj in InstanceFinder.ClientManager.Objects.) + { + if (obj.IsOwner) // This ensures it's YOUR local player + { + var xr = obj.GetComponentInChildren(); + if (xr != null) + { + Debug.Log("Found my XR Origin player."); + TutorialController tutorial = xr.GetComponent(); + if (tutorial != null) + { + tutorial._state = TutorialController.TutorialState.Initializing; + } + } + else + { + Debug.Log("My local player is not an XR Origin."); + } + } + }*/ } private void OnJoinMultiplayer() diff --git a/Assets/_PROJECT/Components/NewHandPresence/TutorialController.cs b/Assets/_PROJECT/Components/NewHandPresence/TutorialController.cs index af262939..15696c79 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/TutorialController.cs +++ b/Assets/_PROJECT/Components/NewHandPresence/TutorialController.cs @@ -8,7 +8,7 @@ namespace _PROJECT.NewHandPresence { public class TutorialController : MonoBehaviour { - private enum State + public enum TutorialState { Initializing, Turn, @@ -34,7 +34,7 @@ namespace _PROJECT.NewHandPresence private SmartHandPresence _leftSmartHandPresence; private SmartHandPresence _rightSmartHandPresence; - private State _state = State.Initializing; + public TutorialState _state = TutorialState.Initializing; private Camera _camera; @@ -45,12 +45,12 @@ namespace _PROJECT.NewHandPresence private void Update() { - if (_state == State.Initializing) + if (_state == TutorialState.Initializing) { TryInitialize(); } - if (_state == State.WaitForGrip) + if (_state == TutorialState.WaitForGrip) { TryFindXRGrabInteractable(); } @@ -76,12 +76,12 @@ namespace _PROJECT.NewHandPresence UpdateState(_state.Next()); } - private void UpdateState(State newState) + private void UpdateState(TutorialState newState) { _state = newState; Debug.Log($"Tutorial state: {_state}"); - if (_state == State.Initializing) return; + if (_state == TutorialState.Initializing) return; SetHandsVisibility(true); _rightHintController.HideHint(); @@ -89,26 +89,26 @@ namespace _PROJECT.NewHandPresence switch (_state) { - case State.Initializing: + case TutorialState.Initializing: break; - case State.Turn: + case TutorialState.Turn: ShowTurnHint(); break; - case State.Move: + case TutorialState.Move: ShowLocomotionHint(); break; - case State.Teleport: + case TutorialState.Teleport: ShowTeleportHint(); break; - case State.WaitForGrip: + case TutorialState.WaitForGrip: SetHandsVisibility(true); break; - case State.Grip: + case TutorialState.Grip: SetHandsVisibility(false); CreateBillboard(_grabInteractable.gameObject, "Grab me!"); ShowGripHint(); break; - case State.Done: + case TutorialState.Done: SetHandsVisibility(true); DestroyBillboard(); break; @@ -215,28 +215,28 @@ namespace _PROJECT.NewHandPresence private void OnGripPerformed(SelectEnterEventArgs arg0) { - if (_state != State.Grip) return; + if (_state != TutorialState.Grip) return; Debug.Log("Grip performed"); UpdateState(_state.Next()); } private void OnTeleportPerformed(LocomotionSystem obj) { - if (_state != State.Teleport) return; + if (_state != TutorialState.Teleport) return; Debug.Log("Teleport performed"); UpdateState(_state.Next()); } private void OnMovePerformed(InputAction.CallbackContext obj) { - if (_state != State.Move) return; + if (_state != TutorialState.Move) return; Debug.Log("Move performed"); UpdateState(_state.Next()); } private void OnTurnPerformed(InputAction.CallbackContext obj) { - if (_state != State.Turn) return; + if (_state != TutorialState.Turn) return; Debug.Log("Turn performed"); UpdateState(_state.Next()); } diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index b1407023..e0a36e13 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7dd7badbe55c6c5d293126f548bdaf3a2270c5b9602872c7ace191e998a6d05d -size 63238193 +oid sha256:eeb3656725e2398be926c1cf5a430c9c62b5d8fb98fa14b8c0e6708ce72ff84c +size 63238219 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 896d8bb2..e29bfaf2 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58745c9321381389f20738b32b3dc4544842f32ad2e3992ddd439651246906a2 -size 26323 +oid sha256:7b0c8187989f051f17c8176a08dd62c09e6144fe6accce74a1dc37fbf1413599 +size 26632 From 803e87688ae9a3540f5395a34bf486d49b08f7b5 Mon Sep 17 00:00:00 2001 From: mxssw Date: Fri, 26 Sep 2025 12:23:40 +0300 Subject: [PATCH 07/11] Forgot to zip the build --- Build.zip | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Build.zip b/Build.zip index 5cac4aa6..7c2365ac 100644 --- a/Build.zip +++ b/Build.zip @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b514b5e5b2b79cdf54ab46999ea7c914eb79c0be9b22956d4c7f042e5bd92ee -size 606923902 +oid sha256:27d78cf0fcedcd7d983ef7849774339d83a7e07530c8912f02a7f76485b5079c +size 606995181 From 1580f40636491c230bb9052adac2cf2749ce6118 Mon Sep 17 00:00:00 2001 From: mxssw Date: Tue, 30 Sep 2025 18:22:46 +0300 Subject: [PATCH 08/11] Added multiplayer joining capability to the desktop UI --- .../NetworkDiscoveryCanvasUI.cs | 105 +- .../Components/Overlay UI/IP Button.prefab | 262 ++++ .../Overlay UI/IP Button.prefab.meta | 7 + .../Overlay UI/NetworkManagerUI.prefab | 1179 +++++++++++++---- .../_PROJECT/Scenes/DeltaBuilding_base.unity | 4 +- ProjectSettings/ProjectSettings.asset | 4 +- 6 files changed, 1231 insertions(+), 330 deletions(-) create mode 100644 Assets/_PROJECT/Components/Overlay UI/IP Button.prefab create mode 100644 Assets/_PROJECT/Components/Overlay UI/IP Button.prefab.meta diff --git a/Assets/Fish-Networking-Discovery-main/NetworkDiscoveryCanvasUI.cs b/Assets/Fish-Networking-Discovery-main/NetworkDiscoveryCanvasUI.cs index 8ad28405..ffcb2350 100644 --- a/Assets/Fish-Networking-Discovery-main/NetworkDiscoveryCanvasUI.cs +++ b/Assets/Fish-Networking-Discovery-main/NetworkDiscoveryCanvasUI.cs @@ -4,6 +4,7 @@ using FishNet.Discovery; using FishNet.Managing.Scened; using FishNet.Object; using System.Collections; +using System.Collections.Concurrent; using System.Collections.Generic; using System.Net; using TMPro; @@ -13,6 +14,9 @@ using UnityEngine.UI; public class NetworkMenuUI : MonoBehaviour { + + + private ConcurrentQueue mainThreadQueue = new(); [Header("UI References")] public Toggle VRToggle; @@ -29,12 +33,14 @@ public class NetworkMenuUI : MonoBehaviour public Camera uiCamera; public AudioListener placeholderAudioListener; private bool _useVR; + //public Image coverImage; private readonly List foundServers = new(); private void Start() { + if (networkDiscovery == null) networkDiscovery = FindObjectOfType(); @@ -55,9 +61,23 @@ public class NetworkMenuUI : MonoBehaviour joinMultiplayerButton.onClick.AddListener(OnJoinMultiplayer); quitButton.onClick.AddListener(OnQuit); - networkDiscovery.ServerFoundCallback += OnServerFound; + networkDiscovery.ServerFoundCallback += (endPoint) => + { + Debug.Log("Found a server"); + // Only queue the endpoint for main-thread processing + mainThreadQueue.Enqueue(() => + { + StartCoroutine(ProcessServerFound(endPoint)); + }); + }; + } + private void Update() + { + while (mainThreadQueue.TryDequeue(out var action)) + { + action.Invoke(); // safely runs on main thread + } } - private void OnStartPlaying() { statusText.text = "Starting host..."; @@ -100,8 +120,11 @@ public class NetworkMenuUI : MonoBehaviour private void OnJoinMultiplayer() { statusText.text = "Searching for servers..."; + networkDiscovery.StopSearchingForServers(); ClearServerList(); + //Debug.Log(foundServers.Count); foundServers.Clear(); + //Debug.Log(foundServers.Count); networkDiscovery.StartSearchingForServers(); } @@ -111,45 +134,57 @@ public class NetworkMenuUI : MonoBehaviour Application.Quit(); } - private void OnServerFound(IPEndPoint endPoint) + private IEnumerator ProcessServerFound(IPEndPoint endPoint) { - if (foundServers.Contains(endPoint)) return; + Debug.Log("server found"); + //Debug.Log(endPoint.Address.ToString()); + //Debug.Log(foundServers.Count); + if (foundServers.Contains(endPoint)) yield return null; foundServers.Add(endPoint); - // Auto-join if started as host - if (InstanceFinder.IsServer) - { - //networkDiscovery.StopAdvertisingServer(); - networkDiscovery.StopSearchingForServers(); + Debug.Log($"Server found {endPoint}"); + // Auto-join if started as host + if (InstanceFinder.IsServer) + { + Debug.Log("Server is local"); + //networkDiscovery.StopAdvertisingServer(); + networkDiscovery.StopSearchingForServers(); - uiCamera.enabled = false; - Debug.Log("Disabled placeholder audio source"); - placeholderAudioListener.enabled = false; - //coverImage.gameObject.SetActive(false); - - InstanceFinder.ClientManager.StartConnection(endPoint.Address.ToString()); - statusText.text = $"Joined server: {endPoint.Address}"; - return; - } - - // Display in UI for manual joining - GameObject item = Instantiate(serverListItemPrefab, serverListContainer); - TMP_Text label = item.GetComponentInChildren(); - label.text = endPoint.Address.ToString(); - - Button btn = item.GetComponent