rizzeadmin/MiniGames
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wall effect fix, Jump fix, env collider fix

Browse Source
This commit is contained in:
Ali Sharoz 2025-09-16 17:51:02 +05:00
parent e98c1f133f
commit ffc4f75892
11 changed files with 263 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Scenes/ChaseRun.unity
View File

@ -11334,6 +11334,7 @@ GameObject:
SceneRoots:
m_ObjectHideFlags: 0
m_Roots:
- {fileID: 7005741450587164540}
- {fileID: 1763402142}
- {fileID: 1870306513}
- {fileID: 191013148}
@ -11349,7 +11350,6 @@ SceneRoots:
- {fileID: 1222413696}
- {fileID: 3053107476953267316}
- {fileID: 500094653}
- {fileID: 7005741450587164540}
- {fileID: 2132875765658397984}
- {fileID: 486463482}
- {fileID: 2076316935}

2
Assets/Scenes/ClawGrab.unity
View File

@ -6275,7 +6275,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!114 &1360678218
MonoBehaviour:
m_ObjectHideFlags: 0

106
Assets/Scenes/CrateEscape.unity
View File

@ -9743,7 +9743,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &260718851
Transform:
m_ObjectHideFlags: 0
@ -23936,6 +23936,37 @@ Transform:
- {fileID: 71872086}
m_Father: {fileID: 1844037649}
m_LocalEulerAnglesHint: {x: -0.00000017657291, y: 0.0000055042838, z: 2.2418983}
--- !u!1 &676580787
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 676580788}
m_Layer: 0
m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &676580788
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 676580787}
serializedVersion: 2
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: 1078607385}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &681334985
GameObject:
m_ObjectHideFlags: 0
@ -38597,6 +38628,7 @@ Transform:
m_Children:
- {fileID: 978110335}
- {fileID: 1245425753}
- {fileID: 676580788}
m_Father: {fileID: 260718851}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1078607386
@ -38728,18 +38760,18 @@ MonoBehaviour:
maxSpeedMultiplier: 3
inputDeadZone: 0.1
cameraRelative: 1
cameraTransform: {fileID: 0}
cameraTransform: {fileID: 1304030265}
useDynamicGroundNormal: 0
staticUp: {x: 0, y: 1, z: 0}
groundForNormalMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 1
groundNormalRayLength: 3
faceMoveDirection: 1
turnSpeed: 540
groundMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 256
groundCheckRadius: 0.2
groundCheck: {fileID: 1078607385}
jumpForce: 7
@ -49736,18 +49768,18 @@ MonoBehaviour:
maxSpeedMultiplier: 3
inputDeadZone: 0.1
cameraRelative: 1
cameraTransform: {fileID: 0}
cameraTransform: {fileID: 1304030265}
useDynamicGroundNormal: 0
staticUp: {x: 0, y: 1, z: 0}
groundForNormalMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 1
groundNormalRayLength: 3
faceMoveDirection: 1
turnSpeed: 540
groundMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 256
groundCheckRadius: 0.2
groundCheck: {fileID: 1329894559}
jumpForce: 7
@ -68696,18 +68728,18 @@ MonoBehaviour:
maxSpeedMultiplier: 3
inputDeadZone: 0.1
cameraRelative: 1
cameraTransform: {fileID: 0}
cameraTransform: {fileID: 1304030265}
useDynamicGroundNormal: 0
staticUp: {x: 0, y: 1, z: 0}
groundForNormalMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 1
groundNormalRayLength: 3
faceMoveDirection: 1
turnSpeed: 540
groundMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 256
groundCheckRadius: 0.2
groundCheck: {fileID: 1816328266}
jumpForce: 7
@ -79747,7 +79779,7 @@ GameObject:
- component: {fileID: 8316978650759498526}
- component: {fileID: 8089337864461908263}
- component: {fileID: 8316978650759498527}
m_Layer: 0
m_Layer: 8
m_Name: Floor
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -80470,6 +80502,7 @@ GameObject:
- component: {fileID: 4042657798250749998}
- component: {fileID: 575816373767074923}
- component: {fileID: 5561101949612881725}
- component: {fileID: 5561101949612881726}
m_Layer: 0
m_Name: Seats_A
m_TagString: Untagged
@ -81832,6 +81865,28 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &5561101949612881726
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3440509902731752572}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 5
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: -3076087298224779314, guid: 966cfe98504e69c4f93880b9de3b84c3, type: 3}
--- !u!33 &5586549074461493978
MeshFilter:
m_ObjectHideFlags: 0
@ -83546,18 +83601,18 @@ MonoBehaviour:
maxSpeedMultiplier: 3
inputDeadZone: 0.1
cameraRelative: 1
cameraTransform: {fileID: 0}
cameraTransform: {fileID: 1304030265}
useDynamicGroundNormal: 0
staticUp: {x: 0, y: 1, z: 0}
groundForNormalMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 1
groundNormalRayLength: 3
faceMoveDirection: 1
turnSpeed: 540
groundMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 256
groundCheckRadius: 0.2
groundCheck: {fileID: 5402742484430148059}
jumpForce: 7
@ -83938,6 +83993,7 @@ GameObject:
- component: {fileID: 5343468960385212202}
- component: {fileID: 4930876577694113767}
- component: {fileID: 1563712157113839043}
- component: {fileID: 7605703272017014113}
m_Layer: 0
m_Name: Seats_B
m_TagString: Untagged
@ -83945,6 +84001,28 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!64 &7605703272017014113
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7605703272017014112}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 5
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: -9132067751168956571, guid: 966cfe98504e69c4f93880b9de3b84c3, type: 3}
--- !u!33 &7626292996014008602
MeshFilter:
m_ObjectHideFlags: 0

2
Assets/Scenes/SkyWalker.unity
View File

@ -1851,7 +1851,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3}
propertyPath: m_SizeDelta.x
value: 960
value: 545.8538
objectReference: {fileID: 0}
- target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3}
propertyPath: m_SizeDelta.y

1
Assets/Scripts/ChaseOn/ChaseObstacleTrigger.cs
View File

@ -17,6 +17,7 @@ public class ChaseObstacleTrigger : MonoBehaviour
contactTimer = 0f;
player.OnObstacleHit(); // First hit (stumble)
}
gameObject.SetActive(false);
}
private void HandleStay()

9
Assets/Scripts/ChaseOn/ChasePlayerController.cs
View File

@ -16,6 +16,7 @@ public class ChasePlayerController : MonoBehaviour
// ===== Movement =====
[Header("Movement")]
public float moveSpeed = 5f;
float startingMoveSpeed;
[SerializeField] private float laneDistance = 2.5f; // 0=Left,1=Mid,2=Right
[SerializeField] private float laneSwitchSpeed = 10f; // units/sec
@ -110,6 +111,7 @@ public class ChasePlayerController : MonoBehaviour
[SerializeField] private Canvas jumpImageCanvas; // optional; drag the Canvas (for camera)
private int jumpCounter=0;
public int numOfJumpsAllowed;
bool cantJump = false;
private bool TouchBeganOnJumpImage(Vector2 screenPos)
{
if (jumpImageRect == null) return false;
@ -120,7 +122,7 @@ public class ChasePlayerController : MonoBehaviour
// Add these public methods anywhere in the class:
public void OnJumpPress()
{
if (jumpCounter >= numOfJumpsAllowed) return;
if (jumpCounter >= numOfJumpsAllowed||cantJump==true) return;
jumpCounter++;
jumpPressTime = Time.time;
TryStartJump();
@ -181,6 +183,7 @@ public class ChasePlayerController : MonoBehaviour
if (animator) animator.applyRootMotion = false;
ForceRunStart();
startingMoveSpeed = moveSpeed;
}
public void SetMoveSpeed(float newSpeed)
@ -491,6 +494,8 @@ public class ChasePlayerController : MonoBehaviour
if (!ignoreGuards && (IsInOrGoingTo(fallShortHash) || IsInOrGoingTo(fallingShortHash) || waitingForGameOver))
return;
moveSpeed = startingMoveSpeed;
if (useSpeedBlendTree && hasSpeedFloat)
animator.SetFloat(speedParamName, runSpeedParamValue);
else if (!string.IsNullOrEmpty(runStateName))
@ -611,6 +616,7 @@ public class ChasePlayerController : MonoBehaviour
originalMoveSpeed = baseMoveSpeed;
SetMoveSpeed(0);
cantJump = true;
StartCoroutine(ResumeRunAfter(fallStateName, fallShortHash));
}
}
@ -642,6 +648,7 @@ public class ChasePlayerController : MonoBehaviour
// restore baseline & current speed
baseMoveSpeed = originalMoveSpeed; // baseline for threat boost
SetMoveSpeed(originalMoveSpeed); // actual run speed now
cantJump = false;
animator.CrossFadeInFixedTime(runStateName, 0.1f, baseLayer, 0f);
}
}

2
Assets/Scripts/CrateEscape/CrateEscapePlayerControllerJoystick.cs
View File

@ -354,7 +354,7 @@ public class CrateEscapePlayerControllerJoystick : MonoBehaviour
public void OnJumpUIButton()
{
if (IsBlocked()) return;
Debug.Log("isGrounded: " + IsGrounded());
if (IsGrounded() || (allowAirJump && !_usedAirJump))
_jumpQueued = true;
}

34
Assets/Scripts/SkyWalker/Skywalker_BreakableWall.cs
View File

@ -9,25 +9,35 @@ public class Skywalker_BreakableWall : MonoBehaviour
public float shrinkScale = 0.1f; // final scale when shrinking
private bool isBreaking = false;
public Transform childMesh;
public void BreakWall()
{
if (isBreaking) return;
isBreaking = true;
// Create a sequence
Sequence seq = DOTween.Sequence();
// Step 1: Shake
seq.Append(transform.DOShakePosition(shakeDuration, strength: 0.2f, vibrato: 10, randomness: 90));
// Step 2: Shrink down
seq.Append(transform.DOScale(Vector3.one * shrinkScale, breakDuration).SetEase(Ease.InBack));
// Step 3: Destroy at the end
seq.OnComplete(() =>
//childMesh.DOShakePosition(shakeDuration,strength: 0.005f, vibrato: 10, randomness: 45).OnComplete(() =>
//{
childMesh.DOScale(Vector3.one * shrinkScale, breakDuration).SetEase(Ease.InOutBack).OnComplete(() =>
{
Destroy(gameObject);
});
//});
// Create a sequence
//Sequence seq = DOTween.Sequence();
//// Step 1: Shake
//seq.Append(childMesh.DOShakePosition(shakeDuration).OnComplete(() =>
//{
// // Step 2: Shrink down
// seq.Append(childMesh.DOScale(Vector3.one * shrinkScale, breakDuration).SetEase(Ease.InBack));
//});
//// Step 3: Destroy at the end
//seq.OnComplete(() =>
//{
// Destroy(gameObject);
//});
}
}

10
Assets/Scripts/SkyWalker/Skywalker_PlayerController.cs
View File

@ -66,12 +66,14 @@ public class Skywalker_PlayerController : MonoBehaviour
void Jump()
{
isGrounded = Physics.CheckSphere(groundCheck.position, groundCheckRadius, groundLayer);
if (jumpPressed && isGrounded)
if (jumpPressed)
{
rb.velocity = new Vector3(rb.velocity.x, jumpForce, rb.velocity.z);
animator.SetTrigger("Jump");
jumpPressed = false; // reset after using
if (isGrounded)
{
rb.velocity = new Vector3(rb.velocity.x, jumpForce, rb.velocity.z);
animator.SetTrigger("Jump");
}
}
}

127
Assets/Skywalker/Prefabs/BreakableWall.prefab
View File

@ -1,5 +1,122 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1154450780734714632
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8927519383163184910}
- component: {fileID: 978350487594416924}
- component: {fileID: 7062171015149614854}
m_Layer: 0
m_Name: Mesh
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8927519383163184910
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1154450780734714632}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: 0.000000029802326, w: 1}
m_LocalPosition: {x: 0, y: 0.0030699996, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 985488211340468034}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &978350487594416924
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1154450780734714632}
m_Mesh: {fileID: 8228448932806584147, guid: a4a9717eb9cd92c46bcb42167f76b64a, type: 3}
--- !u!23 &7062171015149614854
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1154450780734714632}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 4cc15af6faf9a934293e95116bd7007a, type: 2}
- {fileID: 2100000, guid: 5a1f5ea232e7ed44287204f763e68a0c, type: 2}
- {fileID: 2100000, guid: ed6a9709c10ef1d4fa6e7ec57170997a, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &2536999257212327385
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 985488211340468034}
m_Layer: 0
m_Name: MeshParent
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &985488211340468034
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2536999257212327385}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -0.00307, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 8927519383163184910}
m_Father: {fileID: 2869997623298999425}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3770580811960854660
GameObject:
m_ObjectHideFlags: 0
@ -33,7 +150,8 @@ Transform:
m_LocalPosition: {x: -5.93, y: 2.19, z: -4.6124}
m_LocalScale: {x: 0.9996262, y: 1.934939, z: 1.3178982}
m_ConstrainProportionsScale: 0
m_Children: []
m_Children:
- {fileID: 985488211340468034}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
--- !u!33 &4670289408375665519
@ -51,7 +169,7 @@ MeshRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3770580811960854660}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@ -104,6 +222,7 @@ MonoBehaviour:
shakeDuration: 0.5
breakDuration: 0.5
shrinkScale: 0.1
childMesh: {fileID: 985488211340468034}
--- !u!64 &5800281458544151865
MeshCollider:
m_ObjectHideFlags: 0
@ -151,5 +270,5 @@ Rigidbody:
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 126
m_CollisionDetection: 0
m_Constraints: 122
m_CollisionDetection: 1

14
ProjectSettings/ProjectSettings.asset
View File

@ -814,7 +814,7 @@ PlayerSettings:
blurSplashScreenBackground: 1
spritePackerPolicy:
webGLMemorySize: 16
webGLExceptionSupport: 1
webGLExceptionSupport: 0
webGLNameFilesAsHashes: 0
webGLShowDiagnostics: 0
webGLDataCaching: 1
@ -824,18 +824,18 @@ PlayerSettings:
webGLTemplate: APPLICATION:Default
webGLAnalyzeBuildSize: 0
webGLUseEmbeddedResources: 0
webGLCompressionFormat: 2
webGLCompressionFormat: 1
webGLWasmArithmeticExceptions: 0
webGLLinkerTarget: 1
webGLThreadsSupport: 0
webGLDecompressionFallback: 0
webGLInitialMemorySize: 32
webGLDecompressionFallback: 1
webGLInitialMemorySize: 192
webGLMaximumMemorySize: 2048
webGLMemoryGrowthMode: 2
webGLMemoryLinearGrowthStep: 16
webGLMemoryGeometricGrowthStep: 0.2
webGLMemoryGeometricGrowthCap: 96
webGLPowerPreference: 2
webGLMemoryGeometricGrowthCap: 1024
webGLPowerPreference: 0
scriptingDefineSymbols:
Android: UNITY_POST_PROCESSING_STACK_V2
EmbeddedLinux: UNITY_POST_PROCESSING_STACK_V2
@ -865,7 +865,7 @@ PlayerSettings:
QNX: 1
Stadia: 1
VisionOS: 1
WebGL: 1
WebGL: 2
Windows Store Apps: 1
XboxOne: 1
iPhone: 1