diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Editor.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Editor.meta new file mode 100644 index 0000000..308dd63 --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d3135e364fc78d3489b22e53799fcf7e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Editor/DecoControllerEditor.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Editor/DecoControllerEditor.cs new file mode 100644 index 0000000..d112e52 --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Editor/DecoControllerEditor.cs @@ -0,0 +1,77 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEditor; +using UnityEngine; + + +namespace UltraCombos.Frozen.RoyalGallery +{ + [CustomEditor(typeof(DecoController))] + public class DecoControllerEditor : UnityEditor.Editor + { + SerializedProperty languageProperty; + SerializedProperty contextsProperty; + + DecoController translator; + + private void OnEnable() + { + if (target == null) + return; + + translator = target as DecoController; + + languageProperty = serializedObject.FindProperty("language"); + contextsProperty = serializedObject.FindProperty("contexts"); + } + + public override void OnInspectorGUI() + { + serializedObject.Update(); + + using (var check = new EditorGUI.ChangeCheckScope()) + { + EditorGUILayout.Space(); + DrawInspectorGUI(); + EditorGUILayout.Space(); + + if (check.changed) + { + serializedObject.ApplyModifiedProperties(); + } + } + } + + private void DrawInspectorGUI() + { + if (translator.contexts.Count > 0) + { + int selected = 0; + for (int i = 0; i < translator.contexts.Count; i++) + { + if (translator.contexts[i].language == translator.language) + { + selected = i; + break; + } + } + var options = new List(); + foreach (var ctx in translator.contexts) + { + options.Add(ctx.language.ToString()); + } + selected = EditorGUILayout.Popup("Language", selected, options.ToArray()); + var selected_language = translator.contexts[selected].language; + if (translator.language != selected_language) + { + translator.language = selected_language; + EditorUtility.SetDirty(target); + } + } + + EditorGUILayout.PropertyField(contextsProperty, true); + } + + } + +} diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Editor/DecoControllerEditor.cs.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Editor/DecoControllerEditor.cs.meta new file mode 100644 index 0000000..eb51f06 --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Editor/DecoControllerEditor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2e684222976ee814a87b0406d2e2fc5e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-2-Coloring.unity b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-2-Coloring.unity index 8df186f..dd0b633 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-2-Coloring.unity +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-2-Coloring.unity @@ -1616,7 +1616,7 @@ MonoBehaviour: onValueChanged: m_PersistentCalls: m_Calls: [] - m_IsOn: 1 + m_IsOn: 0 --- !u!1 &137693517 GameObject: m_ObjectHideFlags: 0 @@ -6703,6 +6703,12 @@ RectTransform: m_AnchoredPosition: {x: -8, y: 0} m_SizeDelta: {x: -20.000006, y: -12} m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &554648556 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + m_PrefabInstance: {fileID: 7813574810305883449} + m_PrefabAsset: {fileID: 0} --- !u!1 &565946445 GameObject: m_ObjectHideFlags: 0 @@ -8116,7 +8122,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -3.2400055, y: 5} + m_AnchoredPosition: {x: -3.24, y: 18.8} m_SizeDelta: {x: 10, y: 18} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &676678157 @@ -8138,7 +8144,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + m_Font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} m_FontSize: 42 m_FontStyle: 1 m_BestFit: 0 @@ -8150,7 +8156,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: NO, GO BACK + m_Text: "\u4E0D, \u7EE7\u7EED\u7740\u8272" --- !u!222 &676678158 CanvasRenderer: m_ObjectHideFlags: 0 @@ -8171,7 +8177,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5d4111d72b538b544860d085f76e5ad8, type: 3} m_Name: m_EditorClassIdentifier: - language: 10 + language: 40 contexts: - language: 10 text: NO, GO BACK @@ -8412,7 +8418,7 @@ MonoBehaviour: onValueChanged: m_PersistentCalls: m_Calls: [] - m_IsOn: 0 + m_IsOn: 1 --- !u!1 &689453274 GameObject: m_ObjectHideFlags: 0 @@ -11360,11 +11366,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1752638942} - m_RootOrder: 2 + m_RootOrder: 3 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: 1, y: 39.6} + m_AnchoredPosition: {x: 1, y: 53.47} m_SizeDelta: {x: 1500, y: 700} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &971542334 @@ -11386,8 +11392,8 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} - m_FontSize: 64 + m_Font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} + m_FontSize: 63 m_FontStyle: 1 m_BestFit: 0 m_MinSize: 0 @@ -11397,15 +11403,8 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 'YOU ARE ABOUT TO LEAVE - - THE COLORING PAGE. - - - ARE YOU DONE WITH - - COLORING YOUR WORK?' + m_LineSpacing: 1.37 + m_Text: "\u60A8\u5373\u5C06\u79BB\u5F00\u7740\u8272\u9875\u9762\n\u79BB\u5F00\u540E\u5C06\u65E0\u6CD5\u8FD4\u56DE\u4FEE\u6539\n\u786E\u8BA4\u79BB\u5F00\u9875\u9762?" --- !u!222 &971542335 CanvasRenderer: m_ObjectHideFlags: 0 @@ -11426,7 +11425,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5d4111d72b538b544860d085f76e5ad8, type: 3} m_Name: m_EditorClassIdentifier: - language: 10 + language: 40 contexts: - language: 10 text: 'YOU ARE ABOUT TO LEAVE @@ -12087,7 +12086,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 17.4, y: 11.92} + m_AnchoredPosition: {x: 17.4, y: 21.34} m_SizeDelta: {x: 5, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1066516032 @@ -12109,8 +12108,8 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} - m_FontSize: 64 + m_Font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} + m_FontSize: 60 m_FontStyle: 1 m_BestFit: 0 m_MinSize: 2 @@ -12121,7 +12120,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: COMPLETE + m_Text: "\u5B8C\u6210" --- !u!222 &1066516033 CanvasRenderer: m_ObjectHideFlags: 0 @@ -12142,7 +12141,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5d4111d72b538b544860d085f76e5ad8, type: 3} m_Name: m_EditorClassIdentifier: - language: 10 + language: 40 contexts: - language: 10 text: COMPLETE @@ -13837,7 +13836,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1203294611 RectTransform: m_ObjectHideFlags: 0 @@ -16862,7 +16861,7 @@ RectTransform: m_Children: - {fileID: 676678156} m_Father: {fileID: 1752638942} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -17650,7 +17649,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -2, y: 8} + m_AnchoredPosition: {x: -2, y: 22.05} m_SizeDelta: {x: -17, y: 18} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1536546213 @@ -17672,8 +17671,8 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} - m_FontSize: 66 + m_Font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} + m_FontSize: 61 m_FontStyle: 1 m_BestFit: 0 m_MinSize: 7 @@ -17684,7 +17683,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: YES, PROCEED + m_Text: "\u662F\u7684, \u79BB\u5F00" --- !u!222 &1536546214 CanvasRenderer: m_ObjectHideFlags: 0 @@ -17705,7 +17704,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5d4111d72b538b544860d085f76e5ad8, type: 3} m_Name: m_EditorClassIdentifier: - language: 10 + language: 40 contexts: - language: 10 text: YES, PROCEED @@ -18393,11 +18392,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1752638942} - m_RootOrder: 1 + m_RootOrder: 2 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: 479.5} + m_AnchoredPosition: {x: 0, y: 498} m_SizeDelta: {x: 1146.1, y: 250} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1609881464 @@ -18412,7 +18411,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5d4111d72b538b544860d085f76e5ad8, type: 3} m_Name: m_EditorClassIdentifier: - language: 10 + language: 40 contexts: - language: 10 text: UPLOAD YOUR WORK @@ -18447,8 +18446,8 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} - m_FontSize: 78 + m_Font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} + m_FontSize: 68 m_FontStyle: 1 m_BestFit: 0 m_MinSize: 0 @@ -18458,8 +18457,8 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - m_LineSpacing: 2 - m_Text: UPLOAD YOUR WORK + m_LineSpacing: 0.9 + m_Text: "\u4F5C\u54C1\u4E0A\u4F20" --- !u!222 &1609881466 CanvasRenderer: m_ObjectHideFlags: 0 @@ -18645,7 +18644,7 @@ RectTransform: m_Children: - {fileID: 1536546212} m_Father: {fileID: 1752638942} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -20012,6 +20011,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 840849829} + - {fileID: 554648556} - {fileID: 1609881463} - {fileID: 971542333} - {fileID: 1503600939} @@ -21686,7 +21686,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1899362682 RectTransform: m_ObjectHideFlags: 0 @@ -24742,12 +24742,12 @@ PrefabInstance: - target: {fileID: 8757555787750090136, guid: 8fd553587c443f141825bdcd07858522, type: 3} propertyPath: m_AnchoredPosition.y - value: 100 + value: 105.8 objectReference: {fileID: 0} - target: {fileID: 8757555787750090136, guid: 8fd553587c443f141825bdcd07858522, type: 3} propertyPath: m_AnchoredPosition.x - value: -49.4 + value: -23.78 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8fd553587c443f141825bdcd07858522, type: 3} @@ -24802,3 +24802,122 @@ MonoBehaviour: onEnd: m_PersistentCalls: m_Calls: [] +--- !u!1001 &7813574810305883449 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1752638942} + m_Modifications: + - target: {fileID: 7813574810859450066, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_Name + value: Deco + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 491 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_SizeDelta.x + value: 1500 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_SizeDelta.y + value: 128 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3d5873e12c1c4454fa316039b35a0d06, type: 3} diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-3-Signature.unity b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-3-Signature.unity index a3c9ba6..6b9d3b3 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-3-Signature.unity +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-3-Signature.unity @@ -1484,7 +1484,7 @@ RectTransform: m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} m_Children: [] m_Father: {fileID: 1731371877} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2051,7 +2051,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &140207964 RectTransform: m_ObjectHideFlags: 0 @@ -3205,7 +3205,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1731371877} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5214,7 +5214,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1977272186} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5631,7 +5631,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1731371877} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -6781,7 +6781,7 @@ RectTransform: m_Children: - {fileID: 2065718640} m_Father: {fileID: 1731371877} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -7178,7 +7178,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &396771689 RectTransform: m_ObjectHideFlags: 0 @@ -7380,7 +7380,7 @@ RectTransform: m_Children: - {fileID: 1009952123} m_Father: {fileID: 1977272186} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -10860,6 +10860,156 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 550397274} m_CullTransparentMesh: 0 +--- !u!1001 &562187262 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1731371877} + m_Modifications: + - target: {fileID: 7813574810859450066, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_Name + value: Deco + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -734 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_SizeDelta.x + value: 1500 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_SizeDelta.y + value: 128 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450068, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: contexts.Array.data[1].spacing + value: 356 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450068, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: language + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450068, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: contexts.Array.data[0].spacing + value: 661.8 + objectReference: {fileID: 0} + - target: {fileID: 7813574809676915043, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -356 + objectReference: {fileID: 0} + - target: {fileID: 7813574810212987442, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 356 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3d5873e12c1c4454fa316039b35a0d06, type: 3} +--- !u!224 &562187263 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + m_PrefabInstance: {fileID: 562187262} + m_PrefabAsset: {fileID: 0} --- !u!1 &565946445 GameObject: m_ObjectHideFlags: 0 @@ -12070,6 +12220,156 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_IsOn: 0 +--- !u!1001 &632285209 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1977272186} + m_Modifications: + - target: {fileID: 7813574810859450066, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_Name + value: Deco + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -97 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_SizeDelta.x + value: 1500 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_SizeDelta.y + value: 128 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450068, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: contexts.Array.data[1].spacing + value: 392.1 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450068, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: language + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450068, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: contexts.Array.data[0].spacing + value: 600.8 + objectReference: {fileID: 0} + - target: {fileID: 7813574809676915043, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -392.1 + objectReference: {fileID: 0} + - target: {fileID: 7813574810212987442, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 392.1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3d5873e12c1c4454fa316039b35a0d06, type: 3} +--- !u!224 &632285210 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + m_PrefabInstance: {fileID: 632285209} + m_PrefabAsset: {fileID: 0} --- !u!1 &634319957 GameObject: m_ObjectHideFlags: 0 @@ -13375,7 +13675,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &708554734 RectTransform: m_ObjectHideFlags: 0 @@ -17035,7 +17335,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1977272186} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -20369,7 +20669,7 @@ RectTransform: - {fileID: 396771689} - {fileID: 708554734} m_Father: {fileID: 1977272186} - m_RootOrder: 13 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -21173,7 +21473,7 @@ PrefabInstance: - target: {fileID: 1792381460007772463, guid: 8fd553587c443f141825bdcd07858522, type: 3} propertyPath: m_RootOrder - value: 10 + value: 11 objectReference: {fileID: 0} - target: {fileID: 1792381460007772463, guid: 8fd553587c443f141825bdcd07858522, type: 3} @@ -23352,7 +23652,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1977272186} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -26944,7 +27244,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1977272186} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -29684,6 +29984,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1913412844} + - {fileID: 562187263} - {fileID: 2050485136} - {fileID: 225586103} - {fileID: 332208530} @@ -29691,7 +29992,7 @@ RectTransform: - {fileID: 386909061} - {fileID: 84310174} m_Father: {fileID: 1977272186} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -30592,7 +30893,7 @@ RectTransform: m_Children: - {fileID: 1579864890} m_Father: {fileID: 1731371877} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -34468,6 +34769,7 @@ RectTransform: - {fileID: 232943980} - {fileID: 426768724} - {fileID: 339249792} + - {fileID: 632285210} - {fileID: 1331178686} - {fileID: 1572489595} - {fileID: 895392842} @@ -34833,7 +35135,7 @@ RectTransform: m_Children: - {fileID: 1066516031} m_Father: {fileID: 1977272186} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -35439,7 +35741,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2045515095 RectTransform: m_ObjectHideFlags: 0 @@ -35523,7 +35825,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1731371877} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-5-Postcard.unity b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-5-Postcard.unity index 64af8f8..09e98a6 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-5-Postcard.unity +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-5-Postcard.unity @@ -614,7 +614,7 @@ RectTransform: m_Children: - {fileID: 892526981} m_Father: {fileID: 746257130} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -832,7 +832,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &510291185 RectTransform: m_ObjectHideFlags: 0 @@ -1014,7 +1014,7 @@ RectTransform: - {fileID: 2144124202} - {fileID: 510291185} m_Father: {fileID: 746257130} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1217,6 +1217,7 @@ RectTransform: - {fileID: 324924813} - {fileID: 239676772} - {fileID: 1266193605} + - {fileID: 982635294} - {fileID: 1262648296} - {fileID: 1117073449} - {fileID: 481181421} @@ -1552,6 +1553,156 @@ MonoBehaviour: lineSpacing: 1 baseline: 1.74 baseX: 0 +--- !u!1001 &982635293 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 746257130} + m_Modifications: + - target: {fileID: 7813574810859450066, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_Name + value: Deco + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -629 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_SizeDelta.x + value: 1500 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_SizeDelta.y + value: 128 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450068, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: contexts.Array.data[1].spacing + value: 333.4 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450068, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: language + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 7813574810859450068, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: contexts.Array.data[0].spacing + value: 540 + objectReference: {fileID: 0} + - target: {fileID: 7813574809676915043, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -333.4 + objectReference: {fileID: 0} + - target: {fileID: 7813574810212987442, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 333.4 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3d5873e12c1c4454fa316039b35a0d06, type: 3} +--- !u!224 &982635294 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + m_PrefabInstance: {fileID: 982635293} + m_PrefabAsset: {fileID: 0} --- !u!1 &1016033624 GameObject: m_ObjectHideFlags: 0 @@ -1663,7 +1814,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 746257130} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1741,7 +1892,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 746257130} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1851,7 +2002,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: -14.4, y: -626.33} + m_AnchoredPosition: {x: 0.05, y: -626.33} m_SizeDelta: {x: 938.7, y: 250} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1266193606 @@ -1881,7 +2032,7 @@ MonoBehaviour: fontSize: 66 lineSpacing: 1.1 baseline: -626.33 - baseX: -14.4 + baseX: 0.05 --- !u!114 &1266193607 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2320,6 +2471,7 @@ GameObject: - component: {fileID: 1855157457} - component: {fileID: 1855157456} - component: {fileID: 1855157455} + - component: {fileID: 1855157458} - component: {fileID: 1855157454} m_Layer: 5 m_Name: PostcardScene @@ -2340,7 +2492,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 746257130} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2354,13 +2506,13 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1855157452} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: ec9954160510f014684e5bfe8e8d06be, type: 3} m_Name: m_EditorClassIdentifier: fading: 0.5 - duration: 30 + duration: 150 sceneName: Main-1-Intro onCountdown: m_PersistentCalls: @@ -2415,6 +2567,26 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1855157452} m_CullTransparentMesh: 0 +--- !u!114 &1855157458 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1855157452} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 88495ef9abd10e74ba4e033996e763ec, type: 3} + m_Name: + m_EditorClassIdentifier: + duration: 300 + scenePath: Assets/Main-1-Intro.unity + onCountdown: + m_PersistentCalls: + m_Calls: [] + onLoadScene: + m_PersistentCalls: + m_Calls: [] --- !u!1 &2144124201 GameObject: m_ObjectHideFlags: 0 @@ -2432,7 +2604,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2144124202 RectTransform: m_ObjectHideFlags: 0 diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Prefab.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Prefab.meta new file mode 100644 index 0000000..da6c37c --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d45216d5dd48bec4ebb63cbb3be040fd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Prefab/Deco.prefab b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Prefab/Deco.prefab new file mode 100644 index 0000000..a654a92 --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Prefab/Deco.prefab @@ -0,0 +1,204 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7813574809676915040 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7813574809676915043} + - component: {fileID: 7813574809676915045} + - component: {fileID: 7813574809676915042} + m_Layer: 5 + m_Name: Left + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7813574809676915043 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7813574809676915040} + 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: 7813574810859450069} + m_RootOrder: 0 + 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: -266.8, y: 0} + m_SizeDelta: {x: 183, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7813574809676915045 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7813574809676915040} + m_CullTransparentMesh: 0 +--- !u!114 &7813574809676915042 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7813574809676915040} + 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: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: af545bff1ab5d8b4484a4107ec5ebc11, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!1 &7813574810212987443 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7813574810212987442} + - component: {fileID: 7813574810212987444} + - component: {fileID: 7813574810212987445} + m_Layer: 5 + m_Name: Right + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7813574810212987442 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7813574810212987443} + 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: 7813574810859450069} + m_RootOrder: 1 + 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: 266.8, y: 0} + m_SizeDelta: {x: 184, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7813574810212987444 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7813574810212987443} + m_CullTransparentMesh: 0 +--- !u!114 &7813574810212987445 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7813574810212987443} + 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: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: ccf1e223ebfaa41428c68bdad7ef8a48, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!1 &7813574810859450066 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7813574810859450069} + - component: {fileID: 7813574810859450068} + m_Layer: 5 + m_Name: Deco + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7813574810859450069 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7813574810859450066} + 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: 7813574809676915043} + - {fileID: 7813574810212987442} + m_Father: {fileID: 0} + m_RootOrder: 0 + 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: 491} + m_SizeDelta: {x: 1500, y: 128} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7813574810859450068 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7813574810859450066} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c95cf36dfc232be49a9bd4490e2df2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + language: 40 + contexts: + - language: 10 + spacing: 542.9 + - language: 40 + spacing: 266.8 + leftDecoRt: {fileID: 7813574809676915043} + rightDecoRt: {fileID: 7813574810212987442} diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Prefab/Deco.prefab.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Prefab/Deco.prefab.meta new file mode 100644 index 0000000..58efb2e --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Prefab/Deco.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3d5873e12c1c4454fa316039b35a0d06 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/BrushManager.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/BrushManager.cs index 797969b..94b2aa1 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/BrushManager.cs +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/BrushManager.cs @@ -21,7 +21,7 @@ namespace UltraCombos.Coloring { opt.onValueChanged.AddListener(OnOptionChanged); } - SetBrush(brushes.Count - 1); + SetBrush(0); } private void Update() diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/DecoController.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/DecoController.cs new file mode 100644 index 0000000..0ce8fbf --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/DecoController.cs @@ -0,0 +1,65 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UltraCombos.Multilingual; + +namespace UltraCombos.Frozen.RoyalGallery +{ + [ExecuteInEditMode] + public class DecoController : MonoBehaviour + { + public SystemLanguage language = SystemLanguage.English; + [System.Serializable] + public class Context + { + public SystemLanguage language = SystemLanguage.English; + public float spacing = 0.0f; + } + + public List contexts = new List(); + + public RectTransform leftDecoRt; + public RectTransform rightDecoRt; + // Start is called before the first frame update + void Start() + { + RectTransform[] rts = GetComponentsInChildren(false); + leftDecoRt = rts[1]; + rightDecoRt = rts[2]; + + language = Core.Instance.language; + Core.Instance.onLanguageChanged += OnLanguageChanaged; + } + + // Update is called once per frame + void Update() + { + if (Application.isPlaying) + { + language = Core.Instance.language; + } + + Context ctx = null; + foreach (var c in contexts) + { + if (c.language == language) + { + ctx = c; + break; + } + } + if (ctx == null) + { + return; + } + + leftDecoRt.anchoredPosition = new Vector2(-ctx.spacing, leftDecoRt.anchoredPosition.y); + rightDecoRt.anchoredPosition = new Vector2(ctx.spacing, rightDecoRt.anchoredPosition.y); + } + + void OnLanguageChanaged(SystemLanguage language) + { + this.language = language; + } + } +} diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/DecoController.cs.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/DecoController.cs.meta new file mode 100644 index 0000000..21e6450 --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/DecoController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c95cf36dfc232be49a9bd4490e2df2a0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: