From 71da6ede4a17ca6552f9a36842ed18c8fdc99587 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Fri, 8 Jul 2022 11:25:36 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88=E3=81=AF?= =?UTF-8?q?=E3=81=BF=E3=81=A0=E3=81=97=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui_Main_BulkOrder_NameFrame.png.meta | 16 ++- .../Scenes/Main/BulkOrderTelephone.unity | 7 +- .../Main/BulkOrderTelephoneSettings.lighting | 64 ++++++++++ .../BulkOrderTelephoneSettings.lighting.meta | 8 ++ .../Prefabs/BulkOrder/CanvasTelePhone.prefab | 113 ++++++++++++++---- .../Scenes/Main/Prefabs/BulkOrder/Orde.prefab | 34 ++++-- 6 files changed, 201 insertions(+), 41 deletions(-) create mode 100644 popcorn/Assets/MyGame/Scenes/Main/BulkOrderTelephoneSettings.lighting create mode 100644 popcorn/Assets/MyGame/Scenes/Main/BulkOrderTelephoneSettings.lighting.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_NameFrame.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_NameFrame.png.meta index f7afeeeb..dc1253d0 100644 --- a/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_NameFrame.png.meta +++ b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_NameFrame.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,9 +33,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -46,7 +48,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 330, y: 0, z: 2, w: 0} + spriteBorder: {x: 342, y: 0, z: 2, w: 54} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -54,9 +56,12 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -78,12 +83,13 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/BulkOrderTelephone.unity b/popcorn/Assets/MyGame/Scenes/Main/BulkOrderTelephone.unity index 23108ef2..c9091f34 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/BulkOrderTelephone.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/BulkOrderTelephone.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: c2d912a947fc0c44fbdb6ee9a5a4a20e, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Scenes/Main/BulkOrderTelephoneSettings.lighting b/popcorn/Assets/MyGame/Scenes/Main/BulkOrderTelephoneSettings.lighting new file mode 100644 index 00000000..35240f6e --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Main/BulkOrderTelephoneSettings.lighting @@ -0,0 +1,64 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BulkOrderTelephoneSettings + serializedVersion: 4 + m_GIWorkflowMode: 1 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 1 + m_BakeBackend: 1 + m_LightmapMaxSize: 1024 + m_BakeResolution: 40 + m_Padding: 2 + m_LightmapCompression: 3 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 2 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 2 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 256 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentMIS: 1 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/BulkOrderTelephoneSettings.lighting.meta b/popcorn/Assets/MyGame/Scenes/Main/BulkOrderTelephoneSettings.lighting.meta new file mode 100644 index 00000000..7cab0624 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Main/BulkOrderTelephoneSettings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c2d912a947fc0c44fbdb6ee9a5a4a20e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab index 69b1e3d9..bb8e62ac 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab @@ -27,6 +27,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4315754688123097769} - {fileID: 4315754687139857770} @@ -81,6 +82,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4315754687733902321} m_RootOrder: 2 @@ -113,11 +115,12 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4011d10062c94334d84399c8519e3ed1, type: 3} + m_Sprite: {fileID: 21300000, guid: 9ec1fd1b10d054845bc283dc1597bc56, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -195,6 +198,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4315754687482315021} m_RootOrder: 1 @@ -227,6 +231,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.43137255, g: 0.29803923, b: 0.19215687, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -274,13 +279,14 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.2, y: 1.2, z: 1.2} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4315754687736309292} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 107, y: -76} + m_AnchoredPosition: {x: 120, y: -76} m_SizeDelta: {x: 130, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754686625492746 @@ -306,11 +312,12 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e0e63c471a2a05a4f8a3b9e5de25db4f, type: 3} + m_Sprite: {fileID: 21300000, guid: bd3845c3836664a4a9adaac6d554621c, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -388,6 +395,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.2, y: 1.2, z: 1.2} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4315754687482315021} m_RootOrder: 0 @@ -420,6 +428,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -461,6 +470,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4315754687931289281} - {fileID: 4315754687733902321} @@ -523,6 +533,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.1, y: 1.1, z: 1.1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4315754688526726639} - {fileID: 3058138224988021536} @@ -533,7 +544,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 117} - m_SizeDelta: {x: 600, y: 0} + m_SizeDelta: {x: 650, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4315754687099534941 MonoBehaviour: @@ -560,6 +571,7 @@ MonoBehaviour: m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!114 &4315754687099534940 MonoBehaviour: m_ObjectHideFlags: 0 @@ -600,6 +612,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4315754687626831869} m_Father: {fileID: 4315754686536851282} @@ -638,6 +651,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4315754686905675770} - {fileID: 4315754686580462763} @@ -646,7 +660,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: -31, y: 2.000026} + m_AnchoredPosition: {x: -27, y: 2.000026} m_SizeDelta: {x: 220, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754687482315027 @@ -672,6 +686,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -714,6 +729,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4315754688138076307} m_RootOrder: 0 @@ -746,6 +762,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -789,6 +806,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4315754687733902321} m_RootOrder: 1 @@ -821,6 +839,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.43137255, g: 0.29803923, b: 0.19215687, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -907,6 +926,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 4315754688243439425} - {fileID: 4315754686943043844} @@ -962,6 +982,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!114 &4315754687615340677 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1009,6 +1030,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4315754688581755602} m_Father: {fileID: 4315754687139857770} @@ -1042,6 +1064,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1070,6 +1093,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -1143,6 +1167,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4315754688350645387} - {fileID: 4315754687599301552} @@ -1178,6 +1203,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1220,6 +1246,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4315754686625492740} - {fileID: 4315754688138076307} @@ -1230,7 +1257,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -154} - m_SizeDelta: {x: 710, y: 156} + m_SizeDelta: {x: 770, y: 156} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754687736309298 CanvasRenderer: @@ -1255,6 +1282,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1297,6 +1325,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4315754686943043844} m_RootOrder: 0 @@ -1304,7 +1333,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: 760, y: 820} + m_SizeDelta: {x: 820, y: 820} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754687931289287 CanvasRenderer: @@ -1329,6 +1358,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1371,6 +1401,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4315754688138076307} m_RootOrder: 1 @@ -1403,6 +1434,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.43137255, g: 0.29803923, b: 0.19215687, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1450,6 +1482,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.2, y: 1.2, z: 1.2} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4315754686536851282} m_RootOrder: 0 @@ -1482,11 +1515,12 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a5e177dea40081446b2dc78070034c04, type: 3} + m_Sprite: {fileID: 21300000, guid: 48243d820b7c5bd43ba50a88f69a8c05, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1564,6 +1598,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4315754687558309306} - {fileID: 4315754688005591446} @@ -1572,7 +1607,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: 210, y: 2.000026} + m_AnchoredPosition: {x: 233, y: 2.000026} m_SizeDelta: {x: 220, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754688138076305 @@ -1598,6 +1633,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1641,6 +1677,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4315754687615340680} m_RootOrder: 0 @@ -1673,6 +1710,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 0.9372549, a: 0.19607843} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1689,7 +1727,7 @@ MonoBehaviour: m_PixelsPerUnitMultiplier: 1 --- !u!95 &4315754688243439430 Animator: - serializedVersion: 3 + serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1702,6 +1740,7 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -1734,6 +1773,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: 0.09801341, w: 0.99518514} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.9, y: 0.9, z: 0.9} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4315754687733902321} m_RootOrder: 0 @@ -1766,6 +1806,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1809,6 +1850,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4315754687626831869} m_RootOrder: 0 @@ -1841,11 +1883,12 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f292524fd33ea9248859b3b1ef5e1c46, type: 3} + m_Sprite: {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2043,7 +2086,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 3039f511366494148bc836ca960a11e7, + objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, type: 3} - target: {fileID: 1266659963694843888, guid: 7c3046c0280714d4bb45d41bcbb71ce1, type: 3} @@ -2161,14 +2204,18 @@ PrefabInstance: value: objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + - target: {fileID: 3678773672029473446, guid: 7c3046c0280714d4bb45d41bcbb71ce1, + type: 3} + propertyPath: mLocalizeTarget + value: + objectReference: {fileID: 0} + - target: {fileID: 7918152304108384414, guid: 7c3046c0280714d4bb45d41bcbb71ce1, + type: 3} + propertyPath: mLocalizeTarget + value: + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7c3046c0280714d4bb45d41bcbb71ce1, type: 3} ---- !u!224 &4315754688526726639 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1266659963694843888, guid: 7c3046c0280714d4bb45d41bcbb71ce1, - type: 3} - m_PrefabInstance: {fileID: 3058138225154535967} - m_PrefabAsset: {fileID: 0} --- !u!114 &706922748529613437 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2576005101485369442, guid: 7c3046c0280714d4bb45d41bcbb71ce1, @@ -2181,6 +2228,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6f14cd02713649c5b189cbc9fb0b5bfd, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &4315754688526726639 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1266659963694843888, guid: 7c3046c0280714d4bb45d41bcbb71ce1, + type: 3} + m_PrefabInstance: {fileID: 3058138225154535967} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4315754688263163599 PrefabInstance: m_ObjectHideFlags: 0 @@ -2339,7 +2392,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 3039f511366494148bc836ca960a11e7, + objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, type: 3} - target: {fileID: 1266659963694843888, guid: 7c3046c0280714d4bb45d41bcbb71ce1, type: 3} @@ -2457,14 +2510,18 @@ PrefabInstance: value: objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + - target: {fileID: 3678773672029473446, guid: 7c3046c0280714d4bb45d41bcbb71ce1, + type: 3} + propertyPath: mLocalizeTarget + value: + objectReference: {fileID: 0} + - target: {fileID: 7918152304108384414, guid: 7c3046c0280714d4bb45d41bcbb71ce1, + type: 3} + propertyPath: mLocalizeTarget + value: + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7c3046c0280714d4bb45d41bcbb71ce1, type: 3} ---- !u!224 &3058138224988021536 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1266659963694843888, guid: 7c3046c0280714d4bb45d41bcbb71ce1, - type: 3} - m_PrefabInstance: {fileID: 4315754688290612432} - m_PrefabAsset: {fileID: 0} --- !u!114 &1755114094130154674 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2576005101485369442, guid: 7c3046c0280714d4bb45d41bcbb71ce1, @@ -2477,3 +2534,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6f14cd02713649c5b189cbc9fb0b5bfd, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &3058138224988021536 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1266659963694843888, guid: 7c3046c0280714d4bb45d41bcbb71ce1, + type: 3} + m_PrefabInstance: {fileID: 4315754688290612432} + m_PrefabAsset: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Orde.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Orde.prefab index ca704d6b..fedcb381 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Orde.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Orde.prefab @@ -27,6 +27,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 9017528630810034763} - {fileID: 6959843177441059793} @@ -84,14 +85,15 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9017528630810034763} 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: -13, y: 0} - m_SizeDelta: {x: 370, y: 60} + m_AnchoredPosition: {x: 17, y: 0} + m_SizeDelta: {x: 454, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1266659963782799781 CanvasRenderer: @@ -116,6 +118,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 0.99607843, b: 0.81960785, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -201,6 +204,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4067663658127716431} m_RootOrder: 0 @@ -233,6 +237,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -273,6 +278,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1805757311142186072} - {fileID: 4067663658127716431} @@ -283,7 +289,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: -12, y: 0} + m_AnchoredPosition: {x: -23, y: 0} m_SizeDelta: {x: 550, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6078742360956254766 @@ -314,13 +320,14 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1266659963694843888} 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: -12, y: 0} + m_AnchoredPosition: {x: 32, y: 0} m_SizeDelta: {x: 524, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6134255696156549157 @@ -346,6 +353,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -386,6 +394,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7119651629168984665} m_Father: {fileID: 9017528630810034763} @@ -393,7 +402,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: 241, y: -10} + m_AnchoredPosition: {x: 316, y: -10} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7526028034810490598 @@ -425,6 +434,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6510542176296546763} m_Father: {fileID: 8467582708424851607} @@ -458,6 +468,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -540,6 +551,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7119651629168984665} m_RootOrder: 0 @@ -572,6 +584,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.43137255, g: 0.29803923, b: 0.19215687, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -616,6 +629,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0.11129463, w: 0.9937875} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.6000001, y: 0.6000001, z: 0.5999999} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1266659964433289953} m_Father: {fileID: 9017528630810034763} @@ -623,7 +637,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: -12.780001} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -242, y: 0} + m_AnchoredPosition: {x: -248, y: 0} m_SizeDelta: {x: 92, y: 136} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8690967114179661769 @@ -654,14 +668,15 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9017528630810034763} 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: -50, y: 0} - m_SizeDelta: {x: 470, y: 82} + m_AnchoredPosition: {x: -16, y: 0} + m_SizeDelta: {x: 540, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1519306445017384389 CanvasRenderer: @@ -686,12 +701,13 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: c72dbf4b9348e5946b6fe688d40603c2, type: 3} - m_Type: 0 + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4