From 64c674a09d6d0313d1354ff086ec6f944ccb21f6 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Thu, 2 Sep 2021 17:00:56 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=AD=E3=83=A9=E3=82=AD=E3=83=A9=E3=82=A2?= =?UTF-8?q?=E3=83=8B=E3=83=A1=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E5=86=8D?= =?UTF-8?q?=E5=BA=A6=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/marketing/PopcornDescription.unity | 96 ++++++++++++++++++- .../marketing/Prefabs/RareDetails.prefab | 22 ++--- .../Scenes/marketing/ProductManagement.unity | 10 ++ 3 files changed, 113 insertions(+), 15 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/marketing/PopcornDescription.unity b/popcorn/Assets/MyGame/Scenes/marketing/PopcornDescription.unity index 0e03df48..5f7128ef 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/PopcornDescription.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/PopcornDescription.unity @@ -1137,9 +1137,9 @@ Canvas: m_GameObject: {fileID: 658380321} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 + m_RenderMode: 1 + m_Camera: {fileID: 853973360} + m_PlaneDistance: 0 m_PixelPerfect: 0 m_ReceivesEvents: 1 m_OverrideSorting: 0 @@ -1391,6 +1391,89 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 840384780} m_CullTransparentMesh: 0 +--- !u!1 &853973358 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 853973361} + - component: {fileID: 853973360} + - component: {fileID: 853973359} + m_Layer: 5 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &853973359 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 853973358} + m_Enabled: 1 +--- !u!20 &853973360 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 853973358} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 4 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: -10 + far clip plane: 10 + field of view: 26.991467 + orthographic: 1 + orthographic size: 11.04 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 32 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 0 + m_AllowMSAA: 0 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &853973361 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 853973358} + 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: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &872681617 GameObject: m_ObjectHideFlags: 0 @@ -1574,7 +1657,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 26.1, y: -24.5} + m_AnchoredPosition: {x: 26.099998, y: -24.5} m_SizeDelta: {x: 86, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1092092109 @@ -2906,6 +2989,11 @@ PrefabInstance: propertyPath: m_Layer value: 5 objectReference: {fileID: 0} + - target: {fileID: 6575807548503812178, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7802156769292725947, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_Layer diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/RareDetails.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/RareDetails.prefab index f5d822c6..89951f93 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/RareDetails.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/RareDetails.prefab @@ -632,7 +632,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6575807548503812178} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.000027153228, y: 0.000055101184, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6312542440500240187} @@ -646,7 +646,7 @@ ParticleSystem: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6575807548503812178} serializedVersion: 6 - lengthInSec: 0.1 + lengthInSec: 1 simulationSpeed: 1 stopAction: 0 cullingMode: 0 @@ -721,8 +721,8 @@ ParticleSystem: startLifetime: serializedVersion: 2 minMaxState: 3 - scalar: 0.6 - minScalar: 0.4 + scalar: 1.5 + minScalar: 1 maxCurve: serializedVersion: 2 m_Curve: @@ -890,8 +890,8 @@ ParticleSystem: startSize: serializedVersion: 2 minMaxState: 3 - scalar: 12 - minScalar: 8 + scalar: 0.2 + minScalar: 0.15 maxCurve: serializedVersion: 2 m_Curve: @@ -1270,7 +1270,7 @@ ParticleSystem: length: 5 boxThickness: {x: 0, y: 0, z: 0} radiusThickness: 1 - donutRadius: 3.92 + donutRadius: 0.03 m_Position: {x: 0, y: 0, z: 0} m_Rotation: {x: 0, y: 0, z: 0} m_Scale: {x: 1, y: 1, z: 1} @@ -1352,7 +1352,7 @@ ParticleSystem: sphericalDirectionAmount: 0 randomPositionAmount: 0 radius: - value: 19.55 + value: 0.16 mode: 0 spread: 0 speed: @@ -1606,7 +1606,7 @@ ParticleSystem: outWeight: 0.33333334 - serializedVersion: 3 time: 0.49920267 - value: 0.29821777 + value: 0.02129364 inSlope: -0.12325374 outSlope: -0.12325374 tangentMode: 0 @@ -1614,8 +1614,8 @@ ParticleSystem: inWeight: 0.33333334 outWeight: 0.66889787 - serializedVersion: 3 - time: 0.75749594 - value: 0.7076924 + time: 0.7659466 + value: 0.6153847 inSlope: -0.083498724 outSlope: -0.083498724 tangentMode: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity index 3443b3bb..200aebd2 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity @@ -1130,6 +1130,11 @@ PrefabInstance: propertyPath: m_Name value: Canvas objectReference: {fileID: 0} + - target: {fileID: 3664916832564167473, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3664916832564167476, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_Camera @@ -2262,6 +2267,11 @@ PrefabInstance: propertyPath: m_Name value: UICamera objectReference: {fileID: 0} + - target: {fileID: 9117079084301130547, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 021717b65b165374faa3fcffaafedfc2, type: 3} --- !u!20 &533409546 stripped