插屏金币

2022-04-20 15:50:49 +08:00 · 2022-04-20 15:50:49 +08:00 · 143958eea3
parent 9b234a8209
commit 143958eea3
6 changed files with 123 additions and 8 deletions
--- a/popcorn/Assets/Joypac/Scripts/JPSettings/StaticStringsEvent.cs
+++ b/popcorn/Assets/Joypac/Scripts/JPSettings/StaticStringsEvent.cs
@ -69,7 +69,7 @@
    public const string StrawBerry = "Recipe2";

    public const string Sale = "Discount";
-    public const string PLACEMENT_AUTO = "PLACEMENT_AUTO";
+    public const string AutoCook = "AutoCook";

    //public const string Noadspage = "Noadspage";

--- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs
+++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs
@ -39,7 +39,9 @@ public class CookingResult : MonoBehaviour
    [SerializeField] private ResultCoinView coinView;

    ReactiveProperty<CornResult> result = new ReactiveProperty<CornResult>();
-   
+
+    int refreshRewardCoin = 10;
+
    private void Start()
    {
        result.AddTo(this);
@ -168,7 +170,20 @@ public class CookingResult : MonoBehaviour
                CryptoPrefs.SetInt("CookSuccess", CryptoPrefs.GetInt("CookSuccess", 0) + 1);
                if (CryptoPrefs.GetInt("CookSuccess", 0)==2)
                {
-                  JoypacAdManager.Instance.ShowInterstitial(null, ConstStringKey.JOYPAC_SDK_INTERID, StaticStringsEvent.CookSuccess);
+                  JoypacAdManager.Instance.ShowInterstitial((JoypacInterStatus) =>
+                  {
+                      if (JoypacInterStatus==JoypacIntersitialStatus.CLOSE)
+                      {
+                          CoinGetDialog.ShowDialog(refreshRewardCoin, () =>
+                          {
+                              var gameData = GameDataManager.GameData;
+                              CoinManager.Instance.AddCoin(refreshRewardCoin);
+                              gameData.Coin = CoinManager.Instance.OwnCoin;
+                              GameDataManager.SaveGameData();
+                          },true);
+                      }
+                  }
+                  , ConstStringKey.JOYPAC_SDK_INTERID, StaticStringsEvent.CookSuccess);
                   // Debug.LogError("jp======Interstitial"+ CryptoPrefs.GetInt("CookSuccess", 0));
                    CryptoPrefs.SetInt("CookSuccess", 0);
                }
--- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookDialog.cs
+++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookDialog.cs
@ -32,7 +32,10 @@ namespace MyGame.Scenes.Main.Scripts
            var autoCookData = autoCookDataList.First(data => data.level == gameData.AutoCookLevel);
            var maxLevel = autoCookDataList.Last().level;
            var isMaxLevel = autoCookData.level >= maxLevel;
-            
+
+            string position = StaticStringsEvent.AutoCook;
+            JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, position);
+
            closeButton.OnClickAsObservable().Take(1).Subscribe(_ =>
            {
                LocalCacheManager.Load<Action>(CloseCallbackTag, null)?.Invoke();
@ -46,7 +49,7 @@ namespace MyGame.Scenes.Main.Scripts
            }).AddTo(this);
            movieButton.OnClickAsObservable().Take(1).Subscribe(_ =>
            {
-                GetRewardDialog.ShowRewardVideo(GameScenes.AutomaticCookingMovie, StaticStringsEvent.PLACEMENT_AUTO, () =>
+                GetRewardDialog.ShowRewardVideo(GameScenes.AutomaticCookingMovie, StaticStringsEvent.AutoCook, () =>
                {
                    // 自動調理開始
                    gameData.AutoCookFinishTime = DateTime.UtcNow.AddHours(autoCookData.duration).ToBinary();
--- a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity
+++ b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity
@ -532,6 +532,84 @@ MonoBehaviour:
  mGUI_ShowCallback: 0
  mLocalizeTarget: {fileID: 873776007}
  mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image
+--- !u!1 &606941324
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 606941325}
+  - component: {fileID: 606941327}
+  - component: {fileID: 606941326}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &606941325
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 606941324}
+  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: 1432281556}
+  m_RootOrder: 2
+  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: -3, y: -67}
+  m_SizeDelta: {x: 160, y: 60}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &606941326
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 606941324}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0.8520418, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3}
+    m_FontSize: 45
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 45
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u6253\u6270\u4E86"
+--- !u!222 &606941327
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 606941324}
+  m_CullTransparentMesh: 0
 --- !u!1 &660781988
 GameObject:
  m_ObjectHideFlags: 0
@ -926,6 +1004,7 @@ RectTransform:
  m_Children:
  - {fileID: 2114469661}
  - {fileID: 1587966890}
+  - {fileID: 606941325}
  m_Father: {fileID: 982903231}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1748,6 +1827,7 @@ MonoBehaviour:
  backgroundAnimator: {fileID: 660781990}
  closeButton: {fileID: 2088564207}
  messageText: {fileID: 726079106}
+  Intertext: {fileID: 606941324}
 --- !u!1001 &8412240709702713318
 PrefabInstance:
  m_ObjectHideFlags: 0
--- a/popcorn/Assets/MyGame/Scripts/CoinGetDialog.cs
+++ b/popcorn/Assets/MyGame/Scripts/CoinGetDialog.cs
@ -15,9 +15,12 @@ namespace MyGame.Scripts
        [SerializeField] private Animator backgroundAnimator;
        [SerializeField] private Button closeButton;
        [SerializeField] private Text messageText;
+        [SerializeField] private GameObject Intertext;

+        static bool textInter = false;
        private void Start()
        {
+            Intertext.SetActive(textInter);
            closeButton.OnClickAsObservable().Take(1).Subscribe(_ =>
            {
                transform.parent.SetLocalScale(0);
@ -32,11 +35,13 @@ namespace MyGame.Scripts
            messageText.text = LocalCacheManager.Load<int>(AmountTag, 0).ToString();
        }

-        public static void ShowDialog(int amount, Action closeCallback)
+        public static void ShowDialog(int amount, Action closeCallback,bool isInter=false)
        {
            LocalCacheManager.Save(CallbackTag, closeCallback);
            LocalCacheManager.Save(AmountTag, amount);
            TransitionManager.Instance.LoadSceneAdditive(GameScenes.WatchMovieCoinGet);
+
+            textInter = isInter;
        }
    }
 }
--- a/popcorn/Assets/MyGame/Scripts/FooterManager.cs
+++ b/popcorn/Assets/MyGame/Scripts/FooterManager.cs
@ -22,7 +22,7 @@ public class FooterManager : MonoBehaviour

    [SerializeField] private GameObject fieldCornIcon;

-
+    int refreshRewardCoin = 10;
    private void Start()
    {
        if (!Enum.TryParse<GameScenes>(SceneManager.GetActiveScene().name, out var currentSceneName))
@ -50,7 +50,19 @@ public class FooterManager : MonoBehaviour
        stockNotifyIcon.SetActive(Shopping.CheckEarnedRecipe());
        if (JoypacAdManager.Instance.SwitchPageInter)
        {
-            JoypacAdManager.Instance.ShowInterstitial(null, ConstStringKey.JOYPAC_SDK_INTERID, StaticStringsEvent.SwitchPage);
+            JoypacAdManager.Instance.ShowInterstitial((JoypacInterStatus) =>
+            {
+                if (JoypacInterStatus == JoypacIntersitialStatus.CLOSE)
+                {
+                    CoinGetDialog.ShowDialog(refreshRewardCoin, () =>
+                    {
+                        var gameData = GameDataManager.GameData;
+                        CoinManager.Instance.AddCoin(refreshRewardCoin);
+                        gameData.Coin = CoinManager.Instance.OwnCoin;
+                        GameDataManager.SaveGameData();
+                    },true);
+                }
+            }, ConstStringKey.JOYPAC_SDK_INTERID, StaticStringsEvent.SwitchPage);
            Debug.Log("jp======Interstitial");

            // StartCoroutine(JoypacAdManager.Instance.SwitchPageTime());