diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index a1044873d..a623e6ba6 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -184,8 +184,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278255615 - m_fontColor: {r: 1, g: 1, b: 0, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -202,12 +202,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 3 + m_fontSize: 3.45 m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 1 - m_fontSizeMax: 3 + m_fontSizeMax: 4 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -11584,6 +11584,7 @@ GameObject: - component: {fileID: 874445111} - component: {fileID: 874445113} - component: {fileID: 874445112} + - component: {fileID: 874445114} m_Layer: 5 m_Name: LevelText m_TagString: Untagged @@ -11709,6 +11710,114 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 874445110} m_CullTransparentMesh: 1 +--- !u!114 &874445114 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 874445110} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4d0390bd8b8ffd640b34fe25065ff1df, type: 3} + m_Name: + m_EditorClassIdentifier: + updateType: 0 + isSpeedBased: 0 + hasOnStart: 0 + hasOnPlay: 0 + hasOnUpdate: 0 + hasOnStepComplete: 0 + hasOnComplete: 0 + hasOnTweenCreated: 0 + hasOnRewind: 0 + onStart: + m_PersistentCalls: + m_Calls: [] + onPlay: + m_PersistentCalls: + m_Calls: [] + onUpdate: + m_PersistentCalls: + m_Calls: [] + onStepComplete: + m_PersistentCalls: + m_Calls: [] + onComplete: + m_PersistentCalls: + m_Calls: [] + onTweenCreated: + m_PersistentCalls: + m_Calls: [] + onRewind: + m_PersistentCalls: + m_Calls: [] + targetIsSelf: 1 + targetGO: {fileID: 0} + tweenTargetIsTargetGO: 1 + delay: 0 + duration: 1 + easeType: 6 + easeCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + loopType: 0 + loops: 1 + id: + isRelative: 0 + isFrom: 0 + isIndependentUpdate: 0 + autoKill: 1 + autoGenerate: 1 + isActive: 1 + isValid: 1 + target: {fileID: 874445111} + animationType: 11 + targetType: 11 + forcedTargetType: 0 + autoPlay: 1 + useTargetAsV3: 0 + endValueFloat: 0 + endValueV3: {x: 1.5, y: 1.5, z: 1} + endValueV2: {x: 0, y: 0} + endValueColor: {r: 1, g: 1, b: 1, a: 1} + endValueString: + endValueRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + endValueTransform: {fileID: 0} + optionalBool0: 0 + optionalBool1: 0 + optionalFloat0: 1 + optionalInt0: 1 + optionalRotationMode: 0 + optionalScrambleMode: 0 + optionalShakeRandomnessMode: 0 + optionalString: --- !u!1001 &874559119 PrefabInstance: m_ObjectHideFlags: 0 @@ -12487,8 +12596,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 11} - m_SizeDelta: {x: 0, y: 5} + m_AnchoredPosition: {x: 0, y: 9} + m_SizeDelta: {x: 0, y: 10} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &963867004 MonoBehaviour: @@ -12519,8 +12628,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278255615 - m_fontColor: {r: 1, g: 1, b: 0, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -12537,12 +12646,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 3 + m_fontSize: 5 m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 1 - m_fontSizeMax: 3 + m_fontSizeMax: 5 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -14489,6 +14598,7 @@ GameObject: - component: {fileID: 1103501549} - component: {fileID: 1103501551} - component: {fileID: 1103501550} + - component: {fileID: 1103501552} m_Layer: 5 m_Name: FillImage m_TagString: Untagged @@ -14503,17 +14613,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1103501548} - 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: 1 m_Children: [] - m_Father: {fileID: 1540383231} + m_Father: {fileID: 1983229438} 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_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1103501550 MonoBehaviour: @@ -14528,21 +14638,21 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0, b: 0, a: 1} + m_Color: {r: 0.009745443, g: 0.34921232, b: 0.6886792, 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: a6f7d0a5a1f60b5418c0d7b8f72c91e1, type: 3} + m_Sprite: {fileID: 21300000, guid: 3ac0b4e40bbf0f9449f1d7a6d2a9baba, type: 3} m_Type: 3 m_PreserveAspect: 0 m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 0 + m_FillMethod: 0 + m_FillAmount: 1 m_FillClockwise: 1 - m_FillOrigin: 2 + m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 --- !u!222 &1103501551 @@ -14553,6 +14663,26 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1103501548} m_CullTransparentMesh: 1 +--- !u!114 &1103501552 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1103501548} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1001 &1106965575 PrefabInstance: m_ObjectHideFlags: 0 @@ -17934,6 +18064,10 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 394003937711580801, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} - target: {fileID: 464066756816943480, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -17962,6 +18096,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 489636773431890722, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} - target: {fileID: 673115180100039284, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -18658,10 +18796,6 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4119089025960676272, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4251482001701616426, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -19022,6 +19156,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5735524630930733454, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} - target: {fileID: 5792361823204495330, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -19158,6 +19296,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6198619660343708688, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} - target: {fileID: 6282465060434596968, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -19238,6 +19380,10 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 6679305863409353257, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} - target: {fileID: 6755099342028751082, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -19362,10 +19508,6 @@ PrefabInstance: propertyPath: m_Mesh value: objectReference: {fileID: 0} - - target: {fileID: 7640850047456124134, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} - propertyPath: m_LocalPosition.x - value: 1 - objectReference: {fileID: 0} - target: {fileID: 7684160510317418533, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -19418,6 +19560,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7820043592766616516, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} - target: {fileID: 7838944412261657479, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -19634,10 +19780,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8858452115783968250, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} - propertyPath: m_LocalPosition.x - value: 2 - objectReference: {fileID: 0} - target: {fileID: 8892463800151558011, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -22600,6 +22742,8 @@ MonoBehaviour: _expSlider: {fileID: 1929565892} _filledImage: {fileID: 194818730} _animationTime: 0.2 + _punchScale: {x: 1.5, y: 1.5, z: 1.5} + _duration: 1 --- !u!1 &1484385439 GameObject: m_ObjectHideFlags: 0 @@ -22996,7 +23140,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1103501549} - {fileID: 242229610} m_Father: {fileID: 1983229438} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -31350,6 +31493,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1103501549} - {fileID: 1540383231} - {fileID: 1728335878} m_Father: {fileID: 2032162537} diff --git a/Assets/02.Scripts/Character/Npc/Customer/Customer.cs b/Assets/02.Scripts/Character/Npc/Customer/Customer.cs index fbce3fce3..d2cff0a34 100644 --- a/Assets/02.Scripts/Character/Npc/Customer/Customer.cs +++ b/Assets/02.Scripts/Character/Npc/Customer/Customer.cs @@ -462,16 +462,13 @@ namespace BlueWater.Npcs.Customers TycoonStageController.VomitCount++; if (TycoonStageController.VomitCount >= 3) { - // TODO : 80% 곰팡이, 20% 버섯 var random = Random.Range(0, 101); if (random <= 20) { - print("버섯 생성"); EventManager.InvokeCreateMushroom(); } else { - print("곰팡이 생성"); EventManager.InvokeCreateMold(); } TycoonStageController.VomitCount = 0; diff --git a/Assets/02.Scripts/Character/SpineController.cs b/Assets/02.Scripts/Character/SpineController.cs index 0b5dd78c7..1460be415 100644 --- a/Assets/02.Scripts/Character/SpineController.cs +++ b/Assets/02.Scripts/Character/SpineController.cs @@ -159,6 +159,21 @@ namespace BlueWater.Players return trackEntry; } + + public TrackEntry AddAnimation(string animationName, bool isLoopActive, int trackIndex = 0) + { + if (!SkeletonAnimation || _animationState == null) return null; + + if (string.IsNullOrEmpty(animationName)) + { + Debug.LogError($"{animationName} 애니메이션은 존재하지 않습니다."); + return null; + } + + var trackEntry = _animationState.AddAnimation(trackIndex, animationName, isLoopActive, 0); + + return trackEntry; + } public void SetSkin(string skinName) { diff --git a/Assets/02.Scripts/Prop/Tycoon/Barrel.cs b/Assets/02.Scripts/Prop/Tycoon/Barrel.cs index 5163b6476..7c4335886 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Barrel.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Barrel.cs @@ -1,12 +1,24 @@ using System; using BlueWater.Items; +using BlueWater.Players; using Sirenix.OdinInspector; using UnityEngine; namespace BlueWater.Tycoons { + public static class BarrelSpineAnimation + { + public const string Idle = "IdleNormal"; + public const string Mold = "IdleDirty"; + public const string ChangeIdle = "ChangeClean"; + public const string ChangeMold = "ChangeDirty"; + } + public class Barrel : InteractionFurniture { + [SerializeField] + private SpineController _spineController; + [SerializeField, Required] private SpriteRenderer _liquidImage; @@ -27,6 +39,9 @@ namespace BlueWater.Tycoons [field: SerializeField] public int CurrentAmount { get; private set; } + + [field: SerializeField] + public bool IsStatue { get; private set; } [field: SerializeField] public bool IsActivated { get; private set; } @@ -36,12 +51,6 @@ namespace BlueWater.Tycoons [field: SerializeField] public bool IsMoldy { get; private set; } - - [SerializeField] - private Sprite _originalSprite; - - [SerializeField] - private Sprite _moldSprite; [SerializeField] private float _playerHoldingTime = 3f; @@ -61,6 +70,7 @@ namespace BlueWater.Tycoons { base.Awake(); + _spineController = GetComponent(); _instanceMaterial = Instantiate(_fill.material); _fill.material = _instanceMaterial; _liquidData = ItemManager.Instance.LiquidDataSo.GetDataByIdx(_idx); @@ -76,6 +86,11 @@ namespace BlueWater.Tycoons _liquidImage.sprite = IsActivated ? _liquidData.Sprite : DataManager.Instance.SpriteDataSo.BarrelLock; _instanceMaterial.SetColor(LiquidColorHash, _liquidData.Color * _colorIntensity); + + if (_spineController) + { + _spineController.PlayAnimation(BarrelSpineAnimation.Idle, false); + } } private void Update() @@ -172,10 +187,32 @@ namespace BlueWater.Tycoons { UpdateLocalizedString(_interactionEntryName); } - - base.ShowInteractionUi(); + + if (IsStatue) + { + base.ShowInteractionUi(); + } + else + { + _spineController.EnableCustomMaterial(); + EventManager.InvokeShowInteractionUi(InteractionMessage); + IsShowing = true; + } } + public override void HideInteractionUi() + { + if (IsStatue) + { + base.HideInteractionUi(); + } + else + { + _spineController.DisableCustomMaterial(); + EventManager.InvokeHideInteractionUi(); + IsShowing = false; + } + } public bool CanConsume(int amount) { @@ -242,16 +279,16 @@ namespace BlueWater.Tycoons public void Mold() { IsMoldy = true; - VisualLook.sprite = _moldSprite; - InteractionCanvas.BalloonUi.ShowUi(); + _spineController.PlayAnimation(BarrelSpineAnimation.ChangeMold, false); + _spineController.AddAnimation(BarrelSpineAnimation.Mold, true); } public void Recovery() { CancelInteraction(); IsMoldy = false; - VisualLook.sprite = _originalSprite; - InteractionCanvas.BalloonUi.HideUi(); + _spineController.PlayAnimation(BarrelSpineAnimation.ChangeIdle, false); + _spineController.AddAnimation(BarrelSpineAnimation.Idle, false); } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Tycoon/Mushroom.cs b/Assets/02.Scripts/Prop/Tycoon/Mushroom.cs index 5c7cf28e3..a46ed205b 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Mushroom.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Mushroom.cs @@ -1,6 +1,7 @@ using System; using UnityEngine; +using UnityEngine.Serialization; namespace BlueWater.Tycoons { @@ -10,7 +11,9 @@ namespace BlueWater.Tycoons [SerializeField] private float _playerHoldingTime = 3f; - private Sprite _mushroomSprite; + [SerializeField] + private Sprite _heartSprite; + private bool _isPlayerInteracting; protected override void OnEnable() @@ -54,8 +57,7 @@ namespace BlueWater.Tycoons public void Initialize() { - _mushroomSprite = VisualLook.GetComponent().sprite; - InteractionCanvas.BalloonUi.OrderItem(_mushroomSprite, 0, TycoonManager.Instance.TycoonStageController.StageDataSo.MushroomWaitTime); + InteractionCanvas.BalloonUi.OrderItem(_heartSprite, 0, TycoonManager.Instance.TycoonStageController.StageDataSo.MushroomWaitTime); } public override void Interaction() diff --git a/Assets/02.Scripts/Prop/Tycoon/RewardBox.cs b/Assets/02.Scripts/Prop/Tycoon/RewardBox.cs index 9c63b25dd..0d830ef82 100644 --- a/Assets/02.Scripts/Prop/Tycoon/RewardBox.cs +++ b/Assets/02.Scripts/Prop/Tycoon/RewardBox.cs @@ -17,7 +17,7 @@ namespace BlueWater.Tycoons public void Initialize(LevelData levelData) { _rewardBoxType = levelData.RewardBoxType; - _requiredGold = levelData.Gold; + _requiredGold = levelData.RewardBoxPrice; InteractionCanvas.UnlockUi.Initialize(DataManager.Instance.SpriteDataSo.Gold02, _requiredGold); } diff --git a/Assets/02.Scripts/ScriptableObject/Item/LiquidDataTable.asset b/Assets/02.Scripts/ScriptableObject/Item/LiquidDataTable.asset index d0be2e894..67c617aca 100644 --- a/Assets/02.Scripts/ScriptableObject/Item/LiquidDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/Item/LiquidDataTable.asset @@ -20,7 +20,7 @@ MonoBehaviour: k__BackingField: 1 k__BackingField: 99999 k__BackingField: {fileID: 21300000, guid: a8c45767f0a3ec245a47087c7ada2b50, type: 3} - k__BackingField: {r: 1, g: 0.21960784, b: 0, a: 1} + k__BackingField: {r: 0.8018868, g: 0, b: 0.024826864, a: 1} - k__BackingField: LiquidB k__BackingField: k__BackingField: LiquidB diff --git a/Assets/02.Scripts/ScriptableObject/StageData.asset b/Assets/02.Scripts/ScriptableObject/StageData.asset index 44f4288ab..b1edde27a 100644 --- a/Assets/02.Scripts/ScriptableObject/StageData.asset +++ b/Assets/02.Scripts/ScriptableObject/StageData.asset @@ -18,3 +18,9 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 30 k__BackingField: 30 + k__BackingField: 3 + k__BackingField: 5 + k__BackingField: 10 + k__BackingField: 2 + k__BackingField: 60 + k__BackingField: 5 diff --git a/Assets/02.Scripts/Ui/Tycoon/ExpUi.cs b/Assets/02.Scripts/Ui/Tycoon/ExpUi.cs index 44a5b8155..5efddd983 100644 --- a/Assets/02.Scripts/Ui/Tycoon/ExpUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/ExpUi.cs @@ -23,11 +23,19 @@ namespace BlueWater.Uis [SerializeField] private float _animationTime = 0.2f; + + [Title("레벨 텍스트")] + [SerializeField] + private Vector3 _punchScale = new(1.5f, 1.5f, 1.5f); + + [SerializeField] + private float _duration = 1f; private Queue _expQueue = new(); private Coroutine _changeExpInstance; private Color _originalColor; - private Tween _tween; + private Tween _expSliderTween; + private Tween _levelTextTween; private bool _isAnimating; private void Awake() @@ -37,13 +45,17 @@ namespace BlueWater.Uis _expSlider.value = 0f; _originalColor = _filledImage.color; - _tween = _filledImage.DOColor(Color.white, 0.25f) + _expSliderTween = _filledImage.DOColor(Color.white, 0.25f) .SetAutoKill(false) .Pause() .OnComplete(() => { _filledImage.DOColor(_originalColor, 0.25f); }); + + _levelTextTween = _levelText.transform.DOPunchScale(_punchScale, _duration, 1) + .SetAutoKill(false) + .Pause(); } private void OnDestroy() @@ -51,12 +63,14 @@ namespace BlueWater.Uis EventManager.OnChangeExp -= ChangeExp; EventManager.OnLevelUp += ChangeLevel; - _tween.Kill(); + _expSliderTween.Kill(); + _levelTextTween.Kill(); } private void ChangeLevel(LevelData levelData) { _levelText.text = $"Round.{levelData.Idx}"; + _levelTextTween.Restart(); } private void ChangeExp(int addedExp) @@ -90,9 +104,9 @@ namespace BlueWater.Uis if (newExp >= requireExp) { - _tween.Restart(); + _expSliderTween.Restart(); - yield return _tween.WaitForCompletion(); + yield return _expSliderTween.WaitForCompletion(); TycoonManager.Instance.TycoonStatus.CurrentLevel++; currentLevelData = TycoonManager.Instance.GetCurrentLevelData(); diff --git a/Assets/04.Materials/Outline.meta b/Assets/04.Materials/Outline.meta new file mode 100644 index 000000000..59c904975 --- /dev/null +++ b/Assets/04.Materials/Outline.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a2c62a9ee71de0b438d35922f78a92bb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04.Materials/Outline/BarrelOutlineUnlit.mat b/Assets/04.Materials/Outline/BarrelOutlineUnlit.mat new file mode 100644 index 000000000..9a097a946 --- /dev/null +++ b/Assets/04.Materials/Outline/BarrelOutlineUnlit.mat @@ -0,0 +1,152 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BarrelOutlineUnlit + m_Shader: {fileID: -6465566751694194690, guid: 8daa1b13f763ae74f8630c7a631dd327, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 60e606e60be671f4484463d3abd9b15e, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _CastShadows: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _FadeDistance: 150 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _ISCORNER: 0 + - _IsCorner: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _OutlineMipLevel: 0 + - _OutlineOpaqueAlpha: 1 + - _OutlineReferenceTexWidth: 1024 + - _OutlineSmoothness: 1 + - _OutlineWidth: 3 + - _Parallax: 0.005 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _StencilComp: 8 + - _StencilRef: 1 + - _Surface: 0 + - _Thickness: 0.01 + - _ThresholdEnd: 0.25 + - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &6323663459513743005 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Assets/04.Materials/Outline/BarrelOutlineUnlit.mat.meta b/Assets/04.Materials/Outline/BarrelOutlineUnlit.mat.meta new file mode 100644 index 000000000..6427e2533 --- /dev/null +++ b/Assets/04.Materials/Outline/BarrelOutlineUnlit.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d3ef6919547b3674bbeaccbed03a5ad9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04.Materials/CustomerOutLineUnlit.mat b/Assets/04.Materials/Outline/CustomerOutlineUnlit.mat similarity index 99% rename from Assets/04.Materials/CustomerOutLineUnlit.mat rename to Assets/04.Materials/Outline/CustomerOutlineUnlit.mat index bae51ca1b..63ea58fe1 100644 --- a/Assets/04.Materials/CustomerOutLineUnlit.mat +++ b/Assets/04.Materials/Outline/CustomerOutlineUnlit.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: CustomerOutLineUnlit + m_Name: CustomerOutlineUnlit m_Shader: {fileID: -6465566751694194690, guid: 8daa1b13f763ae74f8630c7a631dd327, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/Assets/04.Materials/CustomerOutLineUnlit.mat.meta b/Assets/04.Materials/Outline/CustomerOutlineUnlit.mat.meta similarity index 100% rename from Assets/04.Materials/CustomerOutLineUnlit.mat.meta rename to Assets/04.Materials/Outline/CustomerOutlineUnlit.mat.meta diff --git a/Assets/04.Materials/OutlineLit.mat b/Assets/04.Materials/Outline/OutlineLit.mat similarity index 100% rename from Assets/04.Materials/OutlineLit.mat rename to Assets/04.Materials/Outline/OutlineLit.mat diff --git a/Assets/04.Materials/OutlineLit.mat.meta b/Assets/04.Materials/Outline/OutlineLit.mat.meta similarity index 100% rename from Assets/04.Materials/OutlineLit.mat.meta rename to Assets/04.Materials/Outline/OutlineLit.mat.meta diff --git a/Assets/04.Materials/OutlineUnlit.mat b/Assets/04.Materials/Outline/OutlineUnlit.mat similarity index 100% rename from Assets/04.Materials/OutlineUnlit.mat rename to Assets/04.Materials/Outline/OutlineUnlit.mat diff --git a/Assets/04.Materials/OutlineUnlit.mat.meta b/Assets/04.Materials/Outline/OutlineUnlit.mat.meta similarity index 100% rename from Assets/04.Materials/OutlineUnlit.mat.meta rename to Assets/04.Materials/Outline/OutlineUnlit.mat.meta diff --git a/Assets/04.Materials/PumpOutLineUnlit.mat b/Assets/04.Materials/Outline/PumpOutlineUnlit.mat similarity index 99% rename from Assets/04.Materials/PumpOutLineUnlit.mat rename to Assets/04.Materials/Outline/PumpOutlineUnlit.mat index 2fec3321d..9ba3e98d3 100644 --- a/Assets/04.Materials/PumpOutLineUnlit.mat +++ b/Assets/04.Materials/Outline/PumpOutlineUnlit.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: PumpOutLineUnlit + m_Name: PumpOutlineUnlit m_Shader: {fileID: -6465566751694194690, guid: 8daa1b13f763ae74f8630c7a631dd327, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/Assets/04.Materials/PumpOutLineUnlit.mat.meta b/Assets/04.Materials/Outline/PumpOutlineUnlit.mat.meta similarity index 100% rename from Assets/04.Materials/PumpOutLineUnlit.mat.meta rename to Assets/04.Materials/Outline/PumpOutlineUnlit.mat.meta diff --git a/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab b/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab index f5b632114..05c799591 100644 --- a/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab +++ b/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab @@ -6049,6 +6049,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 3032369304281183765} m_Modifications: + - target: {fileID: 183186261584935481, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} - target: {fileID: 203741387490724426, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: m_LocalScale.x value: -1 @@ -6267,6 +6271,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 3032369304281183765} m_Modifications: + - target: {fileID: 183186261584935481, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} - target: {fileID: 203741387490724426, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: m_LocalScale.x value: -1 @@ -6978,6 +6986,10 @@ PrefabInstance: propertyPath: m_Name value: Pump objectReference: {fileID: 0} + - target: {fileID: 7474514712757053072, guid: 7947dcd65a3517948a2892d06222f5ae, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -9616,7 +9628,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalPosition.x - value: 0.52 + value: 0.3 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalPosition.y @@ -9624,7 +9636,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalPosition.z - value: -7.2 + value: -7.6 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalRotation.w @@ -11822,6 +11834,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 3032369304281183765} m_Modifications: + - target: {fileID: 183186261584935481, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} - target: {fileID: 223172209862223209, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: _idx value: LiquidC @@ -12760,6 +12776,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 3032369304281183765} m_Modifications: + - target: {fileID: 183186261584935481, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} - target: {fileID: 203741387490724426, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: m_LocalScale.x value: -1 @@ -13346,6 +13366,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 3032369304281183765} m_Modifications: + - target: {fileID: 183186261584935481, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} - target: {fileID: 223172209862223209, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: _idx value: LiquidE @@ -13562,7 +13586,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalPosition.x - value: 1.2199997 + value: 1 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalPosition.y @@ -13570,7 +13594,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalPosition.z - value: -7.2 + value: -7.6 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalRotation.w @@ -14456,6 +14480,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 3032369304281183765} m_Modifications: + - target: {fileID: 183186261584935481, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} - target: {fileID: 203741387490724426, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -14693,7 +14721,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalPosition.x - value: 1.92 + value: 1.7 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalPosition.y @@ -14701,7 +14729,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalPosition.z - value: -7.2 + value: -7.6 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/05.Prefabs/Maps/Tycoon/TycoonMap 1.prefab b/Assets/05.Prefabs/Maps/Tycoon/TycoonMap 1.prefab index 35a1ec69b..d90b9cb65 100644 --- a/Assets/05.Prefabs/Maps/Tycoon/TycoonMap 1.prefab +++ b/Assets/05.Prefabs/Maps/Tycoon/TycoonMap 1.prefab @@ -931,42 +931,6 @@ Transform: - {fileID: 3381794055646013358} m_Father: {fileID: 2700294535905665279} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &3683421095321577965 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7679049083161624399} - m_Layer: 0 - m_Name: Barrels - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &7679049083161624399 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3683421095321577965} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 8405745420066320434} - - {fileID: 8717973323817189148} - - {fileID: 766412411975822558} - - {fileID: 2633566611002910380} - - {fileID: 2976063118053674263} - m_Father: {fileID: 1402113424960589398} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3763383041433937158 GameObject: m_ObjectHideFlags: 0 @@ -3438,7 +3402,6 @@ Transform: m_Children: - {fileID: 1582116343231843844} - {fileID: 1829148020791446333} - - {fileID: 7679049083161624399} - {fileID: 4798925548635759970} - {fileID: 3032369304281183765} - {fileID: 1031605920973182729} @@ -3915,76 +3878,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} m_PrefabInstance: {fileID: 44768494324391458} m_PrefabAsset: {fileID: 0} ---- !u!1001 &117039659876036668 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 7679049083161624399} - m_Modifications: - - target: {fileID: 223172209862223209, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: _idx - value: LiquidC - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalPosition.x - value: -10 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalPosition.z - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5897095096647521783, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_Name - value: LiquidC - objectReference: {fileID: 0} - - target: {fileID: 6817574259189873408, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 404e93e2e77f60b49bbcbf1df18904d3, type: 3} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} ---- !u!4 &766412411975822558 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - m_PrefabInstance: {fileID: 117039659876036668} - m_PrefabAsset: {fileID: 0} --- !u!1001 &128984391524895884 PrefabInstance: m_ObjectHideFlags: 0 @@ -5309,76 +5202,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} m_PrefabInstance: {fileID: 2424648456633540640} m_PrefabAsset: {fileID: 0} ---- !u!1001 &2481500261763568117 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 7679049083161624399} - m_Modifications: - - target: {fileID: 223172209862223209, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: _idx - value: LiquidE - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalPosition.x - value: -7 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalPosition.z - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5897095096647521783, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_Name - value: LiquidE - objectReference: {fileID: 0} - - target: {fileID: 6817574259189873408, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 2fc24dca6ce6ac94da0187dfce24fa3a, type: 3} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} ---- !u!4 &2976063118053674263 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - m_PrefabInstance: {fileID: 2481500261763568117} - m_PrefabAsset: {fileID: 0} --- !u!1001 &2498025041410816750 PrefabInstance: m_ObjectHideFlags: 0 @@ -5841,76 +5664,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} m_PrefabInstance: {fileID: 3386331481913863380} m_PrefabAsset: {fileID: 0} ---- !u!1001 &3436624839453424206 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 7679049083161624399} - m_Modifications: - - target: {fileID: 223172209862223209, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: _idx - value: LiquidD - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalPosition.x - value: -8.5 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalPosition.z - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5897095096647521783, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_Name - value: LiquidD - objectReference: {fileID: 0} - - target: {fileID: 6817574259189873408, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: a575a803ef0529e43bcbbe8ccdbb34b2, type: 3} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} ---- !u!4 &2633566611002910380 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - m_PrefabInstance: {fileID: 3436624839453424206} - m_PrefabAsset: {fileID: 0} --- !u!1001 &3452688459547336491 PrefabInstance: m_ObjectHideFlags: 0 @@ -8905,76 +8658,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} m_PrefabInstance: {fileID: 8086306152434432111} m_PrefabAsset: {fileID: 0} ---- !u!1001 &8341054054180037630 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 7679049083161624399} - m_Modifications: - - target: {fileID: 223172209862223209, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: _idx - value: LiquidB - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalPosition.x - value: -11.5 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalPosition.z - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5897095096647521783, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_Name - value: LiquidB - objectReference: {fileID: 0} - - target: {fileID: 6817574259189873408, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 216cb30d7010e95499c22161ccfde634, type: 3} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} ---- !u!4 &8717973323817189148 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - m_PrefabInstance: {fileID: 8341054054180037630} - m_PrefabAsset: {fileID: 0} --- !u!1001 &8372532321520545548 PrefabInstance: m_ObjectHideFlags: 0 @@ -9403,73 +9086,3 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} m_PrefabInstance: {fileID: 8779802075275142014} m_PrefabAsset: {fileID: 0} ---- !u!1001 &9194699079792504016 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 7679049083161624399} - m_Modifications: - - target: {fileID: 223172209862223209, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: _idx - value: LiquidA - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalPosition.x - value: -13 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalPosition.z - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5897095096647521783, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_Name - value: LiquidA - objectReference: {fileID: 0} - - target: {fileID: 6817574259189873408, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: a8c45767f0a3ec245a47087c7ada2b50, type: 3} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} ---- !u!4 &8405745420066320434 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - m_PrefabInstance: {fileID: 9194699079792504016} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel.prefab index 488c29491..8a6038378 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel.prefab @@ -1,5 +1,180 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &808268910254764035 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6100785980319710662} + - component: {fileID: 2324181370382069895} + m_Layer: 8 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6100785980319710662 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 808268910254764035} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 203741387490724426} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2324181370382069895 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 808268910254764035} + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 2 + m_Sprite: {fileID: 21300000, guid: 324c91ab3ca459f4bad7e4187c5fe278, 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!1 &5773649549535946419 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3774058579297377381} + - component: {fileID: 7243116579515171002} + m_Layer: 8 + m_Name: LiquidImageBackground + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3774058579297377381 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5773649549535946419} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.508, y: 0, z: 0} + m_LocalScale: {x: -1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5506324081944544526} + m_Father: {fileID: 203741387490724426} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7243116579515171002 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5773649549535946419} + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 3 + m_Sprite: {fileID: 21300000, guid: d2ba40b4f14eca14e816e51ee69cf81a, 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!1 &6581422458203868687 GameObject: m_ObjectHideFlags: 0 @@ -25,12 +200,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6581422458203868687} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.408, z: -0.001} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.01, y: 0.18, z: 0} m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 203741387490724426} + m_Father: {fileID: 3774058579297377381} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &6817574259189873408 SpriteRenderer: @@ -75,7 +250,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 + m_SortingOrder: 4 m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -113,9 +288,9 @@ Transform: m_GameObject: {fileID: 8294670532554988959} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.02, z: 0.017} - m_LocalScale: {x: 0.9, y: 0.9, z: 0.9} - m_ConstrainProportionsScale: 1 + m_LocalPosition: {x: -0.02, y: 0, z: 0} + m_LocalScale: {x: 0.85, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 203741387490724426} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -162,8 +337,8 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 - m_Sprite: {fileID: 21300000, guid: 9f7d82fbc664fbb4d98842fc46db319d, type: 3} + m_SortingOrder: 1 + m_Sprite: {fileID: 21300000, guid: c7ce7fbf3a68ec040ab6006a84f75785, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -182,17 +357,25 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 40 objectReference: {fileID: 0} - target: {fileID: 2106642157007834423, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_Size.x - value: 0.7 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.x @@ -213,30 +396,106 @@ PrefabInstance: - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 9f7d82fbc664fbb4d98842fc46db319d, type: 3} + objectReference: {fileID: 21300000, guid: 11d1c47204e2d8b4d94e7b57e388252f, type: 3} - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_WasSpriteAssigned value: 1 objectReference: {fileID: 0} + - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - target: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Name - value: Barrel + value: LiquidBarrel + objectReference: {fileID: 0} + - target: {fileID: 3779548209033231211, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: d98551edcbd98e542af000fc7aaaf794, type: 3} + - target: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.x + value: -0.17 objectReference: {fileID: 0} - target: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5953080908505751474, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7192483373850935599, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7192483373850935599, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7192483373850935599, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7192483373850935599, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9396927 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.x + value: 0.3420201 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.x - value: 2.5 + value: 2 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.y - value: 2.5 + value: 2 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.z - value: 2.5 + value: 2 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalPosition.x @@ -281,30 +540,151 @@ PrefabInstance: - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 9f7d82fbc664fbb4d98842fc46db319d, type: 3} + objectReference: {fileID: 21300000, guid: 11d1c47204e2d8b4d94e7b57e388252f, type: 3} - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_WasSpriteAssigned value: 1 objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] + m_RemovedComponents: + - {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_RemovedGameObjects: + - {fileID: 8884531212319162473, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} insertIndex: -1 - addedObject: {fileID: 5506324081944544526} + addedObject: {fileID: 3774058579297377381} - targetCorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} insertIndex: -1 addedObject: {fileID: 3246572212746126634} + - targetCorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 6100785980319710662} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} insertIndex: -1 addedObject: {fileID: 223172209862223209} + - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 3688680572007923171} + - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 1653087204473300138} + - targetCorrespondingSourceObject: {fileID: 7835622629792856689, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 881146744873694949} + - targetCorrespondingSourceObject: {fileID: 7835622629792856689, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 9135412363656340666} + - targetCorrespondingSourceObject: {fileID: 7835622629792856689, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 183186261584935481} m_SourcePrefab: {fileID: 100100000, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} --- !u!4 &203741387490724426 stripped Transform: m_CorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} m_PrefabInstance: {fileID: 7343451337687172630} m_PrefabAsset: {fileID: 0} +--- !u!1 &672328621937310823 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7835622629792856689, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!23 &881146744873694949 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 672328621937310823} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: afbe92892990bdb44bd15a50fde3cdb8, 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &9135412363656340666 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 672328621937310823} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonDataAsset: {fileID: 11400000, guid: 51291e8deacbf1f4795a198c25ed882d, type: 2} + initialSkinName: + fixPrefabOverrideViaMeshFilter: 2 + initialFlipX: 0 + initialFlipY: 0 + updateWhenInvisible: 3 + separatorSlotNames: [] + zSpacing: 0 + useClipping: 1 + immutableTriangles: 0 + pmaVertexColors: 1 + clearStateOnDisable: 0 + tintBlack: 0 + singleSubmesh: 0 + fixDrawOrder: 0 + addNormals: 0 + calculateTangents: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] + disableRenderingOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} + updateTiming: 1 + unscaledTime: 0 + _animationName: IdleNormal + loop: 0 + timeScale: 1 +--- !u!33 &183186261584935481 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 672328621937310823} + m_Mesh: {fileID: 0} --- !u!1 &5897095096647521783 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} @@ -323,41 +703,100 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: k__BackingField: {fileID: 5927803667513949971} - k__BackingField: {fileID: 6077686033771388879} - k__BackingField: {fileID: 8975593228546502023} - k__BackingField: {fileID: 8793236136028073839} - k__BackingField: {fileID: 2100000, guid: 9bce0db68fc4c4d428fa601508de489d, type: 2} + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 6533109861150454071} + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 1653087204473300138} k__BackingField: 1 k__BackingField: 0.8 + k__BackingField: IsOpened: 0 + _spineController: {fileID: 3688680572007923171} _liquidImage: {fileID: 6817574259189873408} _fill: {fileID: 7052380446467937511} _colorIntensity: 2 _idx: + _interactionEntryName: _liquidData: k__BackingField: k__BackingField: + k__BackingField: 0 k__BackingField: 0 k__BackingField: {fileID: 0} k__BackingField: {r: 0, g: 0, b: 0, a: 0} - _currentAmount: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + _playerHoldingTime: 3 +--- !u!114 &3688680572007923171 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5897095096647521783} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be4f815e5e3c0d5459559bdc0b8bbbfb, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: {fileID: 9135412363656340666} + _originalMaterial: {fileID: 2100000, guid: afbe92892990bdb44bd15a50fde3cdb8, type: 2} + _replacementMaterial: {fileID: 2100000, guid: d3ef6919547b3674bbeaccbed03a5ad9, type: 2} + _initialSkinName: default + _isRandomSkin: 0 + _isRandomRange: 0 + _randomRange: {x: 0, y: 0} + _randomStrings: [] +--- !u!114 &1653087204473300138 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5897095096647521783} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3} + m_Name: + m_EditorClassIdentifier: + m_StringReference: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: + - name: global + variable: + rid: 5889118636641091760 + m_FormatArguments: [] + m_UpdateString: + m_PersistentCalls: + m_Calls: [] + references: + version: 2 + RefIds: + - rid: 5889118636641091760 + type: {class: NestedVariablesGroup, ns: UnityEngine.Localization.SmartFormat.PersistentVariables, asm: Unity.Localization} + data: + m_Value: {fileID: 11400000, guid: f81887433cf7f6c4a991e214ea0eda59, type: 2} --- !u!4 &5927803667513949971 stripped Transform: m_CorrespondingSourceObject: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} m_PrefabInstance: {fileID: 7343451337687172630} m_PrefabAsset: {fileID: 0} ---- !u!212 &6077686033771388879 stripped -SpriteRenderer: - m_CorrespondingSourceObject: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - m_PrefabInstance: {fileID: 7343451337687172630} - m_PrefabAsset: {fileID: 0} ---- !u!224 &8793236136028073839 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - m_PrefabInstance: {fileID: 7343451337687172630} - m_PrefabAsset: {fileID: 0} ---- !u!223 &8975593228546502023 stripped -Canvas: - m_CorrespondingSourceObject: {fileID: 1830317875510668177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} +--- !u!114 &6533109861150454071 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4558604739080582945, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} m_PrefabInstance: {fileID: 7343451337687172630} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9ebe6250da0dfa044937230037499988, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel.prefab.meta b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel.prefab.meta index acc013511..c6b1774de 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel.prefab.meta +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7787d3d2cd258714d816e70592966cb3 +guid: 224465767a13abb44b0d3adb16ca76c1 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel01.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel01.prefab deleted file mode 100644 index 30543a7a6..000000000 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel01.prefab +++ /dev/null @@ -1,673 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &808268910254764035 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6100785980319710662} - - component: {fileID: 2324181370382069895} - m_Layer: 8 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6100785980319710662 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 808268910254764035} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 203741387490724426} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &2324181370382069895 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 808268910254764035} - 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_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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: 2 - m_Sprite: {fileID: 21300000, guid: 324c91ab3ca459f4bad7e4187c5fe278, 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!1 &5773649549535946419 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3774058579297377381} - - component: {fileID: 7243116579515171002} - m_Layer: 8 - m_Name: LiquidImageBackground - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3774058579297377381 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5773649549535946419} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.508, y: 0, z: 0} - m_LocalScale: {x: -1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5506324081944544526} - m_Father: {fileID: 203741387490724426} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &7243116579515171002 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5773649549535946419} - 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_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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: 3 - m_Sprite: {fileID: 21300000, guid: d2ba40b4f14eca14e816e51ee69cf81a, 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!1 &6581422458203868687 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5506324081944544526} - - component: {fileID: 6817574259189873408} - m_Layer: 8 - m_Name: LiquidImage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5506324081944544526 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6581422458203868687} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.01, y: 0.18, z: 0} - m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 3774058579297377381} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &6817574259189873408 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6581422458203868687} - 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_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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: 4 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, 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!1 &8294670532554988959 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3246572212746126634} - - component: {fileID: 7052380446467937511} - m_Layer: 8 - m_Name: Fill - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3246572212746126634 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8294670532554988959} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.02, y: 0, z: 0} - m_LocalScale: {x: 0.85, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 203741387490724426} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &7052380446467937511 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8294670532554988959} - 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_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: d5d9120849e43474aaafba12ab84fc47, 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: 1 - m_Sprite: {fileID: 21300000, guid: c7ce7fbf3a68ec040ab6006a84f75785, 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!1001 &7343451337687172630 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalScale.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalScale.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalScale.z - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 40 - objectReference: {fileID: 0} - - target: {fileID: 2106642157007834423, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_AnchoredPosition.y - value: 80 - objectReference: {fileID: 0} - - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 11d1c47204e2d8b4d94e7b57e388252f, type: 3} - - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_WasSpriteAssigned - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: 'm_Materials.Array.data[0]' - value: - objectReference: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - - target: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_Name - value: LiquidBarrel01 - objectReference: {fileID: 0} - - target: {fileID: 3779548209033231211, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: d98551edcbd98e542af000fc7aaaf794, type: 3} - - target: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalPosition.x - value: -0.17 - objectReference: {fileID: 0} - - target: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5953080908505751474, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_AnchoredPosition.y - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7192483373850935599, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7192483373850935599, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7192483373850935599, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7192483373850935599, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalRotation.w - value: 0.9396927 - objectReference: {fileID: 0} - - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalRotation.x - value: 0.3420201 - objectReference: {fileID: 0} - - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 40 - objectReference: {fileID: 0} - - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalScale.x - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalScale.y - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalScale.z - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 11d1c47204e2d8b4d94e7b57e388252f, type: 3} - - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_WasSpriteAssigned - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - insertIndex: -1 - addedObject: {fileID: 3774058579297377381} - - targetCorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - insertIndex: -1 - addedObject: {fileID: 3246572212746126634} - - targetCorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - insertIndex: -1 - addedObject: {fileID: 6100785980319710662} - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - insertIndex: -1 - addedObject: {fileID: 223172209862223209} - - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - insertIndex: -1 - addedObject: {fileID: 1653087204473300138} - m_SourcePrefab: {fileID: 100100000, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} ---- !u!4 &203741387490724426 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - m_PrefabInstance: {fileID: 7343451337687172630} - m_PrefabAsset: {fileID: 0} ---- !u!1 &5897095096647521783 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - m_PrefabInstance: {fileID: 7343451337687172630} - m_PrefabAsset: {fileID: 0} ---- !u!114 &223172209862223209 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5897095096647521783} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3} - m_Name: - m_EditorClassIdentifier: - k__BackingField: {fileID: 5927803667513949971} - k__BackingField: {fileID: 6077686033771388879} - k__BackingField: {fileID: 6533109861150454071} - k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2} - k__BackingField: {fileID: 1653087204473300138} - k__BackingField: 1 - k__BackingField: 0.8 - k__BackingField: - IsOpened: 0 - _liquidImage: {fileID: 6817574259189873408} - _fill: {fileID: 7052380446467937511} - _colorIntensity: 2 - _idx: - _interactionEntryName: - _liquidData: - k__BackingField: - k__BackingField: - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: {fileID: 0} - k__BackingField: {r: 0, g: 0, b: 0, a: 0} - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - _originalSprite: {fileID: 21300000, guid: 11d1c47204e2d8b4d94e7b57e388252f, type: 3} - _moldSprite: {fileID: 21300000, guid: ba260ff89030fda4b99b2bb66f6da61d, type: 3} - _playerHoldingTime: 3 ---- !u!114 &1653087204473300138 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5897095096647521783} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3} - m_Name: - m_EditorClassIdentifier: - m_StringReference: - m_TableReference: - m_TableCollectionName: - m_TableEntryReference: - m_KeyId: 0 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: - - name: global - variable: - rid: 5889118636641091760 - m_FormatArguments: [] - m_UpdateString: - m_PersistentCalls: - m_Calls: [] - references: - version: 2 - RefIds: - - rid: 5889118636641091760 - type: {class: NestedVariablesGroup, ns: UnityEngine.Localization.SmartFormat.PersistentVariables, asm: Unity.Localization} - data: - m_Value: {fileID: 11400000, guid: f81887433cf7f6c4a991e214ea0eda59, type: 2} ---- !u!4 &5927803667513949971 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - m_PrefabInstance: {fileID: 7343451337687172630} - m_PrefabAsset: {fileID: 0} ---- !u!212 &6077686033771388879 stripped -SpriteRenderer: - m_CorrespondingSourceObject: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - m_PrefabInstance: {fileID: 7343451337687172630} - m_PrefabAsset: {fileID: 0} ---- !u!114 &6533109861150454071 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4558604739080582945, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - m_PrefabInstance: {fileID: 7343451337687172630} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9ebe6250da0dfa044937230037499988, type: 3} - m_Name: - m_EditorClassIdentifier: diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab index c336a83e9..6a75291a7 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab @@ -426,6 +426,7 @@ MonoBehaviour: k__BackingField: 0.8 k__BackingField: IsOpened: 0 + _spineController: {fileID: 0} _liquidImage: {fileID: 6817574259189873408} _fill: {fileID: 7052380446467937511} _colorIntensity: 2 @@ -439,11 +440,10 @@ MonoBehaviour: k__BackingField: {fileID: 0} k__BackingField: {r: 0, g: 0, b: 0, a: 0} k__BackingField: 0 + k__BackingField: 1 k__BackingField: 0 k__BackingField: 0 k__BackingField: 0 - _originalSprite: {fileID: 0} - _moldSprite: {fileID: 0} _playerHoldingTime: 3 --- !u!114 &7967298876764243330 MonoBehaviour: diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Mushroom.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/Mushroom.prefab index 8a0b3efb9..6422950d2 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/Mushroom.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/Mushroom.prefab @@ -196,11 +196,13 @@ MonoBehaviour: k__BackingField: {fileID: 6077686033771388879} k__BackingField: {fileID: 6533109861150454071} k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2} + k__BackingField: {fileID: 0} k__BackingField: 1 k__BackingField: 0.6 k__BackingField: IsOpened: 0 _playerHoldingTime: 3 + _heartSprite: {fileID: 21300000, guid: 8de91ee4e8525bb46bb309c15c5207d3, type: 3} --- !u!114 &9176172352370892430 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable02.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable02.prefab index f7348406e..c28e12ddb 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable02.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable02.prefab @@ -130,7 +130,7 @@ PrefabInstance: - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 9e508ffd6f8853c4c8b20b63ad90622d, type: 3} + objectReference: {fileID: 21300000, guid: 2c91f9927b2422c4382675d00e294834, type: 3} - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_WasSpriteAssigned value: 1 @@ -151,21 +151,25 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.x value: 30 objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7624213675240184438, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.x - value: 1 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.y - value: 1 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.z - value: 1 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter.atlas.txt b/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter.atlas.txt index edc5ba63b..b15bd9f1f 100644 --- a/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter.atlas.txt +++ b/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter.atlas.txt @@ -1,57 +1,66 @@ MainCharacter.png -size:2014,935 +size:2033,1478 filter:Linear,Linear 02/Belt -bounds:306,37,191,74 +bounds:1080,10,191,74 +rotate:90 02/Body -bounds:1463,212,202,207 +bounds:1507,241,202,207 02/Eye_Left -bounds:1667,204,197,229 +bounds:1834,1064,197,229 02/Eye_Right -bounds:1387,10,200,229 -rotate:90 +bounds:1305,219,200,229 02/Face -bounds:583,454,556,479 +bounds:2,339,556,479 +rotate:90 02/HairMini_Left -bounds:587,277,175,379 -rotate:90 +bounds:559,2,175,379 02/HairMini_Right -bounds:1831,459,181,474 +bounds:1553,1295,181,474 +rotate:90 02/Hair_Back -bounds:2,412,579,521 +bounds:2,897,579,521 +rotate:90 02/Hair_Front -bounds:1140,13,245,223 +bounds:1080,203,245,223 +rotate:90 02/Hair_Left -bounds:968,115,170,337 +bounds:908,44,170,337 02/Hair_Right -bounds:587,105,170,355 -rotate:90 +bounds:736,26,170,355 02/Hair_Top -bounds:1866,299,129,158 +bounds:1887,290,129,158 02/Hand_Left -bounds:1618,28,174,200 -rotate:90 +bounds:1711,248,174,200 02/Hand_Right -bounds:1820,2,174,200 +bounds:1743,46,174,200 02/Leg_Left -bounds:499,5,98,174 +bounds:1834,964,98,174 rotate:90 02/Leg_Right -bounds:675,14,89,174 -rotate:90 +bounds:1919,114,89,174 02/Mouse -bounds:944,216,59,22 -rotate:90 +bounds:185,11,59,22 02/Pant -bounds:944,28,190,85 -Item/BeerFull -bounds:1141,421,512,512 -Item/Cleaningbroom3 -bounds:1655,435,174,498 -Item/Cleaningstic -bounds:1140,238,181,321 +bounds:1156,11,190,85 rotate:90 +Item/BeerFull +bounds:483,383,512,512 +Item/Bet +bounds:525,964,512,512 +Item/Cleaningbroom3 +bounds:1243,27,174,498 +rotate:90 +Item/Cleaningstic +bounds:2,16,181,321 Item/Shaker -bounds:2,38,302,372 +bounds:185,35,302,372 +rotate:90 +Item/SlimeStick +bounds:997,450,512,512 +Item/SwingEffect +bounds:1039,964,512,512 +Item/Whip +bounds:1511,450,512,512 Item/dust -bounds:306,113,279,297 +bounds:1553,996,279,297 diff --git a/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter.png b/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter.png index 738f4b034..77daf245a 100644 Binary files a/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter.png and b/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter.png differ diff --git a/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter.skel.bytes b/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter.skel.bytes index 70a79985a..49992d8f3 100644 Binary files a/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter.skel.bytes and b/Assets/08.Spines/Characters/Players/Tycoons/MainCharacter.skel.bytes differ diff --git a/Assets/08.Spines/Props/Barrel.meta b/Assets/08.Spines/Props/Barrel.meta new file mode 100644 index 000000000..bbbf52129 --- /dev/null +++ b/Assets/08.Spines/Props/Barrel.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ac29aa72dee900646a16ade3249666ef +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Props/Barrel/Barrel.atlas.txt b/Assets/08.Spines/Props/Barrel/Barrel.atlas.txt new file mode 100644 index 000000000..9490200ee --- /dev/null +++ b/Assets/08.Spines/Props/Barrel/Barrel.atlas.txt @@ -0,0 +1,18 @@ +Barrel.png +size:2019,507 +filter:Linear,Linear +Barrel_Clean +bounds:2,2,503,473 +rotate:90 +Barrel_Dirty +bounds:477,2,503,473 +rotate:90 +DirtyLine01 +bounds:1413,21,484,459 +rotate:90 +DirtyLine02 +bounds:952,14,491,459 +rotate:90 +Head +bounds:1874,326,179,143 +rotate:90 diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel01.prefab.meta b/Assets/08.Spines/Props/Barrel/Barrel.atlas.txt.meta similarity index 62% rename from Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel01.prefab.meta rename to Assets/08.Spines/Props/Barrel/Barrel.atlas.txt.meta index c6b1774de..3426208b0 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel01.prefab.meta +++ b/Assets/08.Spines/Props/Barrel/Barrel.atlas.txt.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 224465767a13abb44b0d3adb16ca76c1 -PrefabImporter: +guid: 7386fdbb973288f48bcbf3601e63eeef +TextScriptImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/08.Spines/Props/Barrel/Barrel.png b/Assets/08.Spines/Props/Barrel/Barrel.png new file mode 100644 index 000000000..43665ae44 Binary files /dev/null and b/Assets/08.Spines/Props/Barrel/Barrel.png differ diff --git a/Assets/08.Spines/Props/Barrel/Barrel.png.meta b/Assets/08.Spines/Props/Barrel/Barrel.png.meta new file mode 100644 index 000000000..bb3352512 --- /dev/null +++ b/Assets/08.Spines/Props/Barrel/Barrel.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 60e606e60be671f4484463d3abd9b15e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Props/Barrel/Barrel.skel.bytes b/Assets/08.Spines/Props/Barrel/Barrel.skel.bytes new file mode 100644 index 000000000..7148e2f6f Binary files /dev/null and b/Assets/08.Spines/Props/Barrel/Barrel.skel.bytes differ diff --git a/Assets/08.Spines/Props/Barrel/Barrel.skel.bytes.meta b/Assets/08.Spines/Props/Barrel/Barrel.skel.bytes.meta new file mode 100644 index 000000000..7bee2b1dd --- /dev/null +++ b/Assets/08.Spines/Props/Barrel/Barrel.skel.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b0ca475f51549f941bfd2c8cb9a20c0d +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Props/Barrel/Barrel_Atlas.asset b/Assets/08.Spines/Props/Barrel/Barrel_Atlas.asset new file mode 100644 index 000000000..d704e1b34 --- /dev/null +++ b/Assets/08.Spines/Props/Barrel/Barrel_Atlas.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} + m_Name: Barrel_Atlas + m_EditorClassIdentifier: + textureLoadingMode: 0 + onDemandTextureLoader: {fileID: 0} + atlasFile: {fileID: 4900000, guid: 7386fdbb973288f48bcbf3601e63eeef, type: 3} + materials: + - {fileID: 2100000, guid: afbe92892990bdb44bd15a50fde3cdb8, type: 2} diff --git a/Assets/08.Spines/Props/Barrel/Barrel_Atlas.asset.meta b/Assets/08.Spines/Props/Barrel/Barrel_Atlas.asset.meta new file mode 100644 index 000000000..355ac9c49 --- /dev/null +++ b/Assets/08.Spines/Props/Barrel/Barrel_Atlas.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5ef1e5ec1df26b74b8e608bb4064618a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Props/Barrel/Barrel_Material.mat b/Assets/08.Spines/Props/Barrel/Barrel_Material.mat new file mode 100644 index 000000000..bceda03af --- /dev/null +++ b/Assets/08.Spines/Props/Barrel/Barrel_Material.mat @@ -0,0 +1,46 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Barrel_Material + m_Shader: {fileID: 4800000, guid: b2f45941d9f4fe9479ce1aebb9d63fbf, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _STRAIGHT_ALPHA_INPUT + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 60e606e60be671f4484463d3abd9b15e, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Cutoff: 0.1 + - _DoubleSidedLighting: 0 + - _LightAffectsAdditive: 0 + - _ReceiveShadows: 0 + - _StencilComp: 8 + - _StencilRef: 1 + - _StraightAlphaInput: 1 + - _TintBlack: 0 + - _ZWrite: 0 + m_Colors: + - _Black: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/08.Spines/Props/Barrel/Barrel_Material.mat.meta b/Assets/08.Spines/Props/Barrel/Barrel_Material.mat.meta new file mode 100644 index 000000000..2a97b6c42 --- /dev/null +++ b/Assets/08.Spines/Props/Barrel/Barrel_Material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: afbe92892990bdb44bd15a50fde3cdb8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Props/Barrel/Barrel_SkeletonData.asset b/Assets/08.Spines/Props/Barrel/Barrel_SkeletonData.asset new file mode 100644 index 000000000..bc66f2d6b --- /dev/null +++ b/Assets/08.Spines/Props/Barrel/Barrel_SkeletonData.asset @@ -0,0 +1,31 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} + m_Name: Barrel_SkeletonData + m_EditorClassIdentifier: + atlasAssets: + - {fileID: 11400000, guid: 5ef1e5ec1df26b74b8e608bb4064618a, type: 2} + scale: 0.002 + skeletonJSON: {fileID: 4900000, guid: b0ca475f51549f941bfd2c8cb9a20c0d, type: 3} + isUpgradingBlendModeMaterials: 0 + blendModeMaterials: + requiresBlendModeMaterials: 0 + applyAdditiveMaterial: 1 + additiveMaterials: [] + multiplyMaterials: [] + screenMaterials: [] + skeletonDataModifiers: [] + fromAnimation: [] + toAnimation: [] + duration: [] + defaultMix: 0.2 + controller: {fileID: 0} diff --git a/Assets/08.Spines/Props/Barrel/Barrel_SkeletonData.asset.meta b/Assets/08.Spines/Props/Barrel/Barrel_SkeletonData.asset.meta new file mode 100644 index 000000000..2f37ac1fc --- /dev/null +++ b/Assets/08.Spines/Props/Barrel/Barrel_SkeletonData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 51291e8deacbf1f4795a198c25ed882d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/13.Localization/Tables/StringDataTable Shared Data.asset b/Assets/13.Localization/Tables/StringDataTable Shared Data.asset index 09bc1512b..f5a06269f 100644 --- a/Assets/13.Localization/Tables/StringDataTable Shared Data.asset +++ b/Assets/13.Localization/Tables/StringDataTable Shared Data.asset @@ -271,6 +271,10 @@ MonoBehaviour: m_Key: Confirm m_Metadata: m_Items: [] + - m_Id: 1035891578306560 + m_Key: LiquidA + m_Metadata: + m_Items: [] m_Metadata: m_Items: [] m_KeyGenerator: