diff --git a/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab b/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab index f716049..84a4f1d 100644 --- a/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab +++ b/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab @@ -1816,7 +1816,7 @@ Transform: m_LocalPosition: {x: 1.0574874e-17, y: 0.021561641, z: 4.998825e-12} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 5182004806792224706} + - {fileID: 2464763802031094779} - {fileID: 7927056769350739999} m_Father: {fileID: 1669950514738216483} m_RootOrder: 1 @@ -3301,7 +3301,7 @@ Transform: m_LocalPosition: {x: 7.7549076e-18, y: 0.02156146, z: 1.338972e-11} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 2798402350392497466} + - {fileID: 5381215068677189563} - {fileID: 5110232042356691026} m_Father: {fileID: 5041720010706727008} m_RootOrder: 1 @@ -6370,83 +6370,71 @@ Transform: m_CorrespondingSourceObject: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} m_PrefabInstance: {fileID: 19146078486908249} m_PrefabAsset: {fileID: 0} ---- !u!1001 &97525180757618131 +--- !u!1001 &1395792858578172524 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 3058360317068509369} m_Modifications: - - target: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} + - target: {fileID: 3560732860612198807, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} - propertyPath: m_LocalScale.x - value: 0.4000001 - objectReference: {fileID: 0} - - target: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} + - target: {fileID: 3560732860612198807, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} propertyPath: m_LocalScale.y - value: 1.1232157 + value: 0.00004 objectReference: {fileID: 0} - - target: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} - propertyPath: m_LocalScale.z - value: 0.40000018 - objectReference: {fileID: 0} - - target: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} + - target: {fileID: 3560732860612198807, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 0.00001 objectReference: {fileID: 0} - - target: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} + - target: {fileID: 3560732860612198807, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} propertyPath: m_LocalPosition.y - value: 0.0062 + value: 0.0098 objectReference: {fileID: 0} - - target: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} + - target: {fileID: 3560732860612198807, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} propertyPath: m_LocalPosition.z - value: 0.0006 + value: -0.00048 objectReference: {fileID: 0} - - target: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} + - target: {fileID: 3560732860612198807, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} + - target: {fileID: 3560732860612198807, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} + - target: {fileID: 3560732860612198807, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - - target: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} + - target: {fileID: 3560732860612198807, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - - target: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} + - target: {fileID: 3560732860612198807, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} + - target: {fileID: 3560732860612198807, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} + - target: {fileID: 3560732860612198807, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5619234375883385003, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} + - target: {fileID: 4188790787953761069, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} propertyPath: m_Name - value: Spring_R - objectReference: {fileID: 0} - - target: {fileID: 5619234375883385003, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} - propertyPath: m_IsActive - value: 0 + value: KR_Model_Springs_Vang objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} ---- !u!4 &5182004806792224706 stripped + m_SourcePrefab: {fileID: 100100000, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} +--- !u!4 &2464763802031094779 stripped Transform: - m_CorrespondingSourceObject: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} - m_PrefabInstance: {fileID: 97525180757618131} + m_CorrespondingSourceObject: {fileID: 3560732860612198807, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} + m_PrefabInstance: {fileID: 1395792858578172524} m_PrefabAsset: {fileID: 0} --- !u!1001 &3220948190511565435 PrefabInstance: @@ -6682,84 +6670,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} m_PrefabInstance: {fileID: 5579957051104421435} m_PrefabAsset: {fileID: 0} ---- !u!1001 &6946163971875563307 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 381965733911046334} - m_Modifications: - - target: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} - propertyPath: m_LocalScale.x - value: 0.40000004 - objectReference: {fileID: 0} - - target: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} - propertyPath: m_LocalScale.y - value: 1.123215 - objectReference: {fileID: 0} - - target: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} - propertyPath: m_LocalScale.z - value: 0.40000004 - objectReference: {fileID: 0} - - target: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} - propertyPath: m_LocalPosition.y - value: 0.0065 - objectReference: {fileID: 0} - - target: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} - propertyPath: m_LocalPosition.z - value: 0.0006 - objectReference: {fileID: 0} - - target: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5619234375883385003, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} - propertyPath: m_Name - value: Spring_L - objectReference: {fileID: 0} - - target: {fileID: 5619234375883385003, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} ---- !u!4 &2798402350392497466 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} - m_PrefabInstance: {fileID: 6946163971875563307} - m_PrefabAsset: {fileID: 0} --- !u!1001 &6956505982127152644 PrefabInstance: m_ObjectHideFlags: 0 @@ -7150,3 +7060,69 @@ Transform: m_CorrespondingSourceObject: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} m_PrefabInstance: {fileID: 8438003000380609380} m_PrefabAsset: {fileID: 0} +--- !u!1001 &8919283626837962284 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 381965733911046334} + m_Modifications: + - target: {fileID: 3560732860612198807, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3560732860612198807, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} + propertyPath: m_LocalScale.y + value: 0.00004 + objectReference: {fileID: 0} + - target: {fileID: 3560732860612198807, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} + propertyPath: m_LocalPosition.x + value: -0.00011 + objectReference: {fileID: 0} + - target: {fileID: 3560732860612198807, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0098 + objectReference: {fileID: 0} + - target: {fileID: 3560732860612198807, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} + propertyPath: m_LocalPosition.z + value: -0.00048 + objectReference: {fileID: 0} + - target: {fileID: 3560732860612198807, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} + propertyPath: m_LocalRotation.w + value: 0.57357645 + objectReference: {fileID: 0} + - target: {fileID: 3560732860612198807, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3560732860612198807, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} + propertyPath: m_LocalRotation.y + value: 0.81915206 + objectReference: {fileID: 0} + - target: {fileID: 3560732860612198807, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3560732860612198807, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3560732860612198807, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 110 + objectReference: {fileID: 0} + - target: {fileID: 3560732860612198807, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4188790787953761069, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} + propertyPath: m_Name + value: KR_Model_Springs_Vang + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} +--- !u!4 &5381215068677189563 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3560732860612198807, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} + m_PrefabInstance: {fileID: 8919283626837962284} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Player/PlayerItemModels.meta b/Assets/Prefabs/Player/PlayerItemModels.meta new file mode 100644 index 0000000..7c3ef10 --- /dev/null +++ b/Assets/Prefabs/Player/PlayerItemModels.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d1bef889cf260db4d82460320c670e52 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player/PlayerItemModels/KR_Model_GrapplingHook_Vang.fbx b/Assets/Prefabs/Player/PlayerItemModels/KR_Model_GrapplingHook_Vang.fbx new file mode 100644 index 0000000..b02e818 Binary files /dev/null and b/Assets/Prefabs/Player/PlayerItemModels/KR_Model_GrapplingHook_Vang.fbx differ diff --git a/Assets/Prefabs/Player/PlayerItemModels/KR_Model_GrapplingHook_Vang.fbx.meta b/Assets/Prefabs/Player/PlayerItemModels/KR_Model_GrapplingHook_Vang.fbx.meta new file mode 100644 index 0000000..0595b78 --- /dev/null +++ b/Assets/Prefabs/Player/PlayerItemModels/KR_Model_GrapplingHook_Vang.fbx.meta @@ -0,0 +1,102 @@ +fileFormatVersion: 2 +guid: f57dbf2146b28e94eb04ff9d8456eadb +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: + 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: diff --git a/Assets/Prefabs/Player/PlayerItemModels/KR_Model_SkateShoes_Vang.fbx b/Assets/Prefabs/Player/PlayerItemModels/KR_Model_SkateShoes_Vang.fbx new file mode 100644 index 0000000..e8dc49a Binary files /dev/null and b/Assets/Prefabs/Player/PlayerItemModels/KR_Model_SkateShoes_Vang.fbx differ diff --git a/Assets/Prefabs/Player/PlayerItemModels/KR_Model_SkateShoes_Vang.fbx.meta b/Assets/Prefabs/Player/PlayerItemModels/KR_Model_SkateShoes_Vang.fbx.meta new file mode 100644 index 0000000..f6ed7a1 --- /dev/null +++ b/Assets/Prefabs/Player/PlayerItemModels/KR_Model_SkateShoes_Vang.fbx.meta @@ -0,0 +1,102 @@ +fileFormatVersion: 2 +guid: adf3bb597285e3243aa0cd293df93697 +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: + 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: diff --git a/Assets/Prefabs/Player/PlayerItemModels/KR_Model_Springs_Vang.fbx b/Assets/Prefabs/Player/PlayerItemModels/KR_Model_Springs_Vang.fbx new file mode 100644 index 0000000..effb129 Binary files /dev/null and b/Assets/Prefabs/Player/PlayerItemModels/KR_Model_Springs_Vang.fbx differ diff --git a/Assets/Prefabs/Player/PlayerItemModels/KR_Model_Springs_Vang.fbx.meta b/Assets/Prefabs/Player/PlayerItemModels/KR_Model_Springs_Vang.fbx.meta new file mode 100644 index 0000000..e027a64 --- /dev/null +++ b/Assets/Prefabs/Player/PlayerItemModels/KR_Model_Springs_Vang.fbx.meta @@ -0,0 +1,102 @@ +fileFormatVersion: 2 +guid: 563475ab8b152d447ae0e0f193b4ed1a +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: + 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: diff --git a/Assets/Prefabs/Player/PlayerItemModels/KR_Model_Springs_Vang.prefab b/Assets/Prefabs/Player/PlayerItemModels/KR_Model_Springs_Vang.prefab new file mode 100644 index 0000000..ebc6ea3 --- /dev/null +++ b/Assets/Prefabs/Player/PlayerItemModels/KR_Model_Springs_Vang.prefab @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4188790787953761069 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3560732860612198807} + - component: {fileID: 487963529225621042} + - component: {fileID: 2387311836468230904} + m_Layer: 0 + m_Name: KR_Model_Springs_Vang + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3560732860612198807 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4188790787953761069} + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.0007, y: 0.0065, z: -0} + m_LocalScale: {x: 0.00004, y: 0.00006, z: 0.00004} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &487963529225621042 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4188790787953761069} + m_Mesh: {fileID: -7392505879255243721, guid: 563475ab8b152d447ae0e0f193b4ed1a, type: 3} +--- !u!23 &2387311836468230904 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4188790787953761069} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: -5664336228073109792, guid: 563475ab8b152d447ae0e0f193b4ed1a, type: 3} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/Prefabs/Player/PlayerItemModels/KR_Model_Springs_Vang.prefab.meta b/Assets/Prefabs/Player/PlayerItemModels/KR_Model_Springs_Vang.prefab.meta new file mode 100644 index 0000000..f49672b --- /dev/null +++ b/Assets/Prefabs/Player/PlayerItemModels/KR_Model_Springs_Vang.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fe26ba5444ee2684b85a308896cd2ef2 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player/PlayerItemModels/KR_Model_wallrunshoes_Vang.fbx b/Assets/Prefabs/Player/PlayerItemModels/KR_Model_wallrunshoes_Vang.fbx new file mode 100644 index 0000000..b42acec Binary files /dev/null and b/Assets/Prefabs/Player/PlayerItemModels/KR_Model_wallrunshoes_Vang.fbx differ diff --git a/Assets/Prefabs/Player/PlayerItemModels/KR_Model_wallrunshoes_Vang.fbx.meta b/Assets/Prefabs/Player/PlayerItemModels/KR_Model_wallrunshoes_Vang.fbx.meta new file mode 100644 index 0000000..b28947c --- /dev/null +++ b/Assets/Prefabs/Player/PlayerItemModels/KR_Model_wallrunshoes_Vang.fbx.meta @@ -0,0 +1,102 @@ +fileFormatVersion: 2 +guid: 99528becfb7a15a44a8e57610518e111 +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: + 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: diff --git a/Assets/Scenes/Lobby.unity b/Assets/Scenes/Lobby.unity index 68992d9..ece4e45 100644 --- a/Assets/Scenes/Lobby.unity +++ b/Assets/Scenes/Lobby.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.8674563, g: 0.8218122, b: 0.7859322, a: 1} + m_IndirectSpecularColor: {r: 0.8672222, g: 0.82182354, b: 0.78585345, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -123,11 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &49756914 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3287131508589137792, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3} - m_PrefabInstance: {fileID: 1129569235} - m_PrefabAsset: {fileID: 0} --- !u!1 &238421040 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2865501194676526530, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3} @@ -143,11 +138,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 6530546244197494214, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3} m_PrefabInstance: {fileID: 1129569235} m_PrefabAsset: {fileID: 0} ---- !u!1 &631883696 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5521973095483032952, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3} - m_PrefabInstance: {fileID: 1129569235} - m_PrefabAsset: {fileID: 0} --- !u!1 &651583808 GameObject: m_ObjectHideFlags: 0 @@ -345,6 +335,10 @@ PrefabInstance: propertyPath: m_Name value: NetworkSMPlayerPrefab objectReference: {fileID: 0} + - target: {fileID: 2990189160485986625, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3669633515805984294, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3} propertyPath: m_RootOrder value: 1 @@ -405,6 +399,10 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 4748546854517208321, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3} --- !u!1 &1129569236 stripped @@ -447,6 +445,16 @@ GameObject: m_CorrespondingSourceObject: {fileID: 5602340108049884658, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3} m_PrefabInstance: {fileID: 1129569235} m_PrefabAsset: {fileID: 0} +--- !u!1 &1129569244 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2990189160485986625, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3} + m_PrefabInstance: {fileID: 1129569235} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1129569245 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4748546854517208321, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3} + m_PrefabInstance: {fileID: 1129569235} + m_PrefabAsset: {fileID: 0} --- !u!1 &1412069676 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1608428008624389940, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3} @@ -701,11 +709,11 @@ PrefabInstance: - target: {fileID: 3670971460473670880, guid: f04855a6b3fae4f478846139aa5cf621, type: 3} propertyPath: runnerBodyModifiers.Array.data[4] value: - objectReference: {fileID: 49756914} + objectReference: {fileID: 1129569245} - target: {fileID: 3670971460473670880, guid: f04855a6b3fae4f478846139aa5cf621, type: 3} propertyPath: runnerBodyModifiers.Array.data[5] value: - objectReference: {fileID: 631883696} + objectReference: {fileID: 1129569244} - target: {fileID: 3670971460473670880, guid: f04855a6b3fae4f478846139aa5cf621, type: 3} propertyPath: runnerBodyModifiers.Array.data[6] value: diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 4069f89..40bdaaa 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,34 +6,34 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c7b151b180b650e3a233126281f3fe7c23837e1ec25a7f234362820 - flags: 0 - RecentlyUsedScenePath-1: value: 22424703114646680e0b0227036c7b151b180b6519016b0515163936efef2776f7e93ffdfe flags: 0 - RecentlyUsedScenePath-2: + RecentlyUsedScenePath-1: value: 22424703114646680e0b0227036c7b151b180b650721283704240d14f0e12d3aedff78fce9332b25 flags: 0 - RecentlyUsedScenePath-3: + RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 flags: 0 + RecentlyUsedScenePath-3: + value: 22424703114646680e0b0227036c7c021313113e3f66333e243d04 + flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb + value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9 flags: 0 RecentlyUsedScenePath-5: value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c731f1415016439262f2434 + value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 RecentlyUsedScenePath-7: value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c731f1415016439262f2434 + value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb + value: 22424703114646680e0b0227036c731f1415016439262f2434 flags: 0 vcSharedLogLevel: value: 0d5e400f0650