diff --git a/BlueWater/Assets/01.Scenes/02.Main.unity b/BlueWater/Assets/01.Scenes/02.Main.unity index 1b695a13d..c3e4920a5 100644 --- a/BlueWater/Assets/01.Scenes/02.Main.unity +++ b/BlueWater/Assets/01.Scenes/02.Main.unity @@ -22873,7 +22873,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 776161953} serializedVersion: 2 - m_LocalRotation: {x: 0.22984377, y: -0.37065172, z: 0.09520439, w: 0.89483255} + m_LocalRotation: {x: 0.22984378, y: -0.37065178, z: 0.09520443, w: 0.89483255} m_LocalPosition: {x: 14.255273, y: -988, z: -6.505382} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -23460,7 +23460,6 @@ GameObject: - component: {fileID: 796205771} - component: {fileID: 796205770} - component: {fileID: 796205769} - - component: {fileID: 796205772} m_Layer: 0 m_Name: cm m_TagString: Untagged @@ -23544,23 +23543,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &796205772 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 796205767} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 68bb026fafb42b14791938953eaace77, type: 3} - m_Name: - m_EditorClassIdentifier: - m_NoiseProfile: {fileID: 11400000, guid: 69ce8388f6785dd4c8c39915efece2f4, type: 2} - m_PivotOffset: {x: 11, y: 11, z: 11} - m_AmplitudeGain: 1 - m_FrequencyGain: 1 - mNoiseOffsets: {x: 0, y: 0, z: 0} --- !u!4 &797156729 Transform: m_ObjectHideFlags: 0 @@ -54201,6 +54183,8 @@ GameObject: m_Component: - component: {fileID: 1632226838} - component: {fileID: 1632226837} + - component: {fileID: 1632226840} + - component: {fileID: 1632226839} m_Layer: 0 m_Name: InShipCam m_TagString: Untagged @@ -54255,7 +54239,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1632226836} serializedVersion: 2 - m_LocalRotation: {x: 0.22984377, y: -0.37065172, z: 0.09520439, w: 0.89483255} + m_LocalRotation: {x: 0.22984378, y: -0.37065178, z: 0.09520443, w: 0.89483255} m_LocalPosition: {x: 51.55527, y: -990.68, z: -6.505382} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -54263,6 +54247,238 @@ Transform: - {fileID: 796205768} m_Father: {fileID: 649179607} m_LocalEulerAnglesHint: {x: 32.2, y: -45, z: 0} +--- !u!114 &1632226839 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1632226836} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6da43522623d4704e979466dc7650b65, type: 3} + m_Name: + m_EditorClassIdentifier: + Feedbacks: [] + InitializationMode: 2 + AutoInitialization: 1 + SafeMode: 3 + Direction: 0 + AutoChangeDirectionOnEnd: 0 + AutoPlayOnStart: 0 + AutoPlayOnEnable: 0 + ForceTimescaleMode: 0 + ForcedTimescaleMode: 1 + DurationMultiplier: 1 + RandomizeDuration: 0 + RandomDurationMultiplier: {x: 0.5, y: 1.5} + DisplayFullDurationDetails: 0 + PlayerTimescaleMode: 1 + OnlyPlayIfWithinRange: 0 + RangeCenter: {fileID: 0} + RangeDistance: 5 + UseRangeFalloff: 0 + RangeFalloff: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + RemapRangeFalloff: {x: 0, y: 1} + IgnoreRangeEvents: 0 + CooldownDuration: 0 + InitialDelay: 0 + CanPlay: 1 + CanPlayWhileAlreadyPlaying: 1 + ChanceToPlay: 100 + FeedbacksIntensity: 1 + Events: + TriggerMMFeedbacksEvents: 0 + TriggerUnityEvents: 1 + OnPlay: + m_PersistentCalls: + m_Calls: [] + OnPause: + m_PersistentCalls: + m_Calls: [] + OnResume: + m_PersistentCalls: + m_Calls: [] + OnRevert: + m_PersistentCalls: + m_Calls: [] + OnComplete: + m_PersistentCalls: + m_Calls: [] + OnRestoreInitialValues: + m_PersistentCalls: + m_Calls: [] + OnSkipToTheEnd: + m_PersistentCalls: + m_Calls: [] + DebugActive: 0 + FeedbacksList: + - rid: 4790737750857613322 + KeepPlayModeChanges: 0 + PerformanceMode: 0 + StopFeedbacksOnDisable: 0 + PlayCount: 0 + references: + version: 2 + RefIds: + - rid: 4790737750857613322 + type: {class: MMF_CinemachineImpulse, ns: MoreMountains.FeedbacksForThirdParty, + asm: MoreMountains.Feedbacks.Cinemachine} + data: + Active: 1 + UniqueID: -1070054105 + Label: Cinemachine Impulse + ChannelMode: 0 + Channel: 0 + MMChannelDefinition: {fileID: 0} + Chance: 100 + DisplayColor: {r: 0, g: 0, b: 0, a: 1} + Timing: + TimescaleMode: 0 + ExcludeFromHoldingPauses: 0 + ContributeToTotalDuration: 1 + InitialDelay: 0 + CooldownDuration: 0 + InterruptsOnStop: 1 + NumberOfRepeats: 0 + RepeatForever: 0 + DelayBetweenRepeats: 1 + MMFeedbacksDirectionCondition: 0 + PlayDirection: 0 + ConstantIntensity: 0 + UseIntensityInterval: 0 + IntensityIntervalMin: 0 + IntensityIntervalMax: 0 + Sequence: {fileID: 0} + TrackID: 0 + Quantized: 0 + TargetBPM: 120 + AutomatedTargetAcquisition: + Mode: 0 + ChildIndex: 0 + RandomizeOutput: 0 + RandomMultiplier: {x: 0.8, y: 1} + RandomizeDuration: 0 + RandomDurationMultiplier: {x: 0.5, y: 2} + UseRange: 0 + RangeDistance: 5 + UseRangeFalloff: 0 + RangeFalloff: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + RemapRangeFalloff: {x: 0, y: 1} + Owner: {fileID: 1632226839} + DebugActive: 0 + m_ImpulseDefinition: + m_ImpulseChannel: 1 + m_ImpulseShape: 0 + m_CustomImpulseShape: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_ImpulseDuration: 0.2 + m_ImpulseType: 3 + m_DissipationRate: 0 + m_RawSignal: {fileID: 11400000, guid: 69ce8388f6785dd4c8c39915efece2f4, + type: 2} + m_AmplitudeGain: 1 + m_FrequencyGain: 1 + m_RepeatMode: 0 + m_Randomize: 1 + m_TimeEnvelope: + m_AttackShape: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_DecayShape: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_AttackTime: 0 + m_SustainTime: 0.2 + m_DecayTime: 0.7 + m_ScaleWithImpact: 1 + m_HoldForever: 0 + m_ImpactRadius: 100 + m_DirectionMode: 0 + m_DissipationMode: 2 + m_DissipationDistance: 100 + m_PropagationSpeed: 343 + Velocity: {x: 0, y: 0, z: 0} + ClearImpulseOnStop: 0 +--- !u!114 &1632226840 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1632226836} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 00b2d199b96b516448144ab30fb26aed, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ApplyAfter: 2 + m_ChannelMask: 1 + m_Gain: 1 + m_Use2DDistance: 0 + m_UseCameraSpace: 1 + m_ReactionSettings: + m_SecondaryNoise: {fileID: 0} + m_AmplitudeGain: 1 + m_FrequencyGain: 1 + m_Duration: 1 + m_NoiseOffsets: {x: 0, y: 0, z: 0} --- !u!1001 &1635889634 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/BlueWater/Assets/02.Scripts/Props/BuildingObject.cs b/BlueWater/Assets/02.Scripts/Props/BuildingObject.cs index 89e35dc06..30754c157 100644 --- a/BlueWater/Assets/02.Scripts/Props/BuildingObject.cs +++ b/BlueWater/Assets/02.Scripts/Props/BuildingObject.cs @@ -2,6 +2,7 @@ using System; using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.UI; // ReSharper disable once CheckNamespace namespace BlueWaterProject @@ -9,22 +10,31 @@ namespace BlueWaterProject public class BuildingObject : MonoBehaviour { private SpriteRenderer spriteRenderer; - private int buildGauge; - private int buildGaugeMax; - // 게이지 프로세스바 - // 다지었는지 불값 + private Image progressBar; private void Awake() { - spriteRenderer = transform.Find("Object").GetComponent(); - buildGauge = 0; - buildGaugeMax = 100; + spriteRenderer = transform.parent.Find("Object").GetComponent(); + progressBar = transform.Find("Canvas/Radial Progress Bar/ProgressBar").GetComponent(); } //컬러를 회색, 알파는 0.8 //게이지 다채우면 컬러를 원래대로, 알파는 1로 + private void RevokeObjectColor() + { + spriteRenderer.color = Color.white; + } //게이지가 증가되는 메서드 <- 캐릭터가 버튼을 누르면 호출 + public void IncreaseProgressBar() + { + progressBar.fillAmount += .1f; + if (progressBar.fillAmount >= 1) + { + RevokeObjectColor(); + gameObject.SetActive(false); + } + } } } diff --git a/BlueWater/Assets/05.Prefabs/Props/InShipProps/Rumbbarrel.prefab b/BlueWater/Assets/05.Prefabs/Props/InShipProps/Rumbbarrel.prefab index 0b5557602..15b1958cc 100644 --- a/BlueWater/Assets/05.Prefabs/Props/InShipProps/Rumbbarrel.prefab +++ b/BlueWater/Assets/05.Prefabs/Props/InShipProps/Rumbbarrel.prefab @@ -1,5 +1,544 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2457463547947112502 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 207522703911156369} + - component: {fileID: 2422481134817691318} + - component: {fileID: 4358299703198865675} + m_Layer: 5 + m_Name: Border + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &207522703911156369 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2457463547947112502} + 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: 9059512775554440497} + 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!222 &2422481134817691318 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2457463547947112502} + m_CullTransparentMesh: 0 +--- !u!114 &4358299703198865675 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2457463547947112502} + 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: 0.36862746, g: 0.29411766, b: 0.28235295, 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: fe21d27a780b643f58f831ab19c5a69f, 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!1 &5776012964992457845 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7936158519186342602} + - component: {fileID: 4422468683828166332} + - component: {fileID: 5203642470345529887} + - component: {fileID: 8401181811675285096} + m_Layer: 21 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7936158519186342602 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5776012964992457845} + 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: 9059512775554440497} + m_Father: {fileID: 257386181886762579} + 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.75} + m_SizeDelta: {x: 5, y: 5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &4422468683828166332 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5776012964992457845} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: -1197429611 + m_SortingOrder: 1 + m_TargetDisplay: 0 +--- !u!114 &5203642470345529887 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5776012964992457845} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 1 +--- !u!114 &8401181811675285096 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5776012964992457845} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 2149721663 +--- !u!1 &9059512774779241633 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9059512774779241634} + - component: {fileID: 9059512774779241638} + - component: {fileID: 9059512774779241637} + - component: {fileID: 9059512774779241636} + - component: {fileID: 9059512774779241635} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9059512774779241634 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9059512774779241633} + 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: 9059512775554440497} + 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: 5, y: 5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9059512774779241638 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9059512774779241633} + m_CullTransparentMesh: 0 +--- !u!114 &9059512774779241637 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9059512774779241633} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 0% + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 50c91989e5a894549a3d36856af3b625, type: 2} + m_sharedMaterial: {fileID: 6592313765678872120, guid: 50c91989e5a894549a3d36856af3b625, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 1 + m_fontSizeBase: 1 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0.8234581, y: 1.6086092, z: 0.90714234, w: 1.6753458} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &9059512774779241636 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9059512774779241633} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 33f104f93e4194bc8b502b044218dd3c, type: 3} + m_Name: + m_EditorClassIdentifier: + progressBar: {fileID: 9059512776167423361} + Suffix: '%' +--- !u!95 &9059512774779241635 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9059512774779241633} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: d731faf9e0a8a433f9396c8a517ef24e, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &9059512775554440496 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9059512775554440497} + m_Layer: 5 + m_Name: Radial Progress Bar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9059512775554440497 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9059512775554440496} + 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: 9059512775703520123} + - {fileID: 9059512776167423364} + - {fileID: 207522703911156369} + - {fileID: 9059512774779241634} + m_Father: {fileID: 7936158519186342602} + 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: 4, y: 3.5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &9059512775703520122 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9059512775703520123} + - component: {fileID: 9059512775703520125} + - component: {fileID: 9059512775703520124} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9059512775703520123 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9059512775703520122} + 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: 9059512775554440497} + 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!222 &9059512775703520125 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9059512775703520122} + m_CullTransparentMesh: 0 +--- !u!114 &9059512775703520124 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9059512775703520122} + 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: 0.19215687, g: 0.15294118, b: 0.15294118, 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: 4596b288f688240be9303691a0bce9a0, 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!1 &9059512776167423360 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9059512776167423364} + - component: {fileID: 9059512776167423363} + - component: {fileID: 9059512776167423361} + m_Layer: 5 + m_Name: ProgressBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9059512776167423364 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9059512776167423360} + 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: 9059512775554440497} + 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!222 &9059512776167423363 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9059512776167423360} + m_CullTransparentMesh: 0 +--- !u!114 &9059512776167423361 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9059512776167423360} + 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: 0.13725491, g: 0.34117648, b: 0.5058824, 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: 4596b288f688240be9303691a0bce9a0, 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!1001 &1339557744348280311 PrefabInstance: m_ObjectHideFlags: 0 @@ -8,6 +547,26 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 706661809145815501, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_Color.b + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 706661809145815501, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_Color.g + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 706661809145815501, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_Color.r + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 706661809145815501, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_SortingOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1226522768702761892, guid: df9556fba23d04a5ea0331528bb1999a, type: 3} propertyPath: m_LocalScale.x @@ -23,11 +582,21 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.46 objectReference: {fileID: 0} + - target: {fileID: 1226522768702761892, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalPosition.x + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1226522768702761892, guid: df9556fba23d04a5ea0331528bb1999a, type: 3} propertyPath: m_LocalPosition.y value: 1.76 objectReference: {fileID: 0} + - target: {fileID: 1226522768702761892, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalPosition.z + value: -1 + objectReference: {fileID: 0} - target: {fileID: 2061692202436134468, guid: df9556fba23d04a5ea0331528bb1999a, type: 3} propertyPath: m_LocalScale.x @@ -68,6 +637,11 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 1 objectReference: {fileID: 0} + - target: {fileID: 4358197233429876608, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5680503881558313543, guid: df9556fba23d04a5ea0331528bb1999a, type: 3} propertyPath: objectScale.x @@ -93,7 +667,7 @@ PrefabInstance: - target: {fileID: 5984269038528210271, guid: df9556fba23d04a5ea0331528bb1999a, type: 3} propertyPath: m_Color.a - value: 0.50980395 + value: 0.5019608 objectReference: {fileID: 0} - target: {fileID: 5984269038528210271, guid: df9556fba23d04a5ea0331528bb1999a, type: 3} @@ -197,6 +771,104 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 1226522768702761892, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + insertIndex: -1 + addedObject: {fileID: 7936158519186342602} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4337131708783605791, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5405561609652691584} + - targetCorrespondingSourceObject: {fileID: 4337131708783605791, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + insertIndex: -1 + addedObject: {fileID: 4237444997000394088} + - targetCorrespondingSourceObject: {fileID: 4337131708783605791, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + insertIndex: -1 + addedObject: {fileID: 6428183898318246750} m_SourcePrefab: {fileID: 100100000, guid: df9556fba23d04a5ea0331528bb1999a, type: 3} +--- !u!4 &257386181886762579 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1226522768702761892, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + m_PrefabInstance: {fileID: 1339557744348280311} + m_PrefabAsset: {fileID: 0} +--- !u!1 &3361803962983484904 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4337131708783605791, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + m_PrefabInstance: {fileID: 1339557744348280311} + m_PrefabAsset: {fileID: 0} +--- !u!114 &5405561609652691584 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3361803962983484904} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 274b80ab5b659c646ba9338870d14625, type: 3} + m_Name: + m_EditorClassIdentifier: + overrideName: Build + overrideUseMessage: + maxUseDistance: 5 + events: + onSelect: + m_PersistentCalls: + m_Calls: [] + onDeselect: + m_PersistentCalls: + m_Calls: [] + onUse: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 6428183898318246750} + m_TargetAssemblyTypeName: BlueWaterProject.BuildingObject, Assembly-CSharp + m_MethodName: IncreaseProgressBar + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!65 &4237444997000394088 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3361803962983484904} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 10, y: 10, z: 10} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &6428183898318246750 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3361803962983484904} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: db7740ee4cca149a4a4ca75599e8bf9d, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/BlueWater/Assets/05.Prefabs/Props/InShipProps/Vomit.prefab b/BlueWater/Assets/05.Prefabs/Props/InShipProps/Vomit.prefab index 2424a540c..236888a88 100644 --- a/BlueWater/Assets/05.Prefabs/Props/InShipProps/Vomit.prefab +++ b/BlueWater/Assets/05.Prefabs/Props/InShipProps/Vomit.prefab @@ -154,7 +154,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8216347814332420713} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: daa6cb7825d05f04bbb53a7e77ecea90, type: 3} m_Name: diff --git a/BlueWater/Assets/UltimateCleanGUIPack/Themes/Classic/Prefabs/UI Elements/Progress Bar/Radial/Filled - Horizontal/Radial Progress Bar - Filled - Horizontal.prefab b/BlueWater/Assets/UltimateCleanGUIPack/Themes/Classic/Prefabs/UI Elements/Progress Bar/Radial/Filled - Horizontal/Radial Progress Bar - Filled - Horizontal.prefab index 047922cc8..e304d5525 100644 --- a/BlueWater/Assets/UltimateCleanGUIPack/Themes/Classic/Prefabs/UI Elements/Progress Bar/Radial/Filled - Horizontal/Radial Progress Bar - Filled - Horizontal.prefab +++ b/BlueWater/Assets/UltimateCleanGUIPack/Themes/Classic/Prefabs/UI Elements/Progress Bar/Radial/Filled - Horizontal/Radial Progress Bar - Filled - Horizontal.prefab @@ -28,9 +28,9 @@ 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_Children: [] m_Father: {fileID: 8883559004894925122} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -60,6 +60,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.36862746, g: 0.29411766, b: 0.28235295, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -104,9 +105,9 @@ 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_Children: [] m_Father: {fileID: 8883559004894925122} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -136,6 +137,7 @@ MonoBehaviour: 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: @@ -226,7 +228,7 @@ MonoBehaviour: Suffix: '%' --- !u!95 &8883559004882021355 Animator: - serializedVersion: 3 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -239,10 +241,13 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &8883559004894925123 GameObject: m_ObjectHideFlags: 0 @@ -270,13 +275,13 @@ 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_Children: - {fileID: 8883559005220540562} - {fileID: 8883559004983664844} - {fileID: 2767191168012432040} - {fileID: 8883559004882021356} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -326,9 +331,9 @@ 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_Children: [] m_Father: {fileID: 8883559004894925122} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -358,6 +363,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.5647059, g: 0.17254901, b: 0.35627064, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -400,9 +406,9 @@ 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_Children: [] m_Father: {fileID: 8883559004894925122} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -432,6 +438,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.19215687, g: 0.15294118, b: 0.15294118, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/BlueWater/Assets/UltimateCleanGUIPack/Themes/Classic/Prefabs/UI Elements/Progress Bar/Radial/Filled - Vertical/Radial Progress Bar - Filled - Vertical.prefab b/BlueWater/Assets/UltimateCleanGUIPack/Themes/Classic/Prefabs/UI Elements/Progress Bar/Radial/Filled - Vertical/Radial Progress Bar - Filled - Vertical.prefab index 7b01866bf..1b8ddc837 100644 --- a/BlueWater/Assets/UltimateCleanGUIPack/Themes/Classic/Prefabs/UI Elements/Progress Bar/Radial/Filled - Vertical/Radial Progress Bar - Filled - Vertical.prefab +++ b/BlueWater/Assets/UltimateCleanGUIPack/Themes/Classic/Prefabs/UI Elements/Progress Bar/Radial/Filled - Vertical/Radial Progress Bar - Filled - Vertical.prefab @@ -28,9 +28,9 @@ 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_Children: [] m_Father: {fileID: 7994320725435224238} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -60,6 +60,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.36862746, g: 0.29411766, b: 0.28235295, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -101,13 +102,13 @@ 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_Children: - {fileID: 7994320726926487268} - {fileID: 7994320726985764891} - {fileID: 1272572877134558990} - {fileID: 7994320725764835645} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -159,9 +160,9 @@ 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_Children: [] m_Father: {fileID: 7994320725435224238} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -191,6 +192,7 @@ MonoBehaviour: 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: @@ -281,7 +283,7 @@ MonoBehaviour: Suffix: '%' --- !u!95 &7994320725764835644 Animator: - serializedVersion: 3 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -294,10 +296,13 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &7994320726926487269 GameObject: m_ObjectHideFlags: 0 @@ -326,9 +331,9 @@ 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_Children: [] m_Father: {fileID: 7994320725435224238} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -358,6 +363,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.19215687, g: 0.15294118, b: 0.15294118, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -400,9 +406,9 @@ 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_Children: [] m_Father: {fileID: 7994320725435224238} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -432,6 +438,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.13725491, g: 0.34117648, b: 0.5058824, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/BlueWater/Assets/UltimateCleanGUIPack/Themes/Classic/Prefabs/UI Elements/Progress Bar/Radial/Outline - Radial/Radial Progress Bar - Outline - Radial - Brown.prefab b/BlueWater/Assets/UltimateCleanGUIPack/Themes/Classic/Prefabs/UI Elements/Progress Bar/Radial/Outline - Radial/Radial Progress Bar - Outline - Radial - Brown.prefab index e3a027547..4bbf5a1d4 100644 --- a/BlueWater/Assets/UltimateCleanGUIPack/Themes/Classic/Prefabs/UI Elements/Progress Bar/Radial/Outline - Radial/Radial Progress Bar - Outline - Radial - Brown.prefab +++ b/BlueWater/Assets/UltimateCleanGUIPack/Themes/Classic/Prefabs/UI Elements/Progress Bar/Radial/Outline - Radial/Radial Progress Bar - Outline - Radial - Brown.prefab @@ -5,12 +5,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 692893511568832040, guid: a4abf5b365e614774b483fecf56b260e, type: 3} - propertyPath: m_Color.r - value: 0.19215687 + propertyPath: m_Color.b + value: 0.15294118 objectReference: {fileID: 0} - target: {fileID: 692893511568832040, guid: a4abf5b365e614774b483fecf56b260e, type: 3} @@ -19,18 +20,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 692893511568832040, guid: a4abf5b365e614774b483fecf56b260e, type: 3} - propertyPath: m_Color.b - value: 0.15294118 - objectReference: {fileID: 0} - - target: {fileID: 692893511568832046, guid: a4abf5b365e614774b483fecf56b260e, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 692893511568832046, guid: a4abf5b365e614774b483fecf56b260e, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 + propertyPath: m_Color.r + value: 0.19215687 objectReference: {fileID: 0} - target: {fileID: 692893511568832046, guid: a4abf5b365e614774b483fecf56b260e, type: 3} @@ -42,6 +33,16 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 692893511568832046, guid: a4abf5b365e614774b483fecf56b260e, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 692893511568832046, guid: a4abf5b365e614774b483fecf56b260e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 692893511568832046, guid: a4abf5b365e614774b483fecf56b260e, type: 3} propertyPath: m_SizeDelta.x @@ -64,8 +65,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 692893511693736792, guid: a4abf5b365e614774b483fecf56b260e, type: 3} - propertyPath: m_Color.r - value: 0.8 + propertyPath: m_Color.b + value: 0.23921569 objectReference: {fileID: 0} - target: {fileID: 692893511693736792, guid: a4abf5b365e614774b483fecf56b260e, type: 3} @@ -74,17 +75,12 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 692893511693736792, guid: a4abf5b365e614774b483fecf56b260e, type: 3} - propertyPath: m_Color.b - value: 0.23921569 + propertyPath: m_Color.r + value: 0.8 objectReference: {fileID: 0} - - target: {fileID: 692893511693736795, guid: a4abf5b365e614774b483fecf56b260e, + - target: {fileID: 692893511693736792, guid: a4abf5b365e614774b483fecf56b260e, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 692893511693736795, guid: a4abf5b365e614774b483fecf56b260e, - type: 3} - propertyPath: m_AnchorMin.y + propertyPath: m_FillAmount value: 0 objectReference: {fileID: 0} - target: {fileID: 692893511693736795, guid: a4abf5b365e614774b483fecf56b260e, @@ -99,7 +95,12 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 692893511693736795, guid: a4abf5b365e614774b483fecf56b260e, type: 3} - propertyPath: m_AnchoredPosition.x + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 692893511693736795, guid: a4abf5b365e614774b483fecf56b260e, + type: 3} + propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - target: {fileID: 692893511693736795, guid: a4abf5b365e614774b483fecf56b260e, @@ -112,6 +113,56 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 692893511693736795, guid: a4abf5b365e614774b483fecf56b260e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 692893511773921924, guid: a4abf5b365e614774b483fecf56b260e, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 692893511773921924, guid: a4abf5b365e614774b483fecf56b260e, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 692893511773921924, guid: a4abf5b365e614774b483fecf56b260e, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 692893511773921924, guid: a4abf5b365e614774b483fecf56b260e, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 692893511773921924, guid: a4abf5b365e614774b483fecf56b260e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 692893511773921924, guid: a4abf5b365e614774b483fecf56b260e, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 692893511773921924, guid: a4abf5b365e614774b483fecf56b260e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 692893511773921924, guid: a4abf5b365e614774b483fecf56b260e, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 692893511773921924, guid: a4abf5b365e614774b483fecf56b260e, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} - target: {fileID: 692893511773921924, guid: a4abf5b365e614774b483fecf56b260e, type: 3} propertyPath: m_LocalPosition.x @@ -127,6 +178,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 692893511773921924, guid: a4abf5b365e614774b483fecf56b260e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 692893511773921924, guid: a4abf5b365e614774b483fecf56b260e, type: 3} propertyPath: m_LocalRotation.x @@ -144,12 +200,12 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 692893511773921924, guid: a4abf5b365e614774b483fecf56b260e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 + propertyPath: m_AnchoredPosition.x + value: 0 objectReference: {fileID: 0} - target: {fileID: 692893511773921924, guid: a4abf5b365e614774b483fecf56b260e, type: 3} - propertyPath: m_RootOrder + propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - target: {fileID: 692893511773921924, guid: a4abf5b365e614774b483fecf56b260e, @@ -167,70 +223,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 692893511773921924, guid: a4abf5b365e614774b483fecf56b260e, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 692893511773921924, guid: a4abf5b365e614774b483fecf56b260e, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 692893511773921924, guid: a4abf5b365e614774b483fecf56b260e, - type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 692893511773921924, guid: a4abf5b365e614774b483fecf56b260e, - type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 692893511773921924, guid: a4abf5b365e614774b483fecf56b260e, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 692893511773921924, guid: a4abf5b365e614774b483fecf56b260e, - type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 692893511773921924, guid: a4abf5b365e614774b483fecf56b260e, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 692893511773921924, guid: a4abf5b365e614774b483fecf56b260e, - type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 692893511773921924, guid: a4abf5b365e614774b483fecf56b260e, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 692893511773921924, guid: a4abf5b365e614774b483fecf56b260e, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - target: {fileID: 692893511773921947, guid: a4abf5b365e614774b483fecf56b260e, type: 3} propertyPath: m_Name - value: Radial ProgressBar - Outline - Radial - Brown - objectReference: {fileID: 0} - - target: {fileID: 2433728414825947220, guid: a4abf5b365e614774b483fecf56b260e, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2433728414825947220, guid: a4abf5b365e614774b483fecf56b260e, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 + value: Radial Progress Bar - Outline - Radial - Brown objectReference: {fileID: 0} - target: {fileID: 2433728414825947220, guid: a4abf5b365e614774b483fecf56b260e, type: 3} @@ -242,6 +238,16 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 2433728414825947220, guid: a4abf5b365e614774b483fecf56b260e, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2433728414825947220, guid: a4abf5b365e614774b483fecf56b260e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2433728414825947220, guid: a4abf5b365e614774b483fecf56b260e, type: 3} propertyPath: m_SizeDelta.x @@ -259,8 +265,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4910266221093435084, guid: a4abf5b365e614774b483fecf56b260e, type: 3} - propertyPath: m_Color.r - value: 0.36862746 + propertyPath: m_Color.b + value: 0.28235295 objectReference: {fileID: 0} - target: {fileID: 4910266221093435084, guid: a4abf5b365e614774b483fecf56b260e, type: 3} @@ -269,8 +275,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4910266221093435084, guid: a4abf5b365e614774b483fecf56b260e, type: 3} - propertyPath: m_Color.b - value: 0.28235295 + propertyPath: m_Color.r + value: 0.36862746 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a4abf5b365e614774b483fecf56b260e, type: 3}