diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-1-Intro.unity b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-1-Intro.unity index d6035a4..5715695 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-1-Intro.unity +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-1-Intro.unity @@ -2766,6 +2766,7 @@ MonoBehaviour: isGetPageBySelf: 1 isEnableSceneTester: 0 targetIndex: -1 + isTaiwanNo1: 0 --- !u!1 &1663065344 GameObject: m_ObjectHideFlags: 0 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 e54b95e..2faed6c 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 @@ -944,7 +944,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &52939690 RectTransform: m_ObjectHideFlags: 0 @@ -961,8 +961,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 8, y: 0} - m_SizeDelta: {x: 10, y: 0} + m_AnchoredPosition: {x: 0.002380371, y: 344.68} + m_SizeDelta: {x: -0.004760742, y: 677.73236} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &52939691 MonoBehaviour: @@ -983,7 +983,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fb0667aac6d75ef4ebbf443e4a943339, type: 3} + m_Sprite: {fileID: 21300000, guid: d9b94dd683ef0f34bb7101dba57b114d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1600,7 +1600,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &135368800 RectTransform: m_ObjectHideFlags: 0 @@ -6298,8 +6298,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: -14, y: -123} - m_SizeDelta: {x: 720, y: 151.3} + m_AnchoredPosition: {x: -14, y: -48.3} + m_SizeDelta: {x: 151.3, y: 684.2241} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &522603592 MonoBehaviour: @@ -6343,11 +6343,11 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1255260411} m_FillRect: {fileID: 52939690} m_HandleRect: {fileID: 1255260410} - m_Direction: 0 + m_Direction: 2 m_MinValue: 0 m_MaxValue: 1 m_WholeNumbers: 0 - m_Value: 0.638 + m_Value: 1 m_OnValueChanged: m_PersistentCalls: m_Calls: [] @@ -6912,10 +6912,10 @@ RectTransform: m_Father: {fileID: 522603591} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: -8, y: 0} - m_SizeDelta: {x: -20.000006, y: -12} + 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 &554648556 stripped RectTransform: @@ -8374,7 +8374,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.24, y: 18.8} + m_AnchoredPosition: {x: -3.2400055, y: 5} m_SizeDelta: {x: 10, y: 18} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &676678157 @@ -8397,7 +8397,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} + m_Font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} m_FontSize: 42 m_FontStyle: 1 m_BestFit: 0 @@ -8409,7 +8409,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u4E0D, \u7EE7\u7EED\u7740\u8272" + m_Text: NO, GO BACK --- !u!222 &676678158 CanvasRenderer: m_ObjectHideFlags: 0 @@ -8430,7 +8430,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5d4111d72b538b544860d085f76e5ad8, type: 3} m_Name: m_EditorClassIdentifier: - language: 40 + language: 10 contexts: - language: 10 text: NO, GO BACK @@ -8446,6 +8446,13 @@ MonoBehaviour: lineSpacing: 1 baseline: 18.8 baseX: -3.24 + - language: 41 + text: "\u4E0D, \u7E7C\u7E8C\u8457\u8272" + font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} + fontSize: 42 + lineSpacing: 1 + baseline: 18.8 + baseX: -3.24 --- !u!1 &678917551 GameObject: m_ObjectHideFlags: 0 @@ -8610,7 +8617,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &688895988 RectTransform: m_ObjectHideFlags: 0 @@ -8679,113 +8686,6 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_IsOn: 1 ---- !u!1 &689453274 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 689453275} - - component: {fileID: 689453278} - - component: {fileID: 689453277} - - component: {fileID: 689453276} - m_Layer: 5 - m_Name: color-finish (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &689453275 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 689453274} - m_LocalRotation: {x: 0, y: 0, z: 0.06975647, w: 0.9975641} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1997411410} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 8} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 9.299988, y: -7} - m_SizeDelta: {x: 5, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &689453276 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 689453274} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5d4111d72b538b544860d085f76e5ad8, type: 3} - m_Name: - m_EditorClassIdentifier: - language: 10 - contexts: - - language: 10 - text: DONE - font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} - fontSize: 74 - lineSpacing: 1 - baseline: -7 - baseX: 0 - - language: 40 - text: "\u5B8C\u6210" - font: {fileID: 12800000, guid: 1f940ec663706444798b9201d8ddedec, type: 3} - fontSize: 70 - lineSpacing: 1 - baseline: 4.2 - baseX: 0 ---- !u!114 &689453277 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 689453274} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.11764706, g: 0.11764706, b: 0.7411765, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} - m_FontSize: 74 - m_FontStyle: 2 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 86 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: DONE ---- !u!222 &689453278 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 689453274} - m_CullTransparentMesh: 0 --- !u!1 &693507767 GameObject: m_ObjectHideFlags: 0 @@ -11850,7 +11750,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: 1, y: 53.47} + m_AnchoredPosition: {x: 1, y: 39.6} m_SizeDelta: {x: 1500, y: 700} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &971542334 @@ -11873,8 +11773,8 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} - m_FontSize: 63 + m_Font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + m_FontSize: 64 m_FontStyle: 1 m_BestFit: 0 m_MinSize: 0 @@ -11884,8 +11784,16 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - 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?" + m_LineSpacing: 1 + m_Text: 'YOU ARE ABOUT TO LEAVE + + THE COLORING PAGE. + + + ARE YOU DONE WITH + + COLORING + YOUR WORK?' --- !u!222 &971542335 CanvasRenderer: m_ObjectHideFlags: 0 @@ -11906,7 +11814,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5d4111d72b538b544860d085f76e5ad8, type: 3} m_Name: m_EditorClassIdentifier: - language: 40 + language: 10 contexts: - language: 10 text: 'YOU ARE ABOUT TO LEAVE @@ -11930,6 +11838,13 @@ MonoBehaviour: lineSpacing: 1.37 baseline: 53.47 baseX: 1 + - language: 41 + text: "\u60A8\u5373\u5C07\u96E2\u958B\u8457\u8272\u9801\u9762\r\n\u96E2\u958B\u5F8C\u5C07\u7121\u6CD5\u8FD4\u56DE\u4FEE\u6539\r\n\u78BA\u8A8D\u96E2\u958B\u9801\u9762?" + font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} + fontSize: 63 + lineSpacing: 1.37 + baseline: 53.47 + baseX: 1 --- !u!1 &977108189 GameObject: m_ObjectHideFlags: 0 @@ -12633,11 +12548,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1997411410} - m_RootOrder: 1 + 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: 17.4, y: 21.34} + m_AnchoredPosition: {x: 17.4, y: 11.92} m_SizeDelta: {x: 5, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1066516032 @@ -12660,8 +12575,8 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} - m_FontSize: 60 + m_Font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + m_FontSize: 64 m_FontStyle: 1 m_BestFit: 0 m_MinSize: 2 @@ -12672,7 +12587,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5B8C\u6210" + m_Text: COMPLETE --- !u!222 &1066516033 CanvasRenderer: m_ObjectHideFlags: 0 @@ -12693,7 +12608,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5d4111d72b538b544860d085f76e5ad8, type: 3} m_Name: m_EditorClassIdentifier: - language: 40 + language: 10 contexts: - language: 10 text: COMPLETE @@ -12709,6 +12624,13 @@ MonoBehaviour: lineSpacing: 1 baseline: 21.34 baseX: 17.4 + - language: 41 + text: "\u5B8C\u6210" + font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} + fontSize: 60 + lineSpacing: 1 + baseline: 21.34 + baseX: 17.4 --- !u!1 &1075056300 GameObject: m_ObjectHideFlags: 0 @@ -13152,7 +13074,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1106246004 RectTransform: m_ObjectHideFlags: 0 @@ -14773,8 +14695,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 17, y: 20.5} - m_SizeDelta: {x: 121, y: 31} + m_AnchoredPosition: {x: 16.778, y: 0} + m_SizeDelta: {x: -33.55561, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1255260411 MonoBehaviour: @@ -14795,7 +14717,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f73539be384016649a759fd92be46d4c, type: 3} + m_Sprite: {fileID: 21300000, guid: 116756e8974435b41bbcec152bd6d293, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -17159,8 +17081,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -2522} - m_SizeDelta: {x: 2048, y: 210} + m_AnchoredPosition: {x: -1796.8, y: -1234.8} + m_SizeDelta: {x: 251.19238, y: 1497.1582} m_Pivot: {x: 1, y: 1} --- !u!114 &1461265347 MonoBehaviour: @@ -17181,7 +17103,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: cd02fae6849ac9f419ef2f00a7610220, type: 3} + m_Sprite: {fileID: 21300000, guid: d80d4f90d7a6a0f4785168b74c9e9082, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -18436,7 +18358,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: 22.05} + m_AnchoredPosition: {x: -2, y: 8} m_SizeDelta: {x: -17, y: 18} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1536546213 @@ -18459,8 +18381,8 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} - m_FontSize: 61 + m_Font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + m_FontSize: 66 m_FontStyle: 1 m_BestFit: 0 m_MinSize: 7 @@ -18471,7 +18393,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u662F\u7684, \u79BB\u5F00" + m_Text: YES, PROCEED --- !u!222 &1536546214 CanvasRenderer: m_ObjectHideFlags: 0 @@ -18492,7 +18414,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5d4111d72b538b544860d085f76e5ad8, type: 3} m_Name: m_EditorClassIdentifier: - language: 40 + language: 10 contexts: - language: 10 text: YES, PROCEED @@ -18508,6 +18430,13 @@ MonoBehaviour: lineSpacing: 1 baseline: 22.05 baseX: -2 + - language: 41 + text: "\u662F\u7684, \u96E2\u958B" + font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} + fontSize: 61 + lineSpacing: 1 + baseline: 22.05 + baseX: -2 --- !u!1 &1548261323 GameObject: m_ObjectHideFlags: 0 @@ -19203,7 +19132,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: 0, y: 498} + m_AnchoredPosition: {x: 0, y: 479.5} m_SizeDelta: {x: 1146.1, y: 250} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1609881464 @@ -19218,7 +19147,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5d4111d72b538b544860d085f76e5ad8, type: 3} m_Name: m_EditorClassIdentifier: - language: 40 + language: 10 contexts: - language: 10 text: UPLOAD YOUR WORK @@ -19234,6 +19163,13 @@ MonoBehaviour: lineSpacing: 0.9 baseline: 498 baseX: 0 + - language: 41 + text: "\u4F5C\u54C1\u4E0A\u50B3" + font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} + fontSize: 68 + lineSpacing: 0.9 + baseline: 498 + baseX: 0 --- !u!114 &1609881465 MonoBehaviour: m_ObjectHideFlags: 0 @@ -19254,8 +19190,8 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} - m_FontSize: 68 + m_Font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + m_FontSize: 78 m_FontStyle: 1 m_BestFit: 0 m_MinSize: 0 @@ -19265,8 +19201,8 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - m_LineSpacing: 0.9 - m_Text: "\u4F5C\u54C1\u4E0A\u4F20" + m_LineSpacing: 2 + m_Text: UPLOAD YOUR WORK --- !u!222 &1609881466 CanvasRenderer: m_ObjectHideFlags: 0 @@ -20573,8 +20509,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: 185} - m_SizeDelta: {x: 147, y: 147} + m_AnchoredPosition: {x: 111, y: 0} + m_SizeDelta: {x: 97, y: 97} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1718155448 MonoBehaviour: @@ -20595,7 +20531,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 83bc60f7222edd54aa45aed67962d766, type: 3} + m_Sprite: {fileID: 21300000, guid: 044e497877388724e8569f5c6a82ea8a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -20648,8 +20584,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: 561, y: -1150} - m_SizeDelta: {x: 512, y: 512} + m_AnchoredPosition: {x: -898.4, y: -333.4} + m_SizeDelta: {x: 512, y: 877.15857} m_Pivot: {x: 0.5, y: 0.5} --- !u!225 &1719121839 CanvasGroup: @@ -20679,7 +20615,7 @@ MonoBehaviour: minSize: 0.2 colorImage: {fileID: 1718155448} pointer: {fileID: 662585646} - lineConfig: {fileID: 1798368799305340155} + lineConfig: {fileID: 986129840} --- !u!1 &1727954072 GameObject: m_ObjectHideFlags: 0 @@ -22862,8 +22798,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 362, y: 85} - m_SizeDelta: {x: 720, y: 89} + m_AnchoredPosition: {x: 75.697, y: 391.5} + m_SizeDelta: {x: 101, y: 783} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1925778845 MonoBehaviour: @@ -22884,7 +22820,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fb0667aac6d75ef4ebbf443e4a943339, type: 3} + m_Sprite: {fileID: 21300000, guid: d9b94dd683ef0f34bb7101dba57b114d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -23884,7 +23820,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1989158663 RectTransform: m_ObjectHideFlags: 0 @@ -23923,7 +23859,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: f99a429de88892347aac4ef7bae4eadb, type: 3} + m_Texture: {fileID: 2800000, guid: ff5c612fb4ebe9e489a3d20422d31d35, type: 3} m_UVRect: serializedVersion: 2 x: 0 @@ -23969,7 +23905,6 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 689453275} - {fileID: 1066516031} m_Father: {fileID: 1977272186} m_RootOrder: 5 @@ -24425,9 +24360,9 @@ RectTransform: m_RootOrder: 2 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: 58} - m_SizeDelta: {x: -20, y: 32} + m_AnchorMax: {x: 1, y: 0.9868464} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2047961710 GameObject: @@ -25721,15 +25656,20 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 2525503451231538874, guid: 8fd553587c443f141825bdcd07858522, + type: 3} + propertyPath: language + value: 10 + objectReference: {fileID: 0} - target: {fileID: 8757555787750090136, guid: 8fd553587c443f141825bdcd07858522, type: 3} propertyPath: m_AnchoredPosition.y - value: 105.8 + value: 100 objectReference: {fileID: 0} - target: {fileID: 8757555787750090136, guid: 8fd553587c443f141825bdcd07858522, type: 3} propertyPath: m_AnchoredPosition.x - value: -23.78 + value: -49.4 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8fd553587c443f141825bdcd07858522, type: 3} @@ -25791,11 +25731,26 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1752638942} m_Modifications: + - target: {fileID: 7813574809676915043, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -542.9 + objectReference: {fileID: 0} + - target: {fileID: 7813574810212987442, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 542.9 + objectReference: {fileID: 0} - target: {fileID: 7813574810859450066, guid: 3d5873e12c1c4454fa316039b35a0d06, type: 3} propertyPath: m_Name value: Deco objectReference: {fileID: 0} + - target: {fileID: 7813574810859450068, guid: 3d5873e12c1c4454fa316039b35a0d06, + type: 3} + propertyPath: language + value: 10 + objectReference: {fileID: 0} - target: {fileID: 7813574810859450069, guid: 3d5873e12c1c4454fa316039b35a0d06, type: 3} propertyPath: m_LocalPosition.x 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 77d6a38..c8d574d 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 @@ -3386,7 +3386,14 @@ MonoBehaviour: baseline: -745.3 baseX: -2 - language: 40 - text: "\u7B7E\u540D\u6253\u5370\u9884\u89C8" + text: "\u7B7E\u540D\u9884\u89C8" + font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} + fontSize: 76 + lineSpacing: 0.9 + baseline: -731.1 + baseX: -7.1 + - language: 41 + text: "\u7C3D\u540D\u9810\u89BD" font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} fontSize: 76 lineSpacing: 0.9 @@ -6254,6 +6261,13 @@ MonoBehaviour: lineSpacing: 1 baseline: 1276.34 baseX: -6 + - language: 41 + text: "\u70BA\u4F60\u7684\u4F5C\u54C1\u7C3D\u540D" + font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} + fontSize: 76 + lineSpacing: 1 + baseline: 1276.34 + baseX: -6 --- !u!1 &340872383 GameObject: m_ObjectHideFlags: 0 @@ -11224,12 +11238,12 @@ PrefabInstance: - target: {fileID: 7813574809676915043, guid: 3d5873e12c1c4454fa316039b35a0d06, type: 3} propertyPath: m_AnchoredPosition.x - value: -356 + value: -661.8 objectReference: {fileID: 0} - target: {fileID: 7813574810212987442, guid: 3d5873e12c1c4454fa316039b35a0d06, type: 3} propertyPath: m_AnchoredPosition.x - value: 356 + value: 661.8 objectReference: {fileID: 0} - target: {fileID: 7813574810859450066, guid: 3d5873e12c1c4454fa316039b35a0d06, type: 3} @@ -12615,12 +12629,12 @@ PrefabInstance: - target: {fileID: 7813574809676915043, guid: 3d5873e12c1c4454fa316039b35a0d06, type: 3} propertyPath: m_AnchoredPosition.x - value: -392.1 + value: -600.8 objectReference: {fileID: 0} - target: {fileID: 7813574810212987442, guid: 3d5873e12c1c4454fa316039b35a0d06, type: 3} propertyPath: m_AnchoredPosition.x - value: 392.1 + value: 600.8 objectReference: {fileID: 0} - target: {fileID: 7813574810859450066, guid: 3d5873e12c1c4454fa316039b35a0d06, type: 3} @@ -20410,6 +20424,13 @@ MonoBehaviour: lineSpacing: 1 baseline: 20.91 baseX: -2.1 + - language: 41 + text: "\u5B8C\u6210" + font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} + fontSize: 60 + lineSpacing: 1 + baseline: 20.91 + baseX: -2.1 --- !u!1 &1080941436 GameObject: m_ObjectHideFlags: 0 @@ -28315,13 +28336,20 @@ MonoBehaviour: lineSpacing: 1 baseline: 25.54 baseX: 1.3599854 - - language: 40 + - language: 41 text: "\u91CD\u7B7E" font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} fontSize: 42 lineSpacing: 1 baseline: 36.18 baseX: 1.3599854 + - language: 40 + text: "\u91CD\u7C3D" + font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} + fontSize: 42 + lineSpacing: 1 + baseline: 36.18 + baseX: 1.3599854 --- !u!114 &1579864892 MonoBehaviour: m_ObjectHideFlags: 0 @@ -37355,6 +37383,13 @@ MonoBehaviour: lineSpacing: 1 baseline: 16.49 baseX: -1.66 + - language: 41 + text: "\u78BA\u8A8D" + font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} + fontSize: 60 + lineSpacing: 1 + baseline: 16.49 + baseX: -1.66 --- !u!114 &2065718642 MonoBehaviour: m_ObjectHideFlags: 0 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 2c59d0d..661ff01 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 @@ -216,6 +216,11 @@ PrefabInstance: propertyPath: language value: 10 objectReference: {fileID: 0} + - target: {fileID: 1189168522907383256, guid: da961c31106ff5949974f5e38c4761f7, + type: 3} + propertyPath: isTaiwanNo1 + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1189168522907383257, guid: da961c31106ff5949974f5e38c4761f7, type: 3} propertyPath: m_Name @@ -385,6 +390,13 @@ MonoBehaviour: lineSpacing: 1.1 baseline: -1024.81 baseX: 0 + - language: 41 + text: "\u8ACB\u8A18\u4E0B\u60A8\u7684\u6253\u5370\u78BC\uFF0C\u60A8\u53EF\u4EE5\u5728\u6253\u5370\u6A5F\u53F0\u8655\u8CFC\u8CB7\u60A8\u7684\u4F5C\u54C1\u3002" + font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} + fontSize: 34 + lineSpacing: 1.1 + baseline: -1024.81 + baseX: 0 --- !u!1 &324924812 GameObject: m_ObjectHideFlags: 0 @@ -1578,6 +1590,13 @@ MonoBehaviour: lineSpacing: 1 baseline: 1.74 baseX: 0 + - language: 41 + text: "\u78BA\u8A8D" + font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} + fontSize: 42 + lineSpacing: 1 + baseline: 1.74 + baseX: 0 --- !u!1001 &982635293 PrefabInstance: m_ObjectHideFlags: 0 @@ -1958,6 +1977,13 @@ MonoBehaviour: lineSpacing: 1.1 baseline: -749.4 baseX: -573.4 + - language: 41 + text: "\u6253\u5370\u78BC" + font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} + fontSize: 36 + lineSpacing: 1.1 + baseline: -749.4 + baseX: -573.4 --- !u!114 &1262648298 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2065,6 +2091,13 @@ MonoBehaviour: lineSpacing: 1.1 baseline: -626.33 baseX: 0.05 + - language: 41 + text: "\u4F5C\u54C1\u4E0A\u50B3\u5B8C\u6210" + font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} + fontSize: 66 + lineSpacing: 1.1 + baseline: -626.33 + baseX: 0.05 --- !u!114 &1266193607 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-6-SelectChar.unity b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-6-SelectChar.unity index 4a2b03b..f42af45 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-6-SelectChar.unity +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-6-SelectChar.unity @@ -1471,11 +1471,11 @@ RectTransform: m_Children: - {fileID: 283365301} m_Father: {fileID: 1265878379} - m_RootOrder: 5 + 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} - m_AnchoredPosition: {x: -0.000024188, y: -194} + m_AnchoredPosition: {x: 0.99998, y: -181} m_SizeDelta: {x: 631.7621, y: 148.61008} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1099005198 @@ -1578,7 +1578,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 17daf52c9a589564895017d386164fef, type: 3} + m_Sprite: {fileID: 21300000, guid: 893aa78ee71d8f245bb0222c07ef0717, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1660,7 +1660,6 @@ RectTransform: - {fileID: 1830099066} - {fileID: 2056529531} - {fileID: 1380585849} - - {fileID: 1432955380} - {fileID: 1623261227} - {fileID: 1099005197} m_Father: {fileID: 1057429904} @@ -1977,7 +1976,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: 1, y: 117.33} + m_AnchoredPosition: {x: 1, y: 120.35} m_SizeDelta: {x: 606.9973, y: 490.41785} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1380585850 @@ -2001,7 +2000,7 @@ MonoBehaviour: font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} fontSize: 50 lineSpacing: 1.45 - baseline: 117.33 + baseline: 120.35 baseX: 1 - language: 40 text: "\u9078\u64C7\u6B64\u5F35\u756B\u7D19\u6A23\u5F0F\n\u4E26\u958B\u59CB\u8457\u8272\uFF1F" @@ -2060,77 +2059,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1380585848} m_CullTransparentMesh: 0 ---- !u!1 &1432955379 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1432955380} - - component: {fileID: 1432955382} - - component: {fileID: 1432955381} - m_Layer: 5 - m_Name: ........ - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1432955380 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1432955379} - 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: 1265878379} - 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: 0, y: 0} - m_SizeDelta: {x: 742, y: 1038} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1432955381 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1432955379} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 0} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!222 &1432955382 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1432955379} - m_CullTransparentMesh: 0 --- !u!1 &1533545346 GameObject: m_ObjectHideFlags: 0 @@ -2373,7 +2301,7 @@ RectTransform: m_Children: - {fileID: 272192099} m_Father: {fileID: 1265878379} - m_RootOrder: 4 + 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} @@ -2669,7 +2597,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1977107979 RectTransform: m_ObjectHideFlags: 0 @@ -2757,8 +2685,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: 0} - m_SizeDelta: {x: 742, y: 1038} + m_AnchoredPosition: {x: 1.52, y: 138.3} + m_SizeDelta: {x: 213.75195, y: 294.13403} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2056529532 MonoBehaviour: @@ -2773,13 +2701,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 79d629598357e9242b854afa75cb6fd9, type: 3} m_UVRect: serializedVersion: 2 x: 0 @@ -2811,7 +2739,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2111310094 RectTransform: m_ObjectHideFlags: 0 diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Asset/RadialClock.prefab b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Asset/RadialClock.prefab index 65040c7..a27bacf 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Asset/RadialClock.prefab +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Asset/RadialClock.prefab @@ -71,12 +71,13 @@ MonoBehaviour: m_GameObject: {fileID: 2000318231216149527} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.16862746, g: 0.23921569, b: 0.32156864, a: 0} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -153,12 +154,13 @@ MonoBehaviour: m_GameObject: {fileID: 2000896897870920853} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.84313726, g: 0.7529412, b: 0.52156866, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -230,12 +232,13 @@ MonoBehaviour: m_GameObject: {fileID: 2001780478511426867} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.84313726, g: 0.7529412, b: 0.52156866, a: 0} m_RaycastTarget: 0 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -248,6 +251,7 @@ MonoBehaviour: m_FillClockwise: 0 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &4059456127422672775 GameObject: m_ObjectHideFlags: 0 @@ -303,12 +307,13 @@ MonoBehaviour: m_GameObject: {fileID: 4059456127422672775} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.84313726, g: 0.7529412, b: 0.52156866, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -354,3 +359,10 @@ MonoBehaviour: lineSpacing: 0.9 baseline: 105.8 baseX: -23.78 + - language: 41 + text: "\u64CD\u4F5C\u6642\u9593" + font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} + fontSize: 42 + lineSpacing: 0.9 + baseline: 105.8 + baseX: -23.78 diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/AppDataxConfiguration.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/AppDataxConfiguration.cs index f0d3790..afe6f49 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/AppDataxConfiguration.cs +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/AppDataxConfiguration.cs @@ -24,6 +24,9 @@ namespace UltraCombos.Frozen.RoyalGallery [Range(-1, 15)] public int targetIndex = -1; + [Configuration.Config] + public bool isTaiwanNo1 = false; + // Start is called before the first frame update void Start() { @@ -35,6 +38,8 @@ namespace UltraCombos.Frozen.RoyalGallery { AppData.Instance.currentIndex = targetIndex; } + + UltraCombos.Multilingual.Core.Instance.isTaiwanNo1 = isTaiwanNo1; } // Update is called once per frame diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/ui-coloring_V2-4.jpg b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/ui-coloring_V2-4.jpg new file mode 100644 index 0000000..8abba9a Binary files /dev/null and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/ui-coloring_V2-4.jpg differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/ui-coloring_V2-4.jpg.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/ui-coloring_V2-4.jpg.meta new file mode 100644 index 0000000..9fdc614 --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/ui-coloring_V2-4.jpg.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: ff5c612fb4ebe9e489a3d20422d31d35 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 4096 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 3 + compressionQuality: 50 + crunchedCompression: 1 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 4096 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 3 + compressionQuality: 50 + crunchedCompression: 1 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/bg-coloring_v2.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/bg-coloring_v2.png new file mode 100644 index 0000000..457ab04 Binary files /dev/null and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/bg-coloring_v2.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/bg-coloring_v2.png.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/bg-coloring_v2.png.meta new file mode 100644 index 0000000..e99083a --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/bg-coloring_v2.png.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: d80d4f90d7a6a0f4785168b74c9e9082 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/brush_bar_v2.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/brush_bar_v2.png new file mode 100644 index 0000000..766f55e Binary files /dev/null and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/brush_bar_v2.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/brush_bar_v2.png.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/brush_bar_v2.png.meta new file mode 100644 index 0000000..b023bbb --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/brush_bar_v2.png.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: d9b94dd683ef0f34bb7101dba57b114d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/brush_color_ref_v2.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/brush_color_ref_v2.png new file mode 100644 index 0000000..41a884e Binary files /dev/null and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/brush_color_ref_v2.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/brush_color_ref_v2.png.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/brush_color_ref_v2.png.meta new file mode 100644 index 0000000..7b56fef --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/brush_color_ref_v2.png.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: 044e497877388724e8569f5c6a82ea8a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/brush_ctrl_v2.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/brush_ctrl_v2.png new file mode 100644 index 0000000..56809ba Binary files /dev/null and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/brush_ctrl_v2.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/brush_ctrl_v2.png.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/brush_ctrl_v2.png.meta new file mode 100644 index 0000000..840e888 --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/brush_ctrl_v2.png.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: 116756e8974435b41bbcec152bd6d293 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/btn-proceed.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/btn-proceed.png new file mode 100644 index 0000000..1126b07 Binary files /dev/null and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/btn-proceed.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/btn-proceed.png.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/btn-proceed.png.meta new file mode 100644 index 0000000..0155c05 --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/btn-proceed.png.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: 893aa78ee71d8f245bb0222c07ef0717 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/textDeco.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/textDeco.png new file mode 100644 index 0000000..81ba46b Binary files /dev/null and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/textDeco.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/textDeco.png.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/textDeco.png.meta new file mode 100644 index 0000000..d98ae53 --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/textDeco.png.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: 79d629598357e9242b854afa75cb6fd9 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Packages/com.ultracombos.multilingual b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Packages/com.ultracombos.multilingual index 63933f9..3245412 160000 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Packages/com.ultracombos.multilingual +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Packages/com.ultracombos.multilingual @@ -1 +1 @@ -Subproject commit 63933f9e38f800445e2bd8c402c1a329c168e866 +Subproject commit 3245412902cbf57aeda3cf6ac66d04f1133f9624