iwnc2020/OldBlueWater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closes #59 Jail can not use 2 NPC

Browse Source
This commit is contained in:
IDMhan 2023-11-24 14:25:47 +09:00
parent 207156cef9
commit 93505c673b
4 changed files with 73 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
BlueWater/Assets/01.Scenes/02.Main.unity
View File

@ -54256,7 +54256,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1625123128}
serializedVersion: 2
m_LocalRotation: {x: 0.6753435, y: 0.030742353, z: -0.028196404, w: 0.73632264}
m_LocalRotation: {x: 0.6753435, y: 0.030742656, z: -0.028196681, w: 0.73632264}
m_LocalPosition: {x: 0, y: 0, z: 0.00000047683716}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -87731,6 +87731,7 @@ GameObject:
- component: {fileID: 474660169}
- component: {fileID: 474660168}
- component: {fileID: 474660167}
- component: {fileID: 7671700087906838493}
- component: {fileID: 474660166}
- component: {fileID: 474660165}
- component: {fileID: 474660164}
@ -87741,6 +87742,54 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &7671700087906838493
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7671700087906838492}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 963d6358c55a0f44d8de57bee560f184, type: 3}
m_Name:
m_EditorClassIdentifier:
useDefaultGUI: 0
guiSkin: {fileID: 0}
guiStyleName:
alignment: 1
color: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
textStyle: 0
textStyleColor: {r: 0, g: 0, b: 0, a: 1}
defaultUseMessage:
useKey: 323
useButton:
enableTouch: 0
touchArea:
origin: 0
alignment: 0
x:
scale: 0
value: 0
y:
scale: 0
value: 0
width:
scale: 0
value: 0
height:
scale: 0
value: 0
minPixelWidth: 0
minPixelHeight: 0
broadcastToChildren: 1
actorTransform: {fileID: 0}
onSelectedUsable:
m_PersistentCalls:
m_Calls: []
onDeselectedUsable:
m_PersistentCalls:
m_Calls: []
--- !u!1 &7671700088093864462
GameObject:
m_ObjectHideFlags: 0

11
BlueWater/Assets/02.Scripts/BlueWater.cs
View File

@ -232,6 +232,17 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""857036ad-83d5-4d39-a34d-eb3f7d804912"",
""path"": ""<Mouse>/leftButton"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard&Mouse"",
""action"": ""Interaction"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""df7a5259-c313-4b14-9cca-9e1acfc0a31a"",

11
BlueWater/Assets/02.Scripts/BlueWater.inputactions
View File

@ -210,6 +210,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "857036ad-83d5-4d39-a34d-eb3f7d804912",
"path": "<Mouse>/leftButton",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
"action": "Interaction",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "df7a5259-c313-4b14-9cca-9e1acfc0a31a",

2
BlueWater/Assets/02.Scripts/Npc/OrderToJailState.cs
View File

@ -45,6 +45,7 @@ namespace BlueWaterProject
agent.SetDestination(availableJail.transform.position + new Vector3(0,0,1));
agent.stoppingDistance = 0;
agent.speed = 10f;
targetJail.UseJail();
agent.isStopped = false;
}
else
@ -62,7 +63,6 @@ namespace BlueWaterProject
if (agent.remainingDistance <= agent.stoppingDistance)
{
isMovingToJail = false;
targetJail.UseJail();
}
}
}