Added Attack animation, Fix Edge case for path finding. Added footsteps. Level 2 merge #444

Merged
maverickdgg merged 7 commits from Navigation into main 2023-03-25 16:54:30 +08:00
32 changed files with 2468 additions and 413 deletions
Showing only changes of commit 749cedfae2 - Show all commits

View File

@ -3,6 +3,6 @@
SubPass: UI SubPass: UI
Properties: Properties:
data.color: {x: 1, y: 1, z: 1, w: 1} data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 59379300 data.textureIndex: 55278388
data.alpha: 1 data.alpha: 1
data.beta: {x: 1, y: 1, z: 1} data.beta: {x: 1, y: 1, z: 1}

View File

@ -17,7 +17,7 @@
- EID: 85 - EID: 85
Name: EnvironmentMaster Name: EnvironmentMaster
IsActive: true IsActive: true
NumberOfChildren: 9 NumberOfChildren: 18
Components: ~ Components: ~
Scripts: ~ Scripts: ~
- EID: 84 - EID: 84
@ -6827,6 +6827,764 @@
Material: 131956078 Material: 131956078
IsActive: true IsActive: true
Scripts: ~ Scripts: ~
- EID: 602
Name: PottedPlant
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: -4.01561403, y: 0.334217787, z: -4.03895283}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 136851231
Material: 131956078
IsActive: true
RigidBody Component:
Type: Dynamic
Drag: 0.00999999978
Angular Drag: 0.100000001
Gravity Scale: 1
Use Gravity: true
Interpolate: false
Sleeping Enabled: false
Freeze Position X: false
Freeze Position Y: false
Freeze Position Z: false
Freeze Rotation X: false
Freeze Rotation Y: false
Freeze Rotation Z: false
IsActive: true
Collider Component:
Colliders:
- Is Trigger: false
Collision Tag: 0
Type: Box
Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
Friction: 0.400000006
Bounciness: 0
Density: 1
Position Offset: {x: 0, y: 0.100000001, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts: ~
- EID: 601
Name: PottedPlant
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: -3.0781858, y: 0.901458919, z: -8.24384117}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 136851231
Material: 131956078
IsActive: true
RigidBody Component:
Type: Dynamic
Drag: 0.00999999978
Angular Drag: 0.100000001
Gravity Scale: 1
Use Gravity: true
Interpolate: false
Sleeping Enabled: false
Freeze Position X: false
Freeze Position Y: false
Freeze Position Z: false
Freeze Rotation X: false
Freeze Rotation Y: false
Freeze Rotation Z: false
IsActive: true
Collider Component:
Colliders:
- Is Trigger: false
Collision Tag: 0
Type: Box
Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
Friction: 0.400000006
Bounciness: 0
Density: 1
Position Offset: {x: 0, y: 0.100000001, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts: ~
- EID: 600
Name: PottedPlant
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 5.14082956, y: 0.956586063, z: -9.60649967}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 136851231
Material: 131956078
IsActive: true
RigidBody Component:
Type: Dynamic
Drag: 0.00999999978
Angular Drag: 0.100000001
Gravity Scale: 1
Use Gravity: true
Interpolate: false
Sleeping Enabled: false
Freeze Position X: false
Freeze Position Y: false
Freeze Position Z: false
Freeze Rotation X: false
Freeze Rotation Y: false
Freeze Rotation Z: false
IsActive: true
Collider Component:
Colliders:
- Is Trigger: false
Collision Tag: 0
Type: Box
Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
Friction: 0.400000006
Bounciness: 0
Density: 1
Position Offset: {x: 0, y: 0.100000001, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts: ~
- EID: 599
Name: PottedPlant
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 4.97405958, y: 0.956586063, z: -2.56497669}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 136851231
Material: 131956078
IsActive: true
RigidBody Component:
Type: Dynamic
Drag: 0.00999999978
Angular Drag: 0.100000001
Gravity Scale: 1
Use Gravity: true
Interpolate: false
Sleeping Enabled: false
Freeze Position X: false
Freeze Position Y: false
Freeze Position Z: false
Freeze Rotation X: false
Freeze Rotation Y: false
Freeze Rotation Z: false
IsActive: true
Collider Component:
Colliders:
- Is Trigger: false
Collision Tag: 0
Type: Box
Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
Friction: 0.400000006
Bounciness: 0
Density: 1
Position Offset: {x: 0, y: 0.100000001, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts: ~
- EID: 596
Name: 3books
IsActive: true
NumberOfChildren: 3
Components:
Transform Component:
Translate: {x: -6.65892982, y: 1.21501589, z: -9.38873291}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Scripts: ~
- EID: 66059
Name: Redbook
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: -0.216216087, y: -0.168680668, z: -0.0682477951}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 149990626
Material: 131956078
IsActive: true
RigidBody Component:
Type: Dynamic
Drag: 0.00999999978
Angular Drag: 0.100000001
Gravity Scale: 1
Use Gravity: true
Interpolate: false
Sleeping Enabled: false
Freeze Position X: false
Freeze Position Y: false
Freeze Position Z: false
Freeze Rotation X: false
Freeze Rotation Y: false
Freeze Rotation Z: false
IsActive: true
Collider Component:
Colliders:
- Is Trigger: false
Collision Tag: 0
Type: Box
Half Extents: {x: 0.100000001, y: 0.400000006, z: 0.300000012}
Friction: 0.400000006
Bounciness: 0
Density: 1
Position Offset: {x: 0, y: 0.200000003, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts: ~
- EID: 598
Name: Bluebook
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: -0.0121536255, y: -0.168680668, z: -0.0682477951}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 148931934
Material: 131956078
IsActive: true
RigidBody Component:
Type: Dynamic
Drag: 0.00999999978
Angular Drag: 0.100000001
Gravity Scale: 1
Use Gravity: true
Interpolate: false
Sleeping Enabled: false
Freeze Position X: false
Freeze Position Y: false
Freeze Position Z: false
Freeze Rotation X: false
Freeze Rotation Y: false
Freeze Rotation Z: false
IsActive: true
Collider Component:
Colliders:
- Is Trigger: false
Collision Tag: 0
Type: Box
Half Extents: {x: 0.100000001, y: 0.400000006, z: 0.300000012}
Friction: 0.400000006
Bounciness: 0
Density: 1
Position Offset: {x: 0, y: 0.200000003, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts: ~
- EID: 597
Name: Greenbook
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 0.181077003, y: -0.168680668, z: -0.0682477951}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 150010583
Material: 131956078
IsActive: true
RigidBody Component:
Type: Dynamic
Drag: 0.00999999978
Angular Drag: 0.100000001
Gravity Scale: 1
Use Gravity: true
Interpolate: false
Sleeping Enabled: false
Freeze Position X: false
Freeze Position Y: false
Freeze Position Z: false
Freeze Rotation X: false
Freeze Rotation Y: false
Freeze Rotation Z: false
IsActive: true
Collider Component:
Colliders:
- Is Trigger: false
Collision Tag: 0
Type: Box
Half Extents: {x: 0.100000001, y: 0.400000006, z: 0.300000012}
Friction: 0.400000006
Bounciness: 0
Density: 1
Position Offset: {x: 0, y: 0.200000003, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts: ~
- EID: 595
Name: 3books
IsActive: true
NumberOfChildren: 3
Components:
Transform Component:
Translate: {x: -7.73414946, y: 0.743469238, z: -9.38873291}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Scripts: ~
- EID: 594
Name: Redbook
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: -0.216216087, y: -0.168680668, z: -0.0682477951}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 149990626
Material: 131956078
IsActive: true
RigidBody Component:
Type: Dynamic
Drag: 0.00999999978
Angular Drag: 0.100000001
Gravity Scale: 1
Use Gravity: true
Interpolate: false
Sleeping Enabled: false
Freeze Position X: false
Freeze Position Y: false
Freeze Position Z: false
Freeze Rotation X: false
Freeze Rotation Y: false
Freeze Rotation Z: false
IsActive: true
Collider Component:
Colliders:
- Is Trigger: false
Collision Tag: 0
Type: Box
Half Extents: {x: 0.100000001, y: 0.400000006, z: 0.300000012}
Friction: 0.400000006
Bounciness: 0
Density: 1
Position Offset: {x: 0, y: 0.200000003, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts: ~
- EID: 593
Name: Bluebook
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: -0.0121536255, y: -0.168680668, z: -0.0682477951}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 148931934
Material: 131956078
IsActive: true
RigidBody Component:
Type: Dynamic
Drag: 0.00999999978
Angular Drag: 0.100000001
Gravity Scale: 1
Use Gravity: true
Interpolate: false
Sleeping Enabled: false
Freeze Position X: false
Freeze Position Y: false
Freeze Position Z: false
Freeze Rotation X: false
Freeze Rotation Y: false
Freeze Rotation Z: false
IsActive: true
Collider Component:
Colliders:
- Is Trigger: false
Collision Tag: 0
Type: Box
Half Extents: {x: 0.100000001, y: 0.400000006, z: 0.300000012}
Friction: 0.400000006
Bounciness: 0
Density: 1
Position Offset: {x: 0, y: 0.200000003, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts: ~
- EID: 592
Name: Greenbook
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 0.181077003, y: -0.168680668, z: -0.0682477951}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 150010583
Material: 131956078
IsActive: true
RigidBody Component:
Type: Dynamic
Drag: 0.00999999978
Angular Drag: 0.100000001
Gravity Scale: 1
Use Gravity: true
Interpolate: false
Sleeping Enabled: false
Freeze Position X: false
Freeze Position Y: false
Freeze Position Z: false
Freeze Rotation X: false
Freeze Rotation Y: false
Freeze Rotation Z: false
IsActive: true
Collider Component:
Colliders:
- Is Trigger: false
Collision Tag: 0
Type: Box
Half Extents: {x: 0.100000001, y: 0.400000006, z: 0.300000012}
Friction: 0.400000006
Bounciness: 0
Density: 1
Position Offset: {x: 0, y: 0.200000003, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts: ~
- EID: 591
Name: 3books
IsActive: true
NumberOfChildren: 3
Components:
Transform Component:
Translate: {x: -7.73414946, y: 1.68549871, z: -9.38873291}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Scripts: ~
- EID: 590
Name: Redbook
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: -0.216216087, y: -0.168680668, z: -0.0682477951}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 149990626
Material: 131956078
IsActive: true
RigidBody Component:
Type: Dynamic
Drag: 0.00999999978
Angular Drag: 0.100000001
Gravity Scale: 1
Use Gravity: true
Interpolate: false
Sleeping Enabled: false
Freeze Position X: false
Freeze Position Y: false
Freeze Position Z: false
Freeze Rotation X: false
Freeze Rotation Y: false
Freeze Rotation Z: false
IsActive: true
Collider Component:
Colliders:
- Is Trigger: false
Collision Tag: 0
Type: Box
Half Extents: {x: 0.100000001, y: 0.400000006, z: 0.300000012}
Friction: 0.400000006
Bounciness: 0
Density: 1
Position Offset: {x: 0, y: 0.200000003, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts: ~
- EID: 589
Name: Bluebook
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: -0.0121536255, y: -0.168680668, z: -0.0682477951}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 148931934
Material: 131956078
IsActive: true
RigidBody Component:
Type: Dynamic
Drag: 0.00999999978
Angular Drag: 0.100000001
Gravity Scale: 1
Use Gravity: true
Interpolate: false
Sleeping Enabled: false
Freeze Position X: false
Freeze Position Y: false
Freeze Position Z: false
Freeze Rotation X: false
Freeze Rotation Y: false
Freeze Rotation Z: false
IsActive: true
Collider Component:
Colliders:
- Is Trigger: false
Collision Tag: 0
Type: Box
Half Extents: {x: 0.100000001, y: 0.400000006, z: 0.300000012}
Friction: 0.400000006
Bounciness: 0
Density: 1
Position Offset: {x: 0, y: 0.200000003, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts: ~
- EID: 588
Name: Greenbook
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 0.181077003, y: -0.168680668, z: -0.0682477951}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 150010583
Material: 131956078
IsActive: true
RigidBody Component:
Type: Dynamic
Drag: 0.00999999978
Angular Drag: 0.100000001
Gravity Scale: 1
Use Gravity: true
Interpolate: false
Sleeping Enabled: false
Freeze Position X: false
Freeze Position Y: false
Freeze Position Z: false
Freeze Rotation X: false
Freeze Rotation Y: false
Freeze Rotation Z: false
IsActive: true
Collider Component:
Colliders:
- Is Trigger: false
Collision Tag: 0
Type: Box
Half Extents: {x: 0.100000001, y: 0.400000006, z: 0.300000012}
Friction: 0.400000006
Bounciness: 0
Density: 1
Position Offset: {x: 0, y: 0.200000003, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts: ~
- EID: 587
Name: Photoframe
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 1.74995995, y: 0.783303618, z: -5.44767904}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 139864675
Material: 131956078
IsActive: true
RigidBody Component:
Type: Dynamic
Drag: 0.00999999978
Angular Drag: 0.100000001
Gravity Scale: 1
Use Gravity: true
Interpolate: false
Sleeping Enabled: false
Freeze Position X: false
Freeze Position Y: false
Freeze Position Z: false
Freeze Rotation X: false
Freeze Rotation Y: false
Freeze Rotation Z: false
IsActive: true
Collider Component:
Colliders:
- Is Trigger: false
Collision Tag: 0
Type: Box
Half Extents: {x: 0.200000003, y: 0.300000012, z: 0.100000001}
Friction: 0.400000006
Bounciness: 0
Density: 1
Position Offset: {x: 0, y: 0.150000006, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts: ~
- EID: 586
Name: 3books
IsActive: true
NumberOfChildren: 3
Components:
Transform Component:
Translate: {x: -8.85774136, y: 0.239445657, z: -9.46920681}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Scripts: ~
- EID: 585
Name: Redbook
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: -0.216216087, y: -0.168680668, z: -0.0682477951}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 149990626
Material: 131956078
IsActive: true
RigidBody Component:
Type: Dynamic
Drag: 0.00999999978
Angular Drag: 0.100000001
Gravity Scale: 1
Use Gravity: true
Interpolate: false
Sleeping Enabled: false
Freeze Position X: false
Freeze Position Y: false
Freeze Position Z: false
Freeze Rotation X: false
Freeze Rotation Y: false
Freeze Rotation Z: false
IsActive: true
Collider Component:
Colliders:
- Is Trigger: false
Collision Tag: 0
Type: Box
Half Extents: {x: 0.100000001, y: 0.400000006, z: 0.300000012}
Friction: 0.400000006
Bounciness: 0
Density: 1
Position Offset: {x: 0, y: 0.200000003, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts: ~
- EID: 584
Name: Bluebook
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: -0.0121536255, y: -0.168680668, z: -0.0682477951}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 148931934
Material: 131956078
IsActive: true
RigidBody Component:
Type: Dynamic
Drag: 0.00999999978
Angular Drag: 0.100000001
Gravity Scale: 1
Use Gravity: true
Interpolate: false
Sleeping Enabled: false
Freeze Position X: false
Freeze Position Y: false
Freeze Position Z: false
Freeze Rotation X: false
Freeze Rotation Y: false
Freeze Rotation Z: false
IsActive: true
Collider Component:
Colliders:
- Is Trigger: false
Collision Tag: 0
Type: Box
Half Extents: {x: 0.100000001, y: 0.400000006, z: 0.300000012}
Friction: 0.400000006
Bounciness: 0
Density: 1
Position Offset: {x: 0, y: 0.200000003, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts: ~
- EID: 583
Name: Greenbook
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 0.181077003, y: -0.168680668, z: -0.0682477951}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 150010583
Material: 131956078
IsActive: true
RigidBody Component:
Type: Dynamic
Drag: 0.00999999978
Angular Drag: 0.100000001
Gravity Scale: 1
Use Gravity: true
Interpolate: false
Sleeping Enabled: false
Freeze Position X: false
Freeze Position Y: false
Freeze Position Z: false
Freeze Rotation X: false
Freeze Rotation Y: false
Freeze Rotation Z: false
IsActive: true
Collider Component:
Colliders:
- Is Trigger: false
Collision Tag: 0
Type: Box
Half Extents: {x: 0.100000001, y: 0.400000006, z: 0.300000012}
Friction: 0.400000006
Bounciness: 0
Density: 1
Position Offset: {x: 0, y: 0.200000003, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts: ~
- EID: 236 - EID: 236
Name: ====GameManager==== Name: ====GameManager====
IsActive: true IsActive: true
@ -7011,7 +7769,6 @@
Score: 50 Score: 50
currCategory: 1 currCategory: 1
currFood: 0 currFood: 0
density: 1
dontReturn: false dontReturn: false
soundDistance: 10 soundDistance: 10
highlightSpeed: 200 highlightSpeed: 200
@ -7064,7 +7821,6 @@
Score: 500 Score: 500
currCategory: 2 currCategory: 2
currFood: 0 currFood: 0
density: 1
dontReturn: false dontReturn: false
soundDistance: 10 soundDistance: 10
highlightSpeed: 200 highlightSpeed: 200
@ -7117,7 +7873,6 @@
Score: 10 Score: 10
currCategory: 0 currCategory: 0
currFood: 0 currFood: 0
density: 1
dontReturn: false dontReturn: false
soundDistance: 10 soundDistance: 10
highlightSpeed: 200 highlightSpeed: 200
@ -7170,7 +7925,6 @@
Score: 10 Score: 10
currCategory: 0 currCategory: 0
currFood: 0 currFood: 0
density: 1
dontReturn: false dontReturn: false
soundDistance: 10 soundDistance: 10
highlightSpeed: 200 highlightSpeed: 200
@ -8317,7 +9071,7 @@
NumberOfChildren: 2 NumberOfChildren: 2
Components: Components:
Transform Component: Transform Component:
Translate: {x: 700, y: 400, z: 0.100000001} Translate: {x: 700, y: 400, z: 0.600000024}
Rotate: {x: 0, y: 0, z: 0} Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 60, y: 60, z: 1} Scale: {x: 60, y: 60, z: 1}
IsActive: true IsActive: true
@ -8447,78 +9201,6 @@
Clicked: false Clicked: false
IsActive: true IsActive: true
Scripts: ~ Scripts: ~
- EID: 523
Name: Mesh_Apple
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: -7.29431438, y: 1.17736602, z: -4.53253984}
Rotate: {x: -5.83341553e-08, y: 7.48974247e-14, z: 1.10461471e-08}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 144128170
Material: 122370915
IsActive: true
RigidBody Component:
Type: Dynamic
Drag: 0.00999999978
Angular Drag: 0.100000001
Gravity Scale: 1
Use Gravity: true
Interpolate: false
Sleeping Enabled: true
Freeze Position X: false
Freeze Position Y: false
Freeze Position Z: false
Freeze Rotation X: false
Freeze Rotation Y: false
Freeze Rotation Z: false
IsActive: true
Collider Component:
Colliders:
- Is Trigger: false
Collision Tag: 2
Type: Box
Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
Friction: 0.400000006
Bounciness: 0
Density: 1
Position Offset: {x: 0, y: 0, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
classSHADE::SHParticleEmitterComponent:
Emission Count: 10
Is Passive: false
Emission Interval: 0
Min Life: 1
Max Life: 2
Minimum Speed: 1
Maximum Speed: 1.5
Minimum Size: 0
Maximum Size: 0.075000003
Size Decay: 0.907999992
Angular Ranges And Offset: {x: 6.19999981, y: 3.1400001, z: 0, w: 1.70000005}
Rotation Speed: 0.805999994
Rotation Decay: 0
Texture Asset ID: 0
Custom Update Shader Asset ID: 0
Color Tint: {x: 0.581223547, y: 0.722466946, z: 0.283257961, w: 1}
Acceleration: {x: 0, y: -0.0390000008, z: 0}
IsActive: true
Scripts:
- Type: Item
Enabled: true
Score: 10
currCategory: 0
currFood: 1
density: 1
dontReturn: false
soundDistance: 10
highlightSpeed: 200
highlightThickness: 60
highlightLowerClamp: 0.25
- EID: 66150 - EID: 66150
Name: ParticlesDeco Name: ParticlesDeco
IsActive: true IsActive: true

File diff suppressed because it is too large Load Diff

View File

@ -6,7 +6,7 @@
Components: Components:
Transform Component: Transform Component:
Translate: {x: -4.64838362, y: 2.94342947, z: 0.209690213} Translate: {x: -4.64838362, y: 2.94342947, z: 0.209690213}
Rotate: {x: 0.5, y: 0.5, z: -2.5} Rotate: {x: 0.5, y: 0.5, z: 6.5}
Scale: {x: 1, y: 1, z: 1} Scale: {x: 1, y: 1, z: 1}
IsActive: true IsActive: true
Light Component: Light Component:
@ -9106,7 +9106,7 @@
scoreText: 237 scoreText: 237
timeText: 525 timeText: 525
minusTimerText: 524 minusTimerText: 524
multiplierText: 524 multiplierText: 521
maxMultiplierDuration: 5 maxMultiplierDuration: 5
maxMultiplierCombo: 10 maxMultiplierCombo: 10
multiplierFont: 60 multiplierFont: 60
@ -9152,11 +9152,11 @@
- Is Trigger: true - Is Trigger: true
Collision Tag: 0 Collision Tag: 0
Type: Box Type: Box
Half Extents: {x: 5, y: 1, z: 5} Half Extents: {x: 10, y: 1, z: 8}
Friction: 0.400000006 Friction: 0.400000006
Bounciness: 0 Bounciness: 0
Density: 1 Density: 1
Position Offset: {x: -1.89999998, y: -1.5, z: 0} Position Offset: {x: -4.5, y: -1.5, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0} Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true IsActive: true
Scripts: Scripts:
@ -9537,7 +9537,6 @@
Score: 50 Score: 50
currCategory: 1 currCategory: 1
currFood: 0 currFood: 0
density: 1
dontReturn: false dontReturn: false
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -9590,7 +9589,6 @@
Score: 50 Score: 50
currCategory: 1 currCategory: 1
currFood: 0 currFood: 0
density: 1
dontReturn: false dontReturn: false
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -9643,7 +9641,6 @@
Score: 50 Score: 50
currCategory: 1 currCategory: 1
currFood: 0 currFood: 0
density: 1
dontReturn: false dontReturn: false
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -9696,7 +9693,6 @@
Score: 50 Score: 50
currCategory: 1 currCategory: 1
currFood: 0 currFood: 0
density: 1
dontReturn: false dontReturn: false
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -9749,7 +9745,6 @@
Score: 50 Score: 50
currCategory: 1 currCategory: 1
currFood: 0 currFood: 0
density: 1
dontReturn: false dontReturn: false
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -9802,7 +9797,6 @@
Score: 50 Score: 50
currCategory: 1 currCategory: 1
currFood: 0 currFood: 0
density: 1
dontReturn: false dontReturn: false
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -9855,7 +9849,6 @@
Score: 50 Score: 50
currCategory: 1 currCategory: 1
currFood: 0 currFood: 0
density: 1
dontReturn: false dontReturn: false
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -9908,7 +9901,6 @@
Score: 10 Score: 10
currCategory: 0 currCategory: 0
currFood: 0 currFood: 0
density: 1
dontReturn: false dontReturn: false
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -9961,7 +9953,6 @@
Score: 10 Score: 10
currCategory: 0 currCategory: 0
currFood: 0 currFood: 0
density: 1
dontReturn: false dontReturn: false
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -10014,7 +10005,6 @@
Score: 10 Score: 10
currCategory: 0 currCategory: 0
currFood: 0 currFood: 0
density: 1
dontReturn: false dontReturn: false
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -10067,7 +10057,6 @@
Score: 10 Score: 10
currCategory: 0 currCategory: 0
currFood: 0 currFood: 0
density: 1
dontReturn: false dontReturn: false
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -10120,7 +10109,6 @@
Score: 10 Score: 10
currCategory: 0 currCategory: 0
currFood: 0 currFood: 0
density: 1
dontReturn: false dontReturn: false
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -10173,7 +10161,6 @@
Score: 10 Score: 10
currCategory: 0 currCategory: 0
currFood: 0 currFood: 0
density: 1
dontReturn: false dontReturn: false
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -10226,7 +10213,6 @@
Score: 10 Score: 10
currCategory: 0 currCategory: 0
currFood: 0 currFood: 0
density: 1
dontReturn: false dontReturn: false
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -10279,7 +10265,6 @@
Score: 10 Score: 10
currCategory: 0 currCategory: 0
currFood: 0 currFood: 0
density: 1
dontReturn: false dontReturn: false
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -10332,7 +10317,6 @@
Score: 10 Score: 10
currCategory: 0 currCategory: 0
currFood: 0 currFood: 0
density: 1
dontReturn: false dontReturn: false
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -10385,7 +10369,6 @@
Score: 500 Score: 500
currCategory: 2 currCategory: 2
currFood: 0 currFood: 0
density: 1
dontReturn: false dontReturn: false
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -10438,7 +10421,6 @@
Score: 500 Score: 500
currCategory: 2 currCategory: 2
currFood: 0 currFood: 0
density: 1
dontReturn: false dontReturn: false
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -10491,7 +10473,6 @@
Score: 500 Score: 500
currCategory: 2 currCategory: 2
currFood: 0 currFood: 0
density: 1
dontReturn: false dontReturn: false
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -10544,7 +10525,6 @@
Score: 500 Score: 500
currCategory: 2 currCategory: 2
currFood: 0 currFood: 0
density: 1
dontReturn: false dontReturn: false
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -10603,7 +10583,6 @@
Score: 10 Score: 10
currCategory: 0 currCategory: 0
currFood: 0 currFood: 0
density: 2
dontReturn: false dontReturn: false
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -10830,7 +10809,6 @@
Score: 10 Score: 10
currCategory: 0 currCategory: 0
currFood: 0 currFood: 0
density: 2
dontReturn: false dontReturn: false
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -11057,7 +11035,6 @@
Score: 500 Score: 500
currCategory: 2 currCategory: 2
currFood: 0 currFood: 0
density: 1
dontReturn: false dontReturn: false
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -11110,7 +11087,6 @@
Score: 50 Score: 50
currCategory: 1 currCategory: 1
currFood: 0 currFood: 0
density: 1
dontReturn: true dontReturn: true
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -11163,7 +11139,6 @@
Score: 50 Score: 50
currCategory: 1 currCategory: 1
currFood: 0 currFood: 0
density: 1
dontReturn: true dontReturn: true
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -11216,7 +11191,6 @@
Score: 10 Score: 10
currCategory: 0 currCategory: 0
currFood: 0 currFood: 0
density: 1
dontReturn: true dontReturn: true
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -11269,7 +11243,6 @@
Score: 10 Score: 10
currCategory: 0 currCategory: 0
currFood: 0 currFood: 0
density: 1
dontReturn: true dontReturn: true
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -11322,7 +11295,6 @@
Score: 10 Score: 10
currCategory: 0 currCategory: 0
currFood: 0 currFood: 0
density: 1
dontReturn: true dontReturn: true
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -11381,7 +11353,6 @@
Score: 500 Score: 500
currCategory: 2 currCategory: 2
currFood: 0 currFood: 0
density: 1
dontReturn: false dontReturn: false
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -11434,7 +11405,6 @@
Score: 50 Score: 50
currCategory: 1 currCategory: 1
currFood: 0 currFood: 0
density: 1
dontReturn: true dontReturn: true
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -11487,7 +11457,6 @@
Score: 50 Score: 50
currCategory: 1 currCategory: 1
currFood: 0 currFood: 0
density: 1
dontReturn: true dontReturn: true
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -11540,7 +11509,6 @@
Score: 10 Score: 10
currCategory: 0 currCategory: 0
currFood: 0 currFood: 0
density: 1
dontReturn: true dontReturn: true
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -11593,7 +11561,6 @@
Score: 10 Score: 10
currCategory: 0 currCategory: 0
currFood: 0 currFood: 0
density: 1
dontReturn: true dontReturn: true
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -11646,7 +11613,6 @@
Score: 10 Score: 10
currCategory: 0 currCategory: 0
currFood: 0 currFood: 0
density: 1
dontReturn: true dontReturn: true
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -11732,7 +11698,6 @@
Score: 10 Score: 10
currCategory: 0 currCategory: 0
currFood: 0 currFood: 0
density: 2
dontReturn: false dontReturn: false
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -11959,7 +11924,6 @@
Score: 10 Score: 10
currCategory: 0 currCategory: 0
currFood: 0 currFood: 0
density: 2
dontReturn: false dontReturn: false
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -12186,7 +12150,6 @@
Score: 10 Score: 10
currCategory: 0 currCategory: 0
currFood: 0 currFood: 0
density: 2
dontReturn: false dontReturn: false
soundDistance: 10 soundDistance: 10
highlightSpeed: 300 highlightSpeed: 300
@ -15159,7 +15122,7 @@
NumberOfChildren: 2 NumberOfChildren: 2
Components: Components:
Transform Component: Transform Component:
Translate: {x: 700, y: 400, z: 0.100000001} Translate: {x: 700, y: 400, z: 0.600000024}
Rotate: {x: 0, y: 0, z: 0} Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 60, y: 60, z: 1} Scale: {x: 60, y: 60, z: 1}
IsActive: true IsActive: true

View File

@ -548,7 +548,6 @@
sfxVolSlider: 30 sfxVolSlider: 30
bgmVolSlider: 31 bgmVolSlider: 31
fovSlider: 37 fovSlider: 37
sensitivitySlider: 38
- EID: 20 - EID: 20
Name: BackGround Name: BackGround
IsActive: true IsActive: true
@ -847,7 +846,7 @@
- EID: 33 - EID: 33
Name: Camera Text Group Name: Camera Text Group
IsActive: true IsActive: true
NumberOfChildren: 4 NumberOfChildren: 3
Components: Components:
Transform Component: Transform Component:
Translate: {x: -900, y: -220, z: 0} Translate: {x: -900, y: -220, z: 0}
@ -882,28 +881,6 @@
Clicked: false Clicked: false
IsActive: true IsActive: true
Scripts: ~ Scripts: ~
- EID: 35
Name: Sensitivity Text
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 0, y: -100, z: 0.100000001}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 75, y: 75, z: 1}
IsActive: true
Text Renderer Component:
Text: Sensitivity
Font: 174412429
Color: {x: 0, y: 0, z: 0, w: 1}
Text Size: {x: 1, y: 1, z: 1}
IsActive: true
UI Component:
Canvas ID: 19
Hovered: false
Clicked: false
IsActive: true
Scripts: ~
- EID: 449 - EID: 449
Name: Camera Invert X Text Name: Camera Invert X Text
IsActive: true IsActive: true
@ -951,7 +928,7 @@
- EID: 36 - EID: 36
Name: Camera Slider Group Name: Camera Slider Group
IsActive: true IsActive: true
NumberOfChildren: 4 NumberOfChildren: 3
Components: Components:
Transform Component: Transform Component:
Translate: {x: 100, y: -200, z: 0} Translate: {x: 100, y: -200, z: 0}
@ -989,31 +966,6 @@
Clicked: false Clicked: false
IsActive: true IsActive: true
Scripts: ~ Scripts: ~
- EID: 38
Name: Sensitivity Slider
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 0, y: -100, z: 0}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1000, y: 75, z: 1}
IsActive: true
Renderable Component:
Mesh: 141771688
Material: 128676209
IsActive: true
Slider Component:
Slider Value: 1
Min Value: 0
Max Value: 100
IsActive: true
UI Component:
Canvas ID: 19
Hovered: false
Clicked: false
IsActive: true
Scripts: ~
- EID: 448 - EID: 448
Name: Invert X Toggle Button Name: Invert X Toggle Button
IsActive: true IsActive: true
@ -1166,7 +1118,7 @@
- EID: 43 - EID: 43
Name: Camera Slider Text Group Name: Camera Slider Text Group
IsActive: true IsActive: true
NumberOfChildren: 2 NumberOfChildren: 1
Components: Components:
Transform Component: Transform Component:
Translate: {x: 700, y: -225, z: -0.5} Translate: {x: 700, y: -225, z: -0.5}
@ -1204,31 +1156,6 @@
- Type: SHADE_Scripting.UI.SliderText - Type: SHADE_Scripting.UI.SliderText
Enabled: true Enabled: true
sliderObj: 37 sliderObj: 37
- EID: 45
Name: Sensitivity Slider Text
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 0, y: -100, z: 1}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 75, y: 75, z: 1}
IsActive: true
Text Renderer Component:
Text: 100
Font: 174412429
Color: {x: 0, y: 0, z: 0, w: 1}
Text Size: {x: 1, y: 1, z: 1}
IsActive: true
UI Component:
Canvas ID: 19
Hovered: false
Clicked: false
IsActive: true
Scripts:
- Type: SHADE_Scripting.UI.SliderText
Enabled: true
sliderObj: 38
- EID: 443 - EID: 443
Name: SubMenuBackGround Name: SubMenuBackGround
IsActive: true IsActive: true
@ -1437,7 +1364,7 @@
NumberOfChildren: 0 NumberOfChildren: 0
Components: Components:
Transform Component: Transform Component:
Translate: {x: -150, y: 400, z: 0.100000001} Translate: {x: -250, y: 400, z: 0.100000001}
Rotate: {x: 0, y: 0, z: 0} Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 100, y: 100, z: 1} Scale: {x: 100, y: 100, z: 1}
IsActive: true IsActive: true
@ -1499,7 +1426,7 @@
Transform Component: Transform Component:
Translate: {x: -600, y: 0, z: 0} Translate: {x: -600, y: 0, z: 0}
Rotate: {x: 0, y: 0, z: 0} Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 380, y: 879, z: 1} Scale: {x: 345, y: 800, z: 1}
IsActive: true IsActive: true
Renderable Component: Renderable Component:
Mesh: 141771688 Mesh: 141771688
@ -1507,8 +1434,8 @@
IsActive: true IsActive: true
Button Component: Button Component:
Default Texture: 55897117 Default Texture: 55897117
Hovered Texture: 55897117 Hovered Texture: 56658801
Clicked Texture: 55897117 Clicked Texture: 58281309
IsActive: true IsActive: true
UI Component: UI Component:
Canvas ID: 50 Canvas ID: 50
@ -1527,7 +1454,7 @@
Transform Component: Transform Component:
Translate: {x: 0, y: 0, z: 0} Translate: {x: 0, y: 0, z: 0}
Rotate: {x: 0, y: 0, z: 0} Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 380, y: 879, z: 1} Scale: {x: 345, y: 800, z: 1}
IsActive: true IsActive: true
Renderable Component: Renderable Component:
Mesh: 141771688 Mesh: 141771688
@ -1535,8 +1462,8 @@
IsActive: true IsActive: true
Button Component: Button Component:
Default Texture: 52151774 Default Texture: 52151774
Hovered Texture: 52151774 Hovered Texture: 66730012
Clicked Texture: 52151774 Clicked Texture: 59730316
IsActive: true IsActive: true
UI Component: UI Component:
Canvas ID: 50 Canvas ID: 50
@ -1555,7 +1482,7 @@
Transform Component: Transform Component:
Translate: {x: 600, y: 0, z: 0} Translate: {x: 600, y: 0, z: 0}
Rotate: {x: 0, y: 0, z: 0} Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 380, y: 879, z: 1} Scale: {x: 345, y: 800, z: 1}
IsActive: true IsActive: true
Renderable Component: Renderable Component:
Mesh: 141771688 Mesh: 141771688
@ -1563,8 +1490,8 @@
IsActive: true IsActive: true
Button Component: Button Component:
Default Texture: 51704639 Default Texture: 51704639
Hovered Texture: 51704639 Hovered Texture: 66852283
Clicked Texture: 51704639 Clicked Texture: 53081657
IsActive: true IsActive: true
UI Component: UI Component:
Canvas ID: 50 Canvas ID: 50

View File

@ -30,8 +30,6 @@ public class Item : Script
private bool caputurePos = false; private bool caputurePos = false;
private Vector3 firstPostion; private Vector3 firstPostion;
private Vector3 firstRotation; private Vector3 firstRotation;
private Collider collider;
public float density = 1.0f;
public bool dontReturn = false; public bool dontReturn = false;
@ -52,9 +50,6 @@ public class Item : Script
{ {
transform = GetComponent<Transform>(); transform = GetComponent<Transform>();
rb = GetComponent<RigidBody>(); rb = GetComponent<RigidBody>();
collider = GetComponent<Collider>();
if(collider)
collider.GetCollisionShape(0).Density = density;
rend = GetComponent<Renderable>(); rend = GetComponent<Renderable>();
if (!rend) if (!rend)
@ -156,10 +151,8 @@ public class Item : Script
Audio.DetachAudioClipFromObject(AudioHandler.audioClipHandlers["SFXImpactElastic"]); Audio.DetachAudioClipFromObject(AudioHandler.audioClipHandlers["SFXImpactElastic"]);
Audio.DetachAudioClipFromObject(AudioHandler.audioClipHandlers["SFXImpactHard"]); Audio.DetachAudioClipFromObject(AudioHandler.audioClipHandlers["SFXImpactHard"]);
Debug.Log("ENTER");
if(emitter) if(emitter)
emitter.Emit(); emitter.Emit();
} }
if (info.GameObject.GetScript<Homeowner1>() && homeownerOnce) if (info.GameObject.GetScript<Homeowner1>() && homeownerOnce)

