From f072b74c673005e5aaa0a6fe71332ee97d937535 Mon Sep 17 00:00:00 2001 From: LH Date: Mon, 14 Sep 2020 17:16:01 +0800 Subject: [PATCH] Updated. --- .../Assets/Main-2-Coloring.unity | 53 +++++++++++++++++-- _Package/com.ultracombos.coloring-old | 2 +- 2 files changed, 51 insertions(+), 4 deletions(-) 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 2faed6c..f87d41f 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 @@ -5483,6 +5483,7 @@ Transform: m_LocalPosition: {x: -1000, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1234618898} - {fileID: 1517958623} - {fileID: 701869997} - {fileID: 986129839} @@ -8969,7 +8970,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 434877872} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &701869998 MonoBehaviour: @@ -11948,7 +11949,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 434877872} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &986129840 MonoBehaviour: @@ -14587,6 +14588,52 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &1234618897 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1234618898} + - component: {fileID: 1234618899} + m_Layer: 0 + m_Name: ZoomInOut + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1234618898 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1234618897} + 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: 434877872} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1234618899 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1234618897} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86af4bb2383319a4980ed0078372de50, type: 3} + m_Name: + m_EditorClassIdentifier: + Controller: {fileID: 701869998} + multiTouch: 1 + orthoZoomSpeed: 0.5 --- !u!1 &1241959016 GameObject: m_ObjectHideFlags: 0 @@ -18095,7 +18142,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 434877872} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1522558665 GameObject: diff --git a/_Package/com.ultracombos.coloring-old b/_Package/com.ultracombos.coloring-old index 9f6403e..1116562 160000 --- a/_Package/com.ultracombos.coloring-old +++ b/_Package/com.ultracombos.coloring-old @@ -1 +1 @@ -Subproject commit 9f6403e5da200f27708298ef35b3444f95bd8f0c +Subproject commit 11165620adca325bf6660395b3c572a458b0cdd6