diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/GirlsRoom/Script/Printer/PrinterClient.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/GirlsRoom/Script/Printer/PrinterClient.cs index a278bdc..b3da845 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/GirlsRoom/Script/Printer/PrinterClient.cs +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/GirlsRoom/Script/Printer/PrinterClient.cs @@ -28,8 +28,8 @@ namespace UltraCombos.Utility public void Print(Texture2D painting) { - if (State != ChannelState.Ready) - return; + //if (State != ChannelState.Ready) + // return; var content = painting.EncodeToJPG(); diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/GirlsRoom/Script/PrintingGenerator.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/GirlsRoom/Script/PrintingGenerator.cs index 46e5928..e0ec0ca 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/GirlsRoom/Script/PrintingGenerator.cs +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/GirlsRoom/Script/PrintingGenerator.cs @@ -39,7 +39,7 @@ namespace UltraCombos.Minions.GirlsRoom.Nav setting_filename = $"{Application.dataPath}/../Settings.json"; var json = File.ReadAllText(setting_filename); - var config = JsonUtility.FromJson(json); + var config = JsonUtility.FromJson(json); luggage_path = config.luggagePath; Debug.Log($"Luggage path: {luggage_path}"); } diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/GirlsRoom/Script/ResourceServer.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/GirlsRoom/Script/ResourceServer.cs index f2ab92b..585cd36 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/GirlsRoom/Script/ResourceServer.cs +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/GirlsRoom/Script/ResourceServer.cs @@ -6,8 +6,9 @@ using System.Threading.Tasks; using UnityEngine; using UnityEngine.Events; using UnityEngine.Networking; +using UltraCombos.Minions.GirlsRoom.Nav; -namespace UltraCombos.Minions.GirlsRoom.Nav +namespace UltraCombos.Marvel.DrawHeroes { class Config { @@ -180,7 +181,7 @@ namespace UltraCombos.Minions.GirlsRoom.Nav return; } - var artwork = new Artwork() { serial = data.Serial, painting = painting, signature = signature }; + var artwork = new Minions.GirlsRoom.Nav.Artwork() { serial = data.Serial, painting = painting, signature = signature }; var folder = Directory.CreateDirectory($"{store_dir.FullName}/{data.Serial}"); string painting_path = $"{folder.FullName}/{painting_filename}"; @@ -189,7 +190,7 @@ namespace UltraCombos.Minions.GirlsRoom.Nav File.WriteAllBytes(signature_path, data.Signature.ToByteArray()); last_data = artwork; - luggagePrinter.PrintLuggage(artwork); + //luggagePrinter.PrintLuggage(artwork); onPaintingReceived.Invoke(artwork, painting_path, signature_path); Log($"Painting {data.Id} is loaded. ({painting.width} x {painting.height})"); } @@ -212,15 +213,18 @@ namespace UltraCombos.Minions.GirlsRoom.Nav 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) { return Task.FromResult(new Index { Id = -1, Serial = "" }); } + */ - + public override Task GetPage(Device request, ServerCallContext context) + { + return Task.FromResult(new Page { Id = "", Serial = "" }); + } } - - } diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/GirlsRoomNavigator.unity b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/GirlsRoomNavigator.unity index 45132bd..5a233b3 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/GirlsRoomNavigator.unity +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/GirlsRoomNavigator.unity @@ -50,7 +50,6 @@ LightmapSettings: m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 @@ -117,7 +116,8 @@ NavMeshSettings: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 24775970} @@ -134,7 +134,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 24775969} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -152,7 +153,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 24775969} m_Enabled: 1 m_EditorHideFlags: 0 @@ -165,8 +167,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -175,18 +175,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &24775972 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 24775969} m_CullTransparentMesh: 0 --- !u!1 &42748816 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 42748817} @@ -203,7 +206,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 42748816} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -221,7 +225,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 42748816} m_Enabled: 1 m_EditorHideFlags: 0 @@ -234,8 +239,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -244,18 +247,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &42748819 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 42748816} m_CullTransparentMesh: 0 --- !u!1 &66363468 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 66363469} @@ -272,7 +278,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 66363468} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -290,7 +297,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 66363468} m_Enabled: 1 m_EditorHideFlags: 0 @@ -303,8 +311,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -313,23 +319,27 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &66363471 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 66363468} m_CullTransparentMesh: 0 --- !u!224 &92474821 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} - m_PrefabInternal: {fileID: 1651604158} + type: 3} + m_PrefabInstance: {fileID: 1651604158} + m_PrefabAsset: {fileID: 0} --- !u!1 &107706126 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 107706127} @@ -346,7 +356,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 107706126} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -364,7 +375,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 107706126} m_Enabled: 1 m_EditorHideFlags: 0 @@ -377,8 +389,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 1ad93c5d9f837cb459c9cb2805dcc183, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -387,18 +397,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &107706129 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 107706126} m_CullTransparentMesh: 0 --- !u!1 &126320257 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 126320259} @@ -414,7 +427,8 @@ GameObject: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 126320257} m_Enabled: 1 m_EditorHideFlags: 0 @@ -431,7 +445,8 @@ MonoBehaviour: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 126320257} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -444,7 +459,8 @@ Transform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 136420941} @@ -460,7 +476,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 136420940} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -480,7 +497,8 @@ RectTransform: CanvasGroup: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 136420940} m_Enabled: 1 m_Alpha: 0.67 @@ -491,7 +509,8 @@ CanvasGroup: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 142495251} @@ -508,7 +527,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 142495250} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -526,7 +546,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 142495250} m_Enabled: 1 m_EditorHideFlags: 0 @@ -539,8 +560,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 07e5fab14e6ed7749ac4f6d249276790, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -549,18 +568,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &142495253 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 142495250} m_CullTransparentMesh: 0 --- !u!1 &143218146 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 143218147} @@ -577,7 +599,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 143218146} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -595,7 +618,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 143218146} m_Enabled: 1 m_EditorHideFlags: 0 @@ -608,8 +632,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -618,18 +640,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &143218149 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 143218146} m_CullTransparentMesh: 0 --- !u!1 &185202468 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 185202469} @@ -646,7 +671,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 185202468} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -664,7 +690,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 185202468} m_Enabled: 1 m_EditorHideFlags: 0 @@ -677,8 +704,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Texture: {fileID: 0} m_UVRect: serializedVersion: 2 @@ -690,14 +715,16 @@ MonoBehaviour: CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 185202468} m_CullTransparentMesh: 0 --- !u!1 &221191058 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 221191059} @@ -714,7 +741,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 221191058} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -732,7 +760,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 221191058} m_Enabled: 1 m_EditorHideFlags: 0 @@ -745,8 +774,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -755,18 +782,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &221191061 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 221191058} m_CullTransparentMesh: 0 --- !u!1 &270760621 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 270760622} @@ -783,7 +813,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 270760621} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -801,7 +832,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 270760621} m_Enabled: 1 m_EditorHideFlags: 0 @@ -814,8 +846,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -824,18 +854,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &270760624 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 270760621} m_CullTransparentMesh: 0 --- !u!1 &277273293 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 277273294} @@ -852,7 +885,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 277273293} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -870,7 +904,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 277273293} m_Enabled: 1 m_EditorHideFlags: 0 @@ -883,8 +918,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 96962988a7690c54c98c1587ab50b6e4, type: 3} m_FontSize: 74 @@ -903,14 +936,16 @@ MonoBehaviour: CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 277273293} m_CullTransparentMesh: 0 --- !u!1 &372890490 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 372890491} @@ -927,7 +962,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 372890490} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -945,7 +981,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 372890490} m_Enabled: 1 m_EditorHideFlags: 0 @@ -958,8 +995,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 96962988a7690c54c98c1587ab50b6e4, type: 3} m_FontSize: 74 @@ -978,14 +1013,16 @@ MonoBehaviour: CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 372890490} m_CullTransparentMesh: 0 --- !u!1 &375078463 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 375078464} @@ -1002,7 +1039,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 375078463} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1020,7 +1058,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 375078463} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1033,8 +1072,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -1043,18 +1080,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &375078466 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 375078463} m_CullTransparentMesh: 0 --- !u!1 &403658386 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 403658387} @@ -1073,7 +1113,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 403658386} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1092,7 +1133,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 403658386} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1132,13 +1174,12 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Scrollbar+ScrollEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &403658389 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 403658386} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1151,8 +1192,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 @@ -1161,18 +1200,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &403658390 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 403658386} m_CullTransparentMesh: 0 --- !u!225 &403658391 CanvasGroup: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 403658386} m_Enabled: 1 m_Alpha: 1 @@ -1183,7 +1225,8 @@ CanvasGroup: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 433562645} @@ -1200,7 +1243,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 433562644} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1218,7 +1262,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 433562644} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1231,8 +1276,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -1241,18 +1284,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &433562647 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 433562644} m_CullTransparentMesh: 0 --- !u!1 &441251961 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 441251962} @@ -1269,7 +1315,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 441251961} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1287,7 +1334,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 441251961} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1300,8 +1348,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 7fc91dfba15b9af4395b39108f3e1c79, type: 3} m_FontSize: 48 @@ -1320,14 +1366,16 @@ MonoBehaviour: CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 441251961} m_CullTransparentMesh: 0 --- !u!1 &444226240 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 444226241} @@ -1342,7 +1390,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 444226240} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1364,7 +1413,8 @@ RectTransform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 467531130} @@ -1381,7 +1431,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 467531129} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1399,7 +1450,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 467531129} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1412,8 +1464,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -1422,18 +1472,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &467531132 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 467531129} m_CullTransparentMesh: 0 --- !u!1 &482007707 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 482007708} @@ -1451,7 +1504,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 482007707} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1470,7 +1524,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 482007707} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1516,13 +1571,12 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &482007710 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 482007707} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1535,8 +1589,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 9fd6566f179d7894180bbb137fa1a8cb, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -1545,18 +1597,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &482007711 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 482007707} m_CullTransparentMesh: 0 --- !u!1 &485759376 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 485759377} @@ -1573,7 +1628,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 485759376} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1591,7 +1647,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 485759376} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1604,8 +1661,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -1614,18 +1669,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &485759379 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 485759376} m_CullTransparentMesh: 0 --- !u!1 &509724727 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 509724728} @@ -1642,7 +1700,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 509724727} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1660,7 +1719,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 509724727} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1673,8 +1733,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Texture: {fileID: 2800000, guid: e289b50c1f2020b4db0b73c35f077ae8, type: 3} m_UVRect: serializedVersion: 2 @@ -1686,14 +1744,16 @@ MonoBehaviour: CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 509724727} m_CullTransparentMesh: 0 --- !u!1 &534669902 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 534669905} @@ -1710,14 +1770,16 @@ GameObject: AudioListener: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 534669902} m_Enabled: 1 --- !u!20 &534669904 Camera: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 534669902} m_Enabled: 1 serializedVersion: 2 @@ -1726,6 +1788,7 @@ Camera: 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 @@ -1757,7 +1820,8 @@ Camera: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 534669902} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: -10} @@ -1770,7 +1834,8 @@ Transform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 549065343} @@ -1787,7 +1852,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 549065342} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1805,7 +1871,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 549065342} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1818,8 +1885,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 7fc91dfba15b9af4395b39108f3e1c79, type: 3} m_FontSize: 70 @@ -1838,182 +1903,184 @@ MonoBehaviour: CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 549065342} m_CullTransparentMesh: 0 --- !u!1001 &549798669 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 1352319089} m_Modifications: + - target: {fileID: 1224928779817680, guid: 64a4a91ab8a2f654fbaf27c8084b2402, type: 3} + propertyPath: m_Name + value: Painting-15x10cm-1770x1180px + objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_SizeDelta.x value: 3508 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_SizeDelta.y value: 2480 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_AnchorMin.y value: 0.5 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_AnchorMax.x value: 0.5 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_AnchorMax.y value: 0.5 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 1224928779817680, guid: 64a4a91ab8a2f654fbaf27c8084b2402, type: 2} - propertyPath: m_Name - value: Painting-15x10cm-1770x1180px - objectReference: {fileID: 0} - - target: {fileID: 1500130722692578, guid: 64a4a91ab8a2f654fbaf27c8084b2402, type: 2} + - target: {fileID: 1500130722692578, guid: 64a4a91ab8a2f654fbaf27c8084b2402, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - target: {fileID: 114015802413654752, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} - target: {fileID: 224150128891029064, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 224982266817039212, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224982266817039212, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} - propertyPath: m_AnchoredPosition.y - value: -1100 - objectReference: {fileID: 0} - target: {fileID: 224150128891029064, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_AnchoredPosition.y value: 250 objectReference: {fileID: 0} - target: {fileID: 224150128891029064, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_LocalScale.x value: 1 objectReference: {fileID: 0} - target: {fileID: 224150128891029064, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_LocalScale.y value: 1 objectReference: {fileID: 0} - target: {fileID: 224150128891029064, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_LocalScale.z value: 1 objectReference: {fileID: 0} - target: {fileID: 224982266817039212, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224982266817039212, guid: 64a4a91ab8a2f654fbaf27c8084b2402, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -1100 + objectReference: {fileID: 0} + - target: {fileID: 224982266817039212, guid: 64a4a91ab8a2f654fbaf27c8084b2402, + type: 3} propertyPath: m_LocalScale.x value: 1 objectReference: {fileID: 0} - target: {fileID: 224982266817039212, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_LocalScale.y value: 1 objectReference: {fileID: 0} - target: {fileID: 224982266817039212, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_LocalScale.z value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 64a4a91ab8a2f654fbaf27c8084b2402, type: 2} - m_IsPrefabAsset: 0 + m_SourcePrefab: {fileID: 100100000, guid: 64a4a91ab8a2f654fbaf27c8084b2402, type: 3} --- !u!224 &549798670 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} - m_PrefabInternal: {fileID: 549798669} + type: 3} + m_PrefabInstance: {fileID: 549798669} + m_PrefabAsset: {fileID: 0} --- !u!1 &567532097 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 567532098} @@ -2030,7 +2097,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 567532097} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2048,7 +2116,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 567532097} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2061,8 +2130,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 96962988a7690c54c98c1587ab50b6e4, type: 3} m_FontSize: 74 @@ -2081,14 +2148,16 @@ MonoBehaviour: CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 567532097} m_CullTransparentMesh: 0 --- !u!1 &580701400 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 580701401} @@ -2105,7 +2174,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 580701400} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2123,7 +2193,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 580701400} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2136,8 +2207,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: d22072d8a4a66954db5b3bb3612b0ee5, type: 3} m_FontSize: 28 @@ -2156,14 +2225,16 @@ MonoBehaviour: CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 580701400} m_CullTransparentMesh: 0 --- !u!1 &598081054 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 598081055} @@ -2180,7 +2251,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 598081054} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2198,7 +2270,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 598081054} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2211,8 +2284,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 @@ -2221,18 +2292,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &598081057 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 598081054} m_CullTransparentMesh: 0 --- !u!1 &612229215 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 612229216} @@ -2247,7 +2321,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 612229215} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2266,7 +2341,8 @@ RectTransform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 621046121} @@ -2284,7 +2360,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 621046120} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2304,7 +2381,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 621046120} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2320,7 +2398,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 621046120} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2341,7 +2420,8 @@ MonoBehaviour: Canvas: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 621046120} m_Enabled: 1 serializedVersion: 3 @@ -2361,7 +2441,8 @@ Canvas: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 626196920} @@ -2378,7 +2459,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 626196919} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2396,7 +2478,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 626196919} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2409,8 +2492,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -2419,18 +2500,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &626196922 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 626196919} m_CullTransparentMesh: 0 --- !u!1 &634144236 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 634144238} @@ -2447,7 +2531,8 @@ GameObject: Camera: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 634144236} m_Enabled: 1 serializedVersion: 2 @@ -2456,6 +2541,7 @@ Camera: 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 @@ -2487,7 +2573,8 @@ Camera: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 634144236} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1000, y: 1500, z: 0} @@ -2501,7 +2588,8 @@ Transform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 634144236} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2522,13 +2610,12 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UltraCombos.Minions.GirlsRoom.Nav.ArtworkGenerator+ArtworkEvent, Assembly-CSharp, - Version=0.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!1 &641566178 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 641566179} @@ -2545,7 +2632,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 641566178} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2570,7 +2658,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 641566178} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2583,8 +2672,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 07e5fab14e6ed7749ac4f6d249276790, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -2593,18 +2680,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &641566181 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 641566178} m_CullTransparentMesh: 0 --- !u!1 &673829345 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 673829346} @@ -2621,7 +2711,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 673829345} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2639,7 +2730,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 673829345} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2652,8 +2744,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 82a0857e37f00714ebb503040e90beb6, type: 3} m_FontSize: 30 @@ -2672,14 +2762,16 @@ MonoBehaviour: CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 673829345} m_CullTransparentMesh: 0 --- !u!1 &690203093 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 690203094} @@ -2698,7 +2790,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 690203093} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2721,7 +2814,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 690203093} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2732,7 +2826,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 690203093} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2745,8 +2840,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -2755,11 +2848,13 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!225 &690203097 CanvasGroup: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 690203093} m_Enabled: 1 m_Alpha: 1 @@ -2770,14 +2865,16 @@ CanvasGroup: CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 690203093} m_CullTransparentMesh: 0 --- !u!1 &750270579 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 750270580} @@ -2794,7 +2891,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 750270579} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2806,13 +2904,14 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 245, y: 65} + m_SizeDelta: {x: 378, y: 65} m_Pivot: {x: 0, y: 1} --- !u!114 &750270581 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 750270579} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2825,8 +2924,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -2835,18 +2932,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &750270582 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 750270579} m_CullTransparentMesh: 0 --- !u!1 &799147170 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 799147171} @@ -2863,7 +2963,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 799147170} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2881,7 +2982,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 799147170} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2894,8 +2996,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -2904,18 +3004,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &799147173 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 799147170} m_CullTransparentMesh: 0 --- !u!1 &829591925 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 829591926} @@ -2932,7 +3035,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 829591925} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2950,7 +3054,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 829591925} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2963,8 +3068,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 @@ -2973,18 +3076,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &829591928 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 829591925} m_CullTransparentMesh: 0 --- !u!1 &831310638 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 831310639} @@ -3002,7 +3108,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 831310638} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3021,7 +3128,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 831310638} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3067,13 +3175,12 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &831310641 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 831310638} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3086,8 +3193,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 @@ -3096,18 +3201,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &831310642 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 831310638} m_CullTransparentMesh: 0 --- !u!1 &840875454 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 840875455} @@ -3126,7 +3234,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 840875454} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3149,7 +3258,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 840875454} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3160,7 +3270,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 840875454} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3173,8 +3284,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -3183,11 +3292,13 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!225 &840875458 CanvasGroup: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 840875454} m_Enabled: 1 m_Alpha: 1 @@ -3198,14 +3309,16 @@ CanvasGroup: CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 840875454} m_CullTransparentMesh: 0 --- !u!1 &846520762 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 846520763} @@ -3222,7 +3335,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 846520762} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3240,7 +3354,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 846520762} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3253,8 +3368,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Texture: {fileID: 2800000, guid: 6e4e5f66aeb09504897a799b545caaf0, type: 3} m_UVRect: serializedVersion: 2 @@ -3266,14 +3379,16 @@ MonoBehaviour: CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 846520762} m_CullTransparentMesh: 0 --- !u!1 &871720291 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 871720292} @@ -3291,7 +3406,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 871720291} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3310,7 +3426,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 871720291} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3367,13 +3484,12 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &871720294 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 871720291} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3386,8 +3502,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 9fd6566f179d7894180bbb137fa1a8cb, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -3396,18 +3510,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &871720295 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 871720291} m_CullTransparentMesh: 0 --- !u!1 &954220329 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 954220330} @@ -3424,7 +3541,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 954220329} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3442,7 +3560,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 954220329} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3455,8 +3574,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -3465,18 +3582,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &954220332 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 954220329} m_CullTransparentMesh: 0 --- !u!1 &969675704 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 969675705} @@ -3495,7 +3615,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 969675704} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3516,7 +3637,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 969675704} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3527,7 +3649,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 969675704} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3540,8 +3663,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -3550,18 +3671,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &969675708 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 969675704} m_CullTransparentMesh: 0 --- !u!225 &969675709 CanvasGroup: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 969675704} m_Enabled: 1 m_Alpha: 1 @@ -3572,7 +3696,8 @@ CanvasGroup: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 977446578} @@ -3589,7 +3714,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 977446577} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3607,7 +3733,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 977446577} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3620,8 +3747,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: d22072d8a4a66954db5b3bb3612b0ee5, type: 3} m_FontSize: 28 @@ -3640,14 +3765,16 @@ MonoBehaviour: CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 977446577} m_CullTransparentMesh: 0 --- !u!1 &983837826 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 983837827} @@ -3664,7 +3791,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 983837826} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3682,7 +3810,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 983837826} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3695,8 +3824,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -3705,18 +3832,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &983837829 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 983837826} m_CullTransparentMesh: 0 --- !u!1 &985872625 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 985872626} @@ -3733,7 +3863,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 985872625} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3751,7 +3882,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 985872625} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3764,8 +3896,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -3774,18 +3904,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &985872628 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 985872625} m_CullTransparentMesh: 0 --- !u!1 &1005367764 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1005367767} @@ -3797,12 +3930,13 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1005367765 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1005367764} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3812,18 +3946,15 @@ MonoBehaviour: onPrint: m_PersistentCalls: m_Calls: [] - m_TypeName: UltraCombos.Minions.GirlsRoom.Nav.PrintingGenerator+TextureEvent, - Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null onPrintLuggage: m_PersistentCalls: m_Calls: [] - m_TypeName: UltraCombos.Minions.GirlsRoom.Nav.PrintingGenerator+LuggageEvent, - Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!20 &1005367766 Camera: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1005367764} m_Enabled: 1 serializedVersion: 2 @@ -3832,6 +3963,7 @@ Camera: 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 @@ -3863,7 +3995,8 @@ Camera: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1005367764} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -3279, y: 500, z: 0} @@ -3877,7 +4010,8 @@ Transform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1045448184} @@ -3895,7 +4029,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1045448183} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3914,7 +4049,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1045448183} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3960,13 +4096,12 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &1045448186 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1045448183} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3979,8 +4114,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 @@ -3989,18 +4122,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1045448187 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1045448183} m_CullTransparentMesh: 0 --- !u!1 &1147096825 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1147096828} @@ -4017,7 +4153,8 @@ GameObject: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1147096825} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4038,29 +4175,15 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UltraCombos.Minions.GirlsRoom.Nav.PrintingGenerator+TextureEvent, - Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null onPrintLuggage: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1005367765} - m_MethodName: PrintLuggage - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 0 - m_TypeName: UltraCombos.Minions.GirlsRoom.Nav.PrintingGenerator+LuggageEvent, - Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_Calls: [] --- !u!20 &1147096827 Camera: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1147096825} m_Enabled: 1 serializedVersion: 2 @@ -4069,6 +4192,7 @@ Camera: 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 @@ -4100,7 +4224,8 @@ Camera: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1147096825} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1600, y: 500, z: 0} @@ -4114,7 +4239,8 @@ Transform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1216005038} @@ -4132,7 +4258,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1216005037} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4151,7 +4278,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1216005037} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4198,13 +4326,12 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &1216005040 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1216005037} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4217,8 +4344,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 192a6c45b8a7fea4db7dbb8d60ffeab0, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -4227,18 +4352,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1216005041 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1216005037} m_CullTransparentMesh: 0 --- !u!1 &1229780803 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1229780804} @@ -4255,7 +4383,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1229780803} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4273,7 +4402,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1229780803} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4286,8 +4416,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -4296,18 +4424,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1229780806 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1229780803} m_CullTransparentMesh: 0 --- !u!1 &1232049704 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1232049705} @@ -4324,7 +4455,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1232049704} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4342,7 +4474,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1232049704} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4355,8 +4488,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 68130692864f58b48bba876426fdb254, type: 3} m_FontSize: 81 @@ -4375,14 +4506,16 @@ MonoBehaviour: CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1232049704} m_CullTransparentMesh: 0 --- !u!1 &1276234955 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1276234956} @@ -4399,7 +4532,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1276234955} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4417,7 +4551,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1276234955} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4430,8 +4565,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -4440,18 +4573,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1276234958 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1276234955} m_CullTransparentMesh: 0 --- !u!1 &1278955125 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1278955126} @@ -4469,7 +4605,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1278955125} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4488,7 +4625,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1278955125} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4545,13 +4683,12 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &1278955128 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1278955125} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4564,8 +4701,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 9fd6566f179d7894180bbb137fa1a8cb, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -4574,18 +4709,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1278955129 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1278955125} m_CullTransparentMesh: 0 --- !u!1 &1290231700 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1290231703} @@ -4602,7 +4740,8 @@ GameObject: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1290231700} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4620,7 +4759,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1290231700} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4634,7 +4774,8 @@ MonoBehaviour: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1290231700} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4647,7 +4788,8 @@ Transform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1305492451} @@ -4664,7 +4806,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1305492450} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4687,7 +4830,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1305492450} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4709,8 +4853,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UltraCombos.Minions.GirlsRoom.Nav.PrintingManager+ThumbnailEvent, - Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null onDelete: m_PersistentCalls: m_Calls: @@ -4725,13 +4867,12 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UltraCombos.Minions.GirlsRoom.Nav.PrintingManager+ThumbnailEvent, - Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!225 &1305492453 CanvasGroup: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1305492450} m_Enabled: 1 m_Alpha: 1 @@ -4742,7 +4883,8 @@ CanvasGroup: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1329940401} @@ -4758,7 +4900,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1329940400} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4796,7 +4939,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1329940400} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4819,7 +4963,8 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1352319089} @@ -4837,7 +4982,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1352319088} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4857,7 +5003,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1352319088} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4873,7 +5020,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1352319088} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4894,7 +5042,8 @@ MonoBehaviour: Canvas: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1352319088} m_Enabled: 1 serializedVersion: 3 @@ -4914,7 +5063,8 @@ Canvas: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1372414771} @@ -4931,7 +5081,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1372414770} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4949,7 +5100,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1372414770} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4962,8 +5114,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -4972,18 +5122,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1372414773 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1372414770} m_CullTransparentMesh: 0 --- !u!1 &1466760335 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1466760336} @@ -5000,7 +5153,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1466760335} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5018,7 +5172,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1466760335} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5031,8 +5186,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 1ad93c5d9f837cb459c9cb2805dcc183, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -5041,18 +5194,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1466760338 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1466760335} m_CullTransparentMesh: 0 --- !u!1 &1495857722 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1495857723} @@ -5070,7 +5226,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1495857722} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5088,7 +5245,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1495857722} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5135,13 +5293,12 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &1495857725 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1495857722} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5154,8 +5311,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: f541fe409dee39f46918ddbb987f787c, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -5164,18 +5319,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1495857726 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1495857722} m_CullTransparentMesh: 0 --- !u!1 &1497926486 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1497926487} @@ -5192,7 +5350,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1497926486} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5210,7 +5369,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1497926486} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5223,8 +5383,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 96962988a7690c54c98c1587ab50b6e4, type: 3} m_FontSize: 74 @@ -5243,14 +5401,16 @@ MonoBehaviour: CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1497926486} m_CullTransparentMesh: 0 --- !u!1 &1513915735 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1513915736} @@ -5265,7 +5425,8 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1513915735} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5278,7 +5439,8 @@ Transform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1522636372} @@ -5297,7 +5459,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1522636371} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5317,7 +5480,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1522636371} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5337,7 +5501,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1522636371} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5350,8 +5515,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -5360,18 +5523,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1522636375 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1522636371} m_CullTransparentMesh: 0 --- !u!225 &1522636376 CanvasGroup: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1522636371} m_Enabled: 1 m_Alpha: 1 @@ -5382,7 +5548,8 @@ CanvasGroup: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1578131958} @@ -5399,7 +5566,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1578131957} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5417,7 +5585,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1578131957} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5430,8 +5599,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -5440,18 +5607,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1578131960 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1578131957} m_CullTransparentMesh: 0 --- !u!1 &1593492004 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1593492005} @@ -5468,7 +5638,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1593492004} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5486,7 +5657,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1593492004} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5499,8 +5671,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 7fc91dfba15b9af4395b39108f3e1c79, type: 3} m_FontSize: 60 @@ -5519,14 +5689,16 @@ MonoBehaviour: CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1593492004} m_CullTransparentMesh: 0 --- !u!1 &1594539877 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1594539879} @@ -5542,7 +5714,8 @@ GameObject: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1594539877} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5554,13 +5727,12 @@ MonoBehaviour: onStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UltraCombos.GrpcClientBase+StateEvent, com.ultracombos.grpc.Runtime, - Version=0.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!4 &1594539879 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1594539877} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5573,7 +5745,8 @@ Transform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1637950944} @@ -5590,7 +5763,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1637950943} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5608,7 +5782,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1637950943} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5621,8 +5796,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 7fc91dfba15b9af4395b39108f3e1c79, type: 3} m_FontSize: 60 @@ -5641,14 +5814,16 @@ MonoBehaviour: CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1637950943} m_CullTransparentMesh: 0 --- !u!1 &1648987186 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1648987187} @@ -5665,7 +5840,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1648987186} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5683,7 +5859,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1648987186} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5696,8 +5873,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 57d1f68ded19e0945bc0d7a4569086b2, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -5706,122 +5881,128 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1648987189 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1648987186} m_CullTransparentMesh: 0 --- !u!1001 &1651604158 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 2005518501} m_Modifications: + - target: {fileID: 1224928779817680, guid: 64a4a91ab8a2f654fbaf27c8084b2402, type: 3} + propertyPath: m_Name + value: Painting-29.7x21cm-3508x2480px + objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_SizeDelta.x value: 3508 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_SizeDelta.y value: 2480 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_AnchorMin.y value: 0.5 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_AnchorMax.x value: 0.5 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_AnchorMax.y value: 0.5 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 1224928779817680, guid: 64a4a91ab8a2f654fbaf27c8084b2402, type: 2} - propertyPath: m_Name - value: Painting-29.7x21cm-3508x2480px + - target: {fileID: 1496305634803178, guid: 64a4a91ab8a2f654fbaf27c8084b2402, type: 3} + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 64a4a91ab8a2f654fbaf27c8084b2402, type: 2} - m_IsPrefabAsset: 0 + m_SourcePrefab: {fileID: 100100000, guid: 64a4a91ab8a2f654fbaf27c8084b2402, type: 3} --- !u!1 &1661187657 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1661187658} @@ -5839,7 +6020,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1661187657} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5858,7 +6040,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1661187657} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5904,13 +6087,12 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &1661187660 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1661187657} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5923,8 +6105,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 9fd6566f179d7894180bbb137fa1a8cb, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -5933,18 +6113,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1661187661 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1661187657} m_CullTransparentMesh: 0 --- !u!1 &1718105679 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1718105680} @@ -5959,7 +6142,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1718105679} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5977,13 +6161,15 @@ RectTransform: --- !u!224 &1727091377 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} - m_PrefabInternal: {fileID: 2127175441} + type: 3} + m_PrefabInstance: {fileID: 2127175441} + m_PrefabAsset: {fileID: 0} --- !u!1 &1755475263 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1755475264} @@ -6000,7 +6186,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1755475263} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6018,7 +6205,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1755475263} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6031,8 +6219,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 96962988a7690c54c98c1587ab50b6e4, type: 3} m_FontSize: 40 @@ -6051,14 +6237,16 @@ MonoBehaviour: CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1755475263} m_CullTransparentMesh: 0 --- !u!1 &1758601734 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1758601735} @@ -6075,7 +6263,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1758601734} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6093,7 +6282,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1758601734} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6106,8 +6296,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 7fc91dfba15b9af4395b39108f3e1c79, type: 3} m_FontSize: 70 @@ -6126,14 +6314,16 @@ MonoBehaviour: CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1758601734} m_CullTransparentMesh: 0 --- !u!1 &1777299339 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1777299340} @@ -6150,7 +6340,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1777299339} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6168,7 +6359,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1777299339} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6181,8 +6373,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -6191,18 +6381,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1777299342 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1777299339} m_CullTransparentMesh: 0 --- !u!1 &1792734339 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1792734340} @@ -6218,7 +6411,8 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1792734339} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6231,7 +6425,8 @@ Transform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1792734339} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6257,14 +6452,13 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UltraCombos.Minions.GirlsRoom.Nav.ResourceServer+PaintingEvent, Assembly-CSharp, - Version=0.0.0.0, Culture=neutral, PublicKeyToken=null mode: 0 --- !u!1 &1822898133 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1822898134} @@ -6281,7 +6475,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1822898133} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6300,7 +6495,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1822898133} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6313,8 +6509,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 1d3f294d46785a4418df1173dfb7898e, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -6323,18 +6517,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1822898136 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1822898133} m_CullTransparentMesh: 0 --- !u!1 &1839140218 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1839140219} @@ -6351,7 +6548,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1839140218} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6369,7 +6567,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1839140218} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6382,8 +6581,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -6392,18 +6589,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1839140221 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1839140218} m_CullTransparentMesh: 0 --- !u!1 &1863406218 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1863406222} @@ -6421,7 +6621,8 @@ GameObject: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1863406218} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6437,7 +6638,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1863406218} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6458,7 +6660,8 @@ MonoBehaviour: Canvas: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1863406218} m_Enabled: 1 serializedVersion: 3 @@ -6478,7 +6681,8 @@ Canvas: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1863406218} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6505,7 +6709,8 @@ RectTransform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1923762307} @@ -6522,7 +6727,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1923762306} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6540,7 +6746,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1923762306} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6553,8 +6760,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -6563,18 +6768,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1923762309 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1923762306} m_CullTransparentMesh: 0 --- !u!1 &1939787136 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1939787137} @@ -6592,7 +6800,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1939787136} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6611,7 +6820,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1939787136} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6662,13 +6872,12 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Scrollbar+ScrollEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &1939787139 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1939787136} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6681,8 +6890,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 @@ -6691,18 +6898,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1939787140 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1939787136} m_CullTransparentMesh: 0 --- !u!1 &1957629656 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1957629657} @@ -6719,7 +6929,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1957629656} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6737,7 +6948,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1957629656} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6750,8 +6962,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -6760,18 +6970,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1957629659 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1957629656} m_CullTransparentMesh: 0 --- !u!1 &1968051913 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1968051914} @@ -6789,7 +7002,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1968051913} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6808,7 +7022,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1968051913} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6854,13 +7069,12 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &1968051916 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1968051913} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6873,8 +7087,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 9fd6566f179d7894180bbb137fa1a8cb, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -6883,18 +7095,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1968051917 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1968051913} m_CullTransparentMesh: 0 --- !u!1 &1987511107 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1987511108} @@ -6911,7 +7126,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1987511107} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6929,7 +7145,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1987511107} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6942,8 +7159,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 82a0857e37f00714ebb503040e90beb6, type: 3} m_FontSize: 30 @@ -6962,14 +7177,16 @@ MonoBehaviour: CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1987511107} m_CullTransparentMesh: 0 --- !u!1 &1991500117 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1991500118} @@ -6986,7 +7203,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1991500117} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -7004,7 +7222,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1991500117} m_Enabled: 1 m_EditorHideFlags: 0 @@ -7017,8 +7236,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 96962988a7690c54c98c1587ab50b6e4, type: 3} m_FontSize: 48 @@ -7037,14 +7254,16 @@ MonoBehaviour: CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1991500117} m_CullTransparentMesh: 0 --- !u!1 &2005518500 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 2005518501} @@ -7062,7 +7281,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2005518500} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -7081,7 +7301,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2005518500} m_Enabled: 1 m_EditorHideFlags: 0 @@ -7097,7 +7318,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2005518500} m_Enabled: 1 m_EditorHideFlags: 0 @@ -7118,7 +7340,8 @@ MonoBehaviour: Canvas: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2005518500} m_Enabled: 1 serializedVersion: 3 @@ -7138,7 +7361,8 @@ Canvas: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 2010870654} @@ -7155,7 +7379,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2010870653} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -7173,7 +7398,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2010870653} m_Enabled: 1 m_EditorHideFlags: 0 @@ -7186,8 +7412,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 68130692864f58b48bba876426fdb254, type: 3} m_FontSize: 95 @@ -7206,14 +7430,16 @@ MonoBehaviour: CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2010870653} m_CullTransparentMesh: 0 --- !u!1 &2014435465 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 2014435466} @@ -7230,7 +7456,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2014435465} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -7248,7 +7475,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2014435465} m_Enabled: 1 m_EditorHideFlags: 0 @@ -7261,8 +7489,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -7271,18 +7497,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &2014435468 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2014435465} m_CullTransparentMesh: 0 --- !u!1 &2038671410 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 2038671411} @@ -7299,7 +7528,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2038671410} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -7317,7 +7547,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2038671410} m_Enabled: 1 m_EditorHideFlags: 0 @@ -7330,8 +7561,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 7fc91dfba15b9af4395b39108f3e1c79, type: 3} m_FontSize: 60 @@ -7350,14 +7579,16 @@ MonoBehaviour: CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2038671410} m_CullTransparentMesh: 0 --- !u!1 &2123137860 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 2123137861} @@ -7374,7 +7605,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2123137860} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -7392,7 +7624,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2123137860} m_Enabled: 1 m_EditorHideFlags: 0 @@ -7405,8 +7638,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 7fc91dfba15b9af4395b39108f3e1c79, type: 3} m_FontSize: 60 @@ -7425,118 +7656,119 @@ MonoBehaviour: CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2123137860} m_CullTransparentMesh: 0 --- !u!1001 &2127175441 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 621046121} m_Modifications: + - target: {fileID: 1224928779817680, guid: 64a4a91ab8a2f654fbaf27c8084b2402, type: 3} + propertyPath: m_Name + value: Painting-15x10cm-1770x1180px + objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_SizeDelta.x value: 3508 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_SizeDelta.y value: 2480 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_AnchorMin.y value: 0.5 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_AnchorMax.x value: 0.5 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_AnchorMax.y value: 0.5 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - target: {fileID: 224812480872117094, guid: 64a4a91ab8a2f654fbaf27c8084b2402, - type: 2} + type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 1224928779817680, guid: 64a4a91ab8a2f654fbaf27c8084b2402, type: 2} - propertyPath: m_Name - value: Painting-15x10cm-1770x1180px - objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 64a4a91ab8a2f654fbaf27c8084b2402, type: 2} - m_IsPrefabAsset: 0 + m_SourcePrefab: {fileID: 100100000, guid: 64a4a91ab8a2f654fbaf27c8084b2402, type: 3} --- !u!1 &2132569318 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 2132569319} @@ -7553,7 +7785,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2132569318} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -7571,7 +7804,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2132569318} m_Enabled: 1 m_EditorHideFlags: 0 @@ -7584,8 +7818,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Texture: {fileID: 0} m_UVRect: serializedVersion: 2 @@ -7597,6 +7829,7 @@ MonoBehaviour: CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2132569318} m_CullTransparentMesh: 0 diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Settings.json b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Settings.json index 6e25e7b..633650a 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Settings.json +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Settings.json @@ -1,4 +1,4 @@ { - "rootPath":"E:/2018_Minions/Project_2018_Minions/Unity_2018_Girl's_Room_Navigator/Assets/../../../Build_GirlsRoomNav/Painting", - "luggagePath":"E:/2018_Minions/Project_2018_Minions/Unity_2018_Girl's_Room_Navigator/Assets/../../../Build_GirlsRoomNav/Print" + "rootPath":"../../../../_Deploy_PC/03_RoyalGallery/UnityBuild-19050-03_RoyalGallery_Navigator/Build/Painting", + "luggagePath":"../../../../_Deploy_PC/03_RoyalGallery/UnityBuild-19050-03_RoyalGallery_Navigator/Build/Print" } \ No newline at end of file diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/MainGirlsRoom.unity b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait.unity similarity index 88% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/MainGirlsRoom.unity rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait.unity index 5cfeaa2..974a440 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/MainGirlsRoom.unity +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait.unity @@ -251,6 +251,114 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2ef5caefbf76037459e39687e6d1c546, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &275645426 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 275645427} + - component: {fileID: 275645430} + - component: {fileID: 275645429} + - component: {fileID: 275645428} + m_Layer: 0 + m_Name: Role-02 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &275645427 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 275645426} + 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &275645428 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 275645426} + 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: 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 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 275645426} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d2220dc78794eaa4b939e412e9f9b902, type: 3} + m_Name: + m_EditorClassIdentifier: + texture: {fileID: 0} +--- !u!114 &275645430 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 275645426} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 21f70a2ec67c77142bb8578ced0ffec9, type: 3} + m_Name: + m_EditorClassIdentifier: + id: 07 + mode: 0 --- !u!1 &283667689 GameObject: m_ObjectHideFlags: 0 @@ -271,7 +379,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &283667690 RectTransform: m_ObjectHideFlags: 0 @@ -306,7 +414,7 @@ MonoBehaviour: target: 0 materials: [] attributeName: - targetObject: {fileID: 0} + targetObject: {fileID: 283667689} --- !u!114 &283667692 MonoBehaviour: m_ObjectHideFlags: 0 @@ -484,6 +592,114 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 417831287} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &492259777 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + 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 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &492259778 +Transform: + 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: 43.41, y: 72.15, z: 10} + m_LocalScale: {x: 6.436748, y: 14.571055, z: 1} + m_Children: [] + m_Father: {fileID: 2135091040} + m_RootOrder: 0 + 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 +MonoBehaviour: + 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: d2220dc78794eaa4b939e412e9f9b902, type: 3} + m_Name: + m_EditorClassIdentifier: + texture: {fileID: 0} +--- !u!114 &492259781 +MonoBehaviour: + 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: we + mode: 0 --- !u!1 &542808023 GameObject: m_ObjectHideFlags: 0 @@ -891,12 +1107,12 @@ RectTransform: - {fileID: 542808024} - {fileID: 1833696213} m_Father: {fileID: 961139955} - m_RootOrder: 0 + 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_SizeDelta: {x: 4192, y: 1200} + m_SizeDelta: {x: 1080, y: 1920} m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &822012542 PrefabInstance: @@ -909,6 +1125,10 @@ PrefabInstance: propertyPath: m_Name value: Painting Manager objectReference: {fileID: 0} + - target: {fileID: 1820076180253818, guid: 12ab0e5b5933e1f409de3b7ff462a95f, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4566515945476120, guid: 12ab0e5b5933e1f409de3b7ff462a95f, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -939,13 +1159,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4566515945476120, guid: 12ab0e5b5933e1f409de3b7ff462a95f, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 114930378025822482, guid: 12ab0e5b5933e1f409de3b7ff462a95f, type: 3} propertyPath: onPaintingUpdated.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 1547140294} + - target: {fileID: 1307646538150898, guid: 12ab0e5b5933e1f409de3b7ff462a95f, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114928219075774338, guid: 12ab0e5b5933e1f409de3b7ff462a95f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 95228011701967148, guid: 12ab0e5b5933e1f409de3b7ff462a95f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 12ab0e5b5933e1f409de3b7ff462a95f, type: 3} --- !u!1 &823225324 @@ -1080,6 +1314,8 @@ GameObject: - component: {fileID: 841726155} - component: {fileID: 841726154} - component: {fileID: 841726153} + - component: {fileID: 841726156} + - component: {fileID: 841726157} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -1121,7 +1357,7 @@ Camera: far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 100 + orthographic size: 160 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -1151,6 +1387,90 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &841726156 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 841726152} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 91a9cabf19a634d2fac557d213b89a59, type: 3} + m_Name: + m_EditorClassIdentifier: + inputTexture: {fileID: 0} + renderToTexture: 0 + outputTexture: {fileID: 0} + outputMipmap: 0 + EffectFade: 0 + PanFade: 0 + SrcBright: 0.94 + SrcContrast: 1.4 + SrcColor: 1.28 + SrcBlur: 0 + BrushDetail: 1 + BrushFill: 0.651 + NumStrokes: 111945 + LayerScale: 0.722 + Canvas: 0.209 + FlickerFreq: 0 + FlickerStrength: 0 + LightAng: 110 + LightOffs: 37 + PaintDiff: 0.605 + PaintSpec: 0.33 + PaintShiny: 0 + ColorSpread: 0.46 + ScreenFOV: 30.9 + StrokeAng: 186 + StrokeBend: 0.1 + StrokeDir: 0.168 + StrokeContour: 1 + MultiStroke: 6.28 + strokeSeed: 51044 + Vignette: 0 + CanvasBg: 0 + CanvasTint: {r: 1, g: 1, b: 1, a: 1} + flipY: 0 + geomFlipY: 1 +--- !u!114 &841726157 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 841726152} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 79621082da8ba124eba3da9eba119a06, type: 3} + m_Name: + m_EditorClassIdentifier: + inputTexture: {fileID: 0} + renderToTexture: 0 + outputTexture: {fileID: 0} + outputMipmap: 0 + fade: 0 + panFade: 0 + brightness: 1.27 + contrast: 1 + color: 1 + shaderMethod: 1 + outlines: 1.2 + hatches: 1.24 + outlineError: 1.55 + flicker: 0 + flickerFreq: 7 + fixedHatchDir: 0.649 + hatchScale: 1.5 + hatchLength: 161 + mipLevel: 0.39 + vignetting: 0 + contentVignetting: 0 + paperTint: {r: 1, g: 1, b: 1, a: 1} + paperRoughness: 1 + paperTex: {fileID: 0} + flipY: 0 --- !u!1 &961139953 GameObject: m_ObjectHideFlags: 0 @@ -1161,9 +1481,8 @@ GameObject: m_Component: - component: {fileID: 961139955} - component: {fileID: 961139954} - - component: {fileID: 961139956} m_Layer: 0 - m_Name: Wall Camera + m_Name: Portrait Camera m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1195,7 +1514,7 @@ Camera: far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 100 + orthographic size: 160 m_Depth: 0 m_CullingMask: serializedVersion: 2 @@ -1222,24 +1541,13 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 2135091040} - {fileID: 819030248} - {fileID: 274290747} - {fileID: 1547140293} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &961139956 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 961139953} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45099d624c1e6c14e9514f4e5ea1ed9c, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &977824798 GameObject: m_ObjectHideFlags: 0 @@ -1319,7 +1627,18 @@ MonoBehaviour: m_IdList: [] onTextureReceived: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 2135091041} + m_MethodName: UpdateTexture + m_Mode: 0 + 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!4 &977824801 Transform: m_ObjectHideFlags: 0 @@ -1712,6 +2031,114 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1368559033} m_CullTransparentMesh: 0 +--- !u!1 &1424239746 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1424239747} + - component: {fileID: 1424239750} + - component: {fileID: 1424239749} + - component: {fileID: 1424239748} + m_Layer: 0 + m_Name: Role-03 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1424239747 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1424239746} + 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_Children: [] + m_Father: {fileID: 2135091040} + m_RootOrder: 2 + 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 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1424239746} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d2220dc78794eaa4b939e412e9f9b902, type: 3} + m_Name: + m_EditorClassIdentifier: + texture: {fileID: 0} +--- !u!114 &1424239750 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1424239746} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 21f70a2ec67c77142bb8578ced0ffec9, type: 3} + m_Name: + m_EditorClassIdentifier: + id: 10 + mode: 0 --- !u!1 &1519278660 GameObject: m_ObjectHideFlags: 0 @@ -1731,7 +2158,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1519278661 RectTransform: m_ObjectHideFlags: 0 @@ -1766,7 +2193,7 @@ MonoBehaviour: target: 0 materials: [] attributeName: - targetObject: {fileID: 0} + targetObject: {fileID: 1519278660} --- !u!114 &1519278663 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1848,7 +2275,7 @@ Transform: m_Children: - {fileID: 417831288} m_Father: {fileID: 961139955} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1547140294 MonoBehaviour: @@ -2535,7 +2962,7 @@ MonoBehaviour: width: 1748 height: 500 fps: 60 - mode: 3 + mode: 1 cursor: 1 --- !u!4 &1672874512 Transform: @@ -3121,7 +3548,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1833696213 RectTransform: m_ObjectHideFlags: 0 @@ -3604,3 +4031,55 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2135091039 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2135091040} + - component: {fileID: 2135091041} + m_Layer: 0 + m_Name: Portrait Manager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2135091040 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + 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: 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 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2135091041 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2135091039} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8813dde4fb2c304bbcde08119f57d54, type: 3} + m_Name: + m_EditorClassIdentifier: + show_cur: + mode: 0 + id: + onPaintingUpdated: + m_PersistentCalls: + m_Calls: [] diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/MainGirlsRoom.unity.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait.unity.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/MainGirlsRoom.unity.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait.unity.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/Background.asset b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/Background.asset similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/Background.asset rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/Background.asset diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/Background.asset.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/Background.asset.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/Background.asset.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/Background.asset.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/Focus-01.asset b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/Focus-01.asset similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/Focus-01.asset rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/Focus-01.asset diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/Focus-01.asset.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/Focus-01.asset.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/Focus-01.asset.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/Focus-01.asset.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/Focus-02.asset b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/Focus-02.asset similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/Focus-02.asset rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/Focus-02.asset diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/Focus-02.asset.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/Focus-02.asset.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/Focus-02.asset.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/Focus-02.asset.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/Focus-03.asset b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/Focus-03.asset similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/Focus-03.asset rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/Focus-03.asset diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/Focus-03.asset.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/Focus-03.asset.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/Focus-03.asset.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/Focus-03.asset.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/Focus-04.asset b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/Focus-04.asset similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/Focus-04.asset rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/Focus-04.asset diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/Focus-04.asset.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/Focus-04.asset.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/Focus-04.asset.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/Focus-04.asset.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/Focus.mat b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/Focus.mat similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/Focus.mat rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/Focus.mat diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/Focus.mat.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/Focus.mat.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/Focus.mat.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/Focus.mat.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni.mat b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni.mat similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni.mat rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni.mat diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni.mat.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni.mat.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni.mat.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni.mat.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-01.asset b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-01.asset similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-01.asset rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-01.asset diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-01.asset.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-01.asset.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-01.asset.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-01.asset.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-02.asset b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-02.asset similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-02.asset rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-02.asset diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-02.asset.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-02.asset.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-02.asset.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-02.asset.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-03.asset b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-03.asset similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-03.asset rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-03.asset diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-03.asset.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-03.asset.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-03.asset.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-03.asset.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-04.asset b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-04.asset similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-04.asset rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-04.asset diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-04.asset.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-04.asset.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-04.asset.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-04.asset.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-05.asset b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-05.asset similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-05.asset rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-05.asset diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-05.asset.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-05.asset.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-05.asset.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-05.asset.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-06.asset b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-06.asset similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-06.asset rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-06.asset diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-06.asset.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-06.asset.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-06.asset.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-06.asset.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-07.asset b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-07.asset similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-07.asset rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-07.asset diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-07.asset.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-07.asset.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-07.asset.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-07.asset.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-08.asset b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-08.asset similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-08.asset rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-08.asset diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-08.asset.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-08.asset.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-08.asset.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-08.asset.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-09.asset b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-09.asset similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-09.asset rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-09.asset diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-09.asset.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-09.asset.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-09.asset.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-09.asset.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-11.asset b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-11.asset similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-11.asset rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-11.asset diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-11.asset.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-11.asset.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-11.asset.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-11.asset.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-12.asset b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-12.asset similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-12.asset rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-12.asset diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-12.asset.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-12.asset.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-12.asset.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-12.asset.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-13.asset b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-13.asset similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-13.asset rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-13.asset diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-13.asset.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-13.asset.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-13.asset.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-13.asset.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-14.asset b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-14.asset similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-14.asset rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-14.asset diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-14.asset.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-14.asset.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-14.asset.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-14.asset.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-15.asset b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-15.asset similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-15.asset rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-15.asset diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-15.asset.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-15.asset.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-15.asset.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-15.asset.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-16.asset b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-16.asset similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-16.asset rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-16.asset diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-16.asset.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-16.asset.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-16.asset.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-16.asset.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-17.asset b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-17.asset similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-17.asset rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-17.asset diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-17.asset.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-17.asset.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-17.asset.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-17.asset.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-18.asset b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-18.asset similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-18.asset rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-18.asset diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-18.asset.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-18.asset.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-18.asset.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-18.asset.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-19.asset b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-19.asset similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-19.asset rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-19.asset diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-19.asset.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-19.asset.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-19.asset.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-19.asset.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-20.asset b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-20.asset similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-20.asset rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-20.asset diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-20.asset.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-20.asset.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/PickAni/PickAni-20.asset.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/PickAni/PickAni-20.asset.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/Skybox.mat b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/Skybox.mat similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/Skybox.mat rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/Skybox.mat diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/Skybox.mat.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/Skybox.mat.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Asset/Skybox.mat.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Asset/Skybox.mat.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/DrawHeroesGrpcServer.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/DrawHeroesGrpcServer.cs similarity index 85% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/DrawHeroesGrpcServer.cs rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/DrawHeroesGrpcServer.cs index 32fa6b6..6e2b26f 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/DrawHeroesGrpcServer.cs +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/DrawHeroesGrpcServer.cs @@ -41,9 +41,11 @@ namespace UltraCombos.Marvel.DrawHeroes StartServer(options, services); #if TRUE - m_IdList.Add("07"); - m_IdList.Add("10"); - m_IdList.Add("we"); + Frozen.Portrait[] list = FindObjectsOfType(); + for (int i = 0; i < list.Length; i++) + { + m_IdList.Add(list[i].id); + } #else /* PaintingSprite[] _paintingSpriteList = FindObjectsOfType(); @@ -54,7 +56,7 @@ namespace UltraCombos.Marvel.DrawHeroes */ #endif - DebugInformation.Instance.UpdateProperty("Local IP", $"{Utility.Network.GetLocalIPAddress(subnet)}"); + //DebugInformation.Instance.UpdateProperty("Local IP", $"{Utility.Network.GetLocalIPAddress(subnet)}"); } private void Update() @@ -75,11 +77,12 @@ namespace UltraCombos.Marvel.DrawHeroes if (texture == null) { - texture = new Texture2D(512, 512, TextureFormat.ARGB32, false); + texture = new Texture2D(2048, 2048, TextureFormat.ARGB32, false); } if (texture.LoadImage(data.Thumbnail.ToByteArray(), false)) { + onMessageReceived.Invoke(data); onTextureReceived.Invoke(role_id, texture); Log($"Texture {role_id} is loaded. ({texture.width} x {texture.height})"); @@ -143,8 +146,14 @@ namespace UltraCombos.Marvel.DrawHeroes { var res = onIndexRequest.Invoke(request.Id); - string serial = $"{System.DateTime.Now.ToString("HHmmss")}{res}"; - Debug.Log(res); + + string dev_id = request.Id.ToString().PadLeft(2, '0'); + string date = System.DateTime.Now.ToString("HHmmss"); + string res_id = res.PadLeft(3, '0'); + + string serial = $"{date}{dev_id}{res_id}"; + + Debug.Log($"GetPage: rid={res}, sid={serial}"); return Task.FromResult(new Page { Id = res, Serial = serial }); } } diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/DrawHeroesGrpcServer.cs.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/DrawHeroesGrpcServer.cs.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/DrawHeroesGrpcServer.cs.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/DrawHeroesGrpcServer.cs.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Editor.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Editor.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Editor.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Editor.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Editor/FileModificationWarning.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Editor/FileModificationWarning.cs similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Editor/FileModificationWarning.cs rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Editor/FileModificationWarning.cs diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Editor/FileModificationWarning.cs.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Editor/FileModificationWarning.cs.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Editor/FileModificationWarning.cs.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Editor/FileModificationWarning.cs.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/FocusGenerator.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/FocusGenerator.cs similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/FocusGenerator.cs rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/FocusGenerator.cs diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/FocusGenerator.cs.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/FocusGenerator.cs.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/FocusGenerator.cs.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/FocusGenerator.cs.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Grpc.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Grpc.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc/Ultracombos.Marvel.DrawHeroesGrpc.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Grpc/Ultracombos.Marvel.DrawHeroesGrpc.cs similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc/Ultracombos.Marvel.DrawHeroesGrpc.cs rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Grpc/Ultracombos.Marvel.DrawHeroesGrpc.cs diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc/Ultracombos.Marvel.DrawHeroesGrpc.cs.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Grpc/Ultracombos.Marvel.DrawHeroesGrpc.cs.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc/Ultracombos.Marvel.DrawHeroesGrpc.cs.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Grpc/Ultracombos.Marvel.DrawHeroesGrpc.cs.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc/Ultracombos.minionsGrpc.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Grpc/Ultracombos.minionsGrpc.cs similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc/Ultracombos.minionsGrpc.cs rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Grpc/Ultracombos.minionsGrpc.cs diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc/Ultracombos.minionsGrpc.cs.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Grpc/Ultracombos.minionsGrpc.cs.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc/Ultracombos.minionsGrpc.cs.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Grpc/Ultracombos.minionsGrpc.cs.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc/UltracombosMarvelDrawHeroes.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Grpc/UltracombosMarvelDrawHeroes.cs similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc/UltracombosMarvelDrawHeroes.cs rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Grpc/UltracombosMarvelDrawHeroes.cs diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc/UltracombosMarvelDrawHeroes.cs.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Grpc/UltracombosMarvelDrawHeroes.cs.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc/UltracombosMarvelDrawHeroes.cs.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Grpc/UltracombosMarvelDrawHeroes.cs.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc/UltracombosMinions.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Grpc/UltracombosMinions.cs similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc/UltracombosMinions.cs rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Grpc/UltracombosMinions.cs diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc/UltracombosMinions.cs.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Grpc/UltracombosMinions.cs.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc/UltracombosMinions.cs.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Grpc/UltracombosMinions.cs.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/PickAniManager.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/PickAniManager.cs similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/PickAniManager.cs rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/PickAniManager.cs diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/PickAniManager.cs.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/PickAniManager.cs.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/PickAniManager.cs.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/PickAniManager.cs.meta 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 new file mode 100644 index 0000000..27acf4a --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Portrait.cs @@ -0,0 +1,130 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.EventSystems; +using UnityEngine.UI; + +namespace UltraCombos.Frozen +{ + public class Portrait : MonoBehaviour + { + public string id; + const float duration = 150.0f; + float stamp = 0.0f; + + RendererPropertyOverride prop; + Texture2D tex; + + Texture blank_texture; + + Animator animator = null; + float speed = 0.0f; + + public bool isVisible + { + set + { + prop.isVisible = value; + } + + get + { + return prop.isVisible; + } + } + + [SerializeField, Header("Debug")] + bool mode = false; + +#if UNITY_IPHONE + private void Awake() + { + animator = GetComponent(); + if (animator) + { + Destroy(animator); + animator = null; + } + var skin = GetComponent(); + if (skin != null) + { + Destroy(skin); + } + } +#endif + + private void Start() + { + prop = GetComponent(); + blank_texture = GetComponent().sprite.texture; + + animator = GetComponent(); + if (animator) + { + animator.speed = 0.0f; + } + } + + private void Update() + { + if (Time.time - stamp > duration && speed > 0.0f) + { + speed = 0.0f; + prop.texture = blank_texture; + } + + if (mode) + { + mode = false; + OnTrigger(); + } + } + + private void FixedUpdate() + { + float t = Time.fixedDeltaTime * 5.0f; + if (animator) + { + animator.speed = Mathf.Lerp(animator.speed, speed, t); + } + } + + public void UpdateTexture(Texture2D texture) + { + OnTrigger(); + + if (texture == null) + return; + + if (tex == null) + { + tex = new Texture2D(texture.width, texture.height, texture.format, true); + } + + if (tex.width != texture.width || tex.height != texture.height) + { + tex.Resize(texture.width, texture.height); + tex.Apply(); + } + + tex.SetPixels(texture.GetPixels()); + tex.Apply(); + + prop.texture = tex; + } + + private void OnTrigger() + { + stamp = Time.time; + speed = 1.0f; + } + + public void Initialize() + { + prop.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/Portrait.cs.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Portrait.cs.meta new file mode 100644 index 0000000..519bbed --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Portrait.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 21f70a2ec67c77142bb8578ced0ffec9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: 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 new file mode 100644 index 0000000..0a5f2d9 --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/PortraitManager.cs @@ -0,0 +1,98 @@ +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Events; +using UnityEngine.EventSystems; +using UnityEngine.UI; + +namespace UltraCombos.Frozen +{ + public class PortraitManager : MonoBehaviour + { + Dictionary portraits; + public string show_cur; + + string show_nxt = null; + + [SerializeField, Header("Debug")] + bool mode = false; + public string id = ""; + + [System.Serializable] + public class PositionEvent : UnityEvent { } + [Space(10)] + public PositionEvent onPaintingUpdated = new PositionEvent(); + + private void Start() + { + portraits = new Dictionary(); + foreach (var p in GetComponentsInChildren()) + { + portraits.Add(p.id, p); + p.isVisible = false; + } + + if (portraits.Count == 0) + { + return; + } + + if (!portraits.ContainsKey(show_cur)) + { + show_cur = ""; + show_nxt = portraits.Keys.GetEnumerator().Current; + } + else + { + show_nxt = show_cur; + } + } + + private void Update() + { + if (portraits.Count == 0) + { + return; + } + + if (show_nxt != null) + { + if (portraits.ContainsKey(show_cur)) + { + portraits[show_cur].isVisible = false; + } + + show_cur = show_nxt; + show_nxt = null; + portraits[show_cur].isVisible = true; + } + + if (Input.GetKeyDown(KeyCode.R)) + { + foreach (var id in portraits.Keys) + { + portraits[id].Initialize(); + } + } + + if (mode) + { + mode = false; + UpdateTexture(id, null); + //index = (index + 1) % portraits.Count; + } + } + + public void UpdateTexture(string id, Texture2D texture) + { + if (portraits.ContainsKey(id)) + { + var painting = portraits[id]; + painting.UpdateTexture(texture); + onPaintingUpdated.Invoke(painting.transform.position); + + show_nxt = id; + } + } + } + +} diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/PortraitManager.cs.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/PortraitManager.cs.meta new file mode 100644 index 0000000..944ee35 --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/PortraitManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d8813dde4fb2c304bbcde08119f57d54 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/RendererPropertyOverride.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/RendererPropertyOverride.cs new file mode 100644 index 0000000..52a13a4 --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/RendererPropertyOverride.cs @@ -0,0 +1,48 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace UltraCombos.Frozen +{ + public class RendererPropertyOverride : MonoBehaviour + { + Renderer rdr; + + public Texture texture; + public bool isVisible + { + set + { + m_isVisible = value; + rdr.enabled = m_isVisible; + } + + get + { + return m_isVisible; + } + } + + private bool m_isVisible = true; + + private void Start() + { + rdr = GetComponent(); + } + + private void Update() + { + var prop = new MaterialPropertyBlock(); + rdr.GetPropertyBlock(prop); + + if (texture) + { + prop.SetTexture("_MainTex", texture); + } + + rdr.SetPropertyBlock(prop); + } + } + +} + diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/RendererPropertyOverride.cs.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/RendererPropertyOverride.cs.meta new file mode 100644 index 0000000..53f250a --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/RendererPropertyOverride.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d2220dc78794eaa4b939e412e9f9b902 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/ResourceClient.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/ResourceClient.cs similarity index 85% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/ResourceClient.cs rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/ResourceClient.cs index 313a734..6325717 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/ResourceClient.cs +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/ResourceClient.cs @@ -6,16 +6,16 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.Events; -namespace UltraCombos.Minions +namespace UltraCombos.Marvel.DrawHeroes { - [RequireComponent(typeof(ResourceServer))] + [RequireComponent(typeof(DrawHeroesGrpcServer))] public class ResourceClient : GrpcClientBase { public float interval = 1.0f; float stamp = 0.0f; Queue data_pool; - ResourceServer server; + Marvel.DrawHeroes.DrawHeroesGrpcServer server; [Space(10)] public UnityEvent onTextureReceived = new UnityEvent(); @@ -32,7 +32,7 @@ namespace UltraCombos.Minions var options = new List { new ChannelOption(ChannelOptions.MaxSendMessageLength, int.MaxValue) }; Connect(options); - server = GetComponent(); + server = GetComponent(); server.onMessageReceived += OnMessageReceived; } @@ -54,8 +54,8 @@ namespace UltraCombos.Minions public void SendData(DataRequest request) { - if (State != ChannelState.Ready) - return; + //if (State != ChannelState.Ready) + // return; SendDataAsync(request); } diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/ResourceClient.cs.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/ResourceClient.cs.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/ResourceClient.cs.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/ResourceClient.cs.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/ResourceServer.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/ResourceServer.cs similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/ResourceServer.cs rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/ResourceServer.cs diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/ResourceServer.cs.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/ResourceServer.cs.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/ResourceServer.cs.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/ResourceServer.cs.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/TextureLoader.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/TextureLoader.cs similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/TextureLoader.cs rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/TextureLoader.cs diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/TextureLoader.cs.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/TextureLoader.cs.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/TextureLoader.cs.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/TextureLoader.cs.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/Page.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/Page.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/Page.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/Page.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/Page/01_outline.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/Page/01_outline.png similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/Page/01_outline.png rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/Page/01_outline.png diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/Page/01_outline.png.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/Page/01_outline.png.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/Page/01_outline.png.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/Page/01_outline.png.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/Page/02_outline.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/Page/02_outline.png similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/Page/02_outline.png rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/Page/02_outline.png diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/Page/02_outline.png.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/Page/02_outline.png.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/Page/02_outline.png.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/Page/02_outline.png.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/background-empty.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/background-empty.png similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/background-empty.png rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/background-empty.png diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/background-empty.png.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/background-empty.png.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/background-empty.png.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/background-empty.png.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/background-full.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/background-full.png similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/background-full.png rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/background-full.png diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/background-full.png.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/background-full.png.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/background-full.png.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/background-full.png.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/bg_empty_temp.jpg b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/bg_empty_temp.jpg similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/bg_empty_temp.jpg rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/bg_empty_temp.jpg diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/bg_empty_temp.jpg.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/bg_empty_temp.jpg.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/bg_empty_temp.jpg.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/bg_empty_temp.jpg.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/bg_temp.jpg b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/bg_temp.jpg similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/bg_temp.jpg rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/bg_temp.jpg diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/bg_temp.jpg.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/bg_temp.jpg.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/bg_temp.jpg.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/bg_temp.jpg.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/empty.renderTexture b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/empty.renderTexture similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/empty.renderTexture rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/empty.renderTexture diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/empty.renderTexture.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/empty.renderTexture.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/empty.renderTexture.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/empty.renderTexture.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/girlsroom_wall_app.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/girlsroom_wall_app 1.png similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/girlsroom_wall_app.png rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/girlsroom_wall_app 1.png diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/girlsroom_wall_app 1.png.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/girlsroom_wall_app 1.png.meta new file mode 100644 index 0000000..769bb2a --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/girlsroom_wall_app 1.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 95e96287a4bd17446854a585699d3905 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: c45ce5da465dcbe4abc4557a456daf5e + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/girlsroom_wall_app.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/girlsroom_wall_app.png new file mode 100644 index 0000000..281ff0a Binary files /dev/null and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/girlsroom_wall_app.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/girlsroom_wall_app.png.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/girlsroom_wall_app.png.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/girlsroom_wall_app.png.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/girlsroom_wall_app.png.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/wall.renderTexture b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/wall.renderTexture similarity index 86% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/wall.renderTexture rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/wall.renderTexture index 8a7d7c6..128ae9d 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/wall.renderTexture +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/wall.renderTexture @@ -4,15 +4,16 @@ RenderTexture: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: wall m_ImageContentsHash: serializedVersion: 2 Hash: 00000000000000000000000000000000 m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 - m_Width: 4192 - m_Height: 1200 + m_Width: 1080 + m_Height: 1920 m_AntiAliasing: 4 m_DepthFormat: 0 m_ColorFormat: 0 diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/wall.renderTexture.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/wall.renderTexture.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Texture/wall.renderTexture.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Texture/wall.renderTexture.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/ProjectSettings/EditorBuildSettings.asset b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/ProjectSettings/EditorBuildSettings.asset index e3b06f2..9552c03 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/ProjectSettings/EditorBuildSettings.asset +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/ProjectSettings/EditorBuildSettings.asset @@ -6,6 +6,6 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/MainGirlsRoom.unity + path: Assets/RoyalGalleryPortrait.unity guid: ab5a351324b2f56418064cd18b1743cf m_configObjects: {} 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..4ab6c2b 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 @@ -274,7 +274,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: 2732, y: 2048} + m_SizeDelta: {x: 2048, y: 2732} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &90118699 MonoBehaviour: @@ -436,7 +436,7 @@ RectTransform: - {fileID: 694176951} - {fileID: 379599992} m_Father: {fileID: 746257130} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -624,78 +624,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 514912794} m_PrefabAsset: {fileID: 0} ---- !u!1 &644007164 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 644007165} - - component: {fileID: 644007167} - - component: {fileID: 644007166} - m_Layer: 5 - m_Name: index-pic - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &644007165 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 644007164} - 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: 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: -6, y: -51} - m_SizeDelta: {x: 1725, y: 1725} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &644007166 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 644007164} - 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: 21300000, guid: b4951b01ae7e1c341bd5faea97be7189, type: 3} - 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 &644007167 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 644007164} - m_CullTransparentMesh: 0 --- !u!1 &666023261 GameObject: m_ObjectHideFlags: 0 @@ -903,16 +831,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 725555479} - m_LocalRotation: {x: 0, y: 0, z: 0.06975647, w: 0.9975641} + 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: 938718533} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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: 31.3, y: 15.08} + m_AnchoredPosition: {x: 1, y: 5.17} m_SizeDelta: {x: 405, y: 276} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &725555481 @@ -928,15 +856,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.84313726, g: 0.7529412, b: 0.52156866, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 1f940ec663706444798b9201d8ddedec, type: 3} + m_Font: {fileID: 12800000, guid: e288133f5da1362419392193f7879aaa, type: 3} m_FontSize: 60 - m_FontStyle: 2 + m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 m_MaxSize: 86 @@ -946,7 +874,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u7C21\u4E2D" + m_Text: "\u4E2D" --- !u!222 &725555482 CanvasRenderer: m_ObjectHideFlags: 0 @@ -970,11 +898,11 @@ MonoBehaviour: language: 10 contexts: - language: 10 - text: "\u7C21\u4E2D" - font: {fileID: 12800000, guid: 1f940ec663706444798b9201d8ddedec, type: 3} + text: "\u4E2D" + font: {fileID: 12800000, guid: e288133f5da1362419392193f7879aaa, type: 3} fontSize: 60 lineSpacing: 1 - baseline: 15.08 + baseline: 5.17 - language: 40 text: EN font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} @@ -1073,8 +1001,7 @@ RectTransform: m_Children: - {fileID: 1237191813} - {fileID: 1103808276} - - {fileID: 644007165} - - {fileID: 1631116824} + - {fileID: 944149852} - {fileID: 1282467667} - {fileID: 938718533} - {fileID: 2033046876} @@ -1114,16 +1041,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 779108440} - m_LocalRotation: {x: 0, y: 0, z: 0.06975647, w: 0.9975641} + 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: 1282467667} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 8} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -18, y: 6} + m_AnchoredPosition: {x: 1, y: 6} m_SizeDelta: {x: 0, y: 14.73} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &779108442 @@ -1139,15 +1066,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.84313726, g: 0.7529412, b: 0.52156866, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} - m_FontSize: 106 - m_FontStyle: 2 + m_Font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + m_FontSize: 100 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 1 m_MaxSize: 129 @@ -1182,8 +1109,8 @@ MonoBehaviour: contexts: - language: 10 text: START - font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} - fontSize: 106 + font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + fontSize: 100 lineSpacing: 1 baseline: 6 - language: 40 @@ -1227,12 +1154,12 @@ RectTransform: - {fileID: 2138975510} - {fileID: 725555480} m_Father: {fileID: 746257130} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -60} - m_SizeDelta: {x: 400, y: 237} + m_AnchoredPosition: {x: 145, y: 0} + m_SizeDelta: {x: 145, y: 239} m_Pivot: {x: 0, y: 1} --- !u!114 &938718534 MonoBehaviour: @@ -1359,6 +1286,78 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c05979c47dbe7ed46aedcf5a3416ef4c, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &944149851 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 944149852} + - component: {fileID: 944149854} + - component: {fileID: 944149853} + m_Layer: 5 + m_Name: bg_start + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &944149852 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 944149851} + 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: 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: -1085} + m_SizeDelta: {x: 2048, y: 562} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &944149853 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 944149851} + 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: 21300000, guid: 41534eb33d2c95b428a7120b78275d2a, type: 3} + 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 &944149854 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 944149851} + m_CullTransparentMesh: 0 --- !u!1 &1035213246 GameObject: m_ObjectHideFlags: 0 @@ -1697,7 +1696,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: -2452, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1103808277 @@ -1924,7 +1923,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 99b58ad3546cd2b4b8710bb1a69ed179, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1959,7 +1958,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1264086241 RectTransform: m_ObjectHideFlags: 0 @@ -1967,16 +1966,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1264086240} - m_LocalRotation: {x: 0, y: 0, z: 0.06975647, w: 0.9975641} + 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: 1282467667} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 8} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -7.19989, y: 0.74} + m_AnchoredPosition: {x: -7.19989, y: 0.7400055} m_SizeDelta: {x: 0, y: 14.73} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1264086242 @@ -2079,12 +2078,12 @@ RectTransform: - {fileID: 1264086241} - {fileID: 779108441} m_Father: {fileID: 746257130} - m_RootOrder: 4 + m_RootOrder: 3 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_SizeDelta: {x: 595, y: 368} + m_AnchoredPosition: {x: -2.1, y: 334} + m_SizeDelta: {x: 774, y: 269} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1282467668 MonoBehaviour: @@ -2108,7 +2107,7 @@ MonoBehaviour: m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1} - m_PressedColor: {r: 0.9372549, g: 0.9372549, b: 0.9372549, a: 1} + m_PressedColor: {r: 0.8113208, g: 0.8113208, b: 0.8113208, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 @@ -2566,78 +2565,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1587564875} m_CullTransparentMesh: 0 ---- !u!1 &1631116823 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1631116824} - - component: {fileID: 1631116826} - - component: {fileID: 1631116825} - m_Layer: 5 - m_Name: logo - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1631116824 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1631116823} - 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: 746257130} - 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: 0, y: 739} - m_SizeDelta: {x: 523, y: 89} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1631116825 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1631116823} - 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: 21300000, guid: 542da5fff7fd9e54b8b7e5b633c580a8, type: 3} - 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 &1631116826 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1631116823} - m_CullTransparentMesh: 0 --- !u!1 &1663065344 GameObject: m_ObjectHideFlags: 0 @@ -2796,7 +2723,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 746257130} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3201,7 +3128,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 746257130} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3246,7 +3173,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 0dbd95d4f23ea1e4597984dfbf1f6235, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3293,7 +3220,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2138975510 RectTransform: m_ObjectHideFlags: 0 diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-2-Coloring.unity b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-2-Coloring.unity index 86868ec..c449b39 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-2-Coloring.unity +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-2-Coloring.unity @@ -930,8 +930,8 @@ RectTransform: 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: 10} + m_AnchoredPosition: {x: 8, y: 0} + m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &52939691 MonoBehaviour: @@ -1567,11 +1567,11 @@ RectTransform: m_Father: {fileID: 137693518} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 0, y: -152.8} - m_SizeDelta: {x: 277, y: 195} - m_Pivot: {x: 0, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 698, y: 0} + m_SizeDelta: {x: 204, y: 277} + m_Pivot: {x: 0, y: 0} --- !u!114 &135368801 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1651,13 +1651,13 @@ RectTransform: - {fileID: 688895988} - {fileID: 135368800} m_Father: {fileID: 1977272186} - m_RootOrder: 6 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 0, y: -15} + 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.5} + m_Pivot: {x: 0, y: 0} --- !u!114 &137693519 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2659,6 +2659,90 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_IsOn: 0 +--- !u!1 &243996843 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 243996844} + - component: {fileID: 243996847} + - component: {fileID: 243996846} + - component: {fileID: 243996845} + m_Layer: 5 + m_Name: back_layer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &243996844 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 243996843} + 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: 2132980668} + m_RootOrder: 0 + 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: 2048, y: 2048} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &243996845 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 243996843} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 386a71ba8e6bc764fa83d351daec67ff, type: 3} + m_Name: + m_EditorClassIdentifier: + canvas: {fileID: 826561460780717485} +--- !u!114 &243996846 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 243996843} + 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: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &243996847 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 243996843} + m_CullTransparentMesh: 0 --- !u!1 &247460791 GameObject: m_ObjectHideFlags: 0 @@ -3024,7 +3108,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: 0} + m_AnchoredPosition: {x: -6, y: -6} m_SizeDelta: {x: 623, y: 623} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &290095851 @@ -5698,7 +5782,7 @@ RectTransform: - {fileID: 1378448208} - {fileID: 74131129} m_Father: {fileID: 1977272186} - m_RootOrder: 7 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5754,7 +5838,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 277, y: 195} + m_SizeDelta: {x: 204, y: 277} m_Pivot: {x: 0, y: 0.5} --- !u!114 &505663585 MonoBehaviour: @@ -5971,8 +6055,8 @@ 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: 5, y: 15} - m_SizeDelta: {x: 151.3, y: 526.8} + m_AnchoredPosition: {x: -14, y: -123} + m_SizeDelta: {x: 720, y: 151.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &522603592 MonoBehaviour: @@ -6013,7 +6097,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1255260411} m_FillRect: {fileID: 52939690} m_HandleRect: {fileID: 1255260410} - m_Direction: 2 + m_Direction: 0 m_MinValue: 0 m_MaxValue: 1 m_WholeNumbers: 0 @@ -6480,12 +6564,12 @@ GameObject: - component: {fileID: 548923641} - component: {fileID: 548923640} m_Layer: 5 - m_Name: UI + m_Name: UI Main m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &548923639 RectTransform: m_ObjectHideFlags: 0 @@ -6498,12 +6582,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1138562568} - m_RootOrder: 0 + 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: 0, y: 0} - m_SizeDelta: {x: 2732, y: 2048} + m_SizeDelta: {x: 2048, y: 2732} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &548923640 MonoBehaviour: @@ -6523,7 +6607,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: 22e95652fb3d52a47884a76ae462b5fb, type: 3} + m_Texture: {fileID: 2800000, guid: f99a429de88892347aac4ef7bae4eadb, type: 3} m_UVRect: serializedVersion: 2 x: 0 @@ -6569,10 +6653,10 @@ RectTransform: m_Father: {fileID: 522603591} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.25, y: 0} - m_AnchorMax: {x: 0.75, y: 1} - m_AnchoredPosition: {x: 0, y: -5.000003} - m_SizeDelta: {x: -12, y: -20.000006} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: -8, y: 0} + m_SizeDelta: {x: -20.000006, y: -12} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &565946445 GameObject: @@ -7733,7 +7817,7 @@ RectTransform: m_Children: - {fileID: 659993040} m_Father: {fileID: 1977272186} - m_RootOrder: 4 + 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} @@ -7978,16 +8062,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 676678155} - m_LocalRotation: {x: 0, y: 0, z: 0.06975647, w: 0.9975641} + 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: 1503600939} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 8} + 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: -21.600006, y: 4.01} + m_AnchoredPosition: {x: 0, y: 5} m_SizeDelta: {x: 10, y: 18} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &676678157 @@ -8003,15 +8087,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.84313726, g: 0.7529412, b: 0.52156866, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} - m_FontSize: 73 - m_FontStyle: 2 + m_Font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + m_FontSize: 42 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 7 m_MaxSize: 88 @@ -8021,7 +8105,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: NO + m_Text: NO, GO BACK --- !u!222 &676678158 CanvasRenderer: m_ObjectHideFlags: 0 @@ -8045,14 +8129,14 @@ MonoBehaviour: language: 10 contexts: - language: 10 - text: NO - font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} - fontSize: 73 + text: NO, GO BACK + font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + fontSize: 42 lineSpacing: 1 - baseline: 4.01 + baseline: 5 - language: 40 text: "\u5426" - font: {fileID: 12800000, guid: 1f940ec663706444798b9201d8ddedec, type: 3} + font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} fontSize: 88 lineSpacing: 1 baseline: 13.04 @@ -8232,11 +8316,11 @@ RectTransform: m_Father: {fileID: 137693518} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 0, y: 26.4} - m_SizeDelta: {x: 126, y: 126} - m_Pivot: {x: 0, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 946, y: 0} + m_SizeDelta: {x: 204, y: 277} + m_Pivot: {x: 0, y: 0} --- !u!114 &688895989 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8300,7 +8384,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &689453275 RectTransform: m_ObjectHideFlags: 0 @@ -8336,7 +8420,7 @@ MonoBehaviour: contexts: - language: 10 text: DONE - font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} + font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} fontSize: 74 lineSpacing: 1 baseline: -7 @@ -9712,11 +9796,11 @@ RectTransform: m_Father: {fileID: 505663584} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 0, y: -7.8} - m_SizeDelta: {x: 294, y: 212} - m_Pivot: {x: 0, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 203, y: 319} + m_Pivot: {x: 0, y: 0} --- !u!114 &808276084 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9884,11 +9968,11 @@ RectTransform: m_Father: {fileID: 135368800} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 277, y: 196} - m_Pivot: {x: 0, y: 0.5} + m_SizeDelta: {x: 204, y: 277} + m_Pivot: {x: 0, y: 0} --- !u!114 &818744319 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9996,6 +10080,90 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 829756664} m_CullTransparentMesh: 0 +--- !u!1 &831302269 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 831302270} + - component: {fileID: 831302273} + - component: {fileID: 831302272} + - component: {fileID: 831302271} + m_Layer: 5 + m_Name: outline_layer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &831302270 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 831302269} + 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: 2132980668} + m_RootOrder: 1 + 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: 2048, y: 2048} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &831302271 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 831302269} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 70ad15fe82d985b4594b2ba95f7d6010, type: 3} + m_Name: + m_EditorClassIdentifier: + canvas: {fileID: 826561460780717485} +--- !u!114 &831302272 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 831302269} + 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: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &831302273 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 831302269} + m_CullTransparentMesh: 0 --- !u!1 &838966514 GameObject: m_ObjectHideFlags: 0 @@ -10129,8 +10297,8 @@ 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: 30, y: 9} - m_SizeDelta: {x: 1649, y: 1084} + m_AnchoredPosition: {x: 9, y: -55} + m_SizeDelta: {x: 1719, y: 1433} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &840849830 MonoBehaviour: @@ -11037,7 +11205,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_AllowSwitchOff: 0 ---- !u!1 &966463296 +--- !u!1 &970129848 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -11045,156 +11213,52 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 966463297} - - component: {fileID: 966463300} - - component: {fileID: 966463299} - - component: {fileID: 966463298} + - component: {fileID: 970129849} + - component: {fileID: 970129851} + - component: {fileID: 970129850} m_Layer: 5 - m_Name: common-no (1) + m_Name: LeftColumn m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &966463297 + m_IsActive: 0 +--- !u!224 &970129849 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 966463296} - m_LocalRotation: {x: 0, y: 0, z: 0.06975647, w: 0.9975641} + m_GameObject: {fileID: 970129848} + 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: 1503600939} + m_Children: + - {fileID: 1453515930} + - {fileID: 962065680} + - {fileID: 30498627} + m_Father: {fileID: 1977272186} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 8} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -12.300003, y: -5.89} - m_SizeDelta: {x: 10, y: 18} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &966463298 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 966463296} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5d4111d72b538b544860d085f76e5ad8, type: 3} - m_Name: - m_EditorClassIdentifier: - language: 10 - contexts: - - language: 10 - text: NO - font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} - fontSize: 73 - lineSpacing: 1 - baseline: -5.89 - - language: 40 - text: "\u5426" - font: {fileID: 12800000, guid: 1f940ec663706444798b9201d8ddedec, type: 3} - fontSize: 88 - lineSpacing: 1 - baseline: 4.6 ---- !u!114 &966463299 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 120, y: 1080} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &970129850 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 966463296} + m_GameObject: {fileID: 970129848} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.11764706, g: 0.11764706, b: 0.7411765, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} - m_FontSize: 73 - m_FontStyle: 2 - m_BestFit: 0 - m_MinSize: 7 - m_MaxSize: 88 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: NO ---- !u!222 &966463300 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 966463296} - m_CullTransparentMesh: 0 ---- !u!1 &970129848 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 970129849} - - component: {fileID: 970129851} - - component: {fileID: 970129850} - m_Layer: 5 - m_Name: LeftColumn - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &970129849 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 970129848} - 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: 1453515930} - - {fileID: 962065680} - - {fileID: 30498627} - m_Father: {fileID: 1977272186} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 120, y: 1080} - m_Pivot: {x: 0, y: 0.5} ---- !u!114 &970129850 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 970129848} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.4, g: 0.4, b: 0.4, a: 1} + m_Color: {r: 0.4, g: 0.4, b: 0.4, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -11242,17 +11306,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 971542332} - m_LocalRotation: {x: 0, y: 0, z: 0.06975647, w: 0.9975641} + 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: 1752638942} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 8} + 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: 28, y: 24.4} - m_SizeDelta: {x: 1500, y: 250} + m_AnchoredPosition: {x: 1, y: 39.6} + m_SizeDelta: {x: 1500, y: 700} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &971542334 MonoBehaviour: @@ -11267,15 +11331,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.92941177, g: 0.18039216, b: 0.011764706, a: 1} + m_Color: {r: 0.70980394, g: 0.6313726, b: 0.39607844, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 1d742de74eda8b04c8b4f7c3e68941ed, type: 3} - m_FontSize: 67 - m_FontStyle: 2 + m_Font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + m_FontSize: 64 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 0 m_MaxSize: 300 @@ -11284,10 +11348,15 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - m_LineSpacing: 1.4 - m_Text: 'You are about to leave the coloring page. + m_LineSpacing: 1 + m_Text: 'YOU ARE ABOUT TO LEAVE + + THE COLORING PAGE. + + + ARE YOU DONE WITH - Are you done with coloring your work?' + COLORING YOUR WORK?' --- !u!222 &971542335 CanvasRenderer: m_ObjectHideFlags: 0 @@ -11311,13 +11380,18 @@ MonoBehaviour: language: 10 contexts: - language: 10 - text: 'You are about to leave the coloring page. + text: 'YOU ARE ABOUT TO LEAVE - Are you done with coloring your work?' - font: {fileID: 12800000, guid: 1d742de74eda8b04c8b4f7c3e68941ed, type: 3} - fontSize: 67 - lineSpacing: 1.4 - baseline: 24.4 + THE COLORING PAGE. + + + ARE YOU DONE WITH + + COLORING YOUR WORK?' + font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + fontSize: 64 + lineSpacing: 1 + baseline: 39.6 - language: 40 text: "\u5373\u5C06\u79BB\u5F00\u7740\u8272\u9875\u9762\uFF0C\n\u60A8\u786E\u5B9A\u5DF2\u5B8C\u6210\u8457\u8272\uFF1F" font: {fileID: 12800000, guid: b9a3cf7d754c5ff448c41816cc1e6c0a, type: 3} @@ -11953,16 +12027,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1066516030} - m_LocalRotation: {x: 0, y: 0, z: 0.06975647, w: 0.9975641} + 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: 1997411410} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 8} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.2000122, y: 4.7} + m_AnchoredPosition: {x: 47, y: 11.92} m_SizeDelta: {x: 5, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1066516032 @@ -11978,15 +12052,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.84313726, g: 0.7529412, b: 0.52156866, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} - m_FontSize: 74 - m_FontStyle: 2 + m_Font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + m_FontSize: 64 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 2 m_MaxSize: 86 @@ -11996,7 +12070,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: DONE + m_Text: COMPLETE --- !u!222 &1066516033 CanvasRenderer: m_ObjectHideFlags: 0 @@ -12020,11 +12094,11 @@ MonoBehaviour: language: 10 contexts: - language: 10 - text: DONE - font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} - fontSize: 74 + text: COMPLETE + font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + fontSize: 64 lineSpacing: 1 - baseline: 4.7 + baseline: 11.92 - language: 40 text: "\u5B8C\u6210" font: {fileID: 12800000, guid: 1f940ec663706444798b9201d8ddedec, type: 3} @@ -12187,11 +12261,11 @@ RectTransform: - {fileID: 290095850} - {fileID: 939923148} m_Father: {fileID: 1977272186} - m_RootOrder: 3 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 311.49994, y: 311.5} + m_AnchoredPosition: {x: 361, y: 339} m_SizeDelta: {x: 623, y: 623} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1079856519 @@ -12576,11 +12650,11 @@ RectTransform: m_Father: {fileID: 818744318} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 0, y: -7.4} - m_SizeDelta: {x: 294, y: 212} - m_Pivot: {x: 0, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 2, y: 0} + m_SizeDelta: {x: 203, y: 319} + m_Pivot: {x: 0, y: 0} --- !u!114 &1121344640 MonoBehaviour: m_ObjectHideFlags: 0 @@ -12913,11 +12987,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1510615578} - {fileID: 548923639} - {fileID: 1696572311} - {fileID: 2047961711} m_Father: {fileID: 1977272186} - m_RootOrder: 11 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -13456,7 +13531,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1977272186} - m_RootOrder: 10 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -13909,8 +13984,8 @@ RectTransform: 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: -20, y: 102} + m_AnchoredPosition: {x: 17, y: 20.5} + m_SizeDelta: {x: 121, y: 31} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1255260411 MonoBehaviour: @@ -16196,6 +16271,78 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1460249471} m_CullTransparentMesh: 0 +--- !u!1 &1461265345 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1461265346} + - component: {fileID: 1461265348} + - component: {fileID: 1461265347} + m_Layer: 5 + m_Name: bg-coloring + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1461265346 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1461265345} + 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: 1977272186} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -2522} + m_SizeDelta: {x: 2048, y: 210} + m_Pivot: {x: 1, y: 1} +--- !u!114 &1461265347 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1461265345} + 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: 21300000, guid: cd02fae6849ac9f419ef2f00a7610220, type: 3} + 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 &1461265348 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1461265345} + m_CullTransparentMesh: 0 --- !u!1 &1462574321 GameObject: m_ObjectHideFlags: 0 @@ -16553,15 +16700,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 966463297} - {fileID: 676678156} m_Father: {fileID: 1752638942} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -665, y: -508} - m_SizeDelta: {x: 470, y: 293} + m_AnchoredPosition: {x: 0, y: -630} + m_SizeDelta: {x: 470, y: 144.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1503600940 MonoBehaviour: @@ -16585,7 +16731,7 @@ MonoBehaviour: m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0} m_DisabledColor: {r: 1, g: 1, b: 1, a: 1} m_ColorMultiplier: 1 m_FadeDuration: 0.1 @@ -16639,12 +16785,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 93e50f61a6d170b4ca2e4a582d967443, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -16775,6 +16921,76 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_IsOn: 0 +--- !u!1 &1510615577 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1510615578} + - component: {fileID: 1510615580} + - component: {fileID: 1510615579} + m_Layer: 5 + m_Name: UI Dialog + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1510615578 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1510615577} + 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: 1138562568} + 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: 2732} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1510615579 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1510615577} + 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: 26cfa29ca1329734b80944383291a680, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &1510615580 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1510615577} + m_CullTransparentMesh: 0 --- !u!1 &1512201423 GameObject: m_ObjectHideFlags: 0 @@ -17265,16 +17481,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1536546211} - m_LocalRotation: {x: 0, y: 0, z: 0.06975647, w: 0.9975641} + 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: 1619059997} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 8} + 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: -21.5, y: 8.8} + m_AnchoredPosition: {x: 2, y: 8} m_SizeDelta: {x: -17, y: 18} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1536546213 @@ -17290,15 +17506,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.84313726, g: 0.7529412, b: 0.52156866, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} - m_FontSize: 73 - m_FontStyle: 2 + m_Font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + m_FontSize: 66 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 7 m_MaxSize: 87 @@ -17308,7 +17524,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: YES + m_Text: YES, PROCEED --- !u!222 &1536546214 CanvasRenderer: m_ObjectHideFlags: 0 @@ -17332,14 +17548,14 @@ MonoBehaviour: language: 10 contexts: - language: 10 - text: YES - font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} - fontSize: 73 + text: YES, PROCEED + font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + fontSize: 66 lineSpacing: 1 - baseline: 8.8 + baseline: 8 - language: 40 text: "\u662F" - font: {fileID: 12800000, guid: 1f940ec663706444798b9201d8ddedec, type: 3} + font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} fontSize: 87 lineSpacing: 1 baseline: 15.27 @@ -18010,16 +18226,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1609881462} - m_LocalRotation: {x: 0, y: 0, z: 0.06975647, w: 0.9975641} + 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: 1752638942} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 8} + 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: -401, y: 402.84} + m_AnchoredPosition: {x: 2, y: 479.5} m_SizeDelta: {x: 1200, y: 250} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1609881464 @@ -18037,11 +18253,11 @@ MonoBehaviour: language: 10 contexts: - language: 10 - text: Attention - font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} - fontSize: 158 + text: UPLOAD YOUR WORK + font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + fontSize: 78 lineSpacing: 2 - baseline: 402.84 + baseline: 479.5 - language: 40 text: "\u8D34\u5FC3\u63D0\u9192" font: {fileID: 12800000, guid: b9a3cf7d754c5ff448c41816cc1e6c0a, type: 3} @@ -18061,15 +18277,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.70980394, g: 0.6313726, b: 0.39607844, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} - m_FontSize: 158 - m_FontStyle: 2 + m_Font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + m_FontSize: 78 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 0 m_MaxSize: 300 @@ -18079,7 +18295,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 2 - m_Text: Attention + m_Text: UPLOAD YOUR WORK --- !u!222 &1609881466 CanvasRenderer: m_ObjectHideFlags: 0 @@ -18263,15 +18479,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1826229032} - {fileID: 1536546212} m_Father: {fileID: 1752638942} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 634, y: -327} - m_SizeDelta: {x: 470, y: 293} + m_AnchoredPosition: {x: 0, y: -443} + m_SizeDelta: {x: 789, y: 185} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1619059998 MonoBehaviour: @@ -18955,7 +19170,7 @@ RectTransform: m_Children: - {fileID: 415560613} m_Father: {fileID: 1138562568} - m_RootOrder: 1 + 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} @@ -19352,8 +19567,8 @@ 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: 158, y: 22} - m_SizeDelta: {x: 115, y: 115} + m_AnchoredPosition: {x: 0, y: 185} + m_SizeDelta: {x: 147, y: 147} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1718155448 MonoBehaviour: @@ -19421,12 +19636,12 @@ RectTransform: m_Children: - {fileID: 522603591} m_Father: {fileID: 1977272186} - m_RootOrder: 5 + 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: -904, y: 486} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 561, y: -1150} + m_SizeDelta: {x: 512, y: 512} m_Pivot: {x: 0.5, y: 0.5} --- !u!225 &1719121839 CanvasGroup: @@ -19633,18 +19848,17 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 840849829} - - {fileID: 2108177150} - {fileID: 1609881463} - {fileID: 971542333} - {fileID: 1503600939} - {fileID: 1619059997} m_Father: {fileID: 1977272186} - m_RootOrder: 8 + m_RootOrder: 11 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_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 1024, y: 1366} + m_SizeDelta: {x: 2048, y: 2732} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1752638943 MonoBehaviour: @@ -19659,12 +19873,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.9019608} + m_Color: {r: 0.050980393, g: 0.3529412, b: 0.30980393, a: 0.9019608} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0dbd95d4f23ea1e4597984dfbf1f6235, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -20300,6 +20514,78 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1811083380} m_CullTransparentMesh: 0 +--- !u!1 &1817307410 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1817307411} + - component: {fileID: 1817307413} + - component: {fileID: 1817307412} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1817307411 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1817307410} + 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: 1977272186} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 2048, y: 2732} + m_Pivot: {x: 1, y: 1} +--- !u!114 &1817307412 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1817307410} + 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: 0.92941177, g: 0.95686275, b: 0.9490196, a: 1} + m_RaycastTarget: 0 + 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 &1817307413 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1817307410} + m_CullTransparentMesh: 0 --- !u!1 &1822063294 GameObject: m_ObjectHideFlags: 0 @@ -20399,110 +20685,6 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_IsOn: 0 ---- !u!1 &1826229031 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1826229032} - - component: {fileID: 1826229035} - - component: {fileID: 1826229034} - - component: {fileID: 1826229033} - m_Layer: 5 - m_Name: common-yes (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1826229032 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1826229031} - m_LocalRotation: {x: 0, y: 0, z: 0.06975647, w: 0.9975641} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1619059997} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 8} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -12.699997, y: 0.53} - m_SizeDelta: {x: -17, y: 18} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1826229033 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1826229031} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5d4111d72b538b544860d085f76e5ad8, type: 3} - m_Name: - m_EditorClassIdentifier: - language: 10 - contexts: - - language: 10 - text: YES - font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} - fontSize: 73 - lineSpacing: 1 - baseline: 0.53 - - language: 40 - text: "\u662F" - font: {fileID: 12800000, guid: 1f940ec663706444798b9201d8ddedec, type: 3} - fontSize: 87 - lineSpacing: 1 - baseline: 6.76 ---- !u!114 &1826229034 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1826229031} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.11764706, g: 0.11764706, b: 0.7411765, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} - m_FontSize: 73 - m_FontStyle: 2 - m_BestFit: 0 - m_MinSize: 7 - m_MaxSize: 87 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: YES ---- !u!222 &1826229035 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1826229031} - m_CullTransparentMesh: 0 --- !u!1 &1830266527 GameObject: m_ObjectHideFlags: 0 @@ -21575,10 +21757,10 @@ RectTransform: m_Father: {fileID: 522603591} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.25, y: 0} - m_AnchorMax: {x: 0.75, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -12, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 362, y: 85} + m_SizeDelta: {x: 720, y: 89} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1925778845 MonoBehaviour: @@ -22319,6 +22501,9 @@ RectTransform: m_Children: - {fileID: 970129849} - {fileID: 147481607} + - {fileID: 1817307411} + - {fileID: 2132980668} + - {fileID: 1461265346} - {fileID: 1997411410} - {fileID: 1079856516} - {fileID: 662585644} @@ -22326,9 +22511,9 @@ RectTransform: - {fileID: 137693518} - {fileID: 490839666} - {fileID: 1752638942} - - {fileID: 224793918842572724} - {fileID: 1174946624} - {fileID: 1138562568} + - {fileID: 224793918842572724} m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -22586,12 +22771,12 @@ RectTransform: - {fileID: 689453275} - {fileID: 1066516031} m_Father: {fileID: 1977272186} - m_RootOrder: 2 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -54} - m_SizeDelta: {x: 421, y: 293} + m_AnchoredPosition: {x: 0, y: -76} + m_SizeDelta: {x: 487, y: 184} m_Pivot: {x: 1, y: 1} --- !u!114 &1997411411 MonoBehaviour: @@ -23001,8 +23186,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 52, y: 0} - m_SizeDelta: {x: 32, y: -20} + m_AnchoredPosition: {x: -2, y: 58} + m_SizeDelta: {x: -20, y: 32} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2047961710 GameObject: @@ -23038,7 +23223,7 @@ RectTransform: - {fileID: 1525415354} - {fileID: 1361544007} m_Father: {fileID: 1138562568} - m_RootOrder: 2 + 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} @@ -23548,110 +23733,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2098350535} m_CullTransparentMesh: 0 ---- !u!1 &2108177149 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2108177150} - - component: {fileID: 2108177153} - - component: {fileID: 2108177152} - - component: {fileID: 2108177151} - m_Layer: 5 - m_Name: color-warning-title (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2108177150 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2108177149} - m_LocalRotation: {x: 0, y: 0, z: 0.06975647, w: 0.9975641} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1752638942} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 8} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -391, y: 382.2} - m_SizeDelta: {x: 1200, y: 250} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2108177151 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2108177149} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5d4111d72b538b544860d085f76e5ad8, type: 3} - m_Name: - m_EditorClassIdentifier: - language: 10 - contexts: - - language: 10 - text: Attention - font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} - fontSize: 158 - lineSpacing: 2 - baseline: 382.2 - - language: 40 - text: "\u8D34\u5FC3\u63D0\u9192" - font: {fileID: 12800000, guid: b9a3cf7d754c5ff448c41816cc1e6c0a, type: 3} - fontSize: 128 - lineSpacing: 0.9 - baseline: 382.1 ---- !u!114 &2108177152 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2108177149} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.11764706, g: 0.11764706, b: 0.7411765, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} - m_FontSize: 158 - m_FontStyle: 2 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 300 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 2 - m_Text: Attention ---- !u!222 &2108177153 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2108177149} - m_CullTransparentMesh: 0 --- !u!1 &2112666367 GameObject: m_ObjectHideFlags: 0 @@ -23796,6 +23877,43 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2114908771} m_CullTransparentMesh: 0 +--- !u!1 &2132980667 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2132980668} + m_Layer: 5 + m_Name: PaintLayer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2132980668 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2132980667} + 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: 243996844} + - {fileID: 831302270} + m_Father: {fileID: 1977272186} + 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: 0, y: 252} + m_SizeDelta: {x: 2048, y: 2048} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2135640106 GameObject: m_ObjectHideFlags: 0 @@ -24273,7 +24391,7 @@ PrefabInstance: - target: {fileID: 1792381460007772463, guid: 8fd553587c443f141825bdcd07858522, type: 3} propertyPath: m_RootOrder - value: 9 + value: 14 objectReference: {fileID: 0} - target: {fileID: 1792381460007772463, guid: 8fd553587c443f141825bdcd07858522, type: 3} @@ -24293,12 +24411,12 @@ PrefabInstance: - target: {fileID: 1792381460007772463, guid: 8fd553587c443f141825bdcd07858522, type: 3} propertyPath: m_AnchoredPosition.x - value: 205 + value: 204 objectReference: {fileID: 0} - target: {fileID: 1792381460007772463, guid: 8fd553587c443f141825bdcd07858522, type: 3} propertyPath: m_AnchoredPosition.y - value: -205 + value: -182 objectReference: {fileID: 0} - target: {fileID: 1792381460007772463, guid: 8fd553587c443f141825bdcd07858522, type: 3} @@ -24361,7 +24479,7 @@ MonoBehaviour: drawAreaOnScreen: serializedVersion: 2 x: 0 - y: 342 + y: 594 width: 2048 height: 2048 autoCaculateViewPortRect: 1 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..c2d10e5 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: 381} + m_SizeDelta: {x: 1920, y: 2688} 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 @@ -1459,7 +1459,7 @@ RectTransform: - {fileID: 1321850371} - {fileID: 1623884416} m_Father: {fileID: 1138562568} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -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: -2, y: -745.3} m_SizeDelta: {x: 1460.7, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &225586104 @@ -2051,17 +2051,17 @@ MonoBehaviour: language: 10 contexts: - language: 10 - text: Preview - font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} - fontSize: 110 + text: PREVIEW YOUR AUTOGRAPH + font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + fontSize: 78 lineSpacing: 2 - baseline: 686.4 + baseline: -745.3 - language: 40 text: "\u4F5C\u54C1\u9884\u89C8" - font: {fileID: 12800000, guid: 1f940ec663706444798b9201d8ddedec, type: 3} + font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} fontSize: 100 lineSpacing: 0.9 - baseline: 690.8 + baseline: 885.8 --- !u!114 &225586105 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2075,15 +2075,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.70980394, g: 0.6313726, b: 0.39607844, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} - m_FontSize: 110 - m_FontStyle: 0 + m_Font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + m_FontSize: 78 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 5 m_MaxSize: 110 @@ -2093,7 +2093,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 2 - m_Text: Preview + m_Text: PREVIEW YOUR AUTOGRAPH --- !u!222 &225586106 CanvasRenderer: 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: @@ -2452,7 +2452,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: 0} + m_AnchoredPosition: {x: 0, y: 252} m_SizeDelta: {x: 2048, y: 2048} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &266725252 @@ -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 @@ -3202,7 +3203,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 0dbd95d4f23ea1e4597984dfbf1f6235, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3318,7 +3319,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &332208530 RectTransform: m_ObjectHideFlags: 0 @@ -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: -3, y: 1266} + m_SizeDelta: {x: 1017.4, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &339249793 MonoBehaviour: @@ -3603,15 +3604,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.70980394, g: 0.6313726, b: 0.39607844, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} - m_FontSize: 106 - m_FontStyle: 0 + m_Font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + m_FontSize: 78 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 5 m_MaxSize: 110 @@ -3621,7 +3622,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Sign your name + m_Text: AUTOGRAPH YOUR WORK --- !u!222 &339249794 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3645,11 +3646,11 @@ MonoBehaviour: language: 10 contexts: - language: 10 - text: Sign your name - font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} - fontSize: 106 + text: AUTOGRAPH YOUR WORK + font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + fontSize: 78 lineSpacing: 1 - baseline: 1125.23 + baseline: 1266 - language: 40 text: "\u8BF7\u4E8E\u6846\u5185\u5199\u4E0A\u60A8\u7684\u5927\u540D" font: {fileID: 12800000, guid: 1f940ec663706444798b9201d8ddedec, type: 3} @@ -4116,8 +4117,8 @@ 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_SizeDelta: {x: 531, y: 208} + m_AnchoredPosition: {x: -1, y: -965} + m_SizeDelta: {x: 789, y: 185} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &386909062 MonoBehaviour: @@ -4675,8 +4676,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 343, y: 919} - m_SizeDelta: {x: 510, y: 150} + m_AnchoredPosition: {x: 1843, y: 1024} + m_SizeDelta: {x: 121, y: 127} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &399262728 MonoBehaviour: @@ -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: 0 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -5225,7 +5226,7 @@ RectTransform: 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_SizeDelta: {x: 2048, y: 1430} 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} @@ -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 @@ -6277,12 +6278,12 @@ GameObject: - component: {fileID: 548923641} - component: {fileID: 548923640} m_Layer: 5 - m_Name: UI + m_Name: UI Sign m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &548923639 RectTransform: m_ObjectHideFlags: 0 @@ -6295,12 +6296,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1138562568} - m_RootOrder: 0 + 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: 0, y: 0} - m_SizeDelta: {x: 2732, y: 2048} + m_SizeDelta: {x: 2045, y: 2732} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &548923640 MonoBehaviour: @@ -6320,7 +6321,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: c2483266a374e7746af1a8deaf660db0, type: 3} + m_Texture: {fileID: 2800000, guid: be174212278af7f41ae3b57de7ef138a, type: 3} m_UVRect: serializedVersion: 2 x: 0 @@ -6833,10 +6834,10 @@ MonoBehaviour: multiTouch: 0 drawAreaOnScreen: serializedVersion: 2 - x: 0 - y: 42 - width: 2048 - height: 800 + x: 267.5 + y: 495 + width: 1513 + height: 625 autoCaculateViewPortRect: 1 needToIgnoredCameraAspect: 1 CameraSize: @@ -9322,8 +9323,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: 42} - m_SizeDelta: {x: 2048, y: 800} + m_AnchoredPosition: {x: 0, y: 495} + m_SizeDelta: {x: 1513, y: 625} m_Pivot: {x: 0.5, y: 0} --- !u!114 &895392843 MonoBehaviour: @@ -9803,7 +9804,7 @@ RectTransform: - {fileID: 962065680} - {fileID: 30498627} m_Father: {fileID: 1138562568} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -10007,7 +10008,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1009952121 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10515,8 +10516,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -2.5, y: 16} - m_SizeDelta: {x: 5, y: 40} + m_AnchoredPosition: {x: -0.000030517578, y: 6.419998} + m_SizeDelta: {x: 0, y: 0.29996} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1066516032 MonoBehaviour: @@ -10531,25 +10532,25 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.84313726, g: 0.7529412, b: 0.52156866, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} - m_FontSize: 86 - m_FontStyle: 0 + m_Font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + m_FontSize: 64 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 2 - m_MaxSize: 86 + m_MaxSize: 111 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Submit + m_Text: COMPLETE --- !u!222 &1066516033 CanvasRenderer: m_ObjectHideFlags: 0 @@ -10573,11 +10574,11 @@ MonoBehaviour: language: 10 contexts: - language: 10 - text: Submit - font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} - fontSize: 86 + text: COMPLETE + font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + fontSize: 64 lineSpacing: 1 - baseline: 16 + baseline: 6.42 - language: 40 text: "\u9001\u51FA" font: {fileID: 12800000, guid: 1f940ec663706444798b9201d8ddedec, type: 3} @@ -11097,6 +11098,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1210265328} - {fileID: 548923639} - {fileID: 1696572311} - {fileID: 970129849} @@ -11723,6 +11725,76 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1192641009} m_CullTransparentMesh: 0 +--- !u!1 &1210265327 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1210265328} + - component: {fileID: 1210265330} + - component: {fileID: 1210265329} + m_Layer: 5 + m_Name: UI Preview + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1210265328 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1210265327} + 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: 1138562568} + 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: 2045, y: 2732} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1210265329 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1210265327} + 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: 0.5372549} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 2800000, guid: bc52d35e275be864c9ae128b31c6ea6b, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &1210265330 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1210265327} + m_CullTransparentMesh: 0 --- !u!1 &1226511298 GameObject: m_ObjectHideFlags: 0 @@ -14788,8 +14860,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -13, y: 4} - m_SizeDelta: {x: 9.44, y: 12} + m_AnchoredPosition: {x: 1.3599854, y: 25.54} + m_SizeDelta: {x: 2.7199998, y: 12} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1579864891 MonoBehaviour: @@ -14806,14 +14878,14 @@ MonoBehaviour: language: 10 contexts: - language: 10 - text: Sign Again - font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} - fontSize: 66 + text: DO-OVER + font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + fontSize: 42 lineSpacing: 1 - baseline: 4 + baseline: 25.54 - language: 40 text: "\u6211\u8981\u91CD\u7B7E" - font: {fileID: 12800000, guid: 1f940ec663706444798b9201d8ddedec, type: 3} + font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} fontSize: 66 lineSpacing: 1 baseline: 10 @@ -14830,15 +14902,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.70980394, g: 0.6313726, b: 0.39607844, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} - m_FontSize: 66 - m_FontStyle: 0 + m_Font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + m_FontSize: 42 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 7 m_MaxSize: 72 @@ -14848,7 +14920,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Sign Again + m_Text: DO-OVER --- !u!222 &1579864893 CanvasRenderer: m_ObjectHideFlags: 0 @@ -15572,7 +15644,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.92941177, g: 0.95686275, b: 0.9490196, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -15770,7 +15842,7 @@ RectTransform: m_Children: - {fileID: 415560613} m_Father: {fileID: 1138562568} - m_RootOrder: 1 + 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} @@ -16183,7 +16255,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.92941177, g: 0.95686275, b: 0.9490196, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -16348,12 +16420,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.9019608} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 75890b151d9535246ad96d5f4988188c, type: 3} + m_Sprite: {fileID: 21300000, guid: d770fc3e6eb1c054590e5c4b40abd28b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -16807,8 +16879,8 @@ 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_SizeDelta: {x: 571, y: 208} + m_AnchoredPosition: {x: -2, y: -1150.2} + m_SizeDelta: {x: 571, y: 135.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1786772118 MonoBehaviour: @@ -16832,7 +16904,7 @@ MonoBehaviour: m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0} m_DisabledColor: {r: 1, g: 1, b: 1, a: 1} m_ColorMultiplier: 1 m_FadeDuration: 0.1 @@ -16886,12 +16958,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 93e50f61a6d170b4ca2e4a582d967443, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -18104,8 +18176,8 @@ 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: 0} - m_SizeDelta: {x: 2451, y: 1766} + m_AnchoredPosition: {x: 0, y: -922.7} + m_SizeDelta: {x: 2048, y: 651} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1913412845 MonoBehaviour: @@ -18502,7 +18574,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 +18589,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 +18611,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 47b15dbef5eb46140a92fffa0f17cfcb, type: 3} m_Name: m_EditorClassIdentifier: + canvas: {fileID: 0} --- !u!114 &1943785796 MonoBehaviour: m_ObjectHideFlags: 0 @@ -19206,8 +19279,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -261, y: -165} - m_SizeDelta: {x: 397, y: 189} + m_AnchoredPosition: {x: -1023.5, y: -2469} + m_SizeDelta: {x: 791, y: 185} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1997411411 MonoBehaviour: @@ -19271,6 +19344,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 @@ -19289,7 +19373,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 77c658eb7718bf94aa6e726cdff112f7, type: 3} + m_Sprite: {fileID: 21300000, guid: 17daf52c9a589564895017d386164fef, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -19748,7 +19832,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: 11, y: 4} + m_AnchoredPosition: {x: 2, y: 4} m_SizeDelta: {x: -22, y: 12} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2065718641 @@ -19766,8 +19850,8 @@ MonoBehaviour: language: 10 contexts: - language: 10 - text: Submit - font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} + text: CONFIRM + font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} fontSize: 66 lineSpacing: 1 baseline: 4 @@ -19790,15 +19874,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.84313726, g: 0.7529412, b: 0.52156866, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} + m_Font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} m_FontSize: 66 - m_FontStyle: 0 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 7 m_MaxSize: 72 @@ -19808,7 +19892,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Submit + m_Text: CONFIRM --- !u!222 &2065718643 CanvasRenderer: 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..cf7f6bb 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} @@ -299,7 +298,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: 10, y: -188} + m_AnchoredPosition: {x: 0, y: -1030.2} m_SizeDelta: {x: 2048, y: 250} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &239676773 @@ -315,15 +314,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.25882354, g: 0.45098042, b: 0.5529412, a: 1} + m_Color: {r: 0.70980394, g: 0.6313726, b: 0.39607844, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 48 - m_FontStyle: 0 + m_Font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + m_FontSize: 42 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 6 m_MaxSize: 72 @@ -358,10 +357,10 @@ MonoBehaviour: contexts: - language: 10 text: You can purchase your work with the following print code at the counter. - font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - fontSize: 48 + font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + fontSize: 42 lineSpacing: 1.1 - baseline: -188 + baseline: -1030.2 - language: 40 text: "\u8BF7\u8BB0\u4E0B\u60A8\u7684\u5217\u5370\u4EE3\u7801\u81F3\u524D\u65B9\u67DC\u53F0\u9009\u8D2D\u60A8\u7684\u4F5C\u54C1\uFF01" font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} @@ -402,8 +401,8 @@ 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: -390} - m_SizeDelta: {x: 1275, y: 265} + m_AnchoredPosition: {x: 2.6, y: -885.8} + m_SizeDelta: {x: 1260, y: 206} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &324924814 MonoBehaviour: @@ -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: 0.92941177, g: 0.95686275, b: 0.9490196, 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 @@ -484,7 +557,7 @@ GameObject: - component: {fileID: 481181422} - component: {fileID: 481181425} m_Layer: 5 - m_Name: Button + m_Name: got-it m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -503,11 +576,11 @@ RectTransform: m_Children: - {fileID: 892526981} m_Father: {fileID: 746257130} - m_RootOrder: 7 + 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: 0, y: -696} + m_AnchoredPosition: {x: 0, y: -1125} m_SizeDelta: {x: 817, y: 164} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &481181422 @@ -532,7 +605,7 @@ MonoBehaviour: m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1} - m_PressedColor: {r: 0.9372549, g: 0.52156866, b: 0.23137255, a: 1} + m_PressedColor: {r: 1, g: 1, b: 1, a: 0} m_DisabledColor: {r: 1, g: 1, b: 1, a: 1} m_ColorMultiplier: 1 m_FadeDuration: 0.1 @@ -585,12 +658,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 208a4e2e11e5597429f005436342f000, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -832,7 +905,7 @@ RectTransform: m_Children: - {fileID: 2144124202} m_Father: {fileID: 746257130} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -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: @@ -1034,13 +1107,14 @@ RectTransform: - {fileID: 1478432114} - {fileID: 239676772} - {fileID: 324924813} + - {fileID: 1266193605} - {fileID: 1262648296} - {fileID: 1117073449} - {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 +1165,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 @@ -1126,8 +1372,8 @@ 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_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -6.62} + m_SizeDelta: {x: 9, y: 2} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &892526982 MonoBehaviour: @@ -1142,15 +1388,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.25882354, g: 0.4509804, b: 0.5529412, a: 1} + m_Color: {r: 0.70980394, g: 0.6313726, b: 0.39607844, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 82 - m_FontStyle: 0 + m_Font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + m_FontSize: 42 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 1 m_MaxSize: 100 @@ -1160,7 +1406,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Got it! + m_Text: GOT IT! --- !u!222 &892526983 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1184,17 +1430,98 @@ MonoBehaviour: language: 10 contexts: - language: 10 - text: Got it! - font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - fontSize: 82 + text: GOT IT! + font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + fontSize: 42 lineSpacing: 1 - baseline: 0 + baseline: -6.62 - language: 40 text: "\u77E5\u9053\u4E86!" font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} 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 @@ -1225,12 +1552,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 746257130} - m_RootOrder: 6 + 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: 0, y: -404} - m_SizeDelta: {x: 2048, y: 250} + m_AnchoredPosition: {x: 2.5999, y: -885.80005} + m_SizeDelta: {x: 1260, y: 206} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1117073451 MonoBehaviour: @@ -1245,25 +1572,25 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.70980394, g: 0.6313726, b: 0.39607844, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 371cdf1b424df4241bc5e8324b427050, type: 3} - m_FontSize: 120 + m_Font: {fileID: 12800000, guid: b8a31bf93a948314baaf6e1c0d39d2b9, type: 3} + m_FontSize: 128 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 - m_MaxSize: 120 + m_MaxSize: 212 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: HHMMSS01 + m_Text: 2751381 --- !u!222 &1117073452 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1303,12 +1630,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 746257130} - m_RootOrder: 5 + 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: -306} - m_SizeDelta: {x: 2048, y: 250} + m_AnchoredPosition: {x: -460, y: -758.4} + m_SizeDelta: {x: 749.6, y: 250} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1262648297 MonoBehaviour: @@ -1325,11 +1652,11 @@ MonoBehaviour: language: 10 contexts: - language: 10 - text: Print code - font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - fontSize: 30 + text: YOUR PRINT CODE + font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + fontSize: 38 lineSpacing: 1.1 - baseline: -306 + baseline: -758.4 - language: 40 text: "\u5217\u5370\u4EE3\u7801" font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} @@ -1349,17 +1676,17 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.70980394, g: 0.6313726, b: 0.39607844, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 30 + m_Font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + m_FontSize: 38 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 6 + m_MinSize: 4 m_MaxSize: 72 m_Alignment: 4 m_AlignByGeometry: 0 @@ -1367,7 +1694,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: Print code + m_Text: YOUR PRINT CODE --- !u!222 &1262648299 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1376,6 +1703,194 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1262648295} m_CullTransparentMesh: 0 +--- !u!1 &1266193604 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1266193605} + - component: {fileID: 1266193608} + - component: {fileID: 1266193607} + - component: {fileID: 1266193606} + m_Layer: 5 + m_Name: title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1266193605 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1266193604} + 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: 746257130} + 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: -4, y: -637.46} + m_SizeDelta: {x: 938.7, y: 250} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1266193606 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1266193604} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5d4111d72b538b544860d085f76e5ad8, type: 3} + m_Name: + m_EditorClassIdentifier: + language: 10 + contexts: + - language: 10 + text: UPLOAD COMPLETED + font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + fontSize: 78 + lineSpacing: 1.1 + baseline: -637.46 + - language: 40 + text: "\u5217\u5370\u4EE3\u7801" + font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + fontSize: 30 + lineSpacing: 1.1 + baseline: 0 +--- !u!114 &1266193607 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1266193604} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.70980394, g: 0.6313726, b: 0.39607844, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + m_FontSize: 78 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 78 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1.1 + m_Text: UPLOAD COMPLETED +--- !u!222 &1266193608 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1266193604} + 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 +1918,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: 381} + m_SizeDelta: {x: 1920, y: 2688} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1478432115 MonoBehaviour: @@ -1431,7 +1946,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 @@ -1546,7 +2061,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a3b08b2f3212775418737408a655e5e0, type: 3} + m_Sprite: {fileID: 21300000, guid: d770fc3e6eb1c054590e5c4b40abd28b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1580,7 +2095,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 @@ -1665,7 +2180,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 746257130} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1711,7 +2226,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 0dbd95d4f23ea1e4597984dfbf1f6235, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1775,7 +2290,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: 2732, y: 2048} + m_SizeDelta: {x: 2048, y: 2732} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2144124203 MonoBehaviour: @@ -1795,7 +2310,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: 487b869ae7002dc4898033ca6e391326, type: 3} + m_Texture: {fileID: 2800000, guid: 13f7130e6570bec469393ceb12137899, type: 3} m_UVRect: serializedVersion: 2 x: 0 diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/empty.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/empty.png new file mode 100644 index 0000000..9f736ae Binary files /dev/null and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/empty.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/start.png.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/empty.png.meta similarity index 97% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/start.png.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/empty.png.meta index c0d1b27..dc1f1bd 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/start.png.meta +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/empty.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 77f1453441252654e99adc04f4c5727c +guid: 7edda462078b5164e82966f21fed5c3f TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -37,7 +37,7 @@ TextureImporter: wrapU: -1 wrapV: -1 wrapW: -1 - nPOTScale: 0 + nPOTScale: 1 lightmap: 0 compressionQuality: 50 spriteMode: 0 @@ -48,7 +48,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + alphaUsage: 2 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/icon.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/icon.png new file mode 100644 index 0000000..10d2ee2 Binary files /dev/null and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/icon.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/signature_2_outline.png.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/icon.png.meta similarity index 97% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/signature_2_outline.png.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/icon.png.meta index bfb4286..936dbce 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/signature_2_outline.png.meta +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/icon.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 005f05c0013515145b188b6e290538ec +guid: b356704b3164c0a4994356906197fa6b TextureImporter: fileIDToRecycleName: {} externalObjects: {} diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/original_07.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/original_07.png new file mode 100644 index 0000000..69787fa Binary files /dev/null and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/original_07.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/outline.png.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/original_07.png.meta similarity index 97% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/outline.png.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/original_07.png.meta index efd9ca0..e7e26cc 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/outline.png.meta +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/original_07.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ac6baf5b76f546d45b85e8528b6c998d +guid: 7afe1bf36b19be448bc4831941462849 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -31,13 +31,13 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 1 aniso: -1 mipBias: -100 wrapU: -1 wrapV: -1 wrapW: -1 - nPOTScale: 0 + nPOTScale: 1 lightmap: 0 compressionQuality: 50 spriteMode: 0 diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/outline.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/outline.png deleted file mode 100644 index ec045b6..0000000 Binary files a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/outline.png and /dev/null differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/outline_07.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/outline_07.png new file mode 100644 index 0000000..b1b6e3b Binary files /dev/null and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/outline_07.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/outline_07.png.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/outline_07.png.meta new file mode 100644 index 0000000..bb11ba0 --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/outline_07.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 4d408d96b03b9ff4cbf3a03aa8ff53e2 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/region.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/region.png deleted file mode 100644 index 7693d60..0000000 Binary files a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/region.png and /dev/null differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/regions_07.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/regions_07.png new file mode 100644 index 0000000..bd3c0b4 Binary files /dev/null and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/regions_07.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/regions_07.png.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/regions_07.png.meta new file mode 100644 index 0000000..7a6a62b --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/regions_07.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 5506b9dacf8b4464ab385100baa59091 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 1 + textureFormat: 3 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 1 + textureFormat: 3 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 1 + textureFormat: 3 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/signature_2_outline.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/signature_2_outline.png deleted file mode 100644 index af8d03b..0000000 Binary files a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/signature_2_outline.png and /dev/null differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/signature_2_regions.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/signature_2_regions.png deleted file mode 100644 index d50efea..0000000 Binary files a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/signature_2_regions.png and /dev/null differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Marvel/empty2.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/signature_outline.png similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Marvel/empty2.png rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/signature_outline.png diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Marvel/empty2.png.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/signature_outline.png.meta similarity index 100% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Marvel/empty2.png.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/signature_outline.png.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/signature_regions.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/signature_regions.png new file mode 100644 index 0000000..035d455 Binary files /dev/null and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/signature_regions.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/signature_regions.png.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/signature_regions.png.meta new file mode 100644 index 0000000..d51af1e --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/signature_regions.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 5b1b5508103306a43b1e09892ed6a3dd +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 3 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 3 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 3 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/start.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/start.png deleted file mode 100644 index b64b252..0000000 Binary files a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/start.png and /dev/null differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/start_07.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/start_07.png new file mode 100644 index 0000000..08ad56a Binary files /dev/null and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/start_07.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/region.png.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/start_07.png.meta similarity index 96% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/region.png.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/start_07.png.meta index f1b7396..3cde940 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/region.png.meta +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/start_07.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d6879ed0612fdd34192a9547cc5f42b1 +guid: 38432f5392a4239449831a523412cc28 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 0 aniso: -1 mipBias: -100 wrapU: -1 @@ -49,7 +49,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/test.asset b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/test.asset deleted file mode 100644 index 88d35fa..0000000 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/test.asset +++ /dev/null @@ -1,19 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8820b1d2e7c56fa4f8625365d4108cc5, type: 3} - m_Name: test - m_EditorClassIdentifier: - UniqueId: test - startImagePath: Frozen/start - outlinePath: Frozen/outline - RegionPath: Frozen/region - IconPath: Marvel/icon diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/test.asset.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/test.asset.meta deleted file mode 100644 index fac16e6..0000000 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Resources/Frozen/test.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 885b5e612e15159478d6d2d8d97eb4a3 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: 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/Asset/PaintCraft/signature.asset b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Asset/PaintCraft/signature.asset index a632d0d..224d71d 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Asset/PaintCraft/signature.asset +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Asset/PaintCraft/signature.asset @@ -14,6 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: UniqueId: 00 startImagePath: Marvel/empty - outlinePath: Marvel/empty2 - RegionPath: Marvel/signature_regions + outlinePath: Frozen/signature_outline + RegionPath: Frozen/signature_regions IconPath: Marvel/icon diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Asset/PaintCraft/signature2.asset b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Asset/PaintCraft/signature2.asset deleted file mode 100644 index 634cee2..0000000 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Asset/PaintCraft/signature2.asset +++ /dev/null @@ -1,19 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8820b1d2e7c56fa4f8625365d4108cc5, type: 3} - m_Name: signature2 - m_EditorClassIdentifier: - UniqueId: 01 - startImagePath: Marvel/empty - outlinePath: Marvel/empty2 - RegionPath: Frozen/signature_2_regions - IconPath: Marvel/icon diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Asset/PaintCraft/signature2.asset.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Asset/PaintCraft/signature2.asset.meta deleted file mode 100644 index ddba0c2..0000000 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Asset/PaintCraft/signature2.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4e20bc016000736469a14b7011bc216e -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Asset/PaintCraft/temp.asset b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Asset/PaintCraft/temp.asset index 871c16b..4b01c10 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Asset/PaintCraft/temp.asset +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Asset/PaintCraft/temp.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8820b1d2e7c56fa4f8625365d4108cc5, type: 3} m_Name: temp m_EditorClassIdentifier: - UniqueId: ca - startImagePath: Marvel/start_ca - outlinePath: Marvel/outline_ca - RegionPath: Marvel/regions_ca + UniqueId: 07 + startImagePath: Frozen/start_07 + outlinePath: Frozen/outline_07 + RegionPath: Frozen/regions_07 IconPath: Marvel/icon diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Asset/RadialClock.prefab b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Asset/RadialClock.prefab index 428891f..aa8d5bd 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Asset/RadialClock.prefab +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Asset/RadialClock.prefab @@ -80,8 +80,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Texture: {fileID: 2800000, guid: 4b056f4b95985cb47bc5d8b0d7a029c6, type: 3} m_UVRect: serializedVersion: 2 @@ -126,16 +124,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2000896897870920853} - m_LocalRotation: {x: 0, y: 0, z: 0.06975647, w: 0.9975641} + 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: 1792381460007772463} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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: 0.4, y: 20.5} + m_AnchoredPosition: {x: -9, y: 24} m_SizeDelta: {x: 300, y: 300} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1789710596541470879 @@ -159,17 +157,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.16078432, g: 0.2784314, b: 0.70980394, a: 1} + m_Color: {r: 0.84313726, g: 0.7529412, b: 0.52156866, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} - m_FontSize: 100 - m_FontStyle: 0 + m_Font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + m_FontSize: 85 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 1 m_MaxSize: 165 @@ -238,13 +234,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.09411765, g: 0.4745098, b: 0.7411765, a: 0} + m_Color: {r: 0.84313726, g: 0.7529412, b: 0.52156866, a: 0} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 4b056f4b95985cb47bc5d8b0d7a029c6, type: 3} m_Type: 3 m_PreserveAspect: 0 @@ -280,13 +274,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4059456127422672775} - m_LocalRotation: {x: 0, y: 0, z: 0.06975647, w: 0.9975641} + 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: 1792381460007772463} m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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: -49.4, y: 100} @@ -313,17 +307,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.16078432, g: 0.2784314, b: 0.70980394, a: 1} + m_Color: {r: 0.84313726, g: 0.7529412, b: 0.52156866, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} + m_Font: {fileID: 12800000, guid: 299e5747903dc2e4bb9a9da6e10407a4, type: 3} m_FontSize: 42 - m_FontStyle: 2 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 1 m_MaxSize: 165 @@ -333,7 +325,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 2 - m_Text: Time Left + m_Text: TIME LEFT --- !u!114 &2525503451231538874 MonoBehaviour: m_ObjectHideFlags: 0 @@ -349,8 +341,8 @@ MonoBehaviour: language: 10 contexts: - language: 10 - text: Time Left - font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} + text: TIME LEFT + font: {fileID: 12800000, guid: 299e5747903dc2e4bb9a9da6e10407a4, type: 3} fontSize: 42 lineSpacing: 2 baseline: 100 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 b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/LastSignatureImage.cs new file mode 100644 index 0000000..1d846e4 --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/LastSignatureImage.cs @@ -0,0 +1,36 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +namespace UltraCombos.Marvel.DrawHeroes +{ + [RequireComponent(typeof(RawImage))] + public class LastSignatureImage : MonoBehaviour + { + [SerializeField] + PaintCraft.CanvasController canvas; + + RawImage image; + + private void Start() + { + image = GetComponent(); + } + + private void Update() + { + if (image.texture == null) + { + if (canvas) + { + image.texture = canvas.BackLayerController.RenderTexture; + } + else + { + image.texture = AppData.Instance.lastSignature; + } + } + } + } +} \ No newline at end of file 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/PageManager.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/PageManager.cs index eea2478..0d27f60 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/PageManager.cs +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/PageManager.cs @@ -12,6 +12,7 @@ namespace UltraCombos.Marvel.DrawHeroes [Space(10)] public UnityEvent onSelected = new UnityEvent(); + public string FolderName = "Frozen"; private void Start() { @@ -24,10 +25,10 @@ namespace UltraCombos.Marvel.DrawHeroes var config = ScriptableObject.CreateInstance(); config.name = $"Page-{id}"; config.UniqueId = $"{id}"; - config.startImagePath = $"Marvel/start_{id}"; - config.outlinePath = $"Marvel/outline_{id}"; - config.RegionPath = $"Marvel/regions_{id}"; - config.IconPath = $"Marvel/icon"; + config.startImagePath = $"{FolderName}/start_{id}"; + config.outlinePath = $"{FolderName}/outline_{id}"; + config.RegionPath = $"{FolderName}/regions_{id}"; + config.IconPath = $"{FolderName}/icon"; pages.Add(id, config); } Debug.Log($"[Page Manager] Add {pages.Count} pages."); 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..cc97e16 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(); @@ -155,7 +163,7 @@ namespace UltraCombos.Marvel.DrawHeroes var data = AppData.Instance; if (AppData.Instance.dev == false) - client.SendData(data.lastThumbnail, data.lastSignature, data.lastThumbnail); + client.SendData(data.lastPainting, data.lastSignature, data.lastThumbnail); yield return new WaitForSeconds(interval); 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/Assets/RoyalGallery/Texture/Layout/EN/04_autograph.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/04_autograph.png new file mode 100644 index 0000000..90bea9e Binary files /dev/null and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/04_autograph.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/04_autograph.png.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/04_autograph.png.meta new file mode 100644 index 0000000..b8b9f01 --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/04_autograph.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: be174212278af7f41ae3b57de7ef138a +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 3 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 3 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 3 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/05_printPreview_1.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/05_printPreview_1.png new file mode 100644 index 0000000..2a72e05 Binary files /dev/null and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/05_printPreview_1.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/05_printPreview_1.png.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/05_printPreview_1.png.meta new file mode 100644 index 0000000..4062175 --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/05_printPreview_1.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: bc52d35e275be864c9ae128b31c6ea6b +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 3 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 3 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 3 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/06_printCode_1.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/06_printCode_1.png new file mode 100644 index 0000000..9dbd58e Binary files /dev/null and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/06_printCode_1.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/06_printCode_1.png.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/06_printCode_1.png.meta new file mode 100644 index 0000000..e117cef --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/06_printCode_1.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 13f7130e6570bec469393ceb12137899 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 3 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 3 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 3 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/1-Index.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/1-Index.png index 79c40df..fff823b 100644 Binary files a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/1-Index.png and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/1-Index.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/2-1.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/2-1.png index 1132405..cac155a 100644 Binary files a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/2-1.png and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/2-1.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/2-Coloring-1.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/2-Coloring-1.png index 1ef7d2d..67e19d7 100644 Binary files a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/2-Coloring-1.png and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/2-Coloring-1.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/2-Coloring-2.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/2-Coloring-2.png deleted file mode 100644 index 9423bda..0000000 Binary files a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/2-Coloring-2.png and /dev/null differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/2-Coloring-2.png.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/2-Coloring-2.png.meta deleted file mode 100644 index 9b3c9ed..0000000 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/2-Coloring-2.png.meta +++ /dev/null @@ -1,132 +0,0 @@ -fileFormatVersion: 2 -guid: 22e95652fb3d52a47884a76ae462b5fb -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/4-Location.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/4-Location.png deleted file mode 100644 index f93f926..0000000 Binary files a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/4-Location.png and /dev/null differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/4-Location.png.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/4-Location.png.meta deleted file mode 100644 index 568378b..0000000 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Layout/EN/4-Location.png.meta +++ /dev/null @@ -1,132 +0,0 @@ -fileFormatVersion: 2 -guid: adb0dd368e6ad5b4489558609b7c41fb -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 4096 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 4096 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: iPhone - maxTextureSize: 4096 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 4096 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 4096 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/Background.jpg b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/Background.jpg deleted file mode 100644 index 6f185a6..0000000 Binary files a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/Background.jpg and /dev/null differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/bg-coloring.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/bg-coloring.png new file mode 100644 index 0000000..e331d86 Binary files /dev/null and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/bg-coloring.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/bg-coloring.png.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/bg-coloring.png.meta new file mode 100644 index 0000000..5cbe73c --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/bg-coloring.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: cd02fae6849ac9f419ef2f00a7610220 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 888596879af397547a7e01548ff2c6a0 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/bg-preview.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/bg-preview.png new file mode 100644 index 0000000..a6a55b7 Binary files /dev/null and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/bg-preview.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/Background.jpg.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/bg-preview.png.meta similarity index 96% rename from 03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/Background.jpg.meta rename to 03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/bg-preview.png.meta index bcbac6a..4848a40 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/Background.jpg.meta +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/bg-preview.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 00b15aeb4208fde4286e5bc898e49cc7 +guid: d770fc3e6eb1c054590e5c4b40abd28b TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: af9298e1a7a284747bb57f0568e946ea + spriteID: d87dd82374292fa44be7b765347b844c vertices: [] indices: edges: [] diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/bg-start.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/bg-start.png new file mode 100644 index 0000000..e946842 Binary files /dev/null and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/bg-start.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/bg-start.png.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/bg-start.png.meta new file mode 100644 index 0000000..b2a4745 --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/bg-start.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 41534eb33d2c95b428a7120b78275d2a +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 2d65e4c94e943ba4c907af184ef71873 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/brush_bar.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/brush_bar.png index 7c93f42..7c5976a 100644 Binary files a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/brush_bar.png and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/brush_bar.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/brush_color_ref.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/brush_color_ref.png index 2d0e690..aabe7cb 100644 Binary files a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/brush_color_ref.png and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/brush_color_ref.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/brush_ctrl.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/brush_ctrl.png index 37f47d5..6a4e064 100644 Binary files a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/brush_ctrl.png and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/brush_ctrl.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/btn-clear.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/btn-clear.png index a9a1798..5413bfa 100644 Binary files a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/btn-clear.png and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/btn-clear.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/btn-done.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/btn-done.png index 0e1b381..3ea201f 100644 Binary files a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/btn-done.png and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/btn-done.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/btn-language.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/btn-language.png index 0841aa4..20def51 100644 Binary files a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/btn-language.png and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/btn-language.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/btn-start.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/btn-start.png index 932d114..1758f26 100644 Binary files a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/btn-start.png and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/btn-start.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/btn-yes.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/btn-yes.png index 0e1e5a4..eb16cb6 100644 Binary files a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/btn-yes.png and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/btn-yes.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/color_coverV1.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/color_coverV1.png new file mode 100644 index 0000000..260cf7b Binary files /dev/null and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/color_coverV1.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/color_coverV1.png.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/color_coverV1.png.meta new file mode 100644 index 0000000..d115b69 --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/color_coverV1.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 99b58ad3546cd2b4b8710bb1a69ed179 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 4096 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 4096 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 4096 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: dc8e243e813611e49820ca987affb845 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/color_ring.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/color_ring.png index 16b29fc..d8bec97 100644 Binary files a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/color_ring.png and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/color_ring.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/icon_brush.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/icon_brush.png index b8ba0df..7e4a084 100644 Binary files a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/icon_brush.png and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/icon_brush.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/icon_brush_click.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/icon_brush_click.png index 45cdb8e..17bd356 100644 Binary files a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/icon_brush_click.png and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/icon_brush_click.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/icon_bucket.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/icon_bucket.png index b70dc42..4e93a96 100644 Binary files a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/icon_bucket.png and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/icon_bucket.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/icon_bucket_click.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/icon_bucket_click.png index 1df82f2..22da660 100644 Binary files a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/icon_bucket_click.png and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/icon_bucket_click.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/pattern1.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/pattern1.png index e64ca0a..a6a55b7 100644 Binary files a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/pattern1.png and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/pattern1.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/pattern1.png.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/pattern1.png.meta index e12478f..13602ae 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/pattern1.png.meta +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/pattern1.png.meta @@ -49,7 +49,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 1 + alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 @@ -60,7 +60,7 @@ TextureImporter: platformSettings: - serializedVersion: 2 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -71,7 +71,7 @@ TextureImporter: androidETC2FallbackOverride: 0 - serializedVersion: 2 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -82,7 +82,7 @@ TextureImporter: androidETC2FallbackOverride: 0 - serializedVersion: 2 buildTarget: iPhone - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/preview.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/preview.png index 33e1a94..5604db5 100644 Binary files a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/preview.png and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/preview.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/print.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/print.png index e921819..b56426c 100644 Binary files a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/print.png and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/print.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/remind.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/remind.png index 865fa8f..34e193c 100644 Binary files a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/remind.png and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/remind.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/sign.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/sign.png index 917cbfb..30db976 100644 Binary files a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/sign.png and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/sign.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/titleDeco-left.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/titleDeco-left.png new file mode 100644 index 0000000..f75af55 Binary files /dev/null and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/titleDeco-left.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/titleDeco-left.png.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/titleDeco-left.png.meta new file mode 100644 index 0000000..e6028e6 --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/titleDeco-left.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: af545bff1ab5d8b4484a4107ec5ebc11 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: b637a4dd3db5a354796a5b5cad142cdc + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/titleDeco-right.png b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/titleDeco-right.png new file mode 100644 index 0000000..a2b54cc Binary files /dev/null and b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/titleDeco-right.png differ diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/titleDeco-right.png.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/titleDeco-right.png.meta new file mode 100644 index 0000000..d19e628 --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/UI/titleDeco-right.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: ccf1e223ebfaa41428c68bdad7ef8a48 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 0faa8755ef253454eb793f8fa4daeac5 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Wall.renderTexture b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Wall.renderTexture deleted file mode 100644 index 5ca577f..0000000 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Wall.renderTexture +++ /dev/null @@ -1,34 +0,0 @@ -%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: Wall - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - m_Width: 2732 - m_Height: 650 - 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_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Wall.renderTexture.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Wall.renderTexture.meta deleted file mode 100644 index cbc81ac..0000000 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Texture/Wall.renderTexture.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b4698bd0339960b47be6eeebf7d3741f -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 8400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Packages/com.ultracombos.coloring b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Packages/com.ultracombos.coloring index b774daa..62df689 160000 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Packages/com.ultracombos.coloring +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Packages/com.ultracombos.coloring @@ -1 +1 @@ -Subproject commit b774daadbbfcd9288026794929c698a4956cbcc4 +Subproject commit 62df68930575c95655f40095e768c4104823133c 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", diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Prefabs/RawImage.prefab b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Prefabs/RawImage.prefab index 0b68d93..694f9a5 100644 --- a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Prefabs/RawImage.prefab +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Prefabs/RawImage.prefab @@ -12,6 +12,8 @@ GameObject: - component: {fileID: 2142686115215515799} - component: {fileID: 2142686115215515798} - component: {fileID: 2829506254029656376} + - component: {fileID: 1996081109} + - component: {fileID: 1996081110} m_Layer: 5 m_Name: RawImage m_TagString: onFoot @@ -28,7 +30,7 @@ RectTransform: m_GameObject: {fileID: 2142686115215515793} 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: 1, y: -1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -36,7 +38,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: 300, y: 300} + m_SizeDelta: {x: 200, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2142686115215515799 CanvasRenderer: @@ -53,7 +55,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2142686115215515793} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -83,8 +85,42 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a7db5ab031d8b640914e599456b9b21, type: 3} m_Name: m_EditorClassIdentifier: - totalTime: 0.5 id: 0 - tuio_event: {fileID: 0} - fade_speed: 0.02 + fade_speed: 0.05 stat: 0 + alpha: 0 + destroy_timer: 0 + CanDsetroy: 0 +--- !u!114 &1996081109 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2142686115215515793} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03dae28dfe6734f4eb76c922ac72dd34, type: 3} + m_Name: + m_EditorClassIdentifier: + target: 0 + materials: [] + attributeName: + targetObject: {fileID: 2142686115215515793} +--- !u!114 &1996081110 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2142686115215515793} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 10f07b3f9fb96524db93eb42d89c229c, type: 3} + m_Name: + m_EditorClassIdentifier: + VideoAsset: {fileID: 11400000, guid: 232980c200b699741a54e99e165d86a2, type: 2} + LoadOnAwake: 1 + PlayOnStart: 1 + Looping: 1 + AudioVolume: 0 diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scenes/DarkSea.unity b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scenes/DarkSea.unity index fda58ba..12f523c 100644 --- a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scenes/DarkSea.unity +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scenes/DarkSea.unity @@ -202,7 +202,7 @@ Transform: m_LocalScale: {x: 2.585, y: 1, z: 1.2} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!1 &299496350 GameObject: @@ -294,153 +294,8 @@ Transform: m_LocalScale: {x: 2.585, y: 1, z: 1.2} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &490275147 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 798465533} - m_Modifications: - - target: {fileID: 2142686115215515793, guid: 8bbc036a3be21954681613cbe4f0e9a8, - type: 3} - propertyPath: m_Name - value: RawImage - objectReference: {fileID: 0} - - target: {fileID: 2142686115215515793, guid: 8bbc036a3be21954681613cbe4f0e9a8, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, - type: 3} - propertyPath: m_SizeDelta.x - value: 300 - objectReference: {fileID: 0} - - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, - type: 3} - propertyPath: m_SizeDelta.y - value: 300 - objectReference: {fileID: 0} - - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, - type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, - type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, - type: 3} - propertyPath: m_LocalScale.y - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 2829506254029656376, guid: 8bbc036a3be21954681613cbe4f0e9a8, - type: 3} - propertyPath: tuio_event - value: - objectReference: {fileID: 914806966} - - target: {fileID: 2829506254029656376, guid: 8bbc036a3be21954681613cbe4f0e9a8, - type: 3} - propertyPath: fade_speed - value: 0.05 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8bbc036a3be21954681613cbe4f0e9a8, type: 3} ---- !u!224 &490275148 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, - type: 3} - m_PrefabInstance: {fileID: 490275147} - m_PrefabAsset: {fileID: 0} --- !u!1 &503604495 GameObject: m_ObjectHideFlags: 0 @@ -471,7 +326,7 @@ RectTransform: m_LocalScale: {x: 1, y: -1, z: 1} m_Children: [] m_Father: {fileID: 798465533} - m_RootOrder: 1 + 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} @@ -604,7 +459,7 @@ PrefabInstance: - target: {fileID: 114872970294644716, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} propertyPath: customRoi.width - value: 2585 + value: 2527 objectReference: {fileID: 0} - target: {fileID: 114872970294644716, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} @@ -690,7 +545,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + 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} @@ -764,7 +619,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &797223803 GameObject: @@ -796,7 +651,7 @@ RectTransform: m_LocalScale: {x: 1, y: -1, z: 1} m_Children: [] m_Father: {fileID: 798465533} - m_RootOrder: 2 + 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} @@ -926,30 +781,17 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - - {fileID: 490275148} - {fileID: 503604496} - {fileID: 797223804} - {fileID: 1959362813} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 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 &846725642 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 114218046520840180, guid: 1f68bf7cec2600e49a46d2f0554453c8, - type: 3} - m_PrefabInstance: {fileID: 513889829} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cdf0798800151dc4e813b97f862d3d10, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &914806964 GameObject: m_ObjectHideFlags: 0 @@ -979,7 +821,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &914806966 MonoBehaviour: @@ -993,10 +835,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e7eda42473bde25468ccb55d2b565cf9, type: 3} m_Name: m_EditorClassIdentifier: - img: {fileID: 1996081105} - canvas: {fileID: 798465529} - tuio_input: {fileID: 846725642} - isLocked: 0 + img: {fileID: 2142686115215515793, guid: 8bbc036a3be21954681613cbe4f0e9a8, type: 3} + canvas: {fileID: 798465533} --- !u!1 &963194225 GameObject: m_ObjectHideFlags: 0 @@ -1078,7 +918,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &963194229 MonoBehaviour: @@ -1165,7 +1005,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + 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} @@ -1190,7 +1030,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1959362813 RectTransform: m_ObjectHideFlags: 0 @@ -1203,7 +1043,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 798465533} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1222,7 +1062,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 62f7dec0b00674947bc631624c21970a, type: 3} m_Name: m_EditorClassIdentifier: - _nameFilter: 01FrostCamera + _nameFilter: Spout DX11 Sender _targetTexture: {fileID: 8400000, guid: e567e88d5f268114c873ccbdd25b0557, type: 2} _targetRenderer: {fileID: 0} _targetMaterialProperty: _MainTex @@ -1259,124 +1099,3 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1959362812} m_CullTransparentMesh: 0 ---- !u!1 &1996081105 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2142686115215515793, guid: 8bbc036a3be21954681613cbe4f0e9a8, - type: 3} - m_PrefabInstance: {fileID: 490275147} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1996081109 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1996081105} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 03dae28dfe6734f4eb76c922ac72dd34, type: 3} - m_Name: - m_EditorClassIdentifier: - target: 0 - materials: [] - attributeName: - targetObject: {fileID: 1996081105} ---- !u!114 &1996081110 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1996081105} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 10f07b3f9fb96524db93eb42d89c229c, type: 3} - m_Name: - m_EditorClassIdentifier: - VideoAsset: {fileID: 11400000, guid: 232980c200b699741a54e99e165d86a2, type: 2} - LoadOnAwake: 1 - PlayOnStart: 1 - Looping: 1 - AudioVolume: 0 ---- !u!1 &2044104306 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2044104309} - - component: {fileID: 2044104308} - - component: {fileID: 2044104307} - m_Layer: 0 - m_Name: WallCam - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &2044104307 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2044104306} - m_Enabled: 1 ---- !u!20 &2044104308 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2044104306} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - 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: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - 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 &2044104309 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2044104306} - 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: 0} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/movieController.cs b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/movieController.cs index 6e1149c..21cbba0 100644 --- a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/movieController.cs +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/movieController.cs @@ -7,95 +7,84 @@ using UltraCombos; public class movieController : MonoBehaviour { - //[RequireComponent(typeof(DShowMoviePlayer))] DShowMoviePlayer player; public int id; - public tuio_event tuio_event; public float fade_speed = 0.02f; public int stat; - float c; - Vector2 pos, pre_pos; - bool first_time = false; + public float alpha; + public float destroy_timer; + public bool CanDsetroy; + float wait_sec = 2f; void Awake() { player = GetComponent(); + CanDsetroy = true; + stat = 1; } void Start() { //player = GetComponent(); GetComponent().color = Color.clear; - pos = Vector2.zero; } - // Update is called once per frame void Update() { - //Debug.Log(stat); - pre_pos = pos; - - if (name == "RawImage") - { - GetComponent().enabled = false; - } - else - { - GetComponent().enabled = true; + if(stat == 0){ + alpha = 0; + stat = 1; } - - bool _isLocked = tuio_event.isLocked; - if (tuio_event.tuio_input.touchCount > 0 && _isLocked == false && id != -1) + else if (stat == 1) { - - transform.gameObject.SetActive(true); - ////////////////////// - int t_c = tuio_event.tuio_input.touchCount; - if (id == t_c) - { - id -= 1; - Debug.Log("error"); - } - //Debug.Log("id = " + id + " / touch count = " + t_c); - if (stat == 1 && id >= 0 && id < t_c) + alpha += fade_speed; + if (alpha >= 1) { - pos = tuio_event.tuio_input.GetTouch(id).position; + alpha = 1; + stat = 2; } - else if (stat == 2) - pos = pre_pos; - GetComponent().position = new Vector3(pos.x, pos.y, 0); - } - if(stat == 1) - { - c += fade_speed; + } - else if (stat == 2) + else if (stat == 3) { - c -= fade_speed; - if (c < 0f) Destroy(gameObject); + float t = Time.time; + if (t - destroy_timer > wait_sec) + { + //Debug.Log("fade"); + alpha -= fade_speed; + if (alpha < 0 && CanDsetroy) + { + Destroy(this.gameObject); + } + } + } - c = Mathf.Clamp(c, 0f, 1f); - GetComponent().color = new Color(1f, 1f, 1f, c); + GetComponent().color = new Color(1f, 1f, 1f, alpha); } void OnEnable() { - Debug.Log("Hi"); - stat = 1; - //c = 0f; - if (first_time == false) - { - Vector3 rot_axis = new Vector3(0, 0, 1); - Vector3 mid_pt = new Vector3(GetComponent().position.x, GetComponent().position.y, 0); - float rand_deg = Random.Range(0, 360); - //GetComponent().Rotate(rot_axis, rand_deg); + if (name != "RawImage") { + + GetComponent().enabled = true; } - first_time = true; + //Debug.Log("Hi"); + + stat = 1; + alpha = 0f; + rotateImg(); } void OnDestroy() { - Debug.Log("Bye"); - player.Stop(); + //Debug.Log("Bye"); + } + + public void rotateImg() + { + Vector3 rot_axis = new Vector3(0, 0, 1); + Vector3 mid_pt = new Vector3(GetComponent().position.x, GetComponent().position.y, 0); + float rand_deg = Random.Range(0, 360); + GetComponent().Rotate(rot_axis, rand_deg); } } diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/tuio_event.cs b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/tuio_event.cs index 5847aa7..326208d 100644 --- a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/tuio_event.cs +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/tuio_event.cs @@ -4,80 +4,91 @@ using UnityEngine; public class tuio_event : MonoBehaviour { - // Start is called before the first frame update +#if true public GameObject img; - public GameObject canvas; - public UltraCombos.GlobalMKHookInput tuio_input; - public bool isLocked; + public Transform canvas; + //public UltraCombos.GlobalMKHookInput tuio_input; + Dictionary movies = new Dictionary(); + Dictionary pre_pos = new Dictionary(); - List cur_ids = new List(); - List pre_ids = new List(); - - int pre_count; - int cur_count; - - void Start() - { - cur_count = 0; - } - - // Update is called once per frame void Update() { - pre_count = cur_count; - pre_ids.Clear(); - cur_ids.ForEach(i => pre_ids.Add(i)); - - cur_count = tuio_input.touchCount; - cur_ids.Clear(); - - for (int i = 0; i < cur_count; i++) + var touches = TUIOManager.Instance.touches; + foreach (var id in touches.Keys) { - cur_ids.Add(tuio_input.GetTouch(i).fingerId); - } - - if (cur_count > pre_count) // Add - { - //Debug.Log("Add"); - for (int i = 0; i < cur_count; i++) + movieController movie = null; + if (movies.ContainsKey(id) == false) // Add { - int f_id = tuio_input.GetTouch(i).fingerId; - bool isOldTouch = pre_ids.Contains(f_id); - if (isOldTouch == false) + Debug.Log("Add"); + GameObject g = Instantiate(img, canvas); + g.name = id.ToString(); + movie = g.AddComponent(); + movie.id = id; + movies.Add(id, movie); + movie.transform.position = touches[id].position; + pre_pos.Add(id, touches[id].position); + } + else //update + { + if (Time.frameCount % 10 == 0) { - GameObject g = Instantiate(img, canvas.GetComponent()); - g.name = f_id.ToString(); - //g.GetComponent().id = i; + float delta_pos = Vector2.Distance(pre_pos[id], touches[id].position); + if (delta_pos > 200) + { + Debug.Log("generate new one"); + GameObject g = Instantiate(img, canvas); + int clone_id = id + Random.Range(5000, 10000); + g.name = clone_id.ToString(); + movie = g.AddComponent(); + movie.id = clone_id; + movies.Add(clone_id, movie); + movie.transform.position = pre_pos[id]; + movie.transform.localRotation = movies[id].transform.localRotation; + movie.alpha = 0.9f; + + movies[id].stat = 0; + movies[id].transform.position = touches[id].position; + movies[id].CanDsetroy = false; + movies[id].rotateImg(); + + pre_pos[id] = touches[id].position; + } + else + { + //movies[id].transform.position = touches[id].position; + } + } + else + { + movie = movies[id]; } } + //update or after adding + //Debug.Log("Update"); + //movie.transform.position = touches[id].position; } - else if (cur_count < pre_count) // Remove + var removes = new HashSet(); + foreach (var id in movies.Keys) { - isLocked = true; - //Debug.Log("Remove"); - for (int i = 0; i < pre_count; i++) - { - int _id = pre_ids[i]; - bool isExitTouch = !cur_ids.Contains(_id); - if (isExitTouch) - { - //GameObject.Find(_id.ToString()).GetComponent().stat = 2; - Destroy(GameObject.Find(_id.ToString())); - } - } + if (touches.ContainsKey(id) == false) // remove + { + //Destroy(movies[id].gameObject); + //movies.Remove(id); + removes.Add(id); + } } - reset_id(); - isLocked = false; - Debug.Log(GameObject.Find("RawImage").GetComponent().id); - } - - void reset_id() - { - GameObject[] objs = GameObject.FindGameObjectsWithTag("onFoot"); - //Debug.Log(objs.Length); - for (int i = 0; i < objs.Length; i++) + foreach (var id in removes) { - objs[i].GetComponent().id = i - 1; + if (movies[id].stat == 2 || movies[id].stat == 3) + { + movies[id].stat = 3; + movies[id].destroy_timer = Time.time; + movies[id].CanDsetroy = true; + movies.Remove(id); + Debug.Log("Remove"); + } + //movies[id].destroy_timer = Time.time; } } +#endif } diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Textures/TUIO_DebugTex.renderTexture b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Textures/TUIO_DebugTex.renderTexture index 57803f7..8e8a05b 100644 --- a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Textures/TUIO_DebugTex.renderTexture +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Textures/TUIO_DebugTex.renderTexture @@ -20,7 +20,7 @@ RenderTexture: m_MipMap: 0 m_GenerateMips: 1 m_SRGB: 0 - m_UseDynamicScale: 0 + m_UseDynamicScale: 1 m_BindMS: 0 m_TextureSettings: serializedVersion: 2 diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/New UltraCombos.DShowClip.asset b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/New UltraCombos.DShowClip.asset index 8514bad..8ac65e0 100644 --- a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/New UltraCombos.DShowClip.asset +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/New UltraCombos.DShowClip.asset @@ -13,5 +13,5 @@ MonoBehaviour: m_Name: New UltraCombos.DShowClip m_EditorClassIdentifier: m_VideoLocation: 1 - m_VideoPath: ..\..\..\..\_Deploy_PC\08_DarkSea\Material\1928-01-D.avi + m_VideoPath: ..\..\..\..\_Deploy_PC\08_DarkSea\Material\Video_buttombracket.avi animationClip: {fileID: 0} diff --git a/Unity-19050-01_ForstCoronation/Assets/Scenes/Ice.unity b/Unity-19050-01_ForstCoronation/Assets/Scenes/Ice.unity index d672d9f..ce358dd 100644 --- a/Unity-19050-01_ForstCoronation/Assets/Scenes/Ice.unity +++ b/Unity-19050-01_ForstCoronation/Assets/Scenes/Ice.unity @@ -237,7 +237,7 @@ Light: m_Type: 2 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 47.746483 - m_Range: 20.754486 + m_Range: 50 m_SpotAngle: 30 m_CookieSize: 10 m_Shadows: @@ -369,6 +369,7 @@ RectTransform: m_Children: - {fileID: 1216109996} - {fileID: 1269857429} + - {fileID: 1048552606} m_Father: {fileID: 0} m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -468,7 +469,9 @@ GameObject: - component: {fileID: 590248850} - component: {fileID: 590248851} - component: {fileID: 590248852} - m_Layer: 0 + - component: {fileID: 590248853} + - component: {fileID: 590248854} + m_Layer: 8 m_Name: 01FrostCamera m_TagString: MainCamera m_Icon: {fileID: 0} @@ -515,7 +518,7 @@ Camera: serializedVersion: 2 m_Bits: 4294967295 m_RenderingPath: -1 - m_TargetTexture: {fileID: 8400000, guid: 50e0f911f359d4746b586e8c5d6cfa82, type: 2} + m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 0 @@ -533,7 +536,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 590248846} m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: -0.21, y: 6.62, z: 0} + m_LocalPosition: {x: 0, y: 8, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -716,6 +719,83 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!114 &590248853 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 590248846} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3} + m_Name: + m_EditorClassIdentifier: + volumeTrigger: {fileID: 590248849} + volumeLayer: + serializedVersion: 2 + m_Bits: 256 + stopNaNPropagation: 1 + finalBlitToCameraTarget: 0 + antialiasingMode: 0 + temporalAntialiasing: + jitterSpread: 0.75 + sharpness: 0.25 + stationaryBlending: 0.95 + motionBlending: 0.85 + subpixelMorphologicalAntialiasing: + quality: 2 + fastApproximateAntialiasing: + fastMode: 0 + keepAlpha: 0 + fog: + enabled: 1 + excludeSkybox: 1 + debugLayer: + lightMeter: + width: 512 + height: 256 + showCurves: 1 + histogram: + width: 512 + height: 256 + channel: 3 + waveform: + exposure: 0.12 + height: 256 + vectorscope: + size: 256 + exposure: 0.12 + overlaySettings: + linearDepth: 0 + motionColorIntensity: 4 + motionGridSize: 64 + colorBlindnessType: 0 + colorBlindnessStrength: 1 + m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2} + m_ShowToolkit: 0 + m_ShowCustomSorter: 0 + breakBeforeColorGrading: 0 + m_BeforeTransparentBundles: [] + m_BeforeStackBundles: [] + m_AfterStackBundles: [] +--- !u!114 &590248854 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 590248846} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} + m_Name: + m_EditorClassIdentifier: + sharedProfile: {fileID: 11400000, guid: f1d0d84839fb1864ca2acb51ade69e2c, type: 2} + isGlobal: 1 + blendDistance: 0 + weight: 1 + priority: 0 --- !u!1 &706372899 GameObject: m_ObjectHideFlags: 0 @@ -825,7 +905,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &940676730 MonoBehaviour: m_ObjectHideFlags: 0 @@ -958,6 +1038,93 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!1 &1048552605 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1048552606} + - component: {fileID: 1048552609} + - component: {fileID: 1048552608} + - component: {fileID: 1048552607} + m_Layer: 5 + m_Name: TUIO_Debug + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1048552606 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1048552605} + 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: 396373731} + 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 &1048552607 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1048552605} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62f7dec0b00674947bc631624c21970a, type: 3} + m_Name: + m_EditorClassIdentifier: + _nameFilter: Spout DX11 Sender + _targetTexture: {fileID: 8400000, guid: d6e0d98396266c549952a8a82d7d26f0, type: 2} + _targetRenderer: {fileID: 0} + _targetMaterialProperty: +--- !u!114 &1048552608 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1048552605} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 8400000, guid: d6e0d98396266c549952a8a82d7d26f0, type: 2} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &1048552609 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1048552605} + m_CullTransparentMesh: 0 --- !u!1 &1090188925 GameObject: m_ObjectHideFlags: 0 @@ -1000,6 +1167,7 @@ VFXRenderer: - {fileID: 0} - {fileID: 0} - {fileID: 0} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1141,9 +1309,9 @@ MonoBehaviour: m_EditorClassIdentifier: m_ExecuteInEditor: 1 m_Bindings: - - {fileID: 1090188931} - - {fileID: 1090188930} - {fileID: 1090188929} + - {fileID: 1090188930} + - {fileID: 1090188931} m_VisualEffect: {fileID: 1090188927} --- !u!1 &1216109995 GameObject: @@ -1162,7 +1330,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1216109996 RectTransform: m_ObjectHideFlags: 0 @@ -1595,10 +1763,10 @@ MonoBehaviour: emitter: {fileID: 1324214445} button: {fileID: 562864505} stat: - Emitter_x: 2.5 - Target_x: -2.5 + Emitter_x: 3.5 + Target_x: -3 Common_z: 0 - growingSpeed: 0.015 + growingSpeed: 0.008 fadeSpeed: 15 smooth: 0.3 --- !u!4 &1482770261 diff --git a/Unity-19050-01_ForstCoronation/Assets/Scenes/Ice_Profiles/PostProcessing Profile.asset b/Unity-19050-01_ForstCoronation/Assets/Scenes/Ice_Profiles/PostProcessing Profile.asset index 9494702..50b23ef 100644 --- a/Unity-19050-01_ForstCoronation/Assets/Scenes/Ice_Profiles/PostProcessing Profile.asset +++ b/Unity-19050-01_ForstCoronation/Assets/Scenes/Ice_Profiles/PostProcessing Profile.asset @@ -16,6 +16,7 @@ MonoBehaviour: - {fileID: 114769904971952996} - {fileID: 114277786280399880} - {fileID: 114759790931544378} + - {fileID: 114436081672504764} --- !u!114 &114277786280399880 MonoBehaviour: m_ObjectHideFlags: 3 @@ -40,8 +41,8 @@ MonoBehaviour: value: {fileID: 0} defaultState: 1 tonemapper: - overrideState: 0 - value: 0 + overrideState: 1 + value: 2 toneCurveToeStrength: overrideState: 0 value: 0 @@ -80,17 +81,17 @@ MonoBehaviour: overrideState: 0 value: 0 saturation: - overrideState: 0 - value: 0 + overrideState: 1 + value: -19.7 brightness: overrideState: 0 value: 0 postExposure: - overrideState: 0 - value: 0 + overrideState: 1 + value: -0.6 contrast: - overrideState: 0 - value: 0 + overrideState: 1 + value: 100 mixerRedOutRedIn: overrideState: 0 value: 100 @@ -1327,6 +1328,28 @@ MonoBehaviour: - 0.5 - 0.5 - 0.5 +--- !u!114 &114436081672504764 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b94fcd11afffcb142908bfcb1e261fba, type: 3} + m_Name: MotionBlur + m_EditorClassIdentifier: + active: 1 + enabled: + overrideState: 1 + value: 1 + shutterAngle: + overrideState: 0 + value: 270 + sampleCount: + overrideState: 1 + value: 4 --- !u!114 &114759790931544378 MonoBehaviour: m_ObjectHideFlags: 3 @@ -1353,8 +1376,8 @@ MonoBehaviour: overrideState: 0 value: {x: 0.5, y: 0.5} intensity: - overrideState: 0 - value: 0 + overrideState: 1 + value: 0.802 smoothness: overrideState: 0 value: 0.2 @@ -1388,11 +1411,11 @@ MonoBehaviour: overrideState: 1 value: 1 intensity: - overrideState: 0 - value: 0 - threshold: - overrideState: 0 + overrideState: 1 value: 1 + threshold: + overrideState: 1 + value: 0.57 softKnee: overrideState: 0 value: 0.5 diff --git a/Unity-19050-01_ForstCoronation/Assets/Scripts/DebugUI.cs b/Unity-19050-01_ForstCoronation/Assets/Scripts/DebugUI.cs index 431e568..78bf38b 100644 --- a/Unity-19050-01_ForstCoronation/Assets/Scripts/DebugUI.cs +++ b/Unity-19050-01_ForstCoronation/Assets/Scripts/DebugUI.cs @@ -61,13 +61,17 @@ public class DebugUI : MonoBehaviour { cur_blob_count = TUIOManager.Instance.touches.Count; - if(cur_blob_count == 3 && stat == "completed") + if (button.GetComponentInParent