From 86f23c9dc0926335f8884d589a4561584ab242c9 Mon Sep 17 00:00:00 2001
From: "xiaohui.wang" <xiaohui.wang@joypac.cn>
Date: Fri, 15 Apr 2022 11:17:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=83=E9=94=80=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 iOS.meta                                      |   8 ----
 .../MyGame/Resource/UI/ui_frame_coin.png      | Bin 4837 -> 1874 bytes
 .../MyGame/Resource/UI/ui_frame_coinget.png   | Bin 1874 -> 4837 bytes
 .../Resource/UI/ui_frame_coinget.png.meta     |   2 +-
 .../Scenes/Main/Prefabs/UI/Header.prefab      |   4 +-
 .../Scenes/Main/WatchMovieCoinGet.unity       |   2 +-
 .../shopping/Scripts/ShopHeaderTabView.cs     |   2 +-
 .../Scenes/shopping/Scripts/ShopItemView.cs   |  39 ++++++++++++++++--
 8 files changed, 40 insertions(+), 17 deletions(-)
 delete mode 100644 iOS.meta

diff --git a/iOS.meta b/iOS.meta
deleted file mode 100644
index 97ef8cb2..00000000
--- a/iOS.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: bad4fa5e5d4eb4cacb76dd1446af3d84
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_frame_coin.png b/popcorn/Assets/MyGame/Resource/UI/ui_frame_coin.png
index 71f9b82d9c5ba16f62b2de5c90959469d73a3b0e..149f8dedc6b0d04389846ef2ea6492ca0271f0e0 100644
GIT binary patch
literal 1874
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
M07*qoM6N<$f{5;mkN^Mx

literal 4837
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
LNkvXXu0mjf&dgrD

diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_frame_coinget.png b/popcorn/Assets/MyGame/Resource/UI/ui_frame_coinget.png
index 149f8dedc6b0d04389846ef2ea6492ca0271f0e0..71f9b82d9c5ba16f62b2de5c90959469d73a3b0e 100644
GIT binary patch
literal 4837
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
LNkvXXu0mjf&dgrD

literal 1874
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
M07*qoM6N<$f{5;mkN^Mx

diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_frame_coinget.png.meta b/popcorn/Assets/MyGame/Resource/UI/ui_frame_coinget.png.meta
index ab03acd0..4088f96c 100644
--- a/popcorn/Assets/MyGame/Resource/UI/ui_frame_coinget.png.meta
+++ b/popcorn/Assets/MyGame/Resource/UI/ui_frame_coinget.png.meta
@@ -46,7 +46,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 27, y: 24, z: 26, w: 21}
+  spriteBorder: {x: 47, y: 26, z: 84, w: 21}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab
index 85eedf0e..5e90f556 100644
--- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab
+++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab
@@ -519,7 +519,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 12345
+  m_Text: '12    '
 --- !u!1 &137127163584464918
 GameObject:
   m_ObjectHideFlags: 0
@@ -991,7 +991,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: ff4d597826f53ac49821fc3d60148965, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 582b70d53a85e4e74be0fb9ca6be120c, type: 3}
   m_Type: 1
   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 9491ae3f..70b9e0b8 100644
--- a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity
+++ b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity
@@ -393,7 +393,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 582b70d53a85e4e74be0fb9ca6be120c, type: 3}
+  m_Sprite: {fileID: 21300000, guid: ff4d597826f53ac49821fc3d60148965, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderTabView.cs b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderTabView.cs
index 9e9dd56d..d9c49792 100644
--- a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderTabView.cs
+++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderTabView.cs
@@ -44,7 +44,7 @@ public class ShopHeaderTabView : MonoBehaviour
             if (null!= freshSale)
             {
                 GameDataManager.sale = GameDataManager.GetTimeStamp(dateTime) + JoypacUtils.OnlineParametersIntByJoypacSDK(StaticOnlineParams.SaleVideoTime);
-                freshSale(true);
+                freshSale(false);
 
             }
         });
diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemView.cs b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemView.cs
index a4484b42..7e65ac77 100644
--- a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemView.cs
+++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemView.cs
@@ -48,10 +48,18 @@ public class ShopItemView : MonoBehaviour
             nomalPrice = shopData.price>nomalPrice?shopData.price:nomalPrice;
             shopData.price = (int)(nomalPrice * 0.8f);
         }
-        else if(nomalPrice!=-1&&GameDataManager.sale<= dateNowTime)
+        else if (sale)
+        {
+            nomalPrice = shopData.price > nomalPrice ? shopData.price : nomalPrice;
+            shopData.price = (int)(nomalPrice * 0.8f);
+        }
+        else if (nomalPrice != -1 && GameDataManager.sale < dateNowTime)
         {
             shopData.price = nomalPrice;
         }
+
+
+
         if (shopData.id == 14 )
         {
             shopData.price = 1;
@@ -99,8 +107,17 @@ public class ShopItemView : MonoBehaviour
 
         onObject.SetActive(shopData.price <= GameDataManager.GameData.adCount);
         offObject.SetActive(!onObject.activeSelf);
+        if ((shopData.id == 14|| shopData.id == 15) && GetItemAmount(shopData) > 0)
+        {
+            progressText.text = string.Format(ProgressFormat, "1", "1");
 
-        if (shopData.id == 14)
+            progressBar.value = Mathf.InverseLerp(0, shopData.price, 1);
+            videoButton.gameObject.SetActive(false);
+            onObject.SetActive(false);
+            offObject.SetActive(false);
+            soldOutObject.SetActive(true);
+        }
+        else if (shopData.id == 14)
         {
             progressText.text = string.Format(ProgressFormat, CryptoPrefs.GetInt("ShowButterDialog", 0), "1");
            
@@ -109,7 +126,7 @@ public class ShopItemView : MonoBehaviour
             offObject.SetActive(false);
             soldOutObject.SetActive(true);
         }
-        if (shopData.id == 15)
+        else if(shopData.id == 15 )
         {
           progressText.text = string.Format(ProgressFormat, CryptoPrefs.GetInt("ShowStrawBerryDialog", 0), "1");
 
@@ -151,7 +168,21 @@ public class ShopItemView : MonoBehaviour
         }
 
     }
-   
+    private  int GetItemAmount(ShopData shopData)
+    {
+        var gameData = GameDataManager.GameData;
+        switch (shopData.Category)
+        {
+            case ItemCategory.Material:
+                return gameData.Material.Find(data => data.Id == shopData.itemId)?.Amount ?? 0;
+            case ItemCategory.Recipe:
+                return gameData.MyRecipes.Contains(shopData.itemId) ? 1 : 0;
+            case ItemCategory.Pan:
+                return gameData.Pans.Contains(shopData.itemId) ? 1 : 0;
+            default:
+                throw new ArgumentOutOfRangeException();
+        }
+    }
 
     public void SetStockCount(int stock)
     {