second commit to make Updater a background task

This commit is contained in:
2018-12-28 21:13:20 +01:00
parent d71221883c
commit 9c783cf71d
10 changed files with 638 additions and 114 deletions

View File

@@ -45,6 +45,23 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!1 &1093947357135468
GameObject:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 224330316150687214}
- component: {fileID: 222536103881524360}
- component: {fileID: 114428313277484686}
m_Layer: 0
m_Name: Icon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1123889251050150 --- !u!1 &1123889251050150
GameObject: GameObject:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@@ -56,6 +73,7 @@ GameObject:
- component: {fileID: 222257107596212176} - component: {fileID: 222257107596212176}
- component: {fileID: 114703351711471558} - component: {fileID: 114703351711471558}
- component: {fileID: 114099535585905582} - component: {fileID: 114099535585905582}
- component: {fileID: 114450829088306680}
m_Layer: 5 m_Layer: 5
m_Name: TextMeshPro Text m_Name: TextMeshPro Text
m_TagString: Untagged m_TagString: Untagged
@@ -128,7 +146,7 @@ GameObject:
- component: {fileID: 222516432528614952} - component: {fileID: 222516432528614952}
- component: {fileID: 114312292318207176} - component: {fileID: 114312292318207176}
m_Layer: 5 m_Layer: 5
m_Name: ButtonLanguage m_Name: ButtonUpdate
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
@@ -180,6 +198,7 @@ GameObject:
- component: {fileID: 222236235550470454} - component: {fileID: 222236235550470454}
- component: {fileID: 114304727189119928} - component: {fileID: 114304727189119928}
- component: {fileID: 114761951126762250} - component: {fileID: 114761951126762250}
- component: {fileID: 114259177279469450}
m_Layer: 5 m_Layer: 5
m_Name: TextMeshPro Text m_Name: TextMeshPro Text
m_TagString: Untagged m_TagString: Untagged
@@ -238,6 +257,25 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!1 &1559326554126414
GameObject:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 224403095676770094}
- component: {fileID: 222736219676448006}
- component: {fileID: 114575509895372660}
- component: {fileID: 114834531991525614}
- component: {fileID: 114855165548587684}
m_Layer: 5
m_Name: TextMeshPro Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1566260761276548 --- !u!1 &1566260761276548
GameObject: GameObject:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@@ -249,6 +287,7 @@ GameObject:
- component: {fileID: 222430445161218842} - component: {fileID: 222430445161218842}
- component: {fileID: 114962239977612638} - component: {fileID: 114962239977612638}
- component: {fileID: 114191467112603124} - component: {fileID: 114191467112603124}
- component: {fileID: 114258570651376336}
m_Layer: 5 m_Layer: 5
m_Name: TextMeshPro Text m_Name: TextMeshPro Text
m_TagString: Untagged m_TagString: Untagged
@@ -289,6 +328,23 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!1 &1613888947816932
GameObject:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 224898673201446374}
- component: {fileID: 222151895407047394}
- component: {fileID: 114021329305057850}
m_Layer: 5
m_Name: ButtonLanguage
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1622699956602756 --- !u!1 &1622699956602756
GameObject: GameObject:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@@ -300,6 +356,7 @@ GameObject:
- component: {fileID: 222686667508429160} - component: {fileID: 222686667508429160}
- component: {fileID: 114993845510651576} - component: {fileID: 114993845510651576}
- component: {fileID: 114386162478351322} - component: {fileID: 114386162478351322}
- component: {fileID: 114567690225261020}
m_Layer: 5 m_Layer: 5
m_Name: TextMeshPro Text m_Name: TextMeshPro Text
m_TagString: Untagged m_TagString: Untagged
@@ -318,6 +375,7 @@ GameObject:
- component: {fileID: 222633703844647490} - component: {fileID: 222633703844647490}
- component: {fileID: 114160009348696074} - component: {fileID: 114160009348696074}
- component: {fileID: 114427529426144796} - component: {fileID: 114427529426144796}
- component: {fileID: 114869981639449470}
m_Layer: 5 m_Layer: 5
m_Name: TextMeshPro Text m_Name: TextMeshPro Text
m_TagString: Untagged m_TagString: Untagged
@@ -325,6 +383,24 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!1 &1733985940025502
GameObject:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 224068246739610406}
- component: {fileID: 222218005056313502}
- component: {fileID: 114529575306895444}
- component: {fileID: 114883595898678426}
m_Layer: 5
m_Name: Button
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1822126980603004 --- !u!1 &1822126980603004
GameObject: GameObject:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@@ -482,6 +558,25 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!114 &114021329305057850
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1613888947816932}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 0
m_MinWidth: -1
m_MinHeight: -1
m_PreferredWidth: -1
m_PreferredHeight: -1
m_FlexibleWidth: 1
m_FlexibleHeight: 1
m_LayoutPriority: 1
--- !u!114 &114023377107792378 --- !u!114 &114023377107792378
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@@ -624,17 +719,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2e7e534f013c7074aaec3f25f856d317, type: 3} m_Script: {fileID: 11500000, guid: 2e7e534f013c7074aaec3f25f856d317, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
MenuEntries:
- Token: t_menu_button_color
TextMesh: {fileID: 114304727189119928}
- Token: t_menu_button_language
TextMesh: {fileID: 114993845510651576}
- Token: t_menu_button_tutorial
TextMesh: {fileID: 114160009348696074}
- Token: t_menu_button_fontsize
TextMesh: {fileID: 114962239977612638}
- Token: t_menu_button_credits
TextMesh: {fileID: 114703351711471558}
--- !u!114 &114140955474629306 --- !u!114 &114140955474629306
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@@ -892,6 +976,30 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
SizeClass: 1 SizeClass: 1
--- !u!114 &114258570651376336
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1566260761276548}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 104796bd5a7a2434bb835da75350ba3f, type: 3}
m_Name:
m_EditorClassIdentifier:
LocalizationToken: t_menu_button_fontsize
--- !u!114 &114259177279469450
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1453184506351326}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 104796bd5a7a2434bb835da75350ba3f, type: 3}
m_Name:
m_EditorClassIdentifier:
LocalizationToken: t_menu_button_color
--- !u!114 &114304727189119928 --- !u!114 &114304727189119928
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@@ -1126,6 +1234,45 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
SizeClass: 1 SizeClass: 1
--- !u!114 &114428313277484686
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1093947357135468}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: c5442431c660fb04187df8dfe3e1818e, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!114 &114450829088306680
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1123889251050150}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 104796bd5a7a2434bb835da75350ba3f, type: 3}
m_Name:
m_EditorClassIdentifier:
LocalizationToken: t_menu_button_credits
--- !u!114 &114481541986733408 --- !u!114 &114481541986733408
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@@ -1270,6 +1417,157 @@ MonoBehaviour:
m_FlexibleWidth: 1 m_FlexibleWidth: 1
m_FlexibleHeight: 1 m_FlexibleHeight: 1
m_LayoutPriority: 1 m_LayoutPriority: 1
--- !u!114 &114529575306895444
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1733985940025502}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: b49170becc957054782e78d161ecef43, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 9fa74bcade8d1ab4d8c93a63ac2cf0f7, type: 3}
m_Type: 1
m_PreserveAspect: 1
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!114 &114567690225261020
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1622699956602756}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 104796bd5a7a2434bb835da75350ba3f, type: 3}
m_Name:
m_EditorClassIdentifier:
LocalizationToken: t_menu_button_update
--- !u!114 &114575509895372660
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1559326554126414}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1453722849, guid: 89f0137620f6af44b9ba852b4190e64e, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: Sprache
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 715b80e429c437e40867928a4e1fc975, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 715b80e429c437e40867928a4e1fc975, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 25
m_fontSizeBase: 25
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_textAlignment: 513
m_isAlignmentEnumConverted: 1
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_firstOverflowCharacterIndex: -1
m_linkedTextComponent: {fileID: 0}
m_isLinkedTextComponent: 0
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_ignoreRectMaskCulling: 0
m_ignoreCulling: 1
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_firstVisibleCharacter: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo:
textComponent: {fileID: 114575509895372660}
characterCount: 7
spriteCount: 0
spaceCount: 0
wordCount: 1
linkCount: 0
lineCount: 1
pageCount: 1
materialCount: 1
m_havePropertiesChanged: 1
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_spriteAnimator: {fileID: 0}
m_isInputParsingRequired: 1
m_inputSource: 0
m_hasFontAssetChanged: 0
m_subTextObjects:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &114596666055262414 --- !u!114 &114596666055262414
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@@ -1337,7 +1635,7 @@ MonoBehaviour:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 114126113914499456} - m_Target: {fileID: 114126113914499456}
m_MethodName: SwitchToLanguageSelectView m_MethodName: SwitchToUpdaterView
m_Mode: 1 m_Mode: 1
m_Arguments: m_Arguments:
m_ObjectArgument: {fileID: 0} m_ObjectArgument: {fileID: 0}
@@ -1617,6 +1915,30 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
SizeClass: 1 SizeClass: 1
--- !u!114 &114834531991525614
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1559326554126414}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, type: 3}
m_Name:
m_EditorClassIdentifier:
SizeClass: 1
--- !u!114 &114855165548587684
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1559326554126414}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 104796bd5a7a2434bb835da75350ba3f, type: 3}
m_Name:
m_EditorClassIdentifier:
LocalizationToken: t_menu_button_language
--- !u!114 &114861247372160662 --- !u!114 &114861247372160662
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@@ -1652,6 +1974,70 @@ MonoBehaviour:
m_FlexibleWidth: 1 m_FlexibleWidth: 1
m_FlexibleHeight: 1 m_FlexibleHeight: 1
m_LayoutPriority: 1 m_LayoutPriority: 1
--- !u!114 &114869981639449470
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1663770969281230}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 104796bd5a7a2434bb835da75350ba3f, type: 3}
m_Name:
m_EditorClassIdentifier:
LocalizationToken: t_menu_button_tutorial
--- !u!114 &114883595898678426
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1733985940025502}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 114529575306895444}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 114126113914499456}
m_MethodName: SwitchToLanguageSelectView
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument: de
m_BoolArgument: 0
m_CallState: 2
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &114891783888147370 --- !u!114 &114891783888147370
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@@ -1725,7 +2111,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: c5442431c660fb04187df8dfe3e1818e, type: 3} m_Sprite: {fileID: 21300000, guid: 1957047573239854895a9ba2a69c12c8, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 1 m_PreserveAspect: 1
m_FillCenter: 1 m_FillCenter: 1
@@ -1891,7 +2277,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: Sprache m_text: Update
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 715b80e429c437e40867928a4e1fc975, type: 2} m_fontAsset: {fileID: 11400000, guid: 715b80e429c437e40867928a4e1fc975, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 715b80e429c437e40867928a4e1fc975, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 715b80e429c437e40867928a4e1fc975, type: 2}
@@ -1958,7 +2344,7 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0} m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo: m_textInfo:
textComponent: {fileID: 114993845510651576} textComponent: {fileID: 114993845510651576}
characterCount: 7 characterCount: 6
spriteCount: 0 spriteCount: 0
spaceCount: 0 spaceCount: 0
wordCount: 1 wordCount: 1
@@ -1996,12 +2382,24 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1008485180534478} m_GameObject: {fileID: 1008485180534478}
--- !u!222 &222151895407047394
CanvasRenderer:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1613888947816932}
--- !u!222 &222153422494546844 --- !u!222 &222153422494546844
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1042628125586808} m_GameObject: {fileID: 1042628125586808}
--- !u!222 &222218005056313502
CanvasRenderer:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1733985940025502}
--- !u!222 &222236235550470454 --- !u!222 &222236235550470454
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@@ -2050,6 +2448,12 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1368374326299624} m_GameObject: {fileID: 1368374326299624}
--- !u!222 &222536103881524360
CanvasRenderer:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1093947357135468}
--- !u!222 &222547030763414376 --- !u!222 &222547030763414376
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@@ -2092,6 +2496,12 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1964565221985070} m_GameObject: {fileID: 1964565221985070}
--- !u!222 &222736219676448006
CanvasRenderer:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1559326554126414}
--- !u!222 &222755655188159418 --- !u!222 &222755655188159418
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@@ -2162,19 +2572,37 @@ RectTransform:
m_GameObject: {fileID: 1368374326299624} m_GameObject: {fileID: 1368374326299624}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994}
m_Children: m_Children:
- {fileID: 224261216574473414} - {fileID: 224261216574473414}
- {fileID: 224128338965173062} - {fileID: 224128338965173062}
- {fileID: 224480372276515010} - {fileID: 224480372276515010}
m_Father: {fileID: 224844527725026830} m_Father: {fileID: 224844527725026830}
m_RootOrder: 1 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224068246739610406
RectTransform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1733985940025502}
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: 224898673201446374}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224082682870789258 --- !u!224 &224082682870789258
RectTransform: RectTransform:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@@ -2305,6 +2733,24 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224330316150687214
RectTransform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1093947357135468}
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: 0}
m_Children: []
m_Father: {fileID: 224898673201446374}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 35, y: 0}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224360344833465170 --- !u!224 &224360344833465170
RectTransform: RectTransform:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@@ -2323,6 +2769,24 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 4, y: 4} m_SizeDelta: {x: 4, y: 4}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224403095676770094
RectTransform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1559326554126414}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224898673201446374}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 35, y: 0}
m_SizeDelta: {x: -70, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224411256630293298 --- !u!224 &224411256630293298
RectTransform: RectTransform:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@@ -2502,9 +2966,10 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 224696479351442688} - {fileID: 224696479351442688}
- {fileID: 224045114038880592} - {fileID: 224898673201446374}
- {fileID: 224750414370576322} - {fileID: 224750414370576322}
- {fileID: 224877065014001232} - {fileID: 224877065014001232}
- {fileID: 224045114038880592}
- {fileID: 224969683658863468} - {fileID: 224969683658863468}
m_Father: {fileID: 224214707840811800} m_Father: {fileID: 224214707840811800}
m_RootOrder: 2 m_RootOrder: 2
@@ -2573,6 +3038,27 @@ RectTransform:
m_AnchoredPosition: {x: -75, y: -75} m_AnchoredPosition: {x: -75, y: -75}
m_SizeDelta: {x: 100, y: 100} m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224898673201446374
RectTransform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1613888947816932}
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:
- {fileID: 224068246739610406}
- {fileID: 224403095676770094}
- {fileID: 224330316150687214}
m_Father: {fileID: 224844527725026830}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224899198735757046 --- !u!224 &224899198735757046
RectTransform: RectTransform:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@@ -2641,7 +3127,7 @@ RectTransform:
- {fileID: 224562788853542486} - {fileID: 224562788853542486}
- {fileID: 224878574598484460} - {fileID: 224878574598484460}
m_Father: {fileID: 224844527725026830} m_Father: {fileID: 224844527725026830}
m_RootOrder: 4 m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}

View File

@@ -498,7 +498,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 224118593201424496} - component: {fileID: 224118593201424496}
m_Layer: 5 m_Layer: 5
m_Name: ButtonSettings m_Name: ButtonBack
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
@@ -1499,7 +1499,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 8f23181e0a1c78544835bd9301f1eef7, type: 3} m_Sprite: {fileID: 21300000, guid: 25c300b5f8ebb4d4aac98e07ba35ce08, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 1 m_PreserveAspect: 1
m_FillCenter: 1 m_FillCenter: 1

View File

@@ -2,6 +2,7 @@
<localization> <localization>
<language key="de" name="Deutsch" flagPath="localization/flag_de"/> <language key="de" name="Deutsch" flagPath="localization/flag_de"/>
<language key="en" name="English" flagPath="localization/flag_uk_us" default="true"/> <language key="en" name="English" flagPath="localization/flag_uk_us" default="true"/>
<entry name="t_color_name_light_blue"> <entry name="t_color_name_light_blue">
<text lang="de" type="inline" value="Hellblau"/> <text lang="de" type="inline" value="Hellblau"/>
<text lang="en" type="inline" value="Light Blue"/> <text lang="en" type="inline" value="Light Blue"/>
@@ -46,6 +47,10 @@
<text lang="de" type="inline" value="Credits"/> <text lang="de" type="inline" value="Credits"/>
<text lang="en" type="inline" value="Credits"/> <text lang="en" type="inline" value="Credits"/>
</entry> </entry>
<entry name="t_menu_button_update">
<text lang="de" type="inline" value="Update"/>
<text lang="en" type="inline" value="Update"/>
</entry>
<entry name="t_languageselect_Default"> <entry name="t_languageselect_Default">
<text lang="de" type="inline" value="Standard"/> <text lang="de" type="inline" value="Standard"/>
<text lang="en" type="inline" value="Default"/> <text lang="en" type="inline" value="Default"/>

View File

@@ -35,5 +35,9 @@ namespace RothenburgAR.UI
{ {
UIManager.Instance.SwitchToView(ViewName.FontsizeSelectView); UIManager.Instance.SwitchToView(ViewName.FontsizeSelectView);
} }
public void SwitchToUpdaterView()
{
UIManager.Instance.SwitchToView(ViewName.UpdaterView);
}
} }
} }

View File

@@ -14,10 +14,6 @@ namespace RothenburgAR.UI
if (tmproTextUI != null) if (tmproTextUI != null)
{ {
tmproTextUI.fontSize = FontsizeManager.Instance.GetFontsize(this.SizeClass); tmproTextUI.fontSize = FontsizeManager.Instance.GetFontsize(this.SizeClass);
//tmproText.enableAutoSizing = true;
//tmproText.fontSizeMax = FontsizeManager.Instance.GetFontsize(this.SizeClass);
//tmproText.fontSizeMin = tmproText.fontSizeMax * 0.8f;
} }
var tmproText = gameObject.GetComponent<TMPro.TextMeshPro>(); var tmproText = gameObject.GetComponent<TMPro.TextMeshPro>();

View File

@@ -0,0 +1,26 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
namespace RothenburgAR.UI
{
public class LocalizationSelector : MonoBehaviour
{
public string LocalizationToken;
void OnEnable()
{
var tmproTextUI = gameObject.GetComponent<TMPro.TextMeshProUGUI>();
if (tmproTextUI != null)
{
tmproTextUI.text = LanguageManager.Instance.GetString(this.LocalizationToken);
}
var tmproText = gameObject.GetComponent<TMPro.TextMeshPro>();
if (tmproText != null)
{
tmproText.text = LanguageManager.Instance.GetString(this.LocalizationToken);
}
}
}
}

View File

@@ -0,0 +1,13 @@
fileFormatVersion: 2
guid: 104796bd5a7a2434bb835da75350ba3f
timeCreated: 1546026587
licenseType: Free
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -6,24 +6,7 @@ using UnityEngine;
namespace RothenburgAR.UI namespace RothenburgAR.UI
{ {
[Serializable]
public struct MenuEntry
{
public string Token;
public TextMeshProUGUI TextMesh;
}
public class SettingsViewBehaviour : BaseViewBehaviour public class SettingsViewBehaviour : BaseViewBehaviour
{ {
[SerializeField]
private List<MenuEntry> MenuEntries;
public void OnEnable()
{
foreach (MenuEntry entry in MenuEntries)
{
entry.TextMesh.SetText(LanguageManager.Instance.GetString(entry.Token));
}
}
} }
} }

View File

@@ -14,7 +14,8 @@ namespace RothenburgAR.UI
LanguageSelectView, LanguageSelectView,
ColorSelectView, ColorSelectView,
FontsizeSelectView, FontsizeSelectView,
FullscreenModelView FullscreenModelView,
UpdaterView
} }
public class UIManager : Singleton<UIManager> public class UIManager : Singleton<UIManager>
@@ -62,7 +63,6 @@ namespace RothenburgAR.UI
public UIManager() public UIManager()
{ {
_availableViews = new Dictionary<ViewName, View>(); _availableViews = new Dictionary<ViewName, View>();
StartingUp = true;
} }
internal void Initialize() internal void Initialize()
@@ -123,6 +123,13 @@ namespace RothenburgAR.UI
ViewName = ViewName.FullscreenModelView, ViewName = ViewName.FullscreenModelView,
PrefabName = "UI/FullscreenModelView" PrefabName = "UI/FullscreenModelView"
}); });
_availableViews.Add(ViewName.UpdaterView,
new View()
{
ViewName = ViewName.UpdaterView,
PrefabName = "UI/UpdaterView"
});
} }
public void InitStartView() public void InitStartView()
@@ -142,7 +149,7 @@ namespace RothenburgAR.UI
View nextView; View nextView;
if (!_availableViews.TryGetValue(nextViewName, out nextView)) if (!_availableViews.TryGetValue(nextViewName, out nextView))
{ {
Debug.Log("Tried to switch to view '" + nextViewName + "', but it failed."); Debug.Log("Tried to switch to view '" + nextViewName + "', but it was not found.");
return null; return null;
} }
@@ -156,7 +163,6 @@ namespace RothenburgAR.UI
Debug.Log("Switching to view '" + nextViewName + "'"); Debug.Log("Switching to view '" + nextViewName + "'");
} }
if (_currentView != null && _currentView.OnExit != null) if (_currentView != null && _currentView.OnExit != null)
{ {
_currentView.OnExit(); _currentView.OnExit();

View File

@@ -3,7 +3,7 @@ using UnityEngine;
namespace RothenburgAR.UI namespace RothenburgAR.UI
{ {
public class UpdaterViewBehaviour : MonoBehaviour public class UpdaterViewBehaviour : BaseViewBehaviour
{ {
public UnityEngine.UI.Slider ProgressBar; public UnityEngine.UI.Slider ProgressBar;
public GameObject UpdateDialog; public GameObject UpdateDialog;
@@ -11,9 +11,11 @@ namespace RothenburgAR.UI
public GameObject UpdateCompletedDialog; public GameObject UpdateCompletedDialog;
public GameObject UpdateFailedDialog; public GameObject UpdateFailedDialog;
private UpdateState lastUpdateState = UpdateState.UpdatesFound;
private void Start() private void Start()
{ {
UpdateDialog.SetActive(false); UpdateDialog.SetActive(true);
UpdateConfirmationDialog.SetActive(false); UpdateConfirmationDialog.SetActive(false);
UpdateCompletedDialog.SetActive(false); UpdateCompletedDialog.SetActive(false);
UpdateFailedDialog.SetActive(false); UpdateFailedDialog.SetActive(false);
@@ -23,7 +25,12 @@ namespace RothenburgAR.UI
private void Update() private void Update()
{ {
ProgressBar.value = UpdaterBehaviour.Instance.CurrentProgress;
ProgressBar.maxValue = UpdaterBehaviour.Instance.MaxProgress;
var state = UpdaterBehaviour.Instance.UpdateState; var state = UpdaterBehaviour.Instance.UpdateState;
if (state == lastUpdateState) return;
lastUpdateState = state;
UpdateDialog.SetActive(false); UpdateDialog.SetActive(false);
UpdateConfirmationDialog.SetActive(false); UpdateConfirmationDialog.SetActive(false);
@@ -40,8 +47,6 @@ namespace RothenburgAR.UI
case UpdateState.Downloading: case UpdateState.Downloading:
UpdateDialog.SetActive(true); UpdateDialog.SetActive(true);
ProgressBar.value = UpdaterBehaviour.Instance.CurrentProgress;
ProgressBar.maxValue = UpdaterBehaviour.Instance.MaxProgress;
break; break;
case UpdateState.Completed: case UpdateState.Completed: