jet 8 年 前
コミット
bfa0c1eecf

+ 2 - 4
Assets/Script/Manage/ManaCenter.cs

@@ -773,7 +773,7 @@ public class ManaCenter : Regist
         Diamond = Diamond;
     }
 
-    public static void Pay(string id, double amt, Current current, UnityAction succeedCallback, 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)
     {
         if (ManaTutorial.PayExempt)
         {
@@ -806,7 +806,7 @@ public class ManaCenter : Regist
 
                 succeedCallback.Invoke();
 
-                StaticsManager.GetInstance().UseItem(0, StaticsManager.Item.金币, amt.ToString("0"), consumeModule);
+                StaticsManager.GetInstance().UseItem(itemId, StaticsManager.ItemType.金币, "1", consumeModule);
             }
             else
             {
@@ -874,8 +874,6 @@ public class ManaCenter : Regist
                 Diamond -= amt;
 
                 succeedCallback.Invoke();
-
-                StaticsManager.GetInstance().PurchaseItem(0, StaticsManager.Item.钻石, amt.ToString("0"), consumeModule);
             }
             else
             {

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

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

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

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

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

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

+ 3 - 0
Assets/Script/Object/Skill/Ability.cs

@@ -426,6 +426,7 @@ public class Ability : SkillRoot
                     UnlockTab();
                 }
             },
+            StaticsManager.ItemID.解锁技能, 
             StaticsManager.ConsumeModule.Shop
         );
     }
@@ -538,6 +539,7 @@ public class Ability : SkillRoot
                     ManaCenter.Level++;
                 }
             },
+            StaticsManager.ItemID.升级技能,
             StaticsManager.ConsumeModule.Shop
         );
     }
@@ -562,6 +564,7 @@ public class Ability : SkillRoot
                     ItemStatus = SkillStatus.UnLock;
                 }
             },
+            StaticsManager.ItemID.提前解锁技能,
             StaticsManager.ConsumeModule.Shop
         );
     }

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

@@ -398,6 +398,7 @@ public class BigSkill : Skill
 
                 BarBk1.material = null;
             },
+            StaticsManager.ItemID.解锁技能,
             StaticsManager.ConsumeModule.Shop
         );
     }
@@ -439,6 +440,7 @@ public class BigSkill : Skill
                     UseA();
                 }
             },
+            StaticsManager.ItemID.升级技能,
             StaticsManager.ConsumeModule.Shop
         );
     }
@@ -473,6 +475,7 @@ public class BigSkill : Skill
 
                 ManaInfo.Show(string.Format("{0}{1}", Language.GetStr("UI", "J_Info1"), Language.GetStr("SkillName", ID)), 10f);
             },
+            StaticsManager.ItemID.使用技能,
             StaticsManager.ConsumeModule.Shop
         );
     }
@@ -608,6 +611,7 @@ public class BigSkill : Skill
                     ItemStatus = SkillStatus.UnLock;
                 }
             },
+            StaticsManager.ItemID.提前解锁技能,
             StaticsManager.ConsumeModule.Shop
         );
     }

+ 1 - 1
Assets/Script/Object/Skill/Pack.cs

@@ -321,7 +321,7 @@ public class Pack : SkillRoot
     {
         ManaAudio.PlayClip(Clip.BtnClip);
 
-        ManaCenter.Pay(ID, UseAmt, BuyCur, PurchaseResult, StaticsManager.ConsumeModule.Charge);
+        ManaCenter.Pay(ID, UseAmt, BuyCur, PurchaseResult, StaticsManager.ItemID.购买礼包,  StaticsManager.ConsumeModule.Charge);
     }
 
     protected void PurchaseResult()

+ 2 - 0
Assets/Script/Object/Skill/Skill.cs

@@ -366,6 +366,7 @@ public class Skill : SkillRoot
 
                 ManaInfo.Show(string.Format("{0}{1}", Language.GetStr("UI", "J_Info1"), Language.GetStr("SkillName", ID)), 10f);
             },
+            StaticsManager.ItemID.使用技能, 
             StaticsManager.ConsumeModule.Shop
         );
     }
@@ -447,6 +448,7 @@ public class Skill : SkillRoot
 
                 ItemStatus = SkillStatus.Buy;
             },
+            StaticsManager.ItemID.提前解锁技能, 
             StaticsManager.ConsumeModule.Shop
         );
     }

+ 2 - 2
Assets/Script/ThirdParty/DataEyeStatics/DataEyeGA.cs

@@ -230,7 +230,7 @@ public class DataEyeGA
     /// <param name="itemCnt">购买的道具数量</param>
     /// <param name="coinNum">消耗虚拟币数量</param>
     /// <param name="coinType">虚拟币种类</param>
-    public static void BuyItem(string itemId, string itemType, string itemCnt, int coinNum, string coinType)
+    public static void BuyItem(string itemId, string itemType, string itemCnt, string coinNum, string coinType)
     {
         if(!CheckIsInited())
             return;
@@ -239,7 +239,7 @@ public class DataEyeGA
         paramList.Add(new KeyValuePair<string, string>("itemId", itemId));
         paramList.Add(new KeyValuePair<string, string>("itemType", itemType));
         paramList.Add(new KeyValuePair<string, string>("itemCnt", itemCnt));
-        paramList.Add(new KeyValuePair<string, string>("coinNum", coinNum.ToString()));
+        paramList.Add(new KeyValuePair<string, string>("coinNum", coinNum));
         paramList.Add(new KeyValuePair<string, string>("coinType", coinType));
         paramList.Add(new KeyValuePair<string, string>("msgTime", DateUtil.GetCurrentTimeByStandardTime().ToString()));
         SendUrl(RequestType.BuyItem, paramList);

+ 14 - 2
Assets/Script/ThirdParty/DataEyeStatics/StaticsManager.cs

@@ -231,6 +231,18 @@ public class StaticsManager
 
 
 
+    public enum ItemID
+    {
+        花朵,
+        服装,
+        访问,
+        购买礼包,
+        使用技能,
+        解锁技能,
+        升级技能,
+        提前解锁技能
+    }
+
     public enum ItemType
     {
         金币,
@@ -282,7 +294,7 @@ public class StaticsManager
     /// <param name="itemType">物品类型</param>
     /// <param name="itemCount">物品数量</param>
     /// <param name="useReason">用途说明: 暂定显示为模块</param>
-    public void UseItem(int itemId, ItemType itemType, string itemCount, ConsumeModule module)
+    public void UseItem(ItemID itemId, ItemType itemType, string itemCount, ConsumeModule module)
     {
         DataEyeGA.UseItem(itemId.ToString(), itemType.ToString(), itemCount, GetStringByConsumeModule(module));
         //Dictionary<string, string> map = new Dictionary<string, string>();
@@ -301,7 +313,7 @@ public class StaticsManager
     /// <param name="string">物品类型</param>
     /// <param name="itemCount">物品数量</param>
     /// <param name="virtualCurrency">虚拟金额</param>
-    public void PurchaseItem(int itemId, ItemType itemType, string itemCount, int virtualCurrency, ConsumeModule consumeModule)
+    public void PurchaseItem(int itemId, ItemType itemType, string itemCount, string virtualCurrency, ConsumeModule consumeModule)
     {
         DataEyeGA.BuyItem(itemId.ToString(), itemType.ToString(), itemCount, virtualCurrency, "钻石");
         //Dictionary<string, string> map = new Dictionary<string, string>();

+ 3 - 3
ProjectSettings/GraphicsSettings.asset

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

+ 2 - 0
ToList.txt

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