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 fe68543..498378b 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 @@ -429,7 +429,7 @@ GameObject: - component: {fileID: 244257793} - component: {fileID: 244257792} m_Layer: 0 - m_Name: Role-00 + m_Name: Role-07 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -472,7 +472,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: 2430709160c0f1241b4c670fe3b4e9b4, type: 3} + m_Texture: {fileID: 2800000, guid: 9e12246b6fe17ae40ac29d2c9936f145, type: 3} m_UVRect: serializedVersion: 2 x: 0 @@ -729,7 +729,7 @@ GameObject: - component: {fileID: 374925488} - component: {fileID: 374925487} m_Layer: 0 - m_Name: Role-00 + m_Name: Role-03 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -772,7 +772,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: 2430709160c0f1241b4c670fe3b4e9b4, type: 3} + m_Texture: {fileID: 2800000, guid: be9c41177171c8c408f4a379a9df5c6b, type: 3} m_UVRect: serializedVersion: 2 x: 0 @@ -1524,7 +1524,7 @@ GameObject: - component: {fileID: 820506443} - component: {fileID: 820506442} m_Layer: 0 - m_Name: Role-00 + m_Name: Role-04 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1567,7 +1567,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: 2430709160c0f1241b4c670fe3b4e9b4, type: 3} + m_Texture: {fileID: 2800000, guid: 6e41ad4e34f1f024694aca6a42b4a93c, type: 3} m_UVRect: serializedVersion: 2 x: 0 @@ -1920,6 +1920,90 @@ MonoBehaviour: CanvasTint: {r: 1, g: 1, b: 1, a: 1} flipY: 0 geomFlipY: 1 +--- !u!1 &891482387 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 891482388} + - component: {fileID: 891482391} + - component: {fileID: 891482390} + - component: {fileID: 891482389} + m_Layer: 0 + m_Name: Portrait-08 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &891482388 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 891482387} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.00002, y: 1.00002, z: 1.00002} + m_Children: + - {fileID: 1182070070} + m_Father: {fileID: 1067656010} + 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} + m_AnchoredPosition: {x: 0, y: -4000} + m_SizeDelta: {x: 1080, y: 1920} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &891482389 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 891482387} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.5647059, g: 0.039215688, b: 0.4745098, a: 1} + m_RaycastTarget: 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 &891482390 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 891482387} + m_CullTransparentMesh: 0 +--- !u!114 &891482391 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 891482387} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e1f97271624dbd74088db35fef864c0b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &937425703 GameObject: m_ObjectHideFlags: 0 @@ -1933,7 +2017,7 @@ GameObject: - component: {fileID: 937425706} - component: {fileID: 937425705} m_Layer: 0 - m_Name: Role-00 + m_Name: Role-06 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1976,7 +2060,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: 2430709160c0f1241b4c670fe3b4e9b4, type: 3} + m_Texture: {fileID: 2800000, guid: bed8a0c0ef31b2a4385b1d791b067bc7, type: 3} m_UVRect: serializedVersion: 2 x: 0 @@ -2076,7 +2160,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 961139953} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalPosition: {x: 2000, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1067656010} @@ -2326,6 +2410,7 @@ RectTransform: - {fileID: 246768082} - {fileID: 78634571} - {fileID: 1629680761} + - {fileID: 891482388} m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2511,7 +2596,7 @@ GameObject: - component: {fileID: 1162992624} - component: {fileID: 1162992623} m_Layer: 0 - m_Name: Role-00 + m_Name: Role-05 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2554,7 +2639,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: 2430709160c0f1241b4c670fe3b4e9b4, type: 3} + m_Texture: {fileID: 2800000, guid: 835ba564aea4c634ab54472ab29f3ad3, type: 3} m_UVRect: serializedVersion: 2 x: 0 @@ -2587,6 +2672,95 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1162992621} m_CullTransparentMesh: 0 +--- !u!1 &1182070069 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1182070070} + - component: {fileID: 1182070073} + - component: {fileID: 1182070072} + - component: {fileID: 1182070071} + m_Layer: 0 + m_Name: Role-08 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1182070070 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1182070069} + 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: 891482388} + 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: 0} + m_SizeDelta: {x: 2048, y: 2048} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1182070071 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1182070069} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -98529514, 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_Texture: {fileID: 2800000, guid: 07e0f495a39e74641991f80168d2da8c, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!114 &1182070072 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1182070069} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 21f70a2ec67c77142bb8578ced0ffec9, type: 3} + m_Name: + m_EditorClassIdentifier: + id: 08 + BackgroundColor: + serializedVersion: 2 + rgba: 4286122640 + Positon: {x: 0, y: -4000} + mode: 0 +--- !u!222 &1182070073 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1182070069} + m_CullTransparentMesh: 0 --- !u!1 &1337158412 GameObject: m_ObjectHideFlags: 0 @@ -2836,7 +3010,7 @@ GameObject: - component: {fileID: 1502836843} - component: {fileID: 1502836842} m_Layer: 0 - m_Name: Role-00 + m_Name: Role-01 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2879,7 +3053,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: 2430709160c0f1241b4c670fe3b4e9b4, type: 3} + m_Texture: {fileID: 2800000, guid: 87651f3f776f73947ae522edb9a6c309, type: 3} m_UVRect: serializedVersion: 2 x: 0 @@ -3473,7 +3647,7 @@ GameObject: - component: {fileID: 1599279133} - component: {fileID: 1599279132} m_Layer: 0 - m_Name: Role-00 + m_Name: Role-02 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3516,7 +3690,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: 2430709160c0f1241b4c670fe3b4e9b4, type: 3} + m_Texture: {fileID: 2800000, guid: eec57d538a8f54d499916be9400c6e61, type: 3} m_UVRect: serializedVersion: 2 x: 0 @@ -5330,7 +5504,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2144215267 RectTransform: m_ObjectHideFlags: 0 diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/PortraitManager.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/PortraitManager.cs index 0f330a8..e4a5dc7 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/PortraitManager.cs +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/PortraitManager.cs @@ -29,6 +29,11 @@ namespace UltraCombos.Frozen portraits = new Dictionary(); foreach (var p in GetComponentsInChildren()) { + if (!p.isActiveAndEnabled) + { + continue; + } + portraits.Add(p.id, p); // p.isVisible = false; }