Compare commits
27 Commits
main
...
5ff0a66971
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5ff0a66971 | ||
|
|
ce33771dfa | ||
| 676c523cf3 | |||
|
|
88b0acdaaa | ||
|
|
f663c934ab | ||
|
|
ee71a34ecc | ||
|
|
a083af6f5e | ||
|
|
b3ff205e69 | ||
|
|
07b7f5d48b | ||
|
|
cee2e74f29 | ||
|
|
f2df9a6910 | ||
|
|
6ebfd4ef2b | ||
|
|
78498e5212 | ||
|
|
80276fbdbf | ||
|
|
598fa9f6fc | ||
|
|
ae1908013d | ||
|
|
39313c96d0 | ||
|
|
4a1dbb9728 | ||
|
|
7fbe05e39b | ||
|
|
92c6ac0016 | ||
|
|
706e53c5f7 | ||
|
|
1c27be3e2f | ||
|
|
7ee82db2cb | ||
|
|
e95748e0e2 | ||
|
|
355f6207a5 | ||
|
|
947be1a946 | ||
|
|
43de6b0d3b |
@@ -12,15 +12,18 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: 7a686a47eee2fa44cb0a34b5d86e4d5e, type: 3}
|
m_Script: {fileID: 11500000, guid: 7a686a47eee2fa44cb0a34b5d86e4d5e, type: 3}
|
||||||
m_Name: GrappleAimBT
|
m_Name: GrappleAimBT
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
_serializedGraph: '{"type":"NodeCanvas.BehaviourTrees.BehaviourTree","nodes":[{"_position":{"x":730.5245,"y":284.5939},"$type":"NodeCanvas.BehaviourTrees.Sequencer","$id":"0"},{"_condition":{"actionName":{"_value":"Grapple"},"actionValue":{},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_position":{"x":498.9515,"y":429.918},"$type":"NodeCanvas.BehaviourTrees.WaitUntil","$id":"1"},{"_action":{"fieldOfView":{"label":"FOV","value":60.0,"changeValue":1},"orbitFollowTop":{"label":"Top","changeHeight":1,"height":2.0,"changeRadius":1,"radius":2.0},"orbitFollowCenter":{"label":"Center","changeHeight":1,"height":1.5,"changeRadius":1,"radius":2.4},"orbitFollowBottom":{"label":"Bottom","changeHeight":1,"height":0.7,"changeRadius":1,"radius":2.0},"cameraOffset":{"label":"Screen
|
_serializedGraph: '{"type":"NodeCanvas.BehaviourTrees.BehaviourTree","nodes":[{"_position":{"x":732.5245,"y":286.5939},"$type":"NodeCanvas.BehaviourTrees.Sequencer","$id":"0"},{"_condition":{"actionName":{"_value":"Grapple"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_position":{"x":359.9515,"y":502.918},"$type":"NodeCanvas.BehaviourTrees.WaitUntil","$id":"1"},{"_action":{"fieldOfView":{"label":"FOV","value":60.0,"changeValue":1},"orbitPositionDamping":{"label":"Position
|
||||||
Position","newValue":{"x":2.0,"z":-1.0},"changeX":1,"changeZ":1},"$type":"NodeCanvas.Tasks.Actions.ChangeCameraSettings"},"_position":{"x":527.6321,"y":581.3029},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"2"},{"_action":{"waitTime":{"_value":0.3},"$type":"NodeCanvas.Tasks.Actions.Wait"},"_position":{"x":682.4366,"y":430.895},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"3"},{"_condition":{"actionName":{"_value":"Grapple"},"actionValue":{},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_position":{"x":826.7462,"y":427.8908},"$type":"NodeCanvas.BehaviourTrees.WaitUntil","$id":"4"},{"_action":{"fieldOfView":{"label":"FOV","changeValue":2},"orbitFollowTop":{"label":"Top","changeHeight":2,"changeRadius":2},"orbitFollowCenter":{"label":"Center","changeHeight":2,"changeRadius":2},"orbitFollowBottom":{"label":"Bottom","changeHeight":2,"changeRadius":2},"screenPosition":{"label":"Screen
|
Damping","newValue":{"x":0.2,"z":0.2},"changeX":1,"changeZ":1},"orbitFollowTop":{"label":"Top","changeHeight":1,"height":2.0,"changeRadius":1,"radius":2.0},"orbitFollowCenter":{"label":"Center","changeHeight":1,"height":1.5,"changeRadius":1,"radius":2.4},"orbitFollowBottom":{"label":"Bottom","changeHeight":1,"height":0.2,"changeRadius":1,"radius":0.8},"cameraOffset":{"label":"Screen
|
||||||
Position","changeX":2,"changeY":2},"cameraOffset":{"label":"Screen Position","changeX":2,"changeY":2,"changeZ":2},"$type":"NodeCanvas.Tasks.Actions.ChangeCameraSettings"},"_position":{"x":880.8403,"y":568.1857},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"5"}],"connections":[{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"4"},"_targetNode":{"$ref":"5"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{}},"derivedData":{"repeat":true,"$type":"NodeCanvas.BehaviourTrees.BehaviourTree+DerivedSerializationData"}}'
|
Position","newValue":{"x":2.0,"y":0.5,"z":-1.0},"changeX":1,"changeY":1,"changeZ":1},"$type":"NodeCanvas.Tasks.Actions.ChangeCameraSettings"},"_position":{"x":184.6321,"y":659.3029},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"2"},{"policy":1,"_position":{"x":599.0,"y":507.0},"$type":"NodeCanvas.BehaviourTrees.Parallel","$id":"3"},{"repeaterMode":2,"repeatTimes":{"_value":1},"_position":{"x":470.0,"y":657.0},"$type":"NodeCanvas.BehaviourTrees.Repeater","$id":"4"},{"_action":{"eventName":{"_value":"Grapple
|
||||||
|
Zoomed"},"delay":{},"$type":"NodeCanvas.Tasks.Actions.SendEvent"},"_position":{"x":438.0,"y":795.0},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"5"},{"_action":{"waitTime":{"_value":0.1},"$type":"NodeCanvas.Tasks.Actions.Wait"},"_position":{"x":647.4366,"y":655.895},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"6"},{"failureRemap":1,"_position":{"x":839.0,"y":509.0},"$type":"NodeCanvas.BehaviourTrees.Remapper","$id":"7"},{"_condition":{"actionName":{"_value":"Grapple"},"actionPhase":{"_value":4},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_position":{"x":798.0,"y":585.0},"$type":"NodeCanvas.BehaviourTrees.Interruptor","$id":"8"},{"repeaterMode":2,"repeatTimes":{"_value":1},"_position":{"x":838.9237,"y":701.0772},"$type":"NodeCanvas.BehaviourTrees.Repeater","$id":"9"},{"_action":{"eventName":{"_value":"Grapple
|
||||||
|
Zoomed"},"delay":{},"$type":"NodeCanvas.Tasks.Actions.SendEvent"},"_position":{"x":807.9237,"y":837.0771},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"10"},{"_action":{"fieldOfView":{"label":"FOV","changeValue":2},"orbitFollowTop":{"label":"Top","changeHeight":2,"changeRadius":2},"orbitFollowCenter":{"label":"Center","changeHeight":2,"changeRadius":2},"orbitFollowBottom":{"label":"Bottom","changeHeight":2,"changeRadius":2},"screenPosition":{"label":"Screen
|
||||||
|
Position","changeX":2,"changeY":2},"cameraOffset":{"label":"Screen Position","changeX":2,"changeY":2,"changeZ":2},"$type":"NodeCanvas.Tasks.Actions.ChangeCameraSettings"},"_position":{"x":1186.84,"y":501.1857},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"11"}],"connections":[{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"7"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"11"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"6"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"4"},"_targetNode":{"$ref":"5"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"7"},"_targetNode":{"$ref":"8"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"8"},"_targetNode":{"$ref":"9"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"9"},"_targetNode":{"$ref":"10"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{}},"derivedData":{"repeat":true,"$type":"NodeCanvas.BehaviourTrees.BehaviourTree+DerivedSerializationData"}}'
|
||||||
_objectReferences: []
|
_objectReferences: []
|
||||||
_graphSource:
|
_graphSource:
|
||||||
_version: 3.31
|
_version: 3.31
|
||||||
_category:
|
_category:
|
||||||
_comments:
|
_comments:
|
||||||
_translation: {x: -21.80302, y: 59.90968}
|
_translation: {x: -285, y: -93}
|
||||||
_zoomFactor: 1
|
_zoomFactor: 1
|
||||||
_haltSerialization: 0
|
_haltSerialization: 0
|
||||||
_externalSerializationFile: {fileID: 0}
|
_externalSerializationFile: {fileID: 0}
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: 7a686a47eee2fa44cb0a34b5d86e4d5e, type: 3}
|
m_Script: {fileID: 11500000, guid: 7a686a47eee2fa44cb0a34b5d86e4d5e, type: 3}
|
||||||
m_Name: GroundedCheckBT
|
m_Name: GroundedCheckBT
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
_serializedGraph: '{"type":"NodeCanvas.BehaviourTrees.BehaviourTree","nodes":[{"repeaterMode":2,"repeatTimes":{"_value":1},"_position":{"x":476.0,"y":327.0},"$type":"NodeCanvas.BehaviourTrees.Repeater","$id":"0"},{"_position":{"x":550.0,"y":433.0},"$type":"NodeCanvas.BehaviourTrees.Sequencer","$id":"1"},{"_condition":{"valueA":{"_name":"isGrounded","_targetVariableID":"09b3259f-8b50-439a-ab86-ea3d8a4916f1"},"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_position":{"x":458.0,"y":522.0},"$type":"NodeCanvas.BehaviourTrees.WaitUntil","$id":"2"},{"_action":{"airMoveDirection":{"_name":"airMoveDirection","_targetVariableID":"2fc91db6-09dd-4a1f-9195-426a0c44de31"},"inputVector3":{"_name":"groundMoveDirection","_targetVariableID":"a2c4fe25-9549-4bdd-8cec-2dbfc4a8856f"},"$type":"NodeCanvas.Tasks.Actions.SetAirMovement"},"_position":{"x":396.0,"y":655.0},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"3"},{"_condition":{"valueA":{"_name":"isGrounded","_targetVariableID":"09b3259f-8b50-439a-ab86-ea3d8a4916f1"},"valueB":{"_value":true},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_position":{"x":715.0,"y":523.0},"$type":"NodeCanvas.BehaviourTrees.WaitUntil","$id":"4"}],"connections":[{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{}},"derivedData":{"repeat":true,"$type":"NodeCanvas.BehaviourTrees.BehaviourTree+DerivedSerializationData"}}'
|
_serializedGraph: '{"type":"NodeCanvas.BehaviourTrees.BehaviourTree","nodes":[{"repeaterMode":2,"repeatTimes":{"_value":1},"_position":{"x":476.0,"y":327.0},"$type":"NodeCanvas.BehaviourTrees.Repeater","$id":"0"},{"_position":{"x":550.0,"y":433.0},"$type":"NodeCanvas.BehaviourTrees.Sequencer","$id":"1"},{"_condition":{"valueA":{"_name":"isGrounded","_targetVariableID":"09b3259f-8b50-439a-ab86-ea3d8a4916f1"},"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_position":{"x":458.0,"y":522.0},"$type":"NodeCanvas.BehaviourTrees.WaitUntil","$id":"2"},{"_position":{"x":522.0,"y":632.0},"$type":"NodeCanvas.BehaviourTrees.Sequencer","$id":"3"},{"_action":{"airMoveDirection":{"_name":"airMoveDirection","_targetVariableID":"2fc91db6-09dd-4a1f-9195-426a0c44de31"},"inputVector3":{"_name":"groundMoveDirection","_targetVariableID":"a2c4fe25-9549-4bdd-8cec-2dbfc4a8856f"},"$type":"NodeCanvas.Tasks.Actions.SetAirMovement"},"_position":{"x":399.0,"y":775.0},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"4"},{"_action":{"airMoveDirection":{"_name":"groundMoveDirection","_targetVariableID":"a2c4fe25-9549-4bdd-8cec-2dbfc4a8856f"},"inputVector3":{},"$type":"NodeCanvas.Tasks.Actions.SetAirMovement"},"_position":{"x":576.0,"y":776.0},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"5"},{"_condition":{"valueA":{"_name":"isGrounded","_targetVariableID":"09b3259f-8b50-439a-ab86-ea3d8a4916f1"},"valueB":{"_value":true},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_position":{"x":715.0,"y":523.0},"$type":"NodeCanvas.BehaviourTrees.WaitUntil","$id":"6"}],"connections":[{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"6"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"5"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{}},"derivedData":{"repeat":true,"$type":"NodeCanvas.BehaviourTrees.BehaviourTree+DerivedSerializationData"}}'
|
||||||
_objectReferences: []
|
_objectReferences: []
|
||||||
_graphSource:
|
_graphSource:
|
||||||
_version: 3.31
|
_version: 3.31
|
||||||
|
|||||||
@@ -12,16 +12,19 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: f945e777233a59f4aba40aeca29093a6, type: 3}
|
m_Script: {fileID: 11500000, guid: f945e777233a59f4aba40aeca29093a6, type: 3}
|
||||||
m_Name: PlayerLocomotionFSM
|
m_Name: PlayerLocomotionFSM
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
_serializedGraph: '{"type":"NodeCanvas.StateMachines.FSM","nodes":[{"_actionList":{"executionMode":1,"actions":[{"moveSpeed":{"_value":10.0},"moveDirection":{"_name":"groundMoveDirection","_targetVariableID":"16ae5ce4-097a-4c21-94a5-2c5d9ce73eb6"},"$type":"NodeCanvas.Tasks.Actions.CalculateGroundedLocomotion"},{"valueA":{"_name":"rotationSpeed","_targetVariableID":"d888730f-97df-4288-bb99-1f6c8a34a7c5"},"valueB":{"_value":0.3},"$type":"NodeCanvas.Tasks.Actions.SetFloat"}]},"_repeatStateActions":true,"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_position":{"x":559.9924,"y":711.7622},"$type":"NodeCanvas.StateMachines.ActionState","$id":"0"},{"_actionList":{"executionMode":1,"actions":[{"moveSpeed":{"_value":15.0},"moveDirection":{"_name":"groundMoveDirection","_targetVariableID":"16ae5ce4-097a-4c21-94a5-2c5d9ce73eb6"},"$type":"NodeCanvas.Tasks.Actions.CalculateGroundedLocomotion"},{"valueA":{"_name":"rotationSpeed","_targetVariableID":"d888730f-97df-4288-bb99-1f6c8a34a7c5"},"valueB":{"_value":0.2},"$type":"NodeCanvas.Tasks.Actions.SetFloat"}]},"_repeatStateActions":true,"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_position":{"x":1161.288,"y":522.152},"$type":"NodeCanvas.StateMachines.ActionState","$id":"1"},{"_position":{"x":430.6569,"y":381.1322},"$type":"NodeCanvas.StateMachines.AnyState","$id":"2"},{"_position":{"x":465.0,"y":561.0},"$type":"NodeCanvas.StateMachines.EmptyState","$id":"3"}],"connections":[{"_condition":{"actionName":{"_value":"Sprint"},"actionValue":{"_value":""},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"desiredVector3":{"_value":{"z":1.0}},"tolerance":{"_value":0.5},"negate":{},"$type":"NodeCanvas.Tasks.Conditions.GetMovementInputDotProduct"},"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"isGrounded","_targetVariableID":"321e55c7-f93e-4667-a0dc-559eb61c6898"},"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"isGrounded","_targetVariableID":"321e55c7-f93e-4667-a0dc-559eb61c6898"},"valueB":{"_value":true},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{"isGrounded":{"_propertyPath":"UnityEngine.CharacterController.isGrounded","_name":"isGrounded","_id":"321e55c7-f93e-4667-a0dc-559eb61c6898","$type":"NodeCanvas.Framework.Variable`1[[System.Boolean,
|
_serializedGraph: '{"type":"NodeCanvas.StateMachines.FSM","nodes":[{"_actionList":{"executionMode":1,"actions":[{"moveSpeed":{"_value":12.0},"moveDirection":{"_name":"groundMoveDirection","_targetVariableID":"16ae5ce4-097a-4c21-94a5-2c5d9ce73eb6"},"$type":"NodeCanvas.Tasks.Actions.CalculateGroundedLocomotion"},{"valueA":{"_name":"rotationSpeed","_targetVariableID":"d888730f-97df-4288-bb99-1f6c8a34a7c5"},"valueB":{"_value":10.0},"$type":"NodeCanvas.Tasks.Actions.SetFloat"},{"valueA":{"_name":"facingDirection","_targetVariableID":"c713d622-aafb-43e7-ae0e-ac0b86a85a37"},"valueB":{"_value":1},"$type":"NodeCanvas.Tasks.Actions.SetVariable`1[[Reset.Player.Movement.PlayerFacingDirection,
|
||||||
|
Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}]},"_repeatStateActions":true,"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_position":{"x":559.9924,"y":711.7622},"$type":"NodeCanvas.StateMachines.ActionState","$id":"0"},{"_actionList":{"executionMode":1,"actions":[{"moveSpeed":{"_value":30.0},"moveDirection":{"_name":"groundMoveDirection","_targetVariableID":"16ae5ce4-097a-4c21-94a5-2c5d9ce73eb6"},"$type":"NodeCanvas.Tasks.Actions.CalculateGroundedLocomotion"},{"valueA":{"_name":"rotationSpeed","_targetVariableID":"d888730f-97df-4288-bb99-1f6c8a34a7c5"},"valueB":{"_value":1.0},"$type":"NodeCanvas.Tasks.Actions.SetFloat"},{"valueA":{"_name":"facingDirection","_targetVariableID":"c713d622-aafb-43e7-ae0e-ac0b86a85a37"},"valueB":{"_value":2},"$type":"NodeCanvas.Tasks.Actions.SetVariable`1[[Reset.Player.Movement.PlayerFacingDirection,
|
||||||
|
Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}]},"_repeatStateActions":true,"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_position":{"x":916.0607,"y":852.7302},"$type":"NodeCanvas.StateMachines.ActionState","$id":"1"},{"_actionList":{"executionMode":1,"actions":[{"moveSpeed":{"_value":20.0},"moveDirection":{"_name":"groundMoveDirection","_targetVariableID":"16ae5ce4-097a-4c21-94a5-2c5d9ce73eb6"},"$type":"NodeCanvas.Tasks.Actions.CalculateGroundedLocomotion"},{"valueA":{"_name":"rotationSpeed","_targetVariableID":"d888730f-97df-4288-bb99-1f6c8a34a7c5"},"valueB":{"_value":2.0},"$type":"NodeCanvas.Tasks.Actions.SetFloat"}]},"_repeatStateActions":true,"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_position":{"x":1161.288,"y":522.152},"$type":"NodeCanvas.StateMachines.ActionState","$id":"2"},{"_position":{"x":383.6569,"y":483.1322},"$type":"NodeCanvas.StateMachines.AnyState","$id":"3"},{"_position":{"x":419.0,"y":609.0},"$type":"NodeCanvas.StateMachines.EmptyState","$id":"4"}],"connections":[{"_condition":{"actionName":{"_value":"Sprint"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":0.1},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"checkAgainst":2,"checkAgainstValue":{"_value":{"z":1.0}},"desiredValue":{"_value":1.0},"tolerance":{"_value":0.32},"considerCameraRotation":{},"negate":{},"$type":"NodeCanvas.Tasks.Conditions.GetMovementInputDotProduct"},"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"isGrounded","_targetVariableID":"321e55c7-f93e-4667-a0dc-559eb61c6898"},"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"isGrounded","_targetVariableID":"321e55c7-f93e-4667-a0dc-559eb61c6898"},"valueB":{"_value":true},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"4"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{"isGrounded":{"_propertyPath":"UnityEngine.CharacterController.isGrounded","_name":"isGrounded","_id":"321e55c7-f93e-4667-a0dc-559eb61c6898","$type":"NodeCanvas.Framework.Variable`1[[System.Boolean,
|
||||||
mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"groundMoveDirection":{"_name":"groundMoveDirection","_id":"16ae5ce4-097a-4c21-94a5-2c5d9ce73eb6","_isPublic":true,"$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Vector3,
|
mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"groundMoveDirection":{"_name":"groundMoveDirection","_id":"16ae5ce4-097a-4c21-94a5-2c5d9ce73eb6","_isPublic":true,"$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Vector3,
|
||||||
UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"rotationSpeed":{"_name":"rotationSpeed","_id":"d888730f-97df-4288-bb99-1f6c8a34a7c5","_isPublic":true,"$type":"NodeCanvas.Framework.Variable`1[[System.Single,
|
UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"rotationSpeed":{"_name":"rotationSpeed","_id":"d888730f-97df-4288-bb99-1f6c8a34a7c5","_isPublic":true,"$type":"NodeCanvas.Framework.Variable`1[[System.Single,
|
||||||
mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"}}}}'
|
mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"facingDirection":{"_name":"facingDirection","_id":"c713d622-aafb-43e7-ae0e-ac0b86a85a37","_isPublic":true,"$type":"NodeCanvas.Framework.Variable`1[[Reset.Player.Movement.PlayerFacingDirection,
|
||||||
|
Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}}}}'
|
||||||
_objectReferences: []
|
_objectReferences: []
|
||||||
_graphSource:
|
_graphSource:
|
||||||
_version: 3.31
|
_version: 3.31
|
||||||
_category:
|
_category:
|
||||||
_comments:
|
_comments:
|
||||||
_translation: {x: 1, y: -175}
|
_translation: {x: -258, y: -69}
|
||||||
_zoomFactor: 0.9967056
|
_zoomFactor: 1
|
||||||
_haltSerialization: 0
|
_haltSerialization: 0
|
||||||
_externalSerializationFile: {fileID: 0}
|
_externalSerializationFile: {fileID: 0}
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &11400000
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 1726182683, guid: a4865f1ab4504ed8a368670db22f409c, type: 3}
|
||||||
|
m_Name: AOTGenerationConfig
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
automateBeforeBuilds: 0
|
||||||
|
deleteDllAfterBuilds: 1
|
||||||
|
AutomateForAllAOTPlatforms: 1
|
||||||
|
automateForPlatforms: 0900000014000000
|
||||||
|
supportSerializedTypes: []
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 8cf4e72d60c563f44b838b832e931b33
|
guid: 516c69467762d38429c69cc7107c0555
|
||||||
folderAsset: yes
|
NativeFormatImporter:
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName:
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,136 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &11400000
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 772478971, guid: a4865f1ab4504ed8a368670db22f409c, type: 3}
|
||||||
|
m_Name: ColorPaletteManager
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
colorPalettes:
|
||||||
|
- name: Country
|
||||||
|
showAlpha: 0
|
||||||
|
colors:
|
||||||
|
- {r: 0.776, g: 0.651, b: 0.349, a: 1}
|
||||||
|
- {r: 0.863, g: 0.761, b: 0.631, a: 1}
|
||||||
|
- {r: 0.91, g: 0.831, b: 0.686, a: 1}
|
||||||
|
- {r: 0.961, g: 0.902, b: 0.788, a: 1}
|
||||||
|
- {r: 0.753, g: 0.714, b: 0.667, a: 1}
|
||||||
|
- {r: 0.478, g: 0.573, b: 0.431, a: 1}
|
||||||
|
- {r: 0.314, g: 0.427, b: 0.31, a: 1}
|
||||||
|
- {r: 0.596, g: 0.345, b: 0.235, a: 1}
|
||||||
|
- {r: 0.545, g: 0.329, b: 0.318, a: 1}
|
||||||
|
- {r: 0.647, g: 0.204, b: 0.227, a: 1}
|
||||||
|
- {r: 0.435, g: 0.161, b: 0.063, a: 1}
|
||||||
|
- {r: 0.357, g: 0.333, b: 0.278, a: 1}
|
||||||
|
- {r: 0.976, g: 0.98, b: 0.961, a: 1}
|
||||||
|
- {r: 0.165, g: 0.271, b: 0.11, a: 1}
|
||||||
|
- name: Beach
|
||||||
|
showAlpha: 0
|
||||||
|
colors:
|
||||||
|
- {r: 0.996, g: 0.906, b: 0.459, a: 1}
|
||||||
|
- {r: 0.314, g: 0.592, b: 0.035, a: 1}
|
||||||
|
- {r: 0.486, g: 0.953, b: 0.875, a: 1}
|
||||||
|
- {r: 0.996, g: 0.82, b: 0.212, a: 1}
|
||||||
|
- {r: 1, g: 0.769, b: 0.165, a: 1}
|
||||||
|
- {r: 0.804, g: 0.835, b: 0.753, a: 1}
|
||||||
|
- {r: 1, g: 0.769, b: 0.165, a: 1}
|
||||||
|
- {r: 1, g: 0.702, b: 0.063, a: 1}
|
||||||
|
- {r: 1, g: 0.898, b: 0.569, a: 1}
|
||||||
|
- name: Fall
|
||||||
|
showAlpha: 0
|
||||||
|
colors:
|
||||||
|
- {r: 0.82, g: 0.722, b: 0.318, a: 1}
|
||||||
|
- {r: 0.537, g: 0.192, b: 0.153, a: 1}
|
||||||
|
- {r: 0.996, g: 0.812, b: 0.012, a: 1}
|
||||||
|
- {r: 1, g: 0.431, b: 0.02, a: 1}
|
||||||
|
- {r: 0.937, g: 0.267, b: 0.094, a: 1}
|
||||||
|
- {r: 0.42, g: 0.212, b: 0.18, a: 1}
|
||||||
|
- {r: 0.992, g: 0.651, b: 0.004, a: 1}
|
||||||
|
- {r: 0.89, g: 0.353, b: 0.086, a: 1}
|
||||||
|
- {r: 1, g: 0.443, b: 0.004, a: 1}
|
||||||
|
- {r: 0.682, g: 0.275, b: 0.137, a: 1}
|
||||||
|
- {r: 0.306, g: 0.231, b: 0.114, a: 1}
|
||||||
|
- {r: 0.384, g: 0.416, b: 0.082, a: 1}
|
||||||
|
- {r: 0.165, g: 0.157, b: 0.008, a: 1}
|
||||||
|
- {r: 0.906, g: 0.635, b: 0.227, a: 1}
|
||||||
|
- {r: 0.82, g: 0.722, b: 0.318, a: 1}
|
||||||
|
- {r: 0.745, g: 0.435, b: 0.031, a: 1}
|
||||||
|
- {r: 0.765, g: 0.682, b: 0.569, a: 1}
|
||||||
|
- {r: 0.18, g: 0.149, b: 0.075, a: 1}
|
||||||
|
- {r: 0.702, g: 0.451, b: 0.059, a: 1}
|
||||||
|
- name: Passion
|
||||||
|
showAlpha: 0
|
||||||
|
colors:
|
||||||
|
- {r: 0.925, g: 0.682, b: 0.624, a: 1}
|
||||||
|
- {r: 0.188, g: 0.114, b: 0.224, a: 1}
|
||||||
|
- {r: 0.349, g: 0.11, b: 0.231, a: 1}
|
||||||
|
- {r: 0.435, g: 0.267, b: 0.357, a: 1}
|
||||||
|
- name: Sepia
|
||||||
|
showAlpha: 0
|
||||||
|
colors:
|
||||||
|
- {r: 0.353, g: 0.098, b: 0.02, a: 1}
|
||||||
|
- {r: 0.663, g: 0.188, b: 0.114, a: 1}
|
||||||
|
- {r: 0.906, g: 0.643, b: 0.082, a: 1}
|
||||||
|
- {r: 0.996, g: 0.839, b: 0.322, a: 1}
|
||||||
|
- {r: 0.486, g: 0.392, b: 0.02, a: 1}
|
||||||
|
- {r: 0.294, g: 0.235, b: 0.012, a: 1}
|
||||||
|
- name: Floral
|
||||||
|
showAlpha: 0
|
||||||
|
colors:
|
||||||
|
- {r: 0.855, g: 0.518, b: 0.412, a: 1}
|
||||||
|
- {r: 0.827, g: 0.294, b: 0.333, a: 1}
|
||||||
|
- {r: 0.737, g: 0.118, b: 0.208, a: 1}
|
||||||
|
- {r: 0.549, g: 0.149, b: 0.235, a: 1}
|
||||||
|
- {r: 0.949, g: 0.925, b: 0.784, a: 1}
|
||||||
|
- {r: 0.945, g: 0.882, b: 0.69, a: 1}
|
||||||
|
- {r: 0.871, g: 0.812, b: 0.698, a: 1}
|
||||||
|
- {r: 0.4, g: 0.196, b: 0.243, a: 1}
|
||||||
|
- {r: 0.271, g: 0.157, b: 0.227, a: 1}
|
||||||
|
- name: Underwater
|
||||||
|
showAlpha: 0
|
||||||
|
colors:
|
||||||
|
- {r: 0.663, g: 0.416, b: 0.733, a: 1}
|
||||||
|
- {r: 0.2, g: 0.6, b: 0.698, a: 1}
|
||||||
|
- {r: 0.11, g: 0.49, b: 0.698, a: 1}
|
||||||
|
- {r: 0.439, g: 0.627, b: 0.227, a: 1}
|
||||||
|
- {r: 0, g: 0.357, b: 0.604, a: 1}
|
||||||
|
- {r: 0.067, g: 0.271, b: 0.353, a: 1}
|
||||||
|
- name: Breeze
|
||||||
|
showAlpha: 0
|
||||||
|
colors:
|
||||||
|
- {r: 0.706, g: 1, b: 0, a: 1}
|
||||||
|
- {r: 0.651, g: 1, b: 0.404, a: 1}
|
||||||
|
- {r: 0.122, g: 1, b: 0.514, a: 1}
|
||||||
|
- {r: 0.216, g: 0.894, b: 0.961, a: 1}
|
||||||
|
- {r: 0.4, g: 1, b: 0.882, a: 1}
|
||||||
|
- {r: 0.027, g: 0.792, b: 0.8, a: 1}
|
||||||
|
- name: Clovers
|
||||||
|
showAlpha: 0
|
||||||
|
colors:
|
||||||
|
- {r: 0.431, g: 0.549, b: 0.102, a: 1}
|
||||||
|
- {r: 0.671, g: 0.714, b: 0.071, a: 1}
|
||||||
|
- {r: 0.969, g: 0.949, b: 0.831, a: 1}
|
||||||
|
- {r: 0.886, g: 0.902, b: 0.702, a: 1}
|
||||||
|
- {r: 0.753, g: 0.824, b: 0.627, a: 1}
|
||||||
|
- {r: 0.404, g: 0.6, b: 0.4, a: 1}
|
||||||
|
- name: Tropical
|
||||||
|
showAlpha: 0
|
||||||
|
colors:
|
||||||
|
- {r: 0.953, g: 0.647, b: 0.804, a: 1}
|
||||||
|
- {r: 0.965, g: 0.741, b: 0.871, a: 1}
|
||||||
|
- {r: 0.949, g: 0.549, b: 0.643, a: 1}
|
||||||
|
- {r: 0.992, g: 0.659, b: 0.498, a: 1}
|
||||||
|
- {r: 0.976, g: 0.792, b: 0.729, a: 1}
|
||||||
|
- {r: 0.984, g: 0.855, b: 0.725, a: 1}
|
||||||
|
- {r: 0.259, g: 0.882, b: 0.663, a: 1}
|
||||||
|
- {r: 0.349, g: 0.753, b: 0.78, a: 1}
|
||||||
|
- {r: 0.725, g: 0.976, b: 0.91, a: 1}
|
||||||
|
- {r: 0.647, g: 0.745, b: 0.957, a: 1}
|
||||||
|
- {r: 0.725, g: 0.863, b: 0.973, a: 1}
|
||||||
|
- {r: 0.89, g: 0.945, b: 0.996, a: 1}
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: e2c435e76ec72da4d9ee1f6d45f8374b
|
guid: d6a3216c4fd1c1a499b50f354c57f048
|
||||||
folderAsset: yes
|
NativeFormatImporter:
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName:
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &11400000
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 188390376, guid: a4865f1ab4504ed8a368670db22f409c, type: 3}
|
||||||
|
m_Name: ImportSettingsConfig
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
automateBeforeBuild: 1
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 15e2cde26c94921429fb7c3b52aa1a2a
|
guid: f6e0f897646bbb54b8306b7d6c6d955d
|
||||||
folderAsset: yes
|
NativeFormatImporter:
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName:
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
21
Assets/Resources/InputSignal.asset
Normal file
21
Assets/Resources/InputSignal.asset
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &11400000
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: b8d78c77b27bcee4792dedf004b44012, type: 3}
|
||||||
|
m_Name: InputSignal
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
_parameters:
|
||||||
|
- _ID: e1c42702-42ed-4f84-b52d-4e72b42a7de5
|
||||||
|
_name: action
|
||||||
|
_type: UnityEngine.InputSystem.InputAction
|
||||||
|
- _ID: 95540415-c9c3-4b53-87b6-97dcfb13cf6e
|
||||||
|
_name: phase
|
||||||
|
_type: UnityEngine.InputSystem.InputActionPhase
|
||||||
8
Assets/Resources/InputSignal.asset.meta
Normal file
8
Assets/Resources/InputSignal.asset.meta
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 69b5f370da7b862439a366000ea6e230
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
File diff suppressed because one or more lines are too long
1937
Assets/Scenes/WordlGeneration.unity
Normal file
1937
Assets/Scenes/WordlGeneration.unity
Normal file
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: a821f9bc27797d940b5963e05313b936
|
guid: 59b93f2adad13734a8942e8d5a1ad672
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
@@ -10,19 +10,21 @@ using Reset.Player.Movement;
|
|||||||
namespace NodeCanvas.Tasks.Actions {
|
namespace NodeCanvas.Tasks.Actions {
|
||||||
[Category("Reset/Movement")]
|
[Category("Reset/Movement")]
|
||||||
public class AddJump : ActionTask<CharacterController> {
|
public class AddJump : ActionTask<CharacterController> {
|
||||||
public BBParameter<float> jumpStrength;
|
|
||||||
public BBParameter<Vector3> airMoveDirection;
|
public BBParameter<Vector3> airMoveDirection;
|
||||||
|
public BBParameter<float> jumpPower;
|
||||||
public BBParameter<PlayerFacingDirection> playerFacingDirection;
|
|
||||||
|
|
||||||
[Range(0f, 1f)]
|
[Space(5)]
|
||||||
|
public BBParameter<float> jumpStrength;
|
||||||
|
|
||||||
|
[SliderField(0, 1)]
|
||||||
public BBParameter<float> standStillJumpStrength;
|
public BBParameter<float> standStillJumpStrength;
|
||||||
|
|
||||||
public BBParameter<float> jumpPower;
|
|
||||||
[Tooltip("Determines how much current movement vectors into jump direction")]
|
[Tooltip("Determines how much current movement vectors into jump direction")]
|
||||||
|
[SliderField(0, 1)]
|
||||||
public BBParameter<float> currentVelocityInheritence;
|
public BBParameter<float> currentVelocityInheritence;
|
||||||
public BBParameter<Vector3> directionalForce;
|
public BBParameter<Vector3> directionalForce;
|
||||||
|
|
||||||
|
[SliderField(0, 1)]
|
||||||
public BBParameter<float> directionalForceStrength;
|
public BBParameter<float> directionalForceStrength;
|
||||||
|
|
||||||
protected override string info {
|
protected override string info {
|
||||||
@@ -72,9 +74,12 @@ namespace NodeCanvas.Tasks.Actions {
|
|||||||
// Check threshold of current XZ velocity- if it's too close to zero, use the jumpStrength for jumping velocity. If it's not, use the current velocity
|
// Check threshold of current XZ velocity- if it's too close to zero, use the jumpStrength for jumping velocity. If it's not, use the current velocity
|
||||||
float velocityThreshold = 4f;
|
float velocityThreshold = 4f;
|
||||||
float magnitudeZeroDifference = Mathf.Clamp(currentVelocityVector3.magnitude - velocityThreshold, 0f, Mathf.Infinity) / velocityThreshold; // Divided by maximum to return a 0-1 value. Clamping not required.
|
float magnitudeZeroDifference = Mathf.Clamp(currentVelocityVector3.magnitude - velocityThreshold, 0f, Mathf.Infinity) / velocityThreshold; // Divided by maximum to return a 0-1 value. Clamping not required.
|
||||||
float outputVelocity = Mathf.Lerp(jumpStrength.value, currentVelocityVector3.magnitude, Math.Clamp(magnitudeZeroDifference, 0f, 1f));
|
float outputHoritontalVelocity = Mathf.Lerp(jumpStrength.value, currentVelocityVector3.magnitude, Math.Clamp(magnitudeZeroDifference, 0f, 1f));
|
||||||
|
|
||||||
|
outputHoritontalVelocity = Mathf.Min(outputHoritontalVelocity, Mathf.Lerp(standStillJumpStrength.value * jumpStrength.value, jumpStrength.value * .4f, magnitudeZeroDifference));
|
||||||
|
|
||||||
outputVelocity = Mathf.Min(outputVelocity, Mathf.Lerp(standStillJumpStrength.value * jumpStrength.value, jumpStrength.value * .4f, magnitudeZeroDifference));
|
// Do the same for directional jump strength
|
||||||
|
outputHoritontalVelocity = Mathf.Lerp(outputHoritontalVelocity, jumpStrength.value, directionalForceStrength.value);
|
||||||
|
|
||||||
// Remap the dot to set -1 (opposing direction) to -.5f, and 1 (same direciton) to 1.2f
|
// Remap the dot to set -1 (opposing direction) to -.5f, and 1 (same direciton) to 1.2f
|
||||||
// This is done to allow some sideways jumping direction change, but none backwards, and all forwards
|
// This is done to allow some sideways jumping direction change, but none backwards, and all forwards
|
||||||
@@ -94,7 +99,7 @@ namespace NodeCanvas.Tasks.Actions {
|
|||||||
outputDirection = Camera.main.transform.rotation.Flatten(0, null, 0) * outputDirection;
|
outputDirection = Camera.main.transform.rotation.Flatten(0, null, 0) * outputDirection;
|
||||||
|
|
||||||
// Set air move direction
|
// Set air move direction
|
||||||
airMoveDirection.value += outputDirection * outputVelocity;
|
airMoveDirection.value += outputDirection * outputHoritontalVelocity;
|
||||||
}
|
}
|
||||||
EndAction(true);
|
EndAction(true);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,16 +3,13 @@ using ParadoxNotion.Design;
|
|||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using Reset.Player.Movement;
|
using Reset.Player.Movement;
|
||||||
|
|
||||||
|
|
||||||
namespace NodeCanvas.Tasks.Actions {
|
namespace NodeCanvas.Tasks.Actions {
|
||||||
|
|
||||||
[Category("Reset/Movement")]
|
[Category("Reset/Movement")]
|
||||||
public class CalculateAirMovement : ActionTask<Transform>{
|
public class CalculateAirMovement : ActionTask<Transform>{
|
||||||
public BBParameter<Vector3> airMoveDirection;
|
public BBParameter<Vector3> airMoveDirection;
|
||||||
public BBParameter<Vector3> groundMoveDirection;
|
public BBParameter<Vector3> groundMoveDirection; // Unused on 7/29/25, delete if still unusued later
|
||||||
|
|
||||||
public BBParameter<PlayerFacingDirection> playerFacingDirection;
|
|
||||||
|
|
||||||
private float airControlPower = 1f;
|
private float airControlPower = 1f;
|
||||||
|
|
||||||
//Use for initialization. This is called only once in the lifetime of the task.
|
//Use for initialization. This is called only once in the lifetime of the task.
|
||||||
@@ -25,7 +22,7 @@ namespace NodeCanvas.Tasks.Actions {
|
|||||||
//Call EndAction() to mark the action as finished, either in success or failure.
|
//Call EndAction() to mark the action as finished, either in success or failure.
|
||||||
//EndAction can be called from anywhere.
|
//EndAction can be called from anywhere.
|
||||||
protected override void OnExecute(){
|
protected override void OnExecute(){
|
||||||
|
airControlPower = 1f;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Called once per frame while the action is active.
|
//Called once per frame while the action is active.
|
||||||
@@ -34,7 +31,7 @@ namespace NodeCanvas.Tasks.Actions {
|
|||||||
airMoveDirection.value = Vector3.Lerp(airMoveDirection.value, Vector3.zero, .7f * Time.deltaTime);
|
airMoveDirection.value = Vector3.Lerp(airMoveDirection.value, Vector3.zero, .7f * Time.deltaTime);
|
||||||
|
|
||||||
// Decay Air Control power
|
// Decay Air Control power
|
||||||
airControlPower = Mathf.Lerp(airControlPower, 0f, 3f * Time.deltaTime);
|
airControlPower = Mathf.Lerp(airControlPower, 0f, 2f * Time.deltaTime);
|
||||||
|
|
||||||
// Add air control
|
// Add air control
|
||||||
Vector3 inputVector3 = new(agent.GetComponent<PlayerControls>().rawMoveInput.x, 0f, agent.GetComponent<PlayerControls>().rawMoveInput.y);
|
Vector3 inputVector3 = new(agent.GetComponent<PlayerControls>().rawMoveInput.x, 0f, agent.GetComponent<PlayerControls>().rawMoveInput.y);
|
||||||
@@ -47,7 +44,7 @@ namespace NodeCanvas.Tasks.Actions {
|
|||||||
|
|
||||||
//Called when the task is disabled.
|
//Called when the task is disabled.
|
||||||
protected override void OnStop() {
|
protected override void OnStop() {
|
||||||
groundMoveDirection.value = agent.GetComponent<CharacterController>().velocity;
|
// groundMoveDirection.value = agent.GetComponent<CharacterController>().velocity;
|
||||||
EndAction(true);
|
EndAction(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,47 +0,0 @@
|
|||||||
using NodeCanvas.Framework;
|
|
||||||
using ParadoxNotion.Design;
|
|
||||||
using UnityEngine;
|
|
||||||
|
|
||||||
namespace NodeCanvas.Tasks.Conditions {
|
|
||||||
|
|
||||||
[Category("Core/Input")]
|
|
||||||
[Description("Returns a float from two Vector3s")]
|
|
||||||
public class GetMovementInputDotProduct : ConditionTask<PlayerControls>{
|
|
||||||
[SliderField(0f,1f)]
|
|
||||||
public BBParameter<Vector3> desiredVector3;
|
|
||||||
public BBParameter<float> tolerance;
|
|
||||||
public BBParameter<bool> negate;
|
|
||||||
|
|
||||||
//Use for initialization. This is called only once in the lifetime of the task.
|
|
||||||
//Return null if init was successfull. Return an error string otherwise
|
|
||||||
protected override string OnInit(){
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
//This is called once each time the task is enabled.
|
|
||||||
//Call EndAction() to mark the action as finished, either in success or failure.
|
|
||||||
//EndAction can be called from anywhere.
|
|
||||||
protected override bool OnCheck(){
|
|
||||||
Vector3 rawInputVector3 = new(agent.rawMoveInput.x, 0f, agent.rawMoveInput.y);
|
|
||||||
float dotProduct = Vector3.Dot(desiredVector3.value, rawInputVector3);
|
|
||||||
|
|
||||||
//Debug.Log(dotProduct);
|
|
||||||
|
|
||||||
if (dotProduct < tolerance.value) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
//Called when the task is disabled.
|
|
||||||
protected override void OnEnable() {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
//Called when the task is paused.
|
|
||||||
protected override void OnDisable() {
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
121
Assets/Scripts/Core/Graph Tasks/ChangeAgentTransform.cs
Normal file
121
Assets/Scripts/Core/Graph Tasks/ChangeAgentTransform.cs
Normal file
@@ -0,0 +1,121 @@
|
|||||||
|
using System;
|
||||||
|
using NodeCanvas.Framework;
|
||||||
|
using ParadoxNotion.Design;
|
||||||
|
using ParadoxNotion.Serialization.FullSerializer;
|
||||||
|
using Sirenix.OdinInspector;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace NodeCanvas.Tasks.Actions {
|
||||||
|
|
||||||
|
[Category("Reset")]
|
||||||
|
[Description("Update the agent's position and rotation (scale too, sure whynot) either instantly or over time.")]
|
||||||
|
public class ChangeAgentTransform : ActionTask<CharacterController>{
|
||||||
|
public enum TransformProperty{
|
||||||
|
Position,
|
||||||
|
Rotation,
|
||||||
|
Scale
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override string info {
|
||||||
|
get{
|
||||||
|
string basicText = string.Format($"Player {targetProperty.ToString()} to {(targetValue.isPresumedDynamic ? targetValue.name : targetValue.value)}");
|
||||||
|
basicText += relativeToSelf.value ? ", relative to Self" : "";
|
||||||
|
|
||||||
|
return basicText;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public TransformProperty targetProperty;
|
||||||
|
|
||||||
|
[ParadoxNotion.Design.ShowIf("targetProperty", 0), Space(5)]
|
||||||
|
public BBParameter<bool> forcePositionChange;
|
||||||
|
|
||||||
|
public BBParameter<Vector3> targetValue;
|
||||||
|
|
||||||
|
public BBParameter<bool> relativeToSelf;
|
||||||
|
|
||||||
|
[Tooltip("Set this to the current position if you're trying to rotate by 'this much'. Keep it zero for world space values.")]
|
||||||
|
public BBParameter<Vector3> relativeValue;
|
||||||
|
|
||||||
|
public BBParameter<bool> changeInstantly;
|
||||||
|
public BBParameter<float> smoothing;
|
||||||
|
|
||||||
|
private Vector3 currentVel;
|
||||||
|
|
||||||
|
|
||||||
|
//Use for initialization. This is called only once in the lifetime of the task.
|
||||||
|
//Return null if init was successfull. Return an error string otherwise
|
||||||
|
protected override string OnInit() {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
//This is called once each time the task is enabled.
|
||||||
|
//Call EndAction() to mark the action as finished, either in success or failure.
|
||||||
|
//EndAction can be called from anywhere.
|
||||||
|
protected override void OnExecute() {
|
||||||
|
switch (targetProperty) {
|
||||||
|
case TransformProperty.Position:
|
||||||
|
Vector3 relativeUseValue = relativeValue.value;
|
||||||
|
if (relativeToSelf.value) {
|
||||||
|
relativeUseValue = agent.transform.position;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (changeInstantly.value) {
|
||||||
|
agent.Move(agent.transform.position.DirectionTo(relativeUseValue + targetValue.value));
|
||||||
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
|
case TransformProperty.Rotation:
|
||||||
|
agent.transform.rotation = Quaternion.LookRotation(relativeValue.value) * Quaternion.Euler(targetValue.value);
|
||||||
|
break;
|
||||||
|
case TransformProperty.Scale:
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw new ArgumentOutOfRangeException();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (changeInstantly.value) {
|
||||||
|
EndAction(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//Called once per frame while the action is active.
|
||||||
|
protected override void OnUpdate() {
|
||||||
|
switch (targetProperty) {
|
||||||
|
case TransformProperty.Position:
|
||||||
|
Vector3 relativeUseValue = relativeValue.value;
|
||||||
|
if (relativeToSelf.value) {
|
||||||
|
relativeUseValue = agent.transform.position;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!changeInstantly.value) {
|
||||||
|
Vector3 targetPosition = relativeUseValue + targetValue.value;
|
||||||
|
// agent.transform.position = Vector3.SmoothDamp(agent.transform.position, targetPosition,
|
||||||
|
// ref currentVel, smoothing.value * Time.deltaTime);
|
||||||
|
|
||||||
|
agent.Move((agent.transform.position.DirectionTo(targetPosition)).normalized * .5f * Mathf.Lerp(0, 1, Vector3.Distance(agent.transform.position, targetPosition)) * smoothing.value * Time.deltaTime);
|
||||||
|
EndAction();
|
||||||
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
|
case TransformProperty.Rotation:
|
||||||
|
agent.transform.rotation = Quaternion.Euler(relativeValue.value) * Quaternion.Euler(targetValue.value);
|
||||||
|
break;
|
||||||
|
case TransformProperty.Scale:
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw new ArgumentOutOfRangeException();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//Called when the task is disabled.
|
||||||
|
protected override void OnStop() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
//Called when the task is paused.
|
||||||
|
protected override void OnPause() {
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b77e2b9ac9aad644480508d5a86f4006
|
||||||
@@ -147,7 +147,7 @@ public class Vector3CameraValueGroupDrawer : ObjectDrawer<Vector3CameraValueGrou
|
|||||||
|
|
||||||
// Start the Vertical layout then add the label before adding a horizontal so the label will be on top of side-by-side options
|
// Start the Vertical layout then add the label before adding a horizontal so the label will be on top of side-by-side options
|
||||||
GUILayout.BeginVertical();
|
GUILayout.BeginVertical();
|
||||||
GUILayout.Label(_instance.ToString(), labelOptions);
|
GUILayout.Label(_instance.label, labelOptions);
|
||||||
GUILayout.BeginHorizontal();
|
GUILayout.BeginHorizontal();
|
||||||
|
|
||||||
// Create the x settings enum
|
// Create the x settings enum
|
||||||
@@ -220,7 +220,7 @@ public class Vector2CameraValueGroupDrawer : ObjectDrawer<Vector2CameraValueGrou
|
|||||||
|
|
||||||
// Start the Vertical layout then add the label before adding a horizontal so the label will be on top of side-by-side options
|
// Start the Vertical layout then add the label before adding a horizontal so the label will be on top of side-by-side options
|
||||||
GUILayout.BeginVertical();
|
GUILayout.BeginVertical();
|
||||||
GUILayout.Label(_instance.ToString(), labelOptions);
|
GUILayout.Label(_instance.label, labelOptions);
|
||||||
GUILayout.BeginHorizontal();
|
GUILayout.BeginHorizontal();
|
||||||
|
|
||||||
// Create the x settings enum
|
// Create the x settings enum
|
||||||
@@ -326,8 +326,9 @@ namespace NodeCanvas.Tasks.Actions {
|
|||||||
public class ChangeCameraSettings : ActionTask{
|
public class ChangeCameraSettings : ActionTask{
|
||||||
[ParadoxNotion.Design.Header("Main Settings")]
|
[ParadoxNotion.Design.Header("Main Settings")]
|
||||||
public FloatCameraValueGroup fieldOfView = new (newLabel: "FOV");
|
public FloatCameraValueGroup fieldOfView = new (newLabel: "FOV");
|
||||||
|
|
||||||
[ParadoxNotion.Design.Header("Orbit Follow Ring Settings")]
|
[ParadoxNotion.Design.Header("Orbit Follow Ring Settings"), Space (5)]
|
||||||
|
public Vector3CameraValueGroup orbitPositionDamping = new(newLabel: "Position Damping");
|
||||||
public OrbitalFollowValueGroup orbitFollowTop = new (newLabel: "Top");
|
public OrbitalFollowValueGroup orbitFollowTop = new (newLabel: "Top");
|
||||||
public OrbitalFollowValueGroup orbitFollowCenter = new (newLabel: "Center");
|
public OrbitalFollowValueGroup orbitFollowCenter = new (newLabel: "Center");
|
||||||
public OrbitalFollowValueGroup orbitFollowBottom = new (newLabel: "Bottom");
|
public OrbitalFollowValueGroup orbitFollowBottom = new (newLabel: "Bottom");
|
||||||
@@ -336,7 +337,7 @@ namespace NodeCanvas.Tasks.Actions {
|
|||||||
public Vector2CameraValueGroup screenPosition = new (newLabel: "Screen Position");
|
public Vector2CameraValueGroup screenPosition = new (newLabel: "Screen Position");
|
||||||
|
|
||||||
[ParadoxNotion.Design.Header("Camera Offset Settings")]
|
[ParadoxNotion.Design.Header("Camera Offset Settings")]
|
||||||
public Vector3CameraValueGroup cameraOffset = new (newLabel: "Screen Position");
|
public Vector3CameraValueGroup cameraOffset = new (newLabel: "Offset");
|
||||||
|
|
||||||
//Use for initialization. This is called only once in the lifetime of the task.
|
//Use for initialization. This is called only once in the lifetime of the task.
|
||||||
//Return null if init was successfull. Return an error string otherwise
|
//Return null if init was successfull. Return an error string otherwise
|
||||||
@@ -461,6 +462,34 @@ namespace NodeCanvas.Tasks.Actions {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Position Damping
|
||||||
|
switch (orbitPositionDamping.changeX) {
|
||||||
|
case CameraSettingsToggle.NewValue:
|
||||||
|
CameraSettingsProcessor.values.orbitPositionDamping.targetValue.x = orbitPositionDamping.newValue.x;
|
||||||
|
break;
|
||||||
|
case CameraSettingsToggle.ResetValue:
|
||||||
|
CameraSettingsProcessor.values.orbitPositionDamping.targetValue.x = CameraSettingsProcessor.values.orbitPositionDamping.originalValue.x;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (orbitPositionDamping.changeY) {
|
||||||
|
case CameraSettingsToggle.NewValue:
|
||||||
|
CameraSettingsProcessor.values.orbitPositionDamping.targetValue.y = orbitPositionDamping.newValue.y;
|
||||||
|
break;
|
||||||
|
case CameraSettingsToggle.ResetValue:
|
||||||
|
CameraSettingsProcessor.values.orbitPositionDamping.targetValue.y = CameraSettingsProcessor.values.orbitPositionDamping.originalValue.y;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (orbitPositionDamping.changeZ) {
|
||||||
|
case CameraSettingsToggle.NewValue:
|
||||||
|
CameraSettingsProcessor.values.orbitPositionDamping.targetValue.z = orbitPositionDamping.newValue.z;
|
||||||
|
break;
|
||||||
|
case CameraSettingsToggle.ResetValue:
|
||||||
|
CameraSettingsProcessor.values.orbitPositionDamping.targetValue.z = CameraSettingsProcessor.values.orbitPositionDamping.originalValue.z;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
EndAction(true);
|
EndAction(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
60
Assets/Scripts/Core/Graph Tasks/CheckEnvironmentObserver.cs
Normal file
60
Assets/Scripts/Core/Graph Tasks/CheckEnvironmentObserver.cs
Normal file
@@ -0,0 +1,60 @@
|
|||||||
|
using NodeCanvas.Framework;
|
||||||
|
using ParadoxNotion.Design;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace NodeCanvas.Tasks.Conditions {
|
||||||
|
[Category("Reset")]
|
||||||
|
public class CheckEnvironmentObserver : ConditionTask<PlayerEnvironmentManager>{
|
||||||
|
|
||||||
|
public BBParameter<string> observerLabel;
|
||||||
|
public BBParameter<RaycastHit> outputHitTo;
|
||||||
|
|
||||||
|
protected override string info{
|
||||||
|
get {
|
||||||
|
return $"Check Environment Observer, [\"{observerLabel.value}\"]";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//Use for initialization. This is called only once in the lifetime of the task.
|
||||||
|
//Return null if init was successfull. Return an error string otherwise
|
||||||
|
protected override string OnInit(){
|
||||||
|
var observer = agent.FindObserverFromString(observerLabel.value);
|
||||||
|
if (observer == null) {
|
||||||
|
return $"An environment observer couldn't be found under the name {observerLabel.value}. Check your spelling and if it exists??";
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
//Called whenever the condition gets enabled.
|
||||||
|
protected override void OnEnable() {
|
||||||
|
agent.FindObserverFromString(observerLabel.value).active = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
//Called whenever the condition gets disabled.
|
||||||
|
protected override void OnDisable() {
|
||||||
|
agent.FindObserverFromString(observerLabel.value).active = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
//Called once per frame while the condition is active.
|
||||||
|
//Return whether the condition is success or failure.
|
||||||
|
protected override bool OnCheck(){
|
||||||
|
if (agent.EvaluateFromString(observerLabel.value) == true) {
|
||||||
|
if (outputHitTo.isDefined) {
|
||||||
|
EnvironmentObserver hitObserver = agent.FindObserverFromString(observerLabel.value, agent.observers);
|
||||||
|
|
||||||
|
if (hitObserver.hit.Equals(default(RaycastHit))) {
|
||||||
|
Debug.LogError("You just tried to pull a RaycastHit for later use from an environment observer, but no RaycastHit is available. Don't forget that CastType.Box and CastType.Sphere CANNOT spit one out!");
|
||||||
|
} else {
|
||||||
|
outputHitTo.value = hitObserver.hit;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 95ad4bd047d9654478597c68a81b01a0
|
||||||
106
Assets/Scripts/Core/Graph Tasks/CheckGenericObserver.cs
Normal file
106
Assets/Scripts/Core/Graph Tasks/CheckGenericObserver.cs
Normal file
@@ -0,0 +1,106 @@
|
|||||||
|
using System.Drawing;
|
||||||
|
using NodeCanvas.Framework;
|
||||||
|
using ParadoxNotion.Design;
|
||||||
|
using UnityEngine;
|
||||||
|
using System;
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
#if UNITY_EDITOR
|
||||||
|
using NodeCanvas.Editor;
|
||||||
|
#endif
|
||||||
|
using UnityEditor;
|
||||||
|
|
||||||
|
namespace Reset {
|
||||||
|
[Category("Reset")]
|
||||||
|
[Description("Creates an environment observer unattached from the player, such as for checking from the Camera or another arbitray location.")]
|
||||||
|
public class CheckGenericObserver : ConditionTask<Transform>{
|
||||||
|
[Space(5)]
|
||||||
|
public BBParameter<EnvironmentObserver.CastType> castType;
|
||||||
|
|
||||||
|
public BBParameter<float> length;
|
||||||
|
public BBParameter<Vector3> direction;
|
||||||
|
public BBParameter<Vector3> offset;
|
||||||
|
public BBParameter<LayerMask> ignoreLayers;
|
||||||
|
|
||||||
|
public BBParameter<float> width;
|
||||||
|
|
||||||
|
public BBParameter<Vector3> size;
|
||||||
|
|
||||||
|
public BBParameter<Vector3> rotation;
|
||||||
|
|
||||||
|
public bool drawGizmos;
|
||||||
|
public bool drawGizmosOnlyWhenActive;
|
||||||
|
|
||||||
|
private EnvironmentObserver observer;
|
||||||
|
|
||||||
|
#if UNITY_EDITOR
|
||||||
|
protected override void OnTaskInspectorGUI(){
|
||||||
|
BBParameterEditor.ParameterField("Cast Type", castType);
|
||||||
|
|
||||||
|
BBParameterEditor.ParameterField("Length", length);
|
||||||
|
BBParameterEditor.ParameterField("Direction", direction);
|
||||||
|
BBParameterEditor.ParameterField("Offset", offset);
|
||||||
|
BBParameterEditor.ParameterField("Ignore Layers", ignoreLayers);
|
||||||
|
|
||||||
|
if (castType.value == EnvironmentObserver.CastType.SphereCast || castType.value == EnvironmentObserver.CastType.SphereOverlap) {
|
||||||
|
BBParameterEditor.ParameterField("Width", width);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (castType.value == EnvironmentObserver.CastType.BoxCast || castType.value == EnvironmentObserver.CastType.BoxOverlap) {
|
||||||
|
BBParameterEditor.ParameterField("Size", size);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (castType.value != EnvironmentObserver.CastType.Ray) {
|
||||||
|
BBParameterEditor.ParameterField("Rotation", rotation);
|
||||||
|
}
|
||||||
|
|
||||||
|
drawGizmos = EditorGUILayout.Toggle("Draw Gizmos", drawGizmos);
|
||||||
|
|
||||||
|
if (drawGizmos) {
|
||||||
|
drawGizmosOnlyWhenActive = EditorGUILayout.Toggle("Draw Gizmos Only When Active", drawGizmosOnlyWhenActive);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
//Return null if init was successfull. Return an error string otherwise
|
||||||
|
protected override string OnInit(){
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
//Called whenever the condition gets enabled.
|
||||||
|
protected override void OnEnable() {
|
||||||
|
observer = new EnvironmentObserver(){
|
||||||
|
castType = castType.value,
|
||||||
|
active = true,
|
||||||
|
|
||||||
|
length = length.value,
|
||||||
|
direction = direction.value,
|
||||||
|
offset = offset.value,
|
||||||
|
ignoreLayers = ignoreLayers.value,
|
||||||
|
|
||||||
|
width = width.value,
|
||||||
|
|
||||||
|
size = size.value,
|
||||||
|
rotation = rotation.value
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
//Called whenever the condition gets disabled.
|
||||||
|
protected override void OnDisable() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
//Called once per frame while the condition is active.
|
||||||
|
//Return whether the condition is success or failure.
|
||||||
|
protected override bool OnCheck() {
|
||||||
|
bool check = observer.Evaluate(agent.gameObject);
|
||||||
|
|
||||||
|
if (drawGizmos) {
|
||||||
|
observer.DrawObserverGizmo(agent.gameObject, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
return check;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: fb4b5bf056649ca48b1b14dbe499de46
|
||||||
@@ -1,49 +1,54 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
using NodeCanvas.Framework;
|
using NodeCanvas.Framework;
|
||||||
|
using ParadoxNotion;
|
||||||
using ParadoxNotion.Design;
|
using ParadoxNotion.Design;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.InputSystem;
|
using UnityEngine.InputSystem;
|
||||||
|
|
||||||
namespace NodeCanvas.Tasks.Conditions {
|
namespace NodeCanvas.Tasks.Conditions {
|
||||||
|
|
||||||
[Category("Reset/Input")]
|
[Category("Reset/Input")]
|
||||||
[Description("Check if input condition was matched this frame")]
|
[Description("Check if input condition was matched this frame by phase.")]
|
||||||
public class CheckInput : ConditionTask<Transform>{
|
public class CheckInput : ConditionTask<Transform>{
|
||||||
public BBParameter<string> actionName;
|
public BBParameter<string> actionName;
|
||||||
public BBParameter<string> actionValue;
|
public BBParameter<InputActionPhase> actionPhase;
|
||||||
|
|
||||||
|
private SignalDefinition signalDefinition;
|
||||||
protected override string info {
|
protected override string info {
|
||||||
get { return "Player Input"; }
|
get { return $"Input <b>{actionName.value}</b> was <b>{actionPhase.value}</b>"; }
|
||||||
}
|
}
|
||||||
|
|
||||||
private InputAction action;
|
|
||||||
|
|
||||||
//Use for initialization. This is called only once in the lifetime of the task.
|
|
||||||
//Return null if init was successfull. Return an error string otherwise
|
|
||||||
protected override string OnInit(){
|
protected override string OnInit(){
|
||||||
|
try {
|
||||||
|
signalDefinition = Resources.Load<SignalDefinition>("InputSignal");
|
||||||
|
} catch (Exception e) {
|
||||||
|
Debug.LogError($"Error finding the Input Signal defintion: {e.Message}");
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Called whenever the condition gets enabled.
|
protected override void OnEnable() {
|
||||||
protected override void OnEnable(){
|
signalDefinition.onInvoke -= OnSignalInvoke;
|
||||||
action = agent.GetComponent<PlayerInput>().actions.FindAction(actionName.value);
|
signalDefinition.onInvoke += OnSignalInvoke;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Called whenever the condition gets disabled.
|
|
||||||
protected override void OnDisable() {
|
protected override void OnDisable() {
|
||||||
|
signalDefinition.onInvoke -= OnSignalInvoke;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Called once per frame while the condition is active.
|
void OnSignalInvoke(Transform sender, Transform receiver, bool isGlobal, params object[] args){
|
||||||
//Return whether the condition is success or failure.
|
// Take the input arguments as objects and convert them to InputAction & Phases
|
||||||
protected override bool OnCheck() {
|
InputAction thisAction = (InputAction)args[0];
|
||||||
// if (action.type == InputActionType.Button){
|
InputActionPhase thisActionPhase = (InputActionPhase)args[1];
|
||||||
if (action.WasPressedThisFrame()) { return true; }
|
|
||||||
// } else if (action.type == InputActionType.Value) {
|
if (actionName.value == thisAction.name && actionPhase.value == thisActionPhase) {
|
||||||
//
|
YieldReturn(true);
|
||||||
// }
|
}
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected override bool OnCheck() { return false; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
55
Assets/Scripts/Core/Graph Tasks/DecomposeRaycastHit.cs
Normal file
55
Assets/Scripts/Core/Graph Tasks/DecomposeRaycastHit.cs
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
using NodeCanvas.Framework;
|
||||||
|
using ParadoxNotion.Design;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
|
||||||
|
namespace NodeCanvas.Tasks.Actions {
|
||||||
|
|
||||||
|
[Category("Reset")]
|
||||||
|
[Description("Breaks down an incoming RaycastHit into it's constituent parts for later use.")]
|
||||||
|
public class DecomposeRaycastHit : ActionTask{
|
||||||
|
public BBParameter<RaycastHit> raycastHit;
|
||||||
|
|
||||||
|
public BBParameter<Transform> transform;
|
||||||
|
public BBParameter<Collider> collider;
|
||||||
|
public BBParameter<GameObject> gameObject;
|
||||||
|
public BBParameter<float> distance;
|
||||||
|
public BBParameter<Vector3> normal;
|
||||||
|
public BBParameter<Vector3> point;
|
||||||
|
|
||||||
|
//Use for initialization. This is called only once in the lifetime of the task.
|
||||||
|
//Return null if init was successfull. Return an error string otherwise
|
||||||
|
protected override string OnInit() {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
//This is called once each time the task is enabled.
|
||||||
|
//Call EndAction() to mark the action as finished, either in success or failure.
|
||||||
|
//EndAction can be called from anywhere.
|
||||||
|
protected override void OnExecute(){
|
||||||
|
if (transform.isDefined){ transform.value = raycastHit.value.transform; }
|
||||||
|
if (collider.isDefined){ collider.value = raycastHit.value.collider; }
|
||||||
|
if (gameObject.isDefined){ gameObject.value = raycastHit.value.transform.gameObject; }
|
||||||
|
if (distance.isDefined){ distance.value = raycastHit.value.distance; }
|
||||||
|
if (normal.isDefined){ normal.value = raycastHit.value.normal; }
|
||||||
|
if (point.isDefined){ point.value = raycastHit.value.point; }
|
||||||
|
|
||||||
|
EndAction(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
//Called once per frame while the action is active.
|
||||||
|
protected override void OnUpdate() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
//Called when the task is disabled.
|
||||||
|
protected override void OnStop() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
//Called when the task is paused.
|
||||||
|
protected override void OnPause() {
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 79f7cbb75d876f84b8edfae676ba324c
|
||||||
@@ -0,0 +1,85 @@
|
|||||||
|
using System;
|
||||||
|
using NodeCanvas.Framework;
|
||||||
|
using NUnit.Framework.Constraints;
|
||||||
|
using ParadoxNotion.Design;
|
||||||
|
using ParadoxNotion.Serialization.FullSerializer;
|
||||||
|
using Sirenix.OdinInspector;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace NodeCanvas.Tasks.Conditions {
|
||||||
|
|
||||||
|
[Category("Reset/Input")]
|
||||||
|
[Description("Returns a float from two Vector3s")]
|
||||||
|
public class GetMovementInputDotProduct : ConditionTask<PlayerControls>{
|
||||||
|
enum CheckDotProductAgainst{
|
||||||
|
ForwardDirection,
|
||||||
|
CameraDirection,
|
||||||
|
InputVector3
|
||||||
|
}
|
||||||
|
|
||||||
|
[ExposeField, fsSerializeAs] CheckDotProductAgainst checkAgainst;
|
||||||
|
[ParadoxNotion.Design.ShowIf("checkAgainst", 2)] public BBParameter<Vector3> checkAgainstValue;
|
||||||
|
[SliderField(-1f, 1f)] public BBParameter<float> desiredValue;
|
||||||
|
public BBParameter<float> tolerance;
|
||||||
|
|
||||||
|
public BBParameter<bool> considerCameraRotation;
|
||||||
|
public BBParameter<bool> negate;
|
||||||
|
|
||||||
|
//Use for initialization. This is called only once in the lifetime of the task.
|
||||||
|
//Return null if init was successfull. Return an error string otherwise
|
||||||
|
protected override string OnInit(){
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
//This is called once each time the task is enabled.
|
||||||
|
//Call EndAction() to mark the action as finished, either in success or failure.
|
||||||
|
//EndAction can be called from anywhere.
|
||||||
|
protected override bool OnCheck(){
|
||||||
|
// Switch what the dot product is checked against
|
||||||
|
Vector3 valueToCheck;
|
||||||
|
|
||||||
|
switch (checkAgainst) {
|
||||||
|
case CheckDotProductAgainst.ForwardDirection:
|
||||||
|
Debug.Log(agent.transform.forward);
|
||||||
|
valueToCheck = agent.transform.forward;
|
||||||
|
break;
|
||||||
|
case CheckDotProductAgainst.CameraDirection:
|
||||||
|
valueToCheck = Camera.main.transform.forward;
|
||||||
|
break;
|
||||||
|
case CheckDotProductAgainst.InputVector3:
|
||||||
|
valueToCheck = checkAgainstValue.value.normalized;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw new ArgumentOutOfRangeException();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get the input as a Vector3
|
||||||
|
Vector3 rawInputVector3 = new Vector3(agent.rawMoveInput.x, 0f, agent.rawMoveInput.y);
|
||||||
|
if (considerCameraRotation.value) {
|
||||||
|
rawInputVector3 = Camera.main.transform.rotation * rawInputVector3;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Calculate dor product
|
||||||
|
float dotProduct = Vector3.Dot(valueToCheck, rawInputVector3);
|
||||||
|
|
||||||
|
Debug.Log(dotProduct);
|
||||||
|
|
||||||
|
// Compare against the desired tolerance and output result
|
||||||
|
if (tolerance.value > Mathf.Abs(dotProduct - tolerance.value)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
//Called when the task is disabled.
|
||||||
|
protected override void OnEnable() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
//Called when the task is paused.
|
||||||
|
protected override void OnDisable() {
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -12,7 +12,8 @@ namespace Reset.Player.Movement{
|
|||||||
public enum PlayerFacingDirection{
|
public enum PlayerFacingDirection{
|
||||||
Target = 0,
|
Target = 0,
|
||||||
Movement,
|
Movement,
|
||||||
MatchCamera
|
MatchCamera,
|
||||||
|
Static
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -43,6 +44,7 @@ namespace NodeCanvas.Tasks.Actions {
|
|||||||
private float currentRotSpeed;
|
private float currentRotSpeed;
|
||||||
private float lastLookMagnitude;
|
private float lastLookMagnitude;
|
||||||
private Quaternion targetRotation;
|
private Quaternion targetRotation;
|
||||||
|
private Vector3 currentMoveDir;
|
||||||
|
|
||||||
// References
|
// References
|
||||||
private PlayerControls controls;
|
private PlayerControls controls;
|
||||||
@@ -55,7 +57,7 @@ namespace NodeCanvas.Tasks.Actions {
|
|||||||
// Append the late update method to actually happen on late update
|
// Append the late update method to actually happen on late update
|
||||||
MonoManager.current.onLateUpdate += LateUpdate;
|
MonoManager.current.onLateUpdate += LateUpdate;
|
||||||
|
|
||||||
// What
|
// Set ingitial rotation power
|
||||||
currentRotSpeed = rotationSpeed.value;
|
currentRotSpeed = rotationSpeed.value;
|
||||||
|
|
||||||
// Reference to controls
|
// Reference to controls
|
||||||
@@ -67,8 +69,8 @@ namespace NodeCanvas.Tasks.Actions {
|
|||||||
//This is called once each time the task is enabled.
|
//This is called once each time the task is enabled.
|
||||||
//Call EndAction() to mark the action as finished, either in success or failure.
|
//Call EndAction() to mark the action as finished, either in success or failure.
|
||||||
//EndAction can be called from anywhere.
|
//EndAction can be called from anywhere.
|
||||||
protected override void OnExecute() {
|
protected override void OnExecute(){
|
||||||
|
currentMoveDir = groundMoveDirection.value;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Called once per frame while the action is active.
|
//Called once per frame while the action is active.
|
||||||
@@ -88,26 +90,39 @@ namespace NodeCanvas.Tasks.Actions {
|
|||||||
break;
|
break;
|
||||||
case PlayerFacingDirection.Movement:
|
case PlayerFacingDirection.Movement:
|
||||||
// Check magnitude to avoid the "Look rotation viewing vector is zero" debug
|
// Check magnitude to avoid the "Look rotation viewing vector is zero" debug
|
||||||
if (controls.rawMoveInput.magnitude == 0) { break; }
|
|
||||||
|
|
||||||
// Set desired rotation to input direction, with respect to camera rotation
|
// Set desired rotation to input direction, with respect to camera rotation
|
||||||
targetRotation = Quaternion.LookRotation(new Vector3(controls.rawMoveInput.x, 0, controls.rawMoveInput.y)) *
|
if (agent.isGrounded){
|
||||||
Quaternion.Euler(Camera.main.transform.rotation.eulerAngles.Flatten(0f, null, 0f));
|
if (controls.rawMoveInput.magnitude == 0) { break; }
|
||||||
|
|
||||||
|
targetRotation = Quaternion.LookRotation(currentMoveDir) *
|
||||||
|
Quaternion.Euler(Camera.main.transform.rotation.eulerAngles.Flatten(0f, null, 0f));
|
||||||
|
} else {
|
||||||
|
if (airMoveDirection.value.magnitude == 0) { break; }
|
||||||
|
|
||||||
|
targetRotation = Quaternion.LookRotation(airMoveDirection.value);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case PlayerFacingDirection.MatchCamera:
|
case PlayerFacingDirection.MatchCamera:
|
||||||
// Craft a new rotation that flattens the camera's rotation to the ground
|
// Craft a new rotation that flattens the camera's rotation to the ground
|
||||||
// Needed to keep the character from inheriting the camera's height-rotation
|
// Needed to keep the character from inheriting the camera's height-rotation
|
||||||
targetRotation = Quaternion.Euler(Camera.main.transform.rotation.eulerAngles.Flatten(0, null, 0));
|
targetRotation = Quaternion.Euler(Camera.main.transform.rotation.eulerAngles.Flatten(0, null, 0));
|
||||||
break;
|
break;
|
||||||
|
case PlayerFacingDirection.Static:
|
||||||
|
targetRotation = agent.transform.rotation;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Construct move direction
|
// Construct move direction
|
||||||
Vector3 finalMoveDir = Vector3.zero;
|
Vector3 finalMoveDir = Vector3.zero;
|
||||||
Vector3 gravityMoveDirection;
|
Vector3 gravityMoveDirection;
|
||||||
|
|
||||||
|
// Change how input is managed based on facing state
|
||||||
|
currentMoveDir = Vector3.Slerp(currentMoveDir, groundMoveDirection.value, currentRotSpeed * Time.deltaTime);
|
||||||
|
|
||||||
// Add input movement
|
// Add input movement
|
||||||
if (agent.isGrounded){
|
if (agent.isGrounded){
|
||||||
finalMoveDir += groundMoveDirection.value + Vector3.down * .03f;
|
finalMoveDir += currentMoveDir + Vector3.down * .03f;
|
||||||
gravityMoveDirection = new(0f, jumpPower.value + (Physics.gravity.y *.3f), 0f);
|
gravityMoveDirection = new(0f, jumpPower.value + (Physics.gravity.y *.3f), 0f);
|
||||||
} else {
|
} else {
|
||||||
finalMoveDir += airMoveDirection.value;
|
finalMoveDir += airMoveDirection.value;
|
||||||
@@ -127,7 +142,7 @@ namespace NodeCanvas.Tasks.Actions {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Set final rotation
|
// Set final rotation
|
||||||
agent.transform.rotation = Quaternion.Lerp(agent.transform.rotation, targetRotation, 10f * Time.deltaTime);
|
agent.transform.rotation = Quaternion.Lerp(agent.transform.rotation, targetRotation, 10f * Time.deltaTime).Flatten(0, null, 0);
|
||||||
|
|
||||||
// ???? Moved this above but don't remember if this needs to be here still
|
// ???? Moved this above but don't remember if this needs to be here still
|
||||||
if (agent.isGrounded) {
|
if (agent.isGrounded) {
|
||||||
|
|||||||
@@ -13,4 +13,7 @@ public static class MathExtensions{
|
|||||||
return (to - origin).normalized;
|
return (to - origin).normalized;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static Color Alpha(this Color input, float newAlpha){
|
||||||
|
return new Color(input.r, input.g, input.b, newAlpha);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,6 +28,8 @@ public struct CameraSettingSingleValue<T>{
|
|||||||
|
|
||||||
public struct CameraSettingValues{
|
public struct CameraSettingValues{
|
||||||
public CameraSettingSingleValue<float> mainFieldOfView;
|
public CameraSettingSingleValue<float> mainFieldOfView;
|
||||||
|
|
||||||
|
public CameraSettingSingleValue<Vector3> orbitPositionDamping;
|
||||||
|
|
||||||
public CameraSettingSingleValue<float> orbitFollowTopHeight;
|
public CameraSettingSingleValue<float> orbitFollowTopHeight;
|
||||||
public CameraSettingSingleValue<float> orbitFollowTopRadius;
|
public CameraSettingSingleValue<float> orbitFollowTopRadius;
|
||||||
@@ -43,6 +45,8 @@ public struct CameraSettingValues{
|
|||||||
public CameraSettingValues(float defaultSmoothing){
|
public CameraSettingValues(float defaultSmoothing){
|
||||||
mainFieldOfView = new CameraSettingSingleValue<float>(defaultSmoothing);
|
mainFieldOfView = new CameraSettingSingleValue<float>(defaultSmoothing);
|
||||||
|
|
||||||
|
orbitPositionDamping = new CameraSettingSingleValue<Vector3>(defaultSmoothing);
|
||||||
|
|
||||||
orbitFollowTopHeight = new CameraSettingSingleValue<float>(defaultSmoothing);
|
orbitFollowTopHeight = new CameraSettingSingleValue<float>(defaultSmoothing);
|
||||||
orbitFollowTopRadius = new CameraSettingSingleValue<float>(defaultSmoothing);
|
orbitFollowTopRadius = new CameraSettingSingleValue<float>(defaultSmoothing);
|
||||||
orbitFollowCenterHeight = new CameraSettingSingleValue<float>(defaultSmoothing);
|
orbitFollowCenterHeight = new CameraSettingSingleValue<float>(defaultSmoothing);
|
||||||
@@ -86,6 +90,7 @@ public class CameraSettingsProcessor : MonoBehaviour{
|
|||||||
values = new CameraSettingValues{
|
values = new CameraSettingValues{
|
||||||
cameraOffsetOffset = new CameraSettingSingleValue<Vector3>(defaultSmoothing: .2f, offset.Offset),
|
cameraOffsetOffset = new CameraSettingSingleValue<Vector3>(defaultSmoothing: .2f, offset.Offset),
|
||||||
mainFieldOfView = new CameraSettingSingleValue<float>(defaultSmoothing: .2f, main.Lens.FieldOfView),
|
mainFieldOfView = new CameraSettingSingleValue<float>(defaultSmoothing: .2f, main.Lens.FieldOfView),
|
||||||
|
orbitPositionDamping = new CameraSettingSingleValue<Vector3>(defaultSmoothing: .2f, orbit.TrackerSettings.PositionDamping),
|
||||||
orbitFollowTopHeight = new CameraSettingSingleValue<float>(defaultSmoothing: .2f, orbit.Orbits.Top.Height),
|
orbitFollowTopHeight = new CameraSettingSingleValue<float>(defaultSmoothing: .2f, orbit.Orbits.Top.Height),
|
||||||
orbitFollowTopRadius = new CameraSettingSingleValue<float>(defaultSmoothing: .2f, orbit.Orbits.Top.Radius),
|
orbitFollowTopRadius = new CameraSettingSingleValue<float>(defaultSmoothing: .2f, orbit.Orbits.Top.Radius),
|
||||||
orbitFollowCenterHeight = new CameraSettingSingleValue<float>(defaultSmoothing: .2f, orbit.Orbits.Center.Height),
|
orbitFollowCenterHeight = new CameraSettingSingleValue<float>(defaultSmoothing: .2f, orbit.Orbits.Center.Height),
|
||||||
@@ -101,6 +106,10 @@ public class CameraSettingsProcessor : MonoBehaviour{
|
|||||||
values.mainFieldOfView.targetValue, ref values.mainFieldOfView.velocityRef,
|
values.mainFieldOfView.targetValue, ref values.mainFieldOfView.velocityRef,
|
||||||
values.mainFieldOfView.smoothing);
|
values.mainFieldOfView.smoothing);
|
||||||
|
|
||||||
|
orbit.TrackerSettings.PositionDamping = Vector3.SmoothDamp(orbit.TrackerSettings.PositionDamping,
|
||||||
|
values.orbitPositionDamping.targetValue, ref values.orbitPositionDamping.velocityRefV3,
|
||||||
|
values.orbitPositionDamping.smoothing);
|
||||||
|
|
||||||
orbit.Orbits.Top.Height = Mathf.SmoothDamp(orbit.Orbits.Top.Height,
|
orbit.Orbits.Top.Height = Mathf.SmoothDamp(orbit.Orbits.Top.Height,
|
||||||
values.orbitFollowTopHeight.targetValue, ref values.orbitFollowTopHeight.velocityRef,
|
values.orbitFollowTopHeight.targetValue, ref values.orbitFollowTopHeight.velocityRef,
|
||||||
values.orbitFollowTopHeight.smoothing);
|
values.orbitFollowTopHeight.smoothing);
|
||||||
@@ -113,6 +122,8 @@ public class CameraSettingsProcessor : MonoBehaviour{
|
|||||||
values.orbitFollowCenterHeight.targetValue, ref values.orbitFollowCenterHeight.velocityRef,
|
values.orbitFollowCenterHeight.targetValue, ref values.orbitFollowCenterHeight.velocityRef,
|
||||||
values.orbitFollowCenterHeight.smoothing);
|
values.orbitFollowCenterHeight.smoothing);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
orbit.Orbits.Center.Radius = Mathf.SmoothDamp(orbit.Orbits.Center.Radius,
|
orbit.Orbits.Center.Radius = Mathf.SmoothDamp(orbit.Orbits.Center.Radius,
|
||||||
values.orbitFollowCenterRadius.targetValue, ref values.orbitFollowCenterRadius.velocityRef,
|
values.orbitFollowCenterRadius.targetValue, ref values.orbitFollowCenterRadius.velocityRef,
|
||||||
values.orbitFollowCenterRadius.smoothing);
|
values.orbitFollowCenterRadius.smoothing);
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using System;
|
using System;
|
||||||
|
using System.Linq;
|
||||||
using UnityEditor;
|
using UnityEditor;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.InputSystem;
|
using UnityEngine.InputSystem;
|
||||||
@@ -6,11 +7,15 @@ using UnityEngine.UIElements;
|
|||||||
using NodeCanvas;
|
using NodeCanvas;
|
||||||
using NodeCanvas.Framework;
|
using NodeCanvas.Framework;
|
||||||
using ParadoxNotion;
|
using ParadoxNotion;
|
||||||
|
using Sirenix.OdinInspector;
|
||||||
|
|
||||||
public class PlayerControls : MonoBehaviour{
|
public class PlayerControls : MonoBehaviour{
|
||||||
// References
|
// References
|
||||||
private Player thisPlayer;
|
private Player thisPlayer;
|
||||||
|
|
||||||
|
private PlayerInput input;
|
||||||
|
public SignalDefinition inputSignal;
|
||||||
|
|
||||||
// TODO: Turn these into accessors
|
// TODO: Turn these into accessors
|
||||||
public Vector2 rawMoveInput;
|
public Vector2 rawMoveInput;
|
||||||
public Vector2 rawLookInput;
|
public Vector2 rawLookInput;
|
||||||
@@ -20,6 +25,31 @@ public class PlayerControls : MonoBehaviour{
|
|||||||
void Awake(){
|
void Awake(){
|
||||||
thisPlayer = GetComponent<Player>();
|
thisPlayer = GetComponent<Player>();
|
||||||
graph = GetComponent<GraphOwner>();
|
graph = GetComponent<GraphOwner>();
|
||||||
|
input = GetComponent<PlayerInput>();
|
||||||
|
|
||||||
|
// Add the delegates for each method
|
||||||
|
foreach (InputAction action in input.actions) {
|
||||||
|
action.started += SendToGraph;
|
||||||
|
action.canceled += SendToGraph;
|
||||||
|
action.performed += SendToGraph;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Remove the delegates for each method
|
||||||
|
void OnDisable(){
|
||||||
|
foreach (InputAction action in input.actions) {
|
||||||
|
action.started -= SendToGraph;
|
||||||
|
action.canceled -= SendToGraph;
|
||||||
|
action.performed -= SendToGraph;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// This will call the OnSignalInvoke for this type of Signal Defintion. CheckInput is the recieving end.
|
||||||
|
public void SendToGraph(InputAction.CallbackContext ctx){
|
||||||
|
inputSignal.Invoke(transform, transform, false, new object[]{
|
||||||
|
ctx.action,
|
||||||
|
ctx.phase
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OnMove(InputValue value){
|
public void OnMove(InputValue value){
|
||||||
|
|||||||
356
Assets/Scripts/Player/PlayerEnvironmentManager.cs
Normal file
356
Assets/Scripts/Player/PlayerEnvironmentManager.cs
Normal file
@@ -0,0 +1,356 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
using Drawing;
|
||||||
|
using Sirenix.OdinInspector;
|
||||||
|
using Sirenix.Serialization;
|
||||||
|
using Unity.Mathematics;
|
||||||
|
using UnityEngine.Serialization;
|
||||||
|
|
||||||
|
[Serializable]
|
||||||
|
public class EnvironmentObserver{
|
||||||
|
enum LabelDrawingLocation{
|
||||||
|
PlayerOffset,
|
||||||
|
HitLocation,
|
||||||
|
IntersectingLength,
|
||||||
|
}
|
||||||
|
|
||||||
|
enum ObserverGizmoDrawingCondition{
|
||||||
|
Always,
|
||||||
|
OnlyActive,
|
||||||
|
Never
|
||||||
|
}
|
||||||
|
|
||||||
|
public enum CastType{
|
||||||
|
Ray,
|
||||||
|
BoxOverlap,
|
||||||
|
SphereOverlap,
|
||||||
|
BoxCast,
|
||||||
|
SphereCast
|
||||||
|
}
|
||||||
|
|
||||||
|
[PropertySpace(0, 5), LabelWidth(60)]
|
||||||
|
public string label;
|
||||||
|
[PropertySpace(0, 10), LabelWidth(60)]
|
||||||
|
public CastType castType;
|
||||||
|
|
||||||
|
[Button(ButtonSizes.Large), GUIColor("@GetObserverStatusColorStatic(active, hit)"), PropertyOrder(-1), PropertySpace(5, 5)]
|
||||||
|
public void Active(){
|
||||||
|
active = !active;
|
||||||
|
}
|
||||||
|
|
||||||
|
[HideInInspector]
|
||||||
|
public bool active;
|
||||||
|
|
||||||
|
// Parameters for Cast cast types
|
||||||
|
[FoldoutGroup("Settings")] public float length;
|
||||||
|
[FoldoutGroup("Settings")] public Vector3 direction;
|
||||||
|
[FoldoutGroup("Settings")] public Vector3 offset;
|
||||||
|
[PropertySpace(0, 5), FoldoutGroup("Settings")] public LayerMask ignoreLayers = ~0;
|
||||||
|
|
||||||
|
[ShowIfGroup("Settings/CastsOnly", VisibleIf = "@castType == CastType.SphereCast || castType == CastType.SphereOverlap")]
|
||||||
|
[FoldoutGroup("Settings")] public float width;
|
||||||
|
|
||||||
|
// Parameters for Overlap cast types
|
||||||
|
[ShowIfGroup("Settings/3DOnly", VisibleIf = "@castType == CastType.BoxCast && castType != CastType.BoxOverlap")] [FoldoutGroup("Settings")]
|
||||||
|
public Vector3 size;
|
||||||
|
|
||||||
|
[ShowIfGroup("Settings/3DOnly")]
|
||||||
|
public Vector3 rotation;
|
||||||
|
|
||||||
|
[HideInInspector]
|
||||||
|
public RaycastHit hit;
|
||||||
|
|
||||||
|
[HideInInspector]
|
||||||
|
public Collider[] overlapHits;
|
||||||
|
|
||||||
|
[FoldoutGroup("Text")]
|
||||||
|
[BoxGroup("Text/Label")] public bool drawLabel;
|
||||||
|
[ShowInInspector, SerializeField] [BoxGroup("Text/Label")] LabelDrawingLocation labelTextLocation;
|
||||||
|
[BoxGroup("Text/Label")] public float labelSize;
|
||||||
|
[BoxGroup("Text/Label")] public Vector3 labelLocationOffset;
|
||||||
|
[BoxGroup("Text/Label")] public Vector3 labelRotationOffset;
|
||||||
|
|
||||||
|
[BoxGroup("Text/Hit")] public bool drawHitName;
|
||||||
|
[ShowInInspector, SerializeField] [BoxGroup("Text/Hit")] LabelDrawingLocation hitTextLocation;
|
||||||
|
[BoxGroup("Text/Hit")] public float hitTextSize;
|
||||||
|
[BoxGroup("Text/Hit")] public Vector3 hitLocationOffset;
|
||||||
|
[BoxGroup("Text/Hit")] public Vector3 hitRotationOffset;
|
||||||
|
[FoldoutGroup("Text"), SerializeField, ShowInInspector] ObserverGizmoDrawingCondition gizmoDrawingCondition;
|
||||||
|
|
||||||
|
[SerializeReference, PropertySpace(5, 5)]
|
||||||
|
public List<EnvironmentObserver> children;
|
||||||
|
|
||||||
|
// NOTE: I had a ref for a RaycastHit here that would correspond to hit but idk if it's needed.
|
||||||
|
public bool Evaluate(GameObject source){
|
||||||
|
if (active) {
|
||||||
|
// Remove player's layer from LayerMask.
|
||||||
|
ignoreLayers -= source.layer;
|
||||||
|
|
||||||
|
// Set some of the variables used later during casting
|
||||||
|
Vector3 relativeStart = source.transform.position + offset;
|
||||||
|
Vector3 relativeStartWithRotation = source.transform.position + source.transform.rotation * offset ;
|
||||||
|
|
||||||
|
switch (castType) {
|
||||||
|
case CastType.Ray:
|
||||||
|
Physics.Raycast(relativeStart, source.transform.rotation * direction, out hit, length, ignoreLayers);
|
||||||
|
break;
|
||||||
|
case CastType.BoxOverlap:
|
||||||
|
overlapHits = Physics.OverlapBox(relativeStartWithRotation, size / 2f,
|
||||||
|
source.transform.rotation * Quaternion.Euler(rotation), ignoreLayers);
|
||||||
|
|
||||||
|
if (overlapHits.Length > 0) {
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
|
||||||
|
break;
|
||||||
|
case CastType.SphereOverlap:
|
||||||
|
break;
|
||||||
|
case CastType.BoxCast:
|
||||||
|
// TODO: Make this not an if statement. Check that it works with NodeCanvas first
|
||||||
|
if (Physics.BoxCast(relativeStartWithRotation, size / 2f,
|
||||||
|
source.transform.rotation * Quaternion.Euler(rotation) * direction,
|
||||||
|
out hit, source.transform.rotation * Quaternion.Euler(rotation), length,
|
||||||
|
ignoreLayers)
|
||||||
|
) {
|
||||||
|
};
|
||||||
|
break;
|
||||||
|
case CastType.SphereCast:
|
||||||
|
// TODO: Make this not an if statement. Check that it works with NodeCanvas first
|
||||||
|
if (Physics.SphereCast(relativeStartWithRotation, width / 2f,
|
||||||
|
source.transform.rotation * Quaternion.Euler(rotation) * direction,
|
||||||
|
out hit, length,
|
||||||
|
ignoreLayers)
|
||||||
|
) {
|
||||||
|
};
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (hit.transform != null) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void DrawObserverGizmo(GameObject source, bool drawAnyways = false){
|
||||||
|
if (!drawAnyways){
|
||||||
|
if (gizmoDrawingCondition == ObserverGizmoDrawingCondition.Never || (gizmoDrawingCondition == ObserverGizmoDrawingCondition.OnlyActive ! & active)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Vector3 relativeStart = source.transform.position + offset;
|
||||||
|
Vector3 relativeStartWithRotation = source.transform.position + source.transform.rotation * (offset);
|
||||||
|
|
||||||
|
// Setup the variables for boxcast, spherecast, etc
|
||||||
|
// Create an offset start point for the center of the wirebox, since gizmos are drawn with their pivot in the center.
|
||||||
|
Vector3 offsetWithRotationAndLength = (Quaternion.LookRotation(direction) * Quaternion.Euler(rotation)) * (Vector3.forward * (length / 2));
|
||||||
|
Vector3 offsetFromCenter = relativeStartWithRotation + source.transform.rotation * offsetWithRotationAndLength;
|
||||||
|
|
||||||
|
// Also create a rotation for use with the gizmos. Mainly just to shorten the lines
|
||||||
|
Quaternion gizmosRotation = source.transform.rotation * Quaternion.LookRotation(direction) * Quaternion.Euler(rotation);
|
||||||
|
Vector3 firstBoxOffset = gizmosRotation * (Vector3.forward * size.z);
|
||||||
|
|
||||||
|
Color gizmoColor = Evaluate(source) ? Color.green : Color.red;
|
||||||
|
gizmoColor = active ? gizmoColor : Color.gray;
|
||||||
|
|
||||||
|
using (Draw.ingame.WithColor(gizmoColor)){
|
||||||
|
switch (castType) {
|
||||||
|
case CastType.Ray:
|
||||||
|
Draw.ingame.Line(relativeStart, relativeStart + (source.transform.rotation * direction.normalized) * length);
|
||||||
|
break;
|
||||||
|
case CastType.BoxOverlap:
|
||||||
|
Draw.ingame.WireBox(relativeStartWithRotation, source.transform.rotation * Quaternion.Euler(rotation), size);
|
||||||
|
break;
|
||||||
|
case CastType.SphereCast:
|
||||||
|
Draw.ingame.SolidCircle(relativeStartWithRotation, relativeStartWithRotation - Camera.main.transform.position, width * 1, gizmoColor.Alpha(.5f));
|
||||||
|
Draw.ingame.WireCapsule(relativeStartWithRotation, relativeStartWithRotation + gizmosRotation * (Vector3.forward * (length - width / 2)), width);
|
||||||
|
break;
|
||||||
|
case CastType.BoxCast:
|
||||||
|
// Draw the gizmos for the boxcast
|
||||||
|
Draw.ingame.WireBox(offsetFromCenter, gizmosRotation, new float3(size.x, size.y, length));
|
||||||
|
Draw.ingame.SolidBox(relativeStartWithRotation, gizmosRotation, size, gizmoColor.Alpha(.1f));
|
||||||
|
|
||||||
|
Draw.ingame.WireBox(relativeStartWithRotation, gizmosRotation, size);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw new ArgumentOutOfRangeException();
|
||||||
|
}
|
||||||
|
|
||||||
|
Draw.ingame.SolidCircle(relativeStartWithRotation, relativeStartWithRotation - Camera.main.transform.position, .4f);
|
||||||
|
Draw.ingame.SolidCircle(hit.point, hit.point - Camera.main.transform.position, .4f);
|
||||||
|
|
||||||
|
// Set up variables for label (not hit name)
|
||||||
|
Vector3 labelStartPos = Vector3.zero;
|
||||||
|
switch (labelTextLocation) {
|
||||||
|
case LabelDrawingLocation.PlayerOffset:
|
||||||
|
labelStartPos = source.transform.position;
|
||||||
|
break;
|
||||||
|
case LabelDrawingLocation.IntersectingLength:
|
||||||
|
labelStartPos = offsetFromCenter;
|
||||||
|
break;
|
||||||
|
case LabelDrawingLocation.HitLocation:{
|
||||||
|
if (hit.transform != null) {
|
||||||
|
labelStartPos = hit.point;
|
||||||
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Draw label
|
||||||
|
if (drawLabel) {
|
||||||
|
Draw.ingame.Label3D(
|
||||||
|
labelStartPos + labelLocationOffset,
|
||||||
|
gizmosRotation * Quaternion.Euler(labelRotationOffset),
|
||||||
|
label,
|
||||||
|
labelSize,
|
||||||
|
LabelAlignment.MiddleLeft,
|
||||||
|
gizmoColor
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set up variables for hit name
|
||||||
|
// Since the label is already drawn just use the previous startPos
|
||||||
|
switch (labelTextLocation) {
|
||||||
|
case LabelDrawingLocation.PlayerOffset:
|
||||||
|
labelStartPos = source.transform.position;
|
||||||
|
break;
|
||||||
|
case LabelDrawingLocation.IntersectingLength:
|
||||||
|
labelStartPos = offsetFromCenter;
|
||||||
|
break;
|
||||||
|
case LabelDrawingLocation.HitLocation:{
|
||||||
|
if (hit.transform != null) {
|
||||||
|
labelStartPos = hit.point;
|
||||||
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Draw hitname
|
||||||
|
if (drawLabel) {
|
||||||
|
Draw.ingame.Label3D(
|
||||||
|
labelStartPos + labelLocationOffset,
|
||||||
|
gizmosRotation * Quaternion.Euler(labelRotationOffset),
|
||||||
|
label,
|
||||||
|
hitTextSize,
|
||||||
|
LabelAlignment.MiddleLeft,
|
||||||
|
gizmoColor
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static Color GetObserverStatusColorStatic(bool active, RaycastHit hit){
|
||||||
|
if (active) {
|
||||||
|
if (hit.Equals(default(RaycastHit))) {
|
||||||
|
return Color.green;
|
||||||
|
}
|
||||||
|
|
||||||
|
return Color.red;
|
||||||
|
}
|
||||||
|
|
||||||
|
return Color.gray;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public class PlayerEnvironmentManager : MonoBehaviour{
|
||||||
|
[OdinSerialize]
|
||||||
|
public List<EnvironmentObserver> observers;
|
||||||
|
|
||||||
|
void Start(){
|
||||||
|
CheckDuplicateLabels(observers);
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: Not working.
|
||||||
|
void CheckDuplicateLabels(List<EnvironmentObserver> sourceList){
|
||||||
|
foreach (EnvironmentObserver sourceObserver in observers) {
|
||||||
|
foreach (EnvironmentObserver observer in sourceList) {
|
||||||
|
if (sourceObserver == observer) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (sourceObserver.label == observer.label) {
|
||||||
|
Debug.LogError($"Duplicate label found in observer: {observer.label} is in use multiple times");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (observer.children != null && observer.children.Count > 0) {
|
||||||
|
CheckDuplicateLabels(observer.children);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool EvaluateFromString(string searchLabel, List<EnvironmentObserver> observerList = null){
|
||||||
|
List<EnvironmentObserver> listToUse = observers;
|
||||||
|
|
||||||
|
if (observerList != null) {
|
||||||
|
listToUse = observerList;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (EnvironmentObserver observer in listToUse) {
|
||||||
|
if (observer.label == searchLabel) {
|
||||||
|
return observer.Evaluate(gameObject);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (observer.children != null && observer.children.Count > 0) {
|
||||||
|
foreach (EnvironmentObserver childObserver in observer.children) {
|
||||||
|
EvaluateFromString(searchLabel, childObserver.children);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public EnvironmentObserver FindObserverFromString(string searchLabel, List<EnvironmentObserver> observerList = null){
|
||||||
|
List<EnvironmentObserver> listToUse = observers;
|
||||||
|
|
||||||
|
if (observerList != null) {
|
||||||
|
listToUse = observerList;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (EnvironmentObserver observer in listToUse) {
|
||||||
|
if (observer.label == searchLabel) {
|
||||||
|
return observer;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (observer.children != null && observer.children.Count > 0) {
|
||||||
|
foreach (EnvironmentObserver childObserver in observer.children) {
|
||||||
|
FindObserverFromString(searchLabel, childObserver.children);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Update(){
|
||||||
|
}
|
||||||
|
|
||||||
|
void LateUpdate(){
|
||||||
|
// Draw Gizmos
|
||||||
|
foreach (EnvironmentObserver observer in observers) {
|
||||||
|
observer.DrawObserverGizmo(gameObject);
|
||||||
|
|
||||||
|
if (observer.children != null && observer.children.Count > 0) {
|
||||||
|
foreach (EnvironmentObserver childObserver in observer.children) {
|
||||||
|
childObserver.DrawObserverGizmo(gameObject);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Clear hit
|
||||||
|
foreach (EnvironmentObserver observer in observers) {
|
||||||
|
observer.hit = default;
|
||||||
|
|
||||||
|
if (observer.children != null && observer.children.Count > 0) {
|
||||||
|
foreach (EnvironmentObserver childObserver in observer.children) {
|
||||||
|
childObserver.hit = default;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
2
Assets/Scripts/Player/PlayerEnvironmentManager.cs.meta
Normal file
2
Assets/Scripts/Player/PlayerEnvironmentManager.cs.meta
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 7a8c0593fef54844383c2f154cf8806c
|
||||||
@@ -15,42 +15,42 @@ public class PlayerMovement : MonoBehaviour
|
|||||||
thisPlayer = GetComponent<Player>();
|
thisPlayer = GetComponent<Player>();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Update(){
|
// void Update(){
|
||||||
// Create Ray Colors
|
// // Create Ray Colors
|
||||||
Color forwardRayStatus = Color.red;
|
// Color forwardRayStatus = Color.red;
|
||||||
Color leftRayStatus = Color.red;
|
// Color leftRayStatus = Color.red;
|
||||||
Color rightRayStatus = Color.red;
|
// Color rightRayStatus = Color.red;
|
||||||
|
//
|
||||||
if (forwardRay.collider&& forwardRay.transform.gameObject.layer == LayerMask.NameToLayer("Environment")){ forwardRayStatus = Color.green;}
|
// if (forwardRay.collider&& forwardRay.transform.gameObject.layer == LayerMask.NameToLayer("Environment")){ forwardRayStatus = Color.green;}
|
||||||
if (leftRay.collider&& leftRay.transform.gameObject.layer == LayerMask.NameToLayer("Environment")){ leftRayStatus = Color.green;}
|
// if (leftRay.collider&& leftRay.transform.gameObject.layer == LayerMask.NameToLayer("Environment")){ leftRayStatus = Color.green;}
|
||||||
if (rightRay.collider&& rightRay.transform.gameObject.layer == LayerMask.NameToLayer("Environment")){ rightRayStatus = Color.green;}
|
// if (rightRay.collider&& rightRay.transform.gameObject.layer == LayerMask.NameToLayer("Environment")){ rightRayStatus = Color.green;}
|
||||||
|
//
|
||||||
using (Draw.WithColor(forwardRayStatus)) {
|
// using (Draw.WithColor(forwardRayStatus)) {
|
||||||
Draw.Line(transform.position + transform.up, transform.position + transform.forward * 2.5f + transform.up);
|
// Draw.Line(transform.position + transform.up, transform.position + transform.forward * 2.5f + transform.up);
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
|
// using (Draw.WithColor(leftRayStatus)) {
|
||||||
|
// Draw.Line(transform.position + transform.up, transform.position + -transform.right * 2f + transform.up);
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// using (Draw.WithColor(rightRayStatus)) {
|
||||||
|
// Draw.Line(transform.position + transform.up, transform.position + transform.right * 2f + transform.up);
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
using (Draw.WithColor(leftRayStatus)) {
|
// void FixedUpdate(){
|
||||||
Draw.Line(transform.position + transform.up, transform.position + -transform.right * 2f + transform.up);
|
// LayerMask environmentLayer = LayerMask.NameToLayer("Environment");
|
||||||
}
|
//
|
||||||
|
// if (Physics.Raycast(transform.position + Vector3.up, transform.forward, out forwardRay, 2.5f, ~environmentLayer)){
|
||||||
using (Draw.WithColor(rightRayStatus)) {
|
// thisPlayer.controls.graph.SendEvent("ForwardRay", true, null);
|
||||||
Draw.Line(transform.position + transform.up, transform.position + transform.right * 2f + transform.up);
|
// }
|
||||||
}
|
//
|
||||||
}
|
// if (Physics.Raycast(transform.position + Vector3.up, transform.position + Vector3.left, out leftRay, maxDistance: 2f, ~environmentLayer )) {
|
||||||
|
// thisPlayer.controls.graph.SendEvent("LeftRay", true, null);
|
||||||
void FixedUpdate(){
|
// }
|
||||||
LayerMask environmentLayer = LayerMask.NameToLayer("Environment");
|
//
|
||||||
|
// if (Physics.Raycast(transform.position + Vector3.up, transform.position + Vector3.right, out rightRay, maxDistance: 2f, ~environmentLayer )) {
|
||||||
if (Physics.Raycast(transform.position + Vector3.up, transform.forward, out forwardRay, 2.5f, ~environmentLayer)){
|
// thisPlayer.controls.graph.SendEvent("RightRay", true, null);
|
||||||
thisPlayer.controls.graph.SendEvent("ForwardRay", true, null);
|
// }
|
||||||
}
|
// }
|
||||||
|
|
||||||
if (Physics.Raycast(transform.position + Vector3.up, transform.position + Vector3.left, out leftRay, maxDistance: 2f, ~environmentLayer )) {
|
|
||||||
thisPlayer.controls.graph.SendEvent("LeftRay", true, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Physics.Raycast(transform.position + Vector3.up, transform.position + Vector3.right, out rightRay, maxDistance: 2f, ~environmentLayer )) {
|
|
||||||
thisPlayer.controls.graph.SendEvent("RightRay", true, null);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
"GUID:de4e6084e6d474788bb8c799d6b461ec",
|
"GUID:de4e6084e6d474788bb8c799d6b461ec",
|
||||||
"GUID:d8b63aba1907145bea998dd612889d6b",
|
"GUID:d8b63aba1907145bea998dd612889d6b",
|
||||||
"GUID:4307f53044263cf4b835bd812fc161a4",
|
"GUID:4307f53044263cf4b835bd812fc161a4",
|
||||||
"GUID:4099e5319e98558428028d54bc62664e",
|
"GUID:e0cd26848372d4e5c891c569017e11f1",
|
||||||
"GUID:1826c0224c0d048b88112c79bbb0cd85"
|
"GUID:1826c0224c0d048b88112c79bbb0cd85"
|
||||||
],
|
],
|
||||||
"includePlatforms": [],
|
"includePlatforms": [],
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: f4be9f6fb652f19488b46fbc9bac8be5
|
guid: 09610894297ae74449b37191945069ff
|
||||||
folderAsset: yes
|
folderAsset: yes
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
116
Assets/Scripts/World/WorldGenerator.cs
Normal file
116
Assets/Scripts/World/WorldGenerator.cs
Normal file
@@ -0,0 +1,116 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
using Sirenix.OdinInspector;
|
||||||
|
using UnityEngine.ProBuilder;
|
||||||
|
using UnityEngine.ProBuilder.MeshOperations;
|
||||||
|
using Random = UnityEngine.Random;
|
||||||
|
|
||||||
|
public class WorldGenerator : MonoBehaviour{
|
||||||
|
public Vector2 worldSize;
|
||||||
|
|
||||||
|
public int platformCount;
|
||||||
|
|
||||||
|
[MinMaxSlider(1f, 100f)]
|
||||||
|
public Vector2 platformHeightRange;
|
||||||
|
[MinMaxSlider(25f, 300f)]
|
||||||
|
public Vector2 platformWidthRange;
|
||||||
|
|
||||||
|
[Header("Mega Platforms")]
|
||||||
|
public int megaPlatformCount;
|
||||||
|
[MinMaxSlider(30f, 100f)]
|
||||||
|
public Vector2 megaPlatformtHeightRange = new Vector2(20, 20);
|
||||||
|
[MinMaxSlider(250f, 500f)]
|
||||||
|
public Vector2 megaPlatformWidthRange = new Vector2(50, 50);
|
||||||
|
|
||||||
|
private List<GameObject> allPlatforms = new List<GameObject>();
|
||||||
|
private List<GameObject> megaPlatforms = new List<GameObject>();
|
||||||
|
|
||||||
|
void Start(){
|
||||||
|
GenerateWorld();
|
||||||
|
}
|
||||||
|
|
||||||
|
[Button]
|
||||||
|
public void RegenerateWorld(){
|
||||||
|
ClearWorld();
|
||||||
|
GenerateWorld();
|
||||||
|
}
|
||||||
|
|
||||||
|
void ClearWorld(){
|
||||||
|
allPlatforms.ForEach(Destroy);
|
||||||
|
}
|
||||||
|
|
||||||
|
void GenerateWorld(){
|
||||||
|
GenerateMegaPlatforms();
|
||||||
|
GenerateStandardPlatforms();
|
||||||
|
}
|
||||||
|
|
||||||
|
void GenerateMegaPlatforms(){
|
||||||
|
for (int i = 0; i < megaPlatformCount; i++) {
|
||||||
|
Vector3 newPlatformSize = new Vector3(
|
||||||
|
Random.Range(megaPlatformWidthRange.x, megaPlatformWidthRange.y),
|
||||||
|
Random.Range(megaPlatformtHeightRange.x, megaPlatformtHeightRange.y),
|
||||||
|
Random.Range(megaPlatformWidthRange.x, megaPlatformWidthRange.y)
|
||||||
|
);
|
||||||
|
|
||||||
|
var newPlatform = ShapeGenerator.GenerateCube(PivotLocation.Center, newPlatformSize);
|
||||||
|
|
||||||
|
newPlatform.SetMaterial(newPlatform.faces, BuiltinMaterials.defaultMaterial);
|
||||||
|
newPlatform.gameObject.AddComponent<BoxCollider>();
|
||||||
|
|
||||||
|
newPlatform.transform.position = new Vector3(
|
||||||
|
Random.Range(-worldSize.x, worldSize.x),
|
||||||
|
newPlatformSize.y / 2f,
|
||||||
|
Random.Range(-worldSize.y, worldSize.y)
|
||||||
|
);
|
||||||
|
|
||||||
|
newPlatform.gameObject.name = "Megaplatform";
|
||||||
|
|
||||||
|
megaPlatforms.Add(newPlatform.gameObject);
|
||||||
|
allPlatforms.Add(newPlatform.gameObject);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void GenerateStandardPlatforms(){
|
||||||
|
for (int i = 0; i < platformCount; i++) {
|
||||||
|
Vector3 newPlatformSize = new Vector3(
|
||||||
|
Random.Range(platformWidthRange.x, platformWidthRange.y),
|
||||||
|
Random.Range(platformHeightRange.x, platformHeightRange.y),
|
||||||
|
Random.Range(platformWidthRange.x, platformWidthRange.y)
|
||||||
|
);
|
||||||
|
|
||||||
|
var newPlatform = ShapeGenerator.GenerateCube(PivotLocation.Center, newPlatformSize);
|
||||||
|
newPlatform.gameObject.layer = 2;
|
||||||
|
|
||||||
|
newPlatform.SetMaterial(newPlatform.faces, BuiltinMaterials.defaultMaterial);
|
||||||
|
|
||||||
|
Vector3 newPlatformPosXZ = new Vector3(
|
||||||
|
Random.Range(-worldSize.x, worldSize.x),
|
||||||
|
350f,
|
||||||
|
Random.Range(-worldSize.y, worldSize.y)
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
Physics.Raycast(newPlatformPosXZ, Vector3.down, out RaycastHit hit, Mathf.Infinity, LayerMask.GetMask("Default"));
|
||||||
|
|
||||||
|
Debug.Log(hit.collider.name);
|
||||||
|
|
||||||
|
newPlatform.transform.position = new Vector3(
|
||||||
|
newPlatformPosXZ.x,
|
||||||
|
hit.point.y + newPlatformSize.y /2f,
|
||||||
|
newPlatformPosXZ.z
|
||||||
|
);
|
||||||
|
|
||||||
|
newPlatform.gameObject.name = "Platform";
|
||||||
|
|
||||||
|
// newPlatform.gameObject.AddComponent<BoxCollider>();
|
||||||
|
allPlatforms.Add(newPlatform.gameObject);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update is called once per frame
|
||||||
|
void Update()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
2
Assets/Scripts/World/WorldGenerator.cs.meta
Normal file
2
Assets/Scripts/World/WorldGenerator.cs.meta
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f48f68f001ea2ca4b89207ff5b4960a9
|
||||||
@@ -342,6 +342,9 @@ MonoBehaviour:
|
|||||||
skyOcclusionIntensityMultiplier:
|
skyOcclusionIntensityMultiplier:
|
||||||
m_OverrideState: 1
|
m_OverrideState: 1
|
||||||
m_Value: 1
|
m_Value: 1
|
||||||
|
worldOffset:
|
||||||
|
m_OverrideState: 1
|
||||||
|
m_Value: {x: 0, y: 0, z: 0}
|
||||||
--- !u!114 &-1216621516061285780
|
--- !u!114 &-1216621516061285780
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 3
|
m_ObjectHideFlags: 3
|
||||||
@@ -462,8 +465,6 @@ MonoBehaviour:
|
|||||||
- {fileID: -6288072647309666549}
|
- {fileID: -6288072647309666549}
|
||||||
- {fileID: 7518938298396184218}
|
- {fileID: 7518938298396184218}
|
||||||
- {fileID: -1410297666881709256}
|
- {fileID: -1410297666881709256}
|
||||||
- {fileID: -7750755424749557576}
|
|
||||||
- {fileID: -5139089513906902183}
|
|
||||||
--- !u!114 &853819529557874667
|
--- !u!114 &853819529557874667
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 3
|
m_ObjectHideFlags: 3
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ MonoBehaviour:
|
|||||||
lineOpacity: 1
|
lineOpacity: 1
|
||||||
solidOpacity: 0.55
|
solidOpacity: 0.55
|
||||||
textOpacity: 1
|
textOpacity: 1
|
||||||
lineOpacityBehindObjects: 0.12
|
lineOpacityBehindObjects: 0.3186
|
||||||
solidOpacityBehindObjects: 0.45
|
solidOpacityBehindObjects: 0.1286
|
||||||
textOpacityBehindObjects: 0.9
|
textOpacityBehindObjects: 0.0881
|
||||||
curveResolution: 1
|
curveResolution: 1
|
||||||
|
|||||||
@@ -1,252 +0,0 @@
|
|||||||
%YAML 1.1
|
|
||||||
%TAG !u! tag:unity3d.com,2011:
|
|
||||||
--- !u!29 &1
|
|
||||||
OcclusionCullingSettings:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
serializedVersion: 2
|
|
||||||
m_OcclusionBakeSettings:
|
|
||||||
smallestOccluder: 5
|
|
||||||
smallestHole: 0.25
|
|
||||||
backfaceThreshold: 100
|
|
||||||
m_SceneGUID: 00000000000000000000000000000000
|
|
||||||
m_OcclusionCullingData: {fileID: 0}
|
|
||||||
--- !u!104 &2
|
|
||||||
RenderSettings:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
serializedVersion: 9
|
|
||||||
m_Fog: 0
|
|
||||||
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
|
|
||||||
m_FogMode: 3
|
|
||||||
m_FogDensity: 0.01
|
|
||||||
m_LinearFogStart: 0
|
|
||||||
m_LinearFogEnd: 300
|
|
||||||
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
|
|
||||||
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
|
|
||||||
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
|
|
||||||
m_AmbientIntensity: 1
|
|
||||||
m_AmbientMode: 3
|
|
||||||
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
|
|
||||||
m_SkyboxMaterial: {fileID: 0}
|
|
||||||
m_HaloStrength: 0.5
|
|
||||||
m_FlareStrength: 1
|
|
||||||
m_FlareFadeSpeed: 3
|
|
||||||
m_HaloTexture: {fileID: 0}
|
|
||||||
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
|
|
||||||
m_DefaultReflectionMode: 0
|
|
||||||
m_DefaultReflectionResolution: 128
|
|
||||||
m_ReflectionBounces: 1
|
|
||||||
m_ReflectionIntensity: 1
|
|
||||||
m_CustomReflection: {fileID: 0}
|
|
||||||
m_Sun: {fileID: 0}
|
|
||||||
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
|
|
||||||
m_UseRadianceAmbientProbe: 0
|
|
||||||
--- !u!157 &3
|
|
||||||
LightmapSettings:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
serializedVersion: 11
|
|
||||||
m_GIWorkflowMode: 1
|
|
||||||
m_GISettings:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_BounceScale: 1
|
|
||||||
m_IndirectOutputScale: 1
|
|
||||||
m_AlbedoBoost: 1
|
|
||||||
m_EnvironmentLightingMode: 0
|
|
||||||
m_EnableBakedLightmaps: 0
|
|
||||||
m_EnableRealtimeLightmaps: 0
|
|
||||||
m_LightmapEditorSettings:
|
|
||||||
serializedVersion: 12
|
|
||||||
m_Resolution: 2
|
|
||||||
m_BakeResolution: 40
|
|
||||||
m_AtlasSize: 1024
|
|
||||||
m_AO: 0
|
|
||||||
m_AOMaxDistance: 1
|
|
||||||
m_CompAOExponent: 1
|
|
||||||
m_CompAOExponentDirect: 0
|
|
||||||
m_ExtractAmbientOcclusion: 0
|
|
||||||
m_Padding: 2
|
|
||||||
m_LightmapParameters: {fileID: 0}
|
|
||||||
m_LightmapsBakeMode: 1
|
|
||||||
m_TextureCompression: 1
|
|
||||||
m_FinalGather: 0
|
|
||||||
m_FinalGatherFiltering: 1
|
|
||||||
m_FinalGatherRayCount: 256
|
|
||||||
m_ReflectionCompression: 2
|
|
||||||
m_MixedBakeMode: 2
|
|
||||||
m_BakeBackend: 1
|
|
||||||
m_PVRSampling: 1
|
|
||||||
m_PVRDirectSampleCount: 32
|
|
||||||
m_PVRSampleCount: 512
|
|
||||||
m_PVRBounces: 2
|
|
||||||
m_PVREnvironmentSampleCount: 256
|
|
||||||
m_PVREnvironmentReferencePointCount: 2048
|
|
||||||
m_PVRFilteringMode: 1
|
|
||||||
m_PVRDenoiserTypeDirect: 1
|
|
||||||
m_PVRDenoiserTypeIndirect: 1
|
|
||||||
m_PVRDenoiserTypeAO: 1
|
|
||||||
m_PVRFilterTypeDirect: 0
|
|
||||||
m_PVRFilterTypeIndirect: 0
|
|
||||||
m_PVRFilterTypeAO: 0
|
|
||||||
m_PVREnvironmentMIS: 1
|
|
||||||
m_PVRCulling: 1
|
|
||||||
m_PVRFilteringGaussRadiusDirect: 1
|
|
||||||
m_PVRFilteringGaussRadiusIndirect: 5
|
|
||||||
m_PVRFilteringGaussRadiusAO: 2
|
|
||||||
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
|
|
||||||
m_PVRFilteringAtrousPositionSigmaIndirect: 2
|
|
||||||
m_PVRFilteringAtrousPositionSigmaAO: 1
|
|
||||||
m_ExportTrainingData: 0
|
|
||||||
m_TrainingDataDestination: TrainingData
|
|
||||||
m_LightProbeSampleCountMultiplier: 4
|
|
||||||
m_LightingDataAsset: {fileID: 0}
|
|
||||||
m_UseShadowmask: 1
|
|
||||||
--- !u!196 &4
|
|
||||||
NavMeshSettings:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_BuildSettings:
|
|
||||||
serializedVersion: 2
|
|
||||||
agentTypeID: 0
|
|
||||||
agentRadius: 0.5
|
|
||||||
agentHeight: 2
|
|
||||||
agentSlope: 45
|
|
||||||
agentClimb: 0.4
|
|
||||||
ledgeDropHeight: 0
|
|
||||||
maxJumpAcrossDistance: 0
|
|
||||||
minRegionArea: 2
|
|
||||||
manualCellSize: 0
|
|
||||||
cellSize: 0.16666667
|
|
||||||
manualTileSize: 0
|
|
||||||
tileSize: 256
|
|
||||||
accuratePlacement: 0
|
|
||||||
debug:
|
|
||||||
m_Flags: 0
|
|
||||||
m_NavMeshData: {fileID: 0}
|
|
||||||
--- !u!1 &869075708
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 869075710}
|
|
||||||
- component: {fileID: 869075709}
|
|
||||||
m_Layer: 0
|
|
||||||
m_Name: Example
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!114 &869075709
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 869075708}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: f0f4fc589d3160f4197a6ec70bab0925, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
info: Hover over slider to see tooltip
|
|
||||||
floatTest: {x: 2, y: 8}
|
|
||||||
intTest: {x: 0, y: 0}
|
|
||||||
--- !u!4 &869075710
|
|
||||||
Transform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 869075708}
|
|
||||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
|
||||||
m_Children: []
|
|
||||||
m_Father: {fileID: 0}
|
|
||||||
m_RootOrder: 1
|
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
||||||
--- !u!1 &1410662703
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 1410662706}
|
|
||||||
- component: {fileID: 1410662705}
|
|
||||||
- component: {fileID: 1410662704}
|
|
||||||
m_Layer: 0
|
|
||||||
m_Name: Main Camera
|
|
||||||
m_TagString: MainCamera
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!81 &1410662704
|
|
||||||
AudioListener:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1410662703}
|
|
||||||
m_Enabled: 1
|
|
||||||
--- !u!20 &1410662705
|
|
||||||
Camera:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1410662703}
|
|
||||||
m_Enabled: 1
|
|
||||||
serializedVersion: 2
|
|
||||||
m_ClearFlags: 1
|
|
||||||
m_BackGroundColor: {r: 0.58219117, g: 0.8396226, b: 0.82838553, a: 0}
|
|
||||||
m_projectionMatrixMode: 1
|
|
||||||
m_GateFitMode: 2
|
|
||||||
m_FOVAxisMode: 0
|
|
||||||
m_SensorSize: {x: 36, y: 24}
|
|
||||||
m_LensShift: {x: 0, y: 0}
|
|
||||||
m_FocalLength: 50
|
|
||||||
m_NormalizedViewPortRect:
|
|
||||||
serializedVersion: 2
|
|
||||||
x: 0
|
|
||||||
y: 0
|
|
||||||
width: 1
|
|
||||||
height: 1
|
|
||||||
near clip plane: 0.3
|
|
||||||
far clip plane: 1000
|
|
||||||
field of view: 60
|
|
||||||
orthographic: 1
|
|
||||||
orthographic size: 5
|
|
||||||
m_Depth: -1
|
|
||||||
m_CullingMask:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Bits: 4294967295
|
|
||||||
m_RenderingPath: -1
|
|
||||||
m_TargetTexture: {fileID: 0}
|
|
||||||
m_TargetDisplay: 0
|
|
||||||
m_TargetEye: 3
|
|
||||||
m_HDR: 1
|
|
||||||
m_AllowMSAA: 1
|
|
||||||
m_AllowDynamicResolution: 0
|
|
||||||
m_ForceIntoRT: 0
|
|
||||||
m_OcclusionCulling: 1
|
|
||||||
m_StereoConvergence: 10
|
|
||||||
m_StereoSeparation: 0.022
|
|
||||||
--- !u!4 &1410662706
|
|
||||||
Transform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1410662703}
|
|
||||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
|
||||||
m_LocalPosition: {x: 0, y: 0, z: -10}
|
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
|
||||||
m_Children: []
|
|
||||||
m_Father: {fileID: 0}
|
|
||||||
m_RootOrder: 0
|
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: b58f02022de16354ba42b835bcc79d57
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@@ -1,108 +0,0 @@
|
|||||||
using UnityEngine;
|
|
||||||
using UnityEditor;
|
|
||||||
using GD.MinMaxSlider;
|
|
||||||
|
|
||||||
[CustomPropertyDrawer(typeof(MinMaxSliderAttribute))]
|
|
||||||
public class MinMaxSliderDrawer : PropertyDrawer {
|
|
||||||
|
|
||||||
public override void OnGUI(Rect position, SerializedProperty property, GUIContent label){
|
|
||||||
|
|
||||||
var minMaxAttribute = (MinMaxSliderAttribute)attribute;
|
|
||||||
var propertyType = property.propertyType;
|
|
||||||
|
|
||||||
label.tooltip = minMaxAttribute.min.ToString("F2") + " to " + minMaxAttribute.max.ToString("F2");
|
|
||||||
|
|
||||||
//PrefixLabel returns the rect of the right part of the control. It leaves out the label section. We don't have to worry about it. Nice!
|
|
||||||
Rect controlRect = EditorGUI.PrefixLabel(position, label);
|
|
||||||
|
|
||||||
Rect[] splittedRect = SplitRect(controlRect,3);
|
|
||||||
|
|
||||||
if(propertyType == SerializedPropertyType.Vector2){
|
|
||||||
|
|
||||||
EditorGUI.BeginChangeCheck();
|
|
||||||
|
|
||||||
Vector2 vector = property.vector2Value;
|
|
||||||
float minVal = vector.x;
|
|
||||||
float maxVal = vector.y;
|
|
||||||
|
|
||||||
//F2 limits the float to two decimal places (0.00).
|
|
||||||
minVal = EditorGUI.FloatField(splittedRect[0], float.Parse(minVal.ToString("F2")));
|
|
||||||
maxVal = EditorGUI.FloatField(splittedRect[2], float.Parse(maxVal.ToString("F2")));
|
|
||||||
|
|
||||||
EditorGUI.MinMaxSlider(splittedRect[1], ref minVal, ref maxVal,
|
|
||||||
minMaxAttribute.min,minMaxAttribute.max);
|
|
||||||
|
|
||||||
if(minVal < minMaxAttribute.min){
|
|
||||||
minVal = minMaxAttribute.min;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(maxVal > minMaxAttribute.max){
|
|
||||||
maxVal = minMaxAttribute.max;
|
|
||||||
}
|
|
||||||
|
|
||||||
vector = new Vector2(minVal > maxVal ? maxVal : minVal, maxVal);
|
|
||||||
|
|
||||||
if(EditorGUI.EndChangeCheck()){
|
|
||||||
property.vector2Value = vector;
|
|
||||||
}
|
|
||||||
|
|
||||||
}else if(propertyType == SerializedPropertyType.Vector2Int){
|
|
||||||
|
|
||||||
EditorGUI.BeginChangeCheck();
|
|
||||||
|
|
||||||
Vector2Int vector = property.vector2IntValue;
|
|
||||||
float minVal = vector.x;
|
|
||||||
float maxVal = vector.y;
|
|
||||||
|
|
||||||
minVal = EditorGUI.FloatField(splittedRect[0], minVal);
|
|
||||||
maxVal = EditorGUI.FloatField(splittedRect[2], maxVal);
|
|
||||||
|
|
||||||
EditorGUI.MinMaxSlider(splittedRect[1], ref minVal, ref maxVal,
|
|
||||||
minMaxAttribute.min,minMaxAttribute.max);
|
|
||||||
|
|
||||||
if(minVal < minMaxAttribute.min){
|
|
||||||
maxVal = minMaxAttribute.min;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(minVal > minMaxAttribute.max){
|
|
||||||
maxVal = minMaxAttribute.max;
|
|
||||||
}
|
|
||||||
|
|
||||||
vector = new Vector2Int(Mathf.FloorToInt(minVal > maxVal ? maxVal : minVal), Mathf.FloorToInt(maxVal));
|
|
||||||
|
|
||||||
if(EditorGUI.EndChangeCheck()){
|
|
||||||
property.vector2IntValue = vector;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
Rect[] SplitRect(Rect rectToSplit, int n){
|
|
||||||
|
|
||||||
|
|
||||||
Rect[] rects = new Rect[n];
|
|
||||||
|
|
||||||
for(int i = 0; i < n; i++){
|
|
||||||
|
|
||||||
rects[i] = new Rect(rectToSplit.position.x + (i * rectToSplit.width / n), rectToSplit.position.y, rectToSplit.width / n, rectToSplit.height);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
int padding = (int)rects[0].width - 40;
|
|
||||||
int space = 5;
|
|
||||||
|
|
||||||
rects[0].width -= padding + space;
|
|
||||||
rects[2].width -= padding + space;
|
|
||||||
|
|
||||||
rects[1].x -= padding;
|
|
||||||
rects[1].width += padding * 2;
|
|
||||||
|
|
||||||
rects[2].x += padding + space;
|
|
||||||
|
|
||||||
|
|
||||||
return rects;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: e6b53f69308943e499e344adc5adee79
|
|
||||||
MonoImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
serializedVersion: 2
|
|
||||||
defaultReferences: []
|
|
||||||
executionOrder: 0
|
|
||||||
icon: {instanceID: 0}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
namespace GD.MinMaxSlider
|
|
||||||
{
|
|
||||||
using UnityEngine;
|
|
||||||
|
|
||||||
public class MinMaxSliderAttribute : PropertyAttribute{
|
|
||||||
|
|
||||||
public float min;
|
|
||||||
public float max;
|
|
||||||
|
|
||||||
public MinMaxSliderAttribute(float min, float max)
|
|
||||||
{
|
|
||||||
this.min = min;
|
|
||||||
this.max = max;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: a090d8b694abe7141af9c000b8cf42ec
|
|
||||||
MonoImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
serializedVersion: 2
|
|
||||||
defaultReferences: []
|
|
||||||
executionOrder: 0
|
|
||||||
icon: {instanceID: 0}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
using System.Collections;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using UnityEngine;
|
|
||||||
using GD.MinMaxSlider;
|
|
||||||
|
|
||||||
public class MinMaxSliderExample : MonoBehaviour
|
|
||||||
{
|
|
||||||
|
|
||||||
public string info = "Hover over a slider to see a tooltip";
|
|
||||||
|
|
||||||
[MinMaxSlider(0,10)]
|
|
||||||
public Vector2 floatRange = new Vector2(2,8);
|
|
||||||
[MinMaxSlider(0,10)]
|
|
||||||
public Vector2Int intRange = new Vector2Int(1,5);
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 212a7a761531d4b48ae374e583db2389
|
|
||||||
MonoImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
serializedVersion: 2
|
|
||||||
defaultReferences: []
|
|
||||||
executionOrder: 0
|
|
||||||
icon: {instanceID: 0}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "SimpleMinMaxSlider"
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 4099e5319e98558428028d54bc62664e
|
|
||||||
AssemblyDefinitionImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "com.guciodevs.simple-min-max-slider",
|
|
||||||
"displayName": "Simple MinMax Slider",
|
|
||||||
"description": "Handy small package that adds a simple MinMaxSlider attribute.",
|
|
||||||
"version": "1.1.2",
|
|
||||||
"unity": "2018.3",
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
},
|
|
||||||
|
|
||||||
"samples": [
|
|
||||||
|
|
||||||
{
|
|
||||||
|
|
||||||
"displayName": "Example Scene",
|
|
||||||
|
|
||||||
"description": "",
|
|
||||||
|
|
||||||
"path": "Samples~/SimpleMinMaxSlider Example"
|
|
||||||
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 783853a57374ff540b56fa85ce900da7
|
|
||||||
TextScriptImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
20
Assets/SinMovement.cs
Normal file
20
Assets/SinMovement.cs
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class SinMovement : MonoBehaviour{
|
||||||
|
private float originalY;
|
||||||
|
|
||||||
|
public float speed;
|
||||||
|
public float scale;
|
||||||
|
|
||||||
|
public float offset;
|
||||||
|
|
||||||
|
void Start(){
|
||||||
|
originalY = transform.position.y;
|
||||||
|
offset += Random.Range(-1, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update is called once per frame
|
||||||
|
void Update(){
|
||||||
|
transform.position = transform.position.Flatten(null, originalY + Mathf.Sin((Time.time + offset) * speed) * scale, null);
|
||||||
|
}
|
||||||
|
}
|
||||||
2
Assets/SinMovement.cs.meta
Normal file
2
Assets/SinMovement.cs.meta
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: e33277577aa379a41a747f01aade9c96
|
||||||
25
Assets/SwayMovement.cs
Normal file
25
Assets/SwayMovement.cs
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class SwayMovement : MonoBehaviour{
|
||||||
|
Vector3 originalRot;
|
||||||
|
public Vector3 swayAmount;
|
||||||
|
public Vector3 swaySpeed;
|
||||||
|
|
||||||
|
private Vector3 offset;
|
||||||
|
|
||||||
|
void Start(){
|
||||||
|
originalRot = transform.rotation.eulerAngles;
|
||||||
|
offset = new Vector3(Random.Range(-5, 1), Random.Range(-1, 5), Random.Range(-3, 1));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update is called once per frame
|
||||||
|
void Update(){
|
||||||
|
Vector3 sway = new Vector3(
|
||||||
|
originalRot.x + Mathf.Sin((Time.time + offset.x) * swaySpeed.x) * swayAmount.x,
|
||||||
|
originalRot.y + Mathf.Sin((Time.time + offset.y) * swaySpeed.y) * swayAmount.y,
|
||||||
|
originalRot.z + Mathf.Sin((Time.time + offset.z) * swaySpeed.z) * swayAmount.z
|
||||||
|
);
|
||||||
|
|
||||||
|
transform.rotation = Quaternion.Euler(sway);
|
||||||
|
}
|
||||||
|
}
|
||||||
2
Assets/SwayMovement.cs.meta
Normal file
2
Assets/SwayMovement.cs.meta
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 57870c7b66535c74688188df7e771ce7
|
||||||
BIN
Documents/Graphics/UI/Icons.afdesign
Normal file
BIN
Documents/Graphics/UI/Icons.afdesign
Normal file
Binary file not shown.
@@ -54,7 +54,7 @@
|
|||||||
{
|
{
|
||||||
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
||||||
"key": "ShapeComponent.SettingsEnabled",
|
"key": "ShapeComponent.SettingsEnabled",
|
||||||
"value": "{\"m_Value\":false}"
|
"value": "{\"m_Value\":true}"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
||||||
@@ -91,6 +91,16 @@
|
|||||||
"key": "CollapseVertices.collapseToFirst",
|
"key": "CollapseVertices.collapseToFirst",
|
||||||
"value": "{\"m_Value\":false}"
|
"value": "{\"m_Value\":false}"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
||||||
|
"key": "SubdivideEdges.rangeExpanded",
|
||||||
|
"value": "{\"m_Value\":false}"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
||||||
|
"key": "SelectEdgeLoop.selectIterative",
|
||||||
|
"value": "{\"m_Value\":false}"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"type": "UnityEngine.Rendering.ShadowCastingMode, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
"type": "UnityEngine.Rendering.ShadowCastingMode, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
"key": "mesh.shadowCastingMode",
|
"key": "mesh.shadowCastingMode",
|
||||||
@@ -119,17 +129,62 @@
|
|||||||
{
|
{
|
||||||
"type": "System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
"type": "System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
||||||
"key": "ShapeBuilder.ActiveShapeIndex",
|
"key": "ShapeBuilder.ActiveShapeIndex",
|
||||||
"value": "{\"m_Value\":6}"
|
"value": "{\"m_Value\":1}"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
||||||
|
"key": "SubdivideEdges.subdivisions",
|
||||||
|
"value": "{\"m_Value\":1}"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
||||||
|
"key": "SubdivideEdges.subdivisionsUIMin",
|
||||||
|
"value": "{\"m_Value\":1}"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
||||||
|
"key": "SubdivideEdges.subdivisionsUIMax",
|
||||||
|
"value": "{\"m_Value\":32}"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
"type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
"key": "ShapeBuilder.LastSize.Cube",
|
"key": "ShapeBuilder.LastSize.Cube",
|
||||||
"value": "{\"m_Value\":{\"x\":20.036033630371095,\"y\":1.0208016633987427,\"z\":-17.9393310546875}}"
|
"value": "{\"m_Value\":{\"x\":2.0,\"y\":14.0,\"z\":-9.0}}"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
"type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
"key": "ShapeBuilder.LastSize.Stairs",
|
"key": "ShapeBuilder.LastSize.Stairs",
|
||||||
"value": "{\"m_Value\":{\"x\":-7.032182693481445,\"y\":2.840894937515259,\"z\":-7.309409141540527}}"
|
"value": "{\"m_Value\":{\"x\":-3.000000476837158,\"y\":14.000001907348633,\"z\":19.0}}"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
|
"key": "ShapeBuilder.LastSize.Door",
|
||||||
|
"value": "{\"m_Value\":{\"x\":22.0,\"y\":13.0,\"z\":-16.0}}"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
|
"key": "ShapeBuilder.LastSize.Plane",
|
||||||
|
"value": "{\"m_Value\":{\"x\":16.0,\"y\":0.0,\"z\":-7.0}}"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
|
"key": "ShapeBuilder.LastSize.Cylinder",
|
||||||
|
"value": "{\"m_Value\":{\"x\":16.0,\"y\":53.0,\"z\":-16.0}}"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
|
"key": "ShapeBuilder.LastSize.Arch",
|
||||||
|
"value": "{\"m_Value\":{\"x\":18.0,\"y\":13.0,\"z\":-8.0}}"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
|
"key": "ShapeBuilder.LastSize.Sphere",
|
||||||
|
"value": "{\"m_Value\":{\"x\":16.0,\"y\":16.0,\"z\":-16.0}}"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
|
"key": "ShapeBuilder.LastSize.Cone",
|
||||||
|
"value": "{\"m_Value\":{\"x\":9.0,\"y\":4.0,\"z\":-11.0}}"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
"type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
@@ -141,16 +196,76 @@
|
|||||||
"key": "ShapeBuilder.LastRotation.Stairs",
|
"key": "ShapeBuilder.LastRotation.Stairs",
|
||||||
"value": "{\"m_Value\":{\"x\":0.0,\"y\":0.0,\"z\":0.0,\"w\":1.0}}"
|
"value": "{\"m_Value\":{\"x\":0.0,\"y\":0.0,\"z\":0.0,\"w\":1.0}}"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
|
"key": "ShapeBuilder.LastRotation.Door",
|
||||||
|
"value": "{\"m_Value\":{\"x\":0.0,\"y\":0.0,\"z\":0.0,\"w\":1.0}}"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
|
"key": "ShapeBuilder.LastRotation.Plane",
|
||||||
|
"value": "{\"m_Value\":{\"x\":0.0,\"y\":0.0,\"z\":0.0,\"w\":1.0}}"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
|
"key": "ShapeBuilder.LastRotation.Cylinder",
|
||||||
|
"value": "{\"m_Value\":{\"x\":0.0,\"y\":0.0,\"z\":0.0,\"w\":1.0}}"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
|
"key": "ShapeBuilder.LastRotation.Arch",
|
||||||
|
"value": "{\"m_Value\":{\"x\":0.0,\"y\":0.0,\"z\":0.0,\"w\":1.0}}"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
|
"key": "ShapeBuilder.LastRotation.Sphere",
|
||||||
|
"value": "{\"m_Value\":{\"x\":0.0,\"y\":0.0,\"z\":0.0,\"w\":1.0}}"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
|
"key": "ShapeBuilder.LastRotation.Cone",
|
||||||
|
"value": "{\"m_Value\":{\"x\":0.0,\"y\":0.0,\"z\":0.0,\"w\":1.0}}"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
"type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
"key": "ShapeBuilder.PivotLocation.Cube",
|
"key": "ShapeBuilder.PivotLocation.Cube",
|
||||||
"value": "{\"m_Value\":0}"
|
"value": "{\"m_Value\":1}"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
"type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
"key": "ShapeBuilder.PivotLocation.Stairs",
|
"key": "ShapeBuilder.PivotLocation.Stairs",
|
||||||
"value": "{\"m_Value\":0}"
|
"value": "{\"m_Value\":0}"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
|
"key": "ShapeBuilder.PivotLocation.Door",
|
||||||
|
"value": "{\"m_Value\":0}"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
|
"key": "ShapeBuilder.PivotLocation.Plane",
|
||||||
|
"value": "{\"m_Value\":0}"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
|
"key": "ShapeBuilder.PivotLocation.Cylinder",
|
||||||
|
"value": "{\"m_Value\":0}"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
|
"key": "ShapeBuilder.PivotLocation.Arch",
|
||||||
|
"value": "{\"m_Value\":0}"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
|
"key": "ShapeBuilder.PivotLocation.Sphere",
|
||||||
|
"value": "{\"m_Value\":0}"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
|
"key": "ShapeBuilder.PivotLocation.Cone",
|
||||||
|
"value": "{\"m_Value\":0}"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"type": "UnityEngine.ProBuilder.Shapes.Shape, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
"type": "UnityEngine.ProBuilder.Shapes.Shape, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
"key": "ShapeBuilder.Cube",
|
"key": "ShapeBuilder.Cube",
|
||||||
@@ -161,10 +276,40 @@
|
|||||||
"key": "ShapeBuilder.Stairs",
|
"key": "ShapeBuilder.Stairs",
|
||||||
"value": "{}"
|
"value": "{}"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"type": "UnityEngine.ProBuilder.Shapes.Shape, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
|
"key": "ShapeBuilder.Door",
|
||||||
|
"value": "{}"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "UnityEngine.ProBuilder.Shapes.Shape, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
|
"key": "ShapeBuilder.Cylinder",
|
||||||
|
"value": "{}"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "UnityEngine.ProBuilder.Shapes.Shape, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
|
"key": "ShapeBuilder.Arch",
|
||||||
|
"value": "{}"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "UnityEngine.ProBuilder.Shapes.Shape, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
|
"key": "ShapeBuilder.Sphere",
|
||||||
|
"value": "{}"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "UnityEngine.ProBuilder.Shapes.Shape, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
|
"key": "ShapeBuilder.Cone",
|
||||||
|
"value": "{}"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "UnityEngine.ProBuilder.Shapes.Shape, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
|
"key": "ShapeBuilder.Plane",
|
||||||
|
"value": "{}"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"type": "UnityEngine.ProBuilder.SelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
"type": "UnityEngine.ProBuilder.SelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
"key": "s_SelectMode",
|
"key": "s_SelectMode",
|
||||||
"value": "{\"m_Value\":1}"
|
"value": "{\"m_Value\":4}"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "UnityEngine.ProBuilder.RectSelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
"type": "UnityEngine.ProBuilder.RectSelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
@@ -180,6 +325,16 @@
|
|||||||
"type": "System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
"type": "System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
||||||
"key": "uv.uvEditorGridSnapIncrement",
|
"key": "uv.uvEditorGridSnapIncrement",
|
||||||
"value": "{\"m_Value\":0.125}"
|
"value": "{\"m_Value\":0.125}"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
||||||
|
"key": "ExtrudeFaces.distance",
|
||||||
|
"value": "{\"m_Value\":0.5}"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "UnityEngine.ProBuilder.ExtrudeMethod, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||||
|
"key": "editor.extrudeMethod",
|
||||||
|
"value": "{\"m_Value\":2}"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,12 +16,12 @@ PlayerSettings:
|
|||||||
productName: Project Reset
|
productName: Project Reset
|
||||||
defaultCursor: {fileID: 0}
|
defaultCursor: {fileID: 0}
|
||||||
cursorHotspot: {x: 0, y: 0}
|
cursorHotspot: {x: 0, y: 0}
|
||||||
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
|
m_SplashScreenBackgroundColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
|
||||||
m_ShowUnitySplashScreen: 1
|
m_ShowUnitySplashScreen: 1
|
||||||
m_ShowUnitySplashLogo: 1
|
m_ShowUnitySplashLogo: 1
|
||||||
m_SplashScreenOverlayOpacity: 1
|
m_SplashScreenOverlayOpacity: 1
|
||||||
m_SplashScreenAnimation: 1
|
m_SplashScreenAnimation: 1
|
||||||
m_SplashScreenLogoStyle: 1
|
m_SplashScreenLogoStyle: 0
|
||||||
m_SplashScreenDrawMode: 0
|
m_SplashScreenDrawMode: 0
|
||||||
m_SplashScreenBackgroundAnimationZoom: 1
|
m_SplashScreenBackgroundAnimationZoom: 1
|
||||||
m_SplashScreenLogoAnimationZoom: 1
|
m_SplashScreenLogoAnimationZoom: 1
|
||||||
@@ -140,7 +140,7 @@ PlayerSettings:
|
|||||||
loadStoreDebugModeEnabled: 0
|
loadStoreDebugModeEnabled: 0
|
||||||
visionOSBundleVersion: 1.0
|
visionOSBundleVersion: 1.0
|
||||||
tvOSBundleVersion: 1.0
|
tvOSBundleVersion: 1.0
|
||||||
bundleVersion: 0.1.0
|
bundleVersion: 0.2.0
|
||||||
preloadedAssets:
|
preloadedAssets:
|
||||||
- {fileID: 11400000, guid: 8e19eb4aa4fac2a409e792d0d3e5f944, type: 2}
|
- {fileID: 11400000, guid: 8e19eb4aa4fac2a409e792d0d3e5f944, type: 2}
|
||||||
metroInputSource: 0
|
metroInputSource: 0
|
||||||
|
|||||||
Reference in New Issue
Block a user