diff --git a/Assets/Artifacts/Sprites/Other/Player Indication.meta b/Assets/Artifacts/Sprites/Other/Player Indication.meta new file mode 100644 index 0000000..9a56ff8 --- /dev/null +++ b/Assets/Artifacts/Sprites/Other/Player Indication.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0017474de88684d92b1a05a4000550ee +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Artifacts/Sprites/Other/Player Indication/Player Count.controller b/Assets/Artifacts/Sprites/Other/Player Indication/Player Count.controller new file mode 100644 index 0000000..747c9fa --- /dev/null +++ b/Assets/Artifacts/Sprites/Other/Player Indication/Player Count.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-2545934288178809719 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PlayerIndication_anim + 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: 51b02f31ecde547eebbafa571745a246, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-672237964412992765 +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: -2545934288178809719} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -2545934288178809719} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Player Count + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -672237964412992765} + 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/Artifacts/Sprites/Other/Player Indication/Player Count.controller.meta b/Assets/Artifacts/Sprites/Other/Player Indication/Player Count.controller.meta new file mode 100644 index 0000000..118227e --- /dev/null +++ b/Assets/Artifacts/Sprites/Other/Player Indication/Player Count.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 75a4679d0223349d280cb4d1c51de929 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Artifacts/Sprites/Other/Player Indication/Player Indication Border.png b/Assets/Artifacts/Sprites/Other/Player Indication/Player Indication Border.png new file mode 100644 index 0000000..f62331c Binary files /dev/null and b/Assets/Artifacts/Sprites/Other/Player Indication/Player Indication Border.png differ diff --git a/Assets/Artifacts/Sprites/Other/Player Indication/Player Indication Border.png.meta b/Assets/Artifacts/Sprites/Other/Player Indication/Player Indication Border.png.meta new file mode 100644 index 0000000..7c35a77 --- /dev/null +++ b/Assets/Artifacts/Sprites/Other/Player Indication/Player Indication Border.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: e9d88b101d2ed46bd877d1bcb5ea1160 +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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 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: 0 + 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 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Artifacts/Sprites/Other/Player Indication/Player Indication FIll.png b/Assets/Artifacts/Sprites/Other/Player Indication/Player Indication FIll.png new file mode 100644 index 0000000..7b98085 Binary files /dev/null and b/Assets/Artifacts/Sprites/Other/Player Indication/Player Indication FIll.png differ diff --git a/Assets/Artifacts/Sprites/Other/Player Indication/Player Indication FIll.png.meta b/Assets/Artifacts/Sprites/Other/Player Indication/Player Indication FIll.png.meta new file mode 100644 index 0000000..bdd8c3a --- /dev/null +++ b/Assets/Artifacts/Sprites/Other/Player Indication/Player Indication FIll.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 1d36c9b9ea1804a01987f56b706af9af +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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 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: 0 + 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 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Artifacts/Sprites/Other/Player Indication/PlayerIndication_anim.anim b/Assets/Artifacts/Sprites/Other/Player Indication/PlayerIndication_anim.anim new file mode 100644 index 0000000..73b7244 --- /dev/null +++ b/Assets/Artifacts/Sprites/Other/Player Indication/PlayerIndication_anim.anim @@ -0,0 +1,205 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PlayerIndication_anim + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1, y: 1, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.33333334 + value: {x: 1.3, y: 1.3, z: 1.3} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6666667 + value: {x: 1, y: 1, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_FloatCurves: [] + m_PPtrCurves: [] + 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: + - serializedVersion: 2 + path: 0 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.6666667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 1.3 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 1.3 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 1.3 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: + classID: 224 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Artifacts/Sprites/Other/Player Indication/PlayerIndication_anim.anim.meta b/Assets/Artifacts/Sprites/Other/Player Indication/PlayerIndication_anim.anim.meta new file mode 100644 index 0000000..9f3f05b --- /dev/null +++ b/Assets/Artifacts/Sprites/Other/Player Indication/PlayerIndication_anim.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 51b02f31ecde547eebbafa571745a246 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Characters/Pirate (Blue).prefab b/Assets/Prefabs/Characters/Pirate (Blue).prefab index b1ec69b..5de5529 100644 --- a/Assets/Prefabs/Characters/Pirate (Blue).prefab +++ b/Assets/Prefabs/Characters/Pirate (Blue).prefab @@ -1593,7 +1593,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 953143927943285832, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} propertyPath: m_AnchoredPosition.y - value: 2.239 + value: 2.6 objectReference: {fileID: 0} - target: {fileID: 953143927943285832, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1607,6 +1607,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1334714064113256010, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1708578341718423809, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} propertyPath: m_TargetGraphic value: diff --git a/Assets/Prefabs/Characters/Pirate (Green).prefab b/Assets/Prefabs/Characters/Pirate (Green).prefab index 7ea2e43..7d00a6c 100644 --- a/Assets/Prefabs/Characters/Pirate (Green).prefab +++ b/Assets/Prefabs/Characters/Pirate (Green).prefab @@ -1579,18 +1579,6 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 953143927943285832, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 953143927943285832, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 953143927943285832, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - target: {fileID: 953143927943285832, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -1625,7 +1613,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 953143927943285832, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} propertyPath: m_AnchoredPosition.y - value: 2.239 + value: 2.6 objectReference: {fileID: 0} - target: {fileID: 953143927943285832, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1639,6 +1627,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1334714064113256010, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1708578341718423809, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} propertyPath: m_TargetGraphic value: diff --git a/Assets/Prefabs/Characters/Pirate (Grey).prefab b/Assets/Prefabs/Characters/Pirate (Grey).prefab index eb26cab..4ed09d5 100644 --- a/Assets/Prefabs/Characters/Pirate (Grey).prefab +++ b/Assets/Prefabs/Characters/Pirate (Grey).prefab @@ -1579,18 +1579,6 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 953143927943285832, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 953143927943285832, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 953143927943285832, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - target: {fileID: 953143927943285832, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -1625,7 +1613,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 953143927943285832, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} propertyPath: m_AnchoredPosition.y - value: 2.239 + value: 2.6 objectReference: {fileID: 0} - target: {fileID: 953143927943285832, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1639,6 +1627,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1334714064113256010, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1708578341718423809, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} propertyPath: m_TargetGraphic value: diff --git a/Assets/Prefabs/Characters/Pirate (Red).prefab b/Assets/Prefabs/Characters/Pirate (Red).prefab index f56a406..2d319ee 100644 --- a/Assets/Prefabs/Characters/Pirate (Red).prefab +++ b/Assets/Prefabs/Characters/Pirate (Red).prefab @@ -1593,7 +1593,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 953143927943285832, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} propertyPath: m_AnchoredPosition.y - value: 2.239 + value: 2.6 objectReference: {fileID: 0} - target: {fileID: 953143927943285832, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1607,6 +1607,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1334714064113256010, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1708578341718423809, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} propertyPath: m_TargetGraphic value: diff --git a/Assets/Prefabs/UI/Canvas - World.prefab b/Assets/Prefabs/UI/Canvas - World.prefab index 80901ba..b7cf742 100644 --- a/Assets/Prefabs/UI/Canvas - World.prefab +++ b/Assets/Prefabs/UI/Canvas - World.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 65645560966781747} - component: {fileID: 2858063052804912079} - component: {fileID: 8752947010238866161} + - component: {fileID: 130026720339915370} m_Layer: 5 m_Name: Player Count m_TagString: Untagged @@ -28,7 +29,7 @@ RectTransform: 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_ConstrainProportionsScale: 1 m_Children: - {fileID: 8089047016482236660} - {fileID: 6813413954384782979} @@ -37,8 +38,8 @@ RectTransform: 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_AnchoredPosition: {x: 0, y: 0.1} + m_SizeDelta: {x: -0.40000004, y: -0.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2858063052804912079 CanvasRenderer: @@ -68,7 +69,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d683a4be9f87743d3b78b0b8761f8f1a, type: 3} + m_Sprite: {fileID: 21300000, guid: 1d36c9b9ea1804a01987f56b706af9af, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -78,6 +79,27 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!95 &130026720339915370 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1950433650452808236} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 75a4679d0223349d280cb4d1c51de929, 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 &3121570579764810185 GameObject: m_ObjectHideFlags: 0 @@ -113,8 +135,8 @@ RectTransform: 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.014999993} - m_SizeDelta: {x: 0.030000001, y: 0.000000013969839} + m_AnchoredPosition: {x: 0, y: -0.006000042} + m_SizeDelta: {x: 0, y: 0.012} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6912280764899309526 CanvasRenderer: @@ -144,7 +166,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: af3141ba5ffc841798e2e04325a2bc4a, type: 3} + m_Sprite: {fileID: 21300000, guid: e9d88b101d2ed46bd877d1bcb5ea1160, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -176,7 +198,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &953143927943285832 RectTransform: m_ObjectHideFlags: 0 @@ -186,7 +208,7 @@ RectTransform: m_GameObject: {fileID: 4879164135252893718} 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_LocalScale: {x: 1.3, y: 1.7, z: 2} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 65645560966781747} @@ -195,7 +217,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 8.79} + m_AnchoredPosition: {x: 0, y: 9} m_SizeDelta: {x: 1, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &5587250865659051320 @@ -242,7 +264,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 + m_PresetInfoIsWorld: 0 --- !u!114 &2739169735767897497 MonoBehaviour: m_ObjectHideFlags: 0 @@ -323,7 +345,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 6293990703772930473} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -374,7 +396,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6813413954384782979 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 3f46e9a..e1159dd 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -1264,6 +1264,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7994886322184003359, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8499714619200364116, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 12.69047 @@ -1603,6 +1607,10 @@ PrefabInstance: propertyPath: m_Name value: Pirate (Grey) (4) objectReference: {fileID: 0} + - target: {fileID: 8742875858490740670, guid: d26746f94e9bc44998992db177b0926d, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d26746f94e9bc44998992db177b0926d, type: 3} --- !u!1 &86529552 @@ -1933,6 +1941,10 @@ PrefabInstance: propertyPath: m_Name value: Pirate (Grey) (2) objectReference: {fileID: 0} + - target: {fileID: 8742875858490740670, guid: d26746f94e9bc44998992db177b0926d, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d26746f94e9bc44998992db177b0926d, type: 3} --- !u!1 &136321829 @@ -3577,6 +3589,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1841959051} m_Modifications: + - target: {fileID: 3205706632183164804, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4643894104949937496, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3} propertyPath: m_Name value: Pirate (Blue) (2) @@ -5049,6 +5065,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1094154913} m_Modifications: + - target: {fileID: 1011126093537271578, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5040387473618948274, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3} propertyPath: m_Name value: Pirate (Green) (2) @@ -5308,6 +5328,10 @@ PrefabInstance: propertyPath: m_Name value: Pirate (Grey) (3) objectReference: {fileID: 0} + - target: {fileID: 8742875858490740670, guid: d26746f94e9bc44998992db177b0926d, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d26746f94e9bc44998992db177b0926d, type: 3} --- !u!1 &543219273 @@ -5467,6 +5491,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1841959051} m_Modifications: + - target: {fileID: 3205706632183164804, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4643894104949937496, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3} propertyPath: m_Name value: Pirate (Blue) (4) @@ -7792,6 +7820,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7994886322184003359, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3} --- !u!1 &833894784 @@ -8690,6 +8722,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -0.022962524 objectReference: {fileID: 0} + - target: {fileID: 3205706632183164804, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3355085080137322900, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 72.00588 @@ -11098,6 +11134,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7994886322184003359, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8499714619200364116, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 3.9168587 @@ -13218,6 +13258,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1094154913} m_Modifications: + - target: {fileID: 1011126093537271578, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5040387473618948274, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3} propertyPath: m_Name value: Pirate (Green) (4) @@ -15003,6 +15047,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1841959051} m_Modifications: + - target: {fileID: 3205706632183164804, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4643894104949937496, guid: d464472cfaa7a45ca9d11bc25d05e025, type: 3} propertyPath: m_Name value: Pirate (Blue) (3) @@ -15793,6 +15841,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1094154913} m_Modifications: + - target: {fileID: 1011126093537271578, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5040387473618948274, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3} propertyPath: m_Name value: Pirate (Green) (3) @@ -17588,6 +17640,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7994886322184003359, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b90e5cd95dff44f94b9151a2e535a0f8, type: 3} --- !u!1001 &1763545631 @@ -21716,6 +21772,10 @@ PrefabInstance: propertyPath: m_Name value: Pirate (Grey) (1) objectReference: {fileID: 0} + - target: {fileID: 8742875858490740670, guid: d26746f94e9bc44998992db177b0926d, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d26746f94e9bc44998992db177b0926d, type: 3} --- !u!1 &1835930482367990250 @@ -27747,6 +27807,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1094154913} m_Modifications: + - target: {fileID: 1011126093537271578, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5040387473618948274, guid: 4dc45edb05c8f4268aebcd5e9cbac783, type: 3} propertyPath: m_Name value: Pirate (Green) (1)