Ryan/SSLR
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

game: i hope this works btr

Browse source
This commit is contained in:
ryan 2025-02-18 02:18:58 +08:00
parent 8af70a3f7b
commit 833fb0b50b
3 changed files with 9 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
SSLR/Assets/Scenes/Game Scene.unity
View file

@ -21149,7 +21149,8 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedComponents:
- {fileID: 4783073925009556759, guid: a7e24a9d9f4418445984728761364801, type: 3}
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
@ -40134,9 +40135,6 @@ PrefabInstance:
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 4026438539017934669, guid: c73e53e753e2b1041a7ac864f5ed636f, type: 3}
insertIndex: -1
addedObject: {fileID: 1236930476}
- targetCorrespondingSourceObject: {fileID: 4026438539017934669, guid: c73e53e753e2b1041a7ac864f5ed636f, type: 3}
insertIndex: -1
addedObject: {fileID: 1236930479}
@ -40151,27 +40149,6 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 4026438539017934669, guid: c73e53e753e2b1041a7ac864f5ed636f, type: 3}
m_PrefabInstance: {fileID: 1236930473}
m_PrefabAsset: {fileID: 0}
--- !u!65 &1236930476
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1236930475}
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: 3
m_Size: {x: 0.010972569, y: 0.0071072597, z: 0.01033768}
m_Center: {x: 0.00004601502, y: 0.00281008, z: -0.00013004988}
--- !u!114 &1236930479
MonoBehaviour:
m_ObjectHideFlags: 0
@ -59850,9 +59827,6 @@ PrefabInstance:
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 4026438539017934669, guid: c73e53e753e2b1041a7ac864f5ed636f, type: 3}
insertIndex: -1
addedObject: {fileID: 2070786417}
- targetCorrespondingSourceObject: {fileID: 4026438539017934669, guid: c73e53e753e2b1041a7ac864f5ed636f, type: 3}
insertIndex: -1
addedObject: {fileID: 2070786420}
@ -59867,27 +59841,6 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 4026438539017934669, guid: c73e53e753e2b1041a7ac864f5ed636f, type: 3}
m_PrefabInstance: {fileID: 2070786414}
m_PrefabAsset: {fileID: 0}
--- !u!65 &2070786417
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2070786416}
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: 3
m_Size: {x: 0.010972569, y: 0.0071072597, z: 0.01033768}
m_Center: {x: 0.00004601502, y: 0.00281008, z: -0.00013004988}
--- !u!114 &2070786420
MonoBehaviour:
m_ObjectHideFlags: 0
@ -61670,7 +61623,7 @@ BoxCollider:
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
m_Enabled: 0
serializedVersion: 3
m_Size: {x: 0.010000003, y: 0.010000001, z: 0.010000001}
m_Center: {x: 0, y: 0, z: 0}
@ -62378,7 +62331,7 @@ BoxCollider:
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
m_Enabled: 0
serializedVersion: 3
m_Size: {x: 0.010000003, y: 0.010000001, z: 0.010000001}
m_Center: {x: 0, y: 0, z: 0}
@ -63362,7 +63315,7 @@ BoxCollider:
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
m_Enabled: 0
serializedVersion: 3
m_Size: {x: 0.010000003, y: 0.01, z: 0.010000003}
m_Center: {x: 0, y: 0, z: 0}
@ -63553,7 +63506,7 @@ BoxCollider:
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
m_Enabled: 0
serializedVersion: 3
m_Size: {x: 0.010000003, y: 0.010000001, z: 0.010000001}
m_Center: {x: 0, y: 0, z: 0}
@ -64329,7 +64282,7 @@ BoxCollider:
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
m_Enabled: 0
serializedVersion: 3
m_Size: {x: 0.010000003, y: 0.01, z: 0.010000003}
m_Center: {x: 0, y: 0, z: 0}
@ -64431,7 +64384,7 @@ BoxCollider:
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
m_Enabled: 0
serializedVersion: 3
m_Size: {x: 0.010000003, y: 0.010000001, z: 0.010000001}
m_Center: {x: 0, y: 0, z: 0}

BIN
SSLR/Assets/Scenes/Game Scene/NavMesh-Game Manager.asset
View file

Binary file not shown.

2
SSLR/Assets/Scripts/NPCMovementRework.cs
View file

@ -148,7 +148,7 @@ public class NpcMovementRework : MonoBehaviour
while (true)
{
var dist = Vector3.Distance(sittingPosition, gameObject.transform.position);
if (dist < 0.05f)
if (dist < 0.5f)
{
agent.SetDestination(gameObject.transform.position);
animator.SetBool(IsSitting, true);