jonas/flufflparty-
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Buf Fixed

Browse Source
This commit is contained in:
brausjonas
2023-04-14 23:10:46 +02:00
parent 481f0d1577
commit ad480a3076
3 changed files with 56 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
Generated
+1 -1
View File
@@ -165,7 +165,7 @@
<workItem from="1680813239896" duration="4155000" />
<workItem from="1681056387914" duration="882000" />
<workItem from="1681415672515" duration="5000" />
<workItem from="1681479671396" duration="10055000" />
<workItem from="1681479671396" duration="10742000" />
</task>
<servers />
</component>
FlufflParty/Assets/Scenes/WesternMap.unity
+52
View File
@@ -6680,6 +6680,7 @@ MonoBehaviour:
- {fileID: 1187141365}
- {fileID: 516946749}
uiHandler: {fileID: 47812149}
fullBlocker: {fileID: 1538277147}
--- !u!1 &163128932
GameObject:
m_ObjectHideFlags: 0
@@ -13963,6 +13964,7 @@ RectTransform:
- {fileID: 1370614408}
- {fileID: 1903920336}
- {fileID: 132120856}
- {fileID: 1538277148}
m_Father: {fileID: 0}
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -35563,6 +35565,56 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1538277147
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1538277148}
- component: {fileID: 1538277149}
m_Layer: 5
m_Name: FullBlocker
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &1538277148
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1538277147}
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: 335464105}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 1.3843994, y: 0.33392334}
m_SizeDelta: {x: -2.0089, y: 0.17212}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!65 &1538277149
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1538277147}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 3444.8516, y: 2261.5276, z: 83.7953}
m_Center: {x: 9.073758, y: 27.202827, z: -304.98425}
--- !u!1 &1547369677
GameObject:
m_ObjectHideFlags: 0
FlufflParty/Assets/Scripts/RandomRotator.cs
+3
View File
@@ -15,6 +15,7 @@ public class RandomRotator : MonoBehaviour
private int stopIndex = 0;
public UIHandler uiHandler;
private bool ended = false;
[SerializeField] private GameObject fullBlocker;
public void SetOptionsText(int index, string text)
{
@@ -73,6 +74,7 @@ public class RandomRotator : MonoBehaviour
if (Time.time - lastTimeSwitched > slowDown)
{
ColorOption(stopIndex);
fullBlocker.SetActive(false);
ended = true;
}
}
@@ -81,6 +83,7 @@ public class RandomRotator : MonoBehaviour
public void StartRandom()
{
fullBlocker.SetActive(true);
lastTimeSwitched = Time.time;
started = true;
ended = false;