game: giving npc documents
This commit is contained in:
parent
7c5c07ae35
commit
b1cd840297
2 changed files with 37 additions and 171 deletions
|
@ -4057,7 +4057,6 @@ Transform:
|
||||||
m_LocalScale: {x: 2.6065, y: 0.87638336, z: 0.59199}
|
m_LocalScale: {x: 2.6065, y: 0.87638336, z: 0.59199}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 1938714097}
|
|
||||||
- {fileID: 1068269875}
|
- {fileID: 1068269875}
|
||||||
m_Father: {fileID: 1432899214}
|
m_Father: {fileID: 1432899214}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
@ -6546,6 +6545,11 @@ Transform:
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!4 &772985123 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 8980189677058893101, guid: 0197fe44356b38740b9747f44a27fa94, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 1705170805}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!1001 &775517552
|
--- !u!1001 &775517552
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -13526,6 +13530,7 @@ Transform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children:
|
||||||
|
- {fileID: 772985123}
|
||||||
- {fileID: 418120326}
|
- {fileID: 418120326}
|
||||||
- {fileID: 270371481}
|
- {fileID: 270371481}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
|
@ -15958,7 +15963,7 @@ PrefabInstance:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Modification:
|
m_Modification:
|
||||||
serializedVersion: 3
|
serializedVersion: 3
|
||||||
m_TransformParent: {fileID: 0}
|
m_TransformParent: {fileID: 1432899214}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
- target: {fileID: 8641240288083967895, guid: 0197fe44356b38740b9747f44a27fa94, type: 3}
|
- target: {fileID: 8641240288083967895, guid: 0197fe44356b38740b9747f44a27fa94, type: 3}
|
||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
|
@ -15968,17 +15973,29 @@ PrefabInstance:
|
||||||
propertyPath: stampDoc
|
propertyPath: stampDoc
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8980189677058893101, guid: 0197fe44356b38740b9747f44a27fa94, type: 3}
|
||||||
|
propertyPath: m_LocalScale.x
|
||||||
|
value: 1.7209033
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8980189677058893101, guid: 0197fe44356b38740b9747f44a27fa94, type: 3}
|
||||||
|
propertyPath: m_LocalScale.y
|
||||||
|
value: 1.7209028
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8980189677058893101, guid: 0197fe44356b38740b9747f44a27fa94, type: 3}
|
||||||
|
propertyPath: m_LocalScale.z
|
||||||
|
value: 1.7209033
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 8980189677058893101, guid: 0197fe44356b38740b9747f44a27fa94, type: 3}
|
- target: {fileID: 8980189677058893101, guid: 0197fe44356b38740b9747f44a27fa94, type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
value: 0.3078552
|
value: 0.31885523
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 8980189677058893101, guid: 0197fe44356b38740b9747f44a27fa94, type: 3}
|
- target: {fileID: 8980189677058893101, guid: 0197fe44356b38740b9747f44a27fa94, type: 3}
|
||||||
propertyPath: m_LocalPosition.y
|
propertyPath: m_LocalPosition.y
|
||||||
value: 0.8763828
|
value: 0.4381916
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 8980189677058893101, guid: 0197fe44356b38740b9747f44a27fa94, type: 3}
|
- target: {fileID: 8980189677058893101, guid: 0197fe44356b38740b9747f44a27fa94, type: 3}
|
||||||
propertyPath: m_LocalPosition.z
|
propertyPath: m_LocalPosition.z
|
||||||
value: 1.5123687
|
value: 0.13236868
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 8980189677058893101, guid: 0197fe44356b38740b9747f44a27fa94, type: 3}
|
- target: {fileID: 8980189677058893101, guid: 0197fe44356b38740b9747f44a27fa94, type: 3}
|
||||||
propertyPath: m_LocalRotation.w
|
propertyPath: m_LocalRotation.w
|
||||||
|
@ -17922,148 +17939,6 @@ GameObject:
|
||||||
m_CorrespondingSourceObject: {fileID: 2125865357384512086, guid: 7795d1095e0684f468f5b8231bb7705f, type: 3}
|
m_CorrespondingSourceObject: {fileID: 2125865357384512086, guid: 7795d1095e0684f468f5b8231bb7705f, type: 3}
|
||||||
m_PrefabInstance: {fileID: 101598008}
|
m_PrefabInstance: {fileID: 101598008}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!1 &1938714094
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 1938714097}
|
|
||||||
- component: {fileID: 1938714096}
|
|
||||||
- component: {fileID: 1938714095}
|
|
||||||
- component: {fileID: 1938714098}
|
|
||||||
- component: {fileID: 1938714099}
|
|
||||||
m_Layer: 0
|
|
||||||
m_Name: Paper Socket
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!54 &1938714095
|
|
||||||
Rigidbody:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1938714094}
|
|
||||||
serializedVersion: 4
|
|
||||||
m_Mass: 1
|
|
||||||
m_Drag: 0
|
|
||||||
m_AngularDrag: 0.05
|
|
||||||
m_CenterOfMass: {x: 0, y: 0, z: 0}
|
|
||||||
m_InertiaTensor: {x: 1, y: 1, z: 1}
|
|
||||||
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
|
|
||||||
m_IncludeLayers:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Bits: 0
|
|
||||||
m_ExcludeLayers:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Bits: 0
|
|
||||||
m_ImplicitCom: 1
|
|
||||||
m_ImplicitTensor: 1
|
|
||||||
m_UseGravity: 0
|
|
||||||
m_IsKinematic: 1
|
|
||||||
m_Interpolate: 0
|
|
||||||
m_Constraints: 0
|
|
||||||
m_CollisionDetection: 0
|
|
||||||
--- !u!65 &1938714096
|
|
||||||
BoxCollider:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1938714094}
|
|
||||||
m_Material: {fileID: 0}
|
|
||||||
m_IncludeLayers:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Bits: 0
|
|
||||||
m_ExcludeLayers:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Bits: 0
|
|
||||||
m_LayerOverridePriority: 0
|
|
||||||
m_IsTrigger: 1
|
|
||||||
m_ProvidesContacts: 0
|
|
||||||
m_Enabled: 1
|
|
||||||
serializedVersion: 3
|
|
||||||
m_Size: {x: 1.0840343, y: 2.0097747, z: 1.0771472}
|
|
||||||
m_Center: {x: -0.000000065650326, y: 0.072126575, z: 0.0055105905}
|
|
||||||
--- !u!4 &1938714097
|
|
||||||
Transform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1938714094}
|
|
||||||
serializedVersion: 2
|
|
||||||
m_LocalRotation: {x: -0, y: 0.9904229, z: -0, w: 0.13806683}
|
|
||||||
m_LocalPosition: {x: -0.24323805, y: 0.51896095, z: 0.015203065}
|
|
||||||
m_LocalScale: {x: 0.18484867, y: 0.016763842, z: 0.77678293}
|
|
||||||
m_ConstrainProportionsScale: 0
|
|
||||||
m_Children: []
|
|
||||||
m_Father: {fileID: 418120326}
|
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 164.128, z: 0}
|
|
||||||
--- !u!114 &1938714098
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1938714094}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 60523e0647cc6ab43acc73cb266a32a7, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_InteractionManager: {fileID: 0}
|
|
||||||
m_InteractionLayers:
|
|
||||||
m_Bits: 2
|
|
||||||
m_Handedness: 0
|
|
||||||
m_AttachTransform: {fileID: 0}
|
|
||||||
m_KeepSelectedTargetValid: 1
|
|
||||||
m_DisableVisualsWhenBlockedInGroup: 1
|
|
||||||
m_StartingSelectedInteractable: {fileID: 0}
|
|
||||||
m_StartingTargetFilter: {fileID: 0}
|
|
||||||
m_HoverEntered:
|
|
||||||
m_PersistentCalls:
|
|
||||||
m_Calls: []
|
|
||||||
m_HoverExited:
|
|
||||||
m_PersistentCalls:
|
|
||||||
m_Calls: []
|
|
||||||
m_SelectEntered:
|
|
||||||
m_PersistentCalls:
|
|
||||||
m_Calls: []
|
|
||||||
m_SelectExited:
|
|
||||||
m_PersistentCalls:
|
|
||||||
m_Calls: []
|
|
||||||
m_StartingHoverFilters: []
|
|
||||||
m_StartingSelectFilters: []
|
|
||||||
m_ShowInteractableHoverMeshes: 1
|
|
||||||
m_InteractableHoverMeshMaterial: {fileID: 2100000, guid: 5838023c4bfa28943bd0abd3e3020361, type: 2}
|
|
||||||
m_InteractableCantHoverMeshMaterial: {fileID: 2100000, guid: 91da77b385f3c274da60c626a8acfa24, type: 2}
|
|
||||||
m_SocketActive: 1
|
|
||||||
m_InteractableHoverScale: 1
|
|
||||||
m_RecycleDelayTime: 1
|
|
||||||
m_HoverSocketSnapping: 0
|
|
||||||
m_SocketSnappingRadius: 0.1
|
|
||||||
m_SocketScaleMode: 0
|
|
||||||
m_FixedScale: {x: 1, y: 1, z: 1}
|
|
||||||
m_TargetBoundsSize: {x: 1, y: 1, z: 1}
|
|
||||||
--- !u!114 &1938714099
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1938714094}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 120dec3a4fef31d4c8b88a1e19de3d80, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
socketName: Paper Socket
|
|
||||||
--- !u!1 &1941602097
|
--- !u!1 &1941602097
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -19707,6 +19582,5 @@ SceneRoots:
|
||||||
- {fileID: 1871635931}
|
- {fileID: 1871635931}
|
||||||
- {fileID: 1718507924}
|
- {fileID: 1718507924}
|
||||||
- {fileID: 101598008}
|
- {fileID: 101598008}
|
||||||
- {fileID: 1705170805}
|
|
||||||
- {fileID: 386490940}
|
- {fileID: 386490940}
|
||||||
- {fileID: 536795482675034010}
|
- {fileID: 536795482675034010}
|
||||||
|
|
|
@ -41,27 +41,23 @@ public class PaperSocket : MonoBehaviour
|
||||||
if (socketName == "Paper Socket_NPC")
|
if (socketName == "Paper Socket_NPC")
|
||||||
{
|
{
|
||||||
if (paperName == "Spawnable_Doc")
|
if (paperName == "Spawnable_Doc")
|
||||||
|
{
|
||||||
|
StampDocument stampDoc = paperObject.GetComponent<StampDocument>();
|
||||||
|
|
||||||
|
if (stampDoc != null)
|
||||||
|
{
|
||||||
|
if (stampDoc.isStamped && stampDoc.isSigned)
|
||||||
{
|
{
|
||||||
Debug.Log("Document given");
|
Debug.Log("Document given");
|
||||||
|
PlayerDialogueInteraction.instance.takeDocumentsTick.SetActive(true);
|
||||||
|
PlayerDialogueInteraction.instance.giveDocumentsTick.SetActive(true);
|
||||||
Destroy(paperObject);
|
Destroy(paperObject);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
if (paperName == "NPC_Doc")
|
|
||||||
{
|
{
|
||||||
return;
|
Debug.Log("Either not stamped or not signed");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (socketName == "Paper Socket")
|
|
||||||
{
|
|
||||||
if (paperName == "Spawnable_Doc")
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (paperName == "NPC_Doc")
|
|
||||||
{
|
|
||||||
Debug.Log("Document submitted");
|
|
||||||
Destroy(paperObject);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -72,9 +68,5 @@ public class PaperSocket : MonoBehaviour
|
||||||
{
|
{
|
||||||
Debug.Log("Paper taken from NPC");
|
Debug.Log("Paper taken from NPC");
|
||||||
}
|
}
|
||||||
else if (socketName == "Paper Socket")
|
|
||||||
{
|
|
||||||
Debug.Log("Paper removed from table");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue