diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml index fc4214e..c2aeefa 100644 --- a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml +++ b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml @@ -142,7 +142,8 @@ - + + diff --git a/FlufflParty/Assets/BlenderFiles/TreePlantTop.blend b/FlufflParty/Assets/BlenderFiles/TreePlantTop.blend index c44d528..dc0ec1b 100644 Binary files a/FlufflParty/Assets/BlenderFiles/TreePlantTop.blend and b/FlufflParty/Assets/BlenderFiles/TreePlantTop.blend differ diff --git a/FlufflParty/Assets/BlenderFiles/TreePlantTop.blend1 b/FlufflParty/Assets/BlenderFiles/TreePlantTop.blend1 new file mode 100644 index 0000000..c44d528 Binary files /dev/null and b/FlufflParty/Assets/BlenderFiles/TreePlantTop.blend1 differ diff --git a/FlufflParty/Assets/BlenderFiles/TreePlantTop.blend1.meta b/FlufflParty/Assets/BlenderFiles/TreePlantTop.blend1.meta new file mode 100644 index 0000000..fc0611c --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/TreePlantTop.blend1.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b52235b29e9ca5b408238aed0a12eba1 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/New Terrain.asset b/FlufflParty/Assets/New Terrain.asset index 45a54bf..d8f6da3 100644 Binary files a/FlufflParty/Assets/New Terrain.asset and b/FlufflParty/Assets/New Terrain.asset differ diff --git a/FlufflParty/Assets/Scenes/Start.unity b/FlufflParty/Assets/Scenes/Start.unity index 8720110..5fac47e 100644 --- a/FlufflParty/Assets/Scenes/Start.unity +++ b/FlufflParty/Assets/Scenes/Start.unity @@ -1798,8 +1798,8 @@ Camera: m_GameObject: {fileID: 936613649} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 3 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_ClearFlags: 2 + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -2928,10 +2928,10 @@ RectTransform: m_Father: {fileID: 1035793954} m_RootOrder: 0 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: -0.000045776, y: 0.0010978} - m_SizeDelta: {x: 800, y: 461.49} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -0.000030517578, y: -0.37069702} + m_SizeDelta: {x: 0, y: 460.7464} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1440669665 MonoBehaviour: diff --git a/FlufflParty/Assets/Scenes/WesternMap.unity b/FlufflParty/Assets/Scenes/WesternMap.unity index 323b5af..599b4c4 100644 --- a/FlufflParty/Assets/Scenes/WesternMap.unity +++ b/FlufflParty/Assets/Scenes/WesternMap.unity @@ -12519,7 +12519,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1235522789 RectTransform: m_ObjectHideFlags: 0 @@ -14537,6 +14537,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6618147588955669852, guid: 38e99aa56206e634b83e1dcd05f0be6a, type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: 553cd74823792624481c24d6c6eaa307, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 38e99aa56206e634b83e1dcd05f0be6a, type: 3} --- !u!4 &1472923488 stripped @@ -19463,7 +19467,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1912330178 RectTransform: m_ObjectHideFlags: 0 @@ -20225,8 +20229,8 @@ BoxCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 444.67572, y: 92.91219, z: 45.183205} - m_Center: {x: 0.055611074, y: -0.39610264, z: 9.810418} + m_Size: {x: 932.50903, y: 127.654884, z: 45.183205} + m_Center: {x: -1.9858401, y: -17.76745, z: 9.810418} --- !u!54 &1988853067 Rigidbody: m_ObjectHideFlags: 0 @@ -20260,8 +20264,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0.00035858, y: -20.2} - m_SizeDelta: {x: 444.19, y: 96.302} + m_AnchoredPosition: {x: -0.0012817, y: -56.2027} + m_SizeDelta: {x: 932.25, y: 156.3364} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2010829640 GameObject: diff --git a/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs b/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs index a7b9b5d..f056d70 100644 --- a/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs +++ b/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs @@ -146,6 +146,7 @@ public class NoPlayablePlayer : Player //delay if (Time.time - timeSinceWurfeln > 2) { + dice.SetActive(false); InterPolerate(); } } diff --git a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs index a709a2a..9d5c39e 100644 --- a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs +++ b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs @@ -149,6 +149,7 @@ public class PlayablePlayer : Player //delay if (Time.time - timeSinceWurfeln > 2) { + dice.SetActive(false); InterPolerate(); } } @@ -344,6 +345,7 @@ public class PlayablePlayer : Player public void StartDice() { + gameObject.SetActive(true); //start the dice dice.transform.position = Vector3.SmoothDamp(dice.transform.position, transform.position + Vector3.up * 3f, ref useLess, 0.2f); diff --git a/FlufflParty/ProjectSettings/ProjectSettings.asset b/FlufflParty/ProjectSettings/ProjectSettings.asset index df99f39..435dcaf 100644 --- a/FlufflParty/ProjectSettings/ProjectSettings.asset +++ b/FlufflParty/ProjectSettings/ProjectSettings.asset @@ -137,7 +137,9 @@ PlayerSettings: 16:9: 1 Others: 1 bundleVersion: 0.14 - preloadedAssets: [] + preloadedAssets: + - {fileID: -6390619424234631034, guid: 90cd1b71078984c4980fcd1aa03eaaa3, type: 2} + - {fileID: 11400000, guid: 48bf7376b3770c44cbfe3f40e77359ab, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 diff --git a/FlufflParty/UserSettings/Layouts/default-2021.dwlt b/FlufflParty/UserSettings/Layouts/default-2021.dwlt index 54dfc8c..f36b0f7 100644 --- a/FlufflParty/UserSettings/Layouts/default-2021.dwlt +++ b/FlufflParty/UserSettings/Layouts/default-2021.dwlt @@ -118,7 +118,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 17 + controlID: 125 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -143,7 +143,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 18 + controlID: 126 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -168,7 +168,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 19 + controlID: 80 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -193,7 +193,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 20 + controlID: 56 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -230,7 +230,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: @@ -241,13 +241,13 @@ MonoBehaviour: height: 755 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 20} + m_ActualView: {fileID: 16} m_Panes: - {fileID: 16} - {fileID: 15} - {fileID: 20} - m_Selected: 2 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 2 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -356,9 +356,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 277} - m_SelectedIDs: d0610000 - m_LastClickedID: 25040 - m_ExpandedIDs: 000000005c6100005e61000060610000626100006461000000ca9a3b + m_SelectedIDs: 186a0000 + m_LastClickedID: 27160 + m_ExpandedIDs: 000000009469000096690000986900009a6900009c69000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -386,7 +386,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000005c6100005e610000606100006261000064610000 + m_ExpandedIDs: 000000009469000096690000986900009a6900009c690000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -473,9 +473,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 90660000 - m_LastClickedID: 26256 - m_ExpandedIDs: 8cf9ffff06fbffff4c630000 + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: b4e3ffff06e4fffffae7ffff2ae8ffff4ef1ffff8ef1ffff82f5ffffb0f5ffff06fbffff5485000072890000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -884,14 +884,14 @@ MonoBehaviour: m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 m_SceneLighting: 1 - m_2DMode: 0 + m_2DMode: 1 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 93.41888, y: 5.5334697, z: 123.85117} + m_Target: {x: 650.0415, y: 376.74948, z: 0} speed: 2 - m_Value: {x: 93.41888, y: 5.5334697, z: 123.85117} + m_Value: {x: 650.0415, y: 376.74948, z: 0} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -938,17 +938,17 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.025187694, y: 0.94757295, z: -0.3090909, w: 0.07720698} + m_Target: {x: 0, y: 0, z: 0, w: 1} speed: 2 - m_Value: {x: 0.024723696, y: 0.94767493, z: -0.30912417, w: 0.07578451} + m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 1.6191624 + m_Target: 339.6271 speed: 2 - m_Value: 1.5494378 + m_Value: 339.6271 m_Ortho: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_CameraSettings: m_Speed: 1.005 m_SpeedNormalized: 0.5 @@ -962,7 +962,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewRotation: {x: 0.025187694, y: 0.94757295, z: -0.3090909, w: 0.07720698} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -1129,7 +1129,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1