View File

@ -1,4 +1,4 @@
using SHADE; using SHADE;
using SHADE_Scripting; using SHADE_Scripting;
using SHADE_Scripting.Audio; using SHADE_Scripting.Audio;
using System; using System;
@ -212,6 +212,14 @@ public class PickAndThrow : Script
} }
} }
public void SetItemGravityBack()
{
if(itemRidigBody)
itemRidigBody.IsGravityEnabled = true;
if(itemCollider)
itemCollider.GetCollisionShape(0).IsTrigger = false;
}
public void ResetItemObject() public void ResetItemObject()
{ {
itemRidigBody = null; itemRidigBody = null;

View File

@ -340,7 +340,13 @@ public class PlayerController : Script
if (stateMachine && !stateMachine.IsState(typeof(PlayerRunState))) if (stateMachine && !stateMachine.IsState(typeof(PlayerRunState)))
stateMachine.SetState(typeof(PlayerRunState)); stateMachine.SetState(typeof(PlayerRunState));
if (pat && holdItem)
{
holdItem = false; holdItem = false;
pat.SetItemGravityBack();
pat.ResetItemObject();
}
if (!sprintIncreaseOnce) if (!sprintIncreaseOnce)
{ {
sprintIncreaseOnce = true; sprintIncreaseOnce = true;
@ -513,8 +519,9 @@ public class PlayerController : Script
if (holdItem) if (holdItem)
{ {
holdItem = false; holdItem = false;
Debug.Log("PLAYER RETURN");
pat.item.GetScript<Item>().returnBack = true; pat.item.GetScript<Item>().returnBack = true;
pat.SetItemGravityBack();
pat.ResetItemObject();
} }
if (isAiming) if (isAiming)
{ {

View File

@ -12,6 +12,7 @@ public class InverseCamera : Script
public bool inverseX = false; public bool inverseX = false;
public bool inverseY = false; public bool inverseY = false;
protected override void awake() protected override void awake()
{ {
UIElement ui = GetComponent<UIElement>(); UIElement ui = GetComponent<UIElement>();
@ -29,19 +30,17 @@ public class InverseCamera : Script
Debug.LogError("Failed to register Toggle action for inverse"); Debug.LogError("Failed to register Toggle action for inverse");
} }
} }
protected override void start() protected override void update()
{ {
UIElement ui = GetComponent<UIElement>(); UIElement ui = GetComponent<UIElement>();
if (ui) if (ui)
{
ui.OnClick.RegisterAction(() =>
{ {
Toggle toggle = ui.GetComponent<Toggle>(); Toggle toggle = ui.GetComponent<Toggle>();
if(inverseX)
if (inverseX)
Settings.inverseX = toggle.GetValue(); Settings.inverseX = toggle.GetValue();
if(inverseY) if (inverseY)
Settings.inverseY = toggle.GetValue(); Settings.inverseY = toggle.GetValue();
});
} }
else else
{ {

View File

@ -13,7 +13,6 @@ namespace SHADE_Scripting.UI
public GameObject sfxVolSlider; public GameObject sfxVolSlider;
public GameObject bgmVolSlider; public GameObject bgmVolSlider;
public GameObject fovSlider; public GameObject fovSlider;
public GameObject sensitivitySlider;
protected override void awake() protected override void awake()
{ {
@ -21,7 +20,6 @@ namespace SHADE_Scripting.UI
Slider sfx = sfxVolSlider.GetComponent<Slider>(); Slider sfx = sfxVolSlider.GetComponent<Slider>();
Slider bgm = bgmVolSlider.GetComponent<Slider>(); Slider bgm = bgmVolSlider.GetComponent<Slider>();
Slider fov = fovSlider.GetComponent<Slider>(); Slider fov = fovSlider.GetComponent<Slider>();
Slider sens = sensitivitySlider.GetComponent<Slider>();
if (mv != null) if (mv != null)
{ {
@ -42,12 +40,6 @@ namespace SHADE_Scripting.UI
fov.ScaledValue = Settings.cameraFOV; fov.ScaledValue = Settings.cameraFOV;
} }
if (sens != null)
{
sens.ScaledValue = Settings.cameraSensitivity;
}
} }
@ -58,7 +50,6 @@ namespace SHADE_Scripting.UI
Slider sfx = sfxVolSlider.GetComponent<Slider>(); Slider sfx = sfxVolSlider.GetComponent<Slider>();
Slider bgm = bgmVolSlider.GetComponent<Slider>(); Slider bgm = bgmVolSlider.GetComponent<Slider>();
Slider fov = fovSlider.GetComponent<Slider>(); Slider fov = fovSlider.GetComponent<Slider>();
Slider sens = sensitivitySlider.GetComponent<Slider>();
if (mv != null) if (mv != null)
{ {
@ -80,11 +71,6 @@ namespace SHADE_Scripting.UI
{ {
Settings.cameraFOV = fov.ScaledValue; Settings.cameraFOV = fov.ScaledValue;
} }
if (sens != null)
{
Settings.cameraSensitivity = sens.ScaledValue;
}
} }

View File

@ -0,0 +1,3 @@
Name: Credits
ID: 55278388
Type: 3

View File

@ -1,3 +0,0 @@
Name: Credits_Placeholder
ID: 59379300
Type: 3

Binary file not shown.

View File

@ -0,0 +1,3 @@
Name: LevelSelect_1_hover
ID: 56658801
Type: 3

View File

@ -0,0 +1,3 @@
Name: LevelSelect_1_pressed
ID: 58281309
Type: 3

Binary file not shown.

View File

@ -0,0 +1,3 @@
Name: LevelSelect_2_hover
ID: 66730012
Type: 3

View File

@ -0,0 +1,3 @@
Name: LevelSelect_2_pressed
ID: 59730316
Type: 3

Binary file not shown.

View File

@ -0,0 +1,3 @@
Name: LevelSelect_3_hover
ID: 66852283
Type: 3

View File

@ -0,0 +1,3 @@
Name: LevelSelect_3_pressed
ID: 53081657
Type: 3