Merge branch 'main' into dev-main

Fireball look direction bug fixed
FPS counter added

Assets/Polyart/PolyartStudio/DreamscapeCastle/Scenes/Gameplay.unity

@@ -100547,7 +100547,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: New Text
+  m_text: 
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -124453,6 +124453,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 94165390}
+  - {fileID: 1609554704}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -258815,6 +258816,154 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 1609482910}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &1609554703
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1609554704}
+  - component: {fileID: 1609554706}
+  - component: {fileID: 1609554705}
+  - component: {fileID: 1609554707}
+  m_Layer: 5
+  m_Name: FPSCounter
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1609554704
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1609554703}
+  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: 812152301}
+  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: 200, y: 50}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!114 &1609554705
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1609554703}
+  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: 
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 36
+  m_fontSizeBase: 36
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  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_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!222 &1609554706
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1609554703}
+  m_CullTransparentMesh: 1
+--- !u!114 &1609554707
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1609554703}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b3a6b12f93aa5374383e5559c622d83e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  updateInterval: 0.5
 --- !u!1 &1609816301
 GameObject:
   m_ObjectHideFlags: 0

Assets/Polyart/PolyartStudio/SharedResources/Scripts/Misc/FPS_Counter.cs

@@ -46,7 +46,7 @@ namespace Polyart
         void OnGUI()
         {
             //Display the fps and round to 2 decimals
-            GUI.Label(new Rect(5, 5, 100, 25), fps.ToString("F2") + "FPS", textStyle);
+            GUI.Label(new Rect(50, 50, 1000, 250), fps.ToString("F2") + "FPS", textStyle);
         }
     }
 }

Assets/Scripts/Abilities/AbilityClasses/FireballAbility.cs

@@ -12,50 +12,17 @@ public class FireballAbility : Ability
     {
         if (!user || !projectilePrefab) return;
 
-        // 1) Figure out an aim direction that includes camera pitch
-        // Try to use an "aim camera" on the user if you have one; otherwise Camera.main.
-        Camera cam = null;
-        if (Polyart.FirstPersonController.instance)
-            cam = Polyart.FirstPersonController.instance.PlayerCamera;
-        if (!cam) cam = Camera.main;
+        Vector3 dir = Camera.main.transform.forward;
 
-
-        Vector3 castPos = user.CastPos();
-        Vector3 dir = user.Forward(); // safe fallback
-
-        if (cam)
-        {
-            // Ray from camera forward
-            Ray ray = new Ray(cam.transform.position, cam.transform.forward);
-
-            // If we hit something, aim at that point; otherwise aim far away
-            Vector3 targetPoint;
-            if (Physics.Raycast(ray, out RaycastHit hit, 1000f, ~0, QueryTriggerInteraction.Ignore))
-                targetPoint = hit.point;
-            else
-                targetPoint = ray.origin + ray.direction * 1000f;
-
-            dir = (targetPoint - castPos).normalized;
-        }
-
-        // 2) Spawn & orient the projectile along that 3D direction
-        var go = Instantiate(projectilePrefab, castPos, Quaternion.LookRotation(dir));
-
-        // 3) Give it velocity along the aimed direction
+        //var go = Instantiate(projectilePrefab, user.CastPos(), Quaternion.LookRotation(user.Forward()));
+        var go = Instantiate(projectilePrefab, user.CastPos(), Quaternion.LookRotation(dir));
         var rb = go.GetComponent<Rigidbody>();
-        if (rb)
-        {
-            rb.velocity = dir * speed;               // or: rb.AddForce(dir * speed, ForceMode.VelocityChange);
-            rb.useGravity = false;                   // optional: keep straight flight
-            rb.collisionDetectionMode = CollisionDetectionMode.Continuous; // nicer for fast shots
-        }
+        if (rb) rb.velocity = dir * speed;
 
-        // 4) Damage component (unchanged)
         var dmg = go.GetComponent<ProjectileDamage>();
         if (!dmg) dmg = go.AddComponent<ProjectileDamage>();
         dmg.damage = damage;
 
         Destroy(go, lifeTime);
     }
-
 }

ProjectSettings/EditorBuildSettings.asset

@@ -6,6 +6,6 @@ EditorBuildSettings:
   serializedVersion: 2
   m_Scenes:
   - enabled: 1
-    path: Assets/Scenes/SampleScene.unity
-    guid: 99c9720ab356a0642a771bea13969a05
+    path: Assets/Polyart/PolyartStudio/DreamscapeCastle/Scenes/Gameplay.unity
+    guid: 88013426acf377648b0e2638e37de079
   m_configObjects: {}