diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-1-Intro.unity b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-1-Intro.unity index e327aea..01ded75 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-1-Intro.unity +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-1-Intro.unity @@ -2083,7 +2083,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 983, y: 238} + m_AnchoredPosition: {x: 669, y: 268.5} m_SizeDelta: {x: 595, y: 368} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1282467668 diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-3-Signature.unity b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-3-Signature.unity index 8ca46ca..4a0e9f5 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-3-Signature.unity +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-3-Signature.unity @@ -1094,15 +1094,15 @@ RectTransform: m_GameObject: {fileID: 84310173} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.9, y: 0.9, z: 1} + m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} m_Children: [] m_Father: {fileID: 1731371877} 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: 0, y: -8} - m_SizeDelta: {x: 1754, y: 1240} + m_AnchoredPosition: {x: 0, y: 36} + m_SizeDelta: {x: 1500, y: 2100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &84310175 MonoBehaviour: @@ -1122,7 +1122,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 8400000, guid: 4ef76f2a408f15842a4a4bea68e8a87b, type: 2} + m_Texture: {fileID: 8400000, guid: 1cd6d5a279f1dfe4397018ca9e03fdb6, type: 2} m_UVRect: serializedVersion: 2 x: 0 @@ -1136,7 +1136,7 @@ CanvasRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 84310173} - m_CullTransparentMesh: 0 + m_CullTransparentMesh: 1 --- !u!1 &116355896 GameObject: m_ObjectHideFlags: 0 @@ -2033,7 +2033,7 @@ RectTransform: 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: -682.2, y: 686.4} + m_AnchoredPosition: {x: -2540, y: 833.4} m_SizeDelta: {x: 1460.7, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &225586104 @@ -2055,13 +2055,13 @@ MonoBehaviour: font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} fontSize: 110 lineSpacing: 2 - baseline: 686.4 + baseline: 833.4 - language: 40 text: "\u4F5C\u54C1\u9884\u89C8" font: {fileID: 12800000, guid: 1f940ec663706444798b9201d8ddedec, type: 3} fontSize: 100 lineSpacing: 0.9 - baseline: 690.8 + baseline: 885.8 --- !u!114 &225586105 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2136,8 +2136,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 2732, y: 1100} + m_AnchoredPosition: {x: 11, y: 0} + m_SizeDelta: {x: 2030.4, y: 1100} m_Pivot: {x: 0.5, y: 0} --- !u!114 &232943981 MonoBehaviour: @@ -2500,6 +2500,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 47b15dbef5eb46140a92fffa0f17cfcb, type: 3} m_Name: m_EditorClassIdentifier: + canvas: {fileID: 0} --- !u!1 &269574124 GameObject: m_ObjectHideFlags: 0 @@ -3139,7 +3140,7 @@ RectTransform: 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_AnchoredPosition: {x: -128, y: -70.5} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &314810288 @@ -3335,7 +3336,7 @@ RectTransform: 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: -429, y: -676} + m_AnchoredPosition: {x: -1694, y: -676} m_SizeDelta: {x: 1154.93, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &332208531 @@ -3587,8 +3588,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -798, y: 1125.23} - m_SizeDelta: {x: 1200, y: 150} + m_AnchoredPosition: {x: -582.1, y: 1125.23} + m_SizeDelta: {x: 891.8, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &339249793 MonoBehaviour: @@ -4116,7 +4117,7 @@ RectTransform: 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: 864, y: -683} + m_AnchoredPosition: {x: 381, y: -796} m_SizeDelta: {x: 531, y: 208} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &386909062 @@ -4835,7 +4836,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 - m_BackGroundColor: {r: 0.64, g: 0.64, b: 0.64, a: 1} + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1} m_projectionMatrixMode: 1 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} @@ -4851,7 +4852,7 @@ Camera: far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 5 + orthographic size: 256 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -5224,8 +5225,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 2732, y: 1213} + m_AnchoredPosition: {x: 11, y: 0} + m_SizeDelta: {x: 2030.4, y: 1213} m_Pivot: {x: 0.5, y: 0} --- !u!114 &426768725 MonoBehaviour: @@ -5419,15 +5420,15 @@ RectTransform: m_GameObject: {fileID: 453494266} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.5000747, y: 0.5000747, z: 0.5000747} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_Children: [] m_Father: {fileID: 1659296031} m_RootOrder: 1 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: 671, y: -1354} - m_SizeDelta: {x: 2048, y: 800} + m_AnchoredPosition: {x: 877, y: -1458} + m_SizeDelta: {x: 1513, y: 625} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &453494268 MonoBehaviour: @@ -5438,7 +5439,7 @@ MonoBehaviour: m_GameObject: {fileID: 453494266} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 386a71ba8e6bc764fa83d351daec67ff, type: 3} + m_Script: {fileID: 11500000, guid: 9550b89dc30ed384d8741f172b12127d, type: 3} m_Name: m_EditorClassIdentifier: canvas: {fileID: 1902582125} @@ -5455,7 +5456,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9245283, g: 0.7805989, b: 0.14391243, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -5736,7 +5737,7 @@ Camera: serializedVersion: 2 m_Bits: 4294967295 m_RenderingPath: -1 - m_TargetTexture: {fileID: 8400000, guid: 4ef76f2a408f15842a4a4bea68e8a87b, type: 2} + m_TargetTexture: {fileID: 8400000, guid: 1cd6d5a279f1dfe4397018ca9e03fdb6, type: 2} m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 0 @@ -6833,10 +6834,10 @@ MonoBehaviour: multiTouch: 0 drawAreaOnScreen: serializedVersion: 2 - x: 0 + x: 267.5 y: 42 - width: 2048 - height: 800 + width: 1513 + height: 625 autoCaculateViewPortRect: 1 needToIgnoredCameraAspect: 1 CameraSize: @@ -9323,7 +9324,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: 42} - m_SizeDelta: {x: 2048, y: 800} + m_SizeDelta: {x: 1513, y: 625} m_Pivot: {x: 0.5, y: 0} --- !u!114 &895392843 MonoBehaviour: @@ -16807,7 +16808,7 @@ RectTransform: 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: 422, y: -683} + m_AnchoredPosition: {x: -285.5, y: -796} m_SizeDelta: {x: 571, y: 208} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1786772118 @@ -18105,7 +18106,7 @@ RectTransform: 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: 2451, y: 1766} + m_SizeDelta: {x: 1500, y: 2100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1913412845 MonoBehaviour: @@ -18502,7 +18503,7 @@ GameObject: - component: {fileID: 1943785796} - component: {fileID: 1943785795} m_Layer: 0 - m_Name: Last Painting + m_Name: Painting m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -18517,15 +18518,15 @@ RectTransform: m_GameObject: {fileID: 1943785793} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.12, y: 1.12, z: 1.12} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1659296031} 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.00012207, y: 0} - m_SizeDelta: {x: 2480, y: 2480} + m_AnchoredPosition: {x: 0, y: 200} + m_SizeDelta: {x: 3000, y: 3000} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1943785795 MonoBehaviour: @@ -18539,6 +18540,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 47b15dbef5eb46140a92fffa0f17cfcb, type: 3} m_Name: m_EditorClassIdentifier: + canvas: {fileID: 0} --- !u!114 &1943785796 MonoBehaviour: m_ObjectHideFlags: 0 @@ -18552,7 +18554,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9433962, g: 0.37824848, b: 0.37824848, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -19271,6 +19273,17 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 1241959018} + m_MethodName: SaveSignature + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1997411412 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-5-Postcard.unity b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-5-Postcard.unity index 2b37d7a..6723822 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-5-Postcard.unity +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-5-Postcard.unity @@ -188,10 +188,9 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 38213200} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 746257130} + m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -440,6 +439,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 324924812} m_CullTransparentMesh: 0 +--- !u!1 &381113713 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 381113714} + - component: {fileID: 381113716} + - component: {fileID: 381113715} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &381113714 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 381113713} + 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: 1345923362} + - {fileID: 848937443} + m_Father: {fileID: 1016033625} + 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 &381113715 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 381113713} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, 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_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &381113716 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 381113713} + m_CullTransparentMesh: 0 --- !u!1 &395441760 GameObject: m_ObjectHideFlags: 0 @@ -868,7 +941,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &621394282 MonoBehaviour: m_ObjectHideFlags: 0 @@ -876,7 +949,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 621394281} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 2202f0779f426064491ff258c8a8f9eb, type: 3} m_Name: @@ -1039,8 +1112,8 @@ RectTransform: - {fileID: 481181421} - {fileID: 1855157453} - {fileID: 562984737} - m_Father: {fileID: 38213203} - m_RootOrder: 0 + m_Father: {fileID: 0} + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1091,6 +1164,178 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &794099966 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 794099969} + - component: {fileID: 794099968} + - component: {fileID: 794099967} + m_Layer: 0 + m_Name: Postcard Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &794099967 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 794099966} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2202f0779f426064491ff258c8a8f9eb, type: 3} + m_Name: + m_EditorClassIdentifier: + canvas: {fileID: 0} +--- !u!20 &794099968 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 794099966} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} + m_projectionMatrixMode: 1 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_GateFitMode: 2 + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 500 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 8400000, guid: 1cd6d5a279f1dfe4397018ca9e03fdb6, type: 2} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 0 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &794099969 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 794099966} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -1729, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1016033625} + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &848937442 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 848937443} + - component: {fileID: 848937446} + - component: {fileID: 848937445} + - component: {fileID: 848937444} + m_Layer: 0 + m_Name: Signature + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &848937443 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 848937442} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_Children: [] + m_Father: {fileID: 381113714} + m_RootOrder: 1 + 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: 736, y: -1500} + m_SizeDelta: {x: 2048, y: 800} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &848937444 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 848937442} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9550b89dc30ed384d8741f172b12127d, type: 3} + m_Name: + m_EditorClassIdentifier: + canvas: {fileID: 0} +--- !u!114 &848937445 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 848937442} + 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: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &848937446 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 848937442} + m_CullTransparentMesh: 0 --- !u!1 &892526980 GameObject: m_ObjectHideFlags: 0 @@ -1195,6 +1440,87 @@ MonoBehaviour: fontSize: 82 lineSpacing: 1 baseline: 0 +--- !u!1 &1016033624 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1016033625} + - component: {fileID: 1016033627} + - component: {fileID: 1016033626} + m_Layer: 0 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1016033625 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1016033624} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 381113714} + m_Father: {fileID: 794099969} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &1016033626 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1016033624} + 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: 0.5 + 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 &1016033627 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1016033624} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 1 + m_Camera: {fileID: 794099968} + 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 &1117073448 GameObject: m_ObjectHideFlags: 0 @@ -1251,7 +1577,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 371cdf1b424df4241bc5e8324b427050, type: 3} + m_Font: {fileID: 12800000, guid: e288133f5da1362419392193f7879aaa, type: 3} m_FontSize: 120 m_FontStyle: 0 m_BestFit: 0 @@ -1263,7 +1589,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: HHMMSS01 + m_Text: HHMMSS01001 --- !u!222 &1117073452 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1307,7 +1633,7 @@ RectTransform: 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: -306} + m_AnchoredPosition: {x: 0, y: -306} m_SizeDelta: {x: 2048, y: 250} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1262648297 @@ -1376,6 +1702,90 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1262648295} m_CullTransparentMesh: 0 +--- !u!1 &1345923361 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1345923362} + - component: {fileID: 1345923365} + - component: {fileID: 1345923364} + - component: {fileID: 1345923363} + m_Layer: 0 + m_Name: Painting + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1345923362 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1345923361} + 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: 381113714} + 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: 200} + m_SizeDelta: {x: 3000, y: 3000} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1345923363 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1345923361} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 47b15dbef5eb46140a92fffa0f17cfcb, type: 3} + m_Name: + m_EditorClassIdentifier: + canvas: {fileID: 0} +--- !u!114 &1345923364 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1345923361} + 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: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &1345923365 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1345923361} + m_CullTransparentMesh: 0 --- !u!1 &1478432113 GameObject: m_ObjectHideFlags: 0 @@ -1403,15 +1813,15 @@ RectTransform: m_GameObject: {fileID: 1478432113} 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_LocalScale: {x: 0.6, y: 0.6, z: 0.6} m_Children: [] m_Father: {fileID: 746257130} 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: 347} - m_SizeDelta: {x: 1280, y: 904.9031} + m_AnchoredPosition: {x: 0, y: 619} + m_SizeDelta: {x: 1500, y: 2100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1478432115 MonoBehaviour: @@ -1431,7 +1841,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 8400000, guid: 926a63ef985233242aa29857b5bbc1d2, type: 2} + m_Texture: {fileID: 8400000, guid: 1cd6d5a279f1dfe4397018ca9e03fdb6, type: 2} m_UVRect: serializedVersion: 2 x: 0 @@ -1580,7 +1990,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1661934915 RectTransform: m_ObjectHideFlags: 0 diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Asset/Highlight.mat b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Asset/Highlight.mat index f15056f..8eaf491 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Asset/Highlight.mat +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Asset/Highlight.mat @@ -84,7 +84,7 @@ Material: - _StencilWriteMask: 255 - _UVSec: 0 - _UseYpCbCr: 0 - - _VertScale: -1 + - _VertScale: 1 - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/LastPaintingImage.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/LastPaintingImage.cs index b2c74a3..94724fe 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/LastPaintingImage.cs +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/LastPaintingImage.cs @@ -10,6 +10,9 @@ namespace UltraCombos.Marvel.DrawHeroes { RawImage image; + [SerializeField] + PaintCraft.CanvasController canvas; + private void Start() { image = GetComponent(); @@ -19,7 +22,14 @@ namespace UltraCombos.Marvel.DrawHeroes { if (image.texture == null) { - image.texture = AppData.Instance.lastPainting; + if (canvas) + { + image.texture = canvas.BackLayerController.RenderTexture; + } + else + { + image.texture = AppData.Instance.lastPainting; + } } } } diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/LastSignatureImage.cs.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/LastSignatureImage.cs.meta new file mode 100644 index 0000000..779e0fe --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/LastSignatureImage.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9550b89dc30ed384d8741f172b12127d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/PaintSender.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/PaintSender.cs index 9b95f8e..aa8c877 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/PaintSender.cs +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/PaintSender.cs @@ -42,6 +42,14 @@ namespace UltraCombos.Marvel.DrawHeroes } } + public void SaveSignature() + { + if (coroutine == null) + { + coroutine = StartCoroutine(DoSaveSignature()); + } + } + IEnumerator DoSavePainting() { yield return canvas.MakeColoringTexture(); diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/ResourceClient.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/ResourceClient.cs index 0c5c30e..10f2112 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/ResourceClient.cs +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/ResourceClient.cs @@ -78,7 +78,7 @@ namespace UltraCombos.Marvel.DrawHeroes public void SendData(Texture2D painting, Texture2D signature, Texture2D thumbnail) { - if (State != ChannelState.Ready || is_data_sent) + if (/*State != ChannelState.Ready ||*/ is_data_sent) return; #if false var content = tex.GetRawTextureData(); diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Packages/manifest.json b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Packages/manifest.json index d4a8bfe..ed8ed1a 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Packages/manifest.json +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Packages/manifest.json @@ -2,7 +2,8 @@ "dependencies": { "com.ultracombos.configuration": "file:/../../../../../_Package/com.ultracombos.configuration", "com.ultracombos.grpc": "file:/../../../../../_Package/com.ultracombos.grpc", - "com.ultracombos.utility-native-plugin": "file:/../../../../../_Package/com.ultracombos.utility-native-plugin", + "com.ultracombos.utility-native-plugin": "file:/../../../../../_Package/com.ultracombos.utility-native-plugin", + "com.ultracombos.frozen.royal-gallery-asset": "file:/../../../../../_Package/com.ultracombos.frozen.royal-gallery-asset", "com.unity.package-manager-ui": "2.0.8", "com.unity.modules.ai": "1.0.0", "com.unity.modules.animation": "1.0.0",