diff --git a/Assets/--2025/Icons/500_weapons/W_background/A_Inventory_frame2_back.png.meta b/Assets/--2025/Icons/500_weapons/W_background/A_Inventory_frame2_back.png.meta index e0f85311..21c51e06 100644 --- a/Assets/--2025/Icons/500_weapons/W_background/A_Inventory_frame2_back.png.meta +++ b/Assets/--2025/Icons/500_weapons/W_background/A_Inventory_frame2_back.png.meta @@ -1,9 +1,16 @@ fileFormatVersion: 2 guid: 22ee036c2f6612b4894186c8fce03513 +AssetOrigin: + serializedVersion: 1 + productId: 144127 + packageName: 500 Weapon Icons + packageVersion: 1.0 + assetPath: Assets/500_weapons/W_background/A_Inventory_frame2_back.png + uploadId: 334211 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: 50, y: 90, z: 50, w: 90} 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: dd6dccfaf0a8abf4fb23f84bf15af80e + internalID: 1817884434 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 144127 - packageName: 500 Weapon Icons - packageVersion: 1.0 - assetPath: Assets/500_weapons/W_background/A_Inventory_frame2_back.png - uploadId: 334211 diff --git a/Assets/--2025/Icons/500_weapons/W_background/bg_grey.png.meta b/Assets/--2025/Icons/500_weapons/W_background/bg_grey.png.meta index 020aa9d9..17c16be2 100644 --- a/Assets/--2025/Icons/500_weapons/W_background/bg_grey.png.meta +++ b/Assets/--2025/Icons/500_weapons/W_background/bg_grey.png.meta @@ -1,9 +1,16 @@ fileFormatVersion: 2 guid: aad8787a1dd499d4dacdb7aaf6665918 +AssetOrigin: + serializedVersion: 1 + productId: 144127 + packageName: 500 Weapon Icons + packageVersion: 1.0 + assetPath: Assets/500_weapons/W_background/bg_grey.png + uploadId: 334211 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: 25, y: 25, z: 25, w: 25} 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: b0767e2e56291214b895d22ce5a86f87 + internalID: -806745589 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 144127 - packageName: 500 Weapon Icons - packageVersion: 1.0 - assetPath: Assets/500_weapons/W_background/bg_grey.png - uploadId: 334211 diff --git a/Assets/--2025/UI/EquipmentSlot.prefab b/Assets/--2025/UI/EquipmentSlot.prefab index 2029d14b..a54f8826 100644 --- a/Assets/--2025/UI/EquipmentSlot.prefab +++ b/Assets/--2025/UI/EquipmentSlot.prefab @@ -28,6 +28,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 7948783338526451718} - {fileID: 2440268520772349108} - {fileID: 1971938701634408561} m_Father: {fileID: 0} @@ -73,7 +74,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -40, y: -40} + m_SizeDelta: {x: -30, y: -30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2440268520772204094 CanvasRenderer: @@ -130,6 +131,81 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] EquipmentType: 6 +--- !u!1 &8825984916611961852 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7948783338526451718} + - component: {fileID: 7105068001618962792} + - component: {fileID: 1523066543418554313} + m_Layer: 5 + m_Name: background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7948783338526451718 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825984916611961852} + 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: 886370065471730277} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -10, y: -10} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7105068001618962792 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825984916611961852} + m_CullTransparentMesh: 1 +--- !u!114 &1523066543418554313 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8825984916611961852} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image + 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_Sprite: {fileID: 21300000, guid: aad8787a1dd499d4dacdb7aaf6665918, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 10 --- !u!1001 &4554382818048221249 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/-UI/InventorySlot.prefab b/Assets/-UI/InventorySlot.prefab index 02831944..2e654056 100644 --- a/Assets/-UI/InventorySlot.prefab +++ b/Assets/-UI/InventorySlot.prefab @@ -1,5 +1,80 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &3100141051741046118 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4019155858582711134} + - component: {fileID: 8903588370089236177} + - component: {fileID: 717785699626440305} + m_Layer: 5 + m_Name: background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4019155858582711134 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3100141051741046118} + 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: 454179752691240676} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -10, y: -10} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8903588370089236177 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3100141051741046118} + m_CullTransparentMesh: 1 +--- !u!114 &717785699626440305 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3100141051741046118} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image + 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_Sprite: {fileID: 21300000, guid: aad8787a1dd499d4dacdb7aaf6665918, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 10 --- !u!1 &5478647745379829905 GameObject: m_ObjectHideFlags: 0 @@ -33,10 +108,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 454179752691240676} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 145, y: 145} + m_SizeDelta: {x: -30, y: -30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5478647745391523805 CanvasRenderer: @@ -120,6 +195,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 4019155858582711134} - {fileID: 5478647745391296785} - {fileID: 7308698417981128966} m_Father: {fileID: 0} @@ -163,11 +239,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2623857814747721776, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} propertyPath: m_SizeDelta.x - value: -4 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2623857814747721776, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} propertyPath: m_SizeDelta.y - value: -4 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2623857814747721776, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/1-Packs/Effects/Hovl Studio/Magic effects pack/Materials/Flash2.mat b/Assets/1-Packs/Effects/Hovl Studio/Magic effects pack/Materials/Flash2.mat index 404dc80e..ff21b28c 100644 --- a/Assets/1-Packs/Effects/Hovl Studio/Magic effects pack/Materials/Flash2.mat +++ b/Assets/1-Packs/Effects/Hovl Studio/Magic effects pack/Materials/Flash2.mat @@ -32,11 +32,13 @@ Material: m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: - RenderType: Opaque + RenderType: Transparent disabledShaderPasses: - GRABPASS + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -99,8 +101,8 @@ Material: - _DistortionEnabled: 0 - _DistortionStrength: 1 - _DistortionStrengthScaled: 0 - - _DstBlend: 0 - - _DstBlendAlpha: 0 + - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EmissionEnabled: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -118,16 +120,16 @@ Material: - _SoftParticlesFarFadeDistance: 1 - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - - _ZWrite: 1 + - _ZWrite: 0 m_Colors: - _BaseColor: {r: 4.7547174, g: 4.7547174, b: 4.7547174, a: 1} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 4.754718, g: 4.754718, b: 4.754718, a: 1} - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/1-Packs/Effects/Matthew Guz/Spell Area of Effect FREE/Materials/AoE Holy Sword/Crack.mat b/Assets/1-Packs/Effects/Matthew Guz/Spell Area of Effect FREE/Materials/AoE Holy Sword/Crack.mat index 1e8859b5..240f5fed 100644 --- a/Assets/1-Packs/Effects/Matthew Guz/Spell Area of Effect FREE/Materials/AoE Holy Sword/Crack.mat +++ b/Assets/1-Packs/Effects/Matthew Guz/Spell Area of Effect FREE/Materials/AoE Holy Sword/Crack.mat @@ -19,11 +19,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 @@ -86,8 +88,8 @@ Material: - _DistortionEnabled: 0 - _DistortionStrength: 1 - _DistortionStrengthScaled: 0 - - _DstBlend: 0 - - _DstBlendAlpha: 0 + - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EmissionEnabled: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -105,16 +107,16 @@ Material: - _SoftParticlesFarFadeDistance: 1 - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - - _ZWrite: 1 + - _ZWrite: 0 m_Colors: - _BaseColor: {r: 2.9960787, g: 2.9960787, b: 2.9960787, a: 1} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 2.996079, g: 2.996079, b: 2.996079, a: 1} - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/1-Packs/Effects/Matthew Guz/Spell Area of Effect FREE/Materials/AoE Holy Sword/Particle 2.mat b/Assets/1-Packs/Effects/Matthew Guz/Spell Area of Effect FREE/Materials/AoE Holy Sword/Particle 2.mat index 45eda081..21a2521d 100644 --- a/Assets/1-Packs/Effects/Matthew Guz/Spell Area of Effect FREE/Materials/AoE Holy Sword/Particle 2.mat +++ b/Assets/1-Packs/Effects/Matthew Guz/Spell Area of Effect FREE/Materials/AoE Holy Sword/Particle 2.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 @@ -99,8 +101,8 @@ Material: - _DistortionEnabled: 0 - _DistortionStrength: 1 - _DistortionStrengthScaled: 0 - - _DstBlend: 0 - - _DstBlendAlpha: 0 + - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EmissionEnabled: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -118,16 +120,16 @@ Material: - _SoftParticlesFarFadeDistance: 1 - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - - _ZWrite: 1 + - _ZWrite: 0 m_Colors: - _BaseColor: {r: 9.849156, g: 9.849156, b: 9.849156, a: 1} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 9.849157, g: 9.849157, b: 9.849157, a: 1} - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/1-Packs/Effects/Matthew Guz/Spell Area of Effect FREE/Materials/AoE Holy Sword/Particle.mat b/Assets/1-Packs/Effects/Matthew Guz/Spell Area of Effect FREE/Materials/AoE Holy Sword/Particle.mat index 5c6ddb3e..96a5f26a 100644 --- a/Assets/1-Packs/Effects/Matthew Guz/Spell Area of Effect FREE/Materials/AoE Holy Sword/Particle.mat +++ b/Assets/1-Packs/Effects/Matthew Guz/Spell Area of Effect FREE/Materials/AoE Holy Sword/Particle.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 @@ -99,8 +101,8 @@ Material: - _DistortionEnabled: 0 - _DistortionStrength: 1 - _DistortionStrengthScaled: 0 - - _DstBlend: 0 - - _DstBlendAlpha: 0 + - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EmissionEnabled: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -118,16 +120,16 @@ Material: - _SoftParticlesFarFadeDistance: 1 - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - - _ZWrite: 1 + - _ZWrite: 0 m_Colors: - _BaseColor: {r: 4, g: 4, b: 4, a: 1} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 4, g: 4, b: 4, a: 1} - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/1-Packs/Effects/Matthew Guz/Spell Area of Effect FREE/Materials/AoE Holy Sword/Sword.mat b/Assets/1-Packs/Effects/Matthew Guz/Spell Area of Effect FREE/Materials/AoE Holy Sword/Sword.mat index 964dbc5e..fb5b254e 100644 --- a/Assets/1-Packs/Effects/Matthew Guz/Spell Area of Effect FREE/Materials/AoE Holy Sword/Sword.mat +++ b/Assets/1-Packs/Effects/Matthew Guz/Spell Area of Effect FREE/Materials/AoE Holy Sword/Sword.mat @@ -19,11 +19,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 @@ -86,8 +88,8 @@ Material: - _DistortionEnabled: 0 - _DistortionStrength: 1 - _DistortionStrengthScaled: 0 - - _DstBlend: 0 - - _DstBlendAlpha: 0 + - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EmissionEnabled: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -105,16 +107,16 @@ Material: - _SoftParticlesFarFadeDistance: 1 - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - - _ZWrite: 1 + - _ZWrite: 0 m_Colors: - _BaseColor: {r: 2.2706032, g: 2.2706032, b: 2.2706032, a: 1} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 2.2706032, g: 2.2706032, b: 2.2706032, a: 1} - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/1-Packs/Effects/Matthew Guz/Spell Area of Effect FREE/Materials/AoE Magic/Base 2.mat b/Assets/1-Packs/Effects/Matthew Guz/Spell Area of Effect FREE/Materials/AoE Magic/Base 2.mat index c56c4291..e87998f7 100644 --- a/Assets/1-Packs/Effects/Matthew Guz/Spell Area of Effect FREE/Materials/AoE Magic/Base 2.mat +++ b/Assets/1-Packs/Effects/Matthew Guz/Spell Area of Effect FREE/Materials/AoE Magic/Base 2.mat @@ -19,11 +19,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 @@ -86,8 +88,8 @@ Material: - _DistortionEnabled: 0 - _DistortionStrength: 1 - _DistortionStrengthScaled: 0 - - _DstBlend: 0 - - _DstBlendAlpha: 0 + - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EmissionEnabled: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -105,16 +107,16 @@ Material: - _SoftParticlesFarFadeDistance: 1 - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - - _ZWrite: 1 + - _ZWrite: 0 m_Colors: - _BaseColor: {r: 8.474191, g: 8.474191, b: 8.474191, a: 1} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 8.474192, g: 8.474192, b: 8.474192, a: 1} - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {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 fad17d32..fb0469cc 100644 --- a/Assets/Character Stats/Examples/Items & Inventory/Prefabs/Character Panel.prefab +++ b/Assets/Character Stats/Examples/Items & Inventory/Prefabs/Character Panel.prefab @@ -269,7 +269,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: -75, y: 0} + m_AnchoredPosition: {x: -80, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 1, y: 0.5} --- !u!222 &22203752 @@ -314,7 +314,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 10 + m_text: 5 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 41f9368fce25cb44ba223ac55f4e69e1, type: 2} m_sharedMaterial: {fileID: -1192090701822111264, guid: 41f9368fce25cb44ba223ac55f4e69e1, type: 2} @@ -785,6 +785,7 @@ RectTransform: - {fileID: 2537039618920728962} - {fileID: 646436410361276731} - {fileID: 3535333221199951038} + - {fileID: 3983369702515520910} m_Father: {fileID: 22436708} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -2478,6 +2479,81 @@ RectTransform: m_AnchoredPosition: {x: 0.00024414062, y: -0.000030517578} m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0, y: 0.5} +--- !u!1 &4025715779373906935 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3983369702515520910} + - component: {fileID: 8781054015115003221} + - component: {fileID: 4976824643472205644} + m_Layer: 5 + m_Name: Separator Line (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3983369702515520910 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4025715779373906935} + 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: 22485050} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -25} + m_SizeDelta: {x: 560, y: 5} + m_Pivot: {x: 0, y: 0} +--- !u!222 &8781054015115003221 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4025715779373906935} + m_CullTransparentMesh: 1 +--- !u!114 &4976824643472205644 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4025715779373906935} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, 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: c0c6236a6ab80ef4a976fb36399ec076, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &4146407517943226566 GameObject: m_ObjectHideFlags: 0 @@ -2976,7 +3052,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -75, y: 0} + m_AnchoredPosition: {x: -80, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 1, y: 0} --- !u!222 &5628216943697850386 @@ -3021,7 +3097,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 10 + m_text: 5 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 41f9368fce25cb44ba223ac55f4e69e1, type: 2} m_sharedMaterial: {fileID: -1192090701822111264, guid: 41f9368fce25cb44ba223ac55f4e69e1, type: 2} @@ -4323,12 +4399,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3989841934932094623} + - {fileID: 3695988768068368181} m_Father: {fileID: 22436708} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 360, y: -750} - m_SizeDelta: {x: 650, y: 300} + m_AnchoredPosition: {x: 360, y: -760} + m_SizeDelta: {x: 650, y: 310} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1478212227536300748 CanvasRenderer: @@ -4358,7 +4435,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4293f3f43e7a5524dbcb191b0ef09d9c, type: 3} + m_Sprite: {fileID: 21300000, guid: aad8787a1dd499d4dacdb7aaf6665918, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4367,7 +4444,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 2 + m_PixelsPerUnitMultiplier: 1.5 --- !u!114 &6394986907049716132 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4616,6 +4693,81 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8039854341493446651 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3695988768068368181} + - component: {fileID: 4255266324623065144} + - component: {fileID: 2497599639091523356} + m_Layer: 5 + m_Name: frame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3695988768068368181 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8039854341493446651} + 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: 983840987023945704} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -0.000061035156} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4255266324623065144 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8039854341493446651} + m_CullTransparentMesh: 1 +--- !u!114 &2497599639091523356 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8039854341493446651} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image + m_Material: {fileID: 0} + 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: 4293f3f43e7a5524dbcb191b0ef09d9c, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1.5 --- !u!1 &8732409747251912305 GameObject: m_ObjectHideFlags: 0 @@ -12619,6 +12771,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 22436708} m_Modifications: + - target: {fileID: 635207864709328192, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} + propertyPath: m_PixelsPerUnitMultiplier + value: 3 + objectReference: {fileID: 0} - target: {fileID: 1782877925726914783, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} propertyPath: m_Pivot.x value: 0.5 diff --git a/Assets/Character Stats/Examples/Items & Inventory/Prefabs/Item Tooltip.prefab b/Assets/Character Stats/Examples/Items & Inventory/Prefabs/Item Tooltip.prefab index ecece74d..20c610d1 100644 --- a/Assets/Character Stats/Examples/Items & Inventory/Prefabs/Item Tooltip.prefab +++ b/Assets/Character Stats/Examples/Items & Inventory/Prefabs/Item Tooltip.prefab @@ -35,7 +35,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 410, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &22235720 CanvasRenderer: @@ -66,7 +66,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 056364985cdd89f42af3bde9f196c7c2, type: 3} + m_Font: {fileID: 12800000, guid: 0aae3ffbcef7a1947b3798f3bac9ee4a, type: 3} m_FontSize: 28 m_FontStyle: 0 m_BestFit: 0 @@ -108,8 +108,8 @@ RectTransform: m_GameObject: {fileID: 118308} 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_LocalScale: {x: 0.74999994, y: 0.74999994, z: 0.74999994} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 22425178} - {fileID: 7629205552810058704} @@ -161,7 +161,7 @@ MonoBehaviour: m_Spacing: 10 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 1 + m_ChildControlWidth: 0 m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 @@ -235,7 +235,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 410, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &22202554 CanvasRenderer: @@ -266,7 +266,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 056364985cdd89f42af3bde9f196c7c2, type: 3} + m_Font: {fileID: 12800000, guid: 0aae3ffbcef7a1947b3798f3bac9ee4a, type: 3} m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 @@ -338,15 +338,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0.10980393, 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_Type: 1 + m_Sprite: {fileID: 21300000, guid: 5cb427ca385cd1248bd3913dbcd3de5a, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -410,7 +410,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 410, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &22224710 CanvasRenderer: @@ -433,7 +433,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 0.19607843, a: 1} + m_Color: {r: 1, g: 0.84313726, b: 0.37254903, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -441,7 +441,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 056364985cdd89f42af3bde9f196c7c2, type: 3} + m_Font: {fileID: 12800000, guid: 0aae3ffbcef7a1947b3798f3bac9ee4a, type: 3} m_FontSize: 22 m_FontStyle: 0 m_BestFit: 0 @@ -491,7 +491,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 380, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &4896690262356150817 CanvasRenderer: @@ -514,7 +514,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 0.19607843, a: 1} + m_Color: {r: 1, g: 0.84313726, b: 0.37254903, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -522,7 +522,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 056364985cdd89f42af3bde9f196c7c2, type: 3} + m_Font: {fileID: 12800000, guid: 0aae3ffbcef7a1947b3798f3bac9ee4a, type: 3} m_FontSize: 22 m_FontStyle: 0 m_BestFit: 0 @@ -589,8 +589,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: 40, y: 0} - m_SizeDelta: {x: 50, y: 50} + m_AnchoredPosition: {x: 35, y: 0} + m_SizeDelta: {x: 24, y: 24} m_Pivot: {x: 1, y: 0.5} --- !u!222 &2016365255415864920 CanvasRenderer: @@ -620,7 +620,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 @@ -638,6 +638,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 22405792} m_Modifications: + - target: {fileID: 635207864709328192, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} + propertyPath: m_PixelsPerUnitMultiplier + value: 4 + objectReference: {fileID: 0} - target: {fileID: 1782877925726914783, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} propertyPath: m_Pivot.x value: 0.5 diff --git a/Assets/Character Stats/Examples/Items & Inventory/Prefabs/Stat Tooltip.prefab b/Assets/Character Stats/Examples/Items & Inventory/Prefabs/Stat Tooltip.prefab index e44f2485..e84ebae8 100644 --- a/Assets/Character Stats/Examples/Items & Inventory/Prefabs/Stat Tooltip.prefab +++ b/Assets/Character Stats/Examples/Items & Inventory/Prefabs/Stat Tooltip.prefab @@ -185,7 +185,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 21d188fcb0c3cfe4785690e10cf3e459, type: 3} + m_Font: {fileID: 12800000, guid: 0aae3ffbcef7a1947b3798f3bac9ee4a, type: 3} m_FontSize: 28 m_FontStyle: 0 m_BestFit: 0 @@ -257,15 +257,15 @@ 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: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 5cb427ca385cd1248bd3913dbcd3de5a, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -352,7 +352,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 0.19607843, a: 1} + m_Color: {r: 1, g: 0.84313726, b: 0.37254903, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -360,7 +360,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 21d188fcb0c3cfe4785690e10cf3e459, type: 3} + m_Font: {fileID: 12800000, guid: 0aae3ffbcef7a1947b3798f3bac9ee4a, type: 3} m_FontSize: 22 m_FontStyle: 0 m_BestFit: 0 @@ -403,8 +403,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 8098952122475057242} + m_Children: [] m_Father: {fileID: 22490916} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -442,15 +441,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.84313726, b: 0.37254903, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -483,15 +482,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 @@ -521,168 +522,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5afc2ced505e9e1499ea22ebdd61031a, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &7146718088730870125 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8098952122475057242} - - component: {fileID: 849072120644950117} - - component: {fileID: 114204089669614379} - - component: {fileID: 8914017181721720198} - - component: {fileID: 6528454648320814258} - 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 &8098952122475057242 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7146718088730870125} - 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: 5394406359605955267} - 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 &849072120644950117 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7146718088730870125} - m_CullTransparentMesh: 1 ---- !u!114 &114204089669614379 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7146718088730870125} - 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 &8914017181721720198 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7146718088730870125} - 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: 40 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 20 - m_fontSizeMax: 40 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 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 &6528454648320814258 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7146718088730870125} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa08dde68b0ecb540b81dab0284fb2c6, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &8841606993931315791 PrefabInstance: m_ObjectHideFlags: 0 @@ -691,6 +530,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 22490916} m_Modifications: + - target: {fileID: 635207864709328192, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} + propertyPath: m_PixelsPerUnitMultiplier + value: 4 + objectReference: {fileID: 0} - target: {fileID: 1782877925726914783, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} propertyPath: m_Pivot.x value: 0.5 diff --git a/Assets/Developer/Prefabs/Persistent Objects.prefab b/Assets/Developer/Prefabs/Persistent Objects.prefab index 09c60424..77510a8c 100644 --- a/Assets/Developer/Prefabs/Persistent Objects.prefab +++ b/Assets/Developer/Prefabs/Persistent Objects.prefab @@ -528,6 +528,96 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &92386943318350442 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4888769543598503656} + - component: {fileID: 8858076552159318023} + - component: {fileID: 4812589277149171289} + - component: {fileID: 3120138441382264205} + m_Layer: 5 + m_Name: CastBarMask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4888769543598503656 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 92386943318350442} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7475116342128910726} + m_Father: {fileID: 8531758885627099224} + 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.000045776367, y: 0.000030517578} + m_SizeDelta: {x: 24, y: 24} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8858076552159318023 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 92386943318350442} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Mask + m_ShowMaskGraphic: 1 +--- !u!222 &4812589277149171289 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 92386943318350442} + m_CullTransparentMesh: 1 +--- !u!114 &3120138441382264205 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 92386943318350442} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image + 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_Sprite: {fileID: 21300000, guid: 4b13a69945a280a46bc2eb7763cf77a8, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &123590469623239277 GameObject: m_ObjectHideFlags: 0 @@ -594,7 +684,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 21d188fcb0c3cfe4785690e10cf3e459, type: 3} + m_Font: {fileID: 12800000, guid: 0aae3ffbcef7a1947b3798f3bac9ee4a, type: 3} m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 @@ -2217,8 +2307,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: 30, y: 0} - m_SizeDelta: {x: 60, y: 60} + m_AnchoredPosition: {x: 20, y: 0} + m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 1, y: 0.5} --- !u!222 &500735117287288996 CanvasRenderer: @@ -2248,7 +2338,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 @@ -2714,14 +2804,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.02441739, g: 0, b: 0.31132078, a: 0.9098039} + 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 @@ -3387,8 +3477,8 @@ MonoBehaviour: m_Calls: [] m_text: 20 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: [] @@ -5223,7 +5313,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: 20, y: 0} + m_AnchoredPosition: {x: 15, y: 0} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 1, y: 0.5} --- !u!222 &8959699437534476517 @@ -5420,7 +5510,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 0.19607843, a: 1} + m_Color: {r: 1, g: 0.84313726, b: 0.37254903, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -5428,7 +5518,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 21d188fcb0c3cfe4785690e10cf3e459, type: 3} + m_Font: {fileID: 12800000, guid: 0aae3ffbcef7a1947b3798f3bac9ee4a, type: 3} m_FontSize: 22 m_FontStyle: 0 m_BestFit: 0 @@ -5500,15 +5590,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.054642845, g: 0.07892854, b: 0.255, 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_Type: 1 + m_Sprite: {fileID: 21300000, guid: 5cb427ca385cd1248bd3913dbcd3de5a, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -5603,7 +5693,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 21d188fcb0c3cfe4785690e10cf3e459, type: 3} + m_Font: {fileID: 12800000, guid: 0aae3ffbcef7a1947b3798f3bac9ee4a, type: 3} m_FontSize: 28 m_FontStyle: 0 m_BestFit: 0 @@ -5804,7 +5894,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 21d188fcb0c3cfe4785690e10cf3e459, type: 3} + m_Font: {fileID: 12800000, guid: 0aae3ffbcef7a1947b3798f3bac9ee4a, type: 3} m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 @@ -6993,7 +7083,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 0.19607843, a: 1} + m_Color: {r: 1, g: 0.84313726, b: 0.37254903, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -7001,7 +7091,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 21d188fcb0c3cfe4785690e10cf3e459, type: 3} + m_Font: {fileID: 12800000, guid: 0aae3ffbcef7a1947b3798f3bac9ee4a, type: 3} m_FontSize: 22 m_FontStyle: 0 m_BestFit: 0 @@ -8065,6 +8155,81 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -25} m_SizeDelta: {x: -40, y: 130} m_Pivot: {x: 0.5, y: 1} +--- !u!1 &4980944199588350600 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 532921807012275775} + - component: {fileID: 7156297194905486666} + - component: {fileID: 4337960136894708005} + m_Layer: 5 + m_Name: border + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &532921807012275775 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4980944199588350600} + 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: 8531758885627099224} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7156297194905486666 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4980944199588350600} + m_CullTransparentMesh: 1 +--- !u!114 &4337960136894708005 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4980944199588350600} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image + 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_Sprite: {fileID: 21300000, guid: 6403afd719acd2b4dbb0dfae7add33cb, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &5003079884034657989 GameObject: m_ObjectHideFlags: 0 @@ -8815,6 +8980,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5394416798803589263 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7593607268777095958} + - component: {fileID: 2860643560484883024} + - component: {fileID: 1584881120345239953} + m_Layer: 5 + m_Name: fillBorder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7593607268777095958 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5394416798803589263} + 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: 8531758885627099224} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 225, y: 0.000040803454} + m_SizeDelta: {x: 200, y: 8} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &2860643560484883024 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5394416798803589263} + m_CullTransparentMesh: 1 +--- !u!114 &1584881120345239953 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5394416798803589263} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.84313726, b: 0.37254903, 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: 9d5f6625b0b035841a1153f7e5466a94, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 0 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 5 --- !u!1 &5406878406025582633 GameObject: m_ObjectHideFlags: 0 @@ -9136,15 +9376,15 @@ MonoBehaviour: m_Calls: [] m_text: 'Job Completed:' 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: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4284471295 + m_fontColor: {r: 1, g: 0.84313726, b: 0.37254903, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -12106,8 +12346,8 @@ MonoBehaviour: m_Calls: [] m_text: 20 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: [] @@ -13088,11 +13328,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 7475116342128910726} + m_Father: {fileID: 8531758885627099224} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 225, y: 0} + m_AnchoredPosition: {x: 225, y: 0.000040803454} m_SizeDelta: {x: 200, y: 8} m_Pivot: {x: 1, y: 0.5} --- !u!222 &7475116341708744573 @@ -13405,7 +13645,7 @@ GameObject: - component: {fileID: 7475116342128910724} - component: {fileID: 7475116342128910725} m_Layer: 5 - m_Name: CastBar + m_Name: CastBarIcon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -13418,19 +13658,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7475116342128910727} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7475116341708744575} - - {fileID: 7475116342385688832} - m_Father: {fileID: 7475116342604559439} + m_Children: [] + m_Father: {fileID: 4888769543598503656} 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: -100, y: 160} - m_SizeDelta: {x: 25, y: 25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -2, y: -2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7475116342128910724 CanvasRenderer: @@ -13744,11 +13982,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 7475116342128910726} + m_Father: {fileID: 8531758885627099224} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 225, y: 0} + m_AnchoredPosition: {x: 225, y: 0.000040803454} m_SizeDelta: {x: 200, y: 8} m_Pivot: {x: 1, y: 0.5} --- !u!222 &7475116342385688838 @@ -13772,7 +14010,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.7916427, b: 0.6745283, a: 1} + m_Color: {r: 1, g: 0.84313726, b: 0.37254903, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -13980,7 +14218,7 @@ RectTransform: - {fileID: 7475116342305776693} - {fileID: 4534840833812050507} - {fileID: 394693719105648064} - - {fileID: 7475116342128910726} + - {fileID: 8531758885627099224} - {fileID: 4340701886936047322} - {fileID: 8303459673738591506} - {fileID: 7475116342081001901} @@ -14680,7 +14918,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da55c14917e4a7041b1569276c777f71, type: 3} m_Name: m_EditorClassIdentifier: - castBar: {fileID: 7475116342128910727} + castBar: {fileID: 8500122309699847114} castBarIcon: {fileID: 7475116342128910725} imageToFill: {fileID: 7475116342385688839} timer: 0 @@ -15253,8 +15491,8 @@ MonoBehaviour: m_Calls: [] m_text: 20 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: [] @@ -16510,6 +16748,46 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8500122309699847114 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8531758885627099224} + m_Layer: 5 + m_Name: CastBarParent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8531758885627099224 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8500122309699847114} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4888769543598503656} + - {fileID: 7475116341708744575} + - {fileID: 7475116342385688832} + - {fileID: 7593607268777095958} + - {fileID: 532921807012275775} + m_Father: {fileID: 7475116342604559439} + 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: -100, y: -380.16718} + m_SizeDelta: {x: 25, y: 25} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8618652164204461469 GameObject: m_ObjectHideFlags: 0 @@ -16843,8 +17121,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: 40, y: 0} - m_SizeDelta: {x: 50, y: 50} + m_AnchoredPosition: {x: 35, y: 0} + m_SizeDelta: {x: 24, y: 24} m_Pivot: {x: 1, y: 0.5} --- !u!222 &3668201335071149038 CanvasRenderer: @@ -16874,7 +17152,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 @@ -18113,6 +18391,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1232464306980202405} m_Modifications: + - target: {fileID: 635207864709328192, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} + propertyPath: m_PixelsPerUnitMultiplier + value: 4 + objectReference: {fileID: 0} - target: {fileID: 1782877925726914783, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -18643,6 +18925,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 2959850296485017366} m_Modifications: + - target: {fileID: 635207864709328192, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} + propertyPath: m_PixelsPerUnitMultiplier + value: 4 + objectReference: {fileID: 0} - target: {fileID: 1782877925726914783, guid: fe12c8a93bbe5e2419fed496d223050b, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -28378,26 +28664,6 @@ PrefabInstance: propertyPath: m_Name value: Item Tooltip objectReference: {fileID: 0} - - target: {fileID: 118308, guid: 98484fbd97870af4d8569162460a89bb, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11419464, guid: 98484fbd97870af4d8569162460a89bb, type: 3} - propertyPath: m_FontData.m_Font - value: - objectReference: {fileID: 12800000, guid: 21d188fcb0c3cfe4785690e10cf3e459, type: 3} - - target: {fileID: 11443260, guid: 98484fbd97870af4d8569162460a89bb, type: 3} - propertyPath: m_ChildControlWidth - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11444982, guid: 98484fbd97870af4d8569162460a89bb, type: 3} - propertyPath: m_FontData.m_Font - value: - objectReference: {fileID: 12800000, guid: 21d188fcb0c3cfe4785690e10cf3e459, type: 3} - - target: {fileID: 11459024, guid: 98484fbd97870af4d8569162460a89bb, type: 3} - propertyPath: m_FontData.m_Font - value: - objectReference: {fileID: 12800000, guid: 21d188fcb0c3cfe4785690e10cf3e459, type: 3} - target: {fileID: 22405792, guid: 98484fbd97870af4d8569162460a89bb, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -28406,10 +28672,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22405792, guid: 98484fbd97870af4d8569162460a89bb, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 22405792, guid: 98484fbd97870af4d8569162460a89bb, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -28434,18 +28696,6 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22405792, guid: 98484fbd97870af4d8569162460a89bb, type: 3} - propertyPath: m_LocalScale.x - value: 0.74999994 - objectReference: {fileID: 0} - - target: {fileID: 22405792, guid: 98484fbd97870af4d8569162460a89bb, type: 3} - propertyPath: m_LocalScale.y - value: 0.74999994 - objectReference: {fileID: 0} - - target: {fileID: 22405792, guid: 98484fbd97870af4d8569162460a89bb, type: 3} - propertyPath: m_LocalScale.z - value: 0.74999994 - objectReference: {fileID: 0} - target: {fileID: 22405792, guid: 98484fbd97870af4d8569162460a89bb, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -28494,10 +28744,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 22405792, guid: 98484fbd97870af4d8569162460a89bb, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - target: {fileID: 22417586, guid: 98484fbd97870af4d8569162460a89bb, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -28506,10 +28752,6 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22417586, guid: 98484fbd97870af4d8569162460a89bb, type: 3} - propertyPath: m_SizeDelta.x - value: 410 - objectReference: {fileID: 0} - target: {fileID: 22417586, guid: 98484fbd97870af4d8569162460a89bb, type: 3} propertyPath: m_SizeDelta.y value: 0 @@ -28530,10 +28772,6 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22433816, guid: 98484fbd97870af4d8569162460a89bb, type: 3} - propertyPath: m_SizeDelta.x - value: 410 - objectReference: {fileID: 0} - target: {fileID: 22433816, guid: 98484fbd97870af4d8569162460a89bb, type: 3} propertyPath: m_SizeDelta.y value: 0 @@ -28554,10 +28792,6 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22450686, guid: 98484fbd97870af4d8569162460a89bb, type: 3} - propertyPath: m_SizeDelta.x - value: 410 - objectReference: {fileID: 0} - target: {fileID: 22450686, guid: 98484fbd97870af4d8569162460a89bb, type: 3} propertyPath: m_SizeDelta.y value: 0 @@ -28578,10 +28812,6 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1572960288142613684, guid: 98484fbd97870af4d8569162460a89bb, type: 3} - propertyPath: m_SizeDelta.x - value: 380 - objectReference: {fileID: 0} - target: {fileID: 1572960288142613684, guid: 98484fbd97870af4d8569162460a89bb, type: 3} propertyPath: m_SizeDelta.y value: 0 @@ -28594,34 +28824,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4107723565270505401, guid: 98484fbd97870af4d8569162460a89bb, type: 3} - propertyPath: m_FontData.m_Font - value: - objectReference: {fileID: 12800000, guid: 21d188fcb0c3cfe4785690e10cf3e459, type: 3} - - target: {fileID: 7629205552810058704, guid: 98484fbd97870af4d8569162460a89bb, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7629205552810058704, guid: 98484fbd97870af4d8569162460a89bb, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7629205552810058704, guid: 98484fbd97870af4d8569162460a89bb, type: 3} - propertyPath: m_SizeDelta.y - value: -4 - objectReference: {fileID: 0} - - target: {fileID: 7629205552810058704, guid: 98484fbd97870af4d8569162460a89bb, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7629205552810058704, guid: 98484fbd97870af4d8569162460a89bb, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9150840259635976979, guid: 98484fbd97870af4d8569162460a89bb, type: 3} - propertyPath: m_IgnoreLayout - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Fantasy Skybox FREE/Panoramics/FS002/FS002_Night.mat b/Assets/Fantasy Skybox FREE/Panoramics/FS002/FS002_Night.mat index 43c93087..dc1ae1d3 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: 7.5066214 + - _Rotation: 15.411946 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Resources/PlayerPrefab.prefab b/Assets/Resources/PlayerPrefab.prefab index a6cc2f07..ca292d59 100644 --- a/Assets/Resources/PlayerPrefab.prefab +++ b/Assets/Resources/PlayerPrefab.prefab @@ -717,7 +717,7 @@ MonoBehaviour: onResourceChanged: m_PersistentCalls: m_Calls: [] - scrollingTextPrefab: {fileID: 0} + scrollingTextPrefab: {fileID: 677595231222924942, guid: abe5cfbb1d6d9454aa835afceb136dcf, type: 3} onMaxHealthChanged: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Scripts/AbilitySystem/Effects/InstantValueEffect.cs b/Assets/Scripts/AbilitySystem/Effects/InstantValueEffect.cs index a6335ecc..b1be3c94 100644 --- a/Assets/Scripts/AbilitySystem/Effects/InstantValueEffect.cs +++ b/Assets/Scripts/AbilitySystem/Effects/InstantValueEffect.cs @@ -128,12 +128,15 @@ public class InstantValueEffect : BaseEffect isCrit = true; //Debug.Log("FinalValue IsCrit = " + finalValue + " dmgType = " + damageType); } + else + isCrit = false; finalValue = damageOutputModifier.ModifyDamageOutput(finalValue); } private bool IsCrit(CharacterStats stats) { - return Random.Range(0, 100) < stats.CritChance.Value; + return MathHelpers.RollChance(MathHelpers.NormalizePercentageDecimal(stats.CritChance.Value)); + //return Random.Range(0, 100) < stats.CritChance.Value; } } diff --git a/Assets/Scripts/Game/GameConstants.cs b/Assets/Scripts/Game/GameConstants.cs index 325eda16..5e47aa99 100644 --- a/Assets/Scripts/Game/GameConstants.cs +++ b/Assets/Scripts/Game/GameConstants.cs @@ -116,24 +116,24 @@ public static class GameConstants public static class CharacterStatsBalancing { #region Cunning Influence - public static float CritChanceIncreasePerCunning = 0.0033f; - public static float CritDamageIncreasePerCunning = 0.008f; - public static float MovementSpeedIncreasePerCunning = 0.0033f; + public static float CritChanceIncreasePerCunning = 0.33f; + public static float CritDamageIncreasePerCunning = 0.8f; + public static float MovementSpeedIncreasePerCunning = 0.33f; #endregion #region Flow Influence - public const float MaxManaIncreasePerFlow = 8f; - public const float ManaRegenIncreasePerFlow = 3f; - public const float CooldownReductionIncreasePerFlow = 0.003f; + public const float MaxManaIncreasePerFlow = 4f; + public const float ManaRegenIncreasePerFlow = 1.5f; + public const float CooldownReductionIncreasePerFlow = 0.3f; public const float AttackSpeedIncreasePerFlow = 0.01f; #endregion #region Presence Influence - public static float AreaEffectivenessIncreasePerPresence = 0.0033f; + public static float AreaEffectivenessIncreasePerPresence = 0.33f; public static float ReputationGainIncreasePerPresence = 0.01f; public static float GoldCostReductionPerPresence = 0.005f; - public static float AuraPowerPerPresence = 0.0033f; + public static float AuraPowerPerPresence = 0.33f; #endregion public const float AttackDamageIncreaseFromStrength = 0.35f; // 35% str => AttkDmg