diff --git a/Assets/--2025/Icons/GUI_Parts/Gui_parts/Mini_frame2.png.meta b/Assets/--2025/Icons/GUI_Parts/Gui_parts/Mini_frame2.png.meta index 23a1a098..2ca2e189 100644 --- a/Assets/--2025/Icons/GUI_Parts/Gui_parts/Mini_frame2.png.meta +++ b/Assets/--2025/Icons/GUI_Parts/Gui_parts/Mini_frame2.png.meta @@ -1,9 +1,16 @@ fileFormatVersion: 2 guid: 6a05953725450a442897308eb7564337 +AssetOrigin: + serializedVersion: 1 + productId: 159068 + packageName: GUI Parts + packageVersion: 1.0 + assetPath: Assets/GUI_Parts/Gui_parts/Mini_frame2.png + uploadId: 342429 TextureImporter: - fileIDToRecycleName: {} + internalIDToNameTable: [] externalObjects: {} - serializedVersion: 9 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -20,9 +27,12 @@ TextureImporter: 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 @@ -31,9 +41,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -46,7 +56,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 19, y: 19, z: 19, w: 19} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -54,11 +64,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 4 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -68,28 +84,54 @@ TextureImporter: 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: 1 + 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: 1 + 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: d1282158601ee654798ec4bff5c1564e + internalID: 1880386507 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 159068 - packageName: GUI Parts - packageVersion: 1.0 - assetPath: Assets/GUI_Parts/Gui_parts/Mini_frame2.png - uploadId: 342429 diff --git a/Assets/-UI/InventorySlot.prefab b/Assets/-UI/InventorySlot.prefab index e1079d1d..02831944 100644 --- a/Assets/-UI/InventorySlot.prefab +++ b/Assets/-UI/InventorySlot.prefab @@ -217,6 +217,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7387994330305630517, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} + propertyPath: m_PixelsPerUnitMultiplier + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7914226979756260339, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} propertyPath: m_Name value: OptionMenuBorder diff --git a/Assets/-UI/LArgeMenuBorder.prefab b/Assets/-UI/LArgeMenuBorder.prefab index de7c27cb..1fcc6608 100644 --- a/Assets/-UI/LArgeMenuBorder.prefab +++ b/Assets/-UI/LArgeMenuBorder.prefab @@ -58,14 +58,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.16, g: 0.3758432, b: 0.8, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f55132da3e510d74f9d700085c3b8f1d, type: 3} + m_Sprite: {fileID: 21300000, guid: 6a05953725450a442897308eb7564337, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/-UI/OptionMenuBorder.prefab b/Assets/-UI/OptionMenuBorder.prefab index 809e3cf2..4fe9c90d 100644 --- a/Assets/-UI/OptionMenuBorder.prefab +++ b/Assets/-UI/OptionMenuBorder.prefab @@ -59,14 +59,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.16078432, g: 0.3764706, b: 0.8, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b85a4681ffe53fa4bbf68b081419c52e, type: 3} + m_Sprite: {fileID: 21300000, guid: 4293f3f43e7a5524dbcb191b0ef09d9c, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -88,5 +88,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3bfc537bd2ebd5a458f8c4d0d6a1698e, type: 3} m_Name: m_EditorClassIdentifier: - Normal: {r: 0.16078432, g: 0.3764706, b: 0.8, a: 1} - Hover: {r: 0, g: 0.060203552, b: 1, a: 1} + Normal: {r: 1, g: 1, b: 1, a: 1} + Hover: {r: 1, g: 0.70980394, b: 0.41960785, a: 1} diff --git a/Assets/1-Packs/Effects/ARPG Effects/Materials/Loot/beam_red.mat b/Assets/1-Packs/Effects/ARPG Effects/Materials/Loot/beam_red.mat index 692cba07..f6be8f80 100644 --- a/Assets/1-Packs/Effects/ARPG Effects/Materials/Loot/beam_red.mat +++ b/Assets/1-Packs/Effects/ARPG Effects/Materials/Loot/beam_red.mat @@ -32,11 +32,13 @@ Material: m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: - RenderType: Opaque + RenderType: Transparent disabledShaderPasses: - GRABPASS + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -74,8 +76,8 @@ Material: - _DistortionEnabled: 0 - _DistortionStrength: 1 - _DistortionStrengthScaled: 0 - - _DstBlend: 0 - - _DstBlendAlpha: 0 + - _DstBlend: 1 + - _DstBlendAlpha: 1 - _EmissionEnabled: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -86,10 +88,10 @@ Material: - _SoftParticlesEnabled: 0 - _SoftParticlesFarFadeDistance: 1 - _SoftParticlesNearFadeDistance: 0 - - _SrcBlend: 1 + - _SrcBlend: 5 - _SrcBlendAlpha: 1 - _Surface: 1 - - _ZWrite: 1 + - _ZWrite: 0 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Character Stats/Examples/Items & Inventory/Prefabs/Character Panel.prefab b/Assets/Character Stats/Examples/Items & Inventory/Prefabs/Character Panel.prefab index 3f1cbd68..4a11d57b 100644 --- a/Assets/Character Stats/Examples/Items & Inventory/Prefabs/Character Panel.prefab +++ b/Assets/Character Stats/Examples/Items & Inventory/Prefabs/Character Panel.prefab @@ -62,14 +62,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0.00485672, b: 0.11320752, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 5cb427ca385cd1248bd3913dbcd3de5a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -403,14 +403,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0.003921569, b: 0.11372549, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 66efb24ed46044ab8a039599cbc47d7b, type: 3} + m_Sprite: {fileID: 21300000, guid: 5cb427ca385cd1248bd3913dbcd3de5a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -502,8 +502,8 @@ MonoBehaviour: m_Calls: [] m_text: 10 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: c8598f6e0154faa4490d1bd6afcda69c, type: 2} - m_sharedMaterial: {fileID: 2436215601175455127, guid: c8598f6e0154faa4490d1bd6afcda69c, type: 2} + m_fontAsset: {fileID: 11400000, guid: 41f9368fce25cb44ba223ac55f4e69e1, type: 2} + m_sharedMaterial: {fileID: -1192090701822111264, guid: 41f9368fce25cb44ba223ac55f4e69e1, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -711,8 +711,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -42.500095, y: -1.5} - m_SizeDelta: {x: -84.99981, y: -13} + m_AnchoredPosition: {x: -42.5, y: -1.5} + m_SizeDelta: {x: -85, y: -13} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &22249554 CanvasRenderer: @@ -744,8 +744,8 @@ MonoBehaviour: m_Calls: [] m_text: 0 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: c8598f6e0154faa4490d1bd6afcda69c, type: 2} - m_sharedMaterial: {fileID: 2436215601175455127, guid: c8598f6e0154faa4490d1bd6afcda69c, type: 2} + m_fontAsset: {fileID: 11400000, guid: 41f9368fce25cb44ba223ac55f4e69e1, type: 2} + m_sharedMaterial: {fileID: -1192090701822111264, guid: 41f9368fce25cb44ba223ac55f4e69e1, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -936,15 +936,15 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 7785839160383368507} - {fileID: 22478518} - {fileID: 7475116342792086822} + - {fileID: 7746453426013743342} m_Father: {fileID: 22465490} 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: 420, y: 282} - m_SizeDelta: {x: 304, y: 75.6} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -220, y: -95} + m_SizeDelta: {x: 304, y: 75.600006} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &22210926 CanvasRenderer: @@ -961,13 +961,13 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 146602} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0.003921569, b: 0.11372549, a: 0.9019608} + m_Color: {r: 0.20754719, g: 0.20754719, b: 0.20754719, a: 0.9019608} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1498,334 +1498,6 @@ MonoBehaviour: m_Spacing: {x: 33, y: 27} m_Constraint: 1 m_ConstraintCount: 6 ---- !u!1 &162546 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 22466304} - - component: {fileID: 22222896} - - component: {fileID: 11430546} - - component: {fileID: 6431204453750959947} - - component: {fileID: 6202915660793249911} - m_Layer: 5 - m_Name: Level Text Label - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &22466304 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 162546} - 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: 6189276437733570211} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -1.5000943, y: 1.4999697} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!222 &22222896 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 162546} - m_CullTransparentMesh: 1 ---- !u!114 &11430546 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 162546} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 2 ---- !u!114 &6431204453750959947 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 162546} - 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: Level - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 01ed77f6af1621a4cb0e3ee10d3b7147, type: 2} - m_sharedMaterial: {fileID: -7243662068360240803, guid: 01ed77f6af1621a4cb0e3ee10d3b7147, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4280257482 - m_fontColor: {r: 0.7921569, g: 0.54509807, b: 0.12156863, 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: 28 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 18 - m_fontSizeMax: 28 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - 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!114 &6202915660793249911 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 162546} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa08dde68b0ecb540b81dab0284fb2c6, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &175212 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 22400858} - - component: {fileID: 22253204} - - component: {fileID: 11474802} - - component: {fileID: 7602726314969029715} - - component: {fileID: 2183920016959208103} - m_Layer: 5 - m_Name: Character Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &22400858 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 175212} - 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: 2469122257539464117} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -2.9999394, y: 2.9999394} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &22253204 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 175212} - m_CullTransparentMesh: 1 ---- !u!114 &11474802 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 175212} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 2 ---- !u!114 &7602726314969029715 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 175212} - 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: Character - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 01ed77f6af1621a4cb0e3ee10d3b7147, type: 2} - m_sharedMaterial: {fileID: -7243662068360240803, guid: 01ed77f6af1621a4cb0e3ee10d3b7147, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4283547647 - m_fontColor: {r: 1, g: 0.7480139, b: 0.3160377, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 0 - m_fontColorGradient: - topLeft: {r: 0.12156862, g: 0.7921569, b: 0.29592794, a: 1} - topRight: {r: 0.12156862, g: 0.7921569, b: 0.29592794, a: 1} - bottomLeft: {r: 0.12156862, g: 0.7921569, b: 0.29592794, a: 1} - bottomRight: {r: 0.12156862, g: 0.7921569, b: 0.29592794, 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: 52 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 20 - m_fontSizeMax: 52 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - 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!114 &2183920016959208103 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 175212} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa08dde68b0ecb540b81dab0284fb2c6, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &177354 GameObject: m_ObjectHideFlags: 0 @@ -2372,8 +2044,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 201, y: -60} - m_SizeDelta: {x: 302, y: 70.060974} + m_AnchoredPosition: {x: 200, y: -60} + m_SizeDelta: {x: 255, y: 60} m_Pivot: {x: 0.5, y: 1} --- !u!1 &734772224536623874 GameObject: @@ -3485,8 +3157,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 9115725286093162695} + m_Children: [] m_Father: {fileID: 22485050} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -3538,15 +3209,15 @@ MonoBehaviour: m_Calls: [] m_text: Rep Level m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 01ed77f6af1621a4cb0e3ee10d3b7147, type: 2} - m_sharedMaterial: {fileID: -7243662068360240803, guid: 01ed77f6af1621a4cb0e3ee10d3b7147, type: 2} + m_fontAsset: {fileID: 11400000, guid: 41f9368fce25cb44ba223ac55f4e69e1, type: 2} + m_sharedMaterial: {fileID: -1192090701822111264, guid: 41f9368fce25cb44ba223ac55f4e69e1, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278206565 - m_fontColor: {r: 0.39607844, g: 0.2509804, b: 0, a: 1} + rgba: 4284471295 + m_fontColor: {r: 1, g: 0.84313726, b: 0.37254903, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -3563,10 +3234,10 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 28 - m_fontSizeBase: 36 + m_fontSize: 32 + m_fontSizeBase: 32 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 28 m_fontStyle: 0 @@ -4096,170 +3767,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: aa08dde68b0ecb540b81dab0284fb2c6, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &5045767297291221535 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9115725286093162695} - - component: {fileID: 5477678961562654691} - - component: {fileID: 3143270987064927947} - - component: {fileID: 8095344865958223140} - - component: {fileID: 7634287754475559529} - m_Layer: 5 - m_Name: RepLevel Text Label (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &9115725286093162695 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5045767297291221535} - 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: 2537039618920728962} - 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: -1.5, y: -11.64} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0} ---- !u!222 &5477678961562654691 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5045767297291221535} - m_CullTransparentMesh: 1 ---- !u!114 &3143270987064927947 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5045767297291221535} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 2 ---- !u!114 &8095344865958223140 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5045767297291221535} - 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: Rep Level - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 01ed77f6af1621a4cb0e3ee10d3b7147, type: 2} - m_sharedMaterial: {fileID: -7243662068360240803, guid: 01ed77f6af1621a4cb0e3ee10d3b7147, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4280257482 - m_fontColor: {r: 0.7921569, g: 0.54509807, b: 0.12156863, 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: 28 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 18 - m_fontSizeMax: 28 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - 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!114 &7634287754475559529 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5045767297291221535} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa08dde68b0ecb540b81dab0284fb2c6, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &5510889049596644572 GameObject: m_ObjectHideFlags: 0 @@ -4417,8 +3924,8 @@ MonoBehaviour: m_Calls: [] m_text: 10 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: c8598f6e0154faa4490d1bd6afcda69c, type: 2} - m_sharedMaterial: {fileID: 2436215601175455127, guid: c8598f6e0154faa4490d1bd6afcda69c, type: 2} + m_fontAsset: {fileID: 11400000, guid: 41f9368fce25cb44ba223ac55f4e69e1, type: 2} + m_sharedMaterial: {fileID: -1192090701822111264, guid: 41f9368fce25cb44ba223ac55f4e69e1, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -4799,170 +4306,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 282} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &6414583539500359681 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7592302484654043516} - - component: {fileID: 2415633901022760613} - - component: {fileID: 158595937240000065} - - component: {fileID: 3991521136593101948} - - component: {fileID: 9053335824818534828} - m_Layer: 5 - m_Name: Character Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7592302484654043516 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6414583539500359681} - 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: 174089516982246235} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -2.9999394, y: 2.9999394} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &2415633901022760613 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6414583539500359681} - m_CullTransparentMesh: 1 ---- !u!114 &158595937240000065 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6414583539500359681} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 2 ---- !u!114 &3991521136593101948 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6414583539500359681} - 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: Inventory - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 01ed77f6af1621a4cb0e3ee10d3b7147, type: 2} - m_sharedMaterial: {fileID: -7243662068360240803, guid: 01ed77f6af1621a4cb0e3ee10d3b7147, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4283547647 - m_fontColor: {r: 1, g: 0.7480139, b: 0.3160377, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 0 - m_fontColorGradient: - topLeft: {r: 0.12156862, g: 0.7921569, b: 0.29592794, a: 1} - topRight: {r: 0.12156862, g: 0.7921569, b: 0.29592794, a: 1} - bottomLeft: {r: 0.12156862, g: 0.7921569, b: 0.29592794, a: 1} - bottomRight: {r: 0.12156862, g: 0.7921569, b: 0.29592794, 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: 52 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 20 - m_fontSizeMax: 52 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - 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!114 &9053335824818534828 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6414583539500359681} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa08dde68b0ecb540b81dab0284fb2c6, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &6605786509416253688 GameObject: m_ObjectHideFlags: 0 @@ -4973,9 +4316,7 @@ GameObject: m_Component: - component: {fileID: 174089516982246235} - component: {fileID: 8282778336009307309} - - component: {fileID: 7382190039234417516} - component: {fileID: 600275348075192628} - - component: {fileID: 8197190273138529179} m_Layer: 5 m_Name: InventoryLabel m_TagString: Untagged @@ -4994,15 +4335,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7592302484654043516} + m_Children: [] m_Father: {fileID: 2777322957094427163} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 1} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8282778336009307309 CanvasRenderer: m_ObjectHideFlags: 0 @@ -5011,20 +4351,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6605786509416253688} m_CullTransparentMesh: 1 ---- !u!114 &7382190039234417516 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6605786509416253688} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 2 --- !u!114 &600275348075192628 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5047,15 +4373,15 @@ MonoBehaviour: m_Calls: [] m_text: Inventory m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 01ed77f6af1621a4cb0e3ee10d3b7147, type: 2} - m_sharedMaterial: {fileID: -7243662068360240803, guid: 01ed77f6af1621a4cb0e3ee10d3b7147, type: 2} + m_fontAsset: {fileID: 11400000, guid: 41f9368fce25cb44ba223ac55f4e69e1, type: 2} + m_sharedMaterial: {fileID: -1192090701822111264, guid: 41f9368fce25cb44ba223ac55f4e69e1, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278206565 - m_fontColor: {r: 0.3962264, g: 0.25, b: 0, a: 1} + rgba: 4284471295 + m_fontColor: {r: 1, g: 0.84316045, b: 0.3726415, a: 1} m_enableVertexGradient: 1 m_colorMode: 3 m_fontColorGradient: @@ -5072,10 +4398,10 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 52 - m_fontSizeBase: 36 + m_fontSize: 60 + m_fontSizeBase: 60 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 20 m_fontSizeMax: 52 m_fontStyle: 0 @@ -5116,18 +4442,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &8197190273138529179 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6605786509416253688} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5afc2ced505e9e1499ea22ebdd61031a, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &7179971544103460405 GameObject: m_ObjectHideFlags: 0 @@ -5505,8 +4819,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: 64, y: 64} m_Pivot: {x: 1, y: 0.5} --- !u!222 &7475116342792086820 CanvasRenderer: @@ -5536,7 +4850,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9d5365d85f9ac2e46b561528dae6e5ab, type: 3} + m_Sprite: {fileID: 21300000, guid: 5895d19c8aa9bfe4286d06e4e3b58e52, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5593,9 +4907,7 @@ GameObject: m_Component: - component: {fileID: 2469122257539464117} - component: {fileID: 3025890638702623641} - - component: {fileID: 821528501408833243} - component: {fileID: 1877459157023630220} - - component: {fileID: 3827555130553904446} m_Layer: 5 m_Name: Character Text Shadow m_TagString: Untagged @@ -5614,14 +4926,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 22400858} + m_Children: [] m_Father: {fileID: 22485050} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 312.41, y: 48.81} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3025890638702623641 CanvasRenderer: @@ -5631,20 +4942,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7910548151525491652} m_CullTransparentMesh: 1 ---- !u!114 &821528501408833243 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7910548151525491652} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 2 --- !u!114 &1877459157023630220 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5667,15 +4964,15 @@ MonoBehaviour: m_Calls: [] m_text: Character m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 01ed77f6af1621a4cb0e3ee10d3b7147, type: 2} - m_sharedMaterial: {fileID: -7243662068360240803, guid: 01ed77f6af1621a4cb0e3ee10d3b7147, type: 2} + m_fontAsset: {fileID: 11400000, guid: 41f9368fce25cb44ba223ac55f4e69e1, type: 2} + m_sharedMaterial: {fileID: -1192090701822111264, guid: 41f9368fce25cb44ba223ac55f4e69e1, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278206565 - m_fontColor: {r: 0.3962264, g: 0.25, b: 0, a: 1} + rgba: 4284471295 + m_fontColor: {r: 1, g: 0.84316045, b: 0.3726415, a: 1} m_enableVertexGradient: 1 m_colorMode: 3 m_fontColorGradient: @@ -5692,10 +4989,10 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 52 - m_fontSizeBase: 36 + m_fontSize: 60 + m_fontSizeBase: 60 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 20 m_fontSizeMax: 52 m_fontStyle: 0 @@ -5736,18 +5033,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &3827555130553904446 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7910548151525491652} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5afc2ced505e9e1499ea22ebdd61031a, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &8322189447367510522 GameObject: m_ObjectHideFlags: 0 @@ -5981,8 +5266,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 22466304} + m_Children: [] m_Father: {fileID: 22485050} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -6034,15 +5318,15 @@ MonoBehaviour: m_Calls: [] m_text: Level m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 01ed77f6af1621a4cb0e3ee10d3b7147, type: 2} - m_sharedMaterial: {fileID: -7243662068360240803, guid: 01ed77f6af1621a4cb0e3ee10d3b7147, type: 2} + m_fontAsset: {fileID: 11400000, guid: 41f9368fce25cb44ba223ac55f4e69e1, type: 2} + m_sharedMaterial: {fileID: -1192090701822111264, guid: 41f9368fce25cb44ba223ac55f4e69e1, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278206565 - m_fontColor: {r: 0.39607844, g: 0.2509804, b: 0, a: 1} + rgba: 4284471295 + m_fontColor: {r: 1, g: 0.84313726, b: 0.37254903, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -6059,10 +5343,10 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 28 - m_fontSizeBase: 36 + m_fontSize: 32 + m_fontSizeBase: 32 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 28 m_fontStyle: 0 @@ -6129,7 +5413,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 127264708406586209, guid: 46b5bfbf454f8fe479ee3430548bbd2c, type: 3} propertyPath: m_fontSize - value: 21 + value: 28 objectReference: {fileID: 0} - target: {fileID: 127264708406586209, guid: 46b5bfbf454f8fe479ee3430548bbd2c, type: 3} propertyPath: m_fontSizeMax @@ -6139,6 +5423,14 @@ PrefabInstance: propertyPath: m_fontSizeMin value: 20 objectReference: {fileID: 0} + - target: {fileID: 127264708406586209, guid: 46b5bfbf454f8fe479ee3430548bbd2c, type: 3} + propertyPath: m_fontSizeBase + value: 28 + objectReference: {fileID: 0} + - target: {fileID: 127264708406586209, guid: 46b5bfbf454f8fe479ee3430548bbd2c, type: 3} + propertyPath: m_enableAutoSizing + value: 0 + objectReference: {fileID: 0} - target: {fileID: 127264708406586209, guid: 46b5bfbf454f8fe479ee3430548bbd2c, type: 3} propertyPath: 'm_ActiveFontFeatures.Array.data[0]' value: 1801810542 @@ -6413,6 +5705,10 @@ PrefabInstance: propertyPath: m_Name value: LArgeMenuBorder_Equipment objectReference: {fileID: 0} + - target: {fileID: 2529997462746559409, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -11053,6 +10349,125 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 454179752691240676, guid: 5d050b13d3af06c48b87acd12ac090a3, type: 3} m_PrefabInstance: {fileID: 5536950183243881636} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5758202450846914782 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 22411916} + m_Modifications: + - target: {fileID: 2623857814747721776, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2623857814747721776, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2623857814747721776, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2623857814747721776, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2623857814747721776, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2623857814747721776, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2623857814747721776, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} + propertyPath: m_SizeDelta.x + value: -8 + objectReference: {fileID: 0} + - target: {fileID: 2623857814747721776, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} + propertyPath: m_SizeDelta.y + value: -3.9999967 + objectReference: {fileID: 0} + - target: {fileID: 2623857814747721776, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2623857814747721776, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2623857814747721776, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2623857814747721776, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2623857814747721776, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2623857814747721776, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2623857814747721776, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2623857814747721776, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2623857814747721776, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2623857814747721776, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2623857814747721776, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} + propertyPath: m_AnchoredPosition.x + value: -2 + objectReference: {fileID: 0} + - target: {fileID: 2623857814747721776, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2623857814747721776, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2623857814747721776, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2623857814747721776, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7914226979756260339, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} + propertyPath: m_Name + value: OptionMenuBorder + objectReference: {fileID: 0} + - target: {fileID: 7914226979756260339, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 1708512460246112266, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} +--- !u!224 &7746453426013743342 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2623857814747721776, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} + m_PrefabInstance: {fileID: 5758202450846914782} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5879799293842902609 PrefabInstance: m_ObjectHideFlags: 0 @@ -11269,10 +10684,6 @@ PrefabInstance: propertyPath: m_text value: Intelligence objectReference: {fileID: 0} - - target: {fileID: 127264708406586209, guid: 46b5bfbf454f8fe479ee3430548bbd2c, type: 3} - propertyPath: m_fontSize - value: 25 - objectReference: {fileID: 0} - target: {fileID: 127264708406586209, guid: 46b5bfbf454f8fe479ee3430548bbd2c, type: 3} propertyPath: 'm_ActiveFontFeatures.Array.data[0]' value: 1801810542 @@ -12473,6 +11884,10 @@ PrefabInstance: propertyPath: m_Name value: LArgeMenuBorder_Stats objectReference: {fileID: 0} + - target: {fileID: 2529997462746559409, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -13369,105 +12784,3 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 454179752691240676, guid: 5d050b13d3af06c48b87acd12ac090a3, type: 3} m_PrefabInstance: {fileID: 7433937811969223536} m_PrefabAsset: {fileID: 0} ---- !u!1001 &8409018131672950244 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 22411916} - m_Modifications: - - target: {fileID: 1782877925726914783, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1782877925726914783, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1782877925726914783, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1782877925726914783, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1782877925726914783, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1782877925726914783, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1782877925726914783, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} - propertyPath: m_SizeDelta.x - value: -4 - objectReference: {fileID: 0} - - target: {fileID: 1782877925726914783, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} - propertyPath: m_SizeDelta.y - value: -3.9999967 - objectReference: {fileID: 0} - - target: {fileID: 1782877925726914783, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1782877925726914783, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1782877925726914783, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1782877925726914783, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1782877925726914783, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1782877925726914783, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1782877925726914783, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1782877925726914783, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1782877925726914783, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1782877925726914783, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1782877925726914783, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1782877925726914783, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2529997462746559409, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} - propertyPath: m_Name - value: LArgeMenuBorder - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} ---- !u!224 &7785839160383368507 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1782877925726914783, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} - m_PrefabInstance: {fileID: 8409018131672950244} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Character Stats/Examples/Items & Inventory/Prefabs/Stat Display (1).prefab b/Assets/Character Stats/Examples/Items & Inventory/Prefabs/Stat Display (1).prefab index 683894a2..c6f2c029 100644 --- a/Assets/Character Stats/Examples/Items & Inventory/Prefabs/Stat Display (1).prefab +++ b/Assets/Character Stats/Examples/Items & Inventory/Prefabs/Stat Display (1).prefab @@ -30,13 +30,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1300701234949389654} + m_Children: [] m_Father: {fileID: 6118383127323394301} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 8, y: 7} + m_AnchoredPosition: {x: 8, y: 0} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0, y: 1} --- !u!222 &7891751392981135478 @@ -69,15 +68,15 @@ MonoBehaviour: m_Calls: [] m_text: New Text m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 01ed77f6af1621a4cb0e3ee10d3b7147, type: 2} - m_sharedMaterial: {fileID: -7243662068360240803, guid: 01ed77f6af1621a4cb0e3ee10d3b7147, type: 2} + m_fontAsset: {fileID: 11400000, guid: 41f9368fce25cb44ba223ac55f4e69e1, type: 2} + m_sharedMaterial: {fileID: -1192090701822111264, guid: 41f9368fce25cb44ba223ac55f4e69e1, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278206565 - m_fontColor: {r: 0.39607844, g: 0.2509804, b: 0, a: 1} + rgba: 4284471295 + m_fontColor: {r: 1, g: 0.84313726, b: 0.37254903, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -94,10 +93,10 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 25 + m_fontSize: 36 m_fontSizeBase: 36 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 25 m_fontStyle: 0 @@ -110,15 +109,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -130,7 +131,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 10, z: 0, w: 10} + m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -148,153 +149,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5afc2ced505e9e1499ea22ebdd61031a, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1736937389206605951 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1300701234949389654} - - component: {fileID: 8250398293883218257} - - component: {fileID: 5815777629776471805} - - component: {fileID: 7938780323409178821} - m_Layer: 5 - m_Name: StatName (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1300701234949389654 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1736937389206605951} - 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: 7264574770827983339} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -1.5, y: 1.5} - m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0, y: 1} ---- !u!222 &8250398293883218257 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1736937389206605951} - m_CullTransparentMesh: 1 ---- !u!114 &5815777629776471805 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1736937389206605951} - 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: New Text - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 01ed77f6af1621a4cb0e3ee10d3b7147, type: 2} - m_sharedMaterial: {fileID: -7243662068360240803, guid: 01ed77f6af1621a4cb0e3ee10d3b7147, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4280257482 - m_fontColor: {r: 0.7921569, g: 0.54509807, b: 0.12156863, 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: 25 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 18 - m_fontSizeMax: 25 - 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_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 10, z: 0, w: 10} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &7938780323409178821 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1736937389206605951} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa08dde68b0ecb540b81dab0284fb2c6, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1785111545271471490 GameObject: m_ObjectHideFlags: 0 @@ -332,7 +186,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -5, y: 4} + m_AnchoredPosition: {x: -5, y: 0} m_SizeDelta: {x: 27, y: 27} m_Pivot: {x: 1, y: 0.5} --- !u!222 &4525523244919885807 @@ -356,7 +210,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0.022742992, b: 0.09433961, a: 0.9098039} + m_Color: {r: 0.24528301, g: 0.15146883, b: 0, a: 0.9098039} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -641,8 +495,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -40, y: -3} - m_SizeDelta: {x: 15, y: 33} + m_AnchoredPosition: {x: -40, y: 0} + m_SizeDelta: {x: 20, y: 50} m_Pivot: {x: 1, y: 1} --- !u!222 &4739614468492038557 CanvasRenderer: @@ -674,8 +528,8 @@ MonoBehaviour: m_Calls: [] m_text: 5 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: c8598f6e0154faa4490d1bd6afcda69c, type: 2} - m_sharedMaterial: {fileID: 2436215601175455127, guid: c8598f6e0154faa4490d1bd6afcda69c, type: 2} + m_fontAsset: {fileID: 11400000, guid: 41f9368fce25cb44ba223ac55f4e69e1, type: 2} + m_sharedMaterial: {fileID: -1192090701822111264, guid: 41f9368fce25cb44ba223ac55f4e69e1, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -715,15 +569,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_TextWrappingMode: 0 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -808,8 +664,8 @@ MonoBehaviour: m_Calls: [] m_text: + m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: c8598f6e0154faa4490d1bd6afcda69c, type: 2} - m_sharedMaterial: {fileID: 2436215601175455127, guid: c8598f6e0154faa4490d1bd6afcda69c, type: 2} + m_fontAsset: {fileID: 11400000, guid: 41f9368fce25cb44ba223ac55f4e69e1, type: 2} + m_sharedMaterial: {fileID: -1192090701822111264, guid: 41f9368fce25cb44ba223ac55f4e69e1, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -849,15 +705,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 diff --git a/Assets/Developer/Prefabs/Persistent Objects.prefab b/Assets/Developer/Prefabs/Persistent Objects.prefab index 7b0cef8e..79c5a873 100644 --- a/Assets/Developer/Prefabs/Persistent Objects.prefab +++ b/Assets/Developer/Prefabs/Persistent Objects.prefab @@ -5872,7 +5872,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 168.74998, y: -600} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 450, y: 0} m_Pivot: {x: 0.5, y: 0} --- !u!114 &2959850296507468170 MonoBehaviour: @@ -13932,7 +13932,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -112.5, y: 180} + m_AnchoredPosition: {x: -100, y: 15} m_SizeDelta: {x: 25, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7475116342128910724 @@ -29234,7 +29234,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22405792, guid: 98484fbd97870af4d8569162460a89bb, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 450 objectReference: {fileID: 0} - target: {fileID: 22405792, guid: 98484fbd97870af4d8569162460a89bb, type: 3} propertyPath: m_SizeDelta.y diff --git a/Assets/Fantasy Skybox FREE/Panoramics/FS002/FS002_Night.mat b/Assets/Fantasy Skybox FREE/Panoramics/FS002/FS002_Night.mat index 67824a78..45089452 100644 --- a/Assets/Fantasy Skybox FREE/Panoramics/FS002/FS002_Night.mat +++ b/Assets/Fantasy Skybox FREE/Panoramics/FS002/FS002_Night.mat @@ -78,7 +78,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Rotation: 6.158834 + - _Rotation: 12.437879 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Resources/-Cameras/Main_Camera_PostProcessing.prefab b/Assets/Resources/-Cameras/Main_Camera_PostProcessing.prefab index beed36d8..949585d5 100644 --- a/Assets/Resources/-Cameras/Main_Camera_PostProcessing.prefab +++ b/Assets/Resources/-Cameras/Main_Camera_PostProcessing.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 4097245961428926931} - component: {fileID: 4097245961428926928} - component: {fileID: 4097245961428926933} + - component: {fileID: 8957741896296797084} m_Layer: 0 m_Name: Main_Camera_PostProcessing m_TagString: MainCamera @@ -26,13 +27,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4097245961428926929} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!20 &4097245961428926931 Camera: @@ -48,9 +49,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -145,3 +154,47 @@ MonoBehaviour: m_BeforeTransparentBundles: [] m_BeforeStackBundles: [] m_AfterStackBundles: [] +--- !u!114 &8957741896296797084 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4097245961428926929} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 diff --git a/Assets/Resources/-Cameras/Main_Camera_RiftHuntersInn_PostProcessing Variant.prefab b/Assets/Resources/-Cameras/Main_Camera_RiftHuntersInn_PostProcessing Variant.prefab index 7f026d65..1f36369e 100644 --- a/Assets/Resources/-Cameras/Main_Camera_RiftHuntersInn_PostProcessing Variant.prefab +++ b/Assets/Resources/-Cameras/Main_Camera_RiftHuntersInn_PostProcessing Variant.prefab @@ -72,6 +72,10 @@ PrefabInstance: propertyPath: m_BackGroundColor.r value: 0.3882353 objectReference: {fileID: 0} + - target: {fileID: 4097245961428926933, guid: cf2c0a59df5b4144fb94f85c7e938288, type: 3} + propertyPath: volumeTrigger + value: + objectReference: {fileID: 3251821988823392337, guid: 797a23835fc71fa4a9ba1b749b439f55, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -82,6 +86,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 4097245961428926929, guid: cf2c0a59df5b4144fb94f85c7e938288, type: 3} insertIndex: -1 addedObject: {fileID: 2010927401967130128} + - targetCorrespondingSourceObject: {fileID: 4097245961428926929, guid: cf2c0a59df5b4144fb94f85c7e938288, type: 3} + insertIndex: -1 + addedObject: {fileID: -7070484896661229080} m_SourcePrefab: {fileID: 100100000, guid: cf2c0a59df5b4144fb94f85c7e938288, type: 3} --- !u!1 &3246946022219845790 stripped GameObject: @@ -106,6 +113,7 @@ MonoBehaviour: offset: {x: 0, y: 7.5, z: -5} rotationEuler: {x: 60, y: 0, z: 0} HasCutsceneAnimation: 0 + zoomFactor: 1.2 players: [] --- !u!114 &2010927401967130128 MonoBehaviour: @@ -123,3 +131,47 @@ MonoBehaviour: Response: m_PersistentCalls: m_Calls: [] +--- !u!114 &-7070484896661229080 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3246946022219845790} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 diff --git a/Assets/Resources/-Cameras/Main_Camera_RiverAve_PostProcessing Variant.prefab b/Assets/Resources/-Cameras/Main_Camera_RiverAve_PostProcessing Variant.prefab index 0f423e74..996a92c5 100644 --- a/Assets/Resources/-Cameras/Main_Camera_RiverAve_PostProcessing Variant.prefab +++ b/Assets/Resources/-Cameras/Main_Camera_RiverAve_PostProcessing Variant.prefab @@ -5,11 +5,12 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4097245961428926929, guid: cf2c0a59df5b4144fb94f85c7e938288, type: 3} propertyPath: m_Name - value: Main_Camera_PostProcessing + value: Main_Camera_RiverAve_PostProcessing Variant objectReference: {fileID: 0} - target: {fileID: 4097245961428926929, guid: cf2c0a59df5b4144fb94f85c7e938288, type: 3} propertyPath: m_IsActive @@ -75,5 +76,12 @@ PrefabInstance: propertyPath: m_BackGroundColor.r value: 0.6273585 objectReference: {fileID: 0} + - target: {fileID: 4097245961428926933, guid: cf2c0a59df5b4144fb94f85c7e938288, type: 3} + propertyPath: volumeTrigger + value: + objectReference: {fileID: 3251821988823392337, guid: 797a23835fc71fa4a9ba1b749b439f55, type: 3} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cf2c0a59df5b4144fb94f85c7e938288, type: 3} diff --git a/Assets/Resources/-Cameras/Main_Camera_Skellyard_PostProcessing Variant Variant.prefab b/Assets/Resources/-Cameras/Main_Camera_Skellyard_PostProcessing Variant Variant.prefab index 066ba987..5e457402 100644 --- a/Assets/Resources/-Cameras/Main_Camera_Skellyard_PostProcessing Variant Variant.prefab +++ b/Assets/Resources/-Cameras/Main_Camera_Skellyard_PostProcessing Variant Variant.prefab @@ -5,8 +5,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 3246946022219845786, guid: 854e098434b30db459648ee955fcc7b8, type: 3} + propertyPath: volumeTrigger + value: + objectReference: {fileID: 3251821988823392337} - target: {fileID: 3246946022219845789, guid: 854e098434b30db459648ee955fcc7b8, type: 3} propertyPath: m_RootOrder value: 0 @@ -53,7 +58,67 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3246946022219845790, guid: 854e098434b30db459648ee955fcc7b8, type: 3} propertyPath: m_Name - value: Main_Camera_Skellyard_PostProcessing Variant + value: Main_Camera_Skellyard_PostProcessing Variant Variant objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3246946022219845790, guid: 854e098434b30db459648ee955fcc7b8, type: 3} + insertIndex: -1 + addedObject: {fileID: -2926312207196258866} m_SourcePrefab: {fileID: 100100000, guid: 854e098434b30db459648ee955fcc7b8, type: 3} +--- !u!4 &3251821988823392337 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3246946022219845789, guid: 854e098434b30db459648ee955fcc7b8, type: 3} + m_PrefabInstance: {fileID: 13426046155583692} + m_PrefabAsset: {fileID: 0} +--- !u!1 &3251821988823392338 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3246946022219845790, guid: 854e098434b30db459648ee955fcc7b8, type: 3} + m_PrefabInstance: {fileID: 13426046155583692} + m_PrefabAsset: {fileID: 0} +--- !u!114 &-2926312207196258866 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3251821988823392338} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 diff --git a/Assets/Resources/-Cameras/Main_Camera_VampsDen_PostProcessing Variant Variant.prefab b/Assets/Resources/-Cameras/Main_Camera_VampsDen_PostProcessing Variant Variant.prefab index 3a6c2934..0b908452 100644 --- a/Assets/Resources/-Cameras/Main_Camera_VampsDen_PostProcessing Variant Variant.prefab +++ b/Assets/Resources/-Cameras/Main_Camera_VampsDen_PostProcessing Variant Variant.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 3251821988823392336, guid: 797a23835fc71fa4a9ba1b749b439f55, type: 3} @@ -65,7 +66,62 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3251821988823392338, guid: 797a23835fc71fa4a9ba1b749b439f55, type: 3} propertyPath: m_Name - value: Main_Camera_Skellyard_PostProcessing Variant + value: Main_Camera_VampsDen_PostProcessing Variant Variant objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3251821988823392338, guid: 797a23835fc71fa4a9ba1b749b439f55, type: 3} + insertIndex: -1 + addedObject: {fileID: -3673809460495051706} m_SourcePrefab: {fileID: 100100000, guid: 797a23835fc71fa4a9ba1b749b439f55, type: 3} +--- !u!1 &5523049474037642924 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3251821988823392338, guid: 797a23835fc71fa4a9ba1b749b439f55, type: 3} + m_PrefabInstance: {fileID: 7027052365714069246} + m_PrefabAsset: {fileID: 0} +--- !u!114 &-3673809460495051706 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5523049474037642924} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 diff --git a/Assets/Resources/-Cameras/MinimapCamera.prefab b/Assets/Resources/-Cameras/MinimapCamera.prefab index 51e28543..a4d6e6c0 100644 --- a/Assets/Resources/-Cameras/MinimapCamera.prefab +++ b/Assets/Resources/-Cameras/MinimapCamera.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 2878385681087962796} - component: {fileID: 858482839168424042} - component: {fileID: 1353647611506353277} + - component: {fileID: -6600536178777827919} m_Layer: 14 m_Name: MinimapCamera m_TagString: Untagged @@ -125,3 +126,47 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!114 &-6600536178777827919 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2878385681087962802} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 diff --git a/Assets/Scripts/CameraFollow.cs b/Assets/Scripts/CameraFollow.cs index 7464cdb2..b1d4f871 100644 --- a/Assets/Scripts/CameraFollow.cs +++ b/Assets/Scripts/CameraFollow.cs @@ -11,6 +11,8 @@ public class CameraFollow : MonoBehaviour [SerializeField] private Vector3 offset; [SerializeField] private Vector3 rotationEuler; [SerializeField] private bool HasCutsceneAnimation; + [Space] + [SerializeField] [Range(0.1f, 5f)] private float zoomFactor = 1f; // <-- Added zoom factor public List players = new List(); @@ -77,7 +79,10 @@ public class CameraFollow : MonoBehaviour shakeDuration = 0f; } - Vector3 targetPosition = firstInRace.transform.position + offset + shakeOffset; + // Apply zoom factor to offset + Vector3 scaledOffset = offset * zoomFactor; + + Vector3 targetPosition = firstInRace.transform.position + scaledOffset + shakeOffset; if (SmoothMovement) this.transform.position = Vector3.Lerp(this.transform.position, targetPosition, Time.deltaTime); @@ -113,4 +118,4 @@ public class CameraFollow : MonoBehaviour shakeDuration = duration; shakeMagnitude = magnitude; } -} +} \ No newline at end of file