diff --git a/Assets/Graphics/Blood.png.meta b/Assets/Graphics/Blood.png.meta index cc4293a..de5a464 100644 --- a/Assets/Graphics/Blood.png.meta +++ b/Assets/Graphics/Blood.png.meta @@ -57,7 +57,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 2 + spritePixelsToUnits: 32 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/Graphics/Flower.png.meta b/Assets/Graphics/Flower.png.meta index b14be05..2d53972 100644 --- a/Assets/Graphics/Flower.png.meta +++ b/Assets/Graphics/Flower.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 16 + spritePixelsToUnits: 32 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/Prefabs/Particles/BloodParticle (Censored).prefab b/Assets/Prefabs/Particles/BloodParticle (Censored).prefab index 88d1cce..938dc1f 100644 --- a/Assets/Prefabs/Particles/BloodParticle (Censored).prefab +++ b/Assets/Prefabs/Particles/BloodParticle (Censored).prefab @@ -26,7 +26,7 @@ Transform: m_GameObject: {fileID: 1882677610630750272} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2, y: 2, z: 2} + m_LocalScale: {x: 4, y: 4, z: 2} m_Children: [] m_Father: {fileID: 1882677610906969933} m_RootOrder: 0 diff --git a/Assets/Prefabs/Particles/BloodParticle.prefab b/Assets/Prefabs/Particles/BloodParticle.prefab index 1e5e2ea..342b71a 100644 --- a/Assets/Prefabs/Particles/BloodParticle.prefab +++ b/Assets/Prefabs/Particles/BloodParticle.prefab @@ -26,7 +26,7 @@ Transform: m_GameObject: {fileID: 5625006176639346184} 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_LocalScale: {x: 12, y: 12, z: 1} m_Children: [] m_Father: {fileID: 5625006176899801349} m_RootOrder: 0 @@ -69,15 +69,16 @@ SpriteRenderer: m_SortingLayerID: -1695068835 m_SortingLayer: 2 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: ff1fce077e0aafb45be2c369b110d6e0, type: 3} + m_Sprite: {fileID: 5684327315910396547, guid: ff1fce077e0aafb45be2c369b110d6e0, + type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.0625, y: 0.0625} + m_Size: {x: 0.1875, y: 0.1875} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 + m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!1 &5625006176899801348 diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index d3153b2..98e94ea 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -13793,7 +13793,7 @@ PrefabInstance: type: 3} propertyPath: CameraFX value: - objectReference: {fileID: 0} + objectReference: {fileID: 963194229} - target: {fileID: 8489029732530782806, guid: 14a47f86f9e45da45863a81716f2378b, type: 3} propertyPath: HandRotationRetractSpeed diff --git a/Assets/Scripts/Effects/BloodLauncher.cs b/Assets/Scripts/Effects/BloodLauncher.cs index bb44d7c..b62a57b 100644 --- a/Assets/Scripts/Effects/BloodLauncher.cs +++ b/Assets/Scripts/Effects/BloodLauncher.cs @@ -27,7 +27,7 @@ namespace Saltosion.OneWeapon { } GameObject Obj = Instantiate(prefab, origin, new Quaternion(), Singleton.ParticleRoot); BloodParticle Particle = Obj.GetComponent(); - float Intensity = Mathf.Pow(Random.value * force, 1.1f); + float Intensity = Mathf.Pow(Random.value, 0.8f) * force; float Cone = degrees / 360.0f; float Offset = Mathf.Atan2(direction.y, direction.x); float Radians = Offset + Mathf.Pow(Cone * (Random.value - 0.5f) * 2f, 2f) * Mathf.PI * 2.0f; @@ -44,7 +44,7 @@ namespace Saltosion.OneWeapon { } private float GetParticleCountMultiplier() { - return Options.CensorGore ? 0.1f : 1f; + return Options.CensorGore ? 0.1f : 1.5f; } } }