Merge branch 'main' into SP3-1-Rendering
This commit is contained in:
commit
ce41e975d0
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -1,6 +1,6 @@
|
||||||
- VertexShader: 46580970
|
- VertexShader: 46580970
|
||||||
FragmentShader: 50110174
|
FragmentShader: 50110174
|
||||||
SubPass: UI
|
SubPass: UI Translucent
|
||||||
Properties:
|
Properties:
|
||||||
data.color: {x: 0, y: 0, z: 0, w: 1}
|
data.color: {x: 0, y: 0, z: 0, w: 1}
|
||||||
data.textureIndex: 0
|
data.textureIndex: 0
|
||||||
|
|
|
@ -521,47 +521,11 @@
|
||||||
- Is Trigger: false
|
- Is Trigger: false
|
||||||
Collision Tag: 0
|
Collision Tag: 0
|
||||||
Type: Box
|
Type: Box
|
||||||
Half Extents: {x: 1.04999995, y: 0.0500000007, z: 0.550000012}
|
Half Extents: {x: 1.10000002, y: 2, z: 0.550000012}
|
||||||
Friction: 0.400000006
|
Friction: 0.400000006
|
||||||
Bounciness: 0
|
Bounciness: 0
|
||||||
Density: 1
|
Density: 1
|
||||||
Position Offset: {x: 0, y: 0.0299999993, z: 0}
|
Position Offset: {x: 0, y: 1, z: 0}
|
||||||
Rotation Offset: {x: 0, y: 0, z: 0}
|
|
||||||
- Is Trigger: false
|
|
||||||
Collision Tag: 0
|
|
||||||
Type: Box
|
|
||||||
Half Extents: {x: 1.04999995, y: 0.0500000007, z: 0.550000012}
|
|
||||||
Friction: 0.400000006
|
|
||||||
Bounciness: 0
|
|
||||||
Density: 1
|
|
||||||
Position Offset: {x: 0, y: 0.5, z: 0}
|
|
||||||
Rotation Offset: {x: 0, y: 0, z: 0}
|
|
||||||
- Is Trigger: false
|
|
||||||
Collision Tag: 0
|
|
||||||
Type: Box
|
|
||||||
Half Extents: {x: 1.04999995, y: 0.0500000007, z: 0.550000012}
|
|
||||||
Friction: 0.400000006
|
|
||||||
Bounciness: 0
|
|
||||||
Density: 1
|
|
||||||
Position Offset: {x: 0, y: 0.985000014, z: 0}
|
|
||||||
Rotation Offset: {x: 0, y: 0, z: 0}
|
|
||||||
- Is Trigger: false
|
|
||||||
Collision Tag: 0
|
|
||||||
Type: Box
|
|
||||||
Half Extents: {x: 1.04999995, y: 0.0500000007, z: 0.550000012}
|
|
||||||
Friction: 0.400000006
|
|
||||||
Bounciness: 0
|
|
||||||
Density: 1
|
|
||||||
Position Offset: {x: 0, y: 1.47500002, z: 0}
|
|
||||||
Rotation Offset: {x: 0, y: 0, z: 0}
|
|
||||||
- Is Trigger: false
|
|
||||||
Collision Tag: 0
|
|
||||||
Type: Box
|
|
||||||
Half Extents: {x: 1.04999995, y: 0.0500000007, z: 0.550000012}
|
|
||||||
Friction: 0.400000006
|
|
||||||
Bounciness: 0
|
|
||||||
Density: 1
|
|
||||||
Position Offset: {x: 0, y: 1.97000003, z: 0}
|
|
||||||
Rotation Offset: {x: 0, y: 0, z: 0}
|
Rotation Offset: {x: 0, y: 0, z: 0}
|
||||||
IsActive: true
|
IsActive: true
|
||||||
Scripts: ~
|
Scripts: ~
|
||||||
|
@ -584,47 +548,11 @@
|
||||||
- Is Trigger: false
|
- Is Trigger: false
|
||||||
Collision Tag: 0
|
Collision Tag: 0
|
||||||
Type: Box
|
Type: Box
|
||||||
Half Extents: {x: 1.04999995, y: 0.0500000007, z: 0.550000012}
|
Half Extents: {x: 1.10000002, y: 2, z: 0.550000012}
|
||||||
Friction: 0.400000006
|
Friction: 0.400000006
|
||||||
Bounciness: 0
|
Bounciness: 0
|
||||||
Density: 1
|
Density: 1
|
||||||
Position Offset: {x: 0, y: 0.0299999993, z: 0}
|
Position Offset: {x: 0, y: 1, z: 0}
|
||||||
Rotation Offset: {x: 0, y: 0, z: 0}
|
|
||||||
- Is Trigger: false
|
|
||||||
Collision Tag: 0
|
|
||||||
Type: Box
|
|
||||||
Half Extents: {x: 1.04999995, y: 0.0500000007, z: 0.550000012}
|
|
||||||
Friction: 0.400000006
|
|
||||||
Bounciness: 0
|
|
||||||
Density: 1
|
|
||||||
Position Offset: {x: 0, y: 0.5, z: 0}
|
|
||||||
Rotation Offset: {x: 0, y: 0, z: 0}
|
|
||||||
- Is Trigger: false
|
|
||||||
Collision Tag: 0
|
|
||||||
Type: Box
|
|
||||||
Half Extents: {x: 1.04999995, y: 0.0500000007, z: 0.550000012}
|
|
||||||
Friction: 0.400000006
|
|
||||||
Bounciness: 0
|
|
||||||
Density: 1
|
|
||||||
Position Offset: {x: 0, y: 0.985000014, z: 0}
|
|
||||||
Rotation Offset: {x: 0, y: 0, z: 0}
|
|
||||||
- Is Trigger: false
|
|
||||||
Collision Tag: 0
|
|
||||||
Type: Box
|
|
||||||
Half Extents: {x: 1.04999995, y: 0.0500000007, z: 0.550000012}
|
|
||||||
Friction: 0.400000006
|
|
||||||
Bounciness: 0
|
|
||||||
Density: 1
|
|
||||||
Position Offset: {x: 0, y: 1.47500002, z: 0}
|
|
||||||
Rotation Offset: {x: 0, y: 0, z: 0}
|
|
||||||
- Is Trigger: false
|
|
||||||
Collision Tag: 0
|
|
||||||
Type: Box
|
|
||||||
Half Extents: {x: 1.04999995, y: 0.0500000007, z: 0.550000012}
|
|
||||||
Friction: 0.400000006
|
|
||||||
Bounciness: 0
|
|
||||||
Density: 1
|
|
||||||
Position Offset: {x: 0, y: 1.97000003, z: 0}
|
|
||||||
Rotation Offset: {x: 0, y: 0, z: 0}
|
Rotation Offset: {x: 0, y: 0, z: 0}
|
||||||
IsActive: true
|
IsActive: true
|
||||||
Scripts: ~
|
Scripts: ~
|
||||||
|
@ -647,47 +575,11 @@
|
||||||
- Is Trigger: false
|
- Is Trigger: false
|
||||||
Collision Tag: 0
|
Collision Tag: 0
|
||||||
Type: Box
|
Type: Box
|
||||||
Half Extents: {x: 1.04999995, y: 0.0500000007, z: 0.550000012}
|
Half Extents: {x: 1.10000002, y: 2, z: 0.550000012}
|
||||||
Friction: 0.400000006
|
Friction: 0.400000006
|
||||||
Bounciness: 0
|
Bounciness: 0
|
||||||
Density: 1
|
Density: 1
|
||||||
Position Offset: {x: 0, y: 0.0299999993, z: 0}
|
Position Offset: {x: 0, y: 1, z: 0}
|
||||||
Rotation Offset: {x: 0, y: 0, z: 0}
|
|
||||||
- Is Trigger: false
|
|
||||||
Collision Tag: 0
|
|
||||||
Type: Box
|
|
||||||
Half Extents: {x: 1.04999995, y: 0.0500000007, z: 0.550000012}
|
|
||||||
Friction: 0.400000006
|
|
||||||
Bounciness: 0
|
|
||||||
Density: 1
|
|
||||||
Position Offset: {x: 0, y: 0.5, z: 0}
|
|
||||||
Rotation Offset: {x: 0, y: 0, z: 0}
|
|
||||||
- Is Trigger: false
|
|
||||||
Collision Tag: 0
|
|
||||||
Type: Box
|
|
||||||
Half Extents: {x: 1.04999995, y: 0.0500000007, z: 0.550000012}
|
|
||||||
Friction: 0.400000006
|
|
||||||
Bounciness: 0
|
|
||||||
Density: 1
|
|
||||||
Position Offset: {x: 0, y: 0.985000014, z: 0}
|
|
||||||
Rotation Offset: {x: 0, y: 0, z: 0}
|
|
||||||
- Is Trigger: false
|
|
||||||
Collision Tag: 0
|
|
||||||
Type: Box
|
|
||||||
Half Extents: {x: 1.04999995, y: 0.0500000007, z: 0.550000012}
|
|
||||||
Friction: 0.400000006
|
|
||||||
Bounciness: 0
|
|
||||||
Density: 1
|
|
||||||
Position Offset: {x: 0, y: 1.47500002, z: 0}
|
|
||||||
Rotation Offset: {x: 0, y: 0, z: 0}
|
|
||||||
- Is Trigger: false
|
|
||||||
Collision Tag: 0
|
|
||||||
Type: Box
|
|
||||||
Half Extents: {x: 1.04999995, y: 0.0500000007, z: 0.550000012}
|
|
||||||
Friction: 0.400000006
|
|
||||||
Bounciness: 0
|
|
||||||
Density: 1
|
|
||||||
Position Offset: {x: 0, y: 1.97000003, z: 0}
|
|
||||||
Rotation Offset: {x: 0, y: 0, z: 0}
|
Rotation Offset: {x: 0, y: 0, z: 0}
|
||||||
IsActive: true
|
IsActive: true
|
||||||
Scripts: ~
|
Scripts: ~
|
||||||
|
@ -836,47 +728,11 @@
|
||||||
- Is Trigger: false
|
- Is Trigger: false
|
||||||
Collision Tag: 0
|
Collision Tag: 0
|
||||||
Type: Box
|
Type: Box
|
||||||
Half Extents: {x: 1.04999995, y: 0.0500000007, z: 0.550000012}
|
Half Extents: {x: 1.10000002, y: 2, z: 0.550000012}
|
||||||
Friction: 0.400000006
|
Friction: 0.400000006
|
||||||
Bounciness: 0
|
Bounciness: 0
|
||||||
Density: 1
|
Density: 1
|
||||||
Position Offset: {x: 0, y: 0.0299999993, z: 0}
|
Position Offset: {x: 0, y: 1, z: 0}
|
||||||
Rotation Offset: {x: 0, y: 0, z: 0}
|
|
||||||
- Is Trigger: false
|
|
||||||
Collision Tag: 0
|
|
||||||
Type: Box
|
|
||||||
Half Extents: {x: 1.04999995, y: 0.0500000007, z: 0.550000012}
|
|
||||||
Friction: 0.400000006
|
|
||||||
Bounciness: 0
|
|
||||||
Density: 1
|
|
||||||
Position Offset: {x: 0, y: 0.5, z: 0}
|
|
||||||
Rotation Offset: {x: 0, y: 0, z: 0}
|
|
||||||
- Is Trigger: false
|
|
||||||
Collision Tag: 0
|
|
||||||
Type: Box
|
|
||||||
Half Extents: {x: 1.04999995, y: 0.0500000007, z: 0.550000012}
|
|
||||||
Friction: 0.400000006
|
|
||||||
Bounciness: 0
|
|
||||||
Density: 1
|
|
||||||
Position Offset: {x: 0, y: 0.985000014, z: 0}
|
|
||||||
Rotation Offset: {x: 0, y: 0, z: 0}
|
|
||||||
- Is Trigger: false
|
|
||||||
Collision Tag: 0
|
|
||||||
Type: Box
|
|
||||||
Half Extents: {x: 1.04999995, y: 0.0500000007, z: 0.550000012}
|
|
||||||
Friction: 0.400000006
|
|
||||||
Bounciness: 0
|
|
||||||
Density: 1
|
|
||||||
Position Offset: {x: 0, y: 1.47500002, z: 0}
|
|
||||||
Rotation Offset: {x: 0, y: 0, z: 0}
|
|
||||||
- Is Trigger: false
|
|
||||||
Collision Tag: 0
|
|
||||||
Type: Box
|
|
||||||
Half Extents: {x: 1.04999995, y: 0.0500000007, z: 0.550000012}
|
|
||||||
Friction: 0.400000006
|
|
||||||
Bounciness: 0
|
|
||||||
Density: 1
|
|
||||||
Position Offset: {x: 0, y: 1.97000003, z: 0}
|
|
||||||
Rotation Offset: {x: 0, y: 0, z: 0}
|
Rotation Offset: {x: 0, y: 0, z: 0}
|
||||||
IsActive: true
|
IsActive: true
|
||||||
Scripts: ~
|
Scripts: ~
|
||||||
|
@ -962,47 +818,11 @@
|
||||||
- Is Trigger: false
|
- Is Trigger: false
|
||||||
Collision Tag: 0
|
Collision Tag: 0
|
||||||
Type: Box
|
Type: Box
|
||||||
Half Extents: {x: 1.04999995, y: 0.0500000007, z: 0.550000012}
|
Half Extents: {x: 1.10000002, y: 2, z: 0.550000012}
|
||||||
Friction: 0.400000006
|
Friction: 0.400000006
|
||||||
Bounciness: 0
|
Bounciness: 0
|
||||||
Density: 1
|
Density: 1
|
||||||
Position Offset: {x: 0, y: 0.0299999993, z: 0}
|
Position Offset: {x: 0, y: 1, z: 0}
|
||||||
Rotation Offset: {x: 0, y: 0, z: 0}
|
|
||||||
- Is Trigger: false
|
|
||||||
Collision Tag: 0
|
|
||||||
Type: Box
|
|
||||||
Half Extents: {x: 1.04999995, y: 0.0500000007, z: 0.550000012}
|
|
||||||
Friction: 0.400000006
|
|
||||||
Bounciness: 0
|
|
||||||
Density: 1
|
|
||||||
Position Offset: {x: 0, y: 0.5, z: 0}
|
|
||||||
Rotation Offset: {x: 0, y: 0, z: 0}
|
|
||||||
- Is Trigger: false
|
|
||||||
Collision Tag: 0
|
|
||||||
Type: Box
|
|
||||||
Half Extents: {x: 1.04999995, y: 0.0500000007, z: 0.550000012}
|
|
||||||
Friction: 0.400000006
|
|
||||||
Bounciness: 0
|
|
||||||
Density: 1
|
|
||||||
Position Offset: {x: 0, y: 0.985000014, z: 0}
|
|
||||||
Rotation Offset: {x: 0, y: 0, z: 0}
|
|
||||||
- Is Trigger: false
|
|
||||||
Collision Tag: 0
|
|
||||||
Type: Box
|
|
||||||
Half Extents: {x: 1.04999995, y: 0.0500000007, z: 0.550000012}
|
|
||||||
Friction: 0.400000006
|
|
||||||
Bounciness: 0
|
|
||||||
Density: 1
|
|
||||||
Position Offset: {x: 0, y: 1.47500002, z: 0}
|
|
||||||
Rotation Offset: {x: 0, y: 0, z: 0}
|
|
||||||
- Is Trigger: false
|
|
||||||
Collision Tag: 0
|
|
||||||
Type: Box
|
|
||||||
Half Extents: {x: 1.04999995, y: 0.0500000007, z: 0.550000012}
|
|
||||||
Friction: 0.400000006
|
|
||||||
Bounciness: 0
|
|
||||||
Density: 1
|
|
||||||
Position Offset: {x: 0, y: 1.97000003, z: 0}
|
|
||||||
Rotation Offset: {x: 0, y: 0, z: 0}
|
Rotation Offset: {x: 0, y: 0, z: 0}
|
||||||
IsActive: true
|
IsActive: true
|
||||||
Scripts: ~
|
Scripts: ~
|
||||||
|
@ -2583,7 +2403,7 @@
|
||||||
Components:
|
Components:
|
||||||
Transform Component:
|
Transform Component:
|
||||||
Translate: {x: 0, y: 0, z: 0}
|
Translate: {x: 0, y: 0, z: 0}
|
||||||
Rotate: {x: -1.48352981, y: 0, z: 0}
|
Rotate: {x: 0, y: 0, z: 0}
|
||||||
Scale: {x: 1, y: 1, z: 1}
|
Scale: {x: 1, y: 1, z: 1}
|
||||||
IsActive: true
|
IsActive: true
|
||||||
Renderable Component:
|
Renderable Component:
|
||||||
|
@ -4293,13 +4113,14 @@
|
||||||
NumberOfChildren: 0
|
NumberOfChildren: 0
|
||||||
Components:
|
Components:
|
||||||
Transform Component:
|
Transform Component:
|
||||||
Translate: {x: -800, y: 400, z: 0}
|
Translate: {x: -800, y: 400, z: 0.100000001}
|
||||||
Rotate: {x: 0, y: 0, z: 0}
|
Rotate: {x: 0, y: 0, z: 0}
|
||||||
Scale: {x: 60, y: 60, z: 60}
|
Scale: {x: 60, y: 60, z: 60}
|
||||||
IsActive: true
|
IsActive: true
|
||||||
Text Renderer Component:
|
Text Renderer Component:
|
||||||
Text: My name is Brandon.
|
Text: "Score: 0"
|
||||||
Font: 176667660
|
Font: 176667660
|
||||||
|
Color: {x: 1, y: 1, z: 1, w: 1}
|
||||||
IsActive: true
|
IsActive: true
|
||||||
Scripts: ~
|
Scripts: ~
|
||||||
- EID: 206
|
- EID: 206
|
||||||
|
@ -4308,13 +4129,14 @@
|
||||||
NumberOfChildren: 0
|
NumberOfChildren: 0
|
||||||
Components:
|
Components:
|
||||||
Transform Component:
|
Transform Component:
|
||||||
Translate: {x: 500, y: 400, z: 0}
|
Translate: {x: 500, y: 400, z: 0.100000001}
|
||||||
Rotate: {x: 0, y: 0, z: 0}
|
Rotate: {x: 0, y: 0, z: 0}
|
||||||
Scale: {x: 60, y: 60, z: 60}
|
Scale: {x: 60, y: 60, z: 60}
|
||||||
IsActive: true
|
IsActive: true
|
||||||
Text Renderer Component:
|
Text Renderer Component:
|
||||||
Text: My name is Brandon.
|
Text: "Time Left: 200"
|
||||||
Font: 176667660
|
Font: 176667660
|
||||||
|
Color: {x: 1, y: 1, z: 1, w: 1}
|
||||||
IsActive: true
|
IsActive: true
|
||||||
Scripts: ~
|
Scripts: ~
|
||||||
- EID: 238
|
- EID: 238
|
||||||
|
@ -4323,13 +4145,14 @@
|
||||||
NumberOfChildren: 0
|
NumberOfChildren: 0
|
||||||
Components:
|
Components:
|
||||||
Transform Component:
|
Transform Component:
|
||||||
Translate: {x: -800, y: 300, z: 0}
|
Translate: {x: -800, y: 300, z: 0.100000001}
|
||||||
Rotate: {x: 0, y: 0, z: 0}
|
Rotate: {x: 0, y: 0, z: 0}
|
||||||
Scale: {x: 60, y: 60, z: 60}
|
Scale: {x: 60, y: 60, z: 60}
|
||||||
IsActive: true
|
IsActive: true
|
||||||
Text Renderer Component:
|
Text Renderer Component:
|
||||||
Text: TEST
|
Text: ""
|
||||||
Font: 176667660
|
Font: 176667660
|
||||||
|
Color: {x: 1, y: 1, z: 1, w: 1}
|
||||||
IsActive: true
|
IsActive: true
|
||||||
Scripts: ~
|
Scripts: ~
|
||||||
- EID: 236
|
- EID: 236
|
||||||
|
@ -4343,7 +4166,7 @@
|
||||||
winScene: 86098106
|
winScene: 86098106
|
||||||
loseScene: 91685359
|
loseScene: 91685359
|
||||||
currGameState: 0
|
currGameState: 0
|
||||||
totalItemCount: 0
|
totalItemCount: 4
|
||||||
Score: 0
|
Score: 0
|
||||||
timer: 200
|
timer: 200
|
||||||
scoreText: 237
|
scoreText: 237
|
||||||
|
@ -4352,14 +4175,20 @@
|
||||||
maxMultiplierDuration: 5
|
maxMultiplierDuration: 5
|
||||||
maxMultiplierCombo: 10
|
maxMultiplierCombo: 10
|
||||||
multiplierFont: 60
|
multiplierFont: 60
|
||||||
|
- Type: PauseMenu
|
||||||
|
Enabled: true
|
||||||
|
resumeBtn: 457
|
||||||
|
retryBtn: 455
|
||||||
|
quitBtn: 456
|
||||||
|
canvas: 458
|
||||||
- EID: 235
|
- EID: 235
|
||||||
Name: ====AI=====
|
Name: ====AI=====
|
||||||
IsActive: true
|
IsActive: true
|
||||||
NumberOfChildren: 0
|
NumberOfChildren: 0
|
||||||
Components:
|
Components:
|
||||||
Transform Component:
|
Transform Component:
|
||||||
Translate: {x: 0.406909943, y: 0.100000001, z: -2}
|
Translate: {x: 2.13981342, y: 0.0490087792, z: -1.96055627}
|
||||||
Rotate: {x: -0, y: 0, z: -0}
|
Rotate: {x: 0, y: -1.53675354, z: 0}
|
||||||
Scale: {x: 1, y: 1, z: 1}
|
Scale: {x: 1, y: 1, z: 1}
|
||||||
IsActive: true
|
IsActive: true
|
||||||
Renderable Component:
|
Renderable Component:
|
||||||
|
@ -4385,7 +4214,7 @@
|
||||||
- Is Trigger: false
|
- Is Trigger: false
|
||||||
Collision Tag: 5
|
Collision Tag: 5
|
||||||
Type: Box
|
Type: Box
|
||||||
Half Extents: {x: 1, y: 1.79999995, z: 0.400000006}
|
Half Extents: {x: 0.600000024, y: 1.79999995, z: 0.400000006}
|
||||||
Friction: 0.400000006
|
Friction: 0.400000006
|
||||||
Bounciness: 0
|
Bounciness: 0
|
||||||
Density: 1
|
Density: 1
|
||||||
|
@ -4466,8 +4295,8 @@
|
||||||
NumberOfChildren: 0
|
NumberOfChildren: 0
|
||||||
Components:
|
Components:
|
||||||
Transform Component:
|
Transform Component:
|
||||||
Translate: {x: 3.71994686, y: 1.14058578, z: -9.35119247}
|
Translate: {x: 3.71994758, y: 1.0997268, z: -9.35119152}
|
||||||
Rotate: {x: -0, y: 0, z: -0}
|
Rotate: {x: 4.18975469e-06, y: -1.08915871e-11, z: -5.03928231e-06}
|
||||||
Scale: {x: 1, y: 1, z: 1}
|
Scale: {x: 1, y: 1, z: 1}
|
||||||
IsActive: true
|
IsActive: true
|
||||||
Renderable Component:
|
Renderable Component:
|
||||||
|
@ -4509,7 +4338,7 @@
|
||||||
dontReturn: false
|
dontReturn: false
|
||||||
soundDistance: 10
|
soundDistance: 10
|
||||||
highlightSpeed: 200
|
highlightSpeed: 200
|
||||||
highlightThickness: 600
|
highlightThickness: 120
|
||||||
highlightLowerClamp: 0.25
|
highlightLowerClamp: 0.25
|
||||||
- EID: 227
|
- EID: 227
|
||||||
Name: Mesh_Cheese
|
Name: Mesh_Cheese
|
||||||
|
@ -4517,8 +4346,8 @@
|
||||||
NumberOfChildren: 0
|
NumberOfChildren: 0
|
||||||
Components:
|
Components:
|
||||||
Transform Component:
|
Transform Component:
|
||||||
Translate: {x: 3.22328258, y: 1.08429813, z: -0.57395637}
|
Translate: {x: 3.22328258, y: 1.02709854, z: -0.57395637}
|
||||||
Rotate: {x: -0, y: 0, z: -0}
|
Rotate: {x: 5.62993963e-09, y: -7.03049191e-17, z: -1.92319405e-08}
|
||||||
Scale: {x: 1, y: 1, z: 1}
|
Scale: {x: 1, y: 1, z: 1}
|
||||||
IsActive: true
|
IsActive: true
|
||||||
Renderable Component:
|
Renderable Component:
|
||||||
|
@ -4530,7 +4359,7 @@
|
||||||
Drag: 0.00999999978
|
Drag: 0.00999999978
|
||||||
Angular Drag: 0.100000001
|
Angular Drag: 0.100000001
|
||||||
Use Gravity: true
|
Use Gravity: true
|
||||||
Interpolate: true
|
Interpolate: false
|
||||||
Sleeping Enabled: true
|
Sleeping Enabled: true
|
||||||
Freeze Position X: false
|
Freeze Position X: false
|
||||||
Freeze Position Y: false
|
Freeze Position Y: false
|
||||||
|
@ -4560,7 +4389,7 @@
|
||||||
dontReturn: false
|
dontReturn: false
|
||||||
soundDistance: 10
|
soundDistance: 10
|
||||||
highlightSpeed: 200
|
highlightSpeed: 200
|
||||||
highlightThickness: 600
|
highlightThickness: 50
|
||||||
highlightLowerClamp: 0.25
|
highlightLowerClamp: 0.25
|
||||||
- EID: 65778
|
- EID: 65778
|
||||||
Name: Mesh_Apple
|
Name: Mesh_Apple
|
||||||
|
@ -4568,8 +4397,8 @@
|
||||||
NumberOfChildren: 0
|
NumberOfChildren: 0
|
||||||
Components:
|
Components:
|
||||||
Transform Component:
|
Transform Component:
|
||||||
Translate: {x: -2.5, y: 0.778462529, z: -5}
|
Translate: {x: -2.50000072, y: 0.799999774, z: -5.00000095}
|
||||||
Rotate: {x: -0, y: 0, z: -0}
|
Rotate: {x: -4.09249949e-08, y: 1.40052995e-13, z: 2.95086267e-08}
|
||||||
Scale: {x: 1, y: 1, z: 1}
|
Scale: {x: 1, y: 1, z: 1}
|
||||||
IsActive: true
|
IsActive: true
|
||||||
Renderable Component:
|
Renderable Component:
|
||||||
|
@ -4581,7 +4410,7 @@
|
||||||
Drag: 0.00999999978
|
Drag: 0.00999999978
|
||||||
Angular Drag: 0.100000001
|
Angular Drag: 0.100000001
|
||||||
Use Gravity: true
|
Use Gravity: true
|
||||||
Interpolate: true
|
Interpolate: false
|
||||||
Sleeping Enabled: true
|
Sleeping Enabled: true
|
||||||
Freeze Position X: false
|
Freeze Position X: false
|
||||||
Freeze Position Y: false
|
Freeze Position Y: false
|
||||||
|
@ -4611,7 +4440,7 @@
|
||||||
dontReturn: false
|
dontReturn: false
|
||||||
soundDistance: 10
|
soundDistance: 10
|
||||||
highlightSpeed: 200
|
highlightSpeed: 200
|
||||||
highlightThickness: 600
|
highlightThickness: 60
|
||||||
highlightLowerClamp: 0.25
|
highlightLowerClamp: 0.25
|
||||||
- EID: 216
|
- EID: 216
|
||||||
Name: Mesh_Apple
|
Name: Mesh_Apple
|
||||||
|
@ -4619,8 +4448,8 @@
|
||||||
NumberOfChildren: 0
|
NumberOfChildren: 0
|
||||||
Components:
|
Components:
|
||||||
Transform Component:
|
Transform Component:
|
||||||
Translate: {x: -2.5, y: 0.778462529, z: -4.28408813}
|
Translate: {x: -2.50000072, y: 0.799999893, z: -4.28408909}
|
||||||
Rotate: {x: -0, y: 0, z: -0}
|
Rotate: {x: -5.83341553e-08, y: 7.48974247e-14, z: 1.10461471e-08}
|
||||||
Scale: {x: 1, y: 1, z: 1}
|
Scale: {x: 1, y: 1, z: 1}
|
||||||
IsActive: true
|
IsActive: true
|
||||||
Renderable Component:
|
Renderable Component:
|
||||||
|
@ -4632,7 +4461,7 @@
|
||||||
Drag: 0.00999999978
|
Drag: 0.00999999978
|
||||||
Angular Drag: 0.100000001
|
Angular Drag: 0.100000001
|
||||||
Use Gravity: true
|
Use Gravity: true
|
||||||
Interpolate: true
|
Interpolate: false
|
||||||
Sleeping Enabled: true
|
Sleeping Enabled: true
|
||||||
Freeze Position X: false
|
Freeze Position X: false
|
||||||
Freeze Position Y: false
|
Freeze Position Y: false
|
||||||
|
@ -4662,7 +4491,7 @@
|
||||||
dontReturn: false
|
dontReturn: false
|
||||||
soundDistance: 10
|
soundDistance: 10
|
||||||
highlightSpeed: 200
|
highlightSpeed: 200
|
||||||
highlightThickness: 600
|
highlightThickness: 60
|
||||||
highlightLowerClamp: 0.25
|
highlightLowerClamp: 0.25
|
||||||
- EID: 229
|
- EID: 229
|
||||||
Name: ====ScoreZonePool====
|
Name: ====ScoreZonePool====
|
||||||
|
@ -4677,7 +4506,7 @@
|
||||||
Components:
|
Components:
|
||||||
Transform Component:
|
Transform Component:
|
||||||
Translate: {x: -7.47360849, y: 1.4327563, z: -2.44241929}
|
Translate: {x: -7.47360849, y: 1.4327563, z: -2.44241929}
|
||||||
Rotate: {x: -0, y: 0, z: -0}
|
Rotate: {x: -0, y: 0, z: 0}
|
||||||
Scale: {x: 1, y: 1, z: 1}
|
Scale: {x: 1, y: 1, z: 1}
|
||||||
IsActive: true
|
IsActive: true
|
||||||
RigidBody Component:
|
RigidBody Component:
|
||||||
|
@ -4739,7 +4568,7 @@
|
||||||
Components:
|
Components:
|
||||||
Transform Component:
|
Transform Component:
|
||||||
Translate: {x: 1.97487497, y: 1.3500793, z: -10.195508}
|
Translate: {x: 1.97487497, y: 1.3500793, z: -10.195508}
|
||||||
Rotate: {x: -0, y: 0, z: -0}
|
Rotate: {x: -0, y: 0, z: 0}
|
||||||
Scale: {x: 1, y: 1, z: 1}
|
Scale: {x: 1, y: 1, z: 1}
|
||||||
IsActive: true
|
IsActive: true
|
||||||
RigidBody Component:
|
RigidBody Component:
|
||||||
|
@ -4800,8 +4629,8 @@
|
||||||
NumberOfChildren: 1
|
NumberOfChildren: 1
|
||||||
Components:
|
Components:
|
||||||
Transform Component:
|
Transform Component:
|
||||||
Translate: {x: -5.47656059, y: 1.4327563, z: -2.44241929}
|
Translate: {x: -5.47656107, y: 1.4327563, z: -2.44241929}
|
||||||
Rotate: {x: -0, y: 0, z: -0}
|
Rotate: {x: -0, y: 0, z: 0}
|
||||||
Scale: {x: 1, y: 1, z: 1}
|
Scale: {x: 1, y: 1, z: 1}
|
||||||
IsActive: true
|
IsActive: true
|
||||||
RigidBody Component:
|
RigidBody Component:
|
||||||
|
@ -4863,7 +4692,7 @@
|
||||||
Components:
|
Components:
|
||||||
Transform Component:
|
Transform Component:
|
||||||
Translate: {x: 6.09239721, y: 1.4327563, z: -6.03106117}
|
Translate: {x: 6.09239721, y: 1.4327563, z: -6.03106117}
|
||||||
Rotate: {x: -0, y: 0, z: -0}
|
Rotate: {x: -0, y: 0, z: 0}
|
||||||
Scale: {x: 1, y: 1, z: 1}
|
Scale: {x: 1, y: 1, z: 1}
|
||||||
IsActive: true
|
IsActive: true
|
||||||
RigidBody Component:
|
RigidBody Component:
|
||||||
|
@ -4925,7 +4754,7 @@
|
||||||
Components:
|
Components:
|
||||||
Transform Component:
|
Transform Component:
|
||||||
Translate: {x: 6.09239721, y: 1.4327563, z: -3.94262314}
|
Translate: {x: 6.09239721, y: 1.4327563, z: -3.94262314}
|
||||||
Rotate: {x: -0, y: 0, z: -0}
|
Rotate: {x: -0, y: 0, z: 0}
|
||||||
Scale: {x: 1, y: 1, z: 1}
|
Scale: {x: 1, y: 1, z: 1}
|
||||||
IsActive: true
|
IsActive: true
|
||||||
RigidBody Component:
|
RigidBody Component:
|
||||||
|
@ -5075,7 +4904,7 @@
|
||||||
Components:
|
Components:
|
||||||
Transform Component:
|
Transform Component:
|
||||||
Translate: {x: -8, y: 1.142977, z: -4}
|
Translate: {x: -8, y: 1.142977, z: -4}
|
||||||
Rotate: {x: -0, y: 0, z: -0}
|
Rotate: {x: -0, y: 1.57079649, z: 0}
|
||||||
Scale: {x: 0.999999881, y: 1, z: 0.999999881}
|
Scale: {x: 0.999999881, y: 1, z: 0.999999881}
|
||||||
IsActive: true
|
IsActive: true
|
||||||
Renderable Component:
|
Renderable Component:
|
||||||
|
@ -5090,7 +4919,7 @@
|
||||||
Interpolate: false
|
Interpolate: false
|
||||||
Sleeping Enabled: true
|
Sleeping Enabled: true
|
||||||
Freeze Position X: false
|
Freeze Position X: false
|
||||||
Freeze Position Y: true
|
Freeze Position Y: false
|
||||||
Freeze Position Z: false
|
Freeze Position Z: false
|
||||||
Freeze Rotation X: true
|
Freeze Rotation X: true
|
||||||
Freeze Rotation Y: true
|
Freeze Rotation Y: true
|
||||||
|
@ -5120,23 +4949,27 @@
|
||||||
maxJumpHeight: 2
|
maxJumpHeight: 2
|
||||||
maxJumpTime: 0.75
|
maxJumpTime: 0.75
|
||||||
fallMultipler: 3
|
fallMultipler: 3
|
||||||
jumpPadMultiplayer: 2
|
jumpPadMultiplayer: 1.20000005
|
||||||
lightMultiper: 0.75
|
lightMultiper: 0.899999976
|
||||||
mediumMultiper: 0.5
|
mediumMultiper: 0.699999988
|
||||||
heavyMultiper: 0.25
|
heavyMultiper: 0.5
|
||||||
|
silhouettePlayer: 462
|
||||||
|
silhouetteBag: 465
|
||||||
- Type: PickAndThrow
|
- Type: PickAndThrow
|
||||||
Enabled: true
|
Enabled: true
|
||||||
throwForce: [8, 10, 8]
|
throwForce: [8, 10, 8]
|
||||||
cameraArmOffSet: [0, 0.25, 0]
|
cameraArmOffSet: [0.25, 0.600000024, 0.200000003]
|
||||||
delayTimer: 1
|
delayTimer: 1
|
||||||
aimingLength: 0.899999976
|
aimingLength: 1
|
||||||
throwItem: false
|
throwItem: false
|
||||||
silhouettePlayer: 462
|
rayDistance: 0.75
|
||||||
silhouetteBag: 465
|
|
||||||
rayDistance: 0.5
|
|
||||||
rayHeight: 0.100000001
|
rayHeight: 0.100000001
|
||||||
aimingFOV: 50
|
aimingFOV: 50
|
||||||
defaultFOV: 45
|
defaultFOV: 45
|
||||||
|
- Type: StateMachine
|
||||||
|
Enabled: true
|
||||||
|
currentStateName: Idle State
|
||||||
|
currentAnimName: ""
|
||||||
- EID: 65733
|
- EID: 65733
|
||||||
Name: HoldingPoint
|
Name: HoldingPoint
|
||||||
IsActive: true
|
IsActive: true
|
||||||
|
@ -5155,36 +4988,36 @@
|
||||||
Components:
|
Components:
|
||||||
Transform Component:
|
Transform Component:
|
||||||
Translate: {x: 0, y: -2.98023224e-08, z: 4.76837158e-07}
|
Translate: {x: 0, y: -2.98023224e-08, z: 4.76837158e-07}
|
||||||
Rotate: {x: 0, y: 6.28318548, z: 2.23517329e-08}
|
Rotate: {x: -0.173316926, y: 3.1415925, z: 2.23517329e-08}
|
||||||
Scale: {x: 1, y: 1, z: 1}
|
Scale: {x: 1, y: 1, z: 1}
|
||||||
IsActive: true
|
IsActive: true
|
||||||
Camera Component:
|
Camera Component:
|
||||||
Position: {x: 2.12735963, y: 0.362327784, z: 7.98933029}
|
Position: {x: -8.9091711, y: 2.05214882, z: -4}
|
||||||
Pitch: 0
|
Pitch: -9.93032837
|
||||||
Yaw: 360
|
Yaw: 270
|
||||||
Roll: 1.28065994e-06
|
Roll: 1.28065994e-06
|
||||||
Width: 1920
|
Width: 1920
|
||||||
Near: 0.00999999978
|
Near: 0.00999999978
|
||||||
Far: 10000
|
Far: 10000
|
||||||
Perspective: true
|
Perspective: true
|
||||||
FOV: 90
|
FOV: 45
|
||||||
IsActive: true
|
IsActive: true
|
||||||
Camera Arm Component:
|
Camera Arm Component:
|
||||||
Arm Pitch: 0
|
Arm Pitch: 45
|
||||||
Arm Yaw: 0
|
Arm Yaw: -90
|
||||||
Arm Length: 1
|
Arm Length: 3
|
||||||
Look At Camera Origin: true
|
Look At Camera Origin: true
|
||||||
Target Offset: {x: 0, y: 0, z: 0}
|
Target Offset: {x: 0, y: 0.75, z: 0}
|
||||||
Camera Collision: true
|
Camera Collision: true
|
||||||
IsActive: true
|
IsActive: true
|
||||||
Scripts:
|
Scripts:
|
||||||
- Type: SHADE_Scripting.ThirdPersonCamera
|
- Type: SHADE_Scripting.ThirdPersonCamera
|
||||||
Enabled: true
|
Enabled: true
|
||||||
armLength: 2
|
armLength: 3
|
||||||
turnSpeedPitch: 0.300000012
|
turnSpeedPitch: 0.200000003
|
||||||
turnSpeedYaw: 0.5
|
turnSpeedYaw: 0.400000006
|
||||||
inverseXControls: true
|
inverseXControls: false
|
||||||
inverseYControls: true
|
inverseYControls: false
|
||||||
pitchUpperClamp: 45
|
pitchUpperClamp: 45
|
||||||
pitchLowerClamp: 5
|
pitchLowerClamp: 5
|
||||||
- EID: 65731
|
- EID: 65731
|
||||||
|
@ -5244,7 +5077,7 @@
|
||||||
IsActive: true
|
IsActive: true
|
||||||
Scripts: ~
|
Scripts: ~
|
||||||
- EID: 464
|
- EID: 464
|
||||||
Name: Canvas
|
Name: StealFoodCanvas
|
||||||
IsActive: true
|
IsActive: true
|
||||||
NumberOfChildren: 1
|
NumberOfChildren: 1
|
||||||
Components:
|
Components:
|
||||||
|
@ -5277,7 +5110,7 @@
|
||||||
- Type: SHADE_Scripting.UI.StealFoodPopUp
|
- Type: SHADE_Scripting.UI.StealFoodPopUp
|
||||||
Enabled: true
|
Enabled: true
|
||||||
popInDuration: 0.5
|
popInDuration: 0.5
|
||||||
popOutDuration: 0.5
|
popOutDuration: 0.075000003
|
||||||
stayDuration: 1
|
stayDuration: 1
|
||||||
rotationAmt: 1800
|
rotationAmt: 1800
|
||||||
scaleAmtX: 538
|
scaleAmtX: 538
|
||||||
|
@ -5291,6 +5124,192 @@
|
||||||
- Type: SHADE_Scripting.UI.TweenManager
|
- Type: SHADE_Scripting.UI.TweenManager
|
||||||
Enabled: true
|
Enabled: true
|
||||||
- EID: 461
|
- EID: 461
|
||||||
|
Name: CameraPoints
|
||||||
|
IsActive: true
|
||||||
|
NumberOfChildren: 3
|
||||||
|
Components: ~
|
||||||
|
Scripts:
|
||||||
|
- Type: SHADE_Scripting.UI.PreviewLevel
|
||||||
|
Enabled: true
|
||||||
|
endPoint1: [-5.5, 1.5, -2]
|
||||||
|
endPoint2: [1, 1.5, -7.5]
|
||||||
|
endPoint3: [2.5, 1.5, -3]
|
||||||
|
playerCamera: 65730
|
||||||
|
duration: 3
|
||||||
|
- EID: 453
|
||||||
|
Name: PreviewLevel1
|
||||||
|
IsActive: true
|
||||||
|
NumberOfChildren: 0
|
||||||
|
Components:
|
||||||
|
Transform Component:
|
||||||
|
Translate: {x: -7.5, y: 1.5, z: -2}
|
||||||
|
Rotate: {x: 0, y: 0, z: 0}
|
||||||
|
Scale: {x: 1, y: 1, z: 1}
|
||||||
|
IsActive: true
|
||||||
|
Camera Component:
|
||||||
|
Position: {x: -5.5, y: 1.5, z: -2}
|
||||||
|
Pitch: 0
|
||||||
|
Yaw: 0
|
||||||
|
Roll: 0
|
||||||
|
Width: 1920
|
||||||
|
Near: 0.00999999978
|
||||||
|
Far: 10000
|
||||||
|
Perspective: true
|
||||||
|
FOV: 90
|
||||||
|
IsActive: true
|
||||||
|
Scripts: ~
|
||||||
|
- EID: 452
|
||||||
|
Name: PreviewLevel2
|
||||||
|
IsActive: true
|
||||||
|
NumberOfChildren: 0
|
||||||
|
Components:
|
||||||
|
Transform Component:
|
||||||
|
Translate: {x: -1.5, y: 1.5, z: -7.5}
|
||||||
|
Rotate: {x: 0, y: -3.14159274, z: 0}
|
||||||
|
Scale: {x: 1, y: 1, z: 1}
|
||||||
|
IsActive: true
|
||||||
|
Camera Component:
|
||||||
|
Position: {x: -0.24528563, y: 1.5, z: -7.5}
|
||||||
|
Pitch: 0
|
||||||
|
Yaw: -180
|
||||||
|
Roll: 0
|
||||||
|
Width: 1920
|
||||||
|
Near: 0.00999999978
|
||||||
|
Far: 10000
|
||||||
|
Perspective: true
|
||||||
|
FOV: 90
|
||||||
|
IsActive: true
|
||||||
|
Scripts: ~
|
||||||
|
- EID: 451
|
||||||
|
Name: PreviewLevel3
|
||||||
|
IsActive: true
|
||||||
|
NumberOfChildren: 0
|
||||||
|
Components:
|
||||||
|
Transform Component:
|
||||||
|
Translate: {x: 2.5, y: 1.5, z: -7.5}
|
||||||
|
Rotate: {x: 0, y: 4.71238899, z: 0}
|
||||||
|
Scale: {x: 1, y: 1, z: 1}
|
||||||
|
IsActive: true
|
||||||
|
Camera Component:
|
||||||
|
Position: {x: 2.5, y: 1.5, z: -7.5}
|
||||||
|
Pitch: 0
|
||||||
|
Yaw: 270
|
||||||
|
Roll: 0
|
||||||
|
Width: 1920
|
||||||
|
Near: 0.00999999978
|
||||||
|
Far: 10000
|
||||||
|
Perspective: true
|
||||||
|
FOV: 90
|
||||||
|
IsActive: true
|
||||||
|
Scripts: ~
|
||||||
|
- EID: 458
|
||||||
|
Name: PauseCanvas
|
||||||
|
IsActive: false
|
||||||
|
NumberOfChildren: 4
|
||||||
|
Components:
|
||||||
|
Canvas Component:
|
||||||
|
Canvas Width: 1920
|
||||||
|
Canvas Height: 1080
|
||||||
|
Scale by canvas width: false
|
||||||
|
IsActive: false
|
||||||
|
Scripts: ~
|
||||||
|
- EID: 457
|
||||||
|
Name: ResumeButton
|
||||||
|
IsActive: true
|
||||||
|
NumberOfChildren: 0
|
||||||
|
Components:
|
||||||
|
Transform Component:
|
||||||
|
Translate: {x: 0, y: 100, z: 0}
|
||||||
|
Rotate: {x: 0, y: 0, z: 0}
|
||||||
|
Scale: {x: 300, y: 200, z: 500}
|
||||||
|
IsActive: true
|
||||||
|
Renderable Component:
|
||||||
|
Mesh: 141771688
|
||||||
|
Material: 129340704
|
||||||
|
IsActive: true
|
||||||
|
Button Component:
|
||||||
|
Default Texture: 63979907
|
||||||
|
Hovered Texture: 51379325
|
||||||
|
Clicked Texture: 66788278
|
||||||
|
IsActive: true
|
||||||
|
UI Component:
|
||||||
|
Canvas ID: 458
|
||||||
|
Hovered: false
|
||||||
|
Clicked: false
|
||||||
|
IsActive: true
|
||||||
|
Scripts: ~
|
||||||
|
- EID: 456
|
||||||
|
Name: QuitButton
|
||||||
|
IsActive: true
|
||||||
|
NumberOfChildren: 0
|
||||||
|
Components:
|
||||||
|
Transform Component:
|
||||||
|
Translate: {x: 0, y: -300, z: 0}
|
||||||
|
Rotate: {x: 0, y: 0, z: 0}
|
||||||
|
Scale: {x: 300, y: 200, z: 500}
|
||||||
|
IsActive: true
|
||||||
|
Renderable Component:
|
||||||
|
Mesh: 141771688
|
||||||
|
Material: 129340704
|
||||||
|
IsActive: true
|
||||||
|
Button Component:
|
||||||
|
Default Texture: 61602036
|
||||||
|
Hovered Texture: 58910810
|
||||||
|
Clicked Texture: 57786063
|
||||||
|
IsActive: true
|
||||||
|
UI Component:
|
||||||
|
Canvas ID: 458
|
||||||
|
Hovered: false
|
||||||
|
Clicked: false
|
||||||
|
IsActive: true
|
||||||
|
Scripts: ~
|
||||||
|
- EID: 455
|
||||||
|
Name: RetryButton
|
||||||
|
IsActive: true
|
||||||
|
NumberOfChildren: 0
|
||||||
|
Components:
|
||||||
|
Transform Component:
|
||||||
|
Translate: {x: 0, y: -100, z: 0}
|
||||||
|
Rotate: {x: 0, y: 0, z: 0}
|
||||||
|
Scale: {x: 300, y: 200, z: 500}
|
||||||
|
IsActive: true
|
||||||
|
Renderable Component:
|
||||||
|
Mesh: 141771688
|
||||||
|
Material: 129340704
|
||||||
|
IsActive: true
|
||||||
|
Button Component:
|
||||||
|
Default Texture: 64806384
|
||||||
|
Hovered Texture: 58347825
|
||||||
|
Clicked Texture: 63234380
|
||||||
|
IsActive: true
|
||||||
|
UI Component:
|
||||||
|
Canvas ID: 458
|
||||||
|
Hovered: false
|
||||||
|
Clicked: false
|
||||||
|
IsActive: true
|
||||||
|
Scripts: ~
|
||||||
|
- EID: 454
|
||||||
|
Name: GamePauseText
|
||||||
|
IsActive: true
|
||||||
|
NumberOfChildren: 0
|
||||||
|
Components:
|
||||||
|
Transform Component:
|
||||||
|
Translate: {x: -250, y: 300, z: 0.100000001}
|
||||||
|
Rotate: {x: 0, y: 0, z: 0}
|
||||||
|
Scale: {x: 100, y: 100, z: 100}
|
||||||
|
IsActive: true
|
||||||
|
Text Renderer Component:
|
||||||
|
Text: Game Pause
|
||||||
|
Font: 176667660
|
||||||
|
Color: {x: 1, y: 1, z: 1, w: 1}
|
||||||
|
IsActive: false
|
||||||
|
UI Component:
|
||||||
|
Canvas ID: 458
|
||||||
|
Hovered: false
|
||||||
|
Clicked: false
|
||||||
|
IsActive: true
|
||||||
|
Scripts: ~
|
||||||
|
- EID: 450
|
||||||
Name: TransitionCanvas
|
Name: TransitionCanvas
|
||||||
IsActive: true
|
IsActive: true
|
||||||
NumberOfChildren: 1
|
NumberOfChildren: 1
|
||||||
|
@ -5301,22 +5320,22 @@
|
||||||
Scale by canvas width: false
|
Scale by canvas width: false
|
||||||
IsActive: true
|
IsActive: true
|
||||||
Scripts: ~
|
Scripts: ~
|
||||||
- EID: 459
|
- EID: 65982
|
||||||
Name: Transition
|
Name: Transition
|
||||||
IsActive: true
|
IsActive: true
|
||||||
NumberOfChildren: 0
|
NumberOfChildren: 0
|
||||||
Components:
|
Components:
|
||||||
Transform Component:
|
Transform Component:
|
||||||
Translate: {x: 0, y: 0, z: 0}
|
Translate: {x: 0, y: 0, z: 0.100000001}
|
||||||
Rotate: {x: 0, y: 0, z: 0}
|
Rotate: {x: 0, y: 0, z: 0}
|
||||||
Scale: {x: 1920, y: 1080, z: 1}
|
Scale: {x: 2500, y: 1080, z: 1}
|
||||||
IsActive: true
|
IsActive: true
|
||||||
Renderable Component:
|
Renderable Component:
|
||||||
Mesh: 141771688
|
Mesh: 141771688
|
||||||
Material: 120016136
|
Material: 120016136
|
||||||
IsActive: true
|
IsActive: true
|
||||||
UI Component:
|
UI Component:
|
||||||
Canvas ID: 461
|
Canvas ID: 450
|
||||||
Hovered: false
|
Hovered: false
|
||||||
Clicked: false
|
Clicked: false
|
||||||
IsActive: true
|
IsActive: true
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -113,7 +113,8 @@ public partial class LeafChase : BehaviourTreeNode
|
||||||
if (GetNodeData("isAlert") != null && (bool)GetNodeData("isAlert") == true)
|
if (GetNodeData("isAlert") != null && (bool)GetNodeData("isAlert") == true)
|
||||||
{
|
{
|
||||||
//AudioHandler.audioClipHandlers["BGMAdpative"].SetParameter("Detected", 0.0f);
|
//AudioHandler.audioClipHandlers["BGMAdpative"].SetParameter("Detected", 0.0f);
|
||||||
Audio.SetParameter("Detected", 0.0f);
|
//Audio.SetParameter("Detected", 0.0f);
|
||||||
|
Audio.SetParameterWithLabel("PlayerDetection", "Undetected");
|
||||||
AudioHandler.audioClipHandlers["SFXHumming"].Play();
|
AudioHandler.audioClipHandlers["SFXHumming"].Play();
|
||||||
}
|
}
|
||||||
SetNodeData("isAlert", false);
|
SetNodeData("isAlert", false);
|
||||||
|
|
|
@ -245,7 +245,8 @@ public partial class LeafPatrol : BehaviourTreeNode
|
||||||
AudioHandler.audioClipHandlers["SFXHumming"].Play();
|
AudioHandler.audioClipHandlers["SFXHumming"].Play();
|
||||||
//AudioHandler.audioClipHandlers["BGMUnalert"].Play();
|
//AudioHandler.audioClipHandlers["BGMUnalert"].Play();
|
||||||
//AudioHandler.audioClipHandlers["BGMAdaptive"].SetParameter("Detected", 0.0f);
|
//AudioHandler.audioClipHandlers["BGMAdaptive"].SetParameter("Detected", 0.0f);
|
||||||
Audio.SetParameter("Detected", 0.0f);
|
//Audio.SetParameter("Detected", 0.0f);
|
||||||
|
Audio.SetParameterWithLabel("PlayerDetection", "Undetected");
|
||||||
}
|
}
|
||||||
SetNodeData("isAlert", false);
|
SetNodeData("isAlert", false);
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,6 +26,7 @@ public partial class LeafSearch : BehaviourTreeNode
|
||||||
private Vector3 eyeOffset;
|
private Vector3 eyeOffset;
|
||||||
private float sightDistance;
|
private float sightDistance;
|
||||||
private GameObject? player; //To be searched for and marked
|
private GameObject? player; //To be searched for and marked
|
||||||
|
private bool screamOnce;
|
||||||
}
|
}
|
||||||
|
|
||||||
//FUNCTIONS HERE
|
//FUNCTIONS HERE
|
||||||
|
@ -67,7 +68,8 @@ public partial class LeafSearch : BehaviourTreeNode
|
||||||
if (GetNodeData("isAlert") != null && (bool)GetNodeData("isAlert") == true)
|
if (GetNodeData("isAlert") != null && (bool)GetNodeData("isAlert") == true)
|
||||||
{
|
{
|
||||||
//AudioHandler.audioClipHandlers["BGMAdaptive"].SetParameter("Detected", 0.0f);
|
//AudioHandler.audioClipHandlers["BGMAdaptive"].SetParameter("Detected", 0.0f);
|
||||||
Audio.SetParameter("Detected", 0.0f);
|
//Audio.SetParameter("Detected", 0.0f);
|
||||||
|
Audio.SetParameterWithLabel("PlayerDetection", "Undetected");
|
||||||
AudioHandler.audioClipHandlers["SFXHumming"].Play();
|
AudioHandler.audioClipHandlers["SFXHumming"].Play();
|
||||||
reevaluateWaypoint();
|
reevaluateWaypoint();
|
||||||
}
|
}
|
||||||
|
@ -97,6 +99,7 @@ public partial class LeafSearch : BehaviourTreeNode
|
||||||
|
|
||||||
//Search for player
|
//Search for player
|
||||||
player = GameObject.Find("Player");
|
player = GameObject.Find("Player");
|
||||||
|
screamOnce = false;
|
||||||
|
|
||||||
//Automatically fail if no player is found
|
//Automatically fail if no player is found
|
||||||
if (player == null)
|
if (player == null)
|
||||||
|
@ -188,31 +191,41 @@ public partial class LeafSearch : BehaviourTreeNode
|
||||||
if (GetNodeData("isAlert") == null)
|
if (GetNodeData("isAlert") == null)
|
||||||
{
|
{
|
||||||
SetNodeData("isAlert", true);
|
SetNodeData("isAlert", true);
|
||||||
|
screamOnce = true;
|
||||||
//Audio.StopAllSounds();
|
//Audio.StopAllSounds();
|
||||||
AudioHandler.audioClipHandlers["SFXDetectAh"].Play();
|
//AudioHandler.audioClipHandlers["SFXDetectAh"].Play();
|
||||||
AudioHandler.audioClipHandlers["SFXDetectSting"].Play();
|
AudioHandler.audioClipHandlers["SFXDetectSting"].Play();
|
||||||
//AudioHandler.audioClipHandlers["BGMAlert"].Play();
|
//AudioHandler.audioClipHandlers["BGMAlert"].Play();
|
||||||
AudioHandler.audioClipHandlers["SFXHumming"].Stop(false);
|
AudioHandler.audioClipHandlers["SFXHumming"].Stop(false);
|
||||||
//AudioHandler.audioClipHandlers["BGMUnalert"].Stop(true);
|
//AudioHandler.audioClipHandlers["BGMUnalert"].Stop(true);
|
||||||
//AudioHandler.audioClipHandlers["BGMAdaptive"].SetParameter("Detected", 1.0f);
|
//AudioHandler.audioClipHandlers["BGMAdaptive"].SetParameter("Detected", 1.0f);
|
||||||
Audio.SetParameter("Detected", 1.0f);
|
//Audio.SetParameter("Detected", 1.0f);
|
||||||
|
Audio.SetParameterWithLabel("PlayerDetection", "Detected");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (GetNodeData("isAlert") != null && (bool)GetNodeData("isAlert") == false)
|
if (GetNodeData("isAlert") != null && (bool)GetNodeData("isAlert") == false)
|
||||||
{
|
{
|
||||||
//Audio.StopAllSounds();
|
//Audio.StopAllSounds();
|
||||||
AudioHandler.audioClipHandlers["SFXDetectAh"].Play();
|
screamOnce = true;
|
||||||
|
//AudioHandler.audioClipHandlers["SFXDetectAh"].Play();
|
||||||
AudioHandler.audioClipHandlers["SFXDetectSting"].Play();
|
AudioHandler.audioClipHandlers["SFXDetectSting"].Play();
|
||||||
//AudioHandler.audioClipHandlers["BGMAlert"].Play();
|
//AudioHandler.audioClipHandlers["BGMAlert"].Play();
|
||||||
AudioHandler.audioClipHandlers["SFXHumming"].Stop(false);
|
AudioHandler.audioClipHandlers["SFXHumming"].Stop(false);
|
||||||
//AudioHandler.audioClipHandlers["BGMUnalert"].Stop(true);
|
//AudioHandler.audioClipHandlers["BGMUnalert"].Stop(true);
|
||||||
//AudioHandler.audioClipHandlers["BGMAdaptive"].SetParameter("Detected", 1.0f);
|
//AudioHandler.audioClipHandlers["BGMAdaptive"].SetParameter("Detected", 1.0f);
|
||||||
Audio.SetParameter("Detected", 1.0f);
|
//Audio.SetParameter("Detected", 1.0f);
|
||||||
|
Audio.SetParameterWithLabel("PlayerDetection", "Detected");
|
||||||
}
|
}
|
||||||
SetNodeData("isAlert", true);
|
SetNodeData("isAlert", true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (screamOnce)
|
||||||
|
{
|
||||||
|
screamOnce = false;
|
||||||
|
AudioHandler.audioClipHandlers["SFXDetectAh"].Play();
|
||||||
|
}
|
||||||
|
|
||||||
status = BehaviourTreeNodeStatus.SUCCESS;
|
status = BehaviourTreeNodeStatus.SUCCESS;
|
||||||
onExit(BehaviourTreeNodeStatus.SUCCESS);
|
onExit(BehaviourTreeNodeStatus.SUCCESS);
|
||||||
return status;
|
return status;
|
||||||
|
|
|
@ -28,11 +28,6 @@ public class PickAndThrow : Script
|
||||||
public bool throwItem = false;
|
public bool throwItem = false;
|
||||||
private Vector3 prevTargetOffSet;
|
private Vector3 prevTargetOffSet;
|
||||||
|
|
||||||
public GameObject silhouettePlayer;
|
|
||||||
public Renderable silhouettePlayerRend;
|
|
||||||
public GameObject silhouetteBag;
|
|
||||||
public Renderable silhouetteBagRend;
|
|
||||||
|
|
||||||
[Tooltip("Lenght of ray")]
|
[Tooltip("Lenght of ray")]
|
||||||
public float rayDistance = 1;
|
public float rayDistance = 1;
|
||||||
|
|
||||||
|
@ -58,41 +53,17 @@ public class PickAndThrow : Script
|
||||||
if(!tpc)
|
if(!tpc)
|
||||||
Debug.LogError("TPC EMPTY");
|
Debug.LogError("TPC EMPTY");
|
||||||
|
|
||||||
if(!silhouettePlayer)
|
|
||||||
Debug.LogError("silhouettePlayer EMPTY");
|
|
||||||
else
|
|
||||||
silhouettePlayerRend = silhouettePlayer.GetComponent<Renderable>();
|
|
||||||
|
|
||||||
if (!silhouetteBag)
|
|
||||||
Debug.LogError("silhouetteBag EMPTY");
|
|
||||||
else
|
|
||||||
silhouetteBagRend = silhouetteBag.GetComponent<Renderable>();
|
|
||||||
|
|
||||||
AudioHandler.audioClipHandlers["SFXThrow"] = Audio.CreateAudioClip("event:/Raccoon/raccoon_throw");
|
AudioHandler.audioClipHandlers["SFXThrow"] = Audio.CreateAudioClip("event:/Raccoon/raccoon_throw");
|
||||||
|
|
||||||
timer = delayTimer;
|
timer = delayTimer;
|
||||||
}
|
}
|
||||||
protected override void update()
|
protected override void update()
|
||||||
{
|
{
|
||||||
if (GameManager.Instance.GamePause)
|
if (GameManager.Instance.GamePause || !GameManager.Instance.stealFoodPopUpDone)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (silhouettePlayerRend && silhouetteBagRend)
|
|
||||||
{
|
|
||||||
//wait for daniel
|
|
||||||
//0.00075f;
|
|
||||||
Vector3 dis = Camera.GetMainCamera().Position - GameObject.GetComponent<Transform>().LocalPosition;
|
|
||||||
float disSqr = dis.GetSqrMagnitude();
|
|
||||||
float ratio = System.Math.Clamp(1 - (disSqr / (1 + disSqr)), 0, 1.0f);
|
|
||||||
float temp = (1 - ratio) * 0.00075f;
|
|
||||||
if (temp <= 0.0006f)
|
|
||||||
temp = 0.1f;
|
|
||||||
silhouettePlayerRend.Material.SetProperty<float>("data.offset", temp);
|
|
||||||
silhouetteBagRend.Material.SetProperty<float>("data.offset", temp);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (timer <= delayTimer)
|
if (timer <= delayTimer)
|
||||||
timer += Time.DeltaTimeF;
|
timer += Time.DeltaTimeF;
|
||||||
|
|
||||||
|
@ -171,7 +142,7 @@ public class PickAndThrow : Script
|
||||||
|
|
||||||
protected override void fixedUpdate()
|
protected override void fixedUpdate()
|
||||||
{
|
{
|
||||||
if (GameManager.Instance.GamePause)
|
if (GameManager.Instance.GamePause || !GameManager.Instance.stealFoodPopUpDone)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,15 +17,6 @@ public class PlayerController : Script
|
||||||
TOTAL
|
TOTAL
|
||||||
}
|
}
|
||||||
|
|
||||||
/* public enum WalkingState
|
|
||||||
{
|
|
||||||
CARRY,
|
|
||||||
AIMING,
|
|
||||||
THROW,
|
|
||||||
WALK,
|
|
||||||
TOTAL
|
|
||||||
}*/
|
|
||||||
|
|
||||||
public RigidBody rb { get; set; }
|
public RigidBody rb { get; set; }
|
||||||
public Transform tranform { get; set; }
|
public Transform tranform { get; set; }
|
||||||
public Camera cam { get; set; }
|
public Camera cam { get; set; }
|
||||||
|
@ -85,6 +76,12 @@ public class PlayerController : Script
|
||||||
[Tooltip("How heavy item will affect player jump")]
|
[Tooltip("How heavy item will affect player jump")]
|
||||||
public float heavyMultiper = 0.25f;
|
public float heavyMultiper = 0.25f;
|
||||||
|
|
||||||
|
//silhouette=====================================================================
|
||||||
|
public GameObject silhouettePlayer;
|
||||||
|
public Renderable silhouettePlayerRend;
|
||||||
|
public GameObject silhouetteBag;
|
||||||
|
public Renderable silhouetteBagRend;
|
||||||
|
|
||||||
protected override void awake()
|
protected override void awake()
|
||||||
{
|
{
|
||||||
//default setup
|
//default setup
|
||||||
|
@ -119,6 +116,21 @@ public class PlayerController : Script
|
||||||
dictionary.Add(typeof(PlayerCaughtState), new PlayerCaughtState(stateMachine));
|
dictionary.Add(typeof(PlayerCaughtState), new PlayerCaughtState(stateMachine));
|
||||||
stateMachine.InitStateMachine(dictionary);
|
stateMachine.InitStateMachine(dictionary);
|
||||||
|
|
||||||
|
if (!silhouettePlayer)
|
||||||
|
Debug.LogError("silhouettePlayer EMPTY");
|
||||||
|
else
|
||||||
|
{
|
||||||
|
silhouettePlayerRend = silhouettePlayer.GetComponent<Renderable>();
|
||||||
|
silhouettePlayerRend.Material.SetProperty<float>("data.offset", 0.1f);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!silhouetteBag)
|
||||||
|
Debug.LogError("silhouetteBag EMPTY");
|
||||||
|
else
|
||||||
|
{
|
||||||
|
silhouetteBagRend = silhouetteBag.GetComponent<Renderable>();
|
||||||
|
silhouetteBagRend.Material.SetProperty<float>("data.offset", 0.1f);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void lateUpdate()
|
protected override void lateUpdate()
|
||||||
|
@ -127,26 +139,23 @@ public class PlayerController : Script
|
||||||
|
|
||||||
protected override void update()
|
protected override void update()
|
||||||
{
|
{
|
||||||
if (GameManager.Instance.GamePause)
|
if (GameManager.Instance.GamePause || !GameManager.Instance.stealFoodPopUpDone)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (delayTimer <= 1)
|
if (silhouettePlayerRend && silhouetteBagRend)
|
||||||
delayTimer += Time.DeltaTimeF;
|
{
|
||||||
|
Vector3 dis = Camera.GetMainCamera().Position - GameObject.GetComponent<Transform>().LocalPosition;
|
||||||
|
float disSqr = dis.GetSqrMagnitude();
|
||||||
|
float ratio = System.Math.Clamp(1 - (disSqr / (1 + disSqr)), 0, 1.0f);
|
||||||
|
float temp = (1 - ratio) * 0.00075f;
|
||||||
|
if (temp <= 0.0006f)
|
||||||
|
temp = 0.1f;
|
||||||
|
silhouettePlayerRend.Material.SetProperty<float>("data.offset", temp);
|
||||||
|
silhouetteBagRend.Material.SetProperty<float>("data.offset", temp);
|
||||||
|
}
|
||||||
|
|
||||||
if (delayTimer < 1)
|
|
||||||
{
|
|
||||||
if (tranform && respawnPoint && rb)
|
|
||||||
{
|
|
||||||
rb.LinearVelocity = Vector3.Zero;
|
|
||||||
tranform.LocalPosition = respawnPoint.GetComponent<Transform>().LocalPosition;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
rb.FreezePositionY = false;
|
|
||||||
}
|
|
||||||
//PickAndThrow check
|
//PickAndThrow check
|
||||||
if (!pat)
|
if (!pat)
|
||||||
{
|
{
|
||||||
|
@ -156,13 +165,15 @@ public class PlayerController : Script
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!cam)
|
if (!cam)
|
||||||
|
{
|
||||||
cam = GetComponentInChildren<Camera>();
|
cam = GetComponentInChildren<Camera>();
|
||||||
|
if(pat)
|
||||||
|
cam.FOV = pat.defaultFOV;
|
||||||
|
}
|
||||||
if(!camArm)
|
if(!camArm)
|
||||||
camArm = GetComponentInChildren<CameraArm>();
|
camArm = GetComponentInChildren<CameraArm>();
|
||||||
|
|
||||||
//tempFix
|
|
||||||
if (tranform)
|
|
||||||
tranform.LocalEulerAngles = new Vector3(0.0f, tranform.LocalEulerAngles.y, 0.0f);
|
|
||||||
|
|
||||||
GotCaught();
|
GotCaught();
|
||||||
Rotation();
|
Rotation();
|
||||||
|
@ -178,7 +189,7 @@ public class PlayerController : Script
|
||||||
|
|
||||||
protected override void fixedUpdate()
|
protected override void fixedUpdate()
|
||||||
{
|
{
|
||||||
if (GameManager.Instance.GamePause)
|
if (GameManager.Instance.GamePause || !GameManager.Instance.stealFoodPopUpDone)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -333,10 +344,11 @@ public class PlayerController : Script
|
||||||
|
|
||||||
private void Rotation()
|
private void Rotation()
|
||||||
{
|
{
|
||||||
|
tranform.LocalEulerAngles = new Vector3(0.0f, tranform.LocalEulerAngles.y, 0.0f);
|
||||||
if (isMoveKeyPress && tranform && !isAiming)
|
if (isMoveKeyPress && tranform && !isAiming)
|
||||||
{
|
{
|
||||||
Quaternion currentRotation = tranform.LocalRotation;
|
Quaternion currentRotation = tranform.LocalRotation;
|
||||||
Quaternion targetRotation = Quaternion.LookRotation(new Vector3(axisMove.x, 0.0f, axisMove.y), new Vector3(0.0f, 1.0f, 0.0f));
|
Quaternion targetRotation = Quaternion.LookRotation(new Vector3(axisMove.x, 0.0f, axisMove.y), Vector3.Up);
|
||||||
tranform.LocalRotation = Quaternion.Slerp(currentRotation, targetRotation, rotationFactorPerFrame * (float)Time.FixedDeltaTime);
|
tranform.LocalRotation = Quaternion.Slerp(currentRotation, targetRotation, rotationFactorPerFrame * (float)Time.FixedDeltaTime);
|
||||||
}
|
}
|
||||||
else if (camArm && tranform && isAiming)
|
else if (camArm && tranform && isAiming)
|
||||||
|
@ -345,6 +357,7 @@ public class PlayerController : Script
|
||||||
Quaternion targetRotation = Quaternion.Euler(0.0f, SHADE.Math.DegreesToRadians(camArm.Yaw + 180.0f), 0.0f);
|
Quaternion targetRotation = Quaternion.Euler(0.0f, SHADE.Math.DegreesToRadians(camArm.Yaw + 180.0f), 0.0f);
|
||||||
tranform.LocalRotation = Quaternion.Slerp(currentRotation, targetRotation, rotationFactorPerFrame * (float)Time.FixedDeltaTime);
|
tranform.LocalRotation = Quaternion.Slerp(currentRotation, targetRotation, rotationFactorPerFrame * (float)Time.FixedDeltaTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Gravity()
|
private void Gravity()
|
||||||
|
|
|
@ -41,7 +41,7 @@ namespace SHADE_Scripting
|
||||||
|
|
||||||
protected override void update()
|
protected override void update()
|
||||||
{
|
{
|
||||||
if (GameManager.Instance.GamePause)
|
if (GameManager.Instance.GamePause || !GameManager.Instance.stealFoodPopUpDone)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,6 +41,8 @@ public class GameManager : Script
|
||||||
public static GameManager Instance { get; private set; }
|
public static GameManager Instance { get; private set; }
|
||||||
|
|
||||||
public bool GamePause { get; set; }
|
public bool GamePause { get; set; }
|
||||||
|
public bool stealFoodPopUpDone { get; set; }
|
||||||
|
public bool PreviewLevelDone { get; set; }
|
||||||
|
|
||||||
public bool itemShatter { get; set; }
|
public bool itemShatter { get; set; }
|
||||||
|
|
||||||
|
@ -63,20 +65,28 @@ public class GameManager : Script
|
||||||
currMultiplierDuration = 0;
|
currMultiplierDuration = 0;
|
||||||
fontScalar = new Vector3(multiplierFont / maxMultiplierDuration, multiplierFont / maxMultiplierDuration , multiplierFont / maxMultiplierDuration);
|
fontScalar = new Vector3(multiplierFont / maxMultiplierDuration, multiplierFont / maxMultiplierDuration , multiplierFont / maxMultiplierDuration);
|
||||||
itemShatter = false;
|
itemShatter = false;
|
||||||
|
GamePause = false;
|
||||||
|
stealFoodPopUpDone = false;
|
||||||
|
PreviewLevelDone = false;
|
||||||
|
|
||||||
AudioHandler.audioClipHandlers["BGMWin"] = Audio.CreateAudioClip("event:/Music/stingers/game_win");
|
AudioHandler.audioClipHandlers["BGMWin"] = Audio.CreateAudioClip("event:/Music/stingers/game_win");
|
||||||
AudioHandler.audioClipHandlers["BGMLose"] = Audio.CreateAudioClip("event:/Music/stingers/game_lose");
|
AudioHandler.audioClipHandlers["BGMLose"] = Audio.CreateAudioClip("event:/Music/stingers/game_lose");
|
||||||
|
|
||||||
goingToWin = false;
|
goingToWin = false;
|
||||||
goingToLose = false;
|
goingToLose = false;
|
||||||
|
|
||||||
|
if (scoreText)
|
||||||
|
scoreText.GetComponent<TextRenderable>().Text = $"Score: {Score}";
|
||||||
|
if (timeText)
|
||||||
|
timeText.GetComponent<TextRenderable>().Text = $"Time Left: {timer.ToString("0")}";
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void start()
|
protected override void start()
|
||||||
{
|
{
|
||||||
AudioHandler.audioClipHandlers["BGMAdaptive"] = Audio.CreateAudioClip("event:/Music/bgm_adaptive");
|
AudioHandler.audioClipHandlers["BGMAdaptive"] = Audio.CreateAudioClip("event:/Music/bgm_adaptive_new");
|
||||||
AudioHandler.audioClipHandlers["BGMAdaptive"].Play();
|
AudioHandler.audioClipHandlers["BGMAdaptive"].Play();
|
||||||
|
|
||||||
Audio.SetParameter("Detected", 0.0f);
|
Audio.SetParameterWithLabel("PlayerDetection", "Undetected");
|
||||||
|
|
||||||
AudioHandler.audioClipHandlers["KitchenAmbience"] = Audio.CreateAudioClip("event:/Ambience/roomtone_kitchen");
|
AudioHandler.audioClipHandlers["KitchenAmbience"] = Audio.CreateAudioClip("event:/Ambience/roomtone_kitchen");
|
||||||
AudioHandler.audioClipHandlers["KitchenAmbience"].Play();
|
AudioHandler.audioClipHandlers["KitchenAmbience"].Play();
|
||||||
|
@ -85,23 +95,29 @@ public class GameManager : Script
|
||||||
AudioHandler.audioClipHandlers["SFXHumming"].SetVolume(0.15f);
|
AudioHandler.audioClipHandlers["SFXHumming"].SetVolume(0.15f);
|
||||||
AudioHandler.audioClipHandlers["SFXHumming"].Play();
|
AudioHandler.audioClipHandlers["SFXHumming"].Play();
|
||||||
|
|
||||||
|
if (SceneFadeInOut.Instance != null)
|
||||||
SceneFadeInOut.Instance.CallFadeOut();
|
SceneFadeInOut.Instance.CallFadeOut();
|
||||||
|
Application.IsCursorVisible = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void update()
|
protected override void update()
|
||||||
{
|
{
|
||||||
if (GamePause)
|
if (GamePause || !stealFoodPopUpDone)
|
||||||
{
|
{
|
||||||
|
Input.SetMouseCentering(false);
|
||||||
|
//Application.IsCursorVisible = true;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (currGameState == GameState.START)
|
if (currGameState == GameState.START)
|
||||||
{
|
{
|
||||||
|
Input.SetMouseCentering(true);
|
||||||
|
|
||||||
timer -= Time.DeltaTimeF;
|
timer -= Time.DeltaTimeF;
|
||||||
if(scoreText)
|
if(scoreText)
|
||||||
scoreText.GetComponent<TextRenderable>().Text = $"{Score}";
|
scoreText.GetComponent<TextRenderable>().Text = $"{Score}";
|
||||||
if(timeText)
|
if(timeText)
|
||||||
timeText.GetComponent<TextRenderable>().Text = $"Time Left: {timer.ToString("0.00")}";
|
timeText.GetComponent<TextRenderable>().Text = $"Time Left: {timer.ToString("0")}";
|
||||||
|
|
||||||
if (itemScored)
|
if (itemScored)
|
||||||
{
|
{
|
||||||
|
@ -128,6 +144,7 @@ public class GameManager : Script
|
||||||
AudioHandler.StopAllSounds(false);
|
AudioHandler.StopAllSounds(false);
|
||||||
AudioHandler.audioClipHandlers["BGMWin"].Play();
|
AudioHandler.audioClipHandlers["BGMWin"].Play();
|
||||||
goingToWin = true;
|
goingToWin = true;
|
||||||
|
if (SceneFadeInOut.Instance != null)
|
||||||
SceneFadeInOut.Instance.CallFadeIn();
|
SceneFadeInOut.Instance.CallFadeIn();
|
||||||
}
|
}
|
||||||
else if(!goingToWin && (timer < 0 || Input.GetKeyDown(Input.KeyCode.F2)))
|
else if(!goingToWin && (timer < 0 || Input.GetKeyDown(Input.KeyCode.F2)))
|
||||||
|
@ -136,11 +153,14 @@ public class GameManager : Script
|
||||||
AudioHandler.StopAllSounds(false);
|
AudioHandler.StopAllSounds(false);
|
||||||
AudioHandler.audioClipHandlers["BGMLose"].Play();
|
AudioHandler.audioClipHandlers["BGMLose"].Play();
|
||||||
goingToLose = true;
|
goingToLose = true;
|
||||||
|
if (SceneFadeInOut.Instance != null)
|
||||||
SceneFadeInOut.Instance.CallFadeIn();
|
SceneFadeInOut.Instance.CallFadeIn();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//Handling transitions
|
//Handling transitions
|
||||||
|
if (SceneFadeInOut.Instance != null)
|
||||||
|
{
|
||||||
if (SceneFadeInOut.Instance.FadeInFinished())
|
if (SceneFadeInOut.Instance.FadeInFinished())
|
||||||
{
|
{
|
||||||
if (goingToWin)
|
if (goingToWin)
|
||||||
|
@ -153,6 +173,18 @@ public class GameManager : Script
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (goingToWin)
|
||||||
|
{
|
||||||
|
SceneManager.ChangeScene(winScene);
|
||||||
|
}
|
||||||
|
if (goingToLose)
|
||||||
|
{
|
||||||
|
SceneManager.ChangeScene(loseScene);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
protected override void onDestroy()
|
protected override void onDestroy()
|
||||||
{
|
{
|
||||||
|
|
|
@ -0,0 +1,158 @@
|
||||||
|
using SHADE;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
|
||||||
|
|
||||||
|
namespace SHADE_Scripting.UI
|
||||||
|
{
|
||||||
|
public class PreviewLevel : Script
|
||||||
|
{
|
||||||
|
private List<Camera> listOfCamera;
|
||||||
|
|
||||||
|
public Vector3 endPoint1;
|
||||||
|
public Vector3 endPoint2;
|
||||||
|
public Vector3 endPoint3;
|
||||||
|
|
||||||
|
public GameObject playerCamera;
|
||||||
|
public float duration = 3.0f;
|
||||||
|
|
||||||
|
private bool point1Done = false;
|
||||||
|
private bool point2Done = false;
|
||||||
|
private bool point3Done = false;
|
||||||
|
|
||||||
|
private bool reset2 = true;
|
||||||
|
private bool reset3 = true;
|
||||||
|
|
||||||
|
private bool skip = false;
|
||||||
|
[NonSerialized]
|
||||||
|
private TweenThreadVec3 moveToEndPoint1;
|
||||||
|
[NonSerialized]
|
||||||
|
private TweenThreadVec3 moveToEndPoint2;
|
||||||
|
[NonSerialized]
|
||||||
|
private TweenThreadVec3 moveToEndPoint3;
|
||||||
|
|
||||||
|
protected override void awake()
|
||||||
|
{
|
||||||
|
listOfCamera = GameObject.GetComponentsInChildren<Camera>().ToList();
|
||||||
|
|
||||||
|
if (listOfCamera.Count == 0)
|
||||||
|
Debug.LogError("EMPTY PREVIEW POINTS");
|
||||||
|
|
||||||
|
listOfCamera[0].SetMainCamera();
|
||||||
|
|
||||||
|
moveToEndPoint1 = TweenManager.CreateTweenThreadVec3(duration, listOfCamera[0].GetComponent<Transform>().LocalPosition, endPoint1, EASING_METHOD.EASE_IN_SINE);
|
||||||
|
moveToEndPoint2 = TweenManager.CreateTweenThreadVec3(duration, listOfCamera[1].GetComponent<Transform>().LocalPosition, endPoint2, EASING_METHOD.EASE_IN_SINE);
|
||||||
|
moveToEndPoint3 = TweenManager.CreateTweenThreadVec3(duration, listOfCamera[2].GetComponent<Transform>().LocalPosition, endPoint3, EASING_METHOD.EASE_IN_SINE);
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void update()
|
||||||
|
{
|
||||||
|
if (!SceneFadeInOut.Instance.FadeOutFinished() && !point1Done)
|
||||||
|
{
|
||||||
|
moveToEndPoint1.Reset();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Input.GetKeyUp(Input.KeyCode.Space))
|
||||||
|
{
|
||||||
|
skip = true;
|
||||||
|
point1Done = true;
|
||||||
|
SceneFadeInOut.Instance.CallFadeIn();
|
||||||
|
SceneFadeInOut.Instance.alphaValue = 0.01f;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (skip && SceneFadeInOut.Instance.FadeInFinished())
|
||||||
|
{
|
||||||
|
playerCamera.GetComponent<Camera>().SetMainCamera();
|
||||||
|
SceneFadeInOut.Instance.CallFadeOut();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (skip && SceneFadeInOut.Instance.FadeOutFinished())
|
||||||
|
{
|
||||||
|
GameManager.Instance.PreviewLevelDone = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if (!skip)
|
||||||
|
{
|
||||||
|
if (!point1Done)
|
||||||
|
{
|
||||||
|
listOfCamera[0].GetComponent<Transform>().LocalPosition = moveToEndPoint1.GetValue();
|
||||||
|
if (moveToEndPoint1.IsCompleted())
|
||||||
|
{
|
||||||
|
point1Done = true;
|
||||||
|
SceneFadeInOut.Instance.CallFadeIn();
|
||||||
|
SceneFadeInOut.Instance.alphaValue = 0.01f;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (SceneFadeInOut.Instance.FadeInFinished() && point1Done)
|
||||||
|
{
|
||||||
|
listOfCamera[1].SetMainCamera();
|
||||||
|
SceneFadeInOut.Instance.CallFadeOut();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (SceneFadeInOut.Instance.FadeOutFinished() && point1Done)
|
||||||
|
{
|
||||||
|
if (!point2Done)
|
||||||
|
{
|
||||||
|
if (reset2)
|
||||||
|
{
|
||||||
|
moveToEndPoint2.Reset();
|
||||||
|
reset2 = false;
|
||||||
|
}
|
||||||
|
listOfCamera[1].GetComponent<Transform>().LocalPosition = moveToEndPoint2.GetValue();
|
||||||
|
if (moveToEndPoint2.IsCompleted())
|
||||||
|
{
|
||||||
|
point2Done = true;
|
||||||
|
SceneFadeInOut.Instance.CallFadeIn();
|
||||||
|
SceneFadeInOut.Instance.alphaValue = 0.01f;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (SceneFadeInOut.Instance.FadeInFinished() && point2Done)
|
||||||
|
{
|
||||||
|
listOfCamera[2].SetMainCamera();
|
||||||
|
SceneFadeInOut.Instance.CallFadeOut();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (SceneFadeInOut.Instance.FadeOutFinished() && point2Done)
|
||||||
|
{
|
||||||
|
if (!point3Done)
|
||||||
|
{
|
||||||
|
if (reset3)
|
||||||
|
{
|
||||||
|
moveToEndPoint3 = TweenManager.CreateTweenThreadVec3(duration, listOfCamera[2].GetComponent<Transform>().LocalPosition, endPoint3, EASING_METHOD.EASE_IN_SINE);
|
||||||
|
reset3 = false;
|
||||||
|
}
|
||||||
|
listOfCamera[2].GetComponent<Transform>().LocalPosition = moveToEndPoint3.GetValue();
|
||||||
|
if (moveToEndPoint3.IsCompleted())
|
||||||
|
{
|
||||||
|
point3Done = true;
|
||||||
|
SceneFadeInOut.Instance.CallFadeIn();
|
||||||
|
SceneFadeInOut.Instance.alphaValue = 0.01f;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (SceneFadeInOut.Instance.FadeInFinished() && point3Done)
|
||||||
|
{
|
||||||
|
playerCamera.GetComponent<Camera>().SetMainCamera();
|
||||||
|
SceneFadeInOut.Instance.CallFadeOut();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (SceneFadeInOut.Instance.FadeOutFinished() && point3Done)
|
||||||
|
{
|
||||||
|
GameManager.Instance.PreviewLevelDone = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
Name: SC_PreviewLevel
|
||||||
|
ID: 155897609
|
||||||
|
Type: 9
|
|
@ -52,12 +52,12 @@ namespace SHADE_Scripting.UI
|
||||||
|
|
||||||
private static float EaseInSine(float value)
|
private static float EaseInSine(float value)
|
||||||
{
|
{
|
||||||
return (float)(1.0f - Math.Cos((value * Math.PI) / 2.0f));
|
return (float)(1.0f - Math.Cos((value * Math.PI / 2.0f)));
|
||||||
}
|
}
|
||||||
|
|
||||||
private static float EaseOutSine(float value)
|
private static float EaseOutSine(float value)
|
||||||
{
|
{
|
||||||
return (float)(Math.Sin(value * Math.PI) / 2.0f);
|
return (float)(Math.Sin(value * Math.PI / 2.0f));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -22,13 +22,11 @@ public class ChangeSceneButton : Script
|
||||||
{
|
{
|
||||||
ui.OnRelease.RegisterAction(() =>
|
ui.OnRelease.RegisterAction(() =>
|
||||||
{
|
{
|
||||||
|
|
||||||
if (sceneID != 0)
|
if (sceneID != 0)
|
||||||
{
|
{
|
||||||
Audio.PlaySFXOnce2D("event:/UI/success");
|
Audio.PlaySFXOnce2D("event:/UI/success");
|
||||||
|
|
||||||
Audio.StopAllSounds();
|
Audio.StopAllSounds();
|
||||||
|
if (SceneFadeInOut.Instance != null)
|
||||||
SceneFadeInOut.Instance.CallFadeIn();
|
SceneFadeInOut.Instance.CallFadeIn();
|
||||||
clickedFlag = true;
|
clickedFlag = true;
|
||||||
}
|
}
|
||||||
|
@ -37,7 +35,6 @@ public class ChangeSceneButton : Script
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Debug.LogError("Failed to register button action for ChangeSceneButton.");
|
Debug.LogError("Failed to register button action for ChangeSceneButton.");
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
protected override void update()
|
protected override void update()
|
||||||
|
|
|
@ -409,7 +409,11 @@ public class Cutscene : Script
|
||||||
|
|
||||||
private void initCutscene1()
|
private void initCutscene1()
|
||||||
{
|
{
|
||||||
|
if(cutscene1Points)
|
||||||
listOfCutscene1Points = cutscene1Points.GetComponentsInChildren<Transform>().ToList();
|
listOfCutscene1Points = cutscene1Points.GetComponentsInChildren<Transform>().ToList();
|
||||||
|
else
|
||||||
|
Debug.LogError("Cutscene1Points Missing");
|
||||||
|
|
||||||
if (listOfCutscene1Points.Count == 0)
|
if (listOfCutscene1Points.Count == 0)
|
||||||
Debug.LogError("Cutscene1Points Empty");
|
Debug.LogError("Cutscene1Points Empty");
|
||||||
|
|
||||||
|
@ -455,7 +459,11 @@ public class Cutscene : Script
|
||||||
|
|
||||||
private void initCutscene2()
|
private void initCutscene2()
|
||||||
{
|
{
|
||||||
|
if(cutscene2Points)
|
||||||
listOfCutscene2Points = cutscene2Points.GetComponentsInChildren<Transform>().ToList();
|
listOfCutscene2Points = cutscene2Points.GetComponentsInChildren<Transform>().ToList();
|
||||||
|
else
|
||||||
|
Debug.LogError("cutscene2Points Missing");
|
||||||
|
|
||||||
if (listOfCutscene2Points.Count == 0)
|
if (listOfCutscene2Points.Count == 0)
|
||||||
Debug.LogError("Cutscene2Points Empty");
|
Debug.LogError("Cutscene2Points Empty");
|
||||||
|
|
||||||
|
@ -503,7 +511,11 @@ public class Cutscene : Script
|
||||||
|
|
||||||
private void initCutscene3()
|
private void initCutscene3()
|
||||||
{
|
{
|
||||||
|
if(cutscene3Points)
|
||||||
listOfCutscene3Points = cutscene3Points.GetComponentsInChildren<Transform>().ToList();
|
listOfCutscene3Points = cutscene3Points.GetComponentsInChildren<Transform>().ToList();
|
||||||
|
else
|
||||||
|
Debug.LogError("cutscene3Points Missing");
|
||||||
|
|
||||||
if (listOfCutscene3Points.Count == 0)
|
if (listOfCutscene3Points.Count == 0)
|
||||||
Debug.LogError("Cutscene3Points Empty");
|
Debug.LogError("Cutscene3Points Empty");
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
using System;
|
using System;
|
||||||
using SHADE;
|
using SHADE;
|
||||||
using SHADE_Scripting.Audio;
|
using SHADE_Scripting.Audio;
|
||||||
|
using SHADE_Scripting.UI;
|
||||||
|
|
||||||
public class EndScene : Script
|
public class EndScene : Script
|
||||||
{
|
{
|
||||||
|
@ -12,6 +13,15 @@ public class EndScene : Script
|
||||||
AudioHandler.audioClipHandlers["SFXMouseDownElement"] = Audio.CreateAudioClip("event:/UI/mouse_down_element");
|
AudioHandler.audioClipHandlers["SFXMouseDownElement"] = Audio.CreateAudioClip("event:/UI/mouse_down_element");
|
||||||
AudioHandler.audioClipHandlers["SFXUISuccess"] = Audio.CreateAudioClip("event:/UI/success");
|
AudioHandler.audioClipHandlers["SFXUISuccess"] = Audio.CreateAudioClip("event:/UI/success");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected override void start()
|
||||||
|
{
|
||||||
|
Input.SetMouseCentering(false);
|
||||||
|
Debug.Log("EndScene::Start():");
|
||||||
|
Application.IsCursorVisible = true;
|
||||||
|
SceneFadeInOut.Instance.CallFadeOut();
|
||||||
|
}
|
||||||
|
|
||||||
protected override void update()
|
protected override void update()
|
||||||
{
|
{
|
||||||
if (Input.GetKeyDown(Input.KeyCode.R))
|
if (Input.GetKeyDown(Input.KeyCode.R))
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
using System;
|
using System;
|
||||||
using SHADE;
|
using SHADE;
|
||||||
using SHADE_Scripting.Audio;
|
using SHADE_Scripting.Audio;
|
||||||
|
using SHADE_Scripting.UI;
|
||||||
|
|
||||||
public class MainMenu : Script
|
public class MainMenu : Script
|
||||||
{
|
{
|
||||||
|
@ -23,6 +24,9 @@ public class MainMenu : Script
|
||||||
|
|
||||||
protected override void start()
|
protected override void start()
|
||||||
{
|
{
|
||||||
|
Input.SetMouseCentering(false);
|
||||||
|
Application.IsCursorVisible = true;
|
||||||
|
SceneFadeInOut.Instance.CallFadeOut();
|
||||||
}
|
}
|
||||||
protected override void update()
|
protected override void update()
|
||||||
{
|
{
|
||||||
|
|
|
@ -8,16 +8,19 @@ public class PauseMenu : Script
|
||||||
public GameObject retryBtn;
|
public GameObject retryBtn;
|
||||||
public GameObject quitBtn;
|
public GameObject quitBtn;
|
||||||
|
|
||||||
public GameObject gamePauseText;
|
private TextRenderable gamePauseText;
|
||||||
public GameObject canvas;
|
public GameObject canvas;
|
||||||
|
|
||||||
protected override void awake()
|
protected override void awake()
|
||||||
{
|
{
|
||||||
|
if (GameManager.Instance != null)
|
||||||
GameManager.Instance.GamePause = false;
|
GameManager.Instance.GamePause = false;
|
||||||
if (gamePauseText)
|
|
||||||
gamePauseText.GetComponent<TextRenderable>().Enabled = false;
|
|
||||||
if (canvas)
|
if (canvas)
|
||||||
|
{
|
||||||
|
gamePauseText = canvas.GetComponentInChildren<TextRenderable>();
|
||||||
canvas.SetActive(false);
|
canvas.SetActive(false);
|
||||||
|
}
|
||||||
|
|
||||||
if (!resumeBtn)
|
if (!resumeBtn)
|
||||||
Debug.LogError("Resume Btn missing");
|
Debug.LogError("Resume Btn missing");
|
||||||
|
@ -39,9 +42,11 @@ public class PauseMenu : Script
|
||||||
if (GameManager.Instance.GamePause)
|
if (GameManager.Instance.GamePause)
|
||||||
{
|
{
|
||||||
GameManager.Instance.GamePause = false;
|
GameManager.Instance.GamePause = false;
|
||||||
|
Input.SetMouseCentering(true);
|
||||||
|
Application.IsCursorVisible = false;
|
||||||
AudioHandler.PauseAllSounds(false);
|
AudioHandler.PauseAllSounds(false);
|
||||||
if (gamePauseText)
|
if (gamePauseText)
|
||||||
gamePauseText.GetComponent<TextRenderable>().Enabled = false;
|
gamePauseText.Enabled = false;
|
||||||
if (canvas)
|
if (canvas)
|
||||||
canvas.SetActive(false);
|
canvas.SetActive(false);
|
||||||
}
|
}
|
||||||
|
@ -86,12 +91,14 @@ public class PauseMenu : Script
|
||||||
protected override void update()
|
protected override void update()
|
||||||
{
|
{
|
||||||
|
|
||||||
if (Input.GetKeyDown(Input.KeyCode.Escape) && !GameManager.Instance.GamePause)
|
if (Input.GetKeyDown(Input.KeyCode.Escape) && !GameManager.Instance.GamePause && GameManager.Instance.stealFoodPopUpDone)
|
||||||
{
|
{
|
||||||
GameManager.Instance.GamePause = true;
|
GameManager.Instance.GamePause = true;
|
||||||
|
Input.SetMouseCentering(false);
|
||||||
|
Application.IsCursorVisible = true;
|
||||||
AudioHandler.PauseAllSounds(true);
|
AudioHandler.PauseAllSounds(true);
|
||||||
if (gamePauseText)
|
if (gamePauseText)
|
||||||
gamePauseText.GetComponent<TextRenderable>().Enabled = true;
|
gamePauseText.Enabled = true;
|
||||||
if (canvas)
|
if (canvas)
|
||||||
canvas.SetActive(true);
|
canvas.SetActive(true);
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,7 +43,6 @@ namespace SHADE_Scripting.UI
|
||||||
|
|
||||||
protected override void start()
|
protected override void start()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void update()
|
protected override void update()
|
||||||
|
@ -56,7 +55,6 @@ namespace SHADE_Scripting.UI
|
||||||
if (fadeInTime == 0.0f)
|
if (fadeInTime == 0.0f)
|
||||||
{
|
{
|
||||||
alphaValue = 1.0f;
|
alphaValue = 1.0f;
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -65,7 +63,7 @@ namespace SHADE_Scripting.UI
|
||||||
if (alphaValue >= 1.0f)
|
if (alphaValue >= 1.0f)
|
||||||
{
|
{
|
||||||
alphaValue = 1.0f;
|
alphaValue = 1.0f;
|
||||||
GameObject.Parent.SetActive(false);
|
//GameObject.Parent.SetActive(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -84,6 +82,8 @@ namespace SHADE_Scripting.UI
|
||||||
if (alphaValue <= 0.0f)
|
if (alphaValue <= 0.0f)
|
||||||
{
|
{
|
||||||
alphaValue = 0.0f;
|
alphaValue = 0.0f;
|
||||||
|
//This line is to be added so that (because the fade in and out item is usually the front-most UI element)
|
||||||
|
//the fade in and out UI element does not block functionality of other UI elements
|
||||||
GameObject.Parent.SetActive(false);
|
GameObject.Parent.SetActive(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -51,6 +51,13 @@ namespace SHADE_Scripting.UI
|
||||||
//538x377
|
//538x377
|
||||||
protected override void update()
|
protected override void update()
|
||||||
{
|
{
|
||||||
|
if (!GameManager.Instance.PreviewLevelDone)
|
||||||
|
{
|
||||||
|
rot.Reset();
|
||||||
|
scaleX.Reset();
|
||||||
|
scaleY.Reset();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (!popInDone)
|
if (!popInDone)
|
||||||
{
|
{
|
||||||
|
@ -79,11 +86,11 @@ namespace SHADE_Scripting.UI
|
||||||
if (scaleOutX.IsCompleted() && scaleOutY.IsCompleted())
|
if (scaleOutX.IsCompleted() && scaleOutY.IsCompleted())
|
||||||
{
|
{
|
||||||
GameObject.SetActive(false);
|
GameObject.SetActive(false);
|
||||||
|
GameManager.Instance.stealFoodPopUpDone = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -656,6 +656,15 @@ namespace SHADE
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void SHAudioSystem::SetParameterWithLabel(const char* path, const char* label)
|
||||||
|
{
|
||||||
|
result = fmodStudioSystem->setParameterByNameWithLabel(path, label);
|
||||||
|
if (result != FMOD_OK)
|
||||||
|
{
|
||||||
|
ErrorCheck();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void AudioClip::Play()
|
void AudioClip::Play()
|
||||||
{
|
{
|
||||||
if(!instance)
|
if(!instance)
|
||||||
|
@ -734,12 +743,16 @@ namespace SHADE
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//void AudioClip::SetParameterLabel(const char* paramName, const char* label)
|
void AudioClip::SetParameterWithLabel(const char* paramName, const char* label)
|
||||||
//{
|
{
|
||||||
// if (!instance)
|
if (!instance)
|
||||||
// return;
|
return;
|
||||||
// instance->setParameterByNameWithLabel(paramName, label);
|
FMOD_RESULT result = instance->setParameterByNameWithLabel(paramName, label);
|
||||||
//}
|
if (result != FMOD_OK)
|
||||||
|
{
|
||||||
|
SHLOG_ERROR("Audio system error: {}", FMOD_ErrorString(result))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
float AudioClip::GetParameterValue(const char* paramName)
|
float AudioClip::GetParameterValue(const char* paramName)
|
||||||
{
|
{
|
||||||
|
|
|
@ -33,7 +33,7 @@ namespace SHADE
|
||||||
void SetPause(bool pause);
|
void SetPause(bool pause);
|
||||||
bool IsPaused();
|
bool IsPaused();
|
||||||
void SetParameter(const char* paramName, float value);
|
void SetParameter(const char* paramName, float value);
|
||||||
//void SetParameterLabel(const char* paramName, const char* label);
|
void SetParameterWithLabel(const char* paramName, const char* label);
|
||||||
float GetParameterValue(const char* paramName);
|
float GetParameterValue(const char* paramName);
|
||||||
float GetVolume();
|
float GetVolume();
|
||||||
void SetVolume(float volume);
|
void SetVolume(float volume);
|
||||||
|
@ -94,6 +94,7 @@ namespace SHADE
|
||||||
|
|
||||||
float GetParameterValue(const char* path);
|
float GetParameterValue(const char* path);
|
||||||
void SetParameter(const char* path, float value);
|
void SetParameter(const char* path, float value);
|
||||||
|
void SetParameterWithLabel(const char* path, const char* label);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
FMOD::Studio::System* fmodStudioSystem;
|
FMOD::Studio::System* fmodStudioSystem;
|
||||||
|
|
|
@ -376,7 +376,9 @@ namespace SHADE
|
||||||
{
|
{
|
||||||
if(editor->LoadScene(asset->id))
|
if(editor->LoadScene(asset->id))
|
||||||
{
|
{
|
||||||
|
#ifdef SHEDITOR
|
||||||
editor->editorConfig->workingSceneID = asset->id;
|
editor->editorConfig->workingSceneID = asset->id;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -592,8 +592,10 @@ namespace SHADE
|
||||||
{
|
{
|
||||||
//Load the scene
|
//Load the scene
|
||||||
sceneToLoad = 0;
|
sceneToLoad = 0;
|
||||||
|
#ifdef SHEDITOR
|
||||||
editorConfig->workingSceneID = assetID;
|
editorConfig->workingSceneID = assetID;
|
||||||
SHConfigurationManager::SaveEditorConfig();
|
SHConfigurationManager::SaveEditorConfig();
|
||||||
|
#endif
|
||||||
SHSceneManager::RestartScene(assetID);
|
SHSceneManager::RestartScene(assetID);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -198,6 +198,7 @@ namespace SHADE
|
||||||
|
|
||||||
void SHWindow::SetMouseVisible(bool show)
|
void SHWindow::SetMouseVisible(bool show)
|
||||||
{
|
{
|
||||||
|
while(GetMouseVisible() != show)
|
||||||
ShowCursor(show);
|
ShowCursor(show);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -207,10 +207,10 @@ namespace SHADE
|
||||||
if constexpr (YAML::HasYAMLConv<ComponentType>())
|
if constexpr (YAML::HasYAMLConv<ComponentType>())
|
||||||
{
|
{
|
||||||
auto component = SHComponentManager::GetComponent_s<ComponentType>(eid);
|
auto component = SHComponentManager::GetComponent_s<ComponentType>(eid);
|
||||||
if (componentsNode.IsNull() || !component)
|
if (!component)
|
||||||
return false;
|
return false;
|
||||||
auto componentNode = GetComponentNode<ComponentType>(componentsNode, eid);
|
auto componentNode = GetComponentNode<ComponentType>(componentsNode, eid);
|
||||||
if (componentNode.IsNull() || !componentNode.IsDefined())
|
if (!componentNode.IsDefined())
|
||||||
return false;
|
return false;
|
||||||
if (componentNode[IsActive.data()].IsDefined())
|
if (componentNode[IsActive.data()].IsDefined())
|
||||||
component->isActive = componentNode[IsActive.data()].as<bool>();
|
component->isActive = componentNode[IsActive.data()].as<bool>();
|
||||||
|
@ -220,7 +220,7 @@ namespace SHADE
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ComponentType* component = SHComponentManager::GetComponent_s<ComponentType>(eid);
|
ComponentType* component = SHComponentManager::GetComponent_s<ComponentType>(eid);
|
||||||
if (componentsNode.IsNull() && !component)
|
if (!component)
|
||||||
return false;
|
return false;
|
||||||
auto rttrType = rttr::type::get<ComponentType>();
|
auto rttrType = rttr::type::get<ComponentType>();
|
||||||
auto componentNode = componentsNode[rttrType.get_name().data()];
|
auto componentNode = componentsNode[rttrType.get_name().data()];
|
||||||
|
|
|
@ -124,6 +124,12 @@ namespace SHADE
|
||||||
audioSys->SetParameter(Convert::ToNative(path).data(), value);
|
audioSys->SetParameter(Convert::ToNative(path).data(), value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Audio::SetParameterWithLabel(System::String^ path, System::String^ label)
|
||||||
|
{
|
||||||
|
auto audioSys = SHSystemManager::GetSystem<SHAudioSystem>();
|
||||||
|
audioSys->SetParameterWithLabel(Convert::ToNative(path).data(), Convert::ToNative(label).data());
|
||||||
|
}
|
||||||
|
|
||||||
AudioClipHandler Audio::CreateAudioClip(System::String^ path)
|
AudioClipHandler Audio::CreateAudioClip(System::String^ path)
|
||||||
{
|
{
|
||||||
auto audioSys = SHSystemManager::GetSystem<SHAudioSystem>();
|
auto audioSys = SHSystemManager::GetSystem<SHAudioSystem>();
|
||||||
|
|
|
@ -105,6 +105,7 @@ namespace SHADE
|
||||||
static void SetVCAVolume(System::String^ path, float volume);
|
static void SetVCAVolume(System::String^ path, float volume);
|
||||||
static float GetParameterValue(System::String^ path);
|
static float GetParameterValue(System::String^ path);
|
||||||
static void SetParameter(System::String^ path, float value);
|
static void SetParameter(System::String^ path, float value);
|
||||||
|
static void SetParameterWithLabel(System::String^ path, System::String^ label);
|
||||||
|
|
||||||
//to comment ltr
|
//to comment ltr
|
||||||
static AudioClipHandler CreateAudioClip(System::String^ path);
|
static AudioClipHandler CreateAudioClip(System::String^ path);
|
||||||
|
|
|
@ -79,6 +79,11 @@ namespace SHADE
|
||||||
NativeObject->SetParameter(Convert::ToNative(paramName).data(), value);
|
NativeObject->SetParameter(Convert::ToNative(paramName).data(), value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void AudioClipHandler::SetParameterWithLabel(System::String^ paramName, System::String^ label)
|
||||||
|
{
|
||||||
|
NativeObject->SetParameterWithLabel(Convert::ToNative(paramName).data(), Convert::ToNative(label).data());
|
||||||
|
}
|
||||||
|
|
||||||
float AudioClipHandler::GetParameterValue(System::String^ paramName)
|
float AudioClipHandler::GetParameterValue(System::String^ paramName)
|
||||||
{
|
{
|
||||||
return NativeObject->GetParameterValue(Convert::ToNative(paramName).data());
|
return NativeObject->GetParameterValue(Convert::ToNative(paramName).data());
|
||||||
|
|
|
@ -71,6 +71,7 @@ namespace SHADE
|
||||||
void SetPause(bool pause);
|
void SetPause(bool pause);
|
||||||
bool IsPaused();
|
bool IsPaused();
|
||||||
void SetParameter(System::String^ paramName, float value);
|
void SetParameter(System::String^ paramName, float value);
|
||||||
|
void SetParameterWithLabel(System::String^ paramName, System::String^ label);
|
||||||
float GetParameterValue(System::String^ paramName);
|
float GetParameterValue(System::String^ paramName);
|
||||||
float GetVolume();
|
float GetVolume();
|
||||||
void SetVolume(float volume);
|
void SetVolume(float volume);
|
||||||
|
|
Loading…
Reference in New Issue