diff --git a/Assets/Models/GunParts/enlarger.fbx b/Assets/Models/GunParts/enlarger.fbx new file mode 100644 index 000000000..d2016be74 Binary files /dev/null and b/Assets/Models/GunParts/enlarger.fbx differ diff --git a/Assets/Models/GunParts/enlarger.fbx.meta b/Assets/Models/GunParts/enlarger.fbx.meta new file mode 100644 index 000000000..8cf4df5e2 --- /dev/null +++ b/Assets/Models/GunParts/enlarger.fbx.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 5523b592edc638e439fe26cdeebe8b79 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 0.3 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 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: 0.003 + 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/GunParts/EnlargerExtension.prefab b/Assets/Prefabs/GunParts/EnlargerExtension.prefab new file mode 100644 index 000000000..8a104d7e2 --- /dev/null +++ b/Assets/Prefabs/GunParts/EnlargerExtension.prefab @@ -0,0 +1,208 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2011919946570164602 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5729402012261899082} + m_Layer: 0 + m_Name: Midpoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5729402012261899082 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2011919946570164602} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.284} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8196151136836888530} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4320344545349446905 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 932626616956480431} + m_Layer: 0 + m_Name: Output + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &932626616956480431 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4320344545349446905} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.235} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8196151136836888530} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8350213044137146345 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8196151136836888530} + - component: {fileID: 7575752308601990708} + - component: {fileID: -1314935375335004500} + m_Layer: 0 + m_Name: EnlargerExtension + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8196151136836888530 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8350213044137146345} + 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: 932626616956480431} + - {fileID: 469324277024488818} + - {fileID: 5729402012261899082} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7575752308601990708 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8350213044137146345} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a7619e994087ad4383adf04a959152d, type: 3} + m_Name: + m_EditorClassIdentifier: + syncDirection: 0 + syncMode: 0 + syncInterval: 0 + statModifiers: + - name: ScreenShakeFactor + addition: 0.5 + multiplier: 0 + exponential: 1 + outputs: + - {fileID: 932626616956480431} + midpoint: {fileID: 5729402012261899082} + model: {fileID: 993201347869452232} +--- !u!114 &-1314935375335004500 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8350213044137146345} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 586f8df323151294a9220b1f0d464466, type: 3} + m_Name: + m_EditorClassIdentifier: + multiplier: 10 +--- !u!1001 &74844362063714969 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8196151136836888530} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 5523b592edc638e439fe26cdeebe8b79, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5523b592edc638e439fe26cdeebe8b79, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5523b592edc638e439fe26cdeebe8b79, type: 3} + propertyPath: m_LocalPosition.y + value: -0.053 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5523b592edc638e439fe26cdeebe8b79, type: 3} + propertyPath: m_LocalPosition.z + value: 0.245 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5523b592edc638e439fe26cdeebe8b79, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5523b592edc638e439fe26cdeebe8b79, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5523b592edc638e439fe26cdeebe8b79, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5523b592edc638e439fe26cdeebe8b79, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5523b592edc638e439fe26cdeebe8b79, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5523b592edc638e439fe26cdeebe8b79, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5523b592edc638e439fe26cdeebe8b79, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 5523b592edc638e439fe26cdeebe8b79, type: 3} + propertyPath: m_Name + value: enlarger + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5523b592edc638e439fe26cdeebe8b79, type: 3} +--- !u!4 &469324277024488818 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 5523b592edc638e439fe26cdeebe8b79, type: 3} + m_PrefabInstance: {fileID: 74844362063714969} + m_PrefabAsset: {fileID: 0} +--- !u!1 &993201347869452232 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 5523b592edc638e439fe26cdeebe8b79, type: 3} + m_PrefabInstance: {fileID: 74844362063714969} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/GunParts/EnlargerExtension.prefab.meta b/Assets/Prefabs/GunParts/EnlargerExtension.prefab.meta new file mode 100644 index 000000000..3b2d02c96 --- /dev/null +++ b/Assets/Prefabs/GunParts/EnlargerExtension.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d8f93281ab4bd2e4f81843b1efc466e0 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Menu.unity b/Assets/Scenes/Menu.unity index 5de1f5a93..8717fb18c 100644 --- a/Assets/Scenes/Menu.unity +++ b/Assets/Scenes/Menu.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 785370674} - m_IndirectSpecularColor: {r: 0.062518954, g: 0.2194095, b: 0.49505043, a: 1} + m_IndirectSpecularColor: {r: 0.062317036, g: 0.21927114, b: 0.4949812, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -312,6 +312,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 3717336014748129540, guid: 0e2ad36662a02c3488301a5286b27635, type: 3} + propertyPath: extensions.Array.size + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3717336014748129540, guid: 0e2ad36662a02c3488301a5286b27635, type: 3} + propertyPath: extensions.Array.data[8] + value: + objectReference: {fileID: 11400000, guid: 1e8a76909fc7b284dae3c37ebcf4d7ce, type: 2} - target: {fileID: 8579357797008554893, guid: 0e2ad36662a02c3488301a5286b27635, type: 3} propertyPath: m_Name value: StaticInfo @@ -414,8 +422,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_RenderShadows: 1 m_RequiresDepthTextureOption: 2 m_RequiresOpaqueTextureOption: 2 @@ -593,8 +601,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_RenderShadows: 1 m_RequiresDepthTextureOption: 2 m_RequiresOpaqueTextureOption: 2 @@ -659,8 +667,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 933018b00f773bb4ea9ceabb5df6a3a9, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: mainMenuCamera: {fileID: 378774845} playerSelectCamera: {fileID: 1383999237} cameraSpeed: 2 @@ -677,8 +685,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6ec37dac7d9c0ad4e823f38c85e24902, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: mainMenuController: {fileID: 8419046673555529007} backButton: {fileID: 828086914} startButton: {fileID: 388277150} @@ -697,8 +705,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!1001 &407123066 PrefabInstance: m_ObjectHideFlags: 0 @@ -831,7 +839,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 537a3efaafb0bf4408b7d5ccfcac743c, type: 3} propertyPath: m_Materials.Array.data[0] - value: + value: objectReference: {fileID: 2100000, guid: 1f1ef69acf7fa6b40bbfa8083bec361f, type: 2} - target: {fileID: 919132149155446097, guid: 537a3efaafb0bf4408b7d5ccfcac743c, type: 3} propertyPath: m_Name @@ -1046,8 +1054,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 @@ -1069,8 +1077,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 324782eef0e82f446be6d39bd6d24713, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: RotationDegrees: 360 RotationSeconds: 360 --- !u!4 &808339425 stripped @@ -1087,8 +1095,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!1001 &895649794 PrefabInstance: m_ObjectHideFlags: 0 @@ -1509,8 +1517,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: b7bcd74fcf9f65c439f08a0a59ed3e44, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!1 &1383999234 GameObject: m_ObjectHideFlags: 0 @@ -1540,8 +1548,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_RenderShadows: 1 m_RequiresDepthTextureOption: 2 m_RequiresOpaqueTextureOption: 2 @@ -2182,7 +2190,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 0349ef12d65cfa54799cef9709f40e28, type: 3} propertyPath: m_Materials.Array.data[0] - value: + value: objectReference: {fileID: 2100000, guid: cbae30653277c8e4380c7fae9aaa588e, type: 2} - target: {fileID: 919132149155446097, guid: 0349ef12d65cfa54799cef9709f40e28, type: 3} propertyPath: m_Name @@ -2378,11 +2386,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 2698465425326294015, guid: 0a7636e90947ac3439eb8a8f3e353425, type: 3} propertyPath: target - value: + value: objectReference: {fileID: 378774848} - target: {fileID: 2698465425326294015, guid: 0a7636e90947ac3439eb8a8f3e353425, type: 3} propertyPath: terrain - value: + value: objectReference: {fileID: 145742579} - target: {fileID: 8171113434969258131, guid: 0a7636e90947ac3439eb8a8f3e353425, type: 3} propertyPath: m_RootOrder @@ -2447,7 +2455,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 2946718800728160598, guid: 025aeacc91556754b8e3da18f5bd92bc, type: 3} propertyPath: playerSelectCam - value: + value: objectReference: {fileID: 1383999237} - target: {fileID: 3757890460894914408, guid: 025aeacc91556754b8e3da18f5bd92bc, type: 3} propertyPath: m_RootOrder @@ -2712,11 +2720,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 816133132157019055, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target - value: + value: objectReference: {fileID: 378774849} - target: {fileID: 816133132157019055, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Target - value: + value: objectReference: {fileID: 1372750352} - target: {fileID: 947967702778676497, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_AnchorMax.y @@ -2752,23 +2760,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1098348358083011975, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: sun - value: + value: objectReference: {fileID: 785370678} - target: {fileID: 1098348358083011975, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: mainMenuCamera - value: + value: objectReference: {fileID: 378774844} - target: {fileID: 1098348358083011975, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: videoPlayerCamera - value: + value: objectReference: {fileID: 284847886} - target: {fileID: 1098348358083011975, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: levelSelectManager - value: + value: objectReference: {fileID: 378774850} - target: {fileID: 1098348358083011975, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: playerSelectManager - value: + value: objectReference: {fileID: 1372750352} - target: {fileID: 1124255533408166699, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_AnchorMax.y @@ -3012,11 +3020,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2124729450309266082, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target - value: + value: objectReference: {fileID: 378774849} - target: {fileID: 2124729450309266082, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Target - value: + value: objectReference: {fileID: 1372750352} - target: {fileID: 2130402793934808804, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_AnchorMax.y @@ -3092,7 +3100,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2462699860172230231, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_Camera - value: + value: objectReference: {fileID: 378774845} - target: {fileID: 2542661620893477752, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_AnchorMax.y @@ -3120,19 +3128,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2878829664369250595, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target - value: + value: objectReference: {fileID: 378774849} - target: {fileID: 2878829664369250595, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Target - value: + value: objectReference: {fileID: 1372750352} - target: {fileID: 2987257829632184135, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target - value: + value: objectReference: {fileID: 378774849} - target: {fileID: 2987257829632184135, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Target - value: + value: objectReference: {fileID: 1372750352} - target: {fileID: 3168330241720235284, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_AnchorMax.y @@ -3160,11 +3168,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3294217757467144596, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target - value: + value: objectReference: {fileID: 378774849} - target: {fileID: 3294217757467144596, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Target - value: + value: objectReference: {fileID: 1372750352} - target: {fileID: 3977087451557504359, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_AnchorMax.y @@ -3216,11 +3224,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4018858951849858731, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_TargetCamera - value: + value: objectReference: {fileID: 284847890} - target: {fileID: 4071540528866138580, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target - value: + value: objectReference: {fileID: 378774849} - target: {fileID: 4239541196560821539, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_AnchorMax.y @@ -3272,15 +3280,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4448356365674713062, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target - value: + value: objectReference: {fileID: 378774849} - target: {fileID: 4448356365674713062, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Target - value: + value: objectReference: {fileID: 1372750352} - target: {fileID: 4464366069592894460, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Target - value: + value: objectReference: {fileID: 378774849} - target: {fileID: 4508513109957129390, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_AnchorMax.x @@ -3360,11 +3368,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4783037583379668445, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target - value: + value: objectReference: {fileID: 378774849} - target: {fileID: 4833381458767646314, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target - value: + value: objectReference: {fileID: 378774849} - target: {fileID: 4871041439918297700, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_AnchorMax.y @@ -3560,7 +3568,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5921977457797426374, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target - value: + value: objectReference: {fileID: 378774849} - target: {fileID: 5996269715136810480, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_AnchorMax.y @@ -3588,7 +3596,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6072983736163556088, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target - value: + value: objectReference: {fileID: 378774849} - target: {fileID: 6108092178850750761, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_AnchorMax.y @@ -3844,7 +3852,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7502603491603641025, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: + value: objectReference: {fileID: 378774849} - target: {fileID: 7587497343910360382, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_AnchorMax.y @@ -4184,11 +4192,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8884802138192377770, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target - value: + value: objectReference: {fileID: 378774849} - target: {fileID: 8884802138192377770, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Target - value: + value: objectReference: {fileID: 1372750352} - target: {fileID: 9191732877050328252, guid: cbf30f348674af6ecb2ba42ec2aacaf6, type: 3} propertyPath: m_AnchorMax.y @@ -4208,5 +4216,5 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4b5c1573441f904429ca01beb1ebfdd1, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/ScriptableObjects/Items/EnlargerExtension.asset b/Assets/ScriptableObjects/Items/EnlargerExtension.asset new file mode 100644 index 000000000..70607bf2b --- /dev/null +++ b/Assets/ScriptableObjects/Items/EnlargerExtension.asset @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d766409d2bfa0674da668e696cd73b7b, type: 3} + m_Name: EnlargerExtension + m_EditorClassIdentifier: + id: Enlarger + displayName: Enlarger + secretName: + displayDescription: What if you're bullets were *bigger* + extendedDescription: + loreDescription: + augmentType: 2 + augment: {fileID: 8350213044137146345, guid: d8f93281ab4bd2e4f81843b1efc466e0, type: 3} diff --git a/Assets/ScriptableObjects/Items/EnlargerExtension.asset.meta b/Assets/ScriptableObjects/Items/EnlargerExtension.asset.meta new file mode 100644 index 000000000..f15c7890b --- /dev/null +++ b/Assets/ScriptableObjects/Items/EnlargerExtension.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1e8a76909fc7b284dae3c37ebcf4d7ce +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Augment/BulletModifiers/ProjectileEnlarger.cs b/Assets/Scripts/Augment/BulletModifiers/ProjectileEnlarger.cs new file mode 100644 index 000000000..3ea7a043d --- /dev/null +++ b/Assets/Scripts/Augment/BulletModifiers/ProjectileEnlarger.cs @@ -0,0 +1,26 @@ +using System.Collections; +using System.Collections.Generic; +using System.Net.NetworkInformation; +using UnityEngine; + +public class ProjectileEnlarger : MonoBehaviour, ProjectileModifier +{ + public float multiplier = 3f; + + public void Scale(ref ProjectileState state, GunStats stats) + { + float relativeDistance = state.distanceTraveled / state.maxDistance; + state.size = state.size * multiplier * (1-1/(1+relativeDistance)); + Debug.Log(relativeDistance); + + } + public void Attach(ProjectileController projectile) + { + projectile.OnProjectileInit += Scale; + } + + public void Detach(ProjectileController projectile) + { + projectile.OnProjectileInit -= Scale; + } +} diff --git a/Assets/Scripts/Augment/BulletModifiers/ProjectileEnlarger.cs.meta b/Assets/Scripts/Augment/BulletModifiers/ProjectileEnlarger.cs.meta new file mode 100644 index 000000000..70020e97b --- /dev/null +++ b/Assets/Scripts/Augment/BulletModifiers/ProjectileEnlarger.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 586f8df323151294a9220b1f0d464466 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: