diff --git a/Assets/Animations/Mysto.meta b/Assets/Animations/Mysto.meta new file mode 100644 index 0000000..3055576 --- /dev/null +++ b/Assets/Animations/Mysto.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 90114aebf36250c46ac9fa57aa7f9288 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Mysto/Fighting Idle.fbx b/Assets/Animations/Mysto/Fighting Idle.fbx new file mode 100644 index 0000000..fb1527d Binary files /dev/null and b/Assets/Animations/Mysto/Fighting Idle.fbx differ diff --git a/Assets/Animations/Mysto/Fighting Idle.fbx.meta b/Assets/Animations/Mysto/Fighting Idle.fbx.meta new file mode 100644 index 0000000..c2c7c03 --- /dev/null +++ b/Assets/Animations/Mysto/Fighting Idle.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: 64d46ca7889e9474f8100f374bb414f3 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + 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 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + 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: 3 + humanoidOversampling: 1 + avatarSetup: 1 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Mysto/Standard Run.fbx b/Assets/Animations/Mysto/Standard Run.fbx new file mode 100644 index 0000000..09fdb2b Binary files /dev/null and b/Assets/Animations/Mysto/Standard Run.fbx differ diff --git a/Assets/Animations/Mysto/Standard Run.fbx.meta b/Assets/Animations/Mysto/Standard Run.fbx.meta new file mode 100644 index 0000000..11b0f82 --- /dev/null +++ b/Assets/Animations/Mysto/Standard Run.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: 9e525bcba97d9fe48ad09c10ae3fe8b9 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + 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 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + 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: 3 + humanoidOversampling: 1 + avatarSetup: 1 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameData/Avatars/MystoBoy.asset b/Assets/GameData/Avatars/MystoBoy.asset index 0deeef3..3b77e12 100644 --- a/Assets/GameData/Avatars/MystoBoy.asset +++ b/Assets/GameData/Avatars/MystoBoy.asset @@ -14,6 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Guid: 203d35f8e617fe49afbe698054593db9 CharacterClass: {fileID: 11400000, guid: db88eb88b930a224fa45fc4e1f943088, type: 2} - Graphics: {fileID: 0} - GraphicsCharacterSelect: {fileID: 0} + Graphics: {fileID: 8385572559299522089, guid: d27be51c72c4bf94aa40b5d1abc3448a, type: 3} + GraphicsCharacterSelect: {fileID: 2659104054394259377, guid: 83b3c8955cb37d14a9daa025085705f7, type: 3} Portrait: {fileID: 0} diff --git a/Assets/GameData/Systems/AvatarRegistry.asset b/Assets/GameData/Systems/AvatarRegistry.asset index 81f9317..baec415 100644 --- a/Assets/GameData/Systems/AvatarRegistry.asset +++ b/Assets/GameData/Systems/AvatarRegistry.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: AvatarRegistry m_EditorClassIdentifier: m_Avatars: - - {fileID: 11400000, guid: da340c65b28e6904a8e89b5a20674ecd, type: 2} + - {fileID: 11400000, guid: e32151d48a3abe543b4e57d6cd16e1ad, type: 2} - {fileID: 11400000, guid: f3963f718ed4cea40b8f6e9e4a3dd80e, type: 2} - {fileID: 11400000, guid: f49fc0646d4e9554f88a31ac496afd19, type: 2} - {fileID: 11400000, guid: 237e099f90346e941af744f402a5bdd6, type: 2} diff --git a/Assets/Models/CharacterSetController_ArcherMysto.overrideController b/Assets/Models/CharacterSetController_ArcherMysto.overrideController index 395db15..e8487b2 100644 --- a/Assets/Models/CharacterSetController_ArcherMysto.overrideController +++ b/Assets/Models/CharacterSetController_ArcherMysto.overrideController @@ -10,9 +10,9 @@ AnimatorOverrideController: m_Controller: {fileID: 9100000, guid: 81ba9d484ee6d174a8aeb3af411babc4, type: 2} m_Clips: - m_OriginalClip: {fileID: 1827226128182048838, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3} - m_OverrideClip: {fileID: 1707754253369947916, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3} + m_OverrideClip: {fileID: -203655887218126122, guid: 64d46ca7889e9474f8100f374bb414f3, type: 3} - m_OriginalClip: {fileID: 6200578666267062213, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3} - m_OverrideClip: {fileID: 6208592259726150901, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3} + m_OverrideClip: {fileID: -203655887218126122, guid: 9e525bcba97d9fe48ad09c10ae3fe8b9, type: 3} - m_OriginalClip: {fileID: -3419257869308726280, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3} m_OverrideClip: {fileID: 339305792967553196, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3} - m_OriginalClip: {fileID: -3649224233829801637, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3} diff --git a/Assets/Models/Mysto/Mysto_V2.fbx.meta b/Assets/Models/Mysto/Mysto_V2.fbx.meta index 5341e72..1e19c8a 100644 --- a/Assets/Models/Mysto/Mysto_V2.fbx.meta +++ b/Assets/Models/Mysto/Mysto_V2.fbx.meta @@ -24,7 +24,7 @@ ModelImporter: animationDoRetargetingWarnings: 0 importAnimatedCustomProperties: 0 importConstraints: 0 - animationCompression: 1 + animationCompression: 3 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 @@ -35,7 +35,7 @@ ModelImporter: isReadable: 0 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 2 meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 @@ -81,8 +81,598 @@ ModelImporter: importAnimation: 1 humanDescription: serializedVersion: 3 - human: [] - skeleton: [] + human: + - boneName: mixamorig:Hips + 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: mixamorig:LeftUpLeg + 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: mixamorig:RightUpLeg + 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: mixamorig:LeftLeg + 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: mixamorig:RightLeg + 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: mixamorig:LeftFoot + 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: mixamorig:RightFoot + 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: mixamorig:Spine + 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: mixamorig:Spine1 + 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: mixamorig:Neck + 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: mixamorig:Head + 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 + - boneName: mixamorig:LeftShoulder + humanName: LeftShoulder + 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: mixamorig:RightShoulder + humanName: RightShoulder + 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: mixamorig:LeftArm + 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: mixamorig:RightArm + 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: mixamorig:LeftForeArm + 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: mixamorig:RightForeArm + 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: mixamorig:LeftHand + 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: mixamorig:RightHand + 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: mixamorig:LeftToeBase + humanName: LeftToes + 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: mixamorig:RightToeBase + humanName: RightToes + 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: mixamorig:LeftHandThumb1 + humanName: Left Thumb Proximal + 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: mixamorig:LeftHandThumb2 + humanName: Left Thumb Intermediate + 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: mixamorig:LeftHandThumb3 + humanName: Left Thumb Distal + 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: mixamorig:LeftHandIndex1 + humanName: Left Index Proximal + 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: mixamorig:LeftHandIndex2 + humanName: Left Index Intermediate + 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: mixamorig:LeftHandIndex3 + humanName: Left Index Distal + 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: mixamorig:LeftHandRing1 + humanName: Left Ring Proximal + 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: mixamorig:LeftHandRing2 + humanName: Left Ring Intermediate + 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: mixamorig:LeftHandRing3 + humanName: Left Ring Distal + 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: mixamorig:RightHandThumb1 + humanName: Right Thumb Proximal + 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: mixamorig:RightHandThumb2 + humanName: Right Thumb Intermediate + 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: mixamorig:RightHandThumb3 + humanName: Right Thumb Distal + 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: mixamorig:RightHandIndex1 + humanName: Right Index Proximal + 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: mixamorig:RightHandIndex2 + humanName: Right Index Intermediate + 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: mixamorig:RightHandIndex3 + humanName: Right Index Distal + 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: mixamorig:RightHandRing1 + humanName: Right Ring Proximal + 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: mixamorig:RightHandRing2 + humanName: Right Ring Intermediate + 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: mixamorig:RightHandRing3 + humanName: Right Ring Distal + 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: mixamorig:Spine2 + 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 + skeleton: + - name: Mysto_V2(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: Armature + parentName: Mysto_V2(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: -0.7071069, y: 0, z: 0, w: 0.7071067} + scale: {x: 100, y: 100, z: 100} + - name: mixamorig:Hips + parentName: Armature + position: {x: 1.6042325e-11, y: -0.000002588707, z: 0.00006701457} + rotation: {x: 0.7071069, y: 0, z: -0, w: 0.7071067} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:Spine + parentName: mixamorig:Hips + position: {x: -0, y: 0.000013551485, z: -0.0000019831352} + rotation: {x: -0.07259081, y: 0, z: -0, w: 0.99736184} + scale: {x: 1, y: 0.9999999, z: 0.9999999} + - name: mixamorig:Spine1 + parentName: mixamorig:Spine + position: {x: -1.4210854e-18, y: 0.00001597846, z: 1.3038516e-12} + rotation: {x: 0.000000048428777, y: 0, z: -0, w: 1} + scale: {x: 1, y: 0.99999994, z: 1} + - name: mixamorig:Spine2 + parentName: mixamorig:Spine1 + position: {x: -0, y: 0.000018261104, z: -1.862645e-12} + rotation: {x: -0.000000067055225, y: 2.8691195e-14, z: 3.3195472e-14, w: 1} + scale: {x: 1, y: 1, z: 1.0000001} + - name: mixamorig:Neck + parentName: mixamorig:Spine2 + position: {x: -4.477549e-19, y: 0.00002018813, z: 0.0000020497366} + rotation: {x: 0.07259078, y: -3.1025184e-14, z: -3.102519e-14, w: 0.99736184} + scale: {x: 1, y: 0.9999999, z: 0.9999998} + - name: mixamorig:Head + parentName: mixamorig:Neck + position: {x: -1.4210876e-18, y: 0.0000069335815, z: 0.000002350645} + rotation: {x: 0.000000033774242, y: -7.617206e-30, z: 7.799711e-21, w: 1} + scale: {x: 1, y: 0.99999994, z: 1} + - name: mixamorig:HeadTop_End + parentName: mixamorig:Head + position: {x: -1.0587911e-25, y: 0.000020569621, z: 0.000006973598} + rotation: {x: 0.000000017151743, y: -1.1666593e-28, z: -2.3051725e-28, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftShoulder + parentName: mixamorig:Spine2 + position: {x: -0.000006910475, y: 0.00002078769, z: 0.0000015937592} + rotation: {x: 0.5407165, y: -0.45163974, z: 0.5597473, w: 0.4362685} + scale: {x: 1, y: 1, z: 0.99999994} + - name: mixamorig:LeftArm + parentName: mixamorig:LeftShoulder + position: {x: 5.587935e-13, y: 0.000014387545, z: 1.0710209e-11} + rotation: {x: -0.071314745, y: 0.0014024484, z: -0.019606832, w: 0.99726015} + scale: {x: 1, y: 1.0000001, z: 1} + - name: mixamorig:LeftForeArm + parentName: mixamorig:LeftArm + position: {x: -9.0803943e-13, y: 0.00003188745, z: 9.313225e-13} + rotation: {x: -0.037090287, y: -0.0017986735, z: -0.038726244, w: 0.9985597} + scale: {x: 0.99999994, y: 0.9999999, z: 0.99999994} + - name: mixamorig:LeftHand + parentName: mixamorig:LeftForeArm + position: {x: 2.0489097e-12, y: 0.000030593805, z: -1.2782402e-11} + rotation: {x: 0.03167983, y: -0.0864613, z: 0.102626674, w: 0.9904487} + scale: {x: 1.0000001, y: 1, z: 1.0000001} + - name: mixamorig:LeftHandThumb1 + parentName: mixamorig:LeftHand + position: {x: 0.000008514504, y: 0.000008283218, z: 0.0000010567127} + rotation: {x: 0.05570522, y: 0.018983528, z: -0.40091074, w: 0.914225} + scale: {x: 1.0000001, y: 1, z: 1.0000001} + - name: mixamorig:LeftHandThumb2 + parentName: mixamorig:LeftHandThumb1 + position: {x: 0.000000011082738, y: 0.0000048524057, z: 0.000000001190789} + rotation: {x: 0.023574954, y: 0.005069621, z: 0.0026806262, w: 0.9997057} + scale: {x: 0.9999999, y: 1, z: 0.9999997} + - name: mixamorig:LeftHandThumb3 + parentName: mixamorig:LeftHandThumb2 + position: {x: -0.000000059459357, y: 0.0000046964733, z: -0.0000000070755366} + rotation: {x: 0.032124598, y: 0.0066967774, z: 0.004037316, w: 0.9994533} + scale: {x: 0.9999999, y: 0.9999999, z: 1} + - name: mixamorig:LeftHandThumb4 + parentName: mixamorig:LeftHandThumb3 + position: {x: 0.000000048317013, y: 0.0000040009445, z: 0.000000006429106} + rotation: {x: 0.00009353748, y: 0.0046618325, z: -0.00028106972, w: 0.9999891} + scale: {x: 1.0000001, y: 0.99999994, z: 1.0000001} + - name: mixamorig:LeftHandIndex1 + parentName: mixamorig:LeftHand + position: {x: 0.0000057353154, y: 0.000014290598, z: 0.0000004888666} + rotation: {x: 0.04914374, y: -0.0017716876, z: -0.05255779, w: 0.9974064} + scale: {x: 0.99999994, y: 0.9999999, z: 1.0000001} + - name: mixamorig:LeftHandIndex2 + parentName: mixamorig:LeftHandIndex1 + position: {x: -0.0000000022402964, y: 0.000005918107, z: -6.749178e-11} + rotation: {x: -0.011136886, y: -0.000051072886, z: 0.00001579016, w: 0.999938} + scale: {x: 1, y: 0.99999964, z: 0.9999999} + - name: mixamorig:LeftHandIndex3 + parentName: mixamorig:LeftHandIndex2 + position: {x: -0.00000000484148, y: 0.000005561929, z: -1.4697434e-11} + rotation: {x: 0.04086649, y: 0.0002572353, z: 0.00025350708, w: 0.9991646} + scale: {x: 1.0000001, y: 1.0000004, z: 1.0000001} + - name: mixamorig:LeftHandIndex4 + parentName: mixamorig:LeftHandIndex3 + position: {x: 0.0000000070796347, y: 0.0000046793607, z: 1.9860454e-11} + rotation: {x: 0.000007641301, y: 0.0049234056, z: -0.00034933802, w: 0.99998784} + scale: {x: 0.99999976, y: 0.9999998, z: 0.99999976} + - name: mixamorig:LeftHandRing1 + parentName: mixamorig:LeftHand + position: {x: -0.0000022802442, y: 0.000018061939, z: -0.00000018267247} + rotation: {x: 0.0072237183, y: -0.0014715333, z: -0.008542469, w: 0.99993634} + scale: {x: 0.99999994, y: 1, z: 1.0000001} + - name: mixamorig:LeftHandRing2 + parentName: mixamorig:LeftHandRing1 + position: {x: 0.000000022609717, y: 0.0000042576785, z: 2.48244e-10} + rotation: {x: -0.04094941, y: 0.007095985, z: -0.00080239103, w: 0.99913573} + scale: {x: 0.99999994, y: 0.9999996, z: 0.9999997} + - name: mixamorig:LeftHandRing3 + parentName: mixamorig:LeftHandRing2 + position: {x: 0.000000020279687, y: 0.0000041620015, z: 4.525529e-10} + rotation: {x: 0.039294455, y: -0.011523062, z: -0.00078311283, w: 0.99916095} + scale: {x: 1.0000001, y: 1.0000002, z: 1.0000001} + - name: mixamorig:LeftHandRing4 + parentName: mixamorig:LeftHandRing3 + position: {x: 3.7252902e-13, y: 0.0000025875563, z: 3.5273841e-12} + rotation: {x: -0.00007159812, y: 0.0058033713, z: 0.0097073475, w: 0.99993604} + scale: {x: 0.9999997, y: 1, z: 0.9999999} + - name: mixamorig:RightShoulder + parentName: mixamorig:Spine2 + position: {x: 0.000006900676, y: 0.000020781732, z: 0.0000016343123} + rotation: {x: -0.542523, y: -0.45015475, z: 0.55836415, w: -0.43733168} + scale: {x: 0.99999976, y: 0.9999998, z: 0.99999964} + - name: mixamorig:RightArm + parentName: mixamorig:RightShoulder + position: {x: -7.4505804e-13, y: 0.000014387541, z: 7.357448e-12} + rotation: {x: -0.07206963, y: -0.0010615494, z: 0.014685731, w: 0.99729097} + scale: {x: 0.9999999, y: 0.9999999, z: 1} + - name: mixamorig:RightForeArm + parentName: mixamorig:RightArm + position: {x: -1.5195837e-12, y: 0.00003188583, z: -5.587935e-12} + rotation: {x: -0.039103232, y: 0.0016661586, z: 0.04100717, w: 0.9983921} + scale: {x: 1.0000001, y: 0.9999998, z: 1.0000001} + - name: mixamorig:RightHand + parentName: mixamorig:RightForeArm + position: {x: 1.6763805e-12, y: 0.00003069895, z: -8.847564e-13} + rotation: {x: 0.038098093, y: 0.08096883, z: 0.0005145156, w: 0.99598813} + scale: {x: 0.99999994, y: 1.0000004, z: 0.9999999} + - name: mixamorig:RightHandThumb1 + parentName: mixamorig:RightHand + position: {x: -0.000008093224, y: 0.000008609505, z: -0.0000005917732} + rotation: {x: 0.051266085, y: -0.016739422, z: 0.29826435, w: 0.9529586} + scale: {x: 1, y: 0.99999994, z: 1.0000002} + - name: mixamorig:RightHandThumb2 + parentName: mixamorig:RightHandThumb1 + position: {x: -0.000000036998838, y: 0.000004752478, z: -0.0000000011947936} + rotation: {x: 0.022243977, y: -0.0034681566, z: 0.00067757745, w: 0.9997463} + scale: {x: 1, y: 0.9999997, z: 0.9999994} + - name: mixamorig:RightHandThumb3 + parentName: mixamorig:RightHandThumb2 + position: {x: 0.000000028818098, y: 0.000004731178, z: 8.095987e-10} + rotation: {x: -0.040411815, y: 0.006274667, z: -0.0013431095, w: 0.9991625} + scale: {x: 0.9999998, y: 1.0000001, z: 1.0000001} + - name: mixamorig:RightHandThumb4 + parentName: mixamorig:RightHandThumb3 + position: {x: 0.000000008178502, y: 0.0000039758875, z: 3.0184164e-10} + rotation: {x: -0.000000087545416, y: -0.004576728, z: -0.0001901136, w: 0.9999895} + scale: {x: 0.9999998, y: 1, z: 0.9999996} + - name: mixamorig:RightHandIndex1 + parentName: mixamorig:RightHand + position: {x: -0.000004145752, y: 0.000017488468, z: 0.0000017096252} + rotation: {x: -0.0052355756, y: 0.00039037014, z: -0.057851113, w: 0.9983114} + scale: {x: 1.0000001, y: 0.99999994, z: 1.0000001} + - name: mixamorig:RightHandIndex2 + parentName: mixamorig:RightHandIndex1 + position: {x: -9.827316e-10, y: 0.0000049306673, z: 1.6234116e-11} + rotation: {x: -0.01233306, y: 0.0002195612, z: 0.0000062113913, w: 0.99992394} + scale: {x: 0.9999998, y: 0.99999994, z: 0.99999976} + - name: mixamorig:RightHandIndex3 + parentName: mixamorig:RightHandIndex2 + position: {x: 4.466623e-10, y: 0.0000045726038, z: -7.508788e-13} + rotation: {x: 0.001634652, y: -0.000029017472, z: -0.00000052028986, w: 0.9999987} + scale: {x: 0.9999999, y: 1.0000001, z: 0.9999999} + - name: mixamorig:RightHandIndex4 + parentName: mixamorig:RightHandIndex3 + position: {x: 5.3718685e-10, y: 0.0000038369817, z: 1.2607779e-11} + rotation: {x: 0.0000004906244, y: -0.0051409067, z: -0.00003499737, w: 0.9999868} + scale: {x: 1, y: 1.0000001, z: 0.99999994} + - name: mixamorig:RightHandRing1 + parentName: mixamorig:RightHand + position: {x: 0.000003899887, y: 0.000014124405, z: 0.0000011012568} + rotation: {x: 0.0007767481, y: 0.0008682187, z: -0.08159133, w: 0.9966652} + scale: {x: 1.0000001, y: 1.0000002, z: 1.0000001} + - name: mixamorig:RightHandRing2 + parentName: mixamorig:RightHandRing1 + position: {x: -0.000000058351826, y: 0.000004621275, z: -5.266512e-10} + rotation: {x: -0.03267589, y: -0.0046859165, z: -0.000084875515, w: 0.99945503} + scale: {x: 1, y: 1, z: 0.99999994} + - name: mixamorig:RightHandRing3 + parentName: mixamorig:RightHandRing2 + position: {x: -0.00000005604159, y: 0.0000043972614, z: 1.7688724e-10} + rotation: {x: -0.008818425, y: -0.0012649974, z: 0.00002966707, w: 0.9999603} + scale: {x: 0.9999997, y: 1.0000001, z: 1.0000001} + - name: mixamorig:RightHandRing4 + parentName: mixamorig:RightHandRing3 + position: {x: 3.8417053e-13, y: 0.0000030026777, z: 1.7113052e-11} + rotation: {x: -0.00019754251, y: -0.0025688137, z: -0.02286846, w: 0.9997352} + scale: {x: 1, y: 0.99999994, z: 0.9999998} + - name: mixamorig:LeftUpLeg + parentName: mixamorig:Hips + position: {x: -0.000015633359, y: 0.000020274834, z: -0.0000018662896} + rotation: {x: 0.00013108182, y: -0.0059765903, z: 0.999745, w: 0.021775605} + scale: {x: 1.0000008, y: 1, z: 1} + - name: mixamorig:LeftLeg + parentName: mixamorig:LeftUpLeg + position: {x: -2.0223068e-12, y: 0.00004055492, z: 1.59676e-13} + rotation: {x: -0.03361006, y: -0.0008580505, z: 0.017538117, w: 0.99928075} + scale: {x: 0.99999994, y: 0.9999998, z: 0.99999994} + - name: mixamorig:LeftFoot + parentName: mixamorig:LeftLeg + position: {x: -6.2245814e-13, y: 0.00003813864, z: 3.6998245e-13} + rotation: {x: 0.5127472, y: -0.011295826, z: -0.029099653, w: 0.857972} + scale: {x: 1, y: 1.0000001, z: 1.0000001} + - name: mixamorig:LeftToeBase + parentName: mixamorig:LeftFoot + position: {x: -1.8568242e-12, y: 0.000014540204, z: 3.399327e-12} + rotation: {x: 0.27183232, y: 0.05384372, z: 0.006401452, w: 0.96081585} + scale: {x: 1, y: 0.99999994, z: 1.0000001} + - name: mixamorig:LeftToe_End + parentName: mixamorig:LeftToeBase + position: {x: 1.0768416e-12, y: 0.0000053809813, z: -2.3283064e-14} + rotation: {x: -0.000000071682734, y: -0.0000065910285, z: 0.00000013716635, w: 1} + scale: {x: 1, y: 1, z: 0.99999994} + - name: mixamorig:RightUpLeg + parentName: mixamorig:Hips + position: {x: 0.000015938625, y: 0.000020274834, z: -0.0000019644222} + rotation: {x: -0.000094079885, y: -0.0051723463, z: 0.99982435, w: -0.01801569} + scale: {x: 1.0000004, y: 1, z: 1} + - name: mixamorig:RightLeg + parentName: mixamorig:RightUpLeg + position: {x: -2.278017e-12, y: 0.00004054205, z: 4.4860823e-14} + rotation: {x: -0.03110051, y: 0.0011747712, z: 0.0022188968, w: 0.99951315} + scale: {x: 1.0000001, y: 0.9999998, z: 0.99999994} + - name: mixamorig:RightFoot + parentName: mixamorig:RightLeg + position: {x: -8.1126924e-13, y: 0.000038149465, z: -3.956302e-15} + rotation: {x: 0.51146793, y: 0.010849908, z: 0.0029776194, w: 0.85922873} + scale: {x: 0.9999998, y: 1, z: 1} + - name: mixamorig:RightToeBase + parentName: mixamorig:RightFoot + position: {x: 1.0535586e-12, y: 0.00001457213, z: -3.352761e-12} + rotation: {x: 0.271084, y: -0.05267972, z: 0.010027459, w: 0.96106076} + scale: {x: 0.99999994, y: 1.0000001, z: 1} + - name: mixamorig:RightToe_End + parentName: mixamorig:RightToeBase + position: {x: 6.2282194e-13, y: 0.0000055202563, z: 1.0477379e-12} + rotation: {x: 0.000000049622038, y: -0.00000015653497, z: -0.00000040620222, w: 1} + scale: {x: 0.99999994, y: 0.99999994, z: 0.99999994} + - name: Mysto + parentName: Mysto_V2(Clone) + position: {x: 2.026558e-10, y: -2.9802502e-12, z: -1.1026859e-10} + rotation: {x: -0.7071069, y: -4.4781034e-10, z: -0.0000000017648994, w: 0.7071067} + scale: {x: 99.999985, y: 99.999985, z: 99.999985} + - name: Mysto.001 + parentName: Mysto_V2(Clone) + position: {x: 2.026558e-10, y: -2.9802502e-12, z: -1.1026859e-10} + rotation: {x: -0.7071069, y: -4.4781034e-10, z: -0.0000000017648994, w: 0.7071067} + scale: {x: 99.999985, y: 99.999985, z: 99.999985} + - name: Mysto.002 + parentName: Mysto_V2(Clone) + position: {x: 2.026558e-10, y: -2.9802502e-12, z: -1.1026859e-10} + rotation: {x: -0.7071069, y: -4.4781034e-10, z: -0.0000000017648994, w: 0.7071067} + scale: {x: 99.999985, y: 99.999985, z: 99.999985} armTwist: 0.5 foreArmTwist: 0.5 upperLegTwist: 0.5 @@ -90,16 +680,16 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 + globalScale: 0.02 rootMotionBoneName: hasTranslationDoF: 0 - hasExtraRoot: 0 + hasExtraRoot: 1 skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 + animationType: 3 humanoidOversampling: 1 - avatarSetup: 0 + avatarSetup: 1 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 importBlendShapeDeformPercent: 1 remapMaterialsIfMaterialImportModeIsNone: 0 diff --git a/Assets/Prefabs/CharGFX/CharacterGraphics/CharacterSelect/PlayerGraphics_MystoArcher_Boy_CharacterSelect.prefab b/Assets/Prefabs/CharGFX/CharacterGraphics/CharacterSelect/PlayerGraphics_MystoArcher_Boy_CharacterSelect.prefab index 5f4c726..00a42bc 100644 --- a/Assets/Prefabs/CharGFX/CharacterGraphics/CharacterSelect/PlayerGraphics_MystoArcher_Boy_CharacterSelect.prefab +++ b/Assets/Prefabs/CharGFX/CharacterGraphics/CharacterSelect/PlayerGraphics_MystoArcher_Boy_CharacterSelect.prefab @@ -89,7 +89,7 @@ Animator: m_GameObject: {fileID: 2659104054394259377} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 0} + m_Controller: {fileID: 22100000, guid: 0b8f7a21eb7f3f04191b3af9df0757ab, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 diff --git a/Assets/Prefabs/Fighting Idle.fbx b/Assets/Prefabs/Fighting Idle.fbx new file mode 100644 index 0000000..fb1527d Binary files /dev/null and b/Assets/Prefabs/Fighting Idle.fbx differ diff --git a/Assets/Prefabs/Fighting Idle.fbx.meta b/Assets/Prefabs/Fighting Idle.fbx.meta new file mode 100644 index 0000000..b389f88 --- /dev/null +++ b/Assets/Prefabs/Fighting Idle.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: 92de5dfa4b405f24cb07c0d54f26683e +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 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 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + 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 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/CharSelect.unity b/Assets/Scenes/CharSelect.unity index 8ef501e..530fbf2 100644 --- a/Assets/Scenes/CharSelect.unity +++ b/Assets/Scenes/CharSelect.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.17726815, g: 0.22192046, b: 0.3041623, a: 1} + m_IndirectSpecularColor: {r: 0.17726853, g: 0.22192088, b: 0.30416295, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -237,13 +237,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 306563559} + serializedVersion: 2 m_LocalRotation: {x: 0.50961196, y: -0.24593104, z: 0.080654934, w: 0.8205538} m_LocalPosition: {x: 7.47, y: 11.66, z: -45.09} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!114 &306563562 MonoBehaviour: @@ -257,14 +257,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 + m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 m_LightLayerMask: 1 + m_RenderingLayers: 1 m_CustomShadowLayers: 0 m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 1 --- !u!1 &353005008 GameObject: m_ObjectHideFlags: 0 @@ -302,13 +305,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 353005008} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &403092387 stripped MonoBehaviour: @@ -337,6 +340,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 294265330276786217, guid: 92e4be25f4f9a694a85129911fdc765b, type: 3} @@ -428,6 +432,9 @@ PrefabInstance: value: SettingsPanelCanvas objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 92e4be25f4f9a694a85129911fdc765b, type: 3} --- !u!1 &596224819 stripped GameObject: @@ -525,6 +532,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 1317383661315508840, guid: fc843f7623d781a448cf42a23409671c, type: 3} @@ -576,6 +584,27 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1947689712084775110, guid: fc843f7623d781a448cf42a23409671c, type: 3} + insertIndex: -1 + addedObject: {fileID: 1606090924} + - targetCorrespondingSourceObject: {fileID: 7717897773102741143, guid: fc843f7623d781a448cf42a23409671c, type: 3} + insertIndex: -1 + addedObject: {fileID: 1606090923} + - targetCorrespondingSourceObject: {fileID: 1177655966066713193, guid: fc843f7623d781a448cf42a23409671c, type: 3} + insertIndex: -1 + addedObject: {fileID: 1606090922} + - targetCorrespondingSourceObject: {fileID: 5632215425567125621, guid: fc843f7623d781a448cf42a23409671c, type: 3} + insertIndex: -1 + addedObject: {fileID: 1606090921} + - targetCorrespondingSourceObject: {fileID: 201667787006272746, guid: fc843f7623d781a448cf42a23409671c, type: 3} + insertIndex: -1 + addedObject: {fileID: 1606090920} + - targetCorrespondingSourceObject: {fileID: 5439376926161086033, guid: fc843f7623d781a448cf42a23409671c, type: 3} + insertIndex: -1 + addedObject: {fileID: 1708761310} m_SourcePrefab: {fileID: 100100000, guid: fc843f7623d781a448cf42a23409671c, type: 3} --- !u!1 &1606090914 stripped GameObject: @@ -619,14 +648,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 + m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 m_LightLayerMask: 1 + m_RenderingLayers: 1 m_CustomShadowLayers: 0 m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 1 --- !u!114 &1606090921 MonoBehaviour: m_ObjectHideFlags: 0 @@ -639,14 +671,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 + m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 m_LightLayerMask: 1 + m_RenderingLayers: 1 m_CustomShadowLayers: 0 m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 1 --- !u!114 &1606090922 MonoBehaviour: m_ObjectHideFlags: 0 @@ -659,14 +694,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 + m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 m_LightLayerMask: 1 + m_RenderingLayers: 1 m_CustomShadowLayers: 0 m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 1 --- !u!114 &1606090923 MonoBehaviour: m_ObjectHideFlags: 0 @@ -679,14 +717,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 + m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 m_LightLayerMask: 1 + m_RenderingLayers: 1 m_CustomShadowLayers: 0 m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 1 --- !u!114 &1606090924 MonoBehaviour: m_ObjectHideFlags: 0 @@ -699,29 +740,45 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 + m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 m_LightLayerMask: 1 + m_RenderingLayers: 1 m_CustomShadowLayers: 0 m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 1 --- !u!1001 &1624197987 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 1092063945021251778, guid: 1a58a2c4657fe6d4890d9ad39f43894e, type: 3} propertyPath: GlobalObjectIdHash value: 2612316768 objectReference: {fileID: 0} + - target: {fileID: 1092063945021251778, guid: 1a58a2c4657fe6d4890d9ad39f43894e, type: 3} + propertyPath: InScenePlacedSourceGlobalObjectIdHash + value: 2959094212 + objectReference: {fileID: 0} - target: {fileID: 3565665953789623672, guid: 1a58a2c4657fe6d4890d9ad39f43894e, type: 3} propertyPath: m_Name value: CharacterSelectState objectReference: {fileID: 0} + - target: {fileID: 3565665953789623673, guid: 1a58a2c4657fe6d4890d9ad39f43894e, type: 3} + propertyPath: AvatarConfiguration.Array.size + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3565665953789623673, guid: 1a58a2c4657fe6d4890d9ad39f43894e, type: 3} + propertyPath: AvatarConfiguration.Array.data[0] + value: + objectReference: {fileID: 11400000, guid: e32151d48a3abe543b4e57d6cd16e1ad, type: 2} - target: {fileID: 3565665953789623674, guid: 1a58a2c4657fe6d4890d9ad39f43894e, type: 3} propertyPath: m_ClassInfoBox value: @@ -871,6 +928,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1a58a2c4657fe6d4890d9ad39f43894e, type: 3} --- !u!114 &1624197988 stripped MonoBehaviour: @@ -895,14 +955,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 + m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 m_LightLayerMask: 1 + m_RenderingLayers: 1 m_CustomShadowLayers: 0 m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 1 --- !u!1 &1953834081 GameObject: m_ObjectHideFlags: 0 @@ -933,6 +996,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -962,13 +1026,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1953834081} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2043722329 stripped GameObject: @@ -1016,13 +1080,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2083157573} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -161.70055, y: 394.94363, z: 245.11069} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2104089349 GameObject: @@ -1047,19 +1111,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2104089349} + serializedVersion: 2 m_LocalRotation: {x: -0, y: 0.9982773, z: -0.058673464, w: 0} m_LocalPosition: {x: -0.04, y: -1.87, z: -40.56} m_LocalScale: {x: 2.0162363, y: 2.0162363, z: 2.0162363} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 6.727, y: 180, z: 0} --- !u!1001 &4107926564415942456 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4107926565600371331, guid: e72290981fe0b14469584445274082b6, type: 3} @@ -1111,12 +1176,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e72290981fe0b14469584445274082b6, type: 3} --- !u!1001 &5940892340892531729 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4921811456745109879, guid: 463d19e34c787654c8cb7332fc58149b, type: 3} @@ -1224,6 +1293,9 @@ PrefabInstance: value: objectReference: {fileID: 1231490493} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 463d19e34c787654c8cb7332fc58149b, type: 3} --- !u!114 &5940892340892531730 stripped MonoBehaviour: @@ -1241,3 +1313,17 @@ GameObject: m_CorrespondingSourceObject: {fileID: 5940892341882885327, guid: 463d19e34c787654c8cb7332fc58149b, type: 3} m_PrefabInstance: {fileID: 5940892340892531729} m_PrefabAsset: {fileID: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 4107926564415942456} + - {fileID: 5940892340892531729} + - {fileID: 1953834084} + - {fileID: 1624197987} + - {fileID: 353005010} + - {fileID: 2104089350} + - {fileID: 1606090913} + - {fileID: 2083157575} + - {fileID: 306563561} + - {fileID: 596224818}