diff --git a/Assets/Resources/UI/UpdaterView.prefab b/Assets/Resources/UI/UpdaterView.prefab index 6377b76..3ce14b4 100644 --- a/Assets/Resources/UI/UpdaterView.prefab +++ b/Assets/Resources/UI/UpdaterView.prefab @@ -72,6 +72,8 @@ GameObject: - component: {fileID: 224745631224505972} - component: {fileID: 222082937115686038} - component: {fileID: 114912997897647956} + - component: {fileID: 114801479454542580} + - component: {fileID: 114471411005921238} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -154,6 +156,8 @@ GameObject: - component: {fileID: 224563369870751156} - component: {fileID: 222809789301068370} - component: {fileID: 114711928523202972} + - component: {fileID: 114074008245472784} + - component: {fileID: 114300188397231386} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -171,6 +175,8 @@ GameObject: - component: {fileID: 224780580255838736} - component: {fileID: 222885362984280038} - component: {fileID: 114299679537650738} + - component: {fileID: 114816227450269734} + - component: {fileID: 114499207526931754} m_Layer: 5 m_Name: Content-Text m_TagString: Untagged @@ -206,6 +212,8 @@ GameObject: - component: {fileID: 224617690411599454} - component: {fileID: 222809553919911166} - component: {fileID: 114103223249113440} + - component: {fileID: 114945115909267040} + - component: {fileID: 114122287051571516} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -240,6 +248,8 @@ GameObject: - component: {fileID: 224636810494298184} - component: {fileID: 222367182740984338} - component: {fileID: 114333296285916826} + - component: {fileID: 114301266977575938} + - component: {fileID: 114254689005287812} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -257,6 +267,8 @@ GameObject: - component: {fileID: 224598502036515924} - component: {fileID: 222240163928446358} - component: {fileID: 114882931857201302} + - component: {fileID: 114417339281150352} + - component: {fileID: 114580859640267144} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -325,6 +337,8 @@ GameObject: - component: {fileID: 224527525971181362} - component: {fileID: 222357804333307370} - component: {fileID: 114543122969888926} + - component: {fileID: 114063020803053740} + - component: {fileID: 114432671164947092} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -361,6 +375,8 @@ GameObject: - component: {fileID: 224802832665793420} - component: {fileID: 222756221251490720} - component: {fileID: 114614886342712594} + - component: {fileID: 114272244831680292} + - component: {fileID: 114099395918971176} m_Layer: 5 m_Name: Header-Text m_TagString: Untagged @@ -522,6 +538,18 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!114 &114063020803053740 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1630151476964772} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 104796bd5a7a2434bb835da75350ba3f, type: 3} + m_Name: + m_EditorClassIdentifier: + LocalizationToken: t_updater_confirmUpdatesDialog --- !u!114 &114072172871485530 MonoBehaviour: m_ObjectHideFlags: 1 @@ -536,6 +564,30 @@ MonoBehaviour: m_EffectColor: {r: 0, g: 0, b: 0, a: 0.2509804} m_EffectDistance: {x: 7, y: -7} m_UseGraphicAlpha: 1 +--- !u!114 &114074008245472784 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1253424446525734} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 104796bd5a7a2434bb835da75350ba3f, type: 3} + m_Name: + m_EditorClassIdentifier: + LocalizationToken: t_updater_applyUpdates +--- !u!114 &114099395918971176 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1678930945777954} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, type: 3} + m_Name: + m_EditorClassIdentifier: + SizeClass: 0 --- !u!114 &114103223249113440 MonoBehaviour: m_ObjectHideFlags: 1 @@ -583,8 +635,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 22 - m_fontSizeBase: 22 + m_fontSize: 35 + m_fontSizeBase: 35 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 15 @@ -628,7 +680,7 @@ MonoBehaviour: spaceCount: 11 wordCount: 12 linkCount: 0 - lineCount: 1 + lineCount: 2 pageCount: 1 materialCount: 1 m_havePropertiesChanged: 1 @@ -676,6 +728,18 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 +--- !u!114 &114122287051571516 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1293035265681834} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, type: 3} + m_Name: + m_EditorClassIdentifier: + SizeClass: 1 --- !u!114 &114167187673626414 MonoBehaviour: m_ObjectHideFlags: 1 @@ -745,6 +809,18 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!114 &114254689005287812 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1360576655840186} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, type: 3} + m_Name: + m_EditorClassIdentifier: + SizeClass: 1 --- !u!114 &114262347126166714 MonoBehaviour: m_ObjectHideFlags: 1 @@ -797,6 +873,18 @@ MonoBehaviour: m_CallState: 2 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!114 &114272244831680292 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1678930945777954} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 104796bd5a7a2434bb835da75350ba3f, type: 3} + m_Name: + m_EditorClassIdentifier: + LocalizationToken: t_updater_header --- !u!114 &114299679537650738 MonoBehaviour: m_ObjectHideFlags: 1 @@ -844,8 +932,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 22 - m_fontSizeBase: 22 + m_fontSize: 35 + m_fontSizeBase: 35 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 15 @@ -910,6 +998,30 @@ MonoBehaviour: - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &114300188397231386 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1253424446525734} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, type: 3} + m_Name: + m_EditorClassIdentifier: + SizeClass: 1 +--- !u!114 &114301266977575938 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1360576655840186} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 104796bd5a7a2434bb835da75350ba3f, type: 3} + m_Name: + m_EditorClassIdentifier: + LocalizationToken: t_updater_retry --- !u!114 &114302654948217402 MonoBehaviour: m_ObjectHideFlags: 1 @@ -995,8 +1107,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 22 - m_fontSizeBase: 22 + m_fontSize: 35 + m_fontSizeBase: 35 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 15 @@ -1115,6 +1227,30 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 +--- !u!114 &114417339281150352 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1393941871416080} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 104796bd5a7a2434bb835da75350ba3f, type: 3} + m_Name: + m_EditorClassIdentifier: + LocalizationToken: t_updater_confirmUpdates +--- !u!114 &114432671164947092 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1630151476964772} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, type: 3} + m_Name: + m_EditorClassIdentifier: + SizeClass: 1 --- !u!114 &114435947389490282 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1131,6 +1267,18 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!114 &114471411005921238 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1123462642303082} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, type: 3} + m_Name: + m_EditorClassIdentifier: + SizeClass: 1 --- !u!114 &114482299725399224 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1158,6 +1306,18 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 +--- !u!114 &114499207526931754 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1271188668400590} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, type: 3} + m_Name: + m_EditorClassIdentifier: + SizeClass: 1 --- !u!114 &114528748301596902 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1232,8 +1392,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 22 - m_fontSizeBase: 22 + m_fontSize: 35 + m_fontSizeBase: 35 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 15 @@ -1298,6 +1458,18 @@ MonoBehaviour: - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &114580859640267144 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1393941871416080} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, type: 3} + m_Name: + m_EditorClassIdentifier: + SizeClass: 1 --- !u!114 &114586589905083440 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1387,8 +1559,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 40 - m_fontSizeBase: 40 + m_fontSize: 56 + m_fontSizeBase: 56 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 42 @@ -1553,7 +1725,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_text: OK + m_text: Updates anwenden m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 715b80e429c437e40867928a4e1fc975, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 715b80e429c437e40867928a4e1fc975, type: 2} @@ -1580,8 +1752,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 22 - m_fontSizeBase: 22 + m_fontSize: 35 + m_fontSizeBase: 35 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 15 @@ -1620,12 +1792,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 114711928523202972} - characterCount: 2 + characterCount: 16 spriteCount: 0 - spaceCount: 0 - wordCount: 1 + spaceCount: 1 + wordCount: 2 linkCount: 0 - lineCount: 1 + lineCount: 2 pageCount: 1 materialCount: 1 m_havePropertiesChanged: 1 @@ -1752,6 +1924,18 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 +--- !u!114 &114801479454542580 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1123462642303082} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 104796bd5a7a2434bb835da75350ba3f, type: 3} + m_Name: + m_EditorClassIdentifier: + LocalizationToken: t_updater_completed --- !u!114 &114804908709051010 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1779,6 +1963,18 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 +--- !u!114 &114816227450269734 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1271188668400590} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 104796bd5a7a2434bb835da75350ba3f, type: 3} + m_Name: + m_EditorClassIdentifier: + LocalizationToken: t_updater_updating --- !u!114 &114840222085343964 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1819,7 +2015,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -2016,8 +2212,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 22 - m_fontSizeBase: 22 + m_fontSize: 35 + m_fontSizeBase: 35 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 15 @@ -2061,7 +2257,7 @@ MonoBehaviour: spaceCount: 1 wordCount: 2 linkCount: 0 - lineCount: 1 + lineCount: 2 pageCount: 1 materialCount: 1 m_havePropertiesChanged: 1 @@ -2128,8 +2324,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 22 - m_fontSizeBase: 22 + m_fontSize: 35 + m_fontSizeBase: 35 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 15 @@ -2246,6 +2442,18 @@ MonoBehaviour: m_CallState: 2 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!114 &114945115909267040 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1293035265681834} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 104796bd5a7a2434bb835da75350ba3f, type: 3} + m_Name: + m_EditorClassIdentifier: + LocalizationToken: t_updater_failed --- !u!114 &114971533680593800 MonoBehaviour: m_ObjectHideFlags: 1 @@ -2265,7 +2473,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: a765cfabfca9fa34fb6d7d0f8c0e5943, type: 3} + m_Sprite: {fileID: 21300000, guid: 1957047573239854895a9ba2a69c12c8, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2488,10 +2696,10 @@ RectTransform: m_Father: {fileID: 224307996891898958} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -75} - m_SizeDelta: {x: -300, y: -450} + m_SizeDelta: {x: 700, y: 500} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224062173711572156 RectTransform: @@ -2586,8 +2794,8 @@ 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: 0, y: -50} - m_SizeDelta: {x: 300, y: 75} + m_AnchoredPosition: {x: 0, y: -110} + m_SizeDelta: {x: 300, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224270051540678668 RectTransform: @@ -2684,8 +2892,8 @@ 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: 0, y: -75} - m_SizeDelta: {x: 300, y: 75} + m_AnchoredPosition: {x: 0, y: -110} + m_SizeDelta: {x: 300, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224422897808493952 RectTransform: @@ -3036,6 +3244,6 @@ 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: 0, y: -75} - m_SizeDelta: {x: 300, y: 75} + m_AnchoredPosition: {x: 0, y: -110} + m_SizeDelta: {x: 300, y: 100} m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Resources/localization.xml b/Assets/Resources/localization.xml index 6cf430c..c9fdffd 100644 --- a/Assets/Resources/localization.xml +++ b/Assets/Resources/localization.xml @@ -59,6 +59,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Assets/RothenburgAR/Scripts/Updater/UpdaterBehaviour.cs b/Assets/RothenburgAR/Scripts/Updater/UpdaterBehaviour.cs index b820894..9a7de90 100644 --- a/Assets/RothenburgAR/Scripts/Updater/UpdaterBehaviour.cs +++ b/Assets/RothenburgAR/Scripts/Updater/UpdaterBehaviour.cs @@ -295,8 +295,10 @@ namespace RothenburgAR.Updater private void GenerateUsedFileList(Dictionary downloadList) { + ExhibitMetas.Clear(); var rootDir = new DirectoryInfo(PathHelper.ExhibitionPath); var exhibitionDirs = rootDir.GetDirectories().ToList(); + foreach (var dir in exhibitionDirs) { var versionFilePath = Path.Combine(dir.FullName, "version.txt");