From 4a3b6e51f0d42b0127936c6a58a534dd9c09c3ea Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 24 Nov 2021 18:02:37 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E5=95=86=E5=93=81=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=81=E3=82=BF=E3=83=B3=E3=82=AF=E8=A9=B3=E7=B4=B0=E3=83=AC?= =?UTF-8?q?=E3=82=A2=E8=A1=A8=E7=A4=BA=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/marketing/Prefabs/Description.prefab | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab index 30896d70..1751b3ed 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab @@ -2500,6 +2500,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 7347831002230456565, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + propertyPath: rarity + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} --- !u!224 &3084478268397759140 stripped @@ -3397,6 +3402,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} +--- !u!224 &3613327422686341716 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + m_PrefabInstance: {fileID: 3856012876160759828} + m_PrefabAsset: {fileID: 0} --- !u!114 &5799495140018518241 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7347831002230456565, guid: 769012ad2d933ed439e798970ef29fdd, @@ -3409,9 +3420,3 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b0dc9cb18f7548c6a51cf39c843c54ef, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &3613327422686341716 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, - type: 3} - m_PrefabInstance: {fileID: 3856012876160759828} - m_PrefabAsset: {fileID: 0} From 216b5ac0122023a36de2ba36187822f3438d45e0 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Wed, 24 Nov 2021 18:56:22 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E3=83=9D=E3=83=83=E3=83=97=E3=81=AE?= =?UTF-8?q?=E3=83=9C=E3=82=BF=E3=83=B3=E3=80=81=E3=81=8A=E9=87=91=E3=81=AE?= =?UTF-8?q?=E6=96=87=E5=AD=97=E3=82=B5=E3=82=A4=E3=82=BA=E7=AD=89=E8=AA=BF?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/Mission/AchievementCanvas.prefab | 26 +++++++++---------- .../Scenes/Main/WatchMovieCoinGet.unity | 21 +++++++-------- .../Scenes/Main/WatchMovieFailure.unity | 8 +++--- .../Assets/MyGame/Scenes/Main/update.unity | 6 ++--- 4 files changed, 30 insertions(+), 31 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab index 9eb59f4d..21b85a37 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab @@ -137,8 +137,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: -226.89996} - m_SizeDelta: {x: 196, y: 98} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 210, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7864277046190771846 CanvasRenderer: @@ -272,7 +272,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: 129, y: -0.39998853} + m_AnchoredPosition: {x: 129, y: 2} m_SizeDelta: {x: 300, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7864277046289359757 @@ -413,14 +413,14 @@ RectTransform: m_GameObject: {fileID: 7864277046498279117} 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_LocalScale: {x: 1.3, y: 1.3, z: 1.3} m_Children: [] m_Father: {fileID: 7864277046289359759} 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: 35.6, y: -37.5} + m_AnchoredPosition: {x: 38.699997, y: -37.1} m_SizeDelta: {x: 44, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7864277046498279120 @@ -787,7 +787,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 339} + m_AnchoredPosition: {x: 0, y: 114} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7864277047165460481 @@ -817,7 +817,7 @@ RectTransform: m_GameObject: {fileID: 7864277047165460481} 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.1, y: 1.1, z: 1.1} m_Children: [] m_Father: {fileID: 7864277048159705408} m_RootOrder: 0 @@ -953,7 +953,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: 173, y: -38.5} + m_AnchoredPosition: {x: 182, y: -38.9} m_SizeDelta: {x: 180, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7864277047470455967 @@ -985,11 +985,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 30 - m_MaxSize: 35 + m_MinSize: 35 + m_MaxSize: 40 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 @@ -1032,7 +1032,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 4} - m_SizeDelta: {x: 46, y: 32} + m_SizeDelta: {x: 64, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7864277048100900071 CanvasRenderer: @@ -1061,7 +1061,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 47b10191009972140a30c32a0e7fd9a1, type: 3} + m_Sprite: {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity index b9ea1a79..f596037a 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity @@ -444,7 +444,7 @@ RectTransform: m_GameObject: {fileID: 558600089} 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.2, y: 1.2, z: 1.2} m_Children: [] m_Father: {fileID: 2088564206} m_RootOrder: 0 @@ -473,7 +473,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f3a0ccdabb17f2244abcb3798b5b589e, type: 3} + m_Sprite: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -619,7 +619,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: 139.3, y: -38.5} + m_AnchoredPosition: {x: 139.3, y: -39.8} m_SizeDelta: {x: 180, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &726079106 @@ -643,11 +643,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 30 - m_MaxSize: 35 + m_MinSize: 35 + m_MaxSize: 40 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 @@ -1150,14 +1150,14 @@ RectTransform: m_GameObject: {fileID: 1737540868} 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_LocalScale: {x: 1.25, y: 1.25, z: 1.25} m_Children: [] m_Father: {fileID: 432520475} 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: 35.6, y: -37.5} + m_AnchoredPosition: {x: 37.6, y: -37.5} m_SizeDelta: {x: 44, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1737540870 @@ -1414,8 +1414,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: 60} - m_SizeDelta: {x: 196, y: 98} + m_AnchoredPosition: {x: 0, y: 63} + m_SizeDelta: {x: 210, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2088564207 MonoBehaviour: @@ -1639,7 +1639,6 @@ MonoBehaviour: m_EditorClassIdentifier: backgroundAnimator: {fileID: 660781990} closeButton: {fileID: 2088564207} - okButton: {fileID: 0} messageText: {fileID: 726079106} --- !u!1001 &8412240709702713318 PrefabInstance: diff --git a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieFailure.unity b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieFailure.unity index 34b83481..27f032ee 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieFailure.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieFailure.unity @@ -586,7 +586,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 4} - m_SizeDelta: {x: 46, y: 32} + m_SizeDelta: {x: 64, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1211618566 MonoBehaviour: @@ -607,7 +607,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 47b10191009972140a30c32a0e7fd9a1, type: 3} + m_Sprite: {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -756,8 +756,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: 60} - m_SizeDelta: {x: 196, y: 98} + m_AnchoredPosition: {x: 0, y: 61} + m_SizeDelta: {x: 210, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1544360571 MonoBehaviour: diff --git a/popcorn/Assets/MyGame/Scenes/Main/update.unity b/popcorn/Assets/MyGame/Scenes/Main/update.unity index 5bab4bb4..45a6b160 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/update.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/update.unity @@ -425,7 +425,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: 71} - m_SizeDelta: {x: 196, y: 98} + m_SizeDelta: {x: 210, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &393391860 MonoBehaviour: @@ -793,7 +793,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 4} - m_SizeDelta: {x: 46, y: 32} + m_SizeDelta: {x: 64, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &764676372 MonoBehaviour: @@ -814,7 +814,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 47b10191009972140a30c32a0e7fd9a1, type: 3} + m_Sprite: {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1