Browse Source

Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop

develop
Jordan 3 years ago
parent
commit
9347b96506
31 changed files with 655 additions and 21 deletions
  1. BIN
      Assets/Scenes/Base Layout.unity
  2. BIN
      Assets/Scenes/Testing Scenes/YeetScene.unity
  3. +7
    -0
      Assets/Scenes/Testing Scenes/YeetScene.unity.meta
  4. +8
    -0
      Assets/Scripts/Behaviours.meta
  5. +9
    -0
      Assets/Scripts/Behaviours/IYeetable.cs
  6. +11
    -0
      Assets/Scripts/Behaviours/IYeetable.cs.meta
  7. +62
    -0
      Assets/Scripts/Behaviours/YeetController.cs
  8. +11
    -0
      Assets/Scripts/Behaviours/YeetController.cs.meta
  9. +41
    -4
      Assets/Scripts/Player Scripts/PlayerInputController.cs
  10. +8
    -0
      Assets/Scripts/Player.meta
  11. +65
    -0
      Assets/Scripts/Player/ControllerBase.cs
  12. +11
    -0
      Assets/Scripts/Player/ControllerBase.cs.meta
  13. +30
    -0
      Assets/Settings/Input/PlayerControls.inputactions
  14. +1
    -1
      Assets/World Assets/Materials/Conveyer.mat
  15. +91
    -0
      Assets/World Assets/Materials/Red.mat
  16. +8
    -0
      Assets/World Assets/Materials/Red.mat.meta
  17. BIN
      Assets/World Assets/Models/Back Wall.fbx
  18. BIN
      Assets/World Assets/Prefabs/Back Wall.fbx
  19. BIN
      Assets/World Assets/Prefabs/Conveyer Belt.fbx
  20. +101
    -0
      Assets/World Assets/Prefabs/Conveyer Belt.fbx.meta
  21. BIN
      Assets/World Assets/Prefabs/Fence.fbx
  22. +3
    -3
      Assets/World Assets/Prefabs/Fence.fbx.meta
  23. +110
    -0
      Assets/World Assets/Prefabs/YeetyPlayer Variant.prefab
  24. +7
    -0
      Assets/World Assets/Prefabs/YeetyPlayer Variant.prefab.meta
  25. +23
    -0
      Assets/YeetHandle.cs
  26. +11
    -0
      Assets/YeetHandle.cs.meta
  27. +1
    -1
      Packages/manifest.json
  28. +7
    -2
      Packages/packages-lock.json
  29. BIN
      ProjectSettings/InputManager.asset
  30. +11
    -1
      ProjectSettings/Packages/com.unity.probuilder/Settings.json
  31. BIN
      ProjectSettings/TimelineSettings.asset

BIN
Assets/Scenes/Base Layout.unity (Stored with Git LFS) View File

size 637412

BIN
Assets/Scenes/Testing Scenes/YeetScene.unity (Stored with Git LFS) View File

size 16523

+ 7
- 0
Assets/Scenes/Testing Scenes/YeetScene.unity.meta View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 7d479bacc53922e4498008816aade241
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 8
- 0
Assets/Scripts/Behaviours.meta View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 408c7b3fd4c3afc4c9187c4ad234f2f2
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 9
- 0
Assets/Scripts/Behaviours/IYeetable.cs View File

@ -0,0 +1,9 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public interface IYeetable
{
void Hold(GameObject child);
void Yeet();
}

+ 11
- 0
Assets/Scripts/Behaviours/IYeetable.cs.meta View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 2bbcd198578c95d40a2dd8f089364686
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

+ 62
- 0
Assets/Scripts/Behaviours/YeetController.cs View File

