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 6bc4479..eb76e26 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 @@ -267,7 +267,7 @@ RectTransform: - {fileID: 937425704} - {fileID: 1358764563} m_Father: {fileID: 1067656010} - m_RootOrder: 9 + 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} @@ -648,7 +648,7 @@ RectTransform: - {fileID: 1162992622} - {fileID: 636355884} m_Father: {fileID: 1067656010} - m_RootOrder: 8 + 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} @@ -1024,112 +1024,13 @@ RectTransform: - {fileID: 1259440795} - {fileID: 398153099} m_Father: {fileID: 1067656010} - m_RootOrder: 12 + 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} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &408730682 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 408730683} - - component: {fileID: 408730686} - - component: {fileID: 408730685} - - component: {fileID: 408730684} - m_Layer: 0 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &408730683 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 408730682} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_Children: - - {fileID: 1270275949} - m_Father: {fileID: 1241877941} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!114 &408730684 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 408730682} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &408730685 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 408730682} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 ---- !u!223 &408730686 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 408730682} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 1 - m_Camera: {fileID: 1241877940} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 --- !u!1 &416750361 GameObject: m_ObjectHideFlags: 0 @@ -1347,79 +1248,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 417831287} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &476149274 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 476149275} - - component: {fileID: 476149276} - m_Layer: 0 - m_Name: Nxt - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &476149275 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 476149274} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 4000, y: 0, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1067656010} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!20 &476149276 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 476149274} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 2 - m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} - m_projectionMatrixMode: 1 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_GateFitMode: 2 - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 1 - orthographic size: 160 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 8400000, guid: 1844d5b4a60447c46817e136c905b56d, type: 2} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 0 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 --- !u!1 &532974843 GameObject: m_ObjectHideFlags: 0 @@ -2792,7 +2620,7 @@ RectTransform: - {fileID: 1182070070} - {fileID: 1817909025} m_Father: {fileID: 1067656010} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2947,8 +2775,10 @@ GameObject: - component: {fileID: 961139954} - component: {fileID: 961139956} - component: {fileID: 961139957} + - component: {fileID: 961139959} + - component: {fileID: 961139958} m_Layer: 0 - m_Name: Portrait Camera + m_Name: Portrait Camera Cur m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3008,7 +2838,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1067656010} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &961139956 MonoBehaviour: @@ -3094,6 +2924,37 @@ MonoBehaviour: CanvasTint: {r: 1, g: 1, b: 1, a: 1} flipY: 1 geomFlipY: 1 +--- !u!114 &961139958 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 961139953} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 10f07b3f9fb96524db93eb42d89c229c, type: 3} + m_Name: + m_EditorClassIdentifier: + VideoAsset: {fileID: 11400000, guid: 1def1b03315173d4395c7050409657dd, type: 2} + LoadOnAwake: 1 + PlayOnStart: 0 + Looping: 0 + AudioVolume: 1 +--- !u!114 &961139959 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 961139953} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 197846e613a35e34aae5281af759652f, type: 3} + m_Name: + m_EditorClassIdentifier: + TexTarget: {fileID: 8400000, guid: 74b3b34ebdff68d4cab7b68b0612b28e, type: 2} + MovPlayer: {fileID: 961139958} --- !u!1 &977824798 GameObject: m_ObjectHideFlags: 0 @@ -3247,6 +3108,79 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 994989327} m_CullTransparentMesh: 0 +--- !u!1 &998739361 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 998739362} + - component: {fileID: 998739363} + m_Layer: 0 + m_Name: Portrait Camera Nxt + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &998739362 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 998739361} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 4000, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1067656010} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!20 &998739363 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 998739361} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} + m_projectionMatrixMode: 1 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_GateFitMode: 2 + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 160 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 8400000, guid: 74b3b34ebdff68d4cab7b68b0612b28e, type: 2} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 0 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &1055363693 GameObject: m_ObjectHideFlags: 0 @@ -3399,8 +3333,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.16666667, y: 0.16666667, z: 0.16666667} m_Children: - - {fileID: 1991862451} - - {fileID: 476149275} + - {fileID: 998739362} - {fileID: 961139955} - {fileID: 2144215267} - {fileID: 2092843638} @@ -3433,7 +3366,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: PortaitInitIndex: 0 - camera: {fileID: 961139954} + CameraCur: {fileID: 961139954} + CameraNxt: {fileID: 998739363} server: {fileID: 977824800} mode: 0 id: @@ -3534,7 +3468,7 @@ RectTransform: - {fileID: 374925486} - {fileID: 1431522096} m_Father: {fileID: 1067656010} - m_RootOrder: 6 + 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} @@ -3813,117 +3747,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1241877936 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1241877941} - - component: {fileID: 1241877940} - - component: {fileID: 1241877939} - - component: {fileID: 1241877938} - - component: {fileID: 1241877937} - m_Layer: 0 - m_Name: Main Camera (1) - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1241877937 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1241877936} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 197846e613a35e34aae5281af759652f, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1241877938 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1241877936} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e7ebb928551598b458017c1d9ba3863f, type: 3} - m_Name: - m_EditorClassIdentifier: - isEnableSpout: 0 - sender: {fileID: 1215315276} ---- !u!81 &1241877939 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1241877936} - m_Enabled: 1 ---- !u!20 &1241877940 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1241877936} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 2 - m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} - m_projectionMatrixMode: 1 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_GateFitMode: 2 - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 1 - orthographic size: 320 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 0 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &1241877941 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1241877936} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -510, y: 800, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 408730683} - m_Father: {fileID: 0} - m_RootOrder: 9 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1253023461 GameObject: m_ObjectHideFlags: 0 @@ -4099,76 +3922,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1259440794} m_CullTransparentMesh: 0 ---- !u!1 &1270275948 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1270275949} - - component: {fileID: 1270275951} - - component: {fileID: 1270275950} - m_Layer: 0 - m_Name: RawImage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1270275949 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1270275948} - 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: 408730683} - 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: 1080, y: 1920} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1270275950 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1270275948} - 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: 8400000, guid: a7fbc987d8ef8694e8a5ed3212387a44, type: 2} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!222 &1270275951 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1270275948} - m_CullTransparentMesh: 0 --- !u!1 &1337158412 GameObject: m_ObjectHideFlags: 0 @@ -5710,7 +5463,7 @@ RectTransform: - {fileID: 244257791} - {fileID: 1713028541} m_Father: {fileID: 1067656010} - m_RootOrder: 10 + 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} @@ -6940,7 +6693,7 @@ RectTransform: - {fileID: 1599279131} - {fileID: 1767519409} m_Father: {fileID: 1067656010} - 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} @@ -7848,7 +7601,7 @@ RectTransform: - {fileID: 820506441} - {fileID: 1943983770} m_Father: {fileID: 1067656010} - m_RootOrder: 7 + 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} @@ -8021,79 +7774,6 @@ MonoBehaviour: isDelay: 0 delayTime: -1 path: 20181126_MinionsSZ_GirlsRoom_Ani_1.aif ---- !u!1 &1991862450 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1991862451} - - component: {fileID: 1991862452} - m_Layer: 0 - m_Name: Cur - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1991862451 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1991862450} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2000, y: 0, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1067656010} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!20 &1991862452 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1991862450} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 2 - m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} - m_projectionMatrixMode: 1 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_GateFitMode: 2 - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 1 - orthographic size: 160 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 8400000, guid: 33e0d1d2d40ad2745b268e9471bb2a08, type: 2} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 0 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 --- !u!1 &2062979616 GameObject: m_ObjectHideFlags: 0 @@ -8194,7 +7874,7 @@ RectTransform: - {fileID: 1502836841} - {fileID: 416750362} m_Father: {fileID: 1067656010} - 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} @@ -8308,7 +7988,7 @@ RectTransform: m_Children: - {fileID: 1883303907} m_Father: {fileID: 1067656010} - m_RootOrder: 3 + 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_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/NewBehaviourScript.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/NewBehaviourScript.cs deleted file mode 100644 index 89597cd..0000000 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/NewBehaviourScript.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -[ExecuteInEditMode] -public class NewBehaviourScript : MonoBehaviour -{ - private Material material; - - // Start is called before the first frame update - void Awake() - { - material = new Material(Shader.Find("Hidden/NewImageEffectShader")); - } - - // Update is called once per frame - void Update() - { - - } - - - // Postprocess the image - void OnRenderImage(RenderTexture source, RenderTexture destination) - { - //if (intensity == 0) - //{ - // Graphics.Blit(source, destination); - // return; - //} - // - //material.SetFloat("_bwBlend", intensity); - Graphics.Blit(source, destination, material); - } - -} 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 44c8f3e..d47f7b9 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 @@ -5,21 +5,26 @@ using UnityEngine.EventSystems; using UnityEngine.UI; using System.Collections; -namespace UltraCombos.Frozen +namespace UltraCombos.Frozen.RoyalGallery { public class PortraitManager : MonoBehaviour { Dictionary portraits; + Queue quePortraitKeyNxt; + [Configuration.Config] [Range(0, 15)] public int PortaitInitIndex = 0; string PortraitKeyCur = ""; - public Camera camera; + public Camera CameraCur; + public Camera CameraNxt; + public RoyalGallery.RorayGalleryGrpcServer server; - string portraitKeyNxt = null; + + bool isTransiting = false; [SerializeField, Header("Debug")] bool mode = false; @@ -33,6 +38,7 @@ namespace UltraCombos.Frozen private void Start() { portraits = new Dictionary(); + quePortraitKeyNxt = new Queue(); int i = 0; foreach (var p in GetComponentsInChildren()) @@ -59,11 +65,11 @@ namespace UltraCombos.Frozen if (!portraits.ContainsKey(PortraitKeyCur)) { PortraitKeyCur = ""; - portraitKeyNxt = portraits.Keys.GetEnumerator().Current; + quePortraitKeyNxt.Enqueue(portraits.Keys.GetEnumerator().Current); } else { - portraitKeyNxt = PortraitKeyCur; + quePortraitKeyNxt.Enqueue(PortraitKeyCur); } if (server) @@ -79,11 +85,21 @@ namespace UltraCombos.Frozen return; } - if (portraitKeyNxt != null) + do { - StartCoroutine(OnPlayPortrait(portraitKeyNxt)); - portraitKeyNxt = null; - } + if (isTransiting) + { + break; + } + + if (quePortraitKeyNxt.Count == 0) + { + break; + } + + StartCoroutine(OnTransition(quePortraitKeyNxt.Dequeue())); + + } while (false); if (Input.GetKeyDown(KeyCode.R)) { @@ -109,7 +125,7 @@ namespace UltraCombos.Frozen painting.UpdateTexture(texture); onPaintingUpdated.Invoke(painting.transform.position); - portraitKeyNxt = id; + quePortraitKeyNxt.Enqueue(id); } } @@ -123,20 +139,48 @@ namespace UltraCombos.Frozen return new Color32(255, 255, 255, 255); } + IEnumerator OnTransition(string next) + { + isTransiting = true; + + Portrait p_nxt = portraits[next]; + p_nxt.OnPlay(); + + yield return new WaitForEndOfFrame(); + + Transform tf = CameraNxt.GetComponent(); + Vector2 tar = p_nxt.Positon; + + CameraNxt.GetComponent().localPosition = new Vector3(tar.x, tar.y, tf.localPosition.z); + + StartCoroutine(UpdateTransition(next, CameraCur.GetComponent())); + yield return null; + } - IEnumerator OnPlayPortrait(string next) + IEnumerator UpdateTransition(string next, TransitionScript transition) { + transition.OnPlay(); + + while (true) + { + if (transition.IsFinished) + { + break; + } + + yield return null; + } + + transition.OnStop(); + string PortraitKeyPre = PortraitKeyCur; PortraitKeyCur = next; - Portrait p_cur = portraits[PortraitKeyCur]; - p_cur.OnPlay(); - yield return new WaitForEndOfFrame(); - Transform tf = camera.GetComponent(); + Transform tf = CameraCur.GetComponent(); Vector2 tar = p_cur.Positon; - camera.GetComponent().localPosition = new Vector3(tar.x, tar.y, tf.localPosition.z); + CameraCur.GetComponent().localPosition = new Vector3(tar.x, tar.y, tf.localPosition.z); yield return new WaitForEndOfFrame(); @@ -144,6 +188,10 @@ namespace UltraCombos.Frozen { StartCoroutine(OnStopPortrait(PortraitKeyPre)); } + else + { + isTransiting = false; + } yield return null; } @@ -157,6 +205,9 @@ namespace UltraCombos.Frozen Portrait p = portraits[pre]; p.OnStop(); + + isTransiting = false; + yield return null; } } diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/TransitionScript.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/TransitionScript.cs new file mode 100644 index 0000000..14ee9da --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/TransitionScript.cs @@ -0,0 +1,59 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + + +namespace UltraCombos.Frozen.RoyalGallery +{ + [ExecuteInEditMode] + public class TransitionScript : MonoBehaviour + { + public Texture TexTarget; + public DShowMoviePlayer MovPlayer; + + private Material Mat; + private Texture TexTransition; + + public bool IsPlaying { get { return MovPlayer.IsPlaying; } } + public bool IsFinished { get { return MovPlayer.IsFinished; } } + + // Start is called before the first frame update + void Awake() + { + Mat = new Material(Shader.Find("Hidden/TransitionEffectShader")); + } + + void Start() + { + TexTransition = MovPlayer.Texture; + } + + public void OnPlay() + { + enabled = true; + MovPlayer.Play(); + } + + public void OnStop() + { + enabled = false; + } + + // Update is called once per frame + void Update() + { + + } + + + // Postprocess the image + void OnRenderImage(RenderTexture source, RenderTexture destination) + { + Mat.SetTexture("_TargetTex", TexTarget); + Mat.SetTexture("_TransitionTex", TexTransition); + Graphics.Blit(source, destination, Mat); + } + + } + +} diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/NewBehaviourScript.cs.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/TransitionScript.cs.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/NewBehaviourScript.cs.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/TransitionScript.cs.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/NewImageEffectShader.shader b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Shader/TransitionEffectShader.shader similarity index 70% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/NewImageEffectShader.shader rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Shader/TransitionEffectShader.shader index 1b08b73..c4238e1 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/NewImageEffectShader.shader +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Shader/TransitionEffectShader.shader @@ -1,4 +1,4 @@ -Shader "Hidden/NewImageEffectShader" +Shader "Hidden/TransitionEffectShader" { Properties { @@ -37,14 +37,18 @@ return o; } - sampler2D _MainTex; + sampler2D _TransitionTex; + sampler2D _TargetTex; + sampler2D _MainTex; fixed4 frag (v2f i) : SV_Target { - fixed4 col = tex2D(_MainTex, i.uv); - // just invert the colors - col.rgb = 1 - col.rgb; - return col; + fixed4 col_src = tex2D(_MainTex, i.uv); + fixed4 col_dst = tex2D(_TargetTex, i.uv); + fixed4 col_tra = tex2D(_TransitionTex, i.uv); + + col_dst.rgb = col_dst.rgb * col_tra.r + col_src.rgb * (1 - col_tra.r); + return col_dst; } ENDCG } diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/NewImageEffectShader.shader.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Shader/TransitionEffectShader.shader.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/NewImageEffectShader.shader.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Shader/TransitionEffectShader.shader.meta