From 77b979913eab21d61e44ba1c9ca5e5c2217095a6 Mon Sep 17 00:00:00 2001 From: SpoodyTheOne Date: Sat, 3 Feb 2024 21:22:37 +0100 Subject: [PATCH] Upgrade menu done --- .../Animations/UpgradeMenu/IdleAnimation.anim | 208 +++++++++- .../UpgradeMenu/UpgradeMenu.controller | 62 ++- Assets/Resources/Player1.prefab | 13 + Assets/Resources/Player2.prefab | 13 + Assets/Scenes/Bloody Mary.unity | 388 +++++++++--------- Assets/Scripts/Dust.mat | 2 +- Assets/Scripts/Upgrader.cs | 47 ++- Assets/UI/Cock/DiabloBlood.png | Bin 0 -> 4077 bytes Assets/UI/Cock/DiabloBlood.png.meta | 127 ++++++ Assets/UI/Cock/DiabloBloodLiquid.png | Bin 0 -> 7317 bytes Assets/UI/Cock/DiabloBloodLiquid.png.meta | 127 ++++++ Assets/UI/Cock/UpgradeMenuBackground.png | Bin 0 -> 12119 bytes Assets/UI/Cock/UpgradeMenuBackground.png.meta | 127 ++++++ 13 files changed, 902 insertions(+), 212 deletions(-) create mode 100644 Assets/UI/Cock/DiabloBlood.png create mode 100644 Assets/UI/Cock/DiabloBlood.png.meta create mode 100644 Assets/UI/Cock/DiabloBloodLiquid.png create mode 100644 Assets/UI/Cock/DiabloBloodLiquid.png.meta create mode 100644 Assets/UI/Cock/UpgradeMenuBackground.png create mode 100644 Assets/UI/Cock/UpgradeMenuBackground.png.meta diff --git a/Assets/Animations/UpgradeMenu/IdleAnimation.anim b/Assets/Animations/UpgradeMenu/IdleAnimation.anim index aa09e25..9c75a74 100644 --- a/Assets/Animations/UpgradeMenu/IdleAnimation.anim +++ b/Assets/Animations/UpgradeMenu/IdleAnimation.anim @@ -17,21 +17,221 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: 3dbbc9f9441d5b035b5fdc4f9085edf1, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 20a36e56b08f74bfb8cdab0654ed94d8, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: 3dbbc9f9441d5b035b5fdc4f9085edf1, type: 3} + attribute: m_Sprite + path: Upgrade1 + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 2 + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: 4c3db29da4fe86d18a0368babe86ef86, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 3c32ccfefc39485b7a2f91f2f1e7b34b, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: 4c3db29da4fe86d18a0368babe86ef86, type: 3} + attribute: m_Sprite + path: Upgrade2 + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 2 + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: 061876a38077ceba890248b417460242, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 41d8a42226ae6dae0879c308ad86817a, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: 061876a38077ceba890248b417460242, type: 3} + attribute: m_Sprite + path: Upgrade3 + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 2 + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: 0037c41d1b6149c84b61678e89dec4c8, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 26b5a2e3883e7221e869eba4c629571a, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: 0037c41d1b6149c84b61678e89dec4c8, type: 3} + attribute: m_Sprite + path: Upgrade4 + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 2 + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: b6c38edcdfdbef0ea8d4a4e5dd251a35, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 6a7362fdae8622ac9ba4806cf9fd66f9, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: b6c38edcdfdbef0ea8d4a4e5dd251a35, type: 3} + attribute: m_Sprite + path: Upgrade5 + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 2 + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: 2d0531172230fa8ac8dc27c2ab571458, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 0003f3e66f8995ebc9c3df40c957f9a8, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: 2d0531172230fa8ac8dc27c2ab571458, type: 3} + attribute: m_Sprite + path: Upgrade6 + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 2 + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: ffbe7bd179e5b5f6cb29ba280e429e3f, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 171c3a1543289b4eda2d95a32ef3d208, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: ffbe7bd179e5b5f6cb29ba280e429e3f, type: 3} + attribute: m_Sprite + path: Upgrade7 + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 2 + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: fdecacfc03d5a47ee8134731daecf4af, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: d0b5a636d892c76dd8e8234608e1c80e, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: fdecacfc03d5a47ee8134731daecf4af, type: 3} + attribute: m_Sprite + path: Upgrade8 + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 2 m_SampleRate: 60 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 2273252079 + attribute: 2015549526 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 511066965 + attribute: 2015549526 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 1769042883 + attribute: 2015549526 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4145407584 + attribute: 2015549526 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 2148718326 + attribute: 2015549526 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 421234508 + attribute: 2015549526 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 1847375834 + attribute: 2015549526 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4272138827 + attribute: 2015549526 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 21300000, guid: 3dbbc9f9441d5b035b5fdc4f9085edf1, type: 3} + - {fileID: 21300000, guid: 20a36e56b08f74bfb8cdab0654ed94d8, type: 3} + - {fileID: 21300000, guid: 3dbbc9f9441d5b035b5fdc4f9085edf1, type: 3} + - {fileID: 21300000, guid: 4c3db29da4fe86d18a0368babe86ef86, type: 3} + - {fileID: 21300000, guid: 3c32ccfefc39485b7a2f91f2f1e7b34b, type: 3} + - {fileID: 21300000, guid: 4c3db29da4fe86d18a0368babe86ef86, type: 3} + - {fileID: 21300000, guid: 061876a38077ceba890248b417460242, type: 3} + - {fileID: 21300000, guid: 41d8a42226ae6dae0879c308ad86817a, type: 3} + - {fileID: 21300000, guid: 061876a38077ceba890248b417460242, type: 3} + - {fileID: 21300000, guid: 0037c41d1b6149c84b61678e89dec4c8, type: 3} + - {fileID: 21300000, guid: 26b5a2e3883e7221e869eba4c629571a, type: 3} + - {fileID: 21300000, guid: 0037c41d1b6149c84b61678e89dec4c8, type: 3} + - {fileID: 21300000, guid: b6c38edcdfdbef0ea8d4a4e5dd251a35, type: 3} + - {fileID: 21300000, guid: 6a7362fdae8622ac9ba4806cf9fd66f9, type: 3} + - {fileID: 21300000, guid: b6c38edcdfdbef0ea8d4a4e5dd251a35, type: 3} + - {fileID: 21300000, guid: 2d0531172230fa8ac8dc27c2ab571458, type: 3} + - {fileID: 21300000, guid: 0003f3e66f8995ebc9c3df40c957f9a8, type: 3} + - {fileID: 21300000, guid: 2d0531172230fa8ac8dc27c2ab571458, type: 3} + - {fileID: 21300000, guid: ffbe7bd179e5b5f6cb29ba280e429e3f, type: 3} + - {fileID: 21300000, guid: 171c3a1543289b4eda2d95a32ef3d208, type: 3} + - {fileID: 21300000, guid: ffbe7bd179e5b5f6cb29ba280e429e3f, type: 3} + - {fileID: 21300000, guid: fdecacfc03d5a47ee8134731daecf4af, type: 3} + - {fileID: 21300000, guid: d0b5a636d892c76dd8e8234608e1c80e, type: 3} + - {fileID: 21300000, guid: fdecacfc03d5a47ee8134731daecf4af, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.35000002 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Animations/UpgradeMenu/UpgradeMenu.controller b/Assets/Animations/UpgradeMenu/UpgradeMenu.controller index 97768e4..fb47662 100644 --- a/Assets/Animations/UpgradeMenu/UpgradeMenu.controller +++ b/Assets/Animations/UpgradeMenu/UpgradeMenu.controller @@ -1,5 +1,53 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-8183638679423009581 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: IdleAnimation + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 7092c28a45e7f0f9aa29d627683da0b4, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-5494140864986254717 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -8183638679423009581} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 60, y: -70, z: 0} + m_EntryPosition: {x: 90, y: 180, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -8183638679423009581} --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -9,4 +57,16 @@ AnimatorController: m_Name: UpgradeMenu serializedVersion: 5 m_AnimatorParameters: [] - m_AnimatorLayers: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -5494140864986254717} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} diff --git a/Assets/Resources/Player1.prefab b/Assets/Resources/Player1.prefab index 27feb4a..c91e80c 100644 --- a/Assets/Resources/Player1.prefab +++ b/Assets/Resources/Player1.prefab @@ -189,6 +189,7 @@ GameObject: - component: {fileID: 3878447480781341932} - component: {fileID: 1749848915408613053} - component: {fileID: 1949941092232239315} + - component: {fileID: 1449424410418603396} m_Layer: 7 m_Name: Player1 m_TagString: Player @@ -341,3 +342,15 @@ MonoBehaviour: movement: {x: 0, y: 0} look: {x: 0, y: 0} whipAttack: 0 +--- !u!114 &1449424410418603396 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3120938410244321186} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b097a132c072b72fbc7808ebf263e52, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Resources/Player2.prefab b/Assets/Resources/Player2.prefab index 2c95419..060e4a5 100644 --- a/Assets/Resources/Player2.prefab +++ b/Assets/Resources/Player2.prefab @@ -189,6 +189,7 @@ GameObject: - component: {fileID: 3878447480781341932} - component: {fileID: 7071433868121438663} - component: {fileID: 1949941092232239315} + - component: {fileID: 7729933180365677331} m_Layer: 7 m_Name: Player2 m_TagString: Player @@ -341,3 +342,15 @@ MonoBehaviour: movement: {x: 0, y: 0} look: {x: 0, y: 0} whipAttack: 0 +--- !u!114 &7729933180365677331 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3120938410244321186} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b097a132c072b72fbc7808ebf263e52, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Scenes/Bloody Mary.unity b/Assets/Scenes/Bloody Mary.unity index 1a3523c..b0a9a83 100644 --- a/Assets/Scenes/Bloody Mary.unity +++ b/Assets/Scenes/Bloody Mary.unity @@ -363,7 +363,7 @@ MonoBehaviour: m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 100 + m_IntArgument: 10000 m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 @@ -483,103 +483,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3} ---- !u!1 &177158864 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 177158867} - - component: {fileID: 177158866} - - component: {fileID: 177158865} - m_Layer: 0 - m_Name: Triangle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &177158865 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 177158864} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6b097a132c072b72fbc7808ebf263e52, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!212 &177158866 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 177158864} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 7482667652216324306, guid: 75f5f34dc1b5347e0b8351032682f224, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &177158867 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 177158864} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.55, y: -2.32, 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 &185592108 GameObject: m_ObjectHideFlags: 0 @@ -683,6 +586,82 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &268970234 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 268970235} + - component: {fileID: 268970237} + - component: {fileID: 268970236} + m_Layer: 5 + m_Name: DiabloBlood + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &268970235 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 268970234} + 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: 383229109} + m_Father: {fileID: 1197965563} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 150, y: 150} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &268970236 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 268970234} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 92b791df6229fa882ab01fc4ec5e82d2, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 1 + m_FillAmount: 0 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &268970237 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 268970234} + m_CullTransparentMesh: 1 --- !u!1 &292249220 GameObject: m_ObjectHideFlags: 0 @@ -973,6 +952,81 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b69b92d72c7244443854899c4b700d9c, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &383229108 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 383229109} + - component: {fileID: 383229111} + - component: {fileID: 383229110} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &383229109 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 383229108} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 268970235} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &383229110 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 383229108} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 460eb439e506a884899dec7f7d98a082, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &383229111 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 383229108} + m_CullTransparentMesh: 1 --- !u!1 &538127010 GameObject: m_ObjectHideFlags: 0 @@ -1048,103 +1102,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 538127010} m_CullTransparentMesh: 1 ---- !u!1 &687809407 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 687809410} - - component: {fileID: 687809409} - - component: {fileID: 687809408} - m_Layer: 0 - m_Name: Triangle (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &687809408 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 687809407} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6b097a132c072b72fbc7808ebf263e52, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!212 &687809409 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 687809407} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 7482667652216324306, guid: 75f5f34dc1b5347e0b8351032682f224, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &687809410 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 687809407} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.55, y: 2.49, 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 &761043861 GameObject: m_ObjectHideFlags: 0 @@ -1341,11 +1298,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ae39a1b1f810ba7a5bcfe4290cc2bbd6, type: 3} m_Name: m_EditorClassIdentifier: - numParticles: 100000 + numParticles: 1000000 bloodCompute: {fileID: 7200000, guid: 99867deda8cf464cd87542adcc3c08f2, type: 3} mesh: {fileID: 6466198060863859617, guid: 803eb7ed90ad4b9388c2563597bd6db2, type: 3} instancedMaterial: {fileID: 2100000, guid: 0d09c46ae354e8c49b2688cc4325b256, type: 2} - size: 0.22 + size: 0.05 scoreMult: 1 activeParticles: 0 score: 0 @@ -1353,7 +1310,7 @@ MonoBehaviour: squeakPlayer: {fileID: 1199570139} splatterVolume: 0 splatterPlayer: {fileID: 1068354139} - CleanRadius: 0 + CleanRadius: 2 bufferLookPointer: 0 --- !u!4 &1068354138 Transform: @@ -1478,6 +1435,7 @@ GameObject: - component: {fileID: 1197965565} - component: {fileID: 1197965564} - component: {fileID: 1197965566} + - component: {fileID: 1197965567} m_Layer: 5 m_Name: MenuForUpgrades m_TagString: Untagged @@ -1505,13 +1463,14 @@ RectTransform: - {fileID: 1487077136} - {fileID: 292249221} - {fileID: 538127011} + - {fileID: 268970235} - {fileID: 1208295405} - {fileID: 761043862} m_Father: {fileID: 185592112} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 125, y: 125} + m_AnchoredPosition: {x: 150, y: 150} m_SizeDelta: {x: 250, y: 250} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1197965564 @@ -1534,7 +1493,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 21300000, guid: 511830d939da6620a9dfbaba9ceb7938, type: 3} m_Type: 3 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1574,7 +1533,30 @@ MonoBehaviour: healthIncrease: 1.1 damageIncrease: 1.1 bloodIncrease: 1.1 - upgradeCost: 10000 + reelIncrease: 1.1 + upgradeCost: 100000 + BloodMeter: {fileID: 268970236} +--- !u!95 &1197965567 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1197965562} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 7866120a2d012ae3db02cdb779b1ea00, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &1199570134 GameObject: m_ObjectHideFlags: 0 @@ -1834,7 +1816,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1208295404} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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 @@ -2261,8 +2243,6 @@ SceneRoots: - {fileID: 1068354138} - {fileID: 185592112} - {fileID: 1311093282} - - {fileID: 177158867} - - {fileID: 687809410} - {fileID: 1456945068} - {fileID: 116792196} - {fileID: 340355508} diff --git a/Assets/Scripts/Dust.mat b/Assets/Scripts/Dust.mat index 9430376..11127cf 100644 --- a/Assets/Scripts/Dust.mat +++ b/Assets/Scripts/Dust.mat @@ -78,6 +78,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.8490566, g: 0.18431373, b: 0.16862746, a: 0.24705882} + - _Color: {r: 0.8301887, g: 0.15299344, b: 0.13705944, a: 0.4627451} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Scripts/Upgrader.cs b/Assets/Scripts/Upgrader.cs index 15f6bc4..87d460f 100644 --- a/Assets/Scripts/Upgrader.cs +++ b/Assets/Scripts/Upgrader.cs @@ -56,6 +56,10 @@ public class Upgrader : MonoBehaviour private Image[] upgradeImages = new Image[8]; + private bool prevCouldUpgrade = true; + + public Image BloodMeter; + // Start is called before the first frame update void Start() { @@ -78,12 +82,14 @@ public class Upgrader : MonoBehaviour // Debug.Log("Found " + idx + " upgrades"); upgrades = new Upgrades(); + + StartCoroutine(updateBloodMeter()); } bool canUpgrade() { - // return bloodManager.score >= upgradeCost; - return true; + return bloodManager.score >= upgradeCost; + // return true; } int getRegion(float x, float y, int regions) @@ -107,6 +113,18 @@ public class Upgrader : MonoBehaviour if (canUpgrade()) { + if (!prevCouldUpgrade) + { + background.color = Color.white; + foreach (Image i in upgradeImages) + { + i.color = Color.white; + } + + Player1Cursor.gameObject.SetActive(true); + Player2Cursor.gameObject.SetActive(true); + } + int p1a = getRegion(Player1Input.look.x, Player1Input.look.y, 8); int p2a = getRegion(Player2Input.look.x, Player2Input.look.y, 8); @@ -143,6 +161,7 @@ public class Upgrader : MonoBehaviour break; } + // Subtract blood bloodManager.score -= upgradeCost; acceptTime = 0f; } @@ -172,9 +191,22 @@ public class Upgrader : MonoBehaviour // background.fillAmount = 0f; } } + else if (prevCouldUpgrade) + { + background.color = Color.gray; + foreach (Image i in upgradeImages) + { + i.color = Color.gray; + } + + Player1Cursor.gameObject.SetActive(false); + Player2Cursor.gameObject.SetActive(false); + } Player1Cursor.localPosition = Player1Input.look.normalized * (125 - 12); Player2Cursor.localPosition = Player2Input.look.normalized * (125 - 12); + + prevCouldUpgrade = canUpgrade(); } /// Increases mop radius by 10% @@ -229,4 +261,15 @@ public class Upgrader : MonoBehaviour upgrades.reelUpgrade.amount++; } + IEnumerator updateBloodMeter() { + while (true) { + yield return new WaitForSeconds(0.5f); + + BloodMeter.fillAmount = ((float)bloodManager.score)/((float)upgradeCost); + } + + // dont care + yield return null; + } + } diff --git a/Assets/UI/Cock/DiabloBlood.png b/Assets/UI/Cock/DiabloBlood.png new file mode 100644 index 0000000000000000000000000000000000000000..0fa221e7cedaf82756c711b5a7620436b356d46e GIT binary patch literal 4077 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 literal 0 HcmV?d00001 diff --git a/Assets/UI/Cock/DiabloBlood.png.meta b/Assets/UI/Cock/DiabloBlood.png.meta new file mode 100644 index 0000000..a6d721c --- /dev/null +++ b/Assets/UI/Cock/DiabloBlood.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 460eb439e506a884899dec7f7d98a082 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UI/Cock/DiabloBloodLiquid.png b/Assets/UI/Cock/DiabloBloodLiquid.png new file mode 100644 index 0000000000000000000000000000000000000000..02a965bce5cfdd67cd9e3ad60a782e240662e887 GIT binary patch literal 7317 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 literal 0 HcmV?d00001 diff --git a/Assets/UI/Cock/DiabloBloodLiquid.png.meta b/Assets/UI/Cock/DiabloBloodLiquid.png.meta new file mode 100644 index 0000000..f7051dd --- /dev/null +++ b/Assets/UI/Cock/DiabloBloodLiquid.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 92b791df6229fa882ab01fc4ec5e82d2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UI/Cock/UpgradeMenuBackground.png b/Assets/UI/Cock/UpgradeMenuBackground.png new file mode 100644 index 0000000000000000000000000000000000000000..0a302db2857699f872b972de4fed0528b7c07de4 GIT binary patch literal 12119 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