Commit 58efc57f authored by Mitchie Maluschnig's avatar Mitchie Maluschnig
Browse files

played round with particle effects

parent f79b9adc
...@@ -1148,7 +1148,6 @@ MonoBehaviour: ...@@ -1148,7 +1148,6 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
interactButton: {fileID: 113816538} interactButton: {fileID: 113816538}
particleSystem: {fileID: 1397976876}
--- !u!61 &503603552 --- !u!61 &503603552
BoxCollider2D: BoxCollider2D:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -12189,7 +12188,7 @@ ParticleSystem: ...@@ -12189,7 +12188,7 @@ ParticleSystem:
startSize: startSize:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
scalar: 0.2 scalar: 1
minScalar: 1 minScalar: 1
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
...@@ -12565,7 +12564,7 @@ ParticleSystem: ...@@ -12565,7 +12564,7 @@ ParticleSystem:
serializedVersion: 5 serializedVersion: 5
enabled: 1 enabled: 1
type: 4 type: 4
angle: 36.746685 angle: 27.47395
length: 5 length: 5
boxThickness: {x: 0, y: 0, z: 0} boxThickness: {x: 0, y: 0, z: 0}
radiusThickness: 1 radiusThickness: 1
...@@ -12713,9 +12712,9 @@ ParticleSystem: ...@@ -12713,9 +12712,9 @@ ParticleSystem:
serializedVersion: 4 serializedVersion: 4
rateOverTime: rateOverTime:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 3
scalar: 1 scalar: 0.8
minScalar: 10 minScalar: 2
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
m_Curve: m_Curve:
...@@ -12824,38 +12823,38 @@ ParticleSystem: ...@@ -12824,38 +12823,38 @@ ParticleSystem:
curve: curve:
serializedVersion: 2 serializedVersion: 2
minMaxState: 2 minMaxState: 2
scalar: 1 scalar: 0.5
minScalar: 1 minScalar: 1
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: 1 value: 0.5063343
inSlope: 0 inSlope: 0.3024492
outSlope: 0 outSlope: 0.3024492
tangentMode: 34 tangentMode: 34
weightedMode: 0 weightedMode: 0
inWeight: 0 inWeight: 0
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 0.5773204 time: 0.4964868
value: 1 value: 0.65649635
inSlope: -0.27848053 inSlope: 0.49366575
outSlope: -0.27848053 outSlope: 0.49366575
tangentMode: 0 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 1 time: 1
value: 0.7215195 value: 0.7989089
inSlope: -0.6588454 inSlope: 0.49202266
outSlope: -0.6588454 outSlope: 0.49202266
tangentMode: 34 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0 outWeight: 0.33333334
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
...@@ -12863,32 +12862,32 @@ ParticleSystem: ...@@ -12863,32 +12862,32 @@ ParticleSystem:
serializedVersion: 2 serializedVersion: 2
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0.2692299 time: 0
value: 0.7637024 value: 0.19831848
inSlope: -0.52622896 inSlope: 0.35224816
outSlope: -0.52622896 outSlope: 0.35224816
tangentMode: 34 tangentMode: 34
weightedMode: 0 weightedMode: 0
inWeight: 0 inWeight: 0
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 0.7389105 time: 0.58814776
value: 0.51654285 value: 0.40549245
inSlope: -1.0450652 inSlope: 0.7384034
outSlope: -1.0450652 outSlope: 0.7384034
tangentMode: 0 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 1 time: 1
value: 0 value: 0.54840827
inSlope: -1.978413 inSlope: 0.14601755
outSlope: -1.978413 outSlope: 0.14601755
tangentMode: 34 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0 outWeight: 1
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
...@@ -13171,32 +13170,32 @@ ParticleSystem: ...@@ -13171,32 +13170,32 @@ ParticleSystem:
maxGradient: maxGradient:
serializedVersion: 2 serializedVersion: 2
key0: {r: 1, g: 0.5254902, b: 0, a: 1} key0: {r: 1, g: 0.5254902, b: 0, a: 1}
key1: {r: 1, g: 0.87076926, b: 0, a: 1} key1: {r: 1, g: 0.8432015, b: 0, a: 0.49803922}
key2: {r: 0, g: 0, b: 0, a: 0} key2: {r: 1, g: 0.87076926, b: 0, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0} key3: {r: 0, g: 0, b: 0, a: 0.49803922}
key4: {r: 0, g: 0, b: 0, a: 0} key4: {r: 0, g: 0, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0} key5: {r: 0, g: 0, b: 0, a: 0}
key6: {r: 0, g: 0, b: 0, a: 0} key6: {r: 0, g: 0, b: 0, a: 0}
key7: {r: 0, g: 0, b: 0, a: 0} key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 0 ctime0: 0
ctime1: 65535 ctime1: 33539
ctime2: 0 ctime2: 65535
ctime3: 0 ctime3: 0
ctime4: 0 ctime4: 0
ctime5: 0 ctime5: 0
ctime6: 0 ctime6: 0
ctime7: 0 ctime7: 0
atime0: 0 atime0: 29491
atime1: 65535 atime1: 52814
atime2: 0 atime2: 65535
atime3: 0 atime3: 42020
atime4: 0 atime4: 65535
atime5: 0 atime5: 0
atime6: 0 atime6: 0
atime7: 0 atime7: 0
m_Mode: 0 m_Mode: 0
m_NumColorKeys: 2 m_NumColorKeys: 3
m_NumAlphaKeys: 2 m_NumAlphaKeys: 3
minGradient: minGradient:
serializedVersion: 2 serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 1} key0: {r: 1, g: 1, b: 1, a: 1}
...@@ -14427,11 +14426,11 @@ ParticleSystem: ...@@ -14427,11 +14426,11 @@ ParticleSystem:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
NoiseModule: NoiseModule:
enabled: 0 enabled: 1
strength: strength:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
scalar: 1 scalar: 0.2
minScalar: 1 minScalar: 1
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
...@@ -14484,7 +14483,7 @@ ParticleSystem: ...@@ -14484,7 +14483,7 @@ ParticleSystem:
strengthY: strengthY:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
scalar: 1 scalar: 0
minScalar: 1 minScalar: 1
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
...@@ -14537,7 +14536,7 @@ ParticleSystem: ...@@ -14537,7 +14536,7 @@ ParticleSystem:
strengthZ: strengthZ:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
scalar: 1 scalar: 0.1
minScalar: 1 minScalar: 1
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
...@@ -14587,13 +14586,13 @@ ParticleSystem: ...@@ -14587,13 +14586,13 @@ ParticleSystem:
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
separateAxes: 0 separateAxes: 1
frequency: 0.5 frequency: 1
damping: 1 damping: 1
octaves: 1 octaves: 2
octaveMultiplier: 0.5 octaveMultiplier: 0.5
octaveScale: 2 octaveScale: 2
quality: 2 quality: 1
scrollSpeed: scrollSpeed:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
...@@ -22029,7 +22028,7 @@ RectTransform: ...@@ -22029,7 +22028,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 1.7982138} m_AnchoredPosition: {x: 0, y: 3.51}
m_SizeDelta: {x: 300, y: 300} m_SizeDelta: {x: 300, y: 300}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2138223316 --- !u!114 &2138223316
......
...@@ -78,4 +78,5 @@ public class AhavaSpeech : MonoBehaviour, Character { ...@@ -78,4 +78,5 @@ public class AhavaSpeech : MonoBehaviour, Character {
public string[] getResponses() { public string[] getResponses() {
return currentResponses; return currentResponses;
} }
} }
...@@ -6,7 +6,7 @@ using UnityEngine.UI; ...@@ -6,7 +6,7 @@ using UnityEngine.UI;
public class TentInteractoins : MonoBehaviour { public class TentInteractoins : MonoBehaviour {
public Button interactButton; public Button interactButton;
public GameObject particleSystem; //public GameObject particleSystem;
private GameObject player; private GameObject player;
private BoxCollider2D thisCollider; private BoxCollider2D thisCollider;
...@@ -49,12 +49,12 @@ public class TentInteractoins : MonoBehaviour { ...@@ -49,12 +49,12 @@ public class TentInteractoins : MonoBehaviour {
void EnterInteractable() { void EnterInteractable() {
interactButton.gameObject.SetActive(true); interactButton.gameObject.SetActive(true);
particleSystem.SetActive(true); //particleSystem.SetActive(true);
} }
void ExitInteractable() { void ExitInteractable() {
interactButton.gameObject.SetActive(false); interactButton.gameObject.SetActive(false);
particleSystem.SetActive(false); //particleSystem.SetActive(false);
} }
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment