diff --git a/Assets/Models/TrooperArms.fbx b/Assets/Models/TrooperArms.fbx new file mode 100644 index 0000000..484607b Binary files /dev/null and b/Assets/Models/TrooperArms.fbx differ diff --git a/Assets/Models/TrooperArms.fbx.meta b/Assets/Models/TrooperArms.fbx.meta new file mode 100644 index 0000000..38b3fcb --- /dev/null +++ b/Assets/Models/TrooperArms.fbx.meta @@ -0,0 +1,107 @@ +fileFormatVersion: 2 +guid: fab1dc1b7184b1749b4b2369a75b69bb +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: + 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/Prefabs/ArmorBar.prefab b/Assets/Prefabs/ArmorBar.prefab index 8f940d3..26754ed 100644 --- a/Assets/Prefabs/ArmorBar.prefab +++ b/Assets/Prefabs/ArmorBar.prefab @@ -471,6 +471,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ac02fa8c7a7e6a94186a25cec41a920f, type: 3} m_Name: m_EditorClassIdentifier: - staticInfo: {fileID: 7596845782851391549} - dynamicInfo: {fileID: 6292949481137731640} - trooper: {fileID: 4166105814924043842, guid: 510021a4335799440b6b08e642a11ddf, type: 3} + _staticInfo: {fileID: 7596845782851391549} + _dynamicInfo: {fileID: 6292949481137731640} + _trooper: {fileID: 4166105814924043842, guid: 510021a4335799440b6b08e642a11ddf, type: 3} diff --git a/Assets/Prefabs/HealthBar.prefab b/Assets/Prefabs/HealthBar.prefab index 7d4fb40..df0e4cd 100644 --- a/Assets/Prefabs/HealthBar.prefab +++ b/Assets/Prefabs/HealthBar.prefab @@ -124,9 +124,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474dc9fe3fae8334ab11728ec7fcd111, type: 3} m_Name: m_EditorClassIdentifier: - staticInfo: {fileID: 0} - dynamicInfo: {fileID: 0} - trooper: {fileID: 4166105814924043842, guid: 510021a4335799440b6b08e642a11ddf, type: 3} + _staticInfo: {fileID: 5391839336420092048} + _dynamicInfo: {fileID: 5821778700187197228} + _trooper: {fileID: 4166105814924043842, guid: 510021a4335799440b6b08e642a11ddf, type: 3} --- !u!1 &2751800238749896981 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/OverlayArms.prefab b/Assets/Prefabs/OverlayArms.prefab new file mode 100644 index 0000000..4704388 --- /dev/null +++ b/Assets/Prefabs/OverlayArms.prefab @@ -0,0 +1,933 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5469097132455519645 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 207248367247572889} + - component: {fileID: 83823304238418796} + - component: {fileID: 2633665184545906167} + m_Layer: 0 + m_Name: OverlayArms + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &207248367247572889 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5469097132455519645} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.78, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5688714740861997666} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!20 &83823304238418796 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5469097132455519645} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 4 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.01 + far clip plane: 1.5 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 512 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!114 &2633665184545906167 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5469097132455519645} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 1 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 +--- !u!1001 &5294234901731014025 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 207248367247572889} + m_Modifications: + - target: {fileID: -9033401718451597234, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -9019445329131718019, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -8997568623508446063, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -8874332520272613690, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_LocalPosition.y + value: -1.65 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8613518891688595887, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -8257758218950289471, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -8103672384584960059, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -8096158550451831257, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -7984159953078015866, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -7867031266443139215, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -7843984926519324281, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -7821812163982160979, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -7791140448180067331, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -7739298410551277116, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -7627835560357094527, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -7443775558465983418, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -7301348365681409554, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -7241374906811505032, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -7229867589971654812, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -6514603634881546435, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -6420882917810451126, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -6280779384387532650, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -6119246356021672212, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -5806508302759500606, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -5789068938089056038, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -5755554389915520365, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -5629385130732337528, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -5589682380695042827, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -5587785532963223190, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -5575846456861750091, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -5548487049614719619, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -5548163271949560980, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -5475385573692147613, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -5350983395573626774, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -5118157690960937207, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -5103295368074402258, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -5031122919825968838, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -4927759785020049147, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -4822716674050288765, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -4817157917935260926, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -4736983614802127807, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -4630341633023701938, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -4443719422720587765, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -4427383198711420308, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -4266715706587714542, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -4261201615785720489, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -4059744430508775722, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -3832130104300195069, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -3729013642415719137, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -3682138117065684058, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -3566025722046765053, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -3498852482206822724, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -3322085998418164239, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -3091438422988163047, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -3031103743832530825, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -3028167156733314038, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -2883585745762931480, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -2743484901942016553, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -2554891396765713931, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -2538073189931183707, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -2438371464816155001, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -2306155183343344472, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -2260828106798531225, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -2219778379830192736, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -2194691876779857252, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -2070484503367128311, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -2036969489283158714, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -2035639314720826014, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -2006292990917057002, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -1898084331783627657, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -1885889757048498082, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -1867087284561366162, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -1485971763511154438, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -1465255911642930550, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -1425676967805166626, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -898318927545352595, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -848549476309570356, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -785111489409692853, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -664691856680530833, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -507575158743288941, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -469076228773837419, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -274805090979992109, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -220235025385043406, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -148528075927102720, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -125675063278142932, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: -63884444145009841, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 24748314106671375, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 80790114337169337, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 84948894834228680, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 219476887925945849, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 267572830032864112, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 655420859032888643, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 758224308970102458, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Name + value: TrooperArms + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 979225425190485339, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1078942570440261972, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1117858266126775886, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1156075177526039683, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1216501404848165053, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1239555292579233325, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1245306301160800473, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1283689513737470984, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1404783490179195210, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1443749098500314720, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1462354511663252160, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1557121288397415515, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1599399216971546385, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1640707935042834287, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1669540050804212899, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1688258734069958661, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1743926812383084525, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1961324791920931359, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 2016711505707551746, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 2099360639970820319, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 2165012096224738522, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 2236261623633807206, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 2330515847117576451, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 2915261820441148180, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 2977650742218074014, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3095710266459650842, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3269314498001201490, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3339775221643327096, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3368052967196533664, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3372457128796169341, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3440456069226662151, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3585175756655181834, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3782809191008125323, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3786566609648259379, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3848605947653270595, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 4278926851256303152, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 4286898983097454316, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 4311516782685552702, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 4691697862106718681, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 4693491775944802486, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 4810303080586380172, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 4834314658174547609, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 4923112289909798741, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 5007220242983335430, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 5076927197715112124, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 5277459557557480721, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 5385917515393416370, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 5438570030866788201, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 5558483809828262216, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 5607595506004743440, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 5636471651687559648, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 5679783204552954646, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 5752255236821577722, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 5861100815038847361, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 5892286269830451405, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 5934234417957314602, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 6152637533354118184, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 6187881647468920272, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 6203454962695428952, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 6375785238177665911, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 6407222881355320143, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 6442425686010321984, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 6483166119199305698, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 6660599265443819473, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 6779349071305749831, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 6809219764403066887, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 6977098676780254467, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 7039230602371724422, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 7072290158429195622, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 7171122251761412839, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 7267323215901525245, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 7668611685468581109, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 7700875436014036310, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 7712656682116628569, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 7790787888272485896, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 8079215015217587457, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 8109151501520423685, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 8176430080048721659, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 8325661593714798667, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 8364656236457787641, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 8425580356105174493, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 8455843163425418612, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 8480611116771666619, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 8527250606345651226, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 8578521397254669792, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 8729998092575114696, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 8738357656252938588, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 8880405353423519192, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 8977742272353776918, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 9088087059578363382, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 9153195074584419777, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} +--- !u!4 &5688714740861997666 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: fab1dc1b7184b1749b4b2369a75b69bb, type: 3} + m_PrefabInstance: {fileID: 5294234901731014025} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/OverlayArms.prefab.meta b/Assets/Prefabs/OverlayArms.prefab.meta new file mode 100644 index 0000000..3c31ee5 --- /dev/null +++ b/Assets/Prefabs/OverlayArms.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: bcf5a034009efa845ae451cddc0a0af7 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/PlayerRobot.prefab b/Assets/Prefabs/PlayerRobot.prefab new file mode 100644 index 0000000..22d6d09 --- /dev/null +++ b/Assets/Prefabs/PlayerRobot.prefab @@ -0,0 +1,217 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2610647159545710388 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8653229924281085025} + - component: {fileID: -6556826965011640375} + m_Layer: 0 + m_Name: PlayerRobot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8653229924281085025 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2610647159545710388} + 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: + - {fileID: 9136025646515143052} + - {fileID: 4950283301813835928} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-6556826965011640375 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2610647159545710388} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} + m_Name: + m_EditorClassIdentifier: + GlobalObjectIdHash: 3297558590 + InScenePlacedSourceGlobalObjectIdHash: 0 + DeferredDespawnTick: 0 + Ownership: 1 + AlwaysReplicateAsRoot: 0 + SynchronizeTransform: 1 + ActiveSceneSynchronization: 0 + SceneMigrationSynchronization: 1 + SpawnWithObservers: 1 + DontDestroyWithOwner: 0 + AutoObjectParentSync: 1 + SyncOwnerTransformWhenParented: 1 + AllowOwnerToParent: 0 +--- !u!1001 &331419730826990906 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8653229924281085025} + m_Modifications: + - target: {fileID: 824175841923420375, guid: 510021a4335799440b6b08e642a11ddf, type: 3} + propertyPath: _mainCam + value: + objectReference: {fileID: 7347490697776647418} + - target: {fileID: 3574937935898293174, guid: 510021a4335799440b6b08e642a11ddf, type: 3} + propertyPath: m_Cameras.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3574937935898293174, guid: 510021a4335799440b6b08e642a11ddf, type: 3} + propertyPath: 'm_Cameras.Array.data[0]' + value: + objectReference: {fileID: 5150842523869817965} + - target: {fileID: 4495406162367756659, guid: 510021a4335799440b6b08e642a11ddf, type: 3} + propertyPath: GlobalObjectIdHash + value: 3297558590 + objectReference: {fileID: 0} + - target: {fileID: 6520515503152090098, guid: 510021a4335799440b6b08e642a11ddf, type: 3} + propertyPath: m_Name + value: Trooper + objectReference: {fileID: 0} + - target: {fileID: 7020821141455985088, guid: 510021a4335799440b6b08e642a11ddf, type: 3} + propertyPath: m_CullingMask.m_Bits + value: 2551 + objectReference: {fileID: 0} + - target: {fileID: 8813789208874013878, guid: 510021a4335799440b6b08e642a11ddf, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8813789208874013878, guid: 510021a4335799440b6b08e642a11ddf, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8813789208874013878, guid: 510021a4335799440b6b08e642a11ddf, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8813789208874013878, guid: 510021a4335799440b6b08e642a11ddf, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8813789208874013878, guid: 510021a4335799440b6b08e642a11ddf, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8813789208874013878, guid: 510021a4335799440b6b08e642a11ddf, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8813789208874013878, guid: 510021a4335799440b6b08e642a11ddf, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8813789208874013878, guid: 510021a4335799440b6b08e642a11ddf, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8813789208874013878, guid: 510021a4335799440b6b08e642a11ddf, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8813789208874013878, guid: 510021a4335799440b6b08e642a11ddf, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: + - {fileID: 4469290404544596163, guid: 510021a4335799440b6b08e642a11ddf, type: 3} + - {fileID: 6890940095661717361, guid: 510021a4335799440b6b08e642a11ddf, type: 3} + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 510021a4335799440b6b08e642a11ddf, type: 3} +--- !u!20 &7347490697776647418 stripped +Camera: + m_CorrespondingSourceObject: {fileID: 7020821141455985088, guid: 510021a4335799440b6b08e642a11ddf, type: 3} + m_PrefabInstance: {fileID: 331419730826990906} + m_PrefabAsset: {fileID: 0} +--- !u!4 &9136025646515143052 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8813789208874013878, guid: 510021a4335799440b6b08e642a11ddf, type: 3} + m_PrefabInstance: {fileID: 331419730826990906} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &5067318301826967297 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8653229924281085025} + m_Modifications: + - target: {fileID: 207248367247572889, guid: bcf5a034009efa845ae451cddc0a0af7, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 207248367247572889, guid: bcf5a034009efa845ae451cddc0a0af7, type: 3} + propertyPath: m_LocalPosition.y + value: 1.78 + objectReference: {fileID: 0} + - target: {fileID: 207248367247572889, guid: bcf5a034009efa845ae451cddc0a0af7, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 207248367247572889, guid: bcf5a034009efa845ae451cddc0a0af7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 207248367247572889, guid: bcf5a034009efa845ae451cddc0a0af7, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 207248367247572889, guid: bcf5a034009efa845ae451cddc0a0af7, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 207248367247572889, guid: bcf5a034009efa845ae451cddc0a0af7, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 207248367247572889, guid: bcf5a034009efa845ae451cddc0a0af7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 207248367247572889, guid: bcf5a034009efa845ae451cddc0a0af7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 207248367247572889, guid: bcf5a034009efa845ae451cddc0a0af7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5469097132455519645, guid: bcf5a034009efa845ae451cddc0a0af7, type: 3} + propertyPath: m_Name + value: OverlayArms + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: bcf5a034009efa845ae451cddc0a0af7, type: 3} +--- !u!4 &4950283301813835928 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 207248367247572889, guid: bcf5a034009efa845ae451cddc0a0af7, type: 3} + m_PrefabInstance: {fileID: 5067318301826967297} + m_PrefabAsset: {fileID: 0} +--- !u!20 &5150842523869817965 stripped +Camera: + m_CorrespondingSourceObject: {fileID: 83823304238418796, guid: bcf5a034009efa845ae451cddc0a0af7, type: 3} + m_PrefabInstance: {fileID: 5067318301826967297} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/PlayerRobot.prefab.meta b/Assets/Prefabs/PlayerRobot.prefab.meta new file mode 100644 index 0000000..0c25978 --- /dev/null +++ b/Assets/Prefabs/PlayerRobot.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c9706745e37043f448baf9ae0c055c64 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Trooper.prefab b/Assets/Prefabs/Trooper.prefab index 8106971..823b727 100644 --- a/Assets/Prefabs/Trooper.prefab +++ b/Assets/Prefabs/Trooper.prefab @@ -46,11 +46,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 81238d9edefd1cb489822146d154d551, type: 3} m_Name: m_EditorClassIdentifier: - range: 100 - mainCam: {fileID: 7020821141455985088} - debugRayDistance: 5 - debugRayDuration: 3.5 - damage: 10 + _mainCam: {fileID: 0} + _debugRayDistance: 5 + _debugRayDuration: 2 + _range: 100 --- !u!1 &721317587861859360 GameObject: m_ObjectHideFlags: 0 @@ -443,7 +442,6 @@ Transform: m_Children: - {fileID: 7501402826907024489} - {fileID: 2816620635741319617} - - {fileID: 4483880752876286549} m_Father: {fileID: 8813789208874013878} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6520515503152090098 @@ -481,6 +479,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8694055787479681612} + - {fileID: 813103327022279614} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4495406162367756659 @@ -582,20 +581,21 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: ShowTopMostFoldoutHeaderGroup: 1 - characterController: {fileID: 8356405788721287060} - mainCam: {fileID: 7020821141455985088} - audioListener: {fileID: 7104621613359403961} - weapon: {fileID: 824175841923420375} - upDownRange: 90 - walkSpeed: 5 - sprintMultiplier: 5 - gravity: 9.81 - jumpForce: 5 - lookSensitivity: 3 - playerInput: {fileID: 5735500280703936108} + _characterController: {fileID: 8356405788721287060} + _mainCam: {fileID: 7020821141455985088} + _audioListener: {fileID: 7104621613359403961} + _weapon: {fileID: 824175841923420375} + _upDownRange: 90 + _walkSpeed: 5 + _sprintMultiplier: 5 + _gravity: 9.81 + _jumpForce: 5 + _lookSensitivity: 3 + _playerInput: {fileID: 5735500280703936108} devConsole: {fileID: 0} - screenSpaceCanvas: {fileID: 131410968269796361, guid: fa9f2c4a615eec54086556e1b725779b, type: 3} - initialHP: 120 + _screenSpaceCanvas: {fileID: 131410968269796361, guid: fa9f2c4a615eec54086556e1b725779b, type: 3} + _initialHP: 100 + _initialArmor: 100 --- !u!114 &5735500280703936108 MonoBehaviour: m_ObjectHideFlags: 0 @@ -852,212 +852,86 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!1001 &4157746822092920254 +--- !u!1001 &919297649786784853 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 8694055787479681612} + m_TransformParent: {fileID: 8813789208874013878} m_Modifications: - - target: {fileID: -9076529199340955233, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} + - target: {fileID: -8679921383154817045, guid: 8da71485de94d1b41b4313f7bad3d45e, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} + - target: {fileID: -8679921383154817045, guid: 8da71485de94d1b41b4313f7bad3d45e, type: 3} propertyPath: m_LocalPosition.y - value: -1 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} + - target: {fileID: -8679921383154817045, guid: 8da71485de94d1b41b4313f7bad3d45e, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} + - target: {fileID: -8679921383154817045, guid: 8da71485de94d1b41b4313f7bad3d45e, type: 3} propertyPath: m_LocalRotation.w value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} + - target: {fileID: -8679921383154817045, guid: 8da71485de94d1b41b4313f7bad3d45e, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} + - target: {fileID: -8679921383154817045, guid: 8da71485de94d1b41b4313f7bad3d45e, type: 3} propertyPath: m_LocalRotation.y value: 1 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} + - target: {fileID: -8679921383154817045, guid: 8da71485de94d1b41b4313f7bad3d45e, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} + - target: {fileID: -8679921383154817045, guid: 8da71485de94d1b41b4313f7bad3d45e, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} + - target: {fileID: -8679921383154817045, guid: 8da71485de94d1b41b4313f7bad3d45e, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 180 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} + - target: {fileID: -8679921383154817045, guid: 8da71485de94d1b41b4313f7bad3d45e, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -8318026159764899723, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: -7775575232482620887, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: -7241374906811505032, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: -7120931491727603200, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: -6184375662676049582, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: -3682138117065684058, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: -3263102695101208481, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: -3190755339459070857, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: -2889341454382434495, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: -2581543614512948119, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: -194957597782303773, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: -96028628802814052, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 92604577169873567, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 196764266855554593, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 342031642467544462, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 793373712063368836, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} + - target: {fileID: 919132149155446097, guid: 8da71485de94d1b41b4313f7bad3d45e, type: 3} propertyPath: m_Name - value: RobotTestModel - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 959737274234027266, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 2250327581552853144, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 2330515847117576451, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 2530799509299690807, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 3339775221643327096, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 4130307362950939217, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 4365425156995490665, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 5229039674595000910, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 5277459557557480721, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 5627063767494492844, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 6442425686010321984, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 6561080512532243928, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_Layer - value: 10 + value: Trooper objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 8da71485de94d1b41b4313f7bad3d45e, type: 3} insertIndex: -1 - addedObject: {fileID: 8358444932577140113} - m_SourcePrefab: {fileID: 100100000, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} ---- !u!1 &3851177350521071855 stripped + addedObject: {fileID: 4071891444099703797} + m_SourcePrefab: {fileID: 100100000, guid: 8da71485de94d1b41b4313f7bad3d45e, type: 3} +--- !u!1 &960450894868740 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - m_PrefabInstance: {fileID: 4157746822092920254} + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 8da71485de94d1b41b4313f7bad3d45e, type: 3} + m_PrefabInstance: {fileID: 919297649786784853} m_PrefabAsset: {fileID: 0} ---- !u!114 &8358444932577140113 +--- !u!114 &4071891444099703797 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3851177350521071855} + m_GameObject: {fileID: 960450894868740} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: ffe838605f6546b4fb6e5fa06c30df20, type: 3} m_Name: m_EditorClassIdentifier: ShowTopMostFoldoutHeaderGroup: 1 - LocalLayerModelMask: - serializedVersion: 2 - m_Bits: 1024 - RemoteLayerModelMask: - serializedVersion: 2 - m_Bits: 2048 ---- !u!4 &4483880752876286549 stripped +--- !u!4 &813103327022279614 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - m_PrefabInstance: {fileID: 4157746822092920254} + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 8da71485de94d1b41b4313f7bad3d45e, type: 3} + m_PrefabInstance: {fileID: 919297649786784853} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scenes/MultiplayerScene.unity b/Assets/Scenes/MultiplayerScene.unity index 73b56f4..7f8db51 100644 --- a/Assets/Scenes/MultiplayerScene.unity +++ b/Assets/Scenes/MultiplayerScene.unity @@ -11608,63 +11608,6 @@ Mesh: offset: 0 size: 0 path: ---- !u!1001 &911870924 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: b5e8b9c441024a5488ac81ee138cb2d0, type: 3} - propertyPath: m_LocalPosition.x - value: -2.7960749 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b5e8b9c441024a5488ac81ee138cb2d0, type: 3} - propertyPath: m_LocalPosition.y - value: 0.0000019073486 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b5e8b9c441024a5488ac81ee138cb2d0, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b5e8b9c441024a5488ac81ee138cb2d0, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b5e8b9c441024a5488ac81ee138cb2d0, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b5e8b9c441024a5488ac81ee138cb2d0, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b5e8b9c441024a5488ac81ee138cb2d0, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b5e8b9c441024a5488ac81ee138cb2d0, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b5e8b9c441024a5488ac81ee138cb2d0, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b5e8b9c441024a5488ac81ee138cb2d0, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: b5e8b9c441024a5488ac81ee138cb2d0, type: 3} - propertyPath: m_Name - value: SpeedFireModels - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b5e8b9c441024a5488ac81ee138cb2d0, type: 3} --- !u!1 &955913176 GameObject: m_ObjectHideFlags: 0 @@ -14309,6 +14252,52 @@ Transform: m_Children: [] m_Father: {fileID: 291306114} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1108456493 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1108456495} + - component: {fileID: 1108456494} + m_Layer: 0 + m_Name: NetworkSpawnPos (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1108456494 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1108456493} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cee2c0113dc15964db87a29bb399e791, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SpawnPoints: + - {fileID: 1108456493} +--- !u!4 &1108456495 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1108456493} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -3, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1119466313 GameObject: m_ObjectHideFlags: 0 @@ -22764,6 +22753,52 @@ Mesh: offset: 0 size: 0 path: +--- !u!1 &1528084438 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1528084439} + - component: {fileID: 1528084440} + m_Layer: 0 + m_Name: NetworkSpawnPos + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1528084439 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1528084438} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1528084440 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1528084438} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cee2c0113dc15964db87a29bb399e791, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SpawnPoints: + - {fileID: 1528084438} --- !u!1 &1530074703 GameObject: m_ObjectHideFlags: 0 @@ -28450,63 +28485,6 @@ Mesh: offset: 0 size: 0 path: ---- !u!1001 &1740863921 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_LocalPosition.x - value: -1.3960747 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_LocalPosition.y - value: 0.00000047683716 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} - propertyPath: m_Name - value: RobotTestModel - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 68f975ad13142f649bdb7d103d57f656, type: 3} --- !u!1 &1761487665 GameObject: m_ObjectHideFlags: 0 @@ -36292,6 +36270,6 @@ SceneRoots: - {fileID: 1316630045} - {fileID: 308004456} - {fileID: 901735154} - - {fileID: 911870924} - - {fileID: 1740863921} - {fileID: 419097832} + - {fileID: 1528084439} + - {fileID: 1108456495} diff --git a/Assets/Scripts/Runtime/Core/Classes/Engineer.cs b/Assets/Scripts/Runtime/Core/Classes/Engineer.cs index 85f11cc..bf09870 100644 --- a/Assets/Scripts/Runtime/Core/Classes/Engineer.cs +++ b/Assets/Scripts/Runtime/Core/Classes/Engineer.cs @@ -2,15 +2,5 @@ using UnityEngine; public class Engineer : RobotController { - // Start is called once before the first execution of Update after the MonoBehaviour is created - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } + // Engineer Class } diff --git a/Assets/Scripts/Runtime/Core/Classes/PlayerEssence.cs b/Assets/Scripts/Runtime/Core/Classes/PlayerEssence.cs index be9d1c1..8a895fd 100644 --- a/Assets/Scripts/Runtime/Core/Classes/PlayerEssence.cs +++ b/Assets/Scripts/Runtime/Core/Classes/PlayerEssence.cs @@ -1,12 +1,13 @@ using UnityEngine; [RequireComponent( typeof(Camera) )] -public class PlayerEssence : MonoBehaviour { - public float acceleration = 50; // how fast you accelerate - public float accSprintMultiplier = 4; // how much faster you go when "sprinting" - public float lookSensitivity = 1; // mouse look sensitivity - public float dampingCoefficient = 5; // how quickly you break to a halt after you stop your input - public bool focusOnEnable = true; // whether or not to focus and lock cursor immediately on enable +public class PlayerEssence : MonoBehaviour +{ + public float _acceleration = 50; // how fast you accelerate + public float _accSprintMultiplier = 4; // how much faster you go when "sprinting" + public float _lookSensitivity = 1; // mouse look sensitivity + public float _dampingCoefficient = 5; // how quickly you break to a halt after you stop your input + public bool _focusOnEnable = true; // whether or not to focus and lock cursor immediately on enable Vector3 velocity; // current velocity @@ -19,7 +20,7 @@ public class PlayerEssence : MonoBehaviour { } void OnEnable() { - if( focusOnEnable ) Focused = true; + if( _focusOnEnable ) Focused = true; } void OnDisable() => Focused = false; @@ -32,7 +33,7 @@ public class PlayerEssence : MonoBehaviour { Focused = true; // Physics - velocity = Vector3.Lerp( velocity, Vector3.zero, dampingCoefficient * Time.deltaTime ); + velocity = Vector3.Lerp( velocity, Vector3.zero, _dampingCoefficient * Time.deltaTime ); transform.position += velocity * Time.deltaTime; } @@ -41,7 +42,7 @@ public class PlayerEssence : MonoBehaviour { velocity += GetAccelerationVector() * Time.deltaTime; // Rotation - Vector2 mouseDelta = lookSensitivity * new Vector2( Input.GetAxis( "Mouse X" ), -Input.GetAxis( "Mouse Y" ) ); + Vector2 mouseDelta = _lookSensitivity * new Vector2( Input.GetAxis( "Mouse X" ), -Input.GetAxis( "Mouse Y" ) ); Quaternion rotation = transform.rotation; Quaternion horiz = Quaternion.AngleAxis( mouseDelta.x, Vector3.up ); Quaternion vert = Quaternion.AngleAxis( mouseDelta.y, Vector3.right ); @@ -69,8 +70,8 @@ public class PlayerEssence : MonoBehaviour { Vector3 direction = transform.TransformVector( moveInput.normalized ); if( Input.GetKey( KeyCode.LeftShift ) ) - return direction * ( acceleration * accSprintMultiplier ); // "sprinting" - return direction * acceleration; // "walking" + return direction * ( _acceleration * _accSprintMultiplier ); // "sprinting" + return direction * _acceleration; // "walking" } // Fog for Camera - Later diff --git a/Assets/Scripts/Runtime/Core/Classes/PlayerSettings.cs b/Assets/Scripts/Runtime/Core/Classes/PlayerSettings.cs index 5247a51..a8fb792 100644 --- a/Assets/Scripts/Runtime/Core/Classes/PlayerSettings.cs +++ b/Assets/Scripts/Runtime/Core/Classes/PlayerSettings.cs @@ -4,5 +4,5 @@ using UnityEngine; public class PlayerSettings : NetworkBehaviour { - public NetworkVariable playerNickname; + public NetworkVariable PlayerNickname; } diff --git a/Assets/Scripts/Runtime/Core/Classes/RobotController.cs b/Assets/Scripts/Runtime/Core/Classes/RobotController.cs index 08a6ef3..2987b4e 100644 --- a/Assets/Scripts/Runtime/Core/Classes/RobotController.cs +++ b/Assets/Scripts/Runtime/Core/Classes/RobotController.cs @@ -4,38 +4,38 @@ using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.InputSystem; -public class RobotController : NetworkBehaviour +public class RobotController : NetworkBehaviour { [Header("Objects")] - [SerializeField] protected CharacterController characterController; - [SerializeField] protected Camera mainCam; - [SerializeField] protected AudioListener audioListener; - [SerializeField] protected Weapon weapon; + [SerializeField] protected CharacterController _characterController; + [SerializeField] protected Camera _mainCam; + [SerializeField] protected AudioListener _audioListener; + [SerializeField] protected Weapon _weapon; - [SerializeField] protected float upDownRange = 90f; - protected float verticalRotation; + [SerializeField] protected float _upDownRange = 90f; + protected float _verticalRotation; [Header("Movement")] - [SerializeField] protected float walkSpeed = 5.0f; - [SerializeField] protected float sprintMultiplier = 5.0f; - protected float speedMultiplier = 1f; + [SerializeField] protected float _walkSpeed = 5.0f; + [SerializeField] protected float _sprintMultiplier = 5.0f; + protected float _speedMultiplier = 1f; [Header("Gravity / JumpForce")] - [SerializeField] protected float gravity = 9.81f; - [SerializeField] protected float jumpForce = 5f; + [SerializeField] protected float _gravity = 9.81f; + [SerializeField] protected float _jumpForce = 5f; [Header("Look Sensitivity")] - [SerializeField] protected float lookSensitivity = 3.0f; - protected bool cursorIsLocked = true; + [SerializeField] protected float _lookSensitivity = 3.0f; + protected bool _cursorIsLocked = true; [Header("Input Actions")] - [SerializeField] protected PlayerInput playerInput; + [SerializeField] protected PlayerInput _playerInput; - protected Vector2 moveInput; - protected Vector2 lookInput; + protected Vector2 _moveInput; + protected Vector2 _lookInput; - protected bool isMoving; - protected Vector3 currentMovement = Vector3.zero; + protected bool _isMoving; + protected Vector3 _currentMovement = Vector3.zero; [Header("Developer Console")] [SerializeField] protected DeveloperConsoleUI devConsole; @@ -43,9 +43,9 @@ public class RobotController : NetworkBehaviour private void Awake() { - characterController = GetComponent(); - playerInput = GetComponent(); - audioListener = GetComponentInChildren(); + _characterController = GetComponent(); + _playerInput = GetComponent(); + _audioListener = GetComponentInChildren(); } // PlayerInput Events @@ -65,26 +65,30 @@ public class RobotController : NetworkBehaviour } } } + public void OnMove(InputAction.CallbackContext context) { - moveInput = context.ReadValue(); + _moveInput = context.ReadValue(); } + public void OnLook(InputAction.CallbackContext context) { - lookInput = context.ReadValue(); + _lookInput = context.ReadValue(); } + public void OnSprint(InputAction.CallbackContext context) { if (context.performed) { Debug.Log("Running"); - speedMultiplier = sprintMultiplier; + _speedMultiplier = _sprintMultiplier; } else { - speedMultiplier = 1f; + _speedMultiplier = 1f; } } + public void OnJump(InputAction.CallbackContext context) { if (context.performed) @@ -92,6 +96,7 @@ public class RobotController : NetworkBehaviour JumpServerRPC(); } } + public void OnAttack(InputAction.CallbackContext context) { if (context.performed) @@ -99,6 +104,7 @@ public class RobotController : NetworkBehaviour ShootServerRPC(); } } + public void OnAim(InputAction.CallbackContext context) { if (context.performed) @@ -106,6 +112,7 @@ public class RobotController : NetworkBehaviour AimServerRPC(); } } + public void OnCrouch(InputAction.CallbackContext context) { if (context.performed) @@ -113,6 +120,7 @@ public class RobotController : NetworkBehaviour CrouchServerRPC(); } } + public void OnInteract(InputAction.CallbackContext context) { if (context.performed) @@ -126,10 +134,10 @@ public class RobotController : NetworkBehaviour { base.OnNetworkSpawn(); - playerInput.enabled = IsOwner; - characterController.enabled = IsOwner; - mainCam.enabled = IsOwner; - audioListener.enabled = IsOwner; + _playerInput.enabled = IsOwner; + _characterController.enabled = IsOwner; + _mainCam.enabled = IsOwner; + _audioListener.enabled = IsOwner; Debug.Log($"NetworkObject ID: {NetworkObjectId} spawned with OwnerClientId: {OwnerClientId}"); } @@ -138,10 +146,10 @@ public class RobotController : NetworkBehaviour { base.OnNetworkDespawn(); - playerInput.enabled = false; - characterController.enabled = false; - mainCam.enabled = false; - audioListener.enabled = false; + _playerInput.enabled = false; + _characterController.enabled = false; + _mainCam.enabled = false; + _audioListener.enabled = false; Debug.Log($"NetworkObject ID: {NetworkObjectId} despawned"); } @@ -160,42 +168,42 @@ public class RobotController : NetworkBehaviour protected void HandleMovement() { - float verticalSpeed = moveInput.y * walkSpeed * speedMultiplier; - float horizontalSpeed = moveInput.x * walkSpeed * speedMultiplier; + float verticalSpeed = _moveInput.y * _walkSpeed * _speedMultiplier; + float horizontalSpeed = _moveInput.x * _walkSpeed * _speedMultiplier; - Vector3 horizontalMovement = new Vector3 (horizontalSpeed, 0, verticalSpeed); + Vector3 horizontalMovement = new(horizontalSpeed, 0, verticalSpeed); horizontalMovement = transform.rotation * horizontalMovement; handleGravityAndJumping(); - currentMovement.x = horizontalMovement.x; - currentMovement.z = horizontalMovement.z; + _currentMovement.x = horizontalMovement.x; + _currentMovement.z = horizontalMovement.z; - characterController.Move(currentMovement * Time.deltaTime); + _characterController.Move(_currentMovement * Time.deltaTime); - isMoving = moveInput.y != 0 || moveInput.x != 0; + _isMoving = _moveInput.y != 0 || _moveInput.x != 0; } protected void handleGravityAndJumping() { - if (characterController.isGrounded) + if (_characterController.isGrounded) { - currentMovement.y = -0.5f; + _currentMovement.y = -0.5f; } else { - currentMovement.y -= gravity * Time.deltaTime; + _currentMovement.y -= _gravity * Time.deltaTime; } } protected void HandleRotation() { - float mouseXRotation = lookInput.x * lookSensitivity; + float mouseXRotation = _lookInput.x * _lookSensitivity; transform.Rotate(0, mouseXRotation, 0); - verticalRotation -= lookInput.y * lookSensitivity; - verticalRotation = Mathf.Clamp(verticalRotation, -upDownRange, upDownRange); - mainCam.transform.localRotation = Quaternion.Euler(verticalRotation, 0, 0); + _verticalRotation -= _lookInput.y * _lookSensitivity; + _verticalRotation = Mathf.Clamp(_verticalRotation, -_upDownRange, _upDownRange); + _mainCam.transform.localRotation = Quaternion.Euler(_verticalRotation, 0, 0); } //controls the locking and unlocking of the mouse @@ -203,27 +211,29 @@ public class RobotController : NetworkBehaviour { if (Input.GetKeyUp(KeyCode.Escape)) { - cursorIsLocked = false; + _cursorIsLocked = false; } else if (Input.GetMouseButtonUp(0)) { - cursorIsLocked = true; + _cursorIsLocked = true; } - if (cursorIsLocked) + if (_cursorIsLocked) { UnlockCursor(); } - else if (!cursorIsLocked) + else if (!_cursorIsLocked) { LockCursor(); } } + private void UnlockCursor() { Cursor.lockState = CursorLockMode.Locked; Cursor.visible = false; } + private void LockCursor() { Cursor.lockState = CursorLockMode.None; @@ -231,11 +241,10 @@ public class RobotController : NetworkBehaviour } // Networking Staff - [ServerRpc] protected void JumpServerRPC() { - if (characterController.isGrounded) + if (_characterController.isGrounded) { Debug.Log($"Jump triggered. Owner: {OwnerClientId}"); } @@ -245,7 +254,7 @@ public class RobotController : NetworkBehaviour protected void ShootServerRPC() { Debug.Log($"Shooting triggered. Owner: {OwnerClientId}"); - weapon.Shooting(); + _weapon.Shooting(); } [ServerRpc] diff --git a/Assets/Scripts/Runtime/Core/Classes/Trooper.cs b/Assets/Scripts/Runtime/Core/Classes/Trooper.cs index eca21e4..a4a023a 100644 --- a/Assets/Scripts/Runtime/Core/Classes/Trooper.cs +++ b/Assets/Scripts/Runtime/Core/Classes/Trooper.cs @@ -6,29 +6,30 @@ using UnityEngine.InputSystem; public class Trooper : RobotController { // Dev Debug Staff - [SerializeField] Canvas screenSpaceCanvas; + [SerializeField] private Canvas _screenSpaceCanvas; [Header("Gameplay Variables")] - private NetworkVariable healthPoints = new NetworkVariable(); - public int HealthPoints { get { return healthPoints.Value; } set { healthPoints.Value = value; } } + public NetworkVariable HealthPoints { get => _healthPoints; set => _healthPoints = value; } + private NetworkVariable _healthPoints = new NetworkVariable(); - private NetworkVariable armorPoints = new NetworkVariable(); - public int ArmorPoints { get { return armorPoints.Value; } set { armorPoints.Value = value; } } + public NetworkVariable ArmorPoints { get => _armorPoints; set => _armorPoints = value; } + private NetworkVariable _armorPoints = new NetworkVariable(); - private NetworkVariable ammoPoints = new NetworkVariable(); - public int AmmoPoints { get { return ammoPoints.Value; } set { ammoPoints.Value = value; } } + public NetworkVariable AmmoPoints { get => _ammoPoints; set => _ammoPoints = value; } + private NetworkVariable _ammoPoints = new NetworkVariable(); - [SerializeField] private int initialHP = 100; - public int InitialHP { get => initialHP; set => initialHP = value; } + public int InitialHP { get => _initialHP; set => _initialHP = value; } + [SerializeField] private int _initialHP = 100; - [SerializeField] private int initialArmor = 100; - public int InitialArmor { get => initialArmor; set => initialArmor = value; } + public int InitialArmor { get => _initialArmor; set => _initialArmor = value; } + [SerializeField] private int _initialArmor = 100; + // Gameplay - Scene Awake & Start private void Awake() { - characterController = GetComponent(); - playerInput = GetComponent(); - audioListener = GetComponentInChildren(); + _characterController = GetComponent(); + _playerInput = GetComponent(); + _audioListener = GetComponentInChildren(); } // PlayerInput Events @@ -48,33 +49,41 @@ public class Trooper : RobotController } // Networking Staff - Spawn & Despawn + private void OnServerSpawnPlayer() + { + // this is done server side, so we have a single source of truth for our spawn point list + var spawnPoint = ServerPlayerSpawnPoints.Instance.ConsumeNextSpawnPoint(); + var spawnPosition = spawnPoint ? spawnPoint.transform.position : Vector3.zero; + transform.position = spawnPosition; + } public override void OnNetworkSpawn() { + OnServerSpawnPlayer(); base.OnNetworkSpawn(); - playerInput.enabled = IsOwner; - characterController.enabled = IsOwner; - mainCam.enabled = IsOwner; - audioListener.enabled = IsOwner; - screenSpaceCanvas.enabled = IsOwner; + _playerInput.enabled = IsOwner; + _characterController.enabled = IsOwner; + _mainCam.enabled = IsOwner; + _audioListener.enabled = IsOwner; + _screenSpaceCanvas.enabled = IsOwner; // Game Variables - healthPoints.Value = InitialHP; + HealthPoints.Value = InitialHP; Debug.Log($"NetworkObject ID: {NetworkObjectId} spawned with OwnerClientId: {OwnerClientId}"); - Debug.Log($"HP of OwnerClientID: {OwnerClientId} is {healthPoints.Value} when spawned."); + Debug.Log($"HP of OwnerClientID: {OwnerClientId} is {HealthPoints.Value} when spawned."); } public override void OnNetworkDespawn() { base.OnNetworkDespawn(); - playerInput.enabled = false; - characterController.enabled = false; - mainCam.enabled = false; - audioListener.enabled = false; - screenSpaceCanvas.enabled = false; + _playerInput.enabled = false; + _characterController.enabled = false; + _mainCam.enabled = false; + _audioListener.enabled = false; + _screenSpaceCanvas.enabled = false; Debug.Log($"NetworkObject ID: {NetworkObjectId} despawned"); } @@ -85,33 +94,33 @@ public class Trooper : RobotController [ServerRpc] private new void JumpServerRPC() { - if (characterController.isGrounded) + if (_characterController.isGrounded) { - Debug.Log("Jumping as Trooper triggered."); + Debug.Log($"Jumping as Trooper triggered. Owner: {OwnerClientId}"); } } [ServerRpc] private new void ShootServerRPC() { - weapon.Shooting(); + _weapon.Shooting(); } [ServerRpc] private new void AimServerRPC() { - Debug.Log("Aim as Trooper triggered."); + Debug.Log($"Aim as Trooper triggered. Owner: {OwnerClientId}"); } [ServerRpc] private new void CrouchServerRPC() { - Debug.Log("Crouch as Trooper triggered."); + Debug.Log($"Crouch as Trooper triggered. Owner: {OwnerClientId}"); } [ServerRpc] private new void InteractServerRPC() { - Debug.Log("Interact as Trooper triggered."); + Debug.Log($"Interact as Trooper triggered. Owner: {OwnerClientId}"); } } diff --git a/Assets/Scripts/Runtime/Core/Classes/Weapon.cs b/Assets/Scripts/Runtime/Core/Classes/Weapon.cs index 05065aa..9098904 100644 --- a/Assets/Scripts/Runtime/Core/Classes/Weapon.cs +++ b/Assets/Scripts/Runtime/Core/Classes/Weapon.cs @@ -3,27 +3,24 @@ using Unity.Netcode; public class Weapon : MonoBehaviour { - // [SerializeField] private float damage = 10f; - [SerializeField] private float range = 100f; - [SerializeField] protected Camera mainCam; - [SerializeField] protected float debugRayDistance = 5f; - [SerializeField] protected float debugRayDuration = 2f; + [SerializeField] protected Camera _mainCam; + [SerializeField] protected float _debugRayDistance = 5f; + [SerializeField] protected float _debugRayDuration = 2f; + [SerializeField] private float _range = 100f; [Header("Gameplay Variables")] - private NetworkVariable m_Damage = new NetworkVariable(); - [SerializeField] protected int damage = 10; - - + public NetworkVariable Damage { get => _damage; set => _damage = value; } + private NetworkVariable _damage = new NetworkVariable(); public void Shooting() { RaycastHit hit; - if (Physics.Raycast(mainCam.transform.position, mainCam.transform.forward, out hit, range)) + if (Physics.Raycast(_mainCam.transform.position, _mainCam.transform.forward, out hit, _range)) { Debug.Log(hit.transform.name); - Vector3 rayDir = mainCam.transform.forward * debugRayDistance; - Debug.DrawRay(mainCam.transform.position, rayDir, Color.yellow, debugRayDuration, false); + Vector3 rayDir = _mainCam.transform.forward * _debugRayDistance; + Debug.DrawRay(_mainCam.transform.position, rayDir, Color.yellow, _debugRayDuration, false); } } diff --git a/Assets/Scripts/Runtime/Networking/ServerPlayerSpawnPoints.cs b/Assets/Scripts/Runtime/Networking/ServerPlayerSpawnPoints.cs new file mode 100644 index 0000000..70b2e0c --- /dev/null +++ b/Assets/Scripts/Runtime/Networking/ServerPlayerSpawnPoints.cs @@ -0,0 +1,40 @@ +using System.Collections.Generic; +using UnityEngine; + +public class ServerPlayerSpawnPoints : MonoBehaviour +{ + [SerializeField] + List m_SpawnPoints; + + static ServerPlayerSpawnPoints s_Instance; + + public static ServerPlayerSpawnPoints Instance + { + get + { + if (s_Instance == null) + { + s_Instance = FindObjectOfType(); + } + + return s_Instance; + } + } + + void OnDestroy() + { + s_Instance = null; + } + + public GameObject ConsumeNextSpawnPoint() + { + if (m_SpawnPoints.Count == 0) + { + return null; + } + + var toReturn = m_SpawnPoints[m_SpawnPoints.Count - 1]; + m_SpawnPoints.RemoveAt(m_SpawnPoints.Count - 1); + return toReturn; + } +} diff --git a/Assets/Scripts/Runtime/Networking/ServerPlayerSpawnPoints.cs.meta b/Assets/Scripts/Runtime/Networking/ServerPlayerSpawnPoints.cs.meta new file mode 100644 index 0000000..808c259 --- /dev/null +++ b/Assets/Scripts/Runtime/Networking/ServerPlayerSpawnPoints.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: cee2c0113dc15964db87a29bb399e791 \ No newline at end of file diff --git a/Assets/Scripts/Runtime/UI/Armorbar.cs b/Assets/Scripts/Runtime/UI/Armorbar.cs index e014bcb..4f4f57b 100644 --- a/Assets/Scripts/Runtime/UI/Armorbar.cs +++ b/Assets/Scripts/Runtime/UI/Armorbar.cs @@ -3,26 +3,26 @@ using UnityEngine; public class Armorbar : MonoBehaviour { - [SerializeField] private TextMeshProUGUI staticInfo; - [SerializeField] private TextMeshProUGUI dynamicInfo; - [SerializeField] private Trooper trooper; + [SerializeField] private TextMeshProUGUI _staticInfo; + [SerializeField] private TextMeshProUGUI _dynamicInfo; + [SerializeField] private Trooper _trooper; - private int bufferHP; - private int initialInfo; + private int _bufferHP; + private int _initialInfo; - public TextMeshProUGUI DynamicInfo { get => dynamicInfo; set => dynamicInfo = value; } - public TextMeshProUGUI StaticInfo { get => staticInfo; set => staticInfo = value; } - public int BufferHP { get => bufferHP; set => bufferHP = value; } + public TextMeshProUGUI DynamicInfo { get => _dynamicInfo; set => _dynamicInfo = value; } + public TextMeshProUGUI StaticInfo { get => _staticInfo; set => _staticInfo = value; } + public int BufferHP { get => _bufferHP; set => _bufferHP = value; } void Start() { - initialInfo = trooper.InitialArmor; - StaticInfo.text = initialInfo.ToString(); - DynamicInfo.text = initialInfo.ToString(); + _initialInfo = _trooper.InitialArmor; + StaticInfo.text = _initialInfo.ToString(); + DynamicInfo.text = _initialInfo.ToString(); } void DynamicInfoChange(int newValue) { - DynamicInfo.text = bufferHP.ToString(); + DynamicInfo.text = _bufferHP.ToString(); } } diff --git a/Assets/Scripts/Runtime/UI/Healthbar.cs b/Assets/Scripts/Runtime/UI/Healthbar.cs index ee5008d..905c06b 100644 --- a/Assets/Scripts/Runtime/UI/Healthbar.cs +++ b/Assets/Scripts/Runtime/UI/Healthbar.cs @@ -3,26 +3,26 @@ using UnityEngine; public class Healthbar : MonoBehaviour { - [SerializeField] private TextMeshProUGUI staticInfo; - [SerializeField] private TextMeshProUGUI dynamicInfo; - [SerializeField] private Trooper trooper; + [SerializeField] private TextMeshProUGUI _staticInfo; + [SerializeField] private TextMeshProUGUI _dynamicInfo; + [SerializeField] private Trooper _trooper; - private int bufferHP; - private int initialInfo; + private int _bufferHP; + private int _initialInfo; - public TextMeshProUGUI DynamicInfo { get => dynamicInfo; set => dynamicInfo = value; } - public TextMeshProUGUI StaticInfo { get => staticInfo; set => staticInfo = value; } - public int BufferHP { get => bufferHP; set => bufferHP = value; } + public TextMeshProUGUI DynamicInfo { get => _dynamicInfo; set => _dynamicInfo = value; } + public TextMeshProUGUI StaticInfo { get => _staticInfo; set => _staticInfo = value; } + public int BufferHP { get => _bufferHP; set => _bufferHP = value; } void Start() { - initialInfo = trooper.InitialHP; - StaticInfo.text = initialInfo.ToString(); - DynamicInfo.text = initialInfo.ToString(); + _initialInfo = _trooper.InitialHP; + StaticInfo.text = _initialInfo.ToString(); + DynamicInfo.text = _initialInfo.ToString(); } void DynamicInfoChange(int newValue) { - DynamicInfo.text = bufferHP.ToString(); + DynamicInfo.text = _bufferHP.ToString(); } -} \ No newline at end of file +} \ No newline at end of file diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset index 70c5d61..af802a1 100644 --- a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset +++ b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset @@ -2,20 +2,24 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2180264 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: LiberationSans SDF Material m_Shader: {fileID: 4800000, guid: fe393ace9b354375a9cb14cdbbc28be4, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -67,6 +71,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _Ambient: 0.5 - _Bevel: 0.5 @@ -148,6 +153,8 @@ Material: - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5} + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -161,17 +168,13 @@ MonoBehaviour: m_Name: LiberationSans SDF - Fallback m_EditorClassIdentifier: m_Version: 1.1.0 - m_Material: {fileID: 2180264} - m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75 - m_SourceFontFile: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3} - m_AtlasPopulationMode: 1 - InternalDynamicOS: 0 m_FaceInfo: m_FaceIndex: 0 m_FamilyName: Liberation Sans m_StyleName: Regular m_PointSize: 86 m_Scale: 1 + m_UnitsPerEM: 2048 m_LineHeight: 98.8916 m_AscentLine: 77.853516 m_CapLine: 59 @@ -187,57 +190,8 @@ MonoBehaviour: m_StrikethroughOffset: 18 m_StrikethroughThickness: 6.298828 m_TabWidth: 24 - m_GlyphTable: [] - m_CharacterTable: [] - m_AtlasTextures: - - {fileID: 28268798066460806} - m_AtlasTextureIndex: 0 - m_IsMultiAtlasTexturesEnabled: 1 - m_ClearDynamicDataOnBuild: 1 - m_UsedGlyphRects: [] - m_FreeGlyphRects: - - m_X: 0 - m_Y: 0 - m_Width: 511 - m_Height: 511 - m_fontInfo: - Name: Liberation Sans - PointSize: 86 - Scale: 1 - CharacterCount: 250 - LineHeight: 98.90625 - Baseline: 0 - Ascender: 77.84375 - CapHeight: 59.1875 - Descender: -18.21875 - CenterLine: 0 - SuperscriptOffset: 77.84375 - SubscriptOffset: -12.261719 - SubSize: 0.5 - Underline: -12.261719 - UnderlineThickness: 6.298828 - strikethrough: 23.675 - strikethroughThickness: 0 - TabWidth: 239.0625 - Padding: 9 - AtlasWidth: 1024 - AtlasHeight: 1024 - atlas: {fileID: 0} - m_AtlasWidth: 512 - m_AtlasHeight: 512 - m_AtlasPadding: 9 - m_AtlasRenderMode: 4169 - m_glyphInfoList: [] - m_KerningTable: - kerningPairs: [] - m_FontFeatureTable: - m_MultipleSubstitutionRecords: [] - m_LigatureSubstitutionRecords: [] - m_GlyphPairAdjustmentRecords: [] - m_MarkToBaseAdjustmentRecords: [] - m_MarkToMarkAdjustmentRecords: [] - fallbackFontAssets: [] - m_FallbackFontAssetTable: [] + m_Material: {fileID: 2180264} + m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75 m_CreationSettings: sourceFontFileName: sourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75 @@ -257,6 +211,426 @@ MonoBehaviour: fontStyleModifier: 0 renderMode: 4169 includeFontFeatures: 1 + m_SourceFontFile: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3} + m_SourceFontFilePath: + m_AtlasPopulationMode: 1 + InternalDynamicOS: 0 + m_GlyphTable: [] + m_CharacterTable: [] + m_AtlasTextures: + - {fileID: 28268798066460806} + m_AtlasTextureIndex: 0 + m_IsMultiAtlasTexturesEnabled: 1 + m_GetFontFeatures: 1 + m_ClearDynamicDataOnBuild: 1 + m_AtlasWidth: 512 + m_AtlasHeight: 512 + m_AtlasPadding: 9 + m_AtlasRenderMode: 4169 + m_UsedGlyphRects: [] + m_FreeGlyphRects: + - m_X: 0 + m_Y: 0 + m_Width: 511 + m_Height: 511 + m_FontFeatureTable: + m_MultipleSubstitutionRecords: [] + m_LigatureSubstitutionRecords: [] + m_GlyphPairAdjustmentRecords: + - m_FirstAdjustmentRecord: + m_GlyphIndex: 998 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -0.9658203 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 994 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 998 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -1.8896484 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 997 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 998 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -0.9658203 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 999 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 998 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -1.8896484 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1000 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 998 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -2.8554688 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1004 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 998 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -2.8554688 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1011 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 998 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -0.9658203 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1012 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 998 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -1.8896484 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1014 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 998 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -2.8554688 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1016 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1013 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -0.9658203 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 994 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1013 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -1.8896484 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 997 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1013 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -1.8896484 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1004 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1013 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -1.8896484 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1011 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1013 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -0.9658203 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1012 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1013 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -1.8896484 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1016 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1013 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -0.9658203 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1024 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1003 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 1.8896484 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 993 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1003 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 1.8896484 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 994 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1003 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0.9658203 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 998 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1003 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0.9658203 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1000 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1003 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0.9658203 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1004 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1003 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0.9658203 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1007 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1003 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0.9658203 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1010 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1003 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0.9658203 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1011 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1003 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0.9658203 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1012 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 1003 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0.9658203 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1022 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: 0 + m_MarkToBaseAdjustmentRecords: [] + m_MarkToMarkAdjustmentRecords: [] + m_ShouldReimportFontFeatures: 0 + m_FallbackFontAssetTable: [] m_FontWeightTable: - regularTypeface: {fileID: 0} italicTypeface: {fileID: 0} @@ -305,6 +679,33 @@ MonoBehaviour: boldSpacing: 7 italicStyle: 35 tabSize: 10 + m_fontInfo: + Name: Liberation Sans + PointSize: 86 + Scale: 1 + CharacterCount: 250 + LineHeight: 98.90625 + Baseline: 0 + Ascender: 77.84375 + CapHeight: 59.1875 + Descender: -18.21875 + CenterLine: 0 + SuperscriptOffset: 77.84375 + SubscriptOffset: -12.261719 + SubSize: 0.5 + Underline: -12.261719 + UnderlineThickness: 6.298828 + strikethrough: 23.675 + strikethroughThickness: 0 + TabWidth: 239.0625 + Padding: 9 + AtlasWidth: 1024 + AtlasHeight: 1024 + m_glyphInfoList: [] + m_KerningTable: + kerningPairs: [] + fallbackFontAssets: [] + atlas: {fileID: 0} --- !u!28 &28268798066460806 Texture2D: m_ObjectHideFlags: 0 @@ -315,17 +716,21 @@ Texture2D: m_ImageContentsHash: serializedVersion: 2 Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - serializedVersion: 2 - m_Width: 0 - m_Height: 0 - m_CompleteImageSize: 0 + m_IsAlphaChannelOptional: 0 + serializedVersion: 3 + m_Width: 1 + m_Height: 1 + m_CompleteImageSize: 1 + m_MipsStripped: 0 m_TextureFormat: 1 m_MipCount: 1 m_IsReadable: 1 + m_IsPreProcessed: 0 + m_IgnoreMipmapLimit: 0 + m_MipmapLimitGroupName: m_StreamingMipmaps: 0 m_StreamingMipmapsPriority: 0 + m_VTOnly: 0 m_AlphaIsTransparency: 0 m_ImageCount: 1 m_TextureDimension: 2 @@ -339,9 +744,11 @@ Texture2D: m_WrapW: 0 m_LightmapFormat: 0 m_ColorSpace: 0 - image data: 0 - _typelessdata: + m_PlatformBlob: + image data: 1 + _typelessdata: 00 m_StreamData: + serializedVersion: 2 offset: 0 size: 0 path: