Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed Captioning system for SFX #498

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Closed Captioning system for SFX #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a157675
Some unity auto generated files. Ignore them when merging back to the…
codeedward Aug 22, 2021
ffae044
Prototype for captioning - 1st part (without off-screen indication). …
codeedward Sep 1, 2021
006a12f
Rename Onomatopoeia to Caption.
codeedward Sep 1, 2021
d4509ca
Move captioning into the separate manager class with registration on …
codeedward Sep 1, 2021
0ffcdb3
Add captioning to the Language menu in settings.
codeedward Sep 4, 2021
dd4edfe
Use captioning from settings in the game.
codeedward Sep 4, 2021
c671fd6
Display many AudioClips for same AudioCueSO.
codeedward Sep 4, 2021
e633969
Add off-screen indicator functionality.
codeedward Sep 5, 2021
e6572a5
Fix for the language settings. Apply changes to the prefab.
codeedward Sep 5, 2021
e3a48b5
Move captioning manager from persistent managers to the gameplay sce…
codeedward Sep 6, 2021
dc427e4
Merge from 'main' branch.
codeedward Sep 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@ MonoBehaviour:
m_Address: Assets/UI/UI Misc Shared Data.asset
m_ReadOnly: 1
m_SerializedLabels: []
- m_GUID: d299736136010ec4f926836ea5b14a66
m_Address: Assets/LocalizationFiles/AssetTables/Onomatopoeia/Onomatopoeia Shared
Data.asset
m_ReadOnly: 1
m_SerializedLabels: []
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: bffab80dc16c4464b92b2e97b6a1964c, type: 2}
m_SchemaSet:
Expand Down
5 changes: 5 additions & 0 deletions ...ct/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ MonoBehaviour:
m_SerializedLabels:
- Locale-en
- Preload
- m_GUID: c09a5a81dffeac540a7dced4c3bbef3d
m_Address: Caption_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: bffab80dc16c4464b92b2e97b6a1964c, type: 2}
m_SchemaSet:
Expand Down
5 changes: 5 additions & 0 deletions ...ect/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-French (fr).asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ MonoBehaviour:
m_SerializedLabels:
- Locale-fr
- Preload
- m_GUID: 637939d10d6fe314d8ffe3d0a63c7dd5
m_Address: Caption_fr
m_ReadOnly: 1
m_SerializedLabels:
- Locale-fr
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: bffab80dc16c4464b92b2e97b6a1964c, type: 2}
m_SchemaSet:
Expand Down
5 changes: 5 additions & 0 deletions ...ct/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Italian (it).asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ MonoBehaviour:
m_ReadOnly: 1
m_SerializedLabels:
- Locale-it
- m_GUID: 3ef13080fdb719940a37520e887c63e4
m_Address: Caption_it
m_ReadOnly: 1
m_SerializedLabels:
- Locale-it
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: bffab80dc16c4464b92b2e97b6a1964c, type: 2}
m_SchemaSet:
Expand Down
8 changes: 8 additions & 0 deletions UOP1_Project/Assets/LocalizationFiles/AssetTables/Onomatopoeia.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 48 additions & 0 deletions ..._Project/Assets/LocalizationFiles/AssetTables/Onomatopoeia/Onomatopoeia Shared Data.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5b11a58205ec3474ca216360e9fa74a8, type: 3}
m_Name: Onomatopoeia Shared Data
m_EditorClassIdentifier:
m_TableCollectionName: Caption
m_TableCollectionNameGuidString: d299736136010ec4f926836ea5b14a66
m_Entries:
- m_Id: 105602867200
m_Key: Footstep
m_Metadata:
m_Items: []
- m_Id: 184631943168
m_Key: Land
m_Metadata:
m_Items: []
- m_Id: 597615697920
m_Key: Attack
m_Metadata:
m_Items: []
- m_Id: 30931925327872
m_Key: BardHareSingLong
m_Metadata:
m_Items: []
- m_Id: 31158178668544
m_Key: BardHareSingShort
m_Metadata:
m_Items: []
m_Metadata:
m_Items: []
m_KeyGenerator:
id: 0
references:
version: 1
00000000:
type: {class: DistributedUIDGenerator, ns: UnityEngine.Localization.Tables,
asm: Unity.Localization}
data:
m_CustomEpoch: 1630233026596
8 changes: 8 additions & 0 deletions ...ect/Assets/LocalizationFiles/AssetTables/Onomatopoeia/Onomatopoeia Shared Data.asset.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 23 additions & 0 deletions UOP1_Project/Assets/LocalizationFiles/AssetTables/Onomatopoeia/Onomatopoeia.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5be51871efa6c3e4eae1703925c8f5ac, type: 3}
m_Name: Onomatopoeia
m_EditorClassIdentifier:
m_SharedTableData: {fileID: 11400000, guid: d299736136010ec4f926836ea5b14a66, type: 2}
m_Tables:
- {fileID: 11400000, guid: c09a5a81dffeac540a7dced4c3bbef3d, type: 2}
- {fileID: 11400000, guid: 637939d10d6fe314d8ffe3d0a63c7dd5, type: 2}
- {fileID: 11400000, guid: 3ef13080fdb719940a37520e887c63e4, type: 2}
m_Extensions: []
m_Group: String Table
references:
version: 1
8 changes: 8 additions & 0 deletions UOP1_Project/Assets/LocalizationFiles/AssetTables/Onomatopoeia/Onomatopoeia.asset.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 42 additions & 0 deletions UOP1_Project/Assets/LocalizationFiles/AssetTables/Onomatopoeia/Onomatopoeia_en.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e9620f8c34305754d8cc9a7e49e852d9, type: 3}
m_Name: Onomatopoeia_en
m_EditorClassIdentifier:
m_LocaleId:
m_Code: en
m_SharedData: {fileID: 11400000, guid: d299736136010ec4f926836ea5b14a66, type: 2}
m_Metadata:
m_Items: []
m_TableData:
- m_Id: 105602867200
m_Localized: clack en
m_Metadata:
m_Items: []
- m_Id: 184631943168
m_Localized: bong en
m_Metadata:
m_Items: []
- m_Id: 597615697920
m_Localized: whisk en
m_Metadata:
m_Items: []
- m_Id: 30931925327872
m_Localized: Lalala en
m_Metadata:
m_Items: []
- m_Id: 31158178668544
m_Localized: La en
m_Metadata:
m_Items: []
references:
version: 1
8 changes: 8 additions & 0 deletions UOP1_Project/Assets/LocalizationFiles/AssetTables/Onomatopoeia/Onomatopoeia_en.asset.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 42 additions & 0 deletions UOP1_Project/Assets/LocalizationFiles/AssetTables/Onomatopoeia/Onomatopoeia_fr.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e9620f8c34305754d8cc9a7e49e852d9, type: 3}
m_Name: Onomatopoeia_fr
m_EditorClassIdentifier:
m_LocaleId:
m_Code: fr
m_SharedData: {fileID: 11400000, guid: d299736136010ec4f926836ea5b14a66, type: 2}
m_Metadata:
m_Items: []
m_TableData:
- m_Id: 184631943168
m_Localized: bong fr
m_Metadata:
m_Items: []
- m_Id: 105602867200
m_Localized: clack fr
m_Metadata:
m_Items: []
- m_Id: 597615697920
m_Localized: whisk fr
m_Metadata:
m_Items: []
- m_Id: 30931925327872
m_Localized: Lalala fr
m_Metadata:
m_Items: []
- m_Id: 31158178668544
m_Localized: La fr
m_Metadata:
m_Items: []
references:
version: 1
8 changes: 8 additions & 0 deletions UOP1_Project/Assets/LocalizationFiles/AssetTables/Onomatopoeia/Onomatopoeia_fr.asset.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 42 additions & 0 deletions UOP1_Project/Assets/LocalizationFiles/AssetTables/Onomatopoeia/Onomatopoeia_it.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e9620f8c34305754d8cc9a7e49e852d9, type: 3}
m_Name: Onomatopoeia_it
m_EditorClassIdentifier:
m_LocaleId:
m_Code: it
m_SharedData: {fileID: 11400000, guid: d299736136010ec4f926836ea5b14a66, type: 2}
m_Metadata:
m_Items: []
m_TableData:
- m_Id: 184631943168
m_Localized: bong it
m_Metadata:
m_Items: []
- m_Id: 105602867200
m_Localized: clack it
m_Metadata:
m_Items: []
- m_Id: 597615697920
m_Localized: whisk it
m_Metadata:
m_Items: []
- m_Id: 30931925327872
m_Localized: Lalala it
m_Metadata:
m_Items: []
- m_Id: 31158178668544
m_Localized: La it
m_Metadata:
m_Items: []
references:
version: 1
8 changes: 8 additions & 0 deletions UOP1_Project/Assets/LocalizationFiles/AssetTables/Onomatopoeia/Onomatopoeia_it.asset.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions UOP1_Project/Assets/LocalizationFiles/AssetTables/UI/UI Misc Shared Data.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,18 @@ MonoBehaviour:
m_Key: Language
m_Metadata:
m_Items: []
- m_Id: 39863313582776320
m_Key: Captioning
m_Metadata:
m_Items: []
- m_Id: 39863497532366848
m_Key: Captioning_On
m_Metadata:
m_Items: []
- m_Id: 39863525374156800
m_Key: Captioning_Off
m_Metadata:
m_Items: []
- m_Id: 35779435768438784
m_Key: Error_Pot
m_Metadata:
Expand Down
12 changes: 12 additions & 0 deletions UOP1_Project/Assets/LocalizationFiles/AssetTables/UI/UI Misc_en.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,18 @@ MonoBehaviour:
m_Localized: Music Volume
m_Metadata:
m_Items: []
- m_Id: 39863313582776320
m_Localized: Captioning
m_Metadata:
m_Items: []
- m_Id: 39863497532366848
m_Localized: On
m_Metadata:
m_Items: []
- m_Id: 39863525374156800
m_Localized: Off
m_Metadata:
m_Items: []
- m_Id: 35779435768438784
m_Localized: '*You need to be near a pot to cook'
m_Metadata:
Expand Down
8 changes: 8 additions & 0 deletions UOP1_Project/Assets/LocalizationFiles/AssetTables/UI/UI Misc_fr.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,5 +239,13 @@ MonoBehaviour:
m_Localized: Volume de la musique
m_Metadata:
m_Items: []
- m_Id: 39863497532366848
m_Localized: "Activ\xE9"
m_Metadata:
m_Items: []
- m_Id: 39863525374156800
m_Localized: "Desactiv\xE9"
m_Metadata:
m_Items: []
references:
version: 1
Loading