安卓finder打点

popcorn/Assets/Joypac/Scripts/JPSDK/AndroidJPSDK/JoyPacAdverManager.cs

@@ -525,5 +525,27 @@ public class JoyPacAdverManager : MonoBehaviour
             onCcodeFail(json);
     }
 
+	void CoinPush(string json)
+	{
+		Debug.Log("unity JoyPacAdverManager Push1 msg:" + json);
+		JoypacAnalyticsManager.Push1 = true;
+
+		JoypacAnalyticsManager.Instance.AppOperation(StaticStringsEvent.MainPage,"Push1","","","");
+	}
+	void ShopSalePush(string json)
+	{
+		Debug.Log("unity JoyPacAdverManager Push2 msg:" + json);
+		JoypacAnalyticsManager.Push2 = true;
+
+		JoypacAnalyticsManager.Instance.AppOperation(StaticStringsEvent.MainPage, "Push2", "", "", "");
+	}
+	void AutoCookPush(string json)
+	{
+		Debug.Log("unity JoyPacAdverManager Push3 msg:" + json);
+		JoypacAnalyticsManager.Push3 = true;
+
+		JoypacAnalyticsManager.Instance.AppOperation(StaticStringsEvent.MainPage, "Push3", "", "", "");
+	}
+
 }
 //#endif

popcorn/Assets/Joypac/Scripts/JPSDK/AndroidJPSDK/JoyPacCurrentcyAdSingle.cs

@@ -316,6 +316,11 @@ public class JoyPacCurrentcyAdSingle
 	}
 
 
+	public void nofityPush(int delayTime)
+	{
+		 _currentcyAdSinglePlugin.Call("nofityPush", delayTime);
+	}
+
 }
 
 #endif

popcorn/Assets/Joypac/Scripts/JPSettings/StaticStringsEvent.cs

@@ -76,6 +76,50 @@
 
 
     //finder
+    public const string PlayGame = "PlayGame";
+    public const string MainPage = "MainPage";
+    public const string enter = "enter";
+    public const string Make = "Make";
+    public const string Push = "Push";
+
+    public const string FertilizerRewardButton = "FertilizerRewardButton";
+
+    public const string FertilizerReward = "FertilizerReward";
+    public const string LeafletsRewardButton = "LeafletsRewardButton";
+
+    public const string LeafletsReward = "LeafletsReward";
+
+    public const string PerfectRewardButton = "PerfectRewardButton";
+    public const string PerfectReward = "PerfectReward";
+
+    public const string CompleteButton = "CompleteButton";
+
+    public const string CompleteInterstitial = "CompleteInterstitial";
+    public const string Interstitial = "Interstitial";
+
+    public const string BackHomeButton = "BackHomeButton";
+    public const string BackHomeInterstitial = "BackHomeInterstitial";
+
+    public const string CoinRewardButton = "CoinRewardButton";
+    public const string CoinReward = "CoinReward";
+
+    public const string VIPRewardButton = "VIPRewardButton";
+
+    public const string VIPReward = "VIPReward";
+
+    public const string DiscountRewardButton = "DiscountRewardButton";
+    public const string DiscountReward = "DiscountReward";
+
+    public const string AutocookRewardButton = "AutocookRewardButton";
+
+    public const string AutocookReward = "AutocookReward";
+
+    public const string Recipe1RewardButton = "Recipe1RewardButton";
+    public const string Recipe1Reward = "Recipe1Reward";
+
+    public const string Recipe2RewardButton = "Recipe2RewardButton";
+
+    public const string Recipe2Reward = "Recipe2Reward";
 
 
 

popcorn/Assets/Joypac/Scripts/JoypacAnalyticsManager.cs

@@ -54,6 +54,31 @@ public class JoypacAnalyticsManager : MonoBehaviour
     }
 
 
+    static bool push1 = false;
+
+    public static bool Push1
+    {
+        get { return push1; }
+        set { push1 = value; }
+    }
+
+    static bool push2 = false;
+
+    public static bool Push2
+    {
+        get { return push2; }
+        set { push2 = value; }
+    }
+
+    static bool push3 = false;
+
+    public static bool Push3
+    {
+        get { return push3; }
+        set { push3 = value; }
+    }
+
+
     public string aPPAdsShowCome = "";
 
     public string aPPAdsShowAdType = "";

popcorn/Assets/Joypac/Scripts/JoypacManager.cs

@@ -65,6 +65,9 @@ public class JoypacManager : MonoBehaviour
         StartCoroutine(ShowGUIEnumerator());
 #endif
         DontDestroyOnLoad(gameObject);
+
+
+       // JoypacAnalyticsManager.Push1 = true;
     }
 
 

popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs

@@ -167,6 +167,8 @@ public class CookingResult : MonoBehaviour
                 TransitionManager.Instance.LoadScene(GameScenes.Main);
 
                 JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Click, StaticStringsEvent.CookSuccess);
+
+                JoypacAnalyticsManager.Instance.AppFunShow(StaticStringsEvent.CompleteButton, "");
                 CryptoPrefs.SetInt("CookSuccess", CryptoPrefs.GetInt("CookSuccess", 0) + 1);
                 if (CryptoPrefs.GetInt("CookSuccess", 0)==2)
                 {
@@ -180,7 +182,10 @@ public class CookingResult : MonoBehaviour
                               CoinManager.Instance.AddCoin(refreshRewardCoin);
                               gameData.Coin = CoinManager.Instance.OwnCoin;
                               GameDataManager.SaveGameData();
-                          },true);
+
+                              JoypacAnalyticsManager.Instance.AdEvent(StaticStringsEvent.CompleteButton, "", "", StaticStringsEvent.CompleteInterstitial, StaticStringsEvent.Interstitial);
+
+                          }, true);
                       }
                   }
                   , ConstStringKey.JOYPAC_SDK_INTERID, StaticStringsEvent.CookSuccess);
@@ -251,8 +256,25 @@ public class CookingResult : MonoBehaviour
                 if (cornResult != CornResult.Failure)
                 {
                   JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, StaticStringsEvent.CookSuccess);
+                    JoypacAnalyticsManager.Instance.AppFunShow(StaticStringsEvent.CompleteButton, "");
+                }
+                if (cornResult == CornResult.Failure)
+                {
+                    JoypacAnalyticsManager.Instance.AppOperation(StaticStringsEvent.PlayGame, "", StaticStringsEvent.Fail, "", "");
 
                 }
+                else if (cornResult == CornResult.Good)
+                {
+                    JoypacAnalyticsManager.Instance.AppOperation(StaticStringsEvent.PlayGame, "", StaticStringsEvent.Complete, "", "");
+
+                }
+                else if (cornResult == CornResult.Perfect)
+                {
+                    JoypacAnalyticsManager.Instance.AppOperation(StaticStringsEvent.PlayGame, StaticStringsEvent.Push, StaticStringsEvent.Perfect, "", "");
+
+                }
+
+
             });
         }
 

popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookDialog.cs

@@ -37,6 +37,9 @@ namespace MyGame.Scenes.Main.Scripts
             string position = StaticStringsEvent.AutoCook;
             JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, position);
 
+            JoypacAnalyticsManager.Instance.AppFunShow(StaticStringsEvent.AutocookRewardButton, "");
+           
+
             closeButton.OnClickAsObservable().Take(1).Subscribe(_ =>
             {
                 LocalCacheManager.Load<Action>(CloseCallbackTag, null)?.Invoke();
@@ -50,6 +53,8 @@ namespace MyGame.Scenes.Main.Scripts
             }).AddTo(this);
             movieButton.OnClickAsObservable().Take(1).Subscribe(_ =>
             {
+                JoypacAnalyticsManager.Instance.AdEvent(StaticStringsEvent.AutocookRewardButton, "","", StaticStringsEvent.AutocookReward, StaticStringsEvent.Reward);
+
                 GetRewardDialog.ShowRewardVideo(GameScenes.AutomaticCookingMovie, StaticStringsEvent.AutoCook, () =>
                 {
                     // 自動調理開始
@@ -59,6 +64,14 @@ namespace MyGame.Scenes.Main.Scripts
                     GameDataManager.SaveGameData();
                     LocalCacheManager.Load<Action>(SuccessCallbackTag, null)?.Invoke();
                     LocalCacheManager.Remove(SuccessCallbackTag);
+
+                    #if UNITY_ANDROID&&!UNITY_EDITOR
+                    JoyPacCurrentcyAdSingle currAdSingleTemp = new JoyPacCurrentcyAdSingle();
+
+                    currAdSingleTemp.nofityPush(autoCookData.duration);
+
+                    #endif
+
                 });
             }).AddTo(this);
             

popcorn/Assets/MyGame/Scenes/Title/Scripts/Title.cs

@@ -15,6 +15,9 @@ public class Title : MonoBehaviour
     // Start is called before the first frame update
     void Start()
     {
+
+        JoypacAnalyticsManager.Instance.AppFunShow(StaticStringsEvent.MainPage, "");
+
         // 実機でアプリ初回起動時にBGMならないの回避。1フレーム遅らせると鳴る
         Observable.NextFrame().Subscribe(_ => SoundManager.Instance.PlayBGM("bgm_Main"));
         startObject.SetActive(false);
@@ -34,6 +37,9 @@ public class Title : MonoBehaviour
                         string position = StaticStringsEvent.Start;
                         JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Basic, StaticStringsEvent.Click, position);
 
+                        JoypacAnalyticsManager.Instance.AppOperation(StaticStringsEvent.PlayGame, StaticStringsEvent.MainPage, StaticStringsEvent.enter,"","");
+
+
                         this.CallWaitForSeconds(.25f, () =>
                         {
                             TransitionManager.Instance.LoadScene(GameScenes.Main);

popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs

@@ -40,6 +40,23 @@ public class MarketManager : MonoBehaviour
         SoundManager.Instance.PlayBGM("bgm_marketing");
         var gameData = GameDataManager.GameData;
 
+        int refreshRewardCoin = UnityEngine.Random.Range(10, 30);
+
+        var isTutorial = gameData.FinishedFlags.HasFlag(TutorialFlag.FirstPlay);
+        if (JoypacAnalyticsManager.Push1 && isTutorial)
+        {
+            JoypacAnalyticsManager.Push1 = false;
+            CoinGetDialog.ShowDialog(refreshRewardCoin, () =>
+            {
+
+                CoinManager.Instance.AddCoin(refreshRewardCoin);
+                gameData.Coin = CoinManager.Instance.OwnCoin;
+                GameDataManager.SaveGameData();
+
+               
+            }, false);
+        }
+
         if (!gameData.FinishedFlags.HasFlag(TutorialFlag.FirstPlay))
         {
             if (TutorialManager.Instance.Index == 3)

popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs

@@ -34,12 +34,20 @@ public class ProductManagement : MonoBehaviour
     
     private void Start()
     {
+
+
+
+
         state.AddTo(this);
         state.Value = ManagementState.None;
 
         Market.Instance.IsPause.Value = true;
         var gameData = GameDataManager.GameData;
+
+
+
         
+
         if (!gameData.FinishedFlags.HasFlag(TutorialFlag.Management))
         {
             TutorialManager.Instance.ShowTutorialConversation(9, () =>

popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs

@@ -66,6 +66,9 @@ public class RecipeDetailView : MonoBehaviour
         
         nextButton.OnClickAsObservable().Take(1).Subscribe(_ =>
         {
+            JoypacAnalyticsManager.Instance.AppOperation(StaticStringsEvent.PlayGame,"", StaticStringsEvent.Make, "", data.id.ToString());
+
+
             LocalCacheManager.Save(PopcornGameManager.PanDataTag, panSelector.SelectedPanData.Value);
             TransitionManager.Instance.LoadScene(GameScenes.Cooking);
         }).AddTo(this);

popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs

@@ -15,6 +15,7 @@ public class Shopping : MonoBehaviour
     private Subject<int> changeCoinSubject = new Subject<int>();
     void Start()
     {
+        
         changeCoinSubject.AddTo(this);
         
         SoundManager.Instance.PlayBGM("bgm_shopping");

popcorn/Assets/MyGame/Scripts/FooterManager.cs

@@ -29,6 +29,39 @@ public class FooterManager : MonoBehaviour
         {
             return;
         }
+        var gameData = GameDataManager.GameData;
+        var isTutorial = gameData.FinishedFlags.HasFlag(TutorialFlag.FirstPlay);
+        
+        if (JoypacAnalyticsManager.Push1&& isTutorial)
+        {
+
+            Debug.Log("JoypacAnalyticsManager.Push1");
+            currentSceneName = GameScenes.marketing;
+
+            TransitionManager.Instance.LoadScene(currentSceneName);
+
+            
+        }
+        else if(JoypacAnalyticsManager.Push2&& isTutorial)
+        {
+            Debug.Log("JoypacAnalyticsManager.Push2");
+            currentSceneName = GameScenes.shopping;
+
+            TransitionManager.Instance.LoadScene(currentSceneName);
+
+            JoypacAnalyticsManager.Push2 = false;
+        }
+        else if (JoypacAnalyticsManager.Push3 && isTutorial)
+        {
+            Debug.Log("JoypacAnalyticsManager.Push3");
+            currentSceneName = GameScenes.Main;
+
+            TransitionManager.Instance.LoadScene(currentSceneName);
+
+            JoypacAnalyticsManager.Push3 = false;
+        }
+
+
         kitchenButton.SetSelected(currentSceneName == GameScenes.Main);
         fieldButton.SetSelected(currentSceneName == GameScenes.CornField);
         stockButton.SetSelected(currentSceneName == GameScenes.shopping);
@@ -56,11 +89,13 @@ public class FooterManager : MonoBehaviour
                 {
                     CoinGetDialog.ShowDialog(refreshRewardCoin, () =>
                     {
-                        var gameData = GameDataManager.GameData;
+                        //var gameData = GameDataManager.GameData;
                         CoinManager.Instance.AddCoin(refreshRewardCoin);
                         gameData.Coin = CoinManager.Instance.OwnCoin;
                         GameDataManager.SaveGameData();
-                    },true);
+                        JoypacAnalyticsManager.Instance.AdEvent(StaticStringsEvent.BackHomeButton, "", "", StaticStringsEvent.BackHomeInterstitial, StaticStringsEvent.Interstitial);
+
+                    }, true);
                 }
             }, ConstStringKey.JOYPAC_SDK_INTERID, StaticStringsEvent.SwitchPage);
             Debug.Log("jp======Interstitial");

popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs

@@ -65,7 +65,10 @@ namespace MyGame.Scripts
                     messageText.text = ScriptLocalization.System.CoinMainMessage;
                      position = StaticStringsEvent.Coin;
                     JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, position);
-                    SetButtonAction(closeButton, okButton, StaticStringsEvent.Coin);//AdManager.AD_PLACEMENT_COIN);
+
+
+                    JoypacAnalyticsManager.Instance.AppFunShow(StaticStringsEvent.CoinRewardButton, "");
+                    SetButtonAction(closeButton, okButton, position, StaticStringsEvent.CoinRewardButton, "", "", StaticStringsEvent.CoinReward, StaticStringsEvent.Reward);// AdManager.AD_PLACEMENT_VIP);
 
                     break;
                 case RewardType.CornField:
@@ -75,7 +78,9 @@ namespace MyGame.Scripts
                     messageText.text = ScriptLocalization.System.CornFieldMessage;
                      position = StaticStringsEvent.Fertilizer;
                     JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, position);
-                    SetButtonAction(closeButton, okButton, StaticStringsEvent.Fertilizer); //AdManager.AD_PLACEMENT_CORNFIELD);
+                    JoypacAnalyticsManager.Instance.AppFunShow(StaticStringsEvent.FertilizerRewardButton, "");
+                    SetButtonAction(closeButton, okButton, position, StaticStringsEvent.FertilizerRewardButton, "", "", StaticStringsEvent.FertilizerReward, StaticStringsEvent.Reward);// AdManager.AD_PLACEMENT_VIP);
+
                     break;
                 case RewardType.IncreaseCustomer:
                     normalWindow.SetActive(true);
@@ -84,7 +89,9 @@ namespace MyGame.Scripts
                     messageText.text = ScriptLocalization.System.IncreaseCustomerMessage;
                     position = StaticStringsEvent.Leaflets;
                     JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, position);
-                    SetButtonAction(closeButton, okButton, StaticStringsEvent.Leaflets);// AdManager.AD_PLACEMENT_CUSTOMER);
+                    JoypacAnalyticsManager.Instance.AppFunShow(StaticStringsEvent.LeafletsRewardButton, "");
+                    SetButtonAction(closeButton, okButton, position, StaticStringsEvent.LeafletsRewardButton, "", "", StaticStringsEvent.LeafletsReward, StaticStringsEvent.Reward);// AdManager.AD_PLACEMENT_VIP);
+
                     break;
                 case RewardType.PerfectPopcorn:
                     normalWindow.SetActive(true);
@@ -92,7 +99,9 @@ namespace MyGame.Scripts
                     messageText.text = ScriptLocalization.System.PerfectPopcornMessage;
                     position = StaticStringsEvent.Perfect;
                     JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, position);
-                    SetButtonAction(closeButton, okButton, StaticStringsEvent.Perfect); //AdManager.AD_PLACEMENT_PERFECT);
+                    JoypacAnalyticsManager.Instance.AppFunShow(StaticStringsEvent.PerfectRewardButton, "");
+                    SetButtonAction(closeButton, okButton, position, StaticStringsEvent.PerfectRewardButton, "", "", StaticStringsEvent.PerfectReward, StaticStringsEvent.Reward);// AdManager.AD_PLACEMENT_VIP);
+
                     break;
                 case RewardType.VipCustomer:
                     normalWindow.SetActive(true);
@@ -100,7 +109,9 @@ namespace MyGame.Scripts
                     messageText.text = ScriptLocalization.System.VipCustomerMessage;
                     position = StaticStringsEvent.VIP;
                     JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, position);
-                    SetButtonAction(closeButton, okButton, StaticStringsEvent.VIP);// AdManager.AD_PLACEMENT_VIP);
+                    JoypacAnalyticsManager.Instance.AppFunShow(StaticStringsEvent.VIPRewardButton, "");
+                    SetButtonAction(closeButton, okButton, position, StaticStringsEvent.VIPRewardButton, "", "", StaticStringsEvent.VIPReward, StaticStringsEvent.Reward);// AdManager.AD_PLACEMENT_VIP);
+
                     break;
                 case RewardType.Butter:
                     normalWindow.SetActive(true);
@@ -109,7 +120,10 @@ namespace MyGame.Scripts
                     messageText.text = "是否观看广告获得配方";
                     position = StaticStringsEvent.Butter;
                     JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, position);
-                    SetButtonAction(closeButton, okButton, StaticStringsEvent.Butter);// AdManager.AD_PLACEMENT_VIP);
+
+                    JoypacAnalyticsManager.Instance.AppFunShow(StaticStringsEvent.Recipe1RewardButton, "");
+                    SetButtonAction(closeButton, okButton, position, StaticStringsEvent.Recipe1RewardButton,"","", StaticStringsEvent.Recipe1Reward, StaticStringsEvent.Reward);// AdManager.AD_PLACEMENT_VIP);
+
                     break;
                 case RewardType.StrawBerry:
                     normalWindow.SetActive(true);
@@ -118,7 +132,9 @@ namespace MyGame.Scripts
                     messageText.text = "是否观看广告获得配方";
                     position = StaticStringsEvent.StrawBerry;
                     JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, position);
-                    SetButtonAction(closeButton, okButton, StaticStringsEvent.StrawBerry);// AdManager.AD_PLACEMENT_VIP);
+                    JoypacAnalyticsManager.Instance.AppFunShow(StaticStringsEvent.Recipe2RewardButton, "");
+                    SetButtonAction(closeButton, okButton, position, StaticStringsEvent.Recipe2RewardButton, "", "", StaticStringsEvent.Recipe2Reward, StaticStringsEvent.Reward);// AdManager.AD_PLACEMENT_VIP);
+
                     break;
                 case RewardType.Sale:
                     normalWindow.SetActive(true);
@@ -127,7 +143,9 @@ namespace MyGame.Scripts
                     messageText.text = "市集内每日12-13,18-19点会有8折促销，是否观看广告直接获取促销？";
                     position = StaticStringsEvent.Sale;
                     JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, position);
-                    SetButtonAction(closeButton, okButton, StaticStringsEvent.Sale);// AdManager.AD_PLACEMENT_VIP);
+                    JoypacAnalyticsManager.Instance.AppFunShow(StaticStringsEvent.DiscountRewardButton, "");
+                    SetButtonAction(closeButton, okButton, position, StaticStringsEvent.DiscountRewardButton, "", "", StaticStringsEvent.DiscountReward, StaticStringsEvent.Reward);// AdManager.AD_PLACEMENT_VIP);
+
                     break;
                 case RewardType.Cold:
                     okButton.gameObject.SetActive(false);
@@ -137,7 +155,7 @@ namespace MyGame.Scripts
                     messageText.text = "金币奖励冷却中...";
                     //position = StaticStringsEvent.Sale;
                     //JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, position);
-                    SetButtonAction(closeButton, okButton, StaticStringsEvent.Sale);// AdManager.AD_PLACEMENT_VIP);
+                    SetButtonAction(closeButton, okButton, "","","","","","");// AdManager.AD_PLACEMENT_VIP);
                     break;
 
                 default:
@@ -145,7 +163,7 @@ namespace MyGame.Scripts
             }
         }
 
-        private void SetButtonAction(Button closeButton, Button okButton, string Placement)
+        private void SetButtonAction(Button closeButton, Button okButton, string Placement, string name, string extras, string from, string AdsShowCome, string AdsShowAdType)
         {
             closeButton.OnClickAsObservable().Take(1).Subscribe(_ =>
             {
@@ -160,6 +178,11 @@ namespace MyGame.Scripts
             }).AddTo(this);
             okButton.OnClickAsObservable().Take(1).Subscribe(_ =>
             {
+                if (!String.IsNullOrEmpty(Placement))
+                {
+                    JoypacAnalyticsManager.Instance.AdEvent(name, extras, from, AdsShowCome, AdsShowAdType);
+
+                }
                 ShowRewardVideo(GameScenes.WatchMovieCoin, Placement, () =>
                 {
                     LocalCacheManager.Load<Action>(OkCallbackTag, null)?.Invoke();

popcorn/ProjectSettings/GraphicsSettings.asset

@@ -34,6 +34,7 @@ GraphicsSettings:
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}