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 10de219..fe68543 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 @@ -233,13 +233,91 @@ MonoBehaviour: isDelay: 0 delayTime: -1 path: 20181126_MinionsSZ_GirlsRoom_Ani_3.aif ---- !u!4 &274290747 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4566515945476120, guid: 12ab0e5b5933e1f409de3b7ff462a95f, - type: 3} - m_PrefabInstance: {fileID: 822012542} +--- !u!1 &78634570 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 78634571} + - component: {fileID: 78634574} + - component: {fileID: 78634573} + - component: {fileID: 78634572} + m_Layer: 0 + m_Name: Portrait-06 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &78634571 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 78634570} + 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: 937425704} + m_Father: {fileID: 1067656010} + 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} + m_AnchoredPosition: {x: 4000, y: -2000} + m_SizeDelta: {x: 1080, y: 1920} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &78634572 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} ---- !u!1 &275645426 + m_GameObject: {fileID: 78634570} + 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.3764706, g: 0.03529412, b: 0.59607846, 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 &78634573 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 78634570} + m_CullTransparentMesh: 0 +--- !u!114 &78634574 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 78634570} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e1f97271624dbd74088db35fef864c0b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &218006478 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -247,106 +325,276 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 275645427} - - component: {fileID: 275645430} - - component: {fileID: 275645429} - - component: {fileID: 275645428} + - component: {fileID: 218006479} + - component: {fileID: 218006482} + - component: {fileID: 218006481} + - component: {fileID: 218006480} m_Layer: 0 - m_Name: Role-02 + m_Name: Canvas m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &275645427 -Transform: + m_IsActive: 1 +--- !u!224 &218006479 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 275645426} + m_GameObject: {fileID: 218006478} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -42.3, y: 101.4, z: 10} - m_LocalScale: {x: 1.8223056, y: 8.144659, z: 1} - m_Children: [] - m_Father: {fileID: 2135091040} - m_RootOrder: 1 + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 680606864} + m_Father: {fileID: 841726155} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &275645428 -SpriteRenderer: + 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 &218006480 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 275645426} + m_GameObject: {fileID: 218006478} m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} + 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 &218006481 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 218006478} + 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 &218006482 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 218006478} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 1 + m_Camera: {fileID: 841726154} + 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_SortingLayer: 0 - m_SortingOrder: 3 - m_Sprite: {fileID: 21300000, guid: c8c0a3c8b6324e543a43d25624902654, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 10.24, y: 10.24} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!114 &275645429 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!1 &244257790 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 244257791} + - component: {fileID: 244257794} + - component: {fileID: 244257793} + - component: {fileID: 244257792} + m_Layer: 0 + m_Name: Role-00 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &244257791 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 244257790} + 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: 1629680761} + 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 &244257792 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 275645426} + m_GameObject: {fileID: 244257790} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d2220dc78794eaa4b939e412e9f9b902, type: 3} + m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - texture: {fileID: 0} ---- !u!114 &275645430 + 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: 2430709160c0f1241b4c670fe3b4e9b4, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!114 &244257793 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 275645426} + m_GameObject: {fileID: 244257790} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 21f70a2ec67c77142bb8578ced0ffec9, type: 3} m_Name: m_EditorClassIdentifier: id: 07 + BackgroundColor: + serializedVersion: 2 + rgba: 4286122640 + Positon: {x: 6000, y: -2000} mode: 0 +--- !u!222 &244257794 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 244257790} + m_CullTransparentMesh: 0 +--- !u!1 &246768081 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 246768082} + - component: {fileID: 246768085} + - component: {fileID: 246768084} + - component: {fileID: 246768083} + m_Layer: 0 + m_Name: Portrait-05 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &246768082 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 246768081} + 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: 1162992622} + m_Father: {fileID: 1067656010} + 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} + m_AnchoredPosition: {x: 2000, y: -2000} + m_SizeDelta: {x: 1080, y: 1920} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &246768083 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 246768081} + 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.08235294, g: 0.15686275, b: 0.5647059, 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 &246768084 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 246768081} + m_CullTransparentMesh: 0 +--- !u!114 &246768085 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 246768081} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e1f97271624dbd74088db35fef864c0b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &274290747 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4566515945476120, guid: 12ab0e5b5933e1f409de3b7ff462a95f, + type: 3} + m_PrefabInstance: {fileID: 822012542} + m_PrefabAsset: {fileID: 0} --- !u!1 &283667689 GameObject: m_ObjectHideFlags: 0 @@ -459,15 +707,215 @@ MonoBehaviour: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 283667689} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ef446a0b9b504c24b8c05c562f07cd72, type: 3} - m_Name: - m_EditorClassIdentifier: - isDelay: 0 - delayTime: -1 - path: 20181126_MinionsSZ_GirlsRoom_Ani_18.aif + m_GameObject: {fileID: 283667689} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ef446a0b9b504c24b8c05c562f07cd72, type: 3} + m_Name: + m_EditorClassIdentifier: + isDelay: 0 + delayTime: -1 + path: 20181126_MinionsSZ_GirlsRoom_Ani_18.aif +--- !u!1 &374925485 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 374925486} + - component: {fileID: 374925489} + - component: {fileID: 374925488} + - component: {fileID: 374925487} + m_Layer: 0 + m_Name: Role-00 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &374925486 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 374925485} + 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: 1095845117} + 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 &374925487 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 374925485} + 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: 2430709160c0f1241b4c670fe3b4e9b4, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!114 &374925488 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 374925485} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 21f70a2ec67c77142bb8578ced0ffec9, type: 3} + m_Name: + m_EditorClassIdentifier: + id: 03 + BackgroundColor: + serializedVersion: 2 + rgba: 4280637757 + Positon: {x: 6000, y: 0} + mode: 0 +--- !u!222 &374925489 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 374925485} + m_CullTransparentMesh: 0 +--- !u!1 &381599333 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 381599336} + - component: {fileID: 381599335} + - component: {fileID: 381599334} + m_Layer: 0 + m_Name: Filter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!114 &381599334 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 381599333} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 79621082da8ba124eba3da9eba119a06, type: 3} + m_Name: + m_EditorClassIdentifier: + inputTexture: {fileID: 8400000, guid: a7fbc987d8ef8694e8a5ed3212387a44, type: 2} + renderToTexture: 1 + outputTexture: {fileID: 8400000, guid: ec4cfe790f7e53e40930b3f3b1d0ea7b, type: 2} + outputMipmap: 0 + fade: 0.437 + panFade: 0.241 + brightness: 1.24 + contrast: 0.38 + color: 1.12 + shaderMethod: 0 + outlines: 0.7 + hatches: 1.04 + outlineError: 1.36 + flicker: 0.015 + flickerFreq: 3.6 + fixedHatchDir: 0.72 + hatchScale: 1.259 + hatchLength: 162 + mipLevel: 0.11 + vignetting: 0 + contentVignetting: 0 + paperTint: {r: 1, g: 1, b: 1, a: 1} + paperRoughness: 1 + paperTex: {fileID: 0} + flipY: 0 +--- !u!20 &381599335 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 381599333} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 4 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, 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: 0 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &381599336 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 381599333} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -555, y: 664.45856, z: -15.53708} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &417831287 GameObject: m_ObjectHideFlags: 0 @@ -580,7 +1028,7 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 417831287} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &492259777 +--- !u!1 &542808023 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -588,107 +1036,69 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 492259778} - - component: {fileID: 492259781} - - component: {fileID: 492259780} - - component: {fileID: 492259779} - m_Layer: 0 - m_Name: Role-01 + - component: {fileID: 542808024} + - component: {fileID: 542808026} + - component: {fileID: 542808025} + m_Layer: 5 + m_Name: debug m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &492259778 -Transform: + m_IsActive: 0 +--- !u!224 &542808024 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 492259777} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.3, y: 0.8, z: 10} - m_LocalScale: {x: 20, y: 20, z: 1} + m_GameObject: {fileID: 542808023} + 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: 2135091040} - m_RootOrder: 0 + m_Father: {fileID: 819030248} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &492259779 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 492259777} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 3 - m_Sprite: {fileID: 21300000, guid: 95e96287a4bd17446854a585699d3905, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 10.24, y: 10.24} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!114 &492259780 + 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, y: 1} +--- !u!114 &542808025 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 492259777} + m_GameObject: {fileID: 542808023} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d2220dc78794eaa4b939e412e9f9b902, type: 3} + m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - texture: {fileID: 0} ---- !u!114 &492259781 -MonoBehaviour: + 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: e9a9354c9acafed4d9da9992a8e9cacf, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &542808026 +CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 492259777} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 21f70a2ec67c77142bb8578ced0ffec9, type: 3} - m_Name: - m_EditorClassIdentifier: - id: 07 - mode: 0 ---- !u!1 &542808023 + m_GameObject: {fileID: 542808023} + m_CullTransparentMesh: 0 +--- !u!1 &680606863 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -696,42 +1106,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 542808024} - - component: {fileID: 542808026} - - component: {fileID: 542808025} - m_Layer: 5 - m_Name: debug + - component: {fileID: 680606864} + - component: {fileID: 680606866} + - component: {fileID: 680606865} + m_Layer: 0 + m_Name: RawImage m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &542808024 + m_IsActive: 1 +--- !u!224 &680606864 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 542808023} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 680606863} + 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: 819030248} - m_RootOrder: 2 + m_Father: {fileID: 218006479} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + 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: 0, y: 0} - m_Pivot: {x: 0, y: 1} ---- !u!114 &542808025 + m_SizeDelta: {x: 1080, y: 1920} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &680606865 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 542808023} + m_GameObject: {fileID: 680606863} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -743,20 +1153,20 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: e9a9354c9acafed4d9da9992a8e9cacf, type: 3} + m_Texture: {fileID: 8400000, guid: a7fbc987d8ef8694e8a5ed3212387a44, type: 2} m_UVRect: serializedVersion: 2 x: 0 y: 0 width: 1 height: 1 ---- !u!222 &542808026 +--- !u!222 &680606866 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 542808023} + m_GameObject: {fileID: 680606863} m_CullTransparentMesh: 0 --- !u!1 &779577949 GameObject: @@ -1086,22 +1496,110 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 819030244} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 100} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 91.00599} m_LocalScale: {x: 0.16666667, y: 0.16666667, z: 0.16666667} m_Children: - - {fileID: 1780615674} - {fileID: 1519278661} - {fileID: 542808024} - {fileID: 1833696213} - m_Father: {fileID: 961139955} + m_Father: {fileID: 1940738862} m_RootOrder: 1 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_AnchoredPosition: {x: -901.9137, y: 118.44653} m_SizeDelta: {x: 1080, y: 1920} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &820506440 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 820506441} + - component: {fileID: 820506444} + - component: {fileID: 820506443} + - component: {fileID: 820506442} + m_Layer: 0 + m_Name: Role-00 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &820506441 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 820506440} + 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: 1953387458} + 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 &820506442 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 820506440} + 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: 2430709160c0f1241b4c670fe3b4e9b4, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!114 &820506443 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 820506440} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 21f70a2ec67c77142bb8578ced0ffec9, type: 3} + m_Name: + m_EditorClassIdentifier: + id: 04 + BackgroundColor: + serializedVersion: 2 + rgba: 4287335448 + Positon: {x: 0, y: -2000} + mode: 0 +--- !u!222 &820506444 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 820506440} + m_CullTransparentMesh: 0 --- !u!1001 &822012542 PrefabInstance: m_ObjectHideFlags: 0 @@ -1147,7 +1645,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4566515945476120, guid: 12ab0e5b5933e1f409de3b7ff462a95f, type: 3} propertyPath: m_RootOrder - value: 0 + value: 3 objectReference: {fileID: 0} - target: {fileID: 114930378025822482, guid: 12ab0e5b5933e1f409de3b7ff462a95f, type: 3} @@ -1303,7 +1801,6 @@ GameObject: - component: {fileID: 841726154} - component: {fileID: 841726153} - component: {fileID: 841726156} - - component: {fileID: 841726157} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -1345,7 +1842,7 @@ Camera: far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 160 + orthographic size: 320 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -1369,11 +1866,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 841726152} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 36, y: 800, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 218006479} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &841726156 MonoBehaviour: @@ -1422,43 +1920,95 @@ MonoBehaviour: CanvasTint: {r: 1, g: 1, b: 1, a: 1} flipY: 0 geomFlipY: 1 ---- !u!114 &841726157 +--- !u!1 &937425703 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 937425704} + - component: {fileID: 937425707} + - component: {fileID: 937425706} + - component: {fileID: 937425705} + m_Layer: 0 + m_Name: Role-00 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &937425704 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 937425703} + 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: 78634571} + 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 &937425705 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 937425703} + 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: 2430709160c0f1241b4c670fe3b4e9b4, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!114 &937425706 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 841726152} + m_GameObject: {fileID: 937425703} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 79621082da8ba124eba3da9eba119a06, type: 3} + m_Script: {fileID: 11500000, guid: 21f70a2ec67c77142bb8578ced0ffec9, type: 3} m_Name: m_EditorClassIdentifier: - inputTexture: {fileID: 0} - renderToTexture: 0 - outputTexture: {fileID: 0} - outputMipmap: 0 - fade: 0.437 - panFade: 0.241 - brightness: 1.24 - contrast: 0.38 - color: 1.12 - shaderMethod: 0 - outlines: 0.7 - hatches: 1.04 - outlineError: 1.36 - flicker: 0.015 - flickerFreq: 3.6 - fixedHatchDir: 0.72 - hatchScale: 1.259 - hatchLength: 162 - mipLevel: 0.11 - vignetting: 0 - contentVignetting: 0 - paperTint: {r: 1, g: 1, b: 1, a: 1} - paperRoughness: 1 - paperTex: {fileID: 0} - flipY: 0 + id: 06 + BackgroundColor: + serializedVersion: 2 + rgba: 4288153952 + Positon: {x: 4000, y: -2000} + mode: 0 +--- !u!222 &937425707 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 937425703} + m_CullTransparentMesh: 0 --- !u!1 &961139953 GameObject: m_ObjectHideFlags: 0 @@ -1508,7 +2058,7 @@ Camera: serializedVersion: 2 m_Bits: 4294967295 m_RenderingPath: -1 - m_TargetTexture: {fileID: 8400000, guid: b5ea81eb7be17c7438d9969ac691ae20, type: 2} + m_TargetTexture: {fileID: 8400000, guid: a7fbc987d8ef8694e8a5ed3212387a44, type: 2} m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 0 @@ -1525,15 +2075,12 @@ Transform: m_PrefabInstance: {fileID: 0} 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: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 2135091040} - - {fileID: 819030248} - - {fileID: 1547140293} - m_Father: {fileID: 0} - m_RootOrder: 4 + m_Children: [] + m_Father: {fileID: 1067656010} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &977824798 GameObject: @@ -1572,7 +2119,7 @@ MonoBehaviour: onTextureReceived: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 2135091041} + - m_Target: {fileID: 1067656011} m_MethodName: UpdateTexture m_Mode: 0 m_Arguments: @@ -1626,119 +2173,420 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1055363694} - - component: {fileID: 1055363698} - - component: {fileID: 1055363697} - - component: {fileID: 1055363696} - - component: {fileID: 1055363695} - - component: {fileID: 1055363699} - m_Layer: 5 - m_Name: PickAni-20 + - component: {fileID: 1055363694} + - component: {fileID: 1055363698} + - component: {fileID: 1055363697} + - component: {fileID: 1055363696} + - component: {fileID: 1055363695} + - component: {fileID: 1055363699} + m_Layer: 5 + m_Name: PickAni-20 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1055363694 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1055363693} + 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: 1833696213} + m_RootOrder: 19 + 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: 1717.6, y: -98.1} + m_SizeDelta: {x: 160, y: 160} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1055363695 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1055363693} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03dae28dfe6734f4eb76c922ac72dd34, type: 3} + m_Name: + m_EditorClassIdentifier: + target: 0 + materials: [] + attributeName: + targetObject: {fileID: 0} +--- !u!114 &1055363696 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1055363693} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 10f07b3f9fb96524db93eb42d89c229c, type: 3} + m_Name: + m_EditorClassIdentifier: + VideoAsset: {fileID: 11400000, guid: 45771f8cf709f7d4b980cc58cf6aa644, type: 2} + LoadOnAwake: 1 + PlayOnStart: 0 + Looping: 0 + AudioVolume: 1 +--- !u!114 &1055363697 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1055363693} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: cbc2bf1a073212b48af81cd388a4a293, type: 2} + m_Color: {r: 1, g: 1, b: 1, 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 &1055363698 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1055363693} + m_CullTransparentMesh: 0 +--- !u!114 &1055363699 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1055363693} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ef446a0b9b504c24b8c05c562f07cd72, type: 3} + m_Name: + m_EditorClassIdentifier: + isDelay: 0 + delayTime: -1 + path: 20181126_MinionsSZ_GirlsRoom_Ani_20.aif +--- !u!1 &1067656009 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1067656010} + - component: {fileID: 1067656014} + - component: {fileID: 1067656013} + - component: {fileID: 1067656012} + - component: {fileID: 1067656011} + m_Layer: 0 + m_Name: Portrait Manager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1067656010 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1067656009} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 100} + m_LocalScale: {x: 0.16666667, y: 0.16666667, z: 0.16666667} + m_Children: + - {fileID: 961139955} + - {fileID: 2144215267} + - {fileID: 2092843638} + - {fileID: 1821221164} + - {fileID: 1095845117} + - {fileID: 1953387458} + - {fileID: 246768082} + - {fileID: 78634571} + - {fileID: 1629680761} + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -500.7, y: 108} + m_SizeDelta: {x: 1080, y: 1920} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1067656011 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1067656009} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8813dde4fb2c304bbcde08119f57d54, type: 3} + m_Name: + m_EditorClassIdentifier: + show_cur: + camera: {fileID: 961139954} + server: {fileID: 977824800} + mode: 0 + id: + onPaintingUpdated: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1067656012 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1067656009} + 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 &1067656013 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1067656009} + 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 &1067656014 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1067656009} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 961139954} + 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 &1095845116 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1095845117} + - component: {fileID: 1095845120} + - component: {fileID: 1095845119} + - component: {fileID: 1095845118} + m_Layer: 0 + m_Name: Portrait-03 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1055363694 +--- !u!224 &1095845117 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1055363693} + m_GameObject: {fileID: 1095845116} 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: 1833696213} - m_RootOrder: 19 + m_LocalScale: {x: 1.00002, y: 1.00002, z: 1.00002} + m_Children: + - {fileID: 374925486} + m_Father: {fileID: 1067656010} + 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: 1717.6, y: -98.1} - m_SizeDelta: {x: 160, y: 160} + m_AnchoredPosition: {x: 6000, y: 0} + m_SizeDelta: {x: 1080, y: 1920} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1055363695 +--- !u!114 &1095845118 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1055363693} + m_GameObject: {fileID: 1095845116} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 03dae28dfe6734f4eb76c922ac72dd34, type: 3} + m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - target: 0 - materials: [] - attributeName: - targetObject: {fileID: 0} ---- !u!114 &1055363696 + m_Material: {fileID: 0} + m_Color: {r: 0.23921569, g: 0.34901962, b: 0.14509805, 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 &1095845119 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1095845116} + m_CullTransparentMesh: 0 +--- !u!114 &1095845120 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1055363693} + m_GameObject: {fileID: 1095845116} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 10f07b3f9fb96524db93eb42d89c229c, type: 3} + m_Script: {fileID: 11500000, guid: e1f97271624dbd74088db35fef864c0b, type: 3} m_Name: m_EditorClassIdentifier: - VideoAsset: {fileID: 11400000, guid: 45771f8cf709f7d4b980cc58cf6aa644, type: 2} - LoadOnAwake: 1 - PlayOnStart: 0 - Looping: 0 - AudioVolume: 1 ---- !u!114 &1055363697 +--- !u!1 &1162992621 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1162992622} + - component: {fileID: 1162992625} + - component: {fileID: 1162992624} + - component: {fileID: 1162992623} + m_Layer: 0 + m_Name: Role-00 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1162992622 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1162992621} + 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: 246768082} + 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 &1162992623 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1055363693} + m_GameObject: {fileID: 1162992621} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: cbc2bf1a073212b48af81cd388a4a293, type: 2} + 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: 0} + m_Texture: {fileID: 2800000, guid: 2430709160c0f1241b4c670fe3b4e9b4, type: 3} m_UVRect: serializedVersion: 2 x: 0 y: 0 width: 1 height: 1 ---- !u!222 &1055363698 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1055363693} - m_CullTransparentMesh: 0 ---- !u!114 &1055363699 +--- !u!114 &1162992624 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1055363693} + m_GameObject: {fileID: 1162992621} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ef446a0b9b504c24b8c05c562f07cd72, type: 3} + m_Script: {fileID: 11500000, guid: 21f70a2ec67c77142bb8578ced0ffec9, type: 3} m_Name: m_EditorClassIdentifier: - isDelay: 0 - delayTime: -1 - path: 20181126_MinionsSZ_GirlsRoom_Ani_20.aif + id: 05 + BackgroundColor: + serializedVersion: 2 + rgba: 4287637525 + Positon: {x: 2000, y: -2000} + mode: 0 +--- !u!222 &1162992625 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1162992621} + m_CullTransparentMesh: 0 --- !u!1 &1337158412 GameObject: m_ObjectHideFlags: 0 @@ -1975,7 +2823,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1368559033} m_CullTransparentMesh: 0 ---- !u!1 &1424239746 +--- !u!1 &1502836840 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1983,106 +2831,87 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1424239747} - - component: {fileID: 1424239750} - - component: {fileID: 1424239749} - - component: {fileID: 1424239748} + - component: {fileID: 1502836841} + - component: {fileID: 1502836844} + - component: {fileID: 1502836843} + - component: {fileID: 1502836842} m_Layer: 0 - m_Name: Role-03 + m_Name: Role-00 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1424239747 -Transform: + m_IsActive: 1 +--- !u!224 &1502836841 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1424239746} + m_GameObject: {fileID: 1502836840} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 3, y: -82.6, z: 10} - m_LocalScale: {x: 12.46615, y: 12.508653, z: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 2135091040} - m_RootOrder: 2 + m_Father: {fileID: 2092843638} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1424239748 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1424239746} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 3 - m_Sprite: {fileID: 21300000, guid: 95e96287a4bd17446854a585699d3905, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 10.24, y: 10.24} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!114 &1424239749 + 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 &1502836842 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1424239746} + m_GameObject: {fileID: 1502836840} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d2220dc78794eaa4b939e412e9f9b902, type: 3} + m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - texture: {fileID: 0} ---- !u!114 &1424239750 + 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: 2430709160c0f1241b4c670fe3b4e9b4, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!114 &1502836843 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1424239746} + m_GameObject: {fileID: 1502836840} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 21f70a2ec67c77142bb8578ced0ffec9, type: 3} m_Name: m_EditorClassIdentifier: - id: 07 + id: 01 + BackgroundColor: + serializedVersion: 2 + rgba: 4280181419 + Positon: {x: 2000, y: 0} mode: 0 +--- !u!222 &1502836844 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1502836840} + m_CullTransparentMesh: 0 --- !u!1 &1519278660 GameObject: m_ObjectHideFlags: 0 @@ -2115,7 +2944,7 @@ RectTransform: m_LocalScale: {x: 1, y: -1, z: 1} m_Children: [] m_Father: {fileID: 819030248} - 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} @@ -2213,13 +3042,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1547140292} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 80} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -418.91367, y: 389.44653, z: 71.00599} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 417831288} - m_Father: {fileID: 961139955} - m_RootOrder: 2 + m_Father: {fileID: 1940738862} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1547140294 MonoBehaviour: @@ -2631,6 +3460,95 @@ MonoBehaviour: isDelay: 0 delayTime: -1 path: 20181126_MinionsSZ_GirlsRoom_Ani_19.aif +--- !u!1 &1599279130 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1599279131} + - component: {fileID: 1599279134} + - component: {fileID: 1599279133} + - component: {fileID: 1599279132} + m_Layer: 0 + m_Name: Role-00 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1599279131 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1599279130} + 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: 1821221164} + 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 &1599279132 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1599279130} + 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: 2430709160c0f1241b4c670fe3b4e9b4, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!114 &1599279133 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1599279130} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 21f70a2ec67c77142bb8578ced0ffec9, type: 3} + m_Name: + m_EditorClassIdentifier: + id: 02 + BackgroundColor: + serializedVersion: 2 + rgba: 4279989883 + Positon: {x: 4000, y: 0} + mode: 0 +--- !u!222 &1599279134 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1599279130} + m_CullTransparentMesh: 0 --- !u!1 &1602203506 GameObject: m_ObjectHideFlags: 0 @@ -2752,6 +3670,90 @@ MonoBehaviour: isDelay: 0 delayTime: -1 path: 20181126_MinionsSZ_GirlsRoom_Ani_9.aif +--- !u!1 &1629680760 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1629680761} + - component: {fileID: 1629680764} + - component: {fileID: 1629680763} + - component: {fileID: 1629680762} + m_Layer: 0 + m_Name: Portrait-07 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1629680761 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1629680760} + 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: 244257791} + m_Father: {fileID: 1067656010} + 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} + m_AnchoredPosition: {x: 6000, y: -2000} + m_SizeDelta: {x: 1080, y: 1920} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1629680762 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1629680760} + 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 &1629680763 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1629680760} + m_CullTransparentMesh: 0 +--- !u!114 &1629680764 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1629680760} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e1f97271624dbd74088db35fef864c0b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1659212941 GameObject: m_ObjectHideFlags: 0 @@ -3164,76 +4166,6 @@ MonoBehaviour: isDelay: 0 delayTime: -1 path: 20181126_MinionsSZ_GirlsRoom_Ani_12.aif ---- !u!1 &1780615673 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1780615674} - - component: {fileID: 1780615676} - - component: {fileID: 1780615675} - m_Layer: 5 - m_Name: BackBackground - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1780615674 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1780615673} - 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: 819030248} - 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: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1780615675 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1780615673} - 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.050980393, g: 0.3529412, b: 0.30980393, 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 &1780615676 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1780615673} - m_CullTransparentMesh: 0 --- !u!1 &1787948967 GameObject: m_ObjectHideFlags: 0 @@ -3476,6 +4408,90 @@ MonoBehaviour: isDelay: 0 delayTime: -1 path: 20181126_MinionsSZ_GirlsRoom_Ani_15.aif +--- !u!1 &1821221163 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1821221164} + - component: {fileID: 1821221167} + - component: {fileID: 1821221166} + - component: {fileID: 1821221165} + m_Layer: 0 + m_Name: Portrait-02 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1821221164 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1821221163} + 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: 1599279131} + m_Father: {fileID: 1067656010} + 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: 4000, y: 0} + m_SizeDelta: {x: 1080, y: 1920} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1821221165 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1821221163} + 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.48235294, g: 0.4627451, b: 0.105882354, 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 &1821221166 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1821221163} + m_CullTransparentMesh: 0 +--- !u!114 &1821221167 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1821221163} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e1f97271624dbd74088db35fef864c0b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1833696212 GameObject: m_ObjectHideFlags: 0 @@ -3503,49 +4519,138 @@ RectTransform: 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: - - {fileID: 1985409674} - - {fileID: 817157394} - - {fileID: 66073407} - - {fileID: 1571020957} - - {fileID: 1910139421} - - {fileID: 1659212942} - - {fileID: 1924607945} - - {fileID: 1787948968} - - {fileID: 1602203507} - - {fileID: 1368559034} - - {fileID: 823225325} - - {fileID: 1736409637} - - {fileID: 779577950} - - {fileID: 1563538147} - - {fileID: 1795609923} - - {fileID: 1356963843} - - {fileID: 1715929158} - - {fileID: 283667690} - - {fileID: 1581958811} - - {fileID: 1055363694} - m_Father: {fileID: 819030248} - m_RootOrder: 3 + m_Children: + - {fileID: 1985409674} + - {fileID: 817157394} + - {fileID: 66073407} + - {fileID: 1571020957} + - {fileID: 1910139421} + - {fileID: 1659212942} + - {fileID: 1924607945} + - {fileID: 1787948968} + - {fileID: 1602203507} + - {fileID: 1368559034} + - {fileID: 823225325} + - {fileID: 1736409637} + - {fileID: 779577950} + - {fileID: 1563538147} + - {fileID: 1795609923} + - {fileID: 1356963843} + - {fileID: 1715929158} + - {fileID: 283667690} + - {fileID: 1581958811} + - {fileID: 1055363694} + m_Father: {fileID: 819030248} + 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} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1833696214 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1833696212} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a8b49e32a3dfdd54bafb245bdb3fd175, type: 3} + m_Name: + m_EditorClassIdentifier: + mode: 0 + index: 0 +--- !u!1 &1883303906 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1883303907} + - component: {fileID: 1883303910} + - component: {fileID: 1883303909} + - component: {fileID: 1883303908} + m_Layer: 0 + m_Name: Role-00 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1883303907 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1883303906} + 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: 2144215267} + 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: 100, y: 100} + m_SizeDelta: {x: 2048, y: 2048} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1833696214 +--- !u!114 &1883303908 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1833696212} + m_GameObject: {fileID: 1883303906} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a8b49e32a3dfdd54bafb245bdb3fd175, type: 3} + 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: 2430709160c0f1241b4c670fe3b4e9b4, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!114 &1883303909 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1883303906} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 21f70a2ec67c77142bb8578ced0ffec9, type: 3} m_Name: m_EditorClassIdentifier: + id: 00 + BackgroundColor: + serializedVersion: 2 + rgba: 4280098190 + Positon: {x: 0, y: 0} mode: 0 - index: 0 +--- !u!222 &1883303910 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1883303906} + m_CullTransparentMesh: 0 --- !u!1 &1910139420 GameObject: m_ObjectHideFlags: 0 @@ -3815,10 +4920,97 @@ Transform: m_LocalPosition: {x: 8.91366, y: 13.553471, z: 8.994012} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1547140293} + - {fileID: 819030248} + - {fileID: 2135091040} - {fileID: 274290747} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1953387457 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1953387458} + - component: {fileID: 1953387461} + - component: {fileID: 1953387460} + - component: {fileID: 1953387459} + m_Layer: 0 + m_Name: Portrait-04 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1953387458 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1953387457} + 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: 820506441} + m_Father: {fileID: 1067656010} + 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} + m_AnchoredPosition: {x: 0, y: -2000} + m_SizeDelta: {x: 1080, y: 1920} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1953387459 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1953387457} + 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.09411765, g: 0.54901963, b: 0.54509807, 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 &1953387460 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1953387457} + m_CullTransparentMesh: 0 +--- !u!114 &1953387461 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1953387457} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e1f97271624dbd74088db35fef864c0b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1985409673 GameObject: m_ObjectHideFlags: 0 @@ -4006,6 +5198,90 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2092843637 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2092843638} + - component: {fileID: 2092843641} + - component: {fileID: 2092843640} + - component: {fileID: 2092843639} + m_Layer: 0 + m_Name: Portrait-01 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2092843638 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2092843637} + 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: 1502836841} + m_Father: {fileID: 1067656010} + 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} + m_AnchoredPosition: {x: 2000, y: 0} + m_SizeDelta: {x: 1080, y: 1920} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2092843639 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2092843637} + 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.67058825, g: 0.38431373, b: 0.11764706, 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 &2092843640 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2092843637} + m_CullTransparentMesh: 0 +--- !u!114 &2092843641 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2092843637} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e1f97271624dbd74088db35fef864c0b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2135091039 GameObject: m_ObjectHideFlags: 0 @@ -4015,7 +5291,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2135091040} - - component: {fileID: 2135091041} m_Layer: 0 m_Name: Portrait Manager m_TagString: Untagged @@ -4030,31 +5305,94 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2135091039} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -153.91367, y: -4.5534706, z: -8.994012} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1940738862} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2144215266 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2144215267} + - component: {fileID: 2144215270} + - component: {fileID: 2144215269} + - component: {fileID: 2144215268} + m_Layer: 0 + m_Name: Portrait-00 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2144215267 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2144215266} 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: - - {fileID: 492259778} - - {fileID: 275645427} - - {fileID: 1424239747} - m_Father: {fileID: 961139955} - m_RootOrder: 0 + - {fileID: 1883303907} + m_Father: {fileID: 1067656010} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2135091041 + 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 &2144215268 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2135091039} + m_GameObject: {fileID: 2144215266} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d8813dde4fb2c304bbcde08119f57d54, type: 3} + m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - show_cur: - mode: 0 - id: - onPaintingUpdated: + m_Material: {fileID: 0} + m_Color: {r: 0.5568628, g: 0.11372549, b: 0.11372549, 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 &2144215269 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2144215266} + m_CullTransparentMesh: 0 +--- !u!114 &2144215270 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2144215266} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e1f97271624dbd74088db35fef864c0b, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Portrait.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Portrait.cs index 9f545f9..1718f9a 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Portrait.cs +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Portrait.cs @@ -9,10 +9,14 @@ namespace UltraCombos.Frozen public class Portrait : MonoBehaviour { public string id; + public Color32 BackgroundColor; + public Vector2 Positon; + const float duration = 150.0f; float stamp = 0.0f; - RendererPropertyOverride prop; + //RendererPropertyOverride prop; + RawImage image; Texture2D tex; Texture blank_texture; @@ -20,19 +24,6 @@ namespace UltraCombos.Frozen Animator animator = null; float speed = 0.0f; - public bool isVisible - { - set - { - prop.isVisible = value; - } - - get - { - return prop.isVisible; - } - } - [SerializeField, Header("Debug")] bool mode = false; @@ -55,14 +46,16 @@ namespace UltraCombos.Frozen private void Start() { - prop = GetComponent(); - blank_texture = GetComponent().sprite.texture; - + image = GetComponent(); + blank_texture = image.texture; + + /* animator = GetComponent(); if (animator) { animator.speed = 0.0f; } + */ } private void Update() @@ -112,7 +105,7 @@ namespace UltraCombos.Frozen tex.SetPixels(texture.GetPixels()); tex.Apply(); - prop.texture = tex; + image.texture = tex; } private void OnTrigger() @@ -123,7 +116,7 @@ namespace UltraCombos.Frozen public void Initialize() { - prop.texture = blank_texture; + image.texture = blank_texture; speed = 0.0f; } } diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/PortraitController.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/PortraitController.cs new file mode 100644 index 0000000..b895cc8 --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/PortraitController.cs @@ -0,0 +1,46 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine.UI; +using UnityEngine; + +namespace UltraCombos.Frozen +{ + [ExecuteInEditMode] + public class PortraitController : MonoBehaviour + { + // Start is called before the first frame update + + RawImage background; + Portrait portrait; + RectTransform rt; + + void Start() + { + portrait = GetComponentInChildren(); + background = GetComponent(); + rt = GetComponent(); + background.color = portrait.BackgroundColor; + portrait.Positon = rt.anchoredPosition; + } + + // Update is called once per frame + void Update() + { + if (Application.isPlaying) + { + return; + } + + if (portrait) + { + background.color = portrait.BackgroundColor; + } + + if (rt) + { + portrait.Positon = rt.anchoredPosition; + } + } + } + +} diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/ResourceServer.cs.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/PortraitController.cs.meta similarity index 83% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/ResourceServer.cs.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/PortraitController.cs.meta index 2b416f1..67d1280 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/ResourceServer.cs.meta +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/PortraitController.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 562012399f9d5ab44bcdd9f041e30c83 +guid: e1f97271624dbd74088db35fef864c0b MonoImporter: externalObjects: {} serializedVersion: 2 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 0a5f2d9..0f330a8 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 @@ -10,6 +10,8 @@ namespace UltraCombos.Frozen { Dictionary portraits; public string show_cur; + public Camera camera; + public RoyalGallery.RorayGalleryGrpcServer server; string show_nxt = null; @@ -28,7 +30,7 @@ namespace UltraCombos.Frozen foreach (var p in GetComponentsInChildren()) { portraits.Add(p.id, p); - p.isVisible = false; + // p.isVisible = false; } if (portraits.Count == 0) @@ -45,6 +47,11 @@ namespace UltraCombos.Frozen { show_nxt = show_cur; } + + if (server) + { + server.onRequestColor = RequestColor; + } } private void Update() @@ -58,12 +65,17 @@ namespace UltraCombos.Frozen { if (portraits.ContainsKey(show_cur)) { - portraits[show_cur].isVisible = false; + //portraits[show_cur].isVisible = false; } show_cur = show_nxt; show_nxt = null; - portraits[show_cur].isVisible = true; + + Transform tf = camera.GetComponent(); + Vector2 tar = portraits[show_cur].Positon; + + camera.GetComponent().localPosition = new Vector3(tar.x, tar.y, tf.localPosition.z); + //portraits[show_cur].isVisible = true; } if (Input.GetKeyDown(KeyCode.R)) @@ -93,6 +105,16 @@ namespace UltraCombos.Frozen show_nxt = id; } } + + private Color32 RequestColor(string id) + { + if (portraits.ContainsKey(id)) + { + return portraits[id].BackgroundColor; + } + + return new Color32(255, 255, 255, 255); + } } } diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/ResourceServer.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/ResourceServer.cs deleted file mode 100644 index 46ef20a..0000000 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/ResourceServer.cs +++ /dev/null @@ -1,141 +0,0 @@ -using Grpc.Core; -using System.Collections; -using System.Collections.Generic; -using System.Threading.Tasks; -using UnityEngine; -using UnityEngine.Events; -using UnityEngine.Networking; - -namespace UltraCombos.Minions -{ - public class ResourceServer : GrpcServerBase - { - public string subnet = "192.168.234.0"; - public Texture2D texture; - - object data_mtx = new object(); - Queue data_pool; - - object idx_mtx = new object(); - public int maxCount = 10; - public int index = 0; - - [System.Serializable] - public class TextureEvent : UnityEvent { } - [Space(10)] - public TextureEvent onTextureReceived = new TextureEvent(); - - public delegate void MessageDelegate(DataRequest request); - public MessageDelegate onMessageReceived; - - private void Start() - { - Utility.Argument.TryParse("subnet", ref subnet); - - data_pool = new Queue(); - - var options = new List { new Grpc.Core.ChannelOption(ChannelOptions.MaxReceiveMessageLength, int.MaxValue) }; - var services = new ServerServiceDefinition[] { Resource.BindService(new ResourceImpl(OnMessageReceived, OnIndexRequest)) }; - StartServer(options, services); - - DebugInformation.Instance.UpdateProperty("Local IP", $"{Utility.Network.GetLocalIPAddress(subnet)}"); - } - - private void Update() - { - DataRequest data = null; - - lock (data_mtx) - { - if (data_pool.Count > 0) - { - data = data_pool.Dequeue(); - } - - } - - if (data != null) - { - int role_id = data.Id; - - if (texture == null) - { - texture = new Texture2D(1024, 1024, TextureFormat.ARGB32, false); - } - - if (texture.LoadImage(data.Content.ToByteArray(), false)) - { - onMessageReceived.Invoke(data); - onTextureReceived.Invoke(role_id, texture); - Log($"Texture {role_id} is loaded. ({texture.width} x {texture.height})"); - - DebugInformation.Instance.UpdateProperty("Last painting", $"{role_id} ({texture.width} x {texture.height})"); - } - else - { - Log("Texture load fail.", LogType.Error); - DebugInformation.Instance.UpdateProperty("Last painting", $"load fail"); - } - } - - DebugInformation.Instance.UpdateProperty("Resouce Server", $"{port}"); - } - - private void OnMessageReceived(DataRequest request) - { - //Log($"Request content length: {request.Content.Length}"); - lock (data_mtx) - { - data_pool.Enqueue(request); - } - } - - private int OnIndexRequest(int deviceId) - { - int res = 0; - lock (idx_mtx) - { - res = index; - index = (index + 1) % maxCount; - } - return res; - } - } - - internal class ResourceImpl : Resource.ResourceBase - { - public delegate void MessageDelegate(DataRequest request); - public MessageDelegate onMessageReceived; - - public delegate int IndexDelegate(int deviceId); - public IndexDelegate onIndexRequest; - - public ResourceImpl(MessageDelegate msg_func, IndexDelegate index_func) - { - if (msg_func != null) - onMessageReceived += msg_func; - - if (index_func != null) - onIndexRequest += index_func; - } - - public override Task SendData(DataRequest request, ServerCallContext context) - { - onMessageReceived.Invoke(request); - return Task.FromResult(new DataReply { Result = $"Texture {request.Id} data is delivered with length: {request.Content.Length}." }); - } - - public override Task GetIndex(Index request, ServerCallContext context) - { - var res = onIndexRequest.Invoke(request.Id); - string serial = $"{System.DateTime.Now.ToString("HHmmss")}{res:D2}"; - return Task.FromResult(new Index { Id = res, Serial = serial }); - } - - - } - - -} - - diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/RorayGalleryGrpcServer.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/RorayGalleryGrpcServer.cs index f33208d..770f36e 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/RorayGalleryGrpcServer.cs +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/RorayGalleryGrpcServer.cs @@ -8,6 +8,12 @@ using UnityEngine.Networking; namespace UltraCombos.Frozen.RoyalGallery { + class IndexInfo + { + public string id; + public Color32 color; + } + public class RorayGalleryGrpcServer : GrpcServerBase { public string subnet = "192.168.234.0"; @@ -27,6 +33,9 @@ namespace UltraCombos.Frozen.RoyalGallery [Space(10)] public TextureEvent onTextureReceived = new TextureEvent(); + public delegate Color32 RequestColorDelegate(string id); + public RequestColorDelegate onRequestColor; + public delegate void MessageDelegate(DataRequest request); public MessageDelegate onMessageReceived; @@ -107,7 +116,7 @@ namespace UltraCombos.Frozen.RoyalGallery } } - private string OnIndexRequest(int deviceId) + private IndexInfo OnIndexRequest(int deviceId) { int res = 0; lock (idx_mtx) @@ -115,16 +124,22 @@ namespace UltraCombos.Frozen.RoyalGallery res = index; index = (index + 1) % m_IdList.Count; } - return m_IdList[index]; + + IndexInfo info = new IndexInfo(); + info.id = m_IdList[index]; + info.color = onRequestColor(info.id); + + return info; } } internal class ResourceImpl : Resource.ResourceBase { + public delegate void MessageDelegate(DataRequest request); public MessageDelegate onMessageReceived; - public delegate string IndexDelegate(int deviceId); + public delegate IndexInfo IndexDelegate(int deviceId); public IndexDelegate onIndexRequest; public ResourceImpl(MessageDelegate msg_func, IndexDelegate index_func) @@ -147,22 +162,23 @@ namespace UltraCombos.Frozen.RoyalGallery var res = onIndexRequest.Invoke(request.Id); - string dev_id = request.Id.ToString("X");//request.Id.ToString().PadLeft(2, '0'); + string dev_sid = request.Id.ToString("X"); string date = System.DateTime.Now.ToString("HHmmss"); - string res_id = res;//res.PadLeft(3, '0'); + string res_sid = res.id; try { - res_id = System.Int32.Parse(res_id).ToString("X"); + res_sid = System.Int32.Parse(res_sid).ToString("X"); } catch (System.FormatException) { - Debug.LogWarning($"GetPage: rid={res} is not number."); + Debug.LogWarning($"GetPage: rid={res_sid} is not number."); } - string serial = $"{date}{dev_id}{res_id}"; + string serial = $"{date}{dev_sid}{res_sid}"; + string colorHex = Utils.ColorToHex(res.color); - Debug.Log($"GetPage: rid={res}, sid={serial}"); - return Task.FromResult(new Page { Id = res, Serial = serial }); + Debug.Log($"GetPage: rid={res.id}, sid={serial}, color={colorHex}"); + return Task.FromResult(new Page { Id = res.id, Serial = serial, Message = colorHex }); } } } diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/wall.renderTexture b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/RT-Filter.renderTexture similarity index 94% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/wall.renderTexture rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/RT-Filter.renderTexture index 128ae9d..8fa4654 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/wall.renderTexture +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/RT-Filter.renderTexture @@ -6,7 +6,7 @@ RenderTexture: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: wall + m_Name: RT-Filter m_ImageContentsHash: serializedVersion: 2 Hash: 00000000000000000000000000000000 @@ -14,7 +14,7 @@ RenderTexture: m_DownscaleFallback: 0 m_Width: 1080 m_Height: 1920 - m_AntiAliasing: 4 + m_AntiAliasing: 1 m_DepthFormat: 0 m_ColorFormat: 0 m_MipMap: 0 diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/RT-Filter.renderTexture.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/RT-Filter.renderTexture.meta new file mode 100644 index 0000000..cd3c9a1 --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/RT-Filter.renderTexture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ec4cfe790f7e53e40930b3f3b1d0ea7b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/RT-PortraitManager.renderTexture b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/RT-PortraitManager.renderTexture new file mode 100644 index 0000000..4749caf --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/RT-PortraitManager.renderTexture @@ -0,0 +1,34 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!84 &8400000 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RT-PortraitManager + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_Width: 1080 + m_Height: 1920 + m_AntiAliasing: 1 + m_DepthFormat: 0 + m_ColorFormat: 0 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/wall.renderTexture.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/RT-PortraitManager.renderTexture.meta similarity index 79% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/wall.renderTexture.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/RT-PortraitManager.renderTexture.meta index 5e20c6e..798fefa 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/wall.renderTexture.meta +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/RT-PortraitManager.renderTexture.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b5ea81eb7be17c7438d9969ac691ae20 +guid: a7fbc987d8ef8694e8a5ed3212387a44 NativeFormatImporter: externalObjects: {} mainObjectFileID: 8400000 diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Logs/Packages-Update.log b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Logs/Packages-Update.log new file mode 100644 index 0000000..7da815c --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Logs/Packages-Update.log @@ -0,0 +1,10 @@ + +=== Sun Dec 1 01:08:41 2019 + +Packages were changed. +Update Mode: updateDependencies + +The following packages were added: + com.unity.collab-proxy@1.2.15 +The following packages were updated: + com.unity.package-manager-ui from version 1.9.11 to 2.0.8 diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/ProjectSettings/VFXManager.asset b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/ProjectSettings/VFXManager.asset new file mode 100644 index 0000000..6e0eaca --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/ProjectSettings/VFXManager.asset @@ -0,0 +1,11 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!937362698 &1 +VFXManager: + m_ObjectHideFlags: 0 + m_IndirectShader: {fileID: 0} + m_CopyBufferShader: {fileID: 0} + m_SortShader: {fileID: 0} + m_RenderPipeSettingsPath: + m_FixedTimeStep: 0.016666668 + m_MaxDeltaTime: 0.05