Skip to content

Commit

Permalink
First Prototype
Browse files Browse the repository at this point in the history
  • Loading branch information
More02 committed Apr 4, 2023
1 parent 197a47e commit 3b4bce4
Show file tree
Hide file tree
Showing 7 changed files with 138 additions and 129 deletions.
10 changes: 5 additions & 5 deletions Assets/Scenes/Prot.unity
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@ Terrain:
m_HeightmapPixelError: 5
m_SplatMapDistance: 1000
m_HeightmapMaximumLOD: 0
m_ShadowCastingMode: 2
m_ShadowCastingMode: 0
m_DrawHeightmap: 1
m_DrawInstanced: 0
m_DrawTreesAndFoliage: 1
Expand Down Expand Up @@ -2784,7 +2784,7 @@ Terrain:
m_HeightmapPixelError: 5
m_SplatMapDistance: 1000
m_HeightmapMaximumLOD: 0
m_ShadowCastingMode: 2
m_ShadowCastingMode: 0
m_DrawHeightmap: 1
m_DrawInstanced: 0
m_DrawTreesAndFoliage: 1
Expand Down Expand Up @@ -3063,13 +3063,13 @@ Rigidbody:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1441579686}
serializedVersion: 2
m_Mass: 1
m_Mass: 500
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 112
m_Constraints: 122
m_CollisionDetection: 0
--- !u!136 &1441579696
CapsuleCollider:
Expand Down Expand Up @@ -3177,7 +3177,7 @@ BoxCollider:
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 9.999999, y: 0.3, z: 9.999999}
m_Center: {x: -0.0000052452087, y: -0.3, z: 0.0000076293945}
m_Center: {x: -0.0000052452087, y: -0.18, z: 0.0000076293945}
--- !u!65 &1561413571
BoxCollider:
m_ObjectHideFlags: 0
Expand Down
5 changes: 4 additions & 1 deletion Assets/Scripts/Spells/DamagingProjectile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ public abstract class DamagingProjectile : ProjectileSpell
[SerializeField] private GameObject _explosionSpell;
protected TypeOfElement TypeOfElement;
protected Color Color = new Color(0.82f, 0.09f, 1f);
private bool _hited;

private bool _castEnd;

protected Collision Target;
Expand All @@ -30,10 +32,11 @@ protected override void PerformSpellAction()
protected void OnCollisionEnter(Collision collision)
{
//if (collision.gameObject.TryGetComponent<Health>(out var health))

if (_hited) return;
Target = collision;
PerformSpellAction();
Destroy(gameObject);
_hited = true;
}

private void OnDestroy()
Expand Down
3 changes: 2 additions & 1 deletion Assets/Scripts/Spells/TeleportationBall.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ protected override void PerformSpellAction()
if (_character is not null)
{
var teleportPoint = transform.position;
teleportPoint.y += _character.GetComponent<CharacterController>().height / 2;
_character.TryGetComponent<CapsuleCollider>(out var collider);
teleportPoint.y += collider is null ? 0.75f : collider.height / 2;
_character.position = teleportPoint;
}
else
Expand Down
1 change: 1 addition & 0 deletions Logs/shadercompiler-UnityShaderCompiler.exe0.log
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Base path: 'C:/Program Files/Unity/Hub/Editor/2021.3.11f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2021.3.11f1/Editor/Data/PlaybackEngines'
Cmd: initializeCompiler

Cmd: shutdown
5 changes: 4 additions & 1 deletion ProjectSettings/EditorBuildSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Scenes: []
m_Scenes:
- enabled: 1
path: Assets/Scenes/Prot.unity
guid: 9fc0d4010bbf28b4594072e72b8655ab
m_configObjects:
Unity.XR.OpenVR.Settings: {fileID: 11400000, guid: bf1b7f87e0fed6445a648ab83bc8a7f6,
type: 2}
Expand Down
7 changes: 4 additions & 3 deletions ProjectSettings/ProjectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ PlayerSettings:
useOnDemandResources: 0
accelerometerFrequency: 60
companyName: DefaultCompany
productName: New Unity Project
productName: Sign of Magic
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
Expand Down Expand Up @@ -134,7 +134,7 @@ PlayerSettings:
16:10: 1
16:9: 1
Others: 1
bundleVersion: 0.1
bundleVersion: 0.1.0
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0
Expand All @@ -155,7 +155,8 @@ PlayerSettings:
androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1
applicationIdentifier:
Standalone: com.DefaultCompany.New-Unity-Project
Android: com.DefaultCompany.SignofMagic
Standalone: com.DefaultCompany.Sign-of-Magic
buildNumber:
Standalone: 0
iPhone: 0
Expand Down
Loading

0 comments on commit 3b4bce4

Please sign in to comment.