diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index 07cd043c9..6d0b3a89d 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -2529,7 +2529,7 @@ RectTransform: m_Father: {fileID: 1465182613} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0.719, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -6705,7 +6705,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.y - value: -30 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.z @@ -10184,11 +10184,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.x - value: -120 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.y - value: -30 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.z @@ -10901,11 +10901,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.x - value: 120 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.y - value: -30 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.z @@ -16721,6 +16721,7 @@ GameObject: - component: {fileID: 1434161267} - component: {fileID: 1434161269} - component: {fileID: 1434161268} + - component: {fileID: 1434161270} m_Layer: 0 m_Name: Chain m_TagString: Untagged @@ -16820,6 +16821,20 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1434161266} m_CullTransparentMesh: 0 +--- !u!114 &1434161270 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1434161266} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: {x: -180, y: 0, z: 60, w: 70} + m_Softness: {x: 0, y: 0} --- !u!1 &1434358734 GameObject: m_ObjectHideFlags: 0 @@ -20018,11 +20033,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.x - value: -60 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.y - value: -30 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.z @@ -22590,11 +22605,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.x - value: 60 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.y - value: -30 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} propertyPath: m_LocalPosition.z @@ -23236,7 +23251,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1929565891 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/02.Scripts/Character/Player/Tycoon/State/InteractionState.cs b/Assets/02.Scripts/Character/Player/Tycoon/State/InteractionState.cs index e8d211a07..b686c3ecc 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/State/InteractionState.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/State/InteractionState.cs @@ -55,6 +55,10 @@ namespace BlueWater.Players.Tycoons { return TycoonPlayerSpineAnimation.CleaningTable; } + if (character.IsCleaningMold) + { + return TycoonPlayerSpineAnimation.AttackLimeTree; + } if (character.IsPumping) { return TycoonPlayerSpineAnimation.Pumping; @@ -65,7 +69,7 @@ namespace BlueWater.Players.Tycoons } if (character.IsInteractedLimeTreeGarnish) { - return TycoonPlayerSpineAnimation.AttackBat; + return TycoonPlayerSpineAnimation.AttackLimeTree; } return null; diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs index 909a85705..fee8d07f5 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs @@ -21,7 +21,7 @@ namespace BlueWater.Players.Tycoons public const string MakingCocktail = "BeerMaker"; public const string Pumping = "AttackWhip"; public const string AttackSlime = "AttackSlime"; - public const string AttackBat = "AttackBat"; + public const string AttackLimeTree = "AttackBat"; } [DefaultExecutionOrder(-1)] @@ -72,6 +72,7 @@ namespace BlueWater.Players.Tycoons public bool IsCleaningFloor { get; set; } public bool IsCleaningTable { get; set; } + public bool IsCleaningMold { get; set; } public bool IsMakingCocktail { get; set; } public bool IsPumping { get; set; } public bool IsInteractedSlimeGarnish { get; set; } diff --git a/Assets/02.Scripts/Prop/Tycoon/LiquidBarrel.cs b/Assets/02.Scripts/Prop/Tycoon/LiquidBarrel.cs index 7d6e59455..12a594c13 100644 --- a/Assets/02.Scripts/Prop/Tycoon/LiquidBarrel.cs +++ b/Assets/02.Scripts/Prop/Tycoon/LiquidBarrel.cs @@ -108,6 +108,7 @@ namespace BlueWater.Tycoons } else { + GameManager.Instance.CurrentTycoonPlayer.IsCleaningMold = true; _isPlayerInteracting = true; } } @@ -121,6 +122,7 @@ namespace BlueWater.Tycoons } else { + GameManager.Instance.CurrentTycoonPlayer.IsCleaningMold = false; _isPlayerInteracting = false; HoldingElapsedTime = 0f; } diff --git a/Assets/02.Scripts/Ui/Tycoon/ExpUi.cs b/Assets/02.Scripts/Ui/Tycoon/ExpUi.cs index 8b276ffca..a4fabe010 100644 --- a/Assets/02.Scripts/Ui/Tycoon/ExpUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/ExpUi.cs @@ -16,7 +16,7 @@ namespace BlueWater.Uis [SerializeField, Required] private TMP_Text _levelText; - [SerializeField, Required] + [SerializeField] private Slider _expSlider; [SerializeField] @@ -47,7 +47,10 @@ namespace BlueWater.Uis EventManager.OnChangeExp += ChangeExp; EventManager.OnLevelUp += ChangeLevel; - _expSlider.value = 0f; + if (_expSlider) + { + _expSlider.value = 0f; + } _originalColor = _filledImage.color; _expSliderTween = _filledImage.DOColor(Color.white, 0.25f) .SetAutoKill(false) @@ -108,7 +111,10 @@ namespace BlueWater.Uis var newExp = Mathf.Lerp(startExp, endExp, elapsedTime / _animationTime); TycoonManager.Instance.TycoonStatus.CurrentExp = (int)newExp; var expClamp = Mathf.Clamp01(newExp / requireExp); - _expSlider.value = expClamp; + if (_expSlider) + { + _expSlider.value = expClamp; + } if (newExp >= requireExp) { @@ -120,8 +126,11 @@ namespace BlueWater.Uis AudioManager.Instance.PlaySfx(_levelUpSfxName); currentLevelData = TycoonManager.Instance.GetCurrentLevelData(); requireExp = currentLevelData.RequiredExp; - - _expSlider.value = 0f; + + if (_expSlider) + { + _expSlider.value = 0f; + } newExp = 0; TycoonManager.Instance.TycoonStatus.CurrentExp = (int)newExp; startExp = 0; diff --git a/Assets/03.Images/Maps/Tycoon/CarpetOff.png b/Assets/03.Images/Maps/Tycoon/CarpetOff.png new file mode 100644 index 000000000..1b09a3bec Binary files /dev/null and b/Assets/03.Images/Maps/Tycoon/CarpetOff.png differ diff --git a/Assets/03.Images/Maps/Tycoon/CarpetOff.png.meta b/Assets/03.Images/Maps/Tycoon/CarpetOff.png.meta new file mode 100644 index 000000000..bb1b7475d --- /dev/null +++ b/Assets/03.Images/Maps/Tycoon/CarpetOff.png.meta @@ -0,0 +1,166 @@ +fileFormatVersion: 2 +guid: 881e14fb05ecca444b56b327bd18e2de +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: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: CarpetOff_0 + rect: + serializedVersion: 2 + x: 4 + y: 158 + width: 502 + height: 183 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 75dc324aac2c6864b8bbf33a08cc1753 + internalID: 1981829358 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 87e5f13733c666c4aa00ae145f2f9a10 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + CarpetOff_0: 1981829358 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Maps/Tycoon/Carpet.png b/Assets/03.Images/Maps/Tycoon/CarpetOn.png similarity index 100% rename from Assets/03.Images/Maps/Tycoon/Carpet.png rename to Assets/03.Images/Maps/Tycoon/CarpetOn.png diff --git a/Assets/03.Images/Maps/Tycoon/Carpet.png.meta b/Assets/03.Images/Maps/Tycoon/CarpetOn.png.meta similarity index 100% rename from Assets/03.Images/Maps/Tycoon/Carpet.png.meta rename to Assets/03.Images/Maps/Tycoon/CarpetOn.png.meta diff --git a/Assets/03.Images/Props/Environment/Tycoons/Dirty01.png b/Assets/03.Images/Props/Environment/Tycoons/Dirty01.png index 83e6a574b..c911439d9 100644 Binary files a/Assets/03.Images/Props/Environment/Tycoons/Dirty01.png and b/Assets/03.Images/Props/Environment/Tycoons/Dirty01.png differ diff --git a/Assets/03.Images/Props/Environment/Tycoons/Dirty02.png b/Assets/03.Images/Props/Environment/Tycoons/Dirty02.png index cbd077303..e17e3cf8d 100644 Binary files a/Assets/03.Images/Props/Environment/Tycoons/Dirty02.png and b/Assets/03.Images/Props/Environment/Tycoons/Dirty02.png differ diff --git a/Assets/03.Images/Props/Furniture/MoneyCounter01.png b/Assets/03.Images/Props/Furniture/MoneyCounter01.png index c848044e9..efecfa1e8 100644 Binary files a/Assets/03.Images/Props/Furniture/MoneyCounter01.png and b/Assets/03.Images/Props/Furniture/MoneyCounter01.png differ diff --git a/Assets/03.Images/Props/Furniture/MoneyCounter02.png b/Assets/03.Images/Props/Furniture/MoneyCounter02.png index 68a690dd4..954a38cb0 100644 Binary files a/Assets/03.Images/Props/Furniture/MoneyCounter02.png and b/Assets/03.Images/Props/Furniture/MoneyCounter02.png differ diff --git a/Assets/03.Images/Props/Furniture/MoneyCounter03.png b/Assets/03.Images/Props/Furniture/MoneyCounter03.png index c600e3313..dc908ec47 100644 Binary files a/Assets/03.Images/Props/Furniture/MoneyCounter03.png and b/Assets/03.Images/Props/Furniture/MoneyCounter03.png differ diff --git a/Assets/03.Images/Props/Furniture/MoneyCounterEmpty.png b/Assets/03.Images/Props/Furniture/MoneyCounterEmpty.png index 76665fbf5..14897e109 100644 Binary files a/Assets/03.Images/Props/Furniture/MoneyCounterEmpty.png and b/Assets/03.Images/Props/Furniture/MoneyCounterEmpty.png differ diff --git a/Assets/03.Images/Props/Furniture/Vomiting.png b/Assets/03.Images/Props/Furniture/Vomiting.png index 22c39a7be..1398e05b4 100644 Binary files a/Assets/03.Images/Props/Furniture/Vomiting.png and b/Assets/03.Images/Props/Furniture/Vomiting.png differ diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/MoneyCounter.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/MoneyCounter.prefab index d418be7c6..4ac245bcc 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/MoneyCounter.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/MoneyCounter.prefab @@ -1,5 +1,141 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &8666890926474269071 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 630232741387001819} + - component: {fileID: 2009489192189582172} + - component: {fileID: 8716460605447754239} + m_Layer: 0 + m_Name: GoldCountText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &630232741387001819 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8666890926474269071} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 8469578238684922817} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.20000029, y: 0.8999999} + m_SizeDelta: {x: 2.5, y: 1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2009489192189582172 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8666890926474269071} + m_CullTransparentMesh: 1 +--- !u!114 &8716460605447754239 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8666890926474269071} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 1000000 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 0.6 + m_fontSizeBase: 0.1 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 0.05 + m_fontSizeMax: 1 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1001 &7343451337687172630 PrefabInstance: m_ObjectHideFlags: 0 @@ -12,6 +148,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.x value: 40 objectReference: {fileID: 0} + - target: {fileID: 1702261025824090784, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_SortingOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2106642157007834423, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_IsActive value: 1 @@ -174,7 +314,10 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 630232741387001819} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} insertIndex: -1 @@ -279,3 +422,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9ebe6250da0dfa044937230037499988, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &8469578238684922817 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0}