mindfulminun/FebGameJam
1
0
Fork 0
mirror of https://github.com/frizbee19/FebGameJam.git synced 2026-09-11 08:17:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Textboxes now instantiate on triggers, ish

Browse Source
This commit is contained in:
Rizvee
2022-02-23 17:40:38 -06:00
parent 71ea85379f
commit 3a81f1a122
6 changed files with 310 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scene 1 Assets/Dialogue.cs
+4
View File
@@ -16,6 +16,7 @@ public class Dialogue : MonoBehaviour
//used to activate/deactivate test object
//activate through outside means probably
public GameObject textTest;
public GameObject headText;
//used to print the first x letters of the text
int cCount = 0;
//changes the pace at which chars appear
@@ -73,6 +74,9 @@ public class Dialogue : MonoBehaviour
isOpen = false;
Movement.pause = false;
textTest.SetActive(false);
headText.SetActive(false);
cCount = 0;
curPage = 0;
}
else
{
Assets/Scene 1 Assets/Interaction.cs
+19 -1
View File
@@ -4,16 +4,34 @@ using UnityEngine;
public class Interaction : MonoBehaviour
{
public Transform detectionPoint;
public float radius = 3f;
public LayerMask detectLayer;
// Start is called before the first frame update
void Start()
{
}
bool InteractInput() {
if(Input.GetKeyDown(KeyCode.E))
Debug.Log("input");
return true;
}
// Update is called once per frame
void Update()
{
if(DetectObject()) {
if(InteractInput()) {
Debug.Log("interacted");
}
}
}
bool DetectObject() {
if(Physics2D.OverlapCircle(detectionPoint.position, radius, detectLayer))
Debug.Log("detected");
return false;
}
}
Assets/Scene 1 Assets/TextTrigger.cs
+28 -3
View File
@@ -4,10 +4,35 @@ using UnityEngine;
public class TextTrigger : Trigger
{
public Dialogue TextBox;
public GameObject TextBox;
public GameObject HeadBox;
public List<string> pages;
public List<int> emotes;
public Animator animator;
public RuntimeAnimatorController controller;
public Sprite startSprite;
public AudioManager audioManager;
public bool isTalking;
GameObject instance;
GameObject headInstance;
void Instant() {
instance = Instantiate(TextBox, TextBox.transform.position, Quaternion.identity);
headInstance = Instantiate(HeadBox, HeadBox.transform.position, Quaternion.identity);
instance.GetComponent<Dialogue>().pages = pages;
instance.GetComponent<Dialogue>().emotes = emotes;
headInstance.GetComponent<Animator>().runtimeAnimatorController = controller;
instance.GetComponent<Dialogue>().animator = animator;
instance.GetComponent<Dialogue>().animator.gameObject.SetActive(true);
instance.GetComponent<Dialogue>().audioManager = audioManager;
headInstance.GetComponent<SpriteRenderer>().sprite = startSprite;
instance.SetActive(true);
headInstance.SetActive(false);
instance.GetComponent<Dialogue>().isOpen = true;
instance.GetComponent<Dialogue>().isTalking = isTalking;
}
public override void Action()
{
TextBox.gameObject.SetActive(true);
TextBox.GetComponent<Dialogue>().isOpen = true;
Instant();
}
}
Assets/Scene 1 Assets/Textbox.prefab
+3 -69
View File
@@ -35,7 +35,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 246, y: -178}
m_AnchoredPosition: {x: 195, y: -178}
m_SizeDelta: {x: 400, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7318253488188377866
@@ -452,7 +452,7 @@ RectTransform:
m_Children:
- {fileID: 8637085924552831791}
m_Father: {fileID: 7059772333487008124}
m_RootOrder: 2
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -520,72 +520,6 @@ MonoBehaviour:
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!1 &7059772332122756754
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7059772332122756757}
- component: {fileID: 7059772332122756756}
- component: {fileID: 7059772332122756755}
m_Layer: 0
m_Name: EventSystem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7059772332122756757
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7059772332122756754}
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_Children: []
m_Father: {fileID: 7059772333487008124}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &7059772332122756756
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7059772332122756754}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_FirstSelected: {fileID: 0}
m_sendNavigationEvents: 1
m_DragThreshold: 10
--- !u!114 &7059772332122756755
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7059772332122756754}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalAxis: Horizontal
m_VerticalAxis: Vertical
m_SubmitButton: Submit
m_CancelButton: Cancel
m_InputActionsPerSecond: 10
m_RepeatDelay: 0.5
m_ForceModuleActive: 0
--- !u!1 &7059772332581294260
GameObject:
m_ObjectHideFlags: 0
@@ -709,6 +643,7 @@ MonoBehaviour:
emotes:
isOpen: 0
textTest: {fileID: 7059772332581294260}
headText: {fileID: 6300146333193859577}
isTalking: 0
--- !u!1 &7059772333148747624
GameObject:
@@ -924,7 +859,6 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7059772332581294261}
- {fileID: 7059772332122756757}
- {fileID: 6897333980894040127}
m_Father: {fileID: 0}
m_RootOrder: 0
Assets/Scene 1 Assets/Trigger.cs
+4
View File
@@ -22,6 +22,7 @@ public abstract class Trigger : MonoBehaviour
//checks if player is in range of the trigger
private void OnTriggerEnter2D(Collider2D other) {
if(other.CompareTag("Player")) {
Debug.Log("entered");
isActive = true;
}
}
@@ -29,6 +30,7 @@ public abstract class Trigger : MonoBehaviour
private void OnTriggerExit2D(Collider2D other) {
if(other.CompareTag("Player")) {
isActive = false;
Debug.Log("exit");
}
if(forceInteract && repeatable) {
hasOccurred = false;
@@ -37,6 +39,7 @@ public abstract class Trigger : MonoBehaviour
// Update is called once per frame
void Update()
{
// Debug.Log("testr");
//checks if conditions are right
if(isActive && !hasOccurred)
{
@@ -51,6 +54,7 @@ public abstract class Trigger : MonoBehaviour
else
{
if(Input.GetKeyDown(KeyCode.E)) {
Debug.Log("action");
Action();
if(!repeatable)
{
Assets/Scenes/Rizvee's Scene.unity
+252 -7
View File
@@ -1048,9 +1048,10 @@ GameObject:
- component: {fileID: 1044829894}
- component: {fileID: 1044829893}
- component: {fileID: 1044829892}
- component: {fileID: 1044829898}
m_Layer: 2
m_Name: Char Movement
m_TagString: Untagged
m_TagString: Player
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -1178,6 +1179,23 @@ Transform:
m_Father: {fileID: 1581338275}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1044829898
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1044829891}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 63ebc7b06abc3e848a932ff1f7c7e3b2, type: 3}
m_Name:
m_EditorClassIdentifier:
detectionPoint: {fileID: 1581338275}
radius: 2.79
detectLayer:
serializedVersion: 2
m_Bits: 2048
--- !u!1 &1205034095
GameObject:
m_ObjectHideFlags: 0
@@ -1359,6 +1377,82 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 1, y: 1}
m_EdgeRadius: 0
--- !u!1001 &1330887279
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 7059772333487008123, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: m_Name
value: testbox
objectReference: {fileID: 0}
- target: {fileID: 7059772333487008123, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7059772333487008124, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
- target: {fileID: 7059772333487008124, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7059772333487008124, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7059772333487008124, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7059772333487008124, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7059772333487008124, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7059772333487008124, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7059772333487008124, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7059772333487008124, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7059772333487008124, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7059772333487008124, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
--- !u!95 &1330887280 stripped
Animator:
m_CorrespondingSourceObject: {fileID: 9032403516113401987, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
m_PrefabInstance: {fileID: 1330887279}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1330887281 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6300146333193859577, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
m_PrefabInstance: {fileID: 1330887279}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1330887282 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7059772332581294260, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
m_PrefabInstance: {fileID: 1330887279}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1477138877
GameObject:
m_ObjectHideFlags: 0
@@ -1613,8 +1707,10 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1977072049}
- component: {fileID: 1977072050}
- component: {fileID: 1977072048}
m_Layer: 0
- component: {fileID: 1977072051}
m_Layer: 11
m_Name: NPC
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -1630,10 +1726,22 @@ MonoBehaviour:
m_GameObject: {fileID: 1977072047}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 63ebc7b06abc3e848a932ff1f7c7e3b2, type: 3}
m_Script: {fileID: 11500000, guid: 58ad46602c4301d47a7b6f71726a1cd9, type: 3}
m_Name:
m_EditorClassIdentifier:
radius: 3
forceInteract: 0
repeatable: 1
value: 0
TextBox: {fileID: 1330887282}
HeadBox: {fileID: 1330887281}
pages:
- asdfsadfasfdsadfasdfsdfasdfasdf
- ahhhhhhhhhhhhhhh
emotes: 0100000003000000
controller: {fileID: 1330887280}
startSprite: {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
audioManager: {fileID: 1586724389}
isTalking: 1
--- !u!4 &1977072049
Transform:
m_ObjectHideFlags: 0
@@ -1642,12 +1750,89 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1977072047}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 4.0371094, y: -3.2215872, z: 81.85253}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalPosition: {x: 6.42, y: -2.53, z: 0}
m_LocalScale: {x: 3, y: 3, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &1977072050
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1977072047}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
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: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 1196539433
m_SortingLayer: 2
m_SortingOrder: 0
m_Sprite: {fileID: 4887068915747301843, guid: 73ae3db8a07b2424caf7884baa7964f8, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1.5625, y: 1.625}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!61 &1977072051
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1977072047}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 1.5625, y: 1.625}
newSize: {x: 1.5625, y: 1.625}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1.5625, y: 1.625}
m_EdgeRadius: 0
--- !u!1001 &1979366127
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1673,7 +1858,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3758862681294202868, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: isOpen
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3758862681294202868, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: isTalking
@@ -1723,6 +1908,62 @@ PrefabInstance:
propertyPath: m_WasSpriteAssigned
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6300146333193859577, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6897333980894040127, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: m_Pivot.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6897333980894040127, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6897333980894040127, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6897333980894040127, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6897333980894040127, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: m_LocalScale.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6897333980894040127, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: m_LocalScale.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6897333980894040127, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: m_LocalScale.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6897333980894040127, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6897333980894040127, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6897333980894040127, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6897333980894040127, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6897333980894040127, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6897333980894040127, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7059772332122756754, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: m_Layer
value: 11
@@ -1731,6 +1972,10 @@ PrefabInstance:
propertyPath: m_Layer
value: 11
objectReference: {fileID: 0}
- target: {fileID: 7059772332581294260, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7059772332581294261, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
propertyPath: m_Pivot.x
value: 0