Commit 9b7d88d3 authored by radow's avatar radow
Browse files

fade into dream and some other nonsense

parent ba3a96f9
......@@ -17753,6 +17753,10 @@ PrefabInstance:
propertyPath: anchorClosed
value:
objectReference: {fileID: 6790736508707002979}
- target: {fileID: 3685575246160673795, guid: 2cca9696502b69f4eb7c3fd6576ab75e, type: 3}
propertyPath: slammdistance
value: 2
objectReference: {fileID: 0}
- target: {fileID: 3685575246160673795, guid: 2cca9696502b69f4eb7c3fd6576ab75e, type: 3}
propertyPath: closedoorDelay
value: 0.2
......@@ -18099,6 +18103,10 @@ PrefabInstance:
propertyPath: closeSFX3
value:
objectReference: {fileID: 8300000, guid: a26d49690e124c84d923b4d42da11b5d, type: 3}
- target: {fileID: 3623658876169494182, guid: 35b4546da5e63354c8fef4f352dd48ed, type: 3}
propertyPath: slammdistance
value: 2
objectReference: {fileID: 0}
- target: {fileID: 3623658876169494182, guid: 35b4546da5e63354c8fef4f352dd48ed, type: 3}
propertyPath: closedoorDelay
value: 0.2
......@@ -21073,6 +21081,10 @@ PrefabInstance:
propertyPath: anchorClosed
value:
objectReference: {fileID: 6790736508707002979}
- target: {fileID: 3623658876169494182, guid: 35b4546da5e63354c8fef4f352dd48ed, type: 3}
propertyPath: slammdistance
value: 3
objectReference: {fileID: 0}
- target: {fileID: 3623658876169494182, guid: 35b4546da5e63354c8fef4f352dd48ed, type: 3}
propertyPath: closedoorDelay
value: 0.2
......@@ -23577,6 +23589,10 @@ PrefabInstance:
propertyPath: anchorClosed
value:
objectReference: {fileID: 6790736508707002979}
- target: {fileID: 3623658876169494182, guid: 35b4546da5e63354c8fef4f352dd48ed, type: 3}
propertyPath: slammdistance
value: 3
objectReference: {fileID: 0}
- target: {fileID: 3623658876169494182, guid: 35b4546da5e63354c8fef4f352dd48ed, type: 3}
propertyPath: closedoorDelay
value: 0.2
......@@ -28523,6 +28539,10 @@ PrefabInstance:
propertyPath: anchorClosed
value:
objectReference: {fileID: 6790736508707002979}
- target: {fileID: 3623658876169494182, guid: 35b4546da5e63354c8fef4f352dd48ed, type: 3}
propertyPath: slammdistance
value: 2
objectReference: {fileID: 0}
- target: {fileID: 3623658876169494182, guid: 35b4546da5e63354c8fef4f352dd48ed, type: 3}
propertyPath: closedoorDelay
value: 0.2
......@@ -30907,6 +30927,10 @@ PrefabInstance:
propertyPath: anchorClosed
value:
objectReference: {fileID: 6790736508707002979}
- target: {fileID: 3623658876169494182, guid: 35b4546da5e63354c8fef4f352dd48ed, type: 3}
propertyPath: slammdistance
value: 3
objectReference: {fileID: 0}
- target: {fileID: 3623658876169494182, guid: 35b4546da5e63354c8fef4f352dd48ed, type: 3}
propertyPath: closedoorDelay
value: 0.2
......@@ -32813,6 +32837,10 @@ PrefabInstance:
propertyPath: anchorClosed
value:
objectReference: {fileID: 6790736508707002979}
- target: {fileID: 3685575246160673795, guid: 2cca9696502b69f4eb7c3fd6576ab75e, type: 3}
propertyPath: slammdistance
value: 3
objectReference: {fileID: 0}
- target: {fileID: 3685575246160673795, guid: 2cca9696502b69f4eb7c3fd6576ab75e, type: 3}
propertyPath: closedoorDelay
value: 0.2
......@@ -33253,6 +33281,10 @@ PrefabInstance:
propertyPath: anchorClosed
value:
objectReference: {fileID: 6790736508707002979}
- target: {fileID: 3685575246160673795, guid: 2cca9696502b69f4eb7c3fd6576ab75e, type: 3}
propertyPath: slammdistance
value: 3
objectReference: {fileID: 0}
- target: {fileID: 3685575246160673795, guid: 2cca9696502b69f4eb7c3fd6576ab75e, type: 3}
propertyPath: closedoorDelay
value: 0.2
......@@ -34259,6 +34291,10 @@ PrefabInstance:
propertyPath: anchorClosed
value:
objectReference: {fileID: 6790736508707002979}
- target: {fileID: 3623658876169494182, guid: 35b4546da5e63354c8fef4f352dd48ed, type: 3}
propertyPath: slammdistance
value: 3
objectReference: {fileID: 0}
- target: {fileID: 3623658876169494182, guid: 35b4546da5e63354c8fef4f352dd48ed, type: 3}
propertyPath: closedoorDelay
value: 0.2
......@@ -35373,6 +35409,10 @@ PrefabInstance:
propertyPath: m_Materials.Array.data[2]
value:
objectReference: {fileID: 2100000, guid: 9f570bd5ea7853c4fb06569f20b7f580, type: 2}
- target: {fileID: 3623658876169494182, guid: 35b4546da5e63354c8fef4f352dd48ed, type: 3}
propertyPath: slammdistance
value: 3
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 102485084136163814, guid: 35b4546da5e63354c8fef4f352dd48ed, type: 3}
- {fileID: 102485084391161393, guid: 35b4546da5e63354c8fef4f352dd48ed, type: 3}
......@@ -36008,6 +36048,10 @@ PrefabInstance:
propertyPath: anchorClosed
value:
objectReference: {fileID: 6790736508707002979}
- target: {fileID: 3623658876169494182, guid: 35b4546da5e63354c8fef4f352dd48ed, type: 3}
propertyPath: slammdistance
value: 4
objectReference: {fileID: 0}
- target: {fileID: 3623658876169494182, guid: 35b4546da5e63354c8fef4f352dd48ed, type: 3}
propertyPath: closedoorDelay
value: 0.2
......@@ -66,7 +66,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
collisionLayers:
serializedVersion: 2
m_Bits: 55
m_Bits: 567
speed: 3
vertRotSpeed: 500
horRotSpeed: 500
......
......@@ -1902,7 +1902,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 70767281}
m_RootOrder: 19
m_RootOrder: 21
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &373069662
MonoBehaviour:
......@@ -7895,7 +7895,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 70767281}
m_RootOrder: 18
m_RootOrder: 20
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1789812659
MonoBehaviour:
......@@ -10764,6 +10764,10 @@ PrefabInstance:
propertyPath: configs.Array.data[0].showBothOnInteract
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1027814840, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
propertyPath: fadefrom
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1027814840, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
propertyPath: endofgametext
value:
......
......@@ -67,9 +67,12 @@ public class Fadescreen : MonoBehaviour
if (activeFrom)
{
progressF -= Time.deltaTime / durF;
c.a = progress;
c.a = progressF;
img.color = c;
if (progressF < 0) activeFrom = false;
if (progressF < 0)
{
activeFrom = false;
}
}
}
}
Supports Markdown
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