From 6b953adf32faed681614e5c77b9e9d7ac57fc36a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B0=B4=E8=B0=B7=E5=9C=AD=E5=90=BE?= Date: Thu, 2 Dec 2021 17:57:24 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=A2=E3=81=A8=E6=AD=A9=E8=A1=8C?= =?UTF-8?q?=E8=80=85=E3=81=AE=E3=83=90=E3=83=A9=E3=83=B3=E3=82=B9=E8=AA=BF?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/MyGame/Resources/DontDestroyObject.prefab | 8 ++++---- .../MyGame/Scenes/marketing/Scripts/CustomerSetting.cs | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/popcorn/Assets/MyGame/Resources/DontDestroyObject.prefab b/popcorn/Assets/MyGame/Resources/DontDestroyObject.prefab index 39f06e78..608b8362 100644 --- a/popcorn/Assets/MyGame/Resources/DontDestroyObject.prefab +++ b/popcorn/Assets/MyGame/Resources/DontDestroyObject.prefab @@ -278,9 +278,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 772e0346311a433fb714573f207813d2, type: 3} m_Name: m_EditorClassIdentifier: - walkerInterval: 10 + walkerInterval: 12 adWalkerDuration: 60 - adWalkerCount: 20 + adWalkerCount: 14 tastingCustomerInterval: 5 --- !u!114 &7815373139353427344 MonoBehaviour: @@ -295,8 +295,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: specialOrderCount: 5 - walkerSpecialRate: 0.01 - customerSpecialRate: 0.01 + walkerSpecialRate: 0.009 + customerSpecialRate: 0.003 --- !u!114 &6660189001731691529 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/CustomerSetting.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/CustomerSetting.cs index c7d0495c..6e1df3e6 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/CustomerSetting.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/CustomerSetting.cs @@ -10,11 +10,11 @@ namespace MyGame.Scenes.marketing.Scripts [SerializeField] private float customerSpecialRate = .01f; private static readonly (int want, float weight)[] CustomerWeightTable = { - (1, 75f), - (2, 15f), - (3, 3.5f), - (4, 1.25f), - (5, .25f), + (1, 81f), + (2, 10f), + (3, 3f), + (4, 0.9f), + (5, 0.1f), (0, 5f), }; From a917e98beb0d4347a2f2ea44fa175f8e5086264c Mon Sep 17 00:00:00 2001 From: hirokei Date: Thu, 2 Dec 2021 18:33:01 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Footer=E3=83=9D=E3=82=B8=E3=82=B7=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E3=81=AE=E3=83=97=E3=83=AC=E3=83=8F=E3=83=96=E7=B5=B1?= =?UTF-8?q?=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/CornField/CornField.unity | 10 -------- popcorn/Assets/MyGame/Scenes/Main/Main.unity | 10 -------- .../MyGame/Scenes/Main/Prefabs/Canvas.prefab | 24 +++++++++---------- .../MyGame/Scenes/marketing/marketing.unity | 10 -------- .../MyGame/Scenes/shopping/shopping.unity | 14 ++--------- 5 files changed, 14 insertions(+), 54 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity index 501dda9b..26262afd 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity @@ -1380,11 +1380,6 @@ PrefabInstance: propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3664916833637780612, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -375 - objectReference: {fileID: 0} - target: {fileID: 3664916833752817997, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_SizeDelta.y @@ -1415,11 +1410,6 @@ PrefabInstance: propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3664916834267713207, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -575 - objectReference: {fileID: 0} - target: {fileID: 4348639590627783772, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_IsActive diff --git a/popcorn/Assets/MyGame/Scenes/Main/Main.unity b/popcorn/Assets/MyGame/Scenes/Main/Main.unity index d3ad7b78..d0dc909b 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity @@ -5703,11 +5703,6 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3664916833637780612, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -375 - objectReference: {fileID: 0} - target: {fileID: 3664916833780733955, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_Name @@ -5773,11 +5768,6 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3664916834267713207, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -575 - objectReference: {fileID: 0} - target: {fileID: 3672624745086876516, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchoredPosition.y diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab index d870be84..95538745 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab @@ -2699,13 +2699,13 @@ PrefabInstance: m_Modifications: - target: {fileID: 3310671341034218321, guid: 42b6e2c5e0aa46a4e973df1237dc5691, type: 3} - propertyPath: m_AnchoredPosition.x - value: -535.10156 + propertyPath: m_LocalPosition.x + value: 0 objectReference: {fileID: 0} - target: {fileID: 3310671341034218321, guid: 42b6e2c5e0aa46a4e973df1237dc5691, type: 3} - propertyPath: m_AnchoredPosition.y - value: 260.70312 + propertyPath: m_LocalPosition.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 3310671341536731056, guid: 42b6e2c5e0aa46a4e973df1237dc5691, type: 3} @@ -2829,23 +2829,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3310671341662576994, guid: 42b6e2c5e0aa46a4e973df1237dc5691, type: 3} - propertyPath: m_AnchoredPosition.x - value: -355.19922 + propertyPath: m_LocalPosition.x + value: 0 objectReference: {fileID: 0} - target: {fileID: 3310671341662576994, guid: 42b6e2c5e0aa46a4e973df1237dc5691, type: 3} - propertyPath: m_AnchoredPosition.y - value: 260.70312 + propertyPath: m_LocalPosition.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 3310671341763054132, guid: 42b6e2c5e0aa46a4e973df1237dc5691, type: 3} - propertyPath: m_AnchoredPosition.y - value: 260.70312 + propertyPath: m_LocalPosition.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 9193060593438266932, guid: 42b6e2c5e0aa46a4e973df1237dc5691, type: 3} - propertyPath: m_AnchoredPosition.y - value: 260.70312 + propertyPath: m_LocalPosition.y + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 42b6e2c5e0aa46a4e973df1237dc5691, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity index f8fbd3b2..1f40d24d 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity @@ -3869,21 +3869,11 @@ PrefabInstance: propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3664916833637780612, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -375 - objectReference: {fileID: 0} - target: {fileID: 3664916834267713207, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3664916834267713207, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -575 - objectReference: {fileID: 0} - target: {fileID: 3906989310087811327, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder diff --git a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity index 7765206f..c8572d8e 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity @@ -626,16 +626,6 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3664916833637780612, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -375 - objectReference: {fileID: 0} - - target: {fileID: 3664916834267713207, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -575 - objectReference: {fileID: 0} - target: {fileID: 4348639590627783772, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_IsActive @@ -653,8 +643,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6969874152703327186, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_AnchoredPosition.y - value: 260.69922 + propertyPath: m_LocalPosition.y + value: -829.99927 objectReference: {fileID: 0} - target: {fileID: 8103176713869808018, guid: caaa748dbeed576499e8cae74d33f689, type: 3}