Skip to content

Commit 41f040b

Browse files
committed
Pull changes from @autios fork (send speech to AudioSource), Downgrade to 2018.3.x, Rename example scene
1 parent 797205c commit 41f040b

File tree

5 files changed

+251
-51
lines changed

5 files changed

+251
-51
lines changed

Assets/Scenes/espeak.unity renamed to Assets/Scenes/Speech-Example.unity

Lines changed: 244 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,14 @@ LightmapSettings:
5454
m_EnableBakedLightmaps: 0
5555
m_EnableRealtimeLightmaps: 0
5656
m_LightmapEditorSettings:
57-
serializedVersion: 12
57+
serializedVersion: 10
5858
m_Resolution: 2
5959
m_BakeResolution: 10
6060
m_AtlasSize: 512
6161
m_AO: 0
6262
m_AOMaxDistance: 1
6363
m_CompAOExponent: 1
6464
m_CompAOExponentDirect: 0
65-
m_ExtractAmbientOcclusion: 0
6665
m_Padding: 2
6766
m_LightmapParameters: {fileID: 0}
6867
m_LightmapsBakeMode: 1
@@ -77,16 +76,10 @@ LightmapSettings:
7776
m_PVRDirectSampleCount: 32
7877
m_PVRSampleCount: 256
7978
m_PVRBounces: 2
80-
m_PVREnvironmentSampleCount: 256
81-
m_PVREnvironmentReferencePointCount: 2048
82-
m_PVRFilteringMode: 2
83-
m_PVRDenoiserTypeDirect: 0
84-
m_PVRDenoiserTypeIndirect: 0
85-
m_PVRDenoiserTypeAO: 0
8679
m_PVRFilterTypeDirect: 0
8780
m_PVRFilterTypeIndirect: 0
8881
m_PVRFilterTypeAO: 0
89-
m_PVREnvironmentMIS: 0
82+
m_PVRFilteringMode: 2
9083
m_PVRCulling: 0
9184
m_PVRFilteringGaussRadiusDirect: 1
9285
m_PVRFilteringGaussRadiusIndirect: 5
@@ -95,7 +88,6 @@ LightmapSettings:
9588
m_PVRFilteringAtrousPositionSigmaIndirect: 2
9689
m_PVRFilteringAtrousPositionSigmaAO: 1
9790
m_ShowResolutionOverlay: 1
98-
m_ExportTrainingData: 0
9991
m_LightingDataAsset: {fileID: 0}
10092
m_UseShadowmask: 1
10193
--- !u!196 &4
@@ -120,6 +112,72 @@ NavMeshSettings:
120112
debug:
121113
m_Flags: 0
122114
m_NavMeshData: {fileID: 0}
115+
--- !u!1 &468129574
116+
GameObject:
117+
m_ObjectHideFlags: 0
118+
m_CorrespondingSourceObject: {fileID: 0}
119+
m_PrefabInstance: {fileID: 0}
120+
m_PrefabAsset: {fileID: 0}
121+
serializedVersion: 6
122+
m_Component:
123+
- component: {fileID: 468129577}
124+
- component: {fileID: 468129576}
125+
- component: {fileID: 468129575}
126+
m_Layer: 0
127+
m_Name: EventSystem
128+
m_TagString: Untagged
129+
m_Icon: {fileID: 0}
130+
m_NavMeshLayer: 0
131+
m_StaticEditorFlags: 0
132+
m_IsActive: 1
133+
--- !u!114 &468129575
134+
MonoBehaviour:
135+
m_ObjectHideFlags: 0
136+
m_CorrespondingSourceObject: {fileID: 0}
137+
m_PrefabInstance: {fileID: 0}
138+
m_PrefabAsset: {fileID: 0}
139+
m_GameObject: {fileID: 468129574}
140+
m_Enabled: 1
141+
m_EditorHideFlags: 0
142+
m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
143+
m_Name:
144+
m_EditorClassIdentifier:
145+
m_HorizontalAxis: Horizontal
146+
m_VerticalAxis: Vertical
147+
m_SubmitButton: Submit
148+
m_CancelButton: Cancel
149+
m_InputActionsPerSecond: 10
150+
m_RepeatDelay: 0.5
151+
m_ForceModuleActive: 0
152+
--- !u!114 &468129576
153+
MonoBehaviour:
154+
m_ObjectHideFlags: 0
155+
m_CorrespondingSourceObject: {fileID: 0}
156+
m_PrefabInstance: {fileID: 0}
157+
m_PrefabAsset: {fileID: 0}
158+
m_GameObject: {fileID: 468129574}
159+
m_Enabled: 1
160+
m_EditorHideFlags: 0
161+
m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
162+
m_Name:
163+
m_EditorClassIdentifier:
164+
m_FirstSelected: {fileID: 0}
165+
m_sendNavigationEvents: 1
166+
m_DragThreshold: 10
167+
--- !u!4 &468129577
168+
Transform:
169+
m_ObjectHideFlags: 0
170+
m_CorrespondingSourceObject: {fileID: 0}
171+
m_PrefabInstance: {fileID: 0}
172+
m_PrefabAsset: {fileID: 0}
173+
m_GameObject: {fileID: 468129574}
174+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
175+
m_LocalPosition: {x: 0, y: 0, z: 0}
176+
m_LocalScale: {x: 1, y: 1, z: 1}
177+
m_Children: []
178+
m_Father: {fileID: 0}
179+
m_RootOrder: 3
180+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
123181
--- !u!1 &534669902
124182
GameObject:
125183
m_ObjectHideFlags: 0
@@ -158,10 +216,9 @@ Camera:
158216
m_ClearFlags: 2
159217
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
160218
m_projectionMatrixMode: 1
161-
m_GateFitMode: 2
162-
m_FOVAxisMode: 0
163219
m_SensorSize: {x: 36, y: 24}
164220
m_LensShift: {x: 0, y: 0}
221+
m_GateFitMode: 2
165222
m_FocalLength: 50
166223
m_NormalizedViewPortRect:
167224
serializedVersion: 2
@@ -213,8 +270,9 @@ GameObject:
213270
m_Component:
214271
- component: {fileID: 548749181}
215272
- component: {fileID: 548749180}
273+
- component: {fileID: 548749182}
216274
m_Layer: 0
217-
m_Name: TestSpeechByPressingKeys
275+
m_Name: TestSpeech-WithAudioSource
218276
m_TagString: Untagged
219277
m_Icon: {fileID: 0}
220278
m_NavMeshLayer: 0
@@ -245,37 +303,20 @@ Transform:
245303
m_LocalScale: {x: 1, y: 1, z: 1}
246304
m_Children: []
247305
m_Father: {fileID: 0}
248-
m_RootOrder: 2
306+
m_RootOrder: 4
249307
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
250-
--- !u!1 &1440771956
251-
GameObject:
252-
m_ObjectHideFlags: 0
253-
m_CorrespondingSourceObject: {fileID: 0}
254-
m_PrefabInstance: {fileID: 0}
255-
m_PrefabAsset: {fileID: 0}
256-
serializedVersion: 6
257-
m_Component:
258-
- component: {fileID: 1440771958}
259-
- component: {fileID: 1440771957}
260-
m_Layer: 0
261-
m_Name: Audio Source
262-
m_TagString: Untagged
263-
m_Icon: {fileID: 0}
264-
m_NavMeshLayer: 0
265-
m_StaticEditorFlags: 0
266-
m_IsActive: 1
267-
--- !u!82 &1440771957
308+
--- !u!82 &548749182
268309
AudioSource:
269310
m_ObjectHideFlags: 0
270311
m_CorrespondingSourceObject: {fileID: 0}
271312
m_PrefabInstance: {fileID: 0}
272313
m_PrefabAsset: {fileID: 0}
273-
m_GameObject: {fileID: 1440771956}
314+
m_GameObject: {fileID: 548749179}
274315
m_Enabled: 1
275316
serializedVersion: 4
276317
OutputAudioMixerGroup: {fileID: 0}
277318
m_audioClip: {fileID: 0}
278-
m_PlayOnAwake: 1
319+
m_PlayOnAwake: 0
279320
m_Volume: 1
280321
m_Pitch: 1
281322
Loop: 0
@@ -360,20 +401,184 @@ AudioSource:
360401
m_PreInfinity: 2
361402
m_PostInfinity: 2
362403
m_RotationOrder: 4
363-
--- !u!4 &1440771958
364-
Transform:
404+
--- !u!1 &1119836945
405+
GameObject:
365406
m_ObjectHideFlags: 0
366407
m_CorrespondingSourceObject: {fileID: 0}
367408
m_PrefabInstance: {fileID: 0}
368409
m_PrefabAsset: {fileID: 0}
369-
m_GameObject: {fileID: 1440771956}
410+
serializedVersion: 6
411+
m_Component:
412+
- component: {fileID: 1119836946}
413+
- component: {fileID: 1119836948}
414+
- component: {fileID: 1119836947}
415+
m_Layer: 5
416+
m_Name: Text
417+
m_TagString: Untagged
418+
m_Icon: {fileID: 0}
419+
m_NavMeshLayer: 0
420+
m_StaticEditorFlags: 0
421+
m_IsActive: 1
422+
--- !u!224 &1119836946
423+
RectTransform:
424+
m_ObjectHideFlags: 0
425+
m_CorrespondingSourceObject: {fileID: 0}
426+
m_PrefabInstance: {fileID: 0}
427+
m_PrefabAsset: {fileID: 0}
428+
m_GameObject: {fileID: 1119836945}
370429
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
371-
m_LocalPosition: {x: -2.093978, y: 2.580687, z: 1.2901945}
430+
m_LocalPosition: {x: 0, y: 0, z: 0}
372431
m_LocalScale: {x: 1, y: 1, z: 1}
373432
m_Children: []
433+
m_Father: {fileID: 1446834462}
434+
m_RootOrder: 0
435+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
436+
m_AnchorMin: {x: 0.5, y: 0.5}
437+
m_AnchorMax: {x: 0.5, y: 0.5}
438+
m_AnchoredPosition: {x: 0, y: 0}
439+
m_SizeDelta: {x: 160, y: 30}
440+
m_Pivot: {x: 0.5, y: 0.5}
441+
--- !u!114 &1119836947
442+
MonoBehaviour:
443+
m_ObjectHideFlags: 0
444+
m_CorrespondingSourceObject: {fileID: 0}
445+
m_PrefabInstance: {fileID: 0}
446+
m_PrefabAsset: {fileID: 0}
447+
m_GameObject: {fileID: 1119836945}
448+
m_Enabled: 1
449+
m_EditorHideFlags: 0
450+
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
451+
m_Name:
452+
m_EditorClassIdentifier:
453+
m_Material: {fileID: 0}
454+
m_Color: {r: 1, g: 1, b: 1, a: 1}
455+
m_RaycastTarget: 1
456+
m_OnCullStateChanged:
457+
m_PersistentCalls:
458+
m_Calls: []
459+
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
460+
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
461+
m_FontData:
462+
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
463+
m_FontSize: 14
464+
m_FontStyle: 0
465+
m_BestFit: 0
466+
m_MinSize: 10
467+
m_MaxSize: 40
468+
m_Alignment: 0
469+
m_AlignByGeometry: 0
470+
m_RichText: 1
471+
m_HorizontalOverflow: 1
472+
m_VerticalOverflow: 0
473+
m_LineSpacing: 1
474+
m_Text: Press Any Key To Speech
475+
--- !u!222 &1119836948
476+
CanvasRenderer:
477+
m_ObjectHideFlags: 0
478+
m_CorrespondingSourceObject: {fileID: 0}
479+
m_PrefabInstance: {fileID: 0}
480+
m_PrefabAsset: {fileID: 0}
481+
m_GameObject: {fileID: 1119836945}
482+
m_CullTransparentMesh: 0
483+
--- !u!1 &1446834458
484+
GameObject:
485+
m_ObjectHideFlags: 0
486+
m_CorrespondingSourceObject: {fileID: 0}
487+
m_PrefabInstance: {fileID: 0}
488+
m_PrefabAsset: {fileID: 0}
489+
serializedVersion: 6
490+
m_Component:
491+
- component: {fileID: 1446834462}
492+
- component: {fileID: 1446834461}
493+
- component: {fileID: 1446834460}
494+
- component: {fileID: 1446834459}
495+
m_Layer: 5
496+
m_Name: Canvas
497+
m_TagString: Untagged
498+
m_Icon: {fileID: 0}
499+
m_NavMeshLayer: 0
500+
m_StaticEditorFlags: 0
501+
m_IsActive: 1
502+
--- !u!114 &1446834459
503+
MonoBehaviour:
504+
m_ObjectHideFlags: 0
505+
m_CorrespondingSourceObject: {fileID: 0}
506+
m_PrefabInstance: {fileID: 0}
507+
m_PrefabAsset: {fileID: 0}
508+
m_GameObject: {fileID: 1446834458}
509+
m_Enabled: 1
510+
m_EditorHideFlags: 0
511+
m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
512+
m_Name:
513+
m_EditorClassIdentifier:
514+
m_IgnoreReversedGraphics: 1
515+
m_BlockingObjects: 0
516+
m_BlockingMask:
517+
serializedVersion: 2
518+
m_Bits: 4294967295
519+
--- !u!114 &1446834460
520+
MonoBehaviour:
521+
m_ObjectHideFlags: 0
522+
m_CorrespondingSourceObject: {fileID: 0}
523+
m_PrefabInstance: {fileID: 0}
524+
m_PrefabAsset: {fileID: 0}
525+
m_GameObject: {fileID: 1446834458}
526+
m_Enabled: 1
527+
m_EditorHideFlags: 0
528+
m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
529+
m_Name:
530+
m_EditorClassIdentifier:
531+
m_UiScaleMode: 0
532+
m_ReferencePixelsPerUnit: 100
533+
m_ScaleFactor: 1
534+
m_ReferenceResolution: {x: 800, y: 600}
535+
m_ScreenMatchMode: 0
536+
m_MatchWidthOrHeight: 0
537+
m_PhysicalUnit: 3
538+
m_FallbackScreenDPI: 96
539+
m_DefaultSpriteDPI: 96
540+
m_DynamicPixelsPerUnit: 1
541+
--- !u!223 &1446834461
542+
Canvas:
543+
m_ObjectHideFlags: 0
544+
m_CorrespondingSourceObject: {fileID: 0}
545+
m_PrefabInstance: {fileID: 0}
546+
m_PrefabAsset: {fileID: 0}
547+
m_GameObject: {fileID: 1446834458}
548+
m_Enabled: 1
549+
serializedVersion: 3
550+
m_RenderMode: 0
551+
m_Camera: {fileID: 0}
552+
m_PlaneDistance: 100
553+
m_PixelPerfect: 0
554+
m_ReceivesEvents: 1
555+
m_OverrideSorting: 0
556+
m_OverridePixelPerfect: 0
557+
m_SortingBucketNormalizedSize: 0
558+
m_AdditionalShaderChannelsFlag: 0
559+
m_SortingLayerID: 0
560+
m_SortingOrder: 0
561+
m_TargetDisplay: 0
562+
--- !u!224 &1446834462
563+
RectTransform:
564+
m_ObjectHideFlags: 0
565+
m_CorrespondingSourceObject: {fileID: 0}
566+
m_PrefabInstance: {fileID: 0}
567+
m_PrefabAsset: {fileID: 0}
568+
m_GameObject: {fileID: 1446834458}
569+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
570+
m_LocalPosition: {x: 0, y: 0, z: 0}
571+
m_LocalScale: {x: 0, y: 0, z: 0}
572+
m_Children:
573+
- {fileID: 1119836946}
374574
m_Father: {fileID: 0}
375-
m_RootOrder: 3
575+
m_RootOrder: 2
376576
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
577+
m_AnchorMin: {x: 0, y: 0}
578+
m_AnchorMax: {x: 0, y: 0}
579+
m_AnchoredPosition: {x: 0, y: 0}
580+
m_SizeDelta: {x: 0, y: 0}
581+
m_Pivot: {x: 0, y: 0}
377582
--- !u!1 &1665498520
378583
GameObject:
379584
m_ObjectHideFlags: 0
@@ -428,7 +633,6 @@ MonoBehaviour:
428633
m_Name:
429634
m_EditorClassIdentifier:
430635
voiceID: Tweaky
431-
audio_source: {fileID: 1440771957}
432636
--- !u!4 &1665498523
433637
Transform:
434638
m_ObjectHideFlags: 0

Packages/manifest.json

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
{
22
"dependencies": {
33
"com.unity.ads": "2.0.8",
4-
"com.unity.analytics": "3.3.2",
5-
"com.unity.collab-proxy": "1.2.16",
6-
"com.unity.multiplayer-hlapi": "1.0.2",
7-
"com.unity.package-manager-ui": "2.1.2",
8-
"com.unity.purchasing": "2.0.6",
9-
"com.unity.textmeshpro": "2.0.1",
10-
"com.unity.timeline": "1.0.0",
11-
"com.unity.xr.legacyinputhelpers": "2.0.2",
4+
"com.unity.analytics": "3.2.2",
5+
"com.unity.collab-proxy": "1.2.15",
6+
"com.unity.package-manager-ui": "2.0.7",
7+
"com.unity.purchasing": "2.0.3",
8+
"com.unity.textmeshpro": "1.3.0",
129
"com.unity.modules.ai": "1.0.0",
1310
"com.unity.modules.animation": "1.0.0",
1411
"com.unity.modules.assetbundle": "1.0.0",

0 commit comments

Comments
 (0)