xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity

Bug fixes and new assets #246

Merged
glencelow merged 10 commits from PlayerController into main 2022-11-22 16:25:14 +08:00
Conversation 0 Commits 10 Files Changed 103 +50 -56
1 changed files with 50 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 81d44e6c59 - Show all commits

106
Assets/Scenes/MainGame.shade
View File

@ -1121,7 +1121,7 @@
NumberOfChildren: 1 NumberOfChildren: 1
Components: Components:
Transform Component: Transform Component:
Translate: {x: -1.65186975e-10, y: 0, z: -0.000383377075} Translate: {x: -6.4710548e-10, y: 0, z: -0.00173091888}
Rotate: {x: -0, y: 0, z: 0} Rotate: {x: -0, y: 0, z: 0}
Scale: {x: 1, y: 1.10000002, z: 1} Scale: {x: 1, y: 1.10000002, z: 1}
IsActive: true IsActive: true
@ -1139,7 +1139,7 @@
NumberOfChildren: 0 NumberOfChildren: 0
Components: Components:
Transform Component: Transform Component:
Translate: {x: -0.400000006, y: 0, z: 0.113329887} Translate: {x: -0.400000006, y: 0, z: 0.113865376}
Rotate: {x: -0, y: 1.57079649, z: 0} Rotate: {x: -0, y: 1.57079649, z: 0}
Scale: {x: 1, y: 1, z: 1} Scale: {x: 1, y: 1, z: 1}
IsActive: true IsActive: true
@ -2997,7 +2997,7 @@
NumberOfChildren: 0 NumberOfChildren: 0
Components: Components:
Transform Component: Transform Component:
Translate: {x: 0.980086565, y: 0.306859791, z: 0.000326213776} Translate: {x: 0.980086565, y: 0.306859791, z: 0.000663099228}
Rotate: {x: -0, y: 0, z: 0} Rotate: {x: -0, y: 0, z: 0}
Scale: {x: 0.999737263, y: 1, z: 0.999737263} Scale: {x: 0.999737263, y: 1, z: 0.999737263}
IsActive: true IsActive: true
@ -3055,7 +3055,7 @@
NumberOfChildren: 0 NumberOfChildren: 0
Components: Components:
Transform Component: Transform Component:
Translate: {x: 0.546194077, y: 1.02225077, z: 0.000168805782} Translate: {x: 0.546036243, y: 1.02225077, z: 0.00050569122}
Rotate: {x: -0, y: 0, z: 0} Rotate: {x: -0, y: 0, z: 0}
Scale: {x: 0.999866426, y: 1, z: 0.999866426} Scale: {x: 0.999866426, y: 1, z: 0.999866426}
IsActive: true IsActive: true
@ -3113,7 +3113,7 @@
NumberOfChildren: 0 NumberOfChildren: 0
Components: Components:
Transform Component: Transform Component:
Translate: {x: 0.79029417, y: 0.665752649, z: 0.000367199129} Translate: {x: 0.79029417, y: 0.665752649, z: 0.000704084581}
Rotate: {x: -0, y: 0, z: 0} Rotate: {x: -0, y: 0, z: 0}
Scale: {x: 0.999760687, y: 1, z: 0.999760687} Scale: {x: 0.999760687, y: 1, z: 0.999760687}
IsActive: true IsActive: true
@ -3197,7 +3197,7 @@
NumberOfChildren: 1 NumberOfChildren: 1
Components: Components:
Transform Component: Transform Component:
Translate: {x: 0.537624598, y: 0.246981457, z: 4.02331389e-05} Translate: {x: 0.537624598, y: 0.246981457, z: 0.000124454513}
Rotate: {x: 1.34603506e-05, y: 3.58487387e-06, z: -1.04719746} Rotate: {x: 1.34603506e-05, y: 3.58487387e-06, z: -1.04719746}
Scale: {x: 1.00001323, y: 0.999983132, z: 0.999992907} Scale: {x: 1.00001323, y: 0.999983132, z: 0.999992907}
IsActive: true IsActive: true
@ -3238,7 +3238,7 @@
NumberOfChildren: 0 NumberOfChildren: 0
Components: Components:
Transform Component: Transform Component:
Translate: {x: 0.678130627, y: 0.635995746, z: -0.000537693559} Translate: {x: 0.678130627, y: 0.635995746, z: -0.000453472167}
Rotate: {x: -0, y: 0, z: 0} Rotate: {x: -0, y: 0, z: 0}
Scale: {x: 0.999971926, y: 1, z: 0.947892308} Scale: {x: 0.999971926, y: 1, z: 0.947892308}
IsActive: true IsActive: true
@ -3354,7 +3354,7 @@
NumberOfChildren: 0 NumberOfChildren: 0
Components: Components:
Transform Component: Transform Component:
Translate: {x: 0.49982515, y: 0.0500000007, z: 0.460019141} Translate: {x: 0.499101311, y: 0.0500000007, z: 0.460019141}
Rotate: {x: -0, y: 0, z: 0} Rotate: {x: -0, y: 0, z: 0}
Scale: {x: 0.999967337, y: 1, z: 0.999967337} Scale: {x: 0.999967337, y: 1, z: 0.999967337}
IsActive: true IsActive: true
@ -3470,7 +3470,7 @@
NumberOfChildren: 0 NumberOfChildren: 0
Components: Components:
Transform Component: Transform Component:
Translate: {x: 0.500506282, y: 0.0500000007, z: -0.459571123} Translate: {x: 0.500843167, y: 0.0500000007, z: -0.459560156}
Rotate: {x: -0, y: 0.559825659, z: 0} Rotate: {x: -0, y: 0.559825659, z: 0}
Scale: {x: 0.999928236, y: 1, z: 0.999928236} Scale: {x: 0.999928236, y: 1, z: 0.999928236}
IsActive: true IsActive: true
@ -4012,7 +4012,7 @@
NumberOfChildren: 0 NumberOfChildren: 0
Components: Components:
Transform Component: Transform Component:
Translate: {x: 0.499338686, y: 0.0500000119, z: -0.460031509} Translate: {x: 0.499338686, y: 0.0500000119, z: -0.460074902}
Rotate: {x: -0, y: 0.107343696, z: 0} Rotate: {x: -0, y: 0.107343696, z: 0}
Scale: {x: 0.999879241, y: 1, z: 0.999879241} Scale: {x: 0.999879241, y: 1, z: 0.999879241}
IsActive: true IsActive: true
@ -4038,7 +4038,7 @@
NumberOfChildren: 0 NumberOfChildren: 0
Components: Components:
Transform Component: Transform Component:
Translate: {x: 0.499584854, y: 0.0500000119, z: 0.460034132} Translate: {x: 0.499669075, y: 0.0500000119, z: 0.460034132}
Rotate: {x: 0, y: -0.299843848, z: 0} Rotate: {x: 0, y: -0.299843848, z: 0}
Scale: {x: 0.999920487, y: 1, z: 0.999920487} Scale: {x: 0.999920487, y: 1, z: 0.999920487}
IsActive: true IsActive: true
@ -4122,7 +4122,7 @@
NumberOfChildren: 0 NumberOfChildren: 0
Components: Components:
Transform Component: Transform Component:
Translate: {x: 0.675502121, y: 0.589012742, z: -9.19103622e-05} Translate: {x: 0.675502121, y: 0.589012742, z: -0.000428795815}
Rotate: {x: -0, y: 0, z: 0} Rotate: {x: -0, y: 0, z: 0}
Scale: {x: 0.999956608, y: 1, z: 0.999956608} Scale: {x: 0.999956608, y: 1, z: 0.999956608}
IsActive: true IsActive: true
@ -4426,7 +4426,7 @@
NumberOfChildren: 1 NumberOfChildren: 1
Components: Components:
Transform Component: Transform Component:
Translate: {x: 0.536073983, y: 0.246981457, z: 4.76837158e-06} Translate: {x: 0.535853326, y: 0.246981457, z: 4.76837158e-06}
Rotate: {x: -0, y: 0, z: 0} Rotate: {x: -0, y: 0, z: 0}
Scale: {x: 0.999996006, y: 0.999996006, z: 1} Scale: {x: 0.999996006, y: 0.999996006, z: 1}
IsActive: true IsActive: true
@ -4467,7 +4467,7 @@
NumberOfChildren: 0 NumberOfChildren: 0
Components: Components:
Transform Component: Transform Component:
Translate: {x: -9.60231046e-05, y: 0.649999976, z: 3.81469727e-06} Translate: {x: -0.000432908564, y: 0.649999976, z: 3.81469727e-06}
Rotate: {x: -0, y: 0, z: 0} Rotate: {x: -0, y: 0, z: 0}
Scale: {x: 0.999995291, y: 1, z: 0.999995291} Scale: {x: 0.999995291, y: 1, z: 0.999995291}
IsActive: true IsActive: true
@ -4971,7 +4971,7 @@
NumberOfChildren: 0 NumberOfChildren: 0
Components: Components:
Transform Component: Transform Component:
Translate: {x: -9.56058502e-05, y: 0, z: -1.14526273e-07} Translate: {x: -0.000432491302, y: 0, z: -1.14566433e-07}
Rotate: {x: -0, y: 1.57079649, z: 0} Rotate: {x: -0, y: 1.57079649, z: 0}
Scale: {x: 0.999999225, y: 1, z: 0.999999225} Scale: {x: 0.999999225, y: 1, z: 0.999999225}
IsActive: true IsActive: true
@ -4997,7 +4997,7 @@
NumberOfChildren: 0 NumberOfChildren: 0
Components: Components:
Transform Component: Transform Component:
Translate: {x: -9.56058502e-05, y: 2, z: -1.14526273e-07} Translate: {x: -0.000432491302, y: 2, z: -1.14566433e-07}
Rotate: {x: -0, y: 1.57079601, z: 0} Rotate: {x: -0, y: 1.57079601, z: 0}
Scale: {x: 0.99998945, y: 1, z: 0.99998945} Scale: {x: 0.99998945, y: 1, z: 0.99998945}
IsActive: true IsActive: true
@ -5023,7 +5023,7 @@
NumberOfChildren: 0 NumberOfChildren: 0
Components: Components:
Transform Component: Transform Component:
Translate: {x: -9.56058502e-05, y: 1, z: -0.500000119} Translate: {x: -0.000432491302, y: 1, z: -0.500000119}
Rotate: {x: 2.08616285e-07, y: 1.57079577, z: 1.57079554} Rotate: {x: 2.08616285e-07, y: 1.57079577, z: 1.57079554}
Scale: {x: 2, y: 0.999999523, z: 1.10000002} Scale: {x: 2, y: 0.999999523, z: 1.10000002}
IsActive: true IsActive: true
@ -5049,7 +5049,7 @@
NumberOfChildren: 0 NumberOfChildren: 0
Components: Components:
Transform Component: Transform Component:
Translate: {x: -9.56058502e-05, y: 0.878599584, z: -1.14526273e-07} Translate: {x: -0.000432491302, y: 0.878599584, z: -1.14566433e-07}
Rotate: {x: -0, y: 1.57079601, z: 0} Rotate: {x: -0, y: 1.57079601, z: 0}
Scale: {x: 0.99996531, y: 1, z: 0.99996531} Scale: {x: 0.99996531, y: 1, z: 0.99996531}
IsActive: true IsActive: true
@ -5075,7 +5075,7 @@
NumberOfChildren: 0 NumberOfChildren: 0
Components: Components:
Transform Component: Transform Component:
Translate: {x: -9.56058502e-05, y: 1, z: -1.14526273e-07} Translate: {x: -0.000432491302, y: 1, z: -1.14566433e-07}
Rotate: {x: -0, y: 1.57079601, z: 0} Rotate: {x: -0, y: 1.57079601, z: 0}
Scale: {x: 0.999963462, y: 1, z: 0.999963462} Scale: {x: 0.999963462, y: 1, z: 0.999963462}
IsActive: true IsActive: true
@ -5109,7 +5109,7 @@
NumberOfChildren: 0 NumberOfChildren: 0
Components: Components:
Transform Component: Transform Component:
Translate: {x: -9.56058502e-05, y: 0, z: -1.14526273e-07} Translate: {x: -0.000432491302, y: 0, z: -1.14566433e-07}
Rotate: {x: -0, y: 1.57079601, z: 0} Rotate: {x: -0, y: 1.57079601, z: 0}
Scale: {x: 0.999942899, y: 1, z: 0.999942899} Scale: {x: 0.999942899, y: 1, z: 0.999942899}
IsActive: true IsActive: true
@ -5177,9 +5177,9 @@
NumberOfChildren: 6 NumberOfChildren: 6
Components: Components:
Transform Component: Transform Component:
Translate: {x: 3.19213867, y: 0, z: -0.926177979} Translate: {x: 3.04601955, y: 0, z: -0.46364665}
Rotate: {x: 0, y: -1.57079601, z: 0} Rotate: {x: -0, y: -1.57079601, z: 0}
Scale: {x: 0.999959767, y: 1.02300358, z: 0.999959767} Scale: {x: 0.999849677, y: 1.02300358, z: 0.999849677}
IsActive: true IsActive: true
Scripts: ~ Scripts: ~
- EID: 258 - EID: 258
@ -5188,8 +5188,8 @@
NumberOfChildren: 0 NumberOfChildren: 0
Components: Components:
Transform Component: Transform Component:
Translate: {x: 2.15561813e-05, y: 0, z: 0.000197887421} Translate: {x: 0.000105956118, y: 0, z: 0.000873088837}
Rotate: {x: -0, y: 1.57079613, z: 0} Rotate: {x: -0, y: 1.57079613, z: -0}
Scale: {x: 1, y: 1, z: 1} Scale: {x: 1, y: 1, z: 1}
IsActive: true IsActive: true
Renderable Component: Renderable Component:
@ -5214,8 +5214,8 @@
NumberOfChildren: 0 NumberOfChildren: 0
Components: Components:
Transform Component: Transform Component:
Translate: {x: 2.15561813e-05, y: 2, z: 0.000197887421} Translate: {x: 0.000105836909, y: 2, z: 0.000872135162}
Rotate: {x: -0, y: 1.57079601, z: 0} Rotate: {x: -0, y: 1.57079601, z: -0}
Scale: {x: 0.99998945, y: 1, z: 0.99998945} Scale: {x: 0.99998945, y: 1, z: 0.99998945}
IsActive: true IsActive: true
Renderable Component: Renderable Component:
@ -5240,7 +5240,7 @@
NumberOfChildren: 0 NumberOfChildren: 0
Components: Components:
Transform Component: Transform Component:
Translate: {x: 2.3642413e-05, y: 1, z: -0.499994278} Translate: {x: 0.00010786378, y: 1, z: -0.499994278}
Rotate: {x: 2.98023224e-08, y: 1.57079542, z: 1.57079542} Rotate: {x: 2.98023224e-08, y: 1.57079542, z: 1.57079542}
Scale: {x: 2, y: 0.999999523, z: 1.10000002} Scale: {x: 2, y: 0.999999523, z: 1.10000002}
IsActive: true IsActive: true
@ -5266,7 +5266,7 @@
NumberOfChildren: 0 NumberOfChildren: 0
Components: Components:
Transform Component: Transform Component:
Translate: {x: 2.15561813e-05, y: 1, z: 0.000197887421} Translate: {x: 0.000105777304, y: 1, z: 0.000871658325}
Rotate: {x: -0, y: 1.57079601, z: 0} Rotate: {x: -0, y: 1.57079601, z: 0}
Scale: {x: 0.999976516, y: 1, z: 0.999976516} Scale: {x: 0.999976516, y: 1, z: 0.999976516}
IsActive: true IsActive: true
@ -5292,7 +5292,7 @@
NumberOfChildren: 0 NumberOfChildren: 0
Components: Components:
Transform Component: Transform Component:
Translate: {x: 2.15561813e-05, y: 1, z: 0.000197887421} Translate: {x: 0.000105777304, y: 1, z: 0.000871658325}
Rotate: {x: -0, y: 1.57079601, z: 0} Rotate: {x: -0, y: 1.57079601, z: 0}
Scale: {x: 0.999963403, y: 1, z: 0.999963403} Scale: {x: 0.999963403, y: 1, z: 0.999963403}
IsActive: true IsActive: true
@ -5326,8 +5326,8 @@
NumberOfChildren: 0 NumberOfChildren: 0
Components: Components:
Transform Component: Transform Component:
Translate: {x: 2.15561813e-05, y: 0, z: 0.000197887421} Translate: {x: 0.000105836909, y: 0, z: 0.000872135162}
Rotate: {x: -0, y: 1.57079601, z: 0} Rotate: {x: -0, y: 1.57079601, z: -0}
Scale: {x: 0.999942899, y: 1, z: 0.999942899} Scale: {x: 0.999942899, y: 1, z: 0.999942899}
IsActive: true IsActive: true
Renderable Component: Renderable Component:
@ -5423,7 +5423,7 @@
NumberOfChildren: 0 NumberOfChildren: 0
Components: Components:
Transform Component: Transform Component:
Translate: {x: 4.76310925e-05, y: 1, z: -0.500002861} Translate: {x: 0.000216073822, y: 1, z: -0.500002861}
Rotate: {x: 2.98023224e-08, y: 1.57079542, z: 1.57079542} Rotate: {x: 2.98023224e-08, y: 1.57079542, z: 1.57079542}
Scale: {x: 2, y: 0.999999523, z: 1.10000002} Scale: {x: 2, y: 0.999999523, z: 1.10000002}
IsActive: true IsActive: true
@ -8501,9 +8501,9 @@
NumberOfChildren: 3 NumberOfChildren: 3
Components: Components:
Transform Component: Transform Component:
Translate: {x: 2.22697735, y: 0.396249354, z: 7.27700758} Translate: {x: 1.82666111, y: 0.00499972701, z: 7.4207387}
Rotate: {x: -0, y: 0, z: -0} Rotate: {x: -0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1} Scale: {x: 0.999999881, y: 1, z: 0.999999881}
IsActive: true IsActive: true
Renderable Component: Renderable Component:
Mesh: 149697411 Mesh: 149697411
@ -8527,7 +8527,7 @@
Colliders: Colliders:
- Is Trigger: false - Is Trigger: false
Type: Box Type: Box
Half Extents: {x: 0.5, y: 0.5, z: 0.5} Half Extents: {x: 0.400000006, y: 0.5, z: 0.300000012}
Friction: 0.400000006 Friction: 0.400000006
Bounciness: 0 Bounciness: 0
Density: 1 Density: 1
@ -8537,13 +8537,13 @@
Scripts: Scripts:
- Type: PlayerController - Type: PlayerController
currentState: 0 currentState: 0
maxMoveVel: 4 maxMoveVel: 3
moveForce: 50 moveForce: 50
sprintMultiplier: 1.5 sprintMultiplier: 1.5
rotationFactorPerFrame: 4 rotationFactorPerFrame: 5
maxJumpHeight: 4 maxJumpHeight: 1
maxJumpTime: 0.75 maxJumpTime: 0.5
fallMultipler: 2 fallMultipler: 3
lightMultiper: 0.75 lightMultiper: 0.75
mediumMultiper: 0.5 mediumMultiper: 0.5
heavyMultiper: 0.25 heavyMultiper: 0.25
@ -8551,12 +8551,6 @@
throwForce: [300, 300, 300] throwForce: [300, 300, 300]
delayTimer: 1 delayTimer: 1
aimingLength: 1.5 aimingLength: 1.5
- Type: StateMachine
currentStateName: ""
currentAnimName: ""
- Type: StateMachine
currentStateName: ""
currentAnimName: ""
- EID: 3 - EID: 3
Name: HoldingPoint Name: HoldingPoint
IsActive: true IsActive: true
@ -8569,20 +8563,20 @@
IsActive: true IsActive: true
Scripts: ~ Scripts: ~
- EID: 4 - EID: 4
Name: Default Name: PlayerCamera
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}
Rotate: {x: 0, y: 5.99521875, z: 0} Rotate: {x: -0.785332263, y: 2.95694828, 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.22697735, y: 0.396249354, z: 7.27700758} Position: {x: 1.82666111, y: 0.00499972701, z: 7.4207387}
Pitch: 0 Pitch: -44.9962234
Yaw: 343.500702 Yaw: 169.420654
Roll: 0 Roll: 1.28065994e-06
Width: 1920 Width: 1920
Height: 1080 Height: 1080
Near: 0.00999999978 Near: 0.00999999978
@ -8591,12 +8585,12 @@
IsActive: true IsActive: true
Scripts: Scripts:
- Type: SHADE_Scripting.ThirdPersonCamera - Type: SHADE_Scripting.ThirdPersonCamera
armLength: 2 armLength: 1
turnSpeedPitch: 0.300000012 turnSpeedPitch: 0.300000012
turnSpeedYaw: 0.5 turnSpeedYaw: 0.5
pitchClamp: 45 pitchClamp: 45
- EID: 9 - EID: 9
Name: Default Name: PlayerBag
IsActive: true IsActive: true
NumberOfChildren: 0 NumberOfChildren: 0
Components: Components: