Merge branch 'develop' of bitbucket.org:usaya/popcorn into develop

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
+  walkerSpecialRate: 0.009
-  customerSpecialRate: 0.01
+  customerSpecialRate: 0.003
 --- !u!114 &6660189001731691529
 MonoBehaviour:
   m_ObjectHideFlags: 0

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

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

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
+      propertyPath: m_LocalPosition.x
-      value: -535.10156
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3310671341034218321, guid: 42b6e2c5e0aa46a4e973df1237dc5691,
         type: 3}
-      propertyPath: m_AnchoredPosition.y
+      propertyPath: m_LocalPosition.y
-      value: 260.70312
+      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
+      propertyPath: m_LocalPosition.x
-      value: -355.19922
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3310671341662576994, guid: 42b6e2c5e0aa46a4e973df1237dc5691,
         type: 3}
-      propertyPath: m_AnchoredPosition.y
+      propertyPath: m_LocalPosition.y
-      value: 260.70312
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3310671341763054132, guid: 42b6e2c5e0aa46a4e973df1237dc5691,
         type: 3}
-      propertyPath: m_AnchoredPosition.y
+      propertyPath: m_LocalPosition.y
-      value: 260.70312
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 9193060593438266932, guid: 42b6e2c5e0aa46a4e973df1237dc5691,
         type: 3}
-      propertyPath: m_AnchoredPosition.y
+      propertyPath: m_LocalPosition.y
-      value: 260.70312
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 42b6e2c5e0aa46a4e973df1237dc5691, type: 3}

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),
+            (1, 81f),
-            (2, 15f),
+            (2, 10f),
-            (3, 3.5f),
+            (3, 3f),
-            (4, 1.25f),
+            (4, 0.9f),
-            (5, .25f),
+            (5, 0.1f),
             (0, 5f),
         };
         

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

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
+      propertyPath: m_LocalPosition.y
-      value: 260.69922
+      value: -829.99927
       objectReference: {fileID: 0}
     - target: {fileID: 8103176713869808018, guid: caaa748dbeed576499e8cae74d33f689,
         type: 3}