@ -0,0 +1,62 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class YeetController : MonoBehaviour
{
public GameObject parent { get; set; }
public float yeetVelocity = 10f;
public float yeetDuration = 2f;
public enum YeetState { Unheld, Held, Yeeting };
public YeetState yeetState { get; private set; } = YeetState.Unheld;
private GameObject _child;
private float _time;
public void Hold(GameObject child)
{
_child = child;
_child.transform.parent = parent.transform;
yeetState = YeetState.Held;
}
public void Yeet()
{
_child.transform.parent = null;
_child.transform.rotation = parent.transform.rotation;
_child.GetComponent<Rigidbody>().velocity = _child.transform.forward * yeetVelocity;
yeetState = YeetState.Yeeting;
_time = yeetDuration;
}
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
switch(yeetState)
{
case YeetState.Yeeting:
//_child.transform.position += _child.transform.forward * yeetVelocity * Time.deltaTime;
_time -= Time.deltaTime;
if(_time <= 0f)
{
Debug.Log("YeetController.Update: Yeet finished");
yeetState = YeetState.Unheld;
}
break;
case YeetState.Held:
break;
case YeetState.Unheld:
_child = null;
break;
}
}
}

+ 11
- 0
Assets/Scripts/Behaviours/YeetController.cs.meta View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 188bb300967eea14fb681a94fc31f911
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

+ 41
- 4
Assets/Scripts/Player Scripts/PlayerInputController.cs View File

@ -28,13 +28,18 @@ public class PlayerInputController : MonoBehaviour
private Vector3 m_desiredDirection;
private bool m_recievedInput => m_desiredDirection.magnitude != 0;
private YeetController m_yeetController;
private GameObject m_child;
private GameObject m_body;
private void Awake()
{
m_input = GetComponent<PlayerInput>();
m_controller = GetComponent<CharacterController>();
m_yeetController = GetComponent<YeetController>();
m_body = this.gameObject;
}
@ -42,6 +47,7 @@ public class PlayerInputController : MonoBehaviour
{
ApplyRotation();
ApplyMovement();
LockAxis(Vector3.up);
}
@ -51,6 +57,36 @@ public class PlayerInputController : MonoBehaviour
m_desiredDirection = new Vector3(m_recievedInput.x, 0.0f, m_recievedInput.y);
}
private void OnTriggerEnter(Collider collider)
{
Debug.Log("PlayerInputController.OnTriggerEnter: arrived");
m_child = collider.gameObject;
}
private void OnTriggerExit(Collider collider)
{
m_child = null;
}
private void OnYeet()
{
m_yeetController.parent = m_body;
switch (m_yeetController.yeetState)
{
case YeetController.YeetState.Unheld:
if(m_child)
m_yeetController.Hold(m_child);
// Grab nearest baby
break;
case YeetController.YeetState.Held:
m_yeetController.Yeet();
// Yeet baby
break;
case YeetController.YeetState.Yeeting:
// Cooldown?
break;
}
}
private void ApplyRotation()
{
@ -70,7 +106,8 @@ public class PlayerInputController : MonoBehaviour
m_controller.Move(transform.forward * speed * Time.deltaTime);
}
private void LockAxis(Vector3 axis)
{
transform.position = Vector3.ProjectOnPlane(transform.position, axis);
}
}

+ 8
- 0
Assets/Scripts/Player.meta View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 0899cb5e9885fc441bc2cfd3746b0ed9
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 65
- 0
Assets/Scripts/Player/ControllerBase.cs View File

@ -0,0 +1,65 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class ControllerBase : MonoBehaviour
{
public CharacterController characterController;
public float speed = 6f;
public float sensitivity = 10f;
public GameObject body;
public GameObject testChild;
public YeetController yeetController;
void Start()
{
}
// Update is called once per frame
void Update()
{
Move();
//Rotate();
if(Input.GetButtonDown("Fire1"))
{
yeetController.parent = body;
switch(yeetController.yeetState)
{
case YeetController.YeetState.Unheld:
yeetController.Hold(testChild);
// Grab nearest baby
break;
case YeetController.YeetState.Held:
yeetController.Yeet();
// Yeet baby
break;
case YeetController.YeetState.Yeeting:
// Cooldown?
break;
}
}
}
void Move()
{
float horizontal = Input.GetAxis("Horizontal");
float vertical = Input.GetAxis("Vertical");
Vector3 move = transform.forward * vertical + transform.right * horizontal;
characterController.Move(speed * Time.deltaTime * move);
}
void Rotate()
{
float horizontal = Input.GetAxis("Mouse Y");
body.transform.Rotate(0, horizontal * sensitivity, 0);
}
}

+ 11
- 0
Assets/Scripts/Player/ControllerBase.cs.meta View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 5f1380fc8f7b79446aa26ea089b4362a
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

+ 30
- 0
Assets/Settings/Input/PlayerControls.inputactions View File

@ -12,6 +12,14 @@
"expectedControlType": "Vector2",
"processors": "",
"interactions": ""
},
{
"name": "Yeet",
"type": "Button",
"id": "23ebbd64-55ef-42f7-9f88-d2ea6b5f9677",
"expectedControlType": "Button",
"processors": "",
"interactions": ""
}
],
"bindings": [
@ -135,6 +143,28 @@
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "",
"id": "e7da0e69-0039-470a-bf8f-079ca8b3c3d6",
"path": "<Gamepad>/buttonSouth",
"interactions": "",
"processors": "",
"groups": "",
"action": "Yeet",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "21a02656-d443-4954-a0f5-6fc8b87f7107",
"path": "<Keyboard>/space",
"interactions": "",
"processors": "",
"groups": "",
"action": "Yeet",
"isComposite": false,
"isPartOfComposite": false
}
]
}

+ 1
- 1
Assets/World Assets/Materials/Conveyer.mat View File

@ -84,7 +84,7 @@ Material:
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.6603774, g: 0.6603774, b: 0.6603774, a: 1}
- _BaseColor: {r: 0, g: 0, b: 0, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}

+ 91
- 0
Assets/World Assets/Materials/Red.mat View File

@ -0,0 +1,91 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Red
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2000
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
- _Cull: 2
- _Cutoff: 0.5
- _DstBlend: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
- _OcclusionStrength: 1
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Surface: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 0.2216981, b: 0.2216981, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
--- !u!114 &6945557477375298710
MonoBehaviour:
m_ObjectHideFlags: 11
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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 2

+ 8
- 0
Assets/World Assets/Materials/Red.mat.meta View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 0496129d598a9d04f983aa47954a629f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/World Assets/Models/Back Wall.fbx (Stored with Git LFS) View File

size 14540

BIN
Assets/World Assets/Prefabs/Back Wall.fbx (Stored with Git LFS) View File

size 14396

BIN
Assets/World Assets/Prefabs/Conveyer Belt.fbx (Stored with Git LFS) View File

size 15468

+ 101
- 0
Assets/World Assets/Prefabs/Conveyer Belt.fbx.meta View File

@ -0,0 +1,101 @@
fileFormatVersion: 2
guid: 20cac98bee24b6644b3264964af77935
ModelImporter:
serializedVersion: 20101
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 1
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 8.5
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 8.5
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/World Assets/Prefabs/Fence.fbx (Stored with Git LFS) View File

size 15484

Assets/World Assets/Models/Back Wall.fbx.meta → Assets/World Assets/Prefabs/Fence.fbx.meta View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 8e789636a97a4e14e85e5f8e59051b0a
guid: bcce9ca1b4787574bb877cc7fad6343e
ModelImporter:
serializedVersion: 20101
internalIDToNameTable: []
@ -34,7 +34,7 @@ ModelImporter:
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 50
globalScale: 6
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
@ -85,7 +85,7 @@ ModelImporter:
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 50
globalScale: 6
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0

+ 110
- 0
Assets/World Assets/Prefabs/YeetyPlayer Variant.prefab View File

