Skip to content

Commit

Permalink
feat(UI): Add scroll text action for dialogue system
Browse files Browse the repository at this point in the history
  • Loading branch information
@jcs090218
jcs090218 committed Aug 6, 2024
1 parent f1cff65 commit 73b8f35
Show file tree
Hide file tree
Showing 7 changed files with 142 additions and 52 deletions.
26 changes: 14 additions & 12 deletions Assets/JCSUnity/Resources/UI/JCS_DialogueSystem (Game Pad).prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -431.99524, y: -240}
m_AnchoredPosition: {x: -724.28314, y: 51.999977}
m_SizeDelta: {x: 200, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7595997605237596528
Expand Down Expand Up @@ -516,7 +516,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 250, y: -273.99997}
m_AnchoredPosition: {x: 258, y: -147}
m_SizeDelta: {x: 200, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4306456933227647885
Expand Down Expand Up @@ -1191,7 +1191,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -424.71207, y: -30}
m_AnchoredPosition: {x: -717, y: 262}
m_SizeDelta: {x: 200, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6867049224040509318
Expand Down Expand Up @@ -1598,7 +1598,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -433.86804, y: -310}
m_AnchoredPosition: {x: -726.15594, y: -18.000023}
m_SizeDelta: {x: 200, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8590432148941433126
Expand Down Expand Up @@ -1766,7 +1766,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 468.49457, y: -206}
m_AnchoredPosition: {x: 476.49457, y: -79.00003}
m_SizeDelta: {x: 200, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8131189469726970
Expand Down Expand Up @@ -2082,7 +2082,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -433.86804, y: -380}
m_AnchoredPosition: {x: -726.15594, y: -88.00002}
m_SizeDelta: {x: 200, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4645801679421002527
Expand Down Expand Up @@ -2418,7 +2418,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 249.99985, y: -206}
m_AnchoredPosition: {x: 257.99985, y: -79.00003}
m_SizeDelta: {x: 200, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &926264110877173220
Expand Down Expand Up @@ -2734,7 +2734,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 474.73724, y: -140.3885}
m_AnchoredPosition: {x: 476.4946, y: -13.388535}
m_SizeDelta: {x: 200, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6686953103201198772
Expand Down Expand Up @@ -3022,7 +3022,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -431.99524, y: -170}
m_AnchoredPosition: {x: -724.28314, y: 121.99998}
m_SizeDelta: {x: 200, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3390935083912683696
Expand Down Expand Up @@ -3993,7 +3993,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 468.0783, y: -274}
m_AnchoredPosition: {x: 476.4946, y: -147.00003}
m_SizeDelta: {x: 200, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5988117786457404174
Expand Down Expand Up @@ -4237,6 +4237,8 @@ MonoBehaviour:
mRightImage: {fileID: 6393945804426866846}
mNameTag: {fileID: 7830457409021631893}
mTextBox: {fileID: 4721417465960552238}
mCompleteTextBeforeAction: 0
mCompleteTextBeforeActionOnButton: 0
mScrollTime: 0.01
mDeltaTimeType: 0
mPanelTrans: {fileID: 0}
Expand Down Expand Up @@ -4295,7 +4297,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 249.99985, y: -140.3885}
m_AnchoredPosition: {x: 257.99985, y: -13.388535}
m_SizeDelta: {x: 200, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6488287147619372343
Expand Down Expand Up @@ -4773,7 +4775,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -428.24957, y: -100}
m_AnchoredPosition: {x: -720.5375, y: 191.99997}
m_SizeDelta: {x: 200, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &185646136241645493
Expand Down
26 changes: 14 additions & 12 deletions Assets/JCSUnity/Resources/UI/JCS_DialogueSystem.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -433.86804, y: -380}
m_AnchoredPosition: {x: -726.15594, y: -148.00003}
m_SizeDelta: {x: 200, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6262121236916706463
Expand Down Expand Up @@ -442,7 +442,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 456.09583, y: -283.99963}
m_AnchoredPosition: {x: 476.4946, y: -143.41821}
m_SizeDelta: {x: 200, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4052809335046560486
Expand Down Expand Up @@ -742,7 +742,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 237.96904, y: -150.9696}
m_AnchoredPosition: {x: 266, y: -10.388184}
m_SizeDelta: {x: 200, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6444299289748461707
Expand Down Expand Up @@ -1272,7 +1272,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 237.96904, y: -216.58139}
m_AnchoredPosition: {x: 266, y: -76}
m_SizeDelta: {x: 200, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6288883892772705336
Expand Down Expand Up @@ -1491,7 +1491,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -431.99524, y: -170}
m_AnchoredPosition: {x: -724.28314, y: 61.99997}
m_SizeDelta: {x: 200, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3125394772613318333
Expand Down Expand Up @@ -1750,7 +1750,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -428.24957, y: -100}
m_AnchoredPosition: {x: -720.5375, y: 131.99997}
m_SizeDelta: {x: 200, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1379027922874875142
Expand Down Expand Up @@ -2110,7 +2110,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -433.86804, y: -310}
m_AnchoredPosition: {x: -726.15594, y: -78.00003}
m_SizeDelta: {x: 200, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1515616796509758646
Expand Down Expand Up @@ -2451,6 +2451,8 @@ MonoBehaviour:
mRightImage: {fileID: 6546777816282174048}
mNameTag: {fileID: 827766543013699587}
mTextBox: {fileID: 6267707290331941680}
mCompleteTextBeforeAction: 0
mCompleteTextBeforeActionOnButton: 0
mScrollTime: 0.01
mDeltaTimeType: 0
mPanelTrans: {fileID: 0}
Expand Down Expand Up @@ -2747,7 +2749,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 462.70642, y: -150.9696}
m_AnchoredPosition: {x: 476.4946, y: -10.388184}
m_SizeDelta: {x: 200, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1008796994622542895
Expand Down Expand Up @@ -3058,7 +3060,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -424.71207, y: -30}
m_AnchoredPosition: {x: -717, y: 202}
m_SizeDelta: {x: 200, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8092643767424977425
Expand Down Expand Up @@ -3664,7 +3666,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 456.46375, y: -216.58139}
m_AnchoredPosition: {x: 476.4946, y: -75.99997}
m_SizeDelta: {x: 200, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8774829633526371978
Expand Down Expand Up @@ -4446,7 +4448,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 238, y: -284}
m_AnchoredPosition: {x: 266.03094, y: -143.41858}
m_SizeDelta: {x: 200, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1752719894327755760
Expand Down Expand Up @@ -4768,7 +4770,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -431.99524, y: -240}
m_AnchoredPosition: {x: -724.28314, y: -8.0000305}
m_SizeDelta: {x: 200, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5754082612063144368
Expand Down
6 changes: 6 additions & 0 deletions Assets/JCSUnity/Scenes/Utilities/JCS_ScriptTester.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -894,6 +894,7 @@ MonoBehaviour:
mTestDialogueScript: {fileID: 1098634727}
DisposeKey: 113
RunScriptKey: 119
NextOrDispose: 110
SkipKey: 101
--- !u!4 &1098634726
Transform:
Expand Down Expand Up @@ -1289,6 +1290,11 @@ PrefabInstance:
propertyPath: m_Name
value: JCS_DialogueSystem (Game Pad)
objectReference: {fileID: 0}
- target: {fileID: 7657870147620464614, guid: c7ea891da8aadd741a2b75f708a50d65,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
Expand Down
8 changes: 8 additions & 0 deletions Assets/JCSUnity/Scripts/Interfaces/JCS_DialogueScript.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,14 @@ protected virtual void Start()
mDialogueSystem = JCS_UtilManager.instance.GetDialogueSystem();
}

/// <summary>
/// Manually set the dialogue system.
/// </summary>
public void SetDialogueSystem(JCS_DialogueSystem ds)
{
this.mDialogueSystem = ds;
}

/// <summary>
/// Starting point of the dialogue.
/// </summary>
Expand Down
Loading

0 comments on commit 73b8f35

Please sign in to comment.