jet 8 years ago
parent
commit
79be171a12

+ 24 - 0
Assets/Editor/EdTest.cs

@@ -0,0 +1,24 @@
+using UnityEditor;
+using UnityEngine;
+
+using System.Collections;
+using System.Collections.Generic;
+
+[CustomEditor(typeof(Test))]
+public class EdTest : Editor
+{
+    public override void OnInspectorGUI()
+    {
+        base.OnInspectorGUI();
+
+        if (GUILayout.Button("Show"))
+        {
+            EditorUtility.DisplayProgressBar("Test", "Info", 0.5f);
+        }
+
+        if (GUILayout.Button("Test"))
+        {
+            EditorUtility.ClearProgressBar();
+        }
+    }
+}

+ 12 - 0
Assets/Editor/EdTest.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 7154c58f8232b3a4d9d3eb7b781dc5ff
+timeCreated: 1501469813
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
Assets/Script/Manage/ManaAchieve.cs

@@ -178,7 +178,7 @@ public class Achieve
         ManaAchieve.UpdateHint();
         ManaAchieve.UpdateHint();
 
 
 
 
-        ManaCenter.Diamond += DiamondOnce;
+        ManaCenter.AddDiamond(DiamondOnce, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.Achieve);
         ManaCenter.SkillPerson += Person;
         ManaCenter.SkillPerson += Person;
         ManaCenter.SkillCoinPerson += CoinPerson;
         ManaCenter.SkillCoinPerson += CoinPerson;
 
 

+ 44 - 26
Assets/Script/Manage/ManaCenter.cs

@@ -270,16 +270,16 @@ public class ManaCenter : Regist
         }
         }
     }
     }
 
 
+    private static int Level_;
+    private static bool Pause_;
+    private static float Person_;
+    private static float CoinPerson_;
+
     public static double Coin
     public static double Coin
     {
     {
         get { return Coin_; }
         get { return Coin_; }
         set
         set
         {
         {
-            if (value - Coin_ > 0)
-            {
-                TotalCoin += value - Coin_;
-            }
-
             Coin_ = value;
             Coin_ = value;
 
 
             ManaReso.SetText("F_CoinLab", Auxiliary.ShrinkNumberStr(Coin_, 0));
             ManaReso.SetText("F_CoinLab", Auxiliary.ShrinkNumberStr(Coin_, 0));
@@ -289,25 +289,9 @@ public class ManaCenter : Regist
             ManaAchieve.UpdateStatus(AchieveType.CurrentCoin, Coin_);
             ManaAchieve.UpdateStatus(AchieveType.CurrentCoin, Coin_);
         }
         }
     }
     }
-    public static double Diamond
-    {
-        get { return Diamond_; }
-        set
-        {
-            Diamond_ = value;
-
-            ManaReso.SetText("F_DiamondLab", Auxiliary.ShrinkNumberStr(Diamond_, 0));
-            ManaReso.SetText("P_DiamondLab", Auxiliary.ShrinkNumberStr(Diamond_, 0));
-        }
-    }
-
-    private static int Level_;
-    private static bool Pause_;
-    private static float Person_;
-    private static float CoinPerson_;
 
 
-    private static double Coin_;
-    private static double Diamond_;
+    public static double Coin_;
+    public static double Diamond;
 
 
     public static bool MiniLock;
     public static bool MiniLock;
     public static bool SaveLock;
     public static bool SaveLock;
@@ -385,6 +369,32 @@ public class ManaCenter : Regist
     }
     }
 
 
 
 
+    public static void AddCoin(double amt, StaticsManager.ItemID itemId, StaticsManager.ConsumeModule consumeModule)
+    {
+        Coin += amt;
+
+        if (amt > 0)
+        {
+            TotalCoin += amt;
+
+            StaticsManager.GetInstance().RewardItem(itemId, StaticsManager.ItemType.金币, amt.ToString("0"), consumeModule);
+        }
+    }
+
+    public static void AddDiamond(double amt, StaticsManager.ItemID itemId, StaticsManager.ConsumeModule consumeModule)
+    {
+        Diamond += amt;
+
+        ManaReso.SetText("F_DiamondLab", Auxiliary.ShrinkNumberStr(Diamond, 0));
+        ManaReso.SetText("P_DiamondLab", Auxiliary.ShrinkNumberStr(Diamond, 0));
+
+        if (amt > 0)
+        {
+            StaticsManager.GetInstance().RewardItem(itemId, StaticsManager.ItemType.钻石, amt.ToString("0"), consumeModule);
+        }
+    }
+
+
     private void OpThread()
     private void OpThread()
     {
     {
         if (Auxiliary.AnyKeyUp)
         if (Auxiliary.AnyKeyUp)
@@ -440,6 +450,8 @@ public class ManaCenter : Regist
                 ManaReso.Get("C_MiniGame").TweenBacRect();
                 ManaReso.Get("C_MiniGame").TweenBacRect();
 
 
                 ManaReso.SetText("C_MiniGameLab", "");
                 ManaReso.SetText("C_MiniGameLab", "");
+
+                StaticsManager.GetInstance().RewardItem(StaticsManager.ItemID.获得小游戏, StaticsManager.ItemType.小游戏,  "1", StaticsManager.ConsumeModule.None);
             }
             }
         }
         }
     }
     }
@@ -470,6 +482,8 @@ public class ManaCenter : Regist
             LoginTimer = 0;
             LoginTimer = 0;
 
 
             ManaServer.Login();
             ManaServer.Login();
+
+            StaticsManager.GetInstance().Online();
         }
         }
     }
     }
 
 
@@ -488,7 +502,7 @@ public class ManaCenter : Regist
 
 
             float temp = (NewPerson * NewCoinPerson * CircleTime) * (1 + SkillPlus);
             float temp = (NewPerson * NewCoinPerson * CircleTime) * (1 + SkillPlus);
 
 
-            Coin += temp;
+            AddCoin(temp, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.Income);
 
 
             ManaReso.Get("C_IncomeLab").TweenReForGra();
             ManaReso.Get("C_IncomeLab").TweenReForGra();
             ManaReso.Get("C_IncomeLab").TweenReForVec();
             ManaReso.Get("C_IncomeLab").TweenReForVec();
@@ -762,7 +776,7 @@ public class ManaCenter : Regist
             ManaReso.SetActive("Ba_Lab2", true);
             ManaReso.SetActive("Ba_Lab2", true);
         }
         }
 
 
-        Coin += coin;
+        AddCoin(coin, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.Income);
 
 
         ManaReso.SetText("Ba_IconLab", Auxiliary.ShrinkNumberStr(coin));
         ManaReso.SetText("Ba_IconLab", Auxiliary.ShrinkNumberStr(coin));
     }
     }
@@ -770,7 +784,7 @@ public class ManaCenter : Regist
     public static void SwitchLanguage()
     public static void SwitchLanguage()
     {
     {
         Coin = Coin;
         Coin = Coin;
-        Diamond = Diamond;
+        AddDiamond(0, StaticsManager.ItemID.None, StaticsManager.ConsumeModule.None);
     }
     }
 
 
     public static void Pay(string id, double amt, Current current, UnityAction succeedCallback, StaticsManager.ItemID itemId, StaticsManager.ConsumeModule consumeModule, bool navigate = true, bool useBubbleTweenNavigate = true, UnityAction navigateCall = null)
     public static void Pay(string id, double amt, Current current, UnityAction succeedCallback, StaticsManager.ItemID itemId, StaticsManager.ConsumeModule consumeModule, bool navigate = true, bool useBubbleTweenNavigate = true, UnityAction navigateCall = null)
@@ -874,6 +888,8 @@ public class ManaCenter : Regist
                 Diamond -= amt;
                 Diamond -= amt;
 
 
                 succeedCallback.Invoke();
                 succeedCallback.Invoke();
+
+                StaticsManager.GetInstance().PurchaseItem(itemId, StaticsManager.ItemType.钻石, "1", amt.ToString("0"), consumeModule);
             }
             }
             else
             else
             {
             {
@@ -1081,6 +1097,8 @@ public class ManaCenter : Regist
         }
         }
         else
         else
         {
         {
+            StaticsManager.GetInstance().StartSession();
+
             Background = false;
             Background = false;
 
 
             if (FirstFrame)
             if (FirstFrame)

+ 1 - 1
Assets/Script/Manage/ManaGarden.cs

@@ -490,7 +490,7 @@ public class ManaGarden : Regist
                                             }
                                             }
                                         );
                                         );
                                 },
                                 },
-                                StaticsManager.ItemID.花朵, 
+                                StaticsManager.ItemID.解锁花朵, 
                                 StaticsManager.ConsumeModule.Shop,
                                 StaticsManager.ConsumeModule.Shop,
                                 true,
                                 true,
                                 false,
                                 false,

+ 19 - 4
Assets/Script/Manage/ManaIAP.cs

@@ -132,26 +132,41 @@ public class ManaIAP : MonoBehaviour, IStoreListener
 
 
     public static void PlayAD(UnityAction action)
     public static void PlayAD(UnityAction action)
     {
     {
+        AdAction = () =>
+        {
+            action.Invoke();
+
+            StaticsManager.GetInstance().AdFinished();
+        };
+
         if (Advertisement.IsReady())
         if (Advertisement.IsReady())
         {
         {
             ManaCenter.ReactiveLock = true;
             ManaCenter.ReactiveLock = true;
 
 
-            AdAction = action;
-
             ShowOptions showOptions = new ShowOptions();
             ShowOptions showOptions = new ShowOptions();
             showOptions.resultCallback = CallbackAD;
             showOptions.resultCallback = CallbackAD;
 
 
             Advertisement.Show(showOptions);
             Advertisement.Show(showOptions);
+
+            StaticsManager.GetInstance().AdChannel(0);
         }
         }
         else
         else
         {
         {
             // Bubble.Show(null, Language.GetStr("IAP", "LoadAd"));
             // Bubble.Show(null, Language.GetStr("IAP", "LoadAd"));
             //Unity广告加载失败,自动加载vungle广告,并且再次初始化unity广告
             //Unity广告加载失败,自动加载vungle广告,并且再次初始化unity广告
-            if(VungleAdsManager.Instance.CheckAd())
+            if (VungleAdsManager.Instance.CheckAd())
+            {
                 VungleAdsManager.Instance.PlayAd();
                 VungleAdsManager.Instance.PlayAd();
+
+                StaticsManager.GetInstance().AdChannel(1);
+            }
             else
             else
+            {
                 OneWayAdsManager.Instance.PlayAd();
                 OneWayAdsManager.Instance.PlayAd();
 
 
+                StaticsManager.GetInstance().AdChannel(2);
+            }
+
             if (!Advertisement.isInitialized)
             if (!Advertisement.isInitialized)
             {
             {
                 InitializeAD();
                 InitializeAD();
@@ -188,7 +203,7 @@ public class ManaIAP : MonoBehaviour, IStoreListener
 
 
             return;
             return;
         }
         }
-
+        
         if (!Complete)
         if (!Complete)
         {
         {
             Bubble.Show(null, Language.GetStr("IAP", "PurchaseFail"));
             Bubble.Show(null, Language.GetStr("IAP", "PurchaseFail"));

+ 5 - 3
Assets/Script/Manage/ManaMiniGame.cs

@@ -89,7 +89,7 @@ public class Award
 
 
         ManaReso.SetActive("Da_CoinLab", true);
         ManaReso.SetActive("Da_CoinLab", true);
 
 
-        ManaCenter.Coin += Coin;
+        ManaCenter.AddCoin(Coin, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.MiniGame);
 
 
         sb.AppendFormat("{0}{1}{2}    ", Language.GetStr("UI", "J_Info0"), "<(金币)>", Coin);
         sb.AppendFormat("{0}{1}{2}    ", Language.GetStr("UI", "J_Info0"), "<(金币)>", Coin);
 
 
@@ -111,7 +111,7 @@ public class Award
 
 
             ManaReso.SetActive("Da_DiamondLab", true);
             ManaReso.SetActive("Da_DiamondLab", true);
 
 
-            ManaCenter.Diamond += Diamond;
+            ManaCenter.AddDiamond(Diamond, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.MiniGame);
 
 
             ManaReso.SetActive("Da_Diamond", true);
             ManaReso.SetActive("Da_Diamond", true);
 
 
@@ -131,7 +131,7 @@ public class Award
 
 
                 ManaReso.SetActive("Da_DiamondLab", true);
                 ManaReso.SetActive("Da_DiamondLab", true);
 
 
-                ManaCenter.Diamond += Diamond;
+                ManaCenter.AddDiamond(Diamond, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.MiniGame);
 
 
                 ManaReso.SetActive("Da_Diamond", true);
                 ManaReso.SetActive("Da_Diamond", true);
 
 
@@ -1574,6 +1574,8 @@ public class ManaMiniGame : Regist
         NewFadeTime = FadeTime;
         NewFadeTime = FadeTime;
         DiamondTimer = Random.Range(0f, GameTime - 5);
         DiamondTimer = Random.Range(0f, GameTime - 5);
 
 
+        StaticsManager.GetInstance().UseItem(StaticsManager.ItemID.开始小游戏, StaticsManager.ItemType.小游戏, "1", StaticsManager.ConsumeModule.None);
+
         if (GameA)
         if (GameA)
         {
         {
             for (int i = 0; i < IdleList.Count; i++)
             for (int i = 0; i < IdleList.Count; i++)

+ 8 - 0
Assets/Script/Manage/ManaServer.cs

@@ -59,6 +59,7 @@ public class ManaServer : Regist
     public static int Counter;
     public static int Counter;
     public static float Timer;
     public static float Timer;
     public static bool Complete;
     public static bool Complete;
+    public static bool FirstConnect = true;
 
 
     public static string ID = "Default";
     public static string ID = "Default";
     public static string ReportContent;
     public static string ReportContent;
@@ -146,6 +147,13 @@ public class ManaServer : Regist
                 }
                 }
             }
             }
 
 
+            if (FirstConnect)
+            {
+                FirstConnect = false;
+
+                StaticsManager.GetInstance().ActOrReg(ID, DataEyeGA.AccountType.Official);
+            }
+
             ManaDebug.Log("<color=red>连接成功</color>");
             ManaDebug.Log("<color=red>连接成功</color>");
         }
         }
         else
         else

+ 4 - 4
Assets/Script/Manage/ManaSign.cs

@@ -137,7 +137,7 @@ public class Sign
 
 
             ManaReso.SetActive("Bb_IconB", true);
             ManaReso.SetActive("Bb_IconB", true);
 
 
-            ManaCenter.Diamond += Diamond;
+            ManaCenter.AddDiamond(Diamond, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.Checkin);
         }
         }
         else if (Coin > 0)
         else if (Coin > 0)
         {
         {
@@ -147,7 +147,7 @@ public class Sign
 
 
             ManaReso.SetActive("Bb_IconB", true);
             ManaReso.SetActive("Bb_IconB", true);
 
 
-            ManaCenter.Coin += Coin;
+            ManaCenter.AddCoin(Coin, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.Checkin);
         }
         }
         else
         else
         {
         {
@@ -651,13 +651,13 @@ public class Lottery
 
 
         if (Type == 1)
         if (Type == 1)
         {
         {
-            ManaCenter.Coin += Value;
+            ManaCenter.AddCoin(Value, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.Checkin);
 
 
             ManaReso.SetText("Bc_Lab", Language.GetStr("UI", "Bc_Lab1") + Language.GetStr("Common", "Coin") + Value);
             ManaReso.SetText("Bc_Lab", Language.GetStr("UI", "Bc_Lab1") + Language.GetStr("Common", "Coin") + Value);
         }
         }
         else if (Type == 2)
         else if (Type == 2)
         {
         {
-            ManaCenter.Diamond += Value;
+            ManaCenter.AddDiamond(Value, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.Checkin);
 
 
             ManaReso.SetText("Bc_Lab", Language.GetStr("UI", "Bc_Lab1") + Language.GetStr("Common", "Diamond") + Value);
             ManaReso.SetText("Bc_Lab", Language.GetStr("UI", "Bc_Lab1") + Language.GetStr("Common", "Diamond") + Value);
         }
         }

+ 38 - 0
Assets/Script/Manage/ManaTutorial.cs

@@ -149,6 +149,8 @@ public class ManaTutorial : Regist
 
 
     public static void EndA1()
     public static void EndA1()
     {
     {
+        StaticsManager.GetInstance().TutoComplete("A1");
+
         Destroy(ManaReso.Get("PlayerBk1").gameObject);
         Destroy(ManaReso.Get("PlayerBk1").gameObject);
         Destroy(ManaReso.Get("PlayerBk2").gameObject);
         Destroy(ManaReso.Get("PlayerBk2").gameObject);
         Destroy(ManaReso.Get("PlayerBk3").gameObject);
         Destroy(ManaReso.Get("PlayerBk3").gameObject);
@@ -158,6 +160,8 @@ public class ManaTutorial : Regist
 
 
     public static void EndA2()
     public static void EndA2()
     {
     {
+        StaticsManager.GetInstance().TutoComplete("A2");
+
         Tutorial.HightDisable();
         Tutorial.HightDisable();
 
 
         EnterA3();
         EnterA3();
@@ -165,6 +169,8 @@ public class ManaTutorial : Regist
 
 
     public static void EndA3()
     public static void EndA3()
     {
     {
+        StaticsManager.GetInstance().TutoComplete("A3");
+
         Tutorial.HightDisable();
         Tutorial.HightDisable();
 
 
         ManaReso.SetActive("D_Quit", true);
         ManaReso.SetActive("D_Quit", true);
@@ -174,6 +180,8 @@ public class ManaTutorial : Regist
 
 
     public static void EndA4()
     public static void EndA4()
     {
     {
+        StaticsManager.GetInstance().TutoComplete("A4");
+
         Tutorial.HightDisable();
         Tutorial.HightDisable();
 
 
         EnterA5();
         EnterA5();
@@ -181,11 +189,15 @@ public class ManaTutorial : Regist
 
 
     public static void EndA5()
     public static void EndA5()
     {
     {
+        StaticsManager.GetInstance().TutoComplete("A5");
+
         EnterA6();
         EnterA6();
     }
     }
 
 
     public static void EndA6()
     public static void EndA6()
     {
     {
+        StaticsManager.GetInstance().TutoComplete("A6");
+
         Tutorial.HightDisable();
         Tutorial.HightDisable();
 
 
         EnterA7();
         EnterA7();
@@ -193,6 +205,8 @@ public class ManaTutorial : Regist
 
 
     public static void EndA7()
     public static void EndA7()
     {
     {
+        StaticsManager.GetInstance().TutoComplete("A7");
+
         Tutorial.HightDisable(0, true);
         Tutorial.HightDisable(0, true);
 
 
         EnterA8();
         EnterA8();
@@ -200,6 +214,8 @@ public class ManaTutorial : Regist
 
 
     public static void EndA8()
     public static void EndA8()
     {
     {
+        StaticsManager.GetInstance().TutoComplete("A8");
+
         Tutorial.HightDisable(0, true);
         Tutorial.HightDisable(0, true);
 
 
         EnterA9();
         EnterA9();
@@ -207,6 +223,8 @@ public class ManaTutorial : Regist
 
 
     public static void EndA()
     public static void EndA()
     {
     {
+        StaticsManager.GetInstance().TutoComplete("A");
+
         TutorialA = false;
         TutorialA = false;
 
 
         ManaAchieve.UpdateHint();
         ManaAchieve.UpdateHint();
@@ -638,11 +656,15 @@ public class ManaTutorial : Regist
 
 
     public static void EndC1()
     public static void EndC1()
     {
     {
+        StaticsManager.GetInstance().TutoComplete("C1");
+
         Tutorial.HightDisable();
         Tutorial.HightDisable();
     }
     }
 
 
     public static void EndC()
     public static void EndC()
     {
     {
+        StaticsManager.GetInstance().TutoComplete("C");
+
         TutorialC = false;
         TutorialC = false;
 
 
         ManaReso.SetActive("N_Tutorial", false);
         ManaReso.SetActive("N_Tutorial", false);
@@ -752,31 +774,43 @@ public class ManaTutorial : Regist
 
 
     public static void EndB1()
     public static void EndB1()
     {
     {
+        StaticsManager.GetInstance().TutoComplete("B1");
+
         Tutorial.HightDisable(0, false);
         Tutorial.HightDisable(0, false);
     }
     }
 
 
     public static void EndB2()
     public static void EndB2()
     {
     {
+        StaticsManager.GetInstance().TutoComplete("B2");
+
         Tutorial.HightDisable(0, false);
         Tutorial.HightDisable(0, false);
     }
     }
 
 
     public static void EndB3()
     public static void EndB3()
     {
     {
+        StaticsManager.GetInstance().TutoComplete("B3");
+
         Tutorial.HightDisable(0, false);
         Tutorial.HightDisable(0, false);
     }
     }
 
 
     public static void EndB4()
     public static void EndB4()
     {
     {
+        StaticsManager.GetInstance().TutoComplete("B4");
+
         Tutorial.HightDisable(0, false);
         Tutorial.HightDisable(0, false);
     }
     }
 
 
     public static void EndB5()
     public static void EndB5()
     {
     {
+        StaticsManager.GetInstance().TutoComplete("B5");
+
         Tutorial.HightDisable(0, false);
         Tutorial.HightDisable(0, false);
     }
     }
 
 
     public static void EndB()
     public static void EndB()
     {
     {
+        StaticsManager.GetInstance().TutoComplete("B");
+
         Tutorial.HightDisable();
         Tutorial.HightDisable();
 
 
         TutorialB = false;
         TutorialB = false;
@@ -898,6 +932,8 @@ public class ManaTutorial : Regist
 
 
     public static void EndD()
     public static void EndD()
     {
     {
+        StaticsManager.GetInstance().TutoComplete("D");
+
         TutorialD = false;
         TutorialD = false;
 
 
         ManaReso.Get("C_Main2").TweenForCG();
         ManaReso.Get("C_Main2").TweenForCG();
@@ -996,6 +1032,8 @@ public class ManaTutorial : Regist
 
 
     public static void EndE()
     public static void EndE()
     {
     {
+        StaticsManager.GetInstance().TutoComplete("E");
+
         TutorialE = false;
         TutorialE = false;
 
 
         Tutorial.HightDisable();
         Tutorial.HightDisable();

+ 1 - 1
Assets/Script/Manage/ManaUI.cs

@@ -453,7 +453,7 @@ public class ManaUI : Regist
                             }
                             }
                         );
                         );
                     },
                     },
-                    StaticsManager.ItemID.访问,
+                    StaticsManager.ItemID.参观花费,
                     StaticsManager.ConsumeModule.Shop,
                     StaticsManager.ConsumeModule.Shop,
                     false
                     false
                 );
                 );

+ 2 - 2
Assets/Script/Object/Flower.cs

@@ -557,13 +557,13 @@ public class Flower : Regist, IPointerClickHandler
 
 
             coin = Mathf.CeilToInt(Mathf.Lerp(awardMin, awardMax, Random.Range(0f, 1f)));
             coin = Mathf.CeilToInt(Mathf.Lerp(awardMin, awardMax, Random.Range(0f, 1f)));
 
 
-            ManaCenter.Coin += coin;
+            ManaCenter.AddCoin(coin, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.ClickFlower);
         }
         }
         else
         else
         {
         {
             coin = Mathf.CeilToInt((float)Auxiliary.FmlParse(CoinFml, "l", Mathf.Clamp(ManaCenter.Level, 1, Mathf.Infinity).ToString()));
             coin = Mathf.CeilToInt((float)Auxiliary.FmlParse(CoinFml, "l", Mathf.Clamp(ManaCenter.Level, 1, Mathf.Infinity).ToString()));
 
 
-            ManaCenter.Coin += coin;
+            ManaCenter.AddCoin(coin, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.ClickFlower);
             ManaCenter.FlowerCoin++;
             ManaCenter.FlowerCoin++;
         }
         }
 
 

+ 1 - 1
Assets/Script/Object/Player.cs

@@ -321,7 +321,7 @@ public class CloseUnit
 
 
                     ManaReso.Get("Pa_Info").TweenBacCG();
                     ManaReso.Get("Pa_Info").TweenBacCG();
                 },
                 },
-                StaticsManager.ItemID.服装,
+                StaticsManager.ItemID.解锁服装,
                 StaticsManager.ConsumeModule.Shop,
                 StaticsManager.ConsumeModule.Shop,
                 false
                 false
             );
             );

+ 5 - 0
Assets/Script/Object/Skill/BigSkill.cs

@@ -448,6 +448,11 @@ public class BigSkill : Skill
 
 
     protected override void Buy()
     protected override void Buy()
     {
     {
+        if (ID_ == 7)
+        {
+            StaticsManager.GetInstance().AdClicked(0);
+        }
+
         if (!ManaServer.Connect)
         if (!ManaServer.Connect)
         {
         {
             ManaReso.Get("Fg_Reconnect").TweenForCG();
             ManaReso.Get("Fg_Reconnect").TweenForCG();

+ 5 - 3
Assets/Script/Object/Skill/Pack.cs

@@ -240,10 +240,12 @@ public class Pack : SkillRoot
     {
     {
         if (!string.IsNullOrEmpty(CoinFml))
         if (!string.IsNullOrEmpty(CoinFml))
         {
         {
-            ManaCenter.Coin += Auxiliary.FmlParse(CoinFml, "l", ManaCenter.Level.ToString(), "c", ManaCenter.CoinPerson.ToString("0.000"));
+            double coin = Auxiliary.FmlParse(CoinFml, "l", ManaCenter.Level.ToString(), "c", ManaCenter.CoinPerson.ToString("0.000"));
+
+            ManaCenter.AddCoin(coin, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.Shop);
         }
         }
 
 
-        ManaCenter.Diamond += DiamondOnce;
+        ManaCenter.AddDiamond(DiamondOnce, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.Charge);
     }
     }
 
 
     protected void UseA()
     protected void UseA()
@@ -260,7 +262,7 @@ public class Pack : SkillRoot
                 }
                 }
                 else
                 else
                 {
                 {
-                    ManaCenter.Diamond += int.Parse(Diamonds[i]);
+                    ManaCenter.AddDiamond(int.Parse(Diamonds[i]), StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.Charge);
                 }
                 }
             }
             }
         }
         }

+ 11 - 3
Assets/Script/Object/Skill/Skill.cs

@@ -282,10 +282,9 @@ public class Skill : SkillRoot
     protected virtual void UseB()
     protected virtual void UseB()
     {
     {
         float temp = NewCoinOnce + ManaCenter.CoinPerson * NewCoinOnceBuff;
         float temp = NewCoinOnce + ManaCenter.CoinPerson * NewCoinOnceBuff;
-        
-        ManaCenter.Coin += temp;
-        ManaCenter.Diamond += DiamondOnce;
 
 
+        ManaCenter.AddCoin(temp, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.AD);
+        ManaCenter.AddDiamond(DiamondOnce, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.AD);
 
 
         StringBuilder sb = new StringBuilder();
         StringBuilder sb = new StringBuilder();
 
 
@@ -345,6 +344,15 @@ public class Skill : SkillRoot
 
 
     protected virtual void Buy()
     protected virtual void Buy()
     {
     {
+        if (ID_ == 5)
+        {
+            StaticsManager.GetInstance().AdClicked(1);
+        }
+        else if (ID_ == 6)
+        {
+            StaticsManager.GetInstance().AdClicked(2);
+        }
+
         ManaCenter.Pay
         ManaCenter.Pay
         (
         (
             ID,
             ID,

+ 2 - 1
Assets/Script/ThirdParty/Alipay/AlipayManager.cs

@@ -1,6 +1,7 @@
+using UnityEngine;
+
 using System.Collections;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Generic;
-using UnityEngine;
 
 
 public class AliplayManager : UnitySingleton<AliplayManager> {
 public class AliplayManager : UnitySingleton<AliplayManager> {
 
 

+ 1 - 0
Assets/Script/ThirdParty/DataEyeStatics/DataEyeGA.cs

@@ -31,6 +31,7 @@ public class DataEyeGA
         Type8 = 13,
         Type8 = 13,
         Type9 = 14,
         Type9 = 14,
         Type10 = 15,
         Type10 = 15,
+        Official = 16,
     }
     }
 
 
     public enum Gender
     public enum Gender

+ 36 - 16
Assets/Script/ThirdParty/DataEyeStatics/StaticsManager.cs

@@ -12,14 +12,6 @@ public class StaticsManager
         Reward,
         Reward,
     }
     }
 
 
-    public enum ConsumeModule
-    {
-        None,
-        Charge,
-        Shop,
-        Checkin,
-    }
-
     private static StaticsManager instance;
     private static StaticsManager instance;
     public static StaticsManager GetInstance()
     public static StaticsManager GetInstance()
     {
     {
@@ -233,14 +225,19 @@ public class StaticsManager
 
 
     public enum ItemID
     public enum ItemID
     {
     {
-        花朵,
-        服装,
-        访问,
+        None,
+        参观花费,
+        解锁花朵,
+        解锁服装,
         购买礼包,
         购买礼包,
         使用技能,
         使用技能,
         解锁技能,
         解锁技能,
         升级技能,
         升级技能,
-        提前解锁技能
+        提前解锁技能,
+        开始小游戏,
+        获得钻石,
+        获得金币,
+        获得小游戏,
     }
     }
 
 
     public enum ItemType
     public enum ItemType
@@ -250,6 +247,19 @@ public class StaticsManager
         小游戏,
         小游戏,
     }
     }
 
 
+    public enum ConsumeModule
+    {
+        None,
+        AD,
+        Charge,
+        Shop,
+        Checkin,
+        MiniGame,
+        Achieve,
+        Income,
+        ClickFlower,
+    }
+
     public static string GetStringByConsumeModule(ConsumeModule module)
     public static string GetStringByConsumeModule(ConsumeModule module)
     {
     {
         switch (module)
         switch (module)
@@ -260,6 +270,16 @@ public class StaticsManager
                 return "签到";
                 return "签到";
             case ConsumeModule.Shop:
             case ConsumeModule.Shop:
                 return "商店";
                 return "商店";
+            case ConsumeModule.MiniGame:
+                return "小游戏";
+            case ConsumeModule.Achieve:
+                return "成就";
+            case ConsumeModule.AD:
+                return "广告";
+            case ConsumeModule.Income:
+                return "收入";
+            case ConsumeModule.ClickFlower:
+                return "点花";
             default: return "未知";
             default: return "未知";
         }
         }
     }
     }
@@ -271,7 +291,7 @@ public class StaticsManager
     /// <param name="string">物品类型</param>
     /// <param name="string">物品类型</param>
     /// <param name="itemCount">物品数量</param>
     /// <param name="itemCount">物品数量</param>
     /// <param name="useReason">用途说明: 暂定显示为模块</param>
     /// <param name="useReason">用途说明: 暂定显示为模块</param>
-    public void RewardItem(int itemId, ItemType itemType, string itemCount, ConsumeModule module)
+    public void RewardItem(ItemID itemId, ItemType itemType, string itemCount, ConsumeModule module)
     {
     {
         //TODO: 如果是钻石则记录为钻石,否则全部记录为道具
         //TODO: 如果是钻石则记录为钻石,否则全部记录为道具
         if (itemType == ItemType.钻石)
         if (itemType == ItemType.钻石)
@@ -313,7 +333,7 @@ public class StaticsManager
     /// <param name="string">物品类型</param>
     /// <param name="string">物品类型</param>
     /// <param name="itemCount">物品数量</param>
     /// <param name="itemCount">物品数量</param>
     /// <param name="virtualCurrency">虚拟金额</param>
     /// <param name="virtualCurrency">虚拟金额</param>
-    public void PurchaseItem(int itemId, ItemType itemType, string itemCount, string virtualCurrency, ConsumeModule consumeModule)
+    public void PurchaseItem(ItemID itemId, ItemType itemType, string itemCount, string virtualCurrency, ConsumeModule consumeModule)
     {
     {
         DataEyeGA.BuyItem(itemId.ToString(), itemType.ToString(), itemCount, virtualCurrency, "钻石");
         DataEyeGA.BuyItem(itemId.ToString(), itemType.ToString(), itemCount, virtualCurrency, "钻石");
         //Dictionary<string, string> map = new Dictionary<string, string>();
         //Dictionary<string, string> map = new Dictionary<string, string>();
@@ -365,9 +385,9 @@ public class StaticsManager
     /// 完成引导 每完成一步调用一次
     /// 完成引导 每完成一步调用一次
     /// </summary>
     /// </summary>
     /// <param name="id">引导id</param>
     /// <param name="id">引导id</param>
-	public void TutoComplete(int id)
+	public void TutoComplete(string step)
 	{
 	{
-		DataEyeGA.CustomEvent("tuto"+id, 0, new List<KeyValuePair<string, string>>());
+		DataEyeGA.CustomEvent(step, 0, new List<KeyValuePair<string, string>>());
 	}
 	}
 
 
     /// <summary>
     /// <summary>

+ 16 - 0
Assets/Test.cs

@@ -0,0 +1,16 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Test : MonoBehaviour {
+
+	// Use this for initialization
+	void Start () {
+		
+	}
+	
+	// Update is called once per frame
+	void Update () {
+		
+	}
+}

+ 12 - 0
Assets/Test.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: e6941bbb7caf8374cab6ebb42b60c890
+timeCreated: 1501470941
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 3
ProjectSettings/GraphicsSettings.asset

@@ -43,13 +43,13 @@ GraphicsSettings:
     type: 0}
     type: 0}
   m_TierSettings_Tier1:
   m_TierSettings_Tier1:
     renderingPath: 1
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_TierSettings_Tier2:
   m_TierSettings_Tier2:
     renderingPath: 1
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_TierSettings_Tier3:
   m_TierSettings_Tier3:
     renderingPath: 1
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_DefaultRenderingPath: 1
   m_DefaultRenderingPath: 1
   m_DefaultMobileRenderingPath: 1
   m_DefaultMobileRenderingPath: 1
   m_TierSettings: []
   m_TierSettings: []

+ 0 - 2
ToList.txt

@@ -1,5 +1,3 @@
-检查所有引用了ManaCenter.Pay的地方
-
 移除AnySDK
 移除AnySDK