@ -0,0 +1,110 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &1051237570
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 33932531309654967}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 188bb300967eea14fb681a94fc31f911, type: 3}
m_Name:
m_EditorClassIdentifier:
yeetVelocity: 10
yeetDuration: 2
--- !u!1001 &2714160732044909285
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2725293204815276921, guid: 47d3f018734864140ba302f6972ba575, type: 3}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 2725293204815276924, guid: 47d3f018734864140ba302f6972ba575, type: 3}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 2725293204815276924, guid: 47d3f018734864140ba302f6972ba575, type: 3}
propertyPath: m_Convex
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2725293204815276924, guid: 47d3f018734864140ba302f6972ba575, type: 3}
propertyPath: m_IsTrigger
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2725293204815276927, guid: 47d3f018734864140ba302f6972ba575, type: 3}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 2725293205319018834, guid: 47d3f018734864140ba302f6972ba575, type: 3}
propertyPath: m_Name
value: YeetyPlayer Variant
objectReference: {fileID: 0}
- target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3}
propertyPath: m_LocalPosition.x
value: 1.2684288
objectReference: {fileID: 0}
- target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3}
propertyPath: m_LocalPosition.z
value: -6.7718506
objectReference: {fileID: 0}
- target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2725293205319018846, guid: 47d3f018734864140ba302f6972ba575, type: 3}
propertyPath: m_SlopeLimit
value: 90
objectReference: {fileID: 0}
- target: {fileID: 2725293205319018847, guid: 47d3f018734864140ba302f6972ba575, type: 3}
propertyPath: body
value:
objectReference: {fileID: 0}
- target: {fileID: 2725293205319018847, guid: 47d3f018734864140ba302f6972ba575, type: 3}
propertyPath: testChild
value:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 47d3f018734864140ba302f6972ba575, type: 3}
--- !u!1 &33932531309654967 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2725293205319018834, guid: 47d3f018734864140ba302f6972ba575, type: 3}
m_PrefabInstance: {fileID: 2714160732044909285}
m_PrefabAsset: {fileID: 0}

+ 7
- 0
Assets/World Assets/Prefabs/YeetyPlayer Variant.prefab.meta View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c3cc089e72190e74aab4c6592121b553
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 23
- 0
Assets/YeetHandle.cs View File

@ -0,0 +1,23 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class YeetHandle : MonoBehaviour
{
private BoxCollider m_handleArea;
// Start is called before the first frame update
void Start()
{
m_handleArea = gameObject.AddComponent<BoxCollider>();
m_handleArea.isTrigger = true;
m_handleArea.size = new Vector3(2, 2, 2);
}
// Update is called once per frame
void Update()
{
}
}

+ 11
- 0
Assets/YeetHandle.cs.meta View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: a18fca169b45e1642b530ee6dc555240
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

+ 1
- 1
Packages/manifest.json View File

@ -9,7 +9,7 @@
"com.unity.render-pipelines.universal": "8.3.1",
"com.unity.test-framework": "1.1.19",
"com.unity.textmeshpro": "3.0.1",
"com.unity.timeline": "1.3.6",
"com.unity.timeline": "1.3.7",
"com.unity.ugui": "1.0.0",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",

+ 7
- 2
Packages/packages-lock.json View File

@ -117,10 +117,15 @@
"url": "https://packages.unity.com"
},
"com.unity.timeline": {
"version": "1.3.6",
"version": "1.3.7",
"depth": 0,
"source": "registry",
"dependencies": {},
"dependencies": {
"com.unity.modules.director": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.modules.audio": "1.0.0",
"com.unity.modules.particlesystem": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.ugui": {

BIN
ProjectSettings/InputManager.asset (Stored with Git LFS) View File

size 9731

+ 11
- 1
ProjectSettings/Packages/com.unity.probuilder/Settings.json View File

@ -93,6 +93,11 @@
"key": "FillHole.selectEntirePath",
"value": "{\"m_Value\":true}"
},
{
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
"key": "editor.extrudeEdgesAsGroup",
"value": "{\"m_Value\":true}"
},
{
"type": "UnityEngine.ProBuilder.SelectionModifierBehavior, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "editor.rectSelectModifier",
@ -106,7 +111,7 @@
{
"type": "UnityEngine.ProBuilder.SelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "editor.selectMode",
"value": "{\"m_Value\":1}"
"value": "{\"m_Value\":4}"
},
{
"type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
@ -152,6 +157,11 @@
"type": "System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
"key": "uv.uvEditorGridSnapIncrement",
"value": "{\"m_Value\":0.125}"
},
{
"type": "System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
"key": "ExtrudeEdges.distance",
"value": "{\"m_Value\":0.5}"
}
]
}

BIN
ProjectSettings/TimelineSettings.asset (Stored with Git LFS) View File

size 411

Loading…
Cancel
Save