From 3a056c4d4160374d1c41dcb966759bca34b1148f Mon Sep 17 00:00:00 2001
From: "xiaohui.wang" <xiaohui.wang@joypac.cn>
Date: Thu, 2 Feb 2023 11:37:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Scripts/JPSettings/StaticStringsEvent.cs   |  4 ++++
 .../Joypac/Scripts/JoypacAnalyticsManager.cs   | 18 ++++++++++++++++++
 .../Scenes/MiniGame/Scripts/GameManager.cs     |  4 ++++
 .../MyGame/Scenes/WorldMap/Scripts/WorldMap.cs |  6 ++++++
 .../Scenes/recipe/Scripts/RecipeDetailView.cs  |  8 ++++++++
 5 files changed, 40 insertions(+)

diff --git a/popcorn/Assets/Joypac/Scripts/JPSettings/StaticStringsEvent.cs b/popcorn/Assets/Joypac/Scripts/JPSettings/StaticStringsEvent.cs
index 711b71a4..a1ff29b7 100644
--- a/popcorn/Assets/Joypac/Scripts/JPSettings/StaticStringsEvent.cs
+++ b/popcorn/Assets/Joypac/Scripts/JPSettings/StaticStringsEvent.cs
@@ -133,6 +133,10 @@
 
     public const string aPPAdsShowAdType = "aPPAdsShowAdType";
 
+    public const string App_Make_popcorn = "App_Make_popcorn";
+    public const string App_Parkour = "App_Parkour";
+    public const string App_San_Francisco = "App_San_Francisco";
 
 
+    
 }
\ No newline at end of file
diff --git a/popcorn/Assets/Joypac/Scripts/JoypacAnalyticsManager.cs b/popcorn/Assets/Joypac/Scripts/JoypacAnalyticsManager.cs
index 7d0779a2..2f83f965 100644
--- a/popcorn/Assets/Joypac/Scripts/JoypacAnalyticsManager.cs
+++ b/popcorn/Assets/Joypac/Scripts/JoypacAnalyticsManager.cs
@@ -221,6 +221,24 @@ public class JoypacAnalyticsManager : MonoBehaviour
         ReYun(temp);
 
     }
+
+    public void DesignEvent(string eventname, string name, string from, string action, string data, string extras)
+    {
+
+        Debug.Log(string.Format("<color=#ff0000>{0}</color>", action + " " + from + "  " + data));
+        VolcanoReYunJson temp = new VolcanoReYunJson();
+        temp.eventname = eventname;
+        temp.values.Add("name", name);
+        temp.values.Add("from", from);
+        temp.values.Add("action", action);
+        temp.values.Add("data", data);
+        temp.values.Add("extras", extras);
+        Volcano(temp);
+        //temp.eventname = "event_15";
+        //ReYun(temp);
+
+    }
+
     public void APPAdsShow(Dictionary<string, object> adSource)
     {
         Debug.Log("APPAdsShow========coming");
diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs
index 1b693f0d..d084043b 100644
--- a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs
+++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs
@@ -136,6 +136,10 @@ namespace MyGame.Scenes.MiniGame.Scripts
                         break;
                     case MenuState.Game:
                         SoundManager.Instance.PlayBGM("bgm_minigame");
+
+                        JoypacAnalyticsManager.Instance.DesignEvent(StaticStringsEvent.App_Parkour, StaticStringsEvent.PlayGame, StaticStringsEvent.MainPage, StaticStringsEvent.enter, "", "");
+
+
                         break;
                     default:
                         throw new ArgumentOutOfRangeException(nameof(x), x, null);
diff --git a/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/WorldMap.cs b/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/WorldMap.cs
index 518e95ed..44ce1718 100644
--- a/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/WorldMap.cs
+++ b/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/WorldMap.cs
@@ -146,6 +146,12 @@ namespace MyGame.Scenes.WorldMap.Scripts
                             earningView.OnClick.Subscribe(_ =>
                             {
                                 ChangeCity(cityIcon.CityId);
+                                if (cityIcon.CityId==2&& PlayerPrefs.GetInt("App_San_Francisco", 0)==0)
+                                {
+                                    JoypacAnalyticsManager.Instance.DesignEvent(StaticStringsEvent.App_San_Francisco,"", "", "", "", "");
+
+                                    PlayerPrefs.SetInt("App_San_Francisco", 100);
+                                }
                                 LocalCacheManager.Save(Const.ChangeCityFlagTag, true);
                                 TransitionManager.Instance.LoadScene(GameScenes.Main);
                             }).AddTo(citySelectDisposable);
diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs
index 70d3e54b..3f174043 100644
--- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs
+++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs
@@ -74,6 +74,14 @@ public class RecipeDetailView : MonoBehaviour
         {
             JoypacAnalyticsManager.Instance.AppOperation(StaticStringsEvent.PlayGame,"", StaticStringsEvent.Make, "", data.id.ToString());
 
+             PlayerPrefs.SetInt("App_Make_popcorn", PlayerPrefs.GetInt("App_Make_popcorn", 0)+1);
+             int makeCount = PlayerPrefs.GetInt("App_Make_popcorn", 0);
+            if (makeCount<20)
+            {
+                JoypacAnalyticsManager.Instance.DesignEvent(StaticStringsEvent.App_Make_popcorn, StaticStringsEvent.PlayGame, "", "", "", makeCount.ToString());
+
+            }
+
             if (PlayerPrefs.GetInt("ADJUST_FIRSTLEVEL", 0) == 0)
             {
                 JoypacAnalyticsManager.Instance.LogEventToken(ConstStringKey.ADJUST_FIRSTLEVEL);