From 92f6a111e063b88c511d245c4cdfce9016a96c5f Mon Sep 17 00:00:00 2001 From: LH Date: Thu, 12 Nov 2020 12:30:01 +0800 Subject: [PATCH] [03_RoyalGallery] Added esc exit feature. --- .../Assets/PaintingNavigator.unity | 13 +++++++++++++ .../Assets/RoyalGalleryPortrait.unity | 15 ++++++++++++++- .../com.ultracombos.frozen.royal-gallery-asset | 2 +- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/PaintingNavigator.unity b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/PaintingNavigator.unity index 13f5671..a3b3fc1 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/PaintingNavigator.unity +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/PaintingNavigator.unity @@ -730,6 +730,7 @@ GameObject: - component: {fileID: 126320259} - component: {fileID: 126320258} - component: {fileID: 126320260} + - component: {fileID: 126320261} m_Layer: 0 m_Name: Misc m_TagString: Untagged @@ -783,6 +784,18 @@ MonoBehaviour: m_EditorClassIdentifier: language: 0 isTaiwanNo1: 0 +--- !u!114 &126320261 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 126320257} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1214614ae4f485e449ce7dbb7fca84a3, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &136420940 GameObject: m_ObjectHideFlags: 0 diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait.unity b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait.unity index 527c615..a88eb07 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait.unity +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait.unity @@ -4931,7 +4931,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8813dde4fb2c304bbcde08119f57d54, type: 3} m_Name: m_EditorClassIdentifier: - PortaitInitIndex: 8 + PortaitInitIndex: 0 CameraCur: {fileID: 961139954} CameraNxt: {fileID: 998739363} server: {fileID: 977824800} @@ -8004,6 +8004,7 @@ GameObject: m_Component: - component: {fileID: 1672874512} - component: {fileID: 1672874511} + - component: {fileID: 1672874513} m_Layer: 0 m_Name: Misc m_TagString: Untagged @@ -8043,6 +8044,18 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1672874513 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1672874510} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1214614ae4f485e449ce7dbb7fca84a3, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1676615723 GameObject: m_ObjectHideFlags: 0 diff --git a/_Package/com.ultracombos.frozen.royal-gallery-asset b/_Package/com.ultracombos.frozen.royal-gallery-asset index 4e2cd67..2f76cc0 160000 --- a/_Package/com.ultracombos.frozen.royal-gallery-asset +++ b/_Package/com.ultracombos.frozen.royal-gallery-asset @@ -1 +1 @@ -Subproject commit 4e2cd67467b8a5a562d01dcf93cc7b14e7cc103a +Subproject commit 2f76cc0f8981b9391bb16034535397835fca7861