Merge branch 'bindKeys' into main

This commit is contained in:
Evan Nydahl
2022-04-21 21:37:47 -05:00
18 changed files with 26940 additions and 139 deletions

View File

@@ -0,0 +1,105 @@
fileFormatVersion: 2
guid: f3533e9f1e47f244ba1e8d3e49779c45
ModelImporter:
serializedVersion: 20200
internalIDToNameTable:
- first:
74: 1827226128182048838
second: Take 001
externalObjects: {}
materials:
materialImportMode: 2
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: 1
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: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

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

Binary file not shown.

View File

@@ -0,0 +1,507 @@
fileFormatVersion: 2
guid: 01a0b68d9b1816a498269ee32c17f8aa
ModelImporter:
serializedVersion: 20200
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors: "Invalid Avatar Rig Configuration. Missing or invalid transform:\n\tRequired
human bone 'Head' not found\n"
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 3
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
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:
- boneName: Root_Joint
humanName: Hips
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: L_Hip_Joint
humanName: LeftUpperLeg
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: R_Hip_Joint
humanName: RightUpperLeg
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: L_Knee_Joint
humanName: LeftLowerLeg
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: R_Knee_Joint
humanName: RightLowerLeg
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: L_Ankle_Joint
humanName: LeftFoot
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: R_Ankle_Joint
humanName: RightFoot
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: Spine1_Joint
humanName: Spine
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: Spine2_Joint
humanName: Chest
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: Neck_Joint
humanName: Neck
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: L_Shoulder_Joint
humanName: LeftUpperArm
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: R_Shoulder_Joint
humanName: RightUpperArm
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: L_Elbow_Joint
humanName: LeftLowerArm
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: R_Elbow_Joint
humanName: RightLowerArm
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: L_Wrist_Joint
humanName: LeftHand
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: R_Wrist_Joint
humanName: RightHand
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: Spine3_Joint
humanName: UpperChest
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: Head_Joint
humanName: Head
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
skeleton:
- name: KR_Model_Racer_V05_Howa(Clone)
parentName:
position: {x: 0, y: 0, z: 0}
rotation: {x: 0, y: 0, z: 0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Racer
parentName: KR_Model_Racer_V05_Howa(Clone)
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Racer_Head
parentName: Racer
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Racer_NeckJoint
parentName: Racer
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Racer_Neck
parentName: Racer
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Racer_Chest
parentName: Racer
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Racer_L_Shoulder
parentName: Racer
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Racer_L_Bicep
parentName: Racer
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Racer_L_Elbow
parentName: Racer
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Racer_L_Forearm
parentName: Racer
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Racer_L_Wrist
parentName: Racer
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Racer_L_Hand
parentName: Racer
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Racer_R_Shoulder
parentName: Racer
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Racer_R_Bicep
parentName: Racer
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Racer_R_Elbow
parentName: Racer
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Racer_R_Forearm
parentName: Racer
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Racer_R_Wrist
parentName: Racer
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Racer_R_Hand
parentName: Racer
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Racer_Abdomen
parentName: Racer
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Racer_Pelvis
parentName: Racer
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Racer_L_Hip
parentName: Racer
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Racer_L_Thigh
parentName: Racer
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Racer_L_Knee
parentName: Racer
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Racer_L_Leg
parentName: Racer
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Racer_L_Ankle
parentName: Racer
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Racer_L_Foot
parentName: Racer
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Racer_R_Hip
parentName: Racer
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Racer_R_Thigh
parentName: Racer
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Racer_R_Knee
parentName: Racer
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Racer_R_Leg
parentName: Racer
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Racer_R_Ankle
parentName: Racer
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Racer_R_Foot
parentName: Racer
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Root_Joint
parentName: KR_Model_Racer_V05_Howa(Clone)
position: {x: 5.551115e-19, y: 0.043564584, z: -0.0009131328}
rotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068}
scale: {x: 1, y: 1, z: 1}
- name: L_Hip_Joint
parentName: Root_Joint
position: {x: 0.0027794885, y: -0.004084565, z: -0.000058705507}
rotation: {x: -0.0023947142, y: -0.014812616, z: 0.99981356, w: 0.012156535}
scale: {x: 1, y: 1, z: 1}
- name: L_Knee_Joint
parentName: L_Hip_Joint
position: {x: -0.018091608, y: 0.000101182355, z: 0.0002534762}
rotation: {x: 0.015825588, y: -0.0151341, z: -0.002746472, w: 0.99975646}
scale: {x: 1, y: 1, z: 1}
- name: L_Ankle_Joint
parentName: L_Knee_Joint
position: {x: -0.019341223, y: -5.454098e-10, z: -6.5081246e-11}
rotation: {x: 0.5971159, y: 0.3723267, z: -0.35879254, w: 0.6132645}
scale: {x: 1, y: 1, z: 1}
- name: L_Foot_Joint
parentName: L_Ankle_Joint
position: {x: -0.005170743, y: 0.00019955968, z: -0.0004402057}
rotation: {x: -0.16150005, y: -0.6849101, z: -0.17668271, w: 0.68818533}
scale: {x: 1, y: 1, z: 1}
- name: Spine1_Joint
parentName: Root_Joint
position: {x: -0.0036827426, y: -0.000000014609295, z: 0.0006372283}
rotation: {x: 0.9999827, y: -0.0058820476, z: -3.6017155e-19, w: 6.1231284e-17}
scale: {x: 1, y: 1, z: 1}
- name: Spine2_Joint
parentName: Spine1_Joint
position: {x: -0.0068591833, y: 0.00008068165, z: 0.0007333966}
rotation: {x: -6.0520286e-17, y: 6.123648e-17, z: -0.00013520822, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Spine3_Joint
parentName: Spine2_Joint
position: {x: -0.008035076, y: 0.00009235719, z: 0.0024144042}
rotation: {x: 0.99977684, y: -0.021125065, z: -6.248325e-17, w: 5.992575e-17}
scale: {x: 1, y: 1, z: 1}
- name: Neck_Joint
parentName: Spine3_Joint
position: {x: -0.0063668955, y: 0.00019590784, z: 0.0019203824}
rotation: {x: 0.99979985, y: -0.020007925, z: -2.1081775e-10, w: 0.000000010534603}
scale: {x: 1, y: 1, z: 1}
- name: Head_Joint
parentName: Neck_Joint
position: {x: -0.006076222, y: 0.000056261313, z: 1.3877787e-18}
rotation: {x: -0.70382565, y: 0.71037275, z: 6.9302244e-11, w: -6.8663526e-11}
scale: {x: 1, y: 1, z: 1}
- name: R_Shoulder_Joint
parentName: Spine3_Joint
position: {x: 0.0019935025, y: 0.006994004, z: 0.00066861813}
rotation: {x: 0.71028996, y: 0.7039092, z: -4.3102006e-17, w: -4.3492717e-17}
scale: {x: 1, y: 1, z: 1}
- name: R_Elbow_Joint
parentName: R_Shoulder_Joint
position: {x: 0.01061393, y: -0.0000906483, z: 0.000580517}
rotation: {x: -3.498742e-20, y: 3.219223e-18, z: 0.037150834, w: 0.99930966}
scale: {x: 1, y: 1, z: 1}
- name: R_Wrist_Joint
parentName: R_Elbow_Joint
position: {x: 0.010848114, y: -0.000031982458, z: -0.0000215646}
rotation: {x: 0, y: 0, z: -0.026288502, w: 0.9996544}
scale: {x: 1, y: 1, z: 1}
- name: L_Shoulder_Joint
parentName: Spine3_Joint
position: {x: 0.0015598033, y: -0.0071033454, z: 0.00066863}
rotation: {x: 0, y: 0, z: 0.6883055, w: 0.72542095}
scale: {x: 1, y: 1, z: 1}
- name: L_Elbow_Joint
parentName: L_Shoulder_Joint
position: {x: -0.010613935, y: 0.000090836154, z: -0.00058052805}
rotation: {x: 0, y: 0, z: 0.037150834, w: 0.99930966}
scale: {x: 1, y: 1, z: 1}
- name: L_Wrist_Joint
parentName: L_Elbow_Joint
position: {x: -0.010848208, y: 0.00003188319, z: 0.000021551847}
rotation: {x: 0, y: 0, z: -0.026288502, w: 0.9996544}
scale: {x: 1, y: 1, z: 1}
- name: R_Hip_Joint
parentName: Root_Joint
position: {x: 0.0027795504, y: 0.004084574, z: -0.000058706773}
rotation: {x: 0.9998135, y: 0.01215653, z: 0.0023818421, w: 0.014815894}
scale: {x: 1, y: 1, z: 1}
- name: R_Knee_Joint
parentName: R_Hip_Joint
position: {x: 0.018091558, y: -0.00010117292, z: -0.00025356485}
rotation: {x: 0.015825653, y: -0.015111376, z: -0.0027463543, w: 0.9997568}
scale: {x: 1, y: 1, z: 1}
- name: R_Ankle_Joint
parentName: R_Knee_Joint
position: {x: 0.019341197, y: 5.373427e-10, z: -6.276203e-11}
rotation: {x: 0.36582637, y: -0.56055397, z: 0.6337311, w: 0.38773078}
scale: {x: 1, y: 1, z: 1}
- name: R_Foot_Joint
parentName: R_Ankle_Joint
position: {x: -0.0051932707, y: 9.436896e-18, z: 0}
rotation: {x: 0.6545491, y: -0.14009053, z: 0.7230847, w: 0.17055377}
scale: {x: 1, y: 1, z: 1}
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 1
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 3
humanoidOversampling: 1
avatarSetup: 1
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@@ -702,6 +702,20 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5339804152290053153, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
propertyPath: m_Avatar
value:
objectReference: {fileID: 9000000, guid: 01a0b68d9b1816a498269ee32c17f8aa, type: 3}
- target: {fileID: 5339804152290053153, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
propertyPath: m_WarningMessage
value: "\nBinding warning: Some generic clip(s) animate transforms that are
already bound by a Humanoid avatar. These transforms can only be changed
by Humanoid clips.\n\tTransform 'R_Wrist_Joint'\n\tTransform 'Root_Joint'\n\tTransform
'R_Wrist_Joint'\n\tTransform 'R_Ankle_Joint'\n\tTransform 'L_Elbow_Joint'\n\tTransform
'L_Ankle_Joint'\n\tTransform 'L_Shoulder_Joint'\n\tTransform 'L_Knee_Joint'\n\tTransform
'Spine2_Joint'\n\tTransform 'Neck_Joint'\n\tand more ...\n\tFrom animation
clip 'Take 001'"
objectReference: {fileID: 0}
- target: {fileID: 5474104329426587794, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
propertyPath: m_IsActive
value: 1
@@ -758,6 +772,10 @@ PrefabInstance:
propertyPath: m_Name
value: DebugSMPlayerPrefab
objectReference: {fileID: 0}
- target: {fileID: 8869624430673171230, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
propertyPath: m_TagString
value: PlayerModel
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
--- !u!1001 &933633206

View File

@@ -380,6 +380,142 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 1659762132620482750, guid: a4b73e27fc2b6314899be279692e516a, type: 3}
m_PrefabInstance: {fileID: 126909621}
m_PrefabAsset: {fileID: 0}
--- !u!1 &203267542
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 203267543}
- component: {fileID: 203267545}
- component: {fileID: 203267544}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &203267543
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 203267542}
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: 1475788377}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &203267544
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 203267542}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 'Controls Menu Button
'
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4281479730
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 24
m_fontSizeBase: 24
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &203267545
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 203267542}
m_CullTransparentMesh: 1
--- !u!1 &312100036
GameObject:
m_ObjectHideFlags: 0
@@ -418,7 +554,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -300}
m_AnchoredPosition: {x: 536, y: -300}
m_SizeDelta: {x: 300, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &312100038
@@ -999,6 +1135,188 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1460118014}
m_CullTransparentMesh: 1
--- !u!1 &1475788376
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1475788377}
- component: {fileID: 1475788382}
- component: {fileID: 1475788381}
- component: {fileID: 1475788380}
- component: {fileID: 1475788379}
- component: {fileID: 1475788378}
m_Layer: 5
m_Name: Controls Menu
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1475788377
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1475788376}
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:
- {fileID: 203267543}
m_Father: {fileID: 1713758107}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -486, y: -300}
m_SizeDelta: {x: 300, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!61 &1475788378
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1475788376}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 300, y: 50}
m_EdgeRadius: 0
--- !u!50 &1475788379
Rigidbody2D:
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1475788376}
m_BodyType: 0
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
m_Mass: 1
m_LinearDrag: 0
m_AngularDrag: 0.05
m_GravityScale: 0
m_Material: {fileID: 0}
m_Interpolate: 0
m_SleepingMode: 0
m_CollisionDetection: 1
m_Constraints: 0
--- !u!114 &1475788380
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1475788376}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 1475788381}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1619285605}
m_TargetAssemblyTypeName: OptionsMenu, Assembly-CSharp
m_MethodName: GoToControls
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &1475788381
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1475788376}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1475788382
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1475788376}
m_CullTransparentMesh: 1
--- !u!1 &1523374636
GameObject:
m_ObjectHideFlags: 0
@@ -1239,6 +1557,7 @@ RectTransform:
- {fileID: 2042651154}
- {fileID: 312100037}
- {fileID: 126909622}
- {fileID: 1475788377}
m_Father: {fileID: 1619285604}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

View File

@@ -0,0 +1,39 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class ControlsMenuScript : MonoBehaviour
{
public GameObject keyboardControlsMenu;
public GameObject gamePadControlsMenu;
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
//if vertical input from right analog
if (Input.GetAxis("KingVerticalMouseMove") != 0 || Input.GetAxis("KingHorizontalMouseMove") != 0)
{
//if off, turn it on
if(gamePadControlsMenu.activeInHierarchy == false)
{
keyboardControlsMenu.SetActive(false);
gamePadControlsMenu.SetActive(true);
}
}
//check if mouse movement if so (turn off pointer)
if (Input.GetAxis("Mouse X") != 0 || Input.GetAxis("Mouse Y") != 0)
{
if (keyboardControlsMenu.activeInHierarchy == false)
{
keyboardControlsMenu.SetActive(true);
gamePadControlsMenu.SetActive(false);
}
}
}
}

View File

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

View File

@@ -0,0 +1,59 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class GameManager : MonoBehaviour
{
public static GameManager GM;
//values for runner
//probably shouldn't rebind this
//public KeyCode glide;
[SerializeField]
public Dictionary<string,KeyCode> bindableActions = new Dictionary<string, KeyCode>();
private void Awake()
{
if (GM == null)
{
DontDestroyOnLoad(gameObject);
GM = this;
}
else if (GM != this)
{
Destroy(gameObject);
}
//for keyboard
/* walkForward = (KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("walkForwardKey", "W"));
walkBackward = (KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("walkBackwardKey", "S"));
walkLeft = (KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("walkLeftKey", "A"));
walkRight = (KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("walkRightKey", "D"));*/
KeyCode jump = (KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("jumpKey", "Space"));
KeyCode kick = (KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("kickKey", "F"));
KeyCode slide = (KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("slideKey", "Q"));
KeyCode dash = (KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("dashKey", "R"));
KeyCode nitro = (KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("nitroKey", "LeftShift"));
KeyCode grapple = (KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("grappleKey", "E"));
bindableActions.Add("jumpKey", jump);
bindableActions.Add("kickKey", kick);
bindableActions.Add("slideKey", slide);
bindableActions.Add("dashKey", dash);
bindableActions.Add("nitroKey", nitro);
bindableActions.Add("grappleKey", grapple);
}
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
}

View File

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

View File

@@ -47,4 +47,8 @@ public class OptionsMenu : MonoBehaviour {
public void OnReturnToTitleClicked() {
SceneManager.LoadScene("TitleScene");
}
public void GoToControls()
{
SceneManager.LoadScene("Controls");
}
}

View File

@@ -0,0 +1,171 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class RebindManager : MonoBehaviour
{
Event keyEvent;
KeyCode newKey;
GameObject currentButtonObject;
//const array of valid input
readonly KeyCode[] valildKeys = {KeyCode.Q, KeyCode.E, KeyCode.R, KeyCode.F, KeyCode.LeftShift, KeyCode.Space};
//currently waiting for input from user
bool waitingForKey;
bool hasPressedValidKey = false;
// Start is called before the first frame update
void Start()
{
waitingForKey = false;
//go through all buttons and set correct image
//for
}
// Update is called once per frame
void Update()
{
}
void OnGUI()
{
keyEvent = Event.current;
//if is a key event
if (keyEvent.isKey)
{
//if waiting for a key and the key entered is valid
if (waitingForKey && isValidKey(keyEvent.keyCode))
{
newKey = keyEvent.keyCode;
waitingForKey = false;
hasPressedValidKey = true;
//Debug.Log("right key");
}
}
}
public void SendCurrentButton(GameObject gameObject)
{
currentButtonObject = gameObject;
}
public void StartAssignment(string keyName)
{
if (!waitingForKey)
{
StartCoroutine(AssignKey(keyName));
}
}
//
IEnumerator waitForKey()
{
//if it gets past here it has a keycode, but we also want to double check if it is one of the 10 keys we
//TO-DO add controller keys
//Debug.Log("waiting");
while (hasPressedValidKey == false)
{
yield return null;
}
}
public bool isValidKey(KeyCode keycode)
{
bool hasValue = false;
for(int i =0; i < valildKeys.Length; i++) {
if(valildKeys[i] == keycode)
{
hasValue = true;
}
}
return hasValue;
}
public bool areThereDuplicates()
{
bool duplicateExists = false;
List<KeyCode> tHolder = new List<KeyCode>();
foreach (var item in GameManager.GM.bindableActions)
{
tHolder.Add(item.Value);
}
/* foreach (var item in tHolder)
{
Debug.Log(item);
}*/
for(int i=0; i < tHolder.Count - 1; i++)
{
for(int j=i+1; j < tHolder.Count; j++)
{
if(tHolder[i] == tHolder[j])
{
duplicateExists = true;
}
}
}
return duplicateExists;
}
public IEnumerator AssignKey(string keyName)
{
waitingForKey = true;
yield return waitForKey();
//could be a bit more dyanmic, but it is sufficeint solution for goal
switch (keyName)
{
//player prefs are used to keep key binds after game has closed (won't do anything until then). They are commented out for now for SGX
case "jump":
GameManager.GM.bindableActions["jumpKey"] = newKey;
//replace image of button
//currentButtonObject.GetComponent<Image>().sprite =
//PlayerPrefs.SetString("jumpKey", GameManager.GM.bindableActions["jumpKey"].ToString());
//revert flag
hasPressedValidKey = false;
break;
case "kick":
GameManager.GM.bindableActions["kickKey"] = newKey;
//replace image of button
//currentButtonObject.GetComponent<Image>().sprite =
//PlayerPrefs.SetString("kickKey", GameManager.GM.bindableActions["kickKey"].ToString());
//revert flag
hasPressedValidKey = false;
break;
case "slide":
GameManager.GM.bindableActions["slideKey"] = newKey;
//replace image of button
//currentButtonObject.GetComponent<Image>().sprite =
//PlayerPrefs.SetString("slideKey", GameManager.GM.bindableActions["slideKey"].ToString());
//revert flag
hasPressedValidKey = false;
break;
case "dash":
GameManager.GM.bindableActions["dashKey"] = newKey;
//replace image of button
//currentButtonObject.GetComponent<Image>().sprite =
//PlayerPrefs.SetString("dashKey", GameManager.GM.bindableActions["dashKey"].ToString());
//revert flag
hasPressedValidKey = false;
break;
case "nitro":
GameManager.GM.bindableActions["nitroKey"] = newKey;
//replace image of button
//currentButtonObject.GetComponent<Image>().sprite =
//PlayerPrefs.SetString("nitroKey", GameManager.GM.bindableActions["nitroKey"].ToString());
//revert flag
hasPressedValidKey = false;
break;
case "grapple":
GameManager.GM.bindableActions["grappleKey"] = newKey;
//replace image of button
//currentButtonObject.GetComponent<Image>().sprite =
//PlayerPrefs.SetString("grappleKey", GameManager.GM.bindableActions["grappleKey"].ToString());
//revert flag
hasPressedValidKey = false;
break;
}
yield return null;
}
}

View File

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

View File

@@ -5,7 +5,7 @@ using UnityEngine.SceneManagement;
public class ReturnToTitle : MonoBehaviour
{
public void backToTitle(){
SceneManager.LoadScene("TitleScene");
public void backToSettings(){
SceneManager.LoadScene("Options");
}
}

View File

@@ -18,7 +18,7 @@ EditorUserSettings:
value: 22424703114646680e0b0227036c7c021313113e3f66333e243d04
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9
value: 22424703114646680e0b0227036c731f1415016439262f2434
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb