Temp

Assets/Advertisements/Editor/Resources/iOS/builds.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: f533cc2da3e36884f93fdd5dc9124f8c
-folderAsset: yes
-timeCreated: 1494301205
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Resource/Prefab/Object/DebugMode.prefab

@@ -69,7 +69,6 @@ MonoBehaviour:
   - {fileID: 1218039672979224, guid: 78146b79fe2f18c4bab8b0c9a6a0a04a, type: 2}
   - {fileID: 1846155164804538, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17, type: 2}
   - {fileID: 1988003470994862, guid: ed63e319067658f48b0c72b655552450, type: 2}
-  - {fileID: 21300000, guid: b813046556cad144a8d802561e852941, type: 3}
   - {fileID: 1424904125323438, guid: c176e58cecd9fd5428a8498de87375a2, type: 2}
   - {fileID: 21300000, guid: ee6655093ea65d94b8e4e21f6c532fe8, type: 3}
   - {fileID: 1530314730688346, guid: aefbbfee089a9964e9b377589692f48c, type: 2}
@@ -289,6 +288,8 @@ MonoBehaviour:
   - {fileID: 4900000, guid: 55c5db2c9a211884895cd4df0dc4dc96, type: 3}
   - {fileID: 4900000, guid: 8f38b94956f16c64f9bd76a51d82dc3f, type: 3}
   - {fileID: 4900000, guid: c73fc4d1ada1ad744ba552dd68b77db2, type: 3}
+  - {fileID: 4900000, guid: 075016097d3fe144aad23832fbad02d2, type: 3}
+  - {fileID: 4900000, guid: 68a23da1aaa13bd40b898e3011d11f96, type: 3}
   DiscardList:
   - {fileID: 1422722603004606, guid: f66999d8c3be4ff46b7dbde0417af018, type: 2}
   - {fileID: 1178346060137818, guid: e2d62becad3f170428db59673f313354, type: 2}

Assets/Resource/XML/Config/achieve_config.xml

@@ -73,6 +73,18 @@
   <item id="224" index="12" name="积少成多-4" desc="收集花园里的金币600次" type="12" value="1000" parent="223" del="1" diamond_once="25" coin_person="" person="" icon="绿-金币包3" />
   <item id="225" index="12" name="积少成多-5" desc="收集花园里的金币1000次" type="12" value="5000" parent="224" del="1" diamond_once="40" coin_person="" person="" icon="绿-金币包3" />
   <item id="226" index="12" name="积少成多-6" desc="收集花园里的金币2500次" type="12" value="10000" parent="225" del="0" diamond_once="50" coin_person="" person="" icon="绿-金币包3" />
+  <item id="241" index="13" name="花费的钻石-1" desc="" type="13" value="10" parent="" del="1" diamond_once="10" coin_person="" person="" icon="绿-金币包3" />
+  <item id="242" index="13" name="花费的钻石-2" desc="" type="13" value="20" parent="241" del="1" diamond_once="15" coin_person="" person="" icon="绿-金币包3" />
+  <item id="243" index="13" name="花费的钻石-3" desc="" type="13" value="30" parent="242" del="1" diamond_once="20" coin_person="" person="" icon="绿-金币包3" />
+  <item id="244" index="13" name="花费的钻石-4" desc="" type="13" value="40" parent="243" del="1" diamond_once="25" coin_person="" person="" icon="绿-金币包3" />
+  <item id="245" index="13" name="花费的钻石-5" desc="" type="13" value="50" parent="244" del="1" diamond_once="40" coin_person="" person="" icon="绿-金币包3" />
+  <item id="246" index="13" name="花费的钻石-6" desc="" type="13" value="60" parent="245" del="0" diamond_once="50" coin_person="" person="" icon="绿-金币包3" />
+  <item id="261" index="14" name="拥有的服装-1" desc="" type="14" value="2" parent="" del="1" diamond_once="10" coin_person="" person="" icon="绿-金币包3" />
+  <item id="262" index="14" name="拥有的服装-2" desc="" type="14" value="4" parent="261" del="1" diamond_once="15" coin_person="" person="" icon="绿-金币包3" />
+  <item id="263" index="14" name="拥有的服装-3" desc="" type="14" value="6" parent="262" del="1" diamond_once="20" coin_person="" person="" icon="绿-金币包3" />
+  <item id="264" index="14" name="拥有的服装-4" desc="" type="14" value="8" parent="263" del="1" diamond_once="25" coin_person="" person="" icon="绿-金币包3" />
+  <item id="265" index="14" name="拥有的服装-5" desc="" type="14" value="10" parent="264" del="1" diamond_once="40" coin_person="" person="" icon="绿-金币包3" />
+  <item id="266" index="14" name="拥有的服装-6" desc="" type="14" value="12" parent="265" del="0" diamond_once="50" coin_person="" person="" icon="绿-金币包3" />
   <comment>
     <id>
 

Assets/Resource/XML/Config/iap_config.xml

@@ -0,0 +1,30 @@
+<data>
+  <item id="1" item_id="com.dashgame.garden.packfresh" price="6" reward="pack,4" desc="新手礼包" skill_id="Pack4" />
+  <item id="2" item_id="com.dashgame.garden.packjunior" price="30" reward="pack,5" desc="中级礼包" skill_id="Pack5" />
+  <item id="3" item_id="com.dashgame.garden.packsenior" price="68" reward="pack,6" desc="高级礼包" skill_id="Pack6" />
+  <item id="4" item_id="com.dashgame.garden.diamond100" price="6" reward="pack,7" desc="钻石100" skill_id="Pack7" />
+  <item id="5" item_id="com.dashgame.garden.diamond500" price="30" reward="pack,8" desc="钻石500 赠送50" skill_id="Pack8" />
+  <item id="6" item_id="com.dashgame.garden.diamond2000" price="68" reward="pack,9" desc="钻石2000 赠送500" skill_id="Pack9" />
+  <item id="7" item_id="com.dashgame.garden.diamond6000" price="128" reward="pack,10" desc="钻石6000 赠送600" skill_id="Pack10" />
+  <item id="8" item_id="com.dashgame.garden.diamond10000" price="328" reward="pack,11" desc="钻石10000 赠送2000" skill_id="Pack11" />
+  <comment>
+    <id>
+编号
+</id>
+    <item_id>
+商品id
+</item_id>
+    <price>
+价格
+</price>
+    <reward>
+奖励字符串
+</reward>
+    <desc>
+描述
+</desc>
+    <skill_id>
+技能id
+</skill_id>
+  </comment>
+</data>

Assets/Resource/XML/Config/iap_config.xml.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 075016097d3fe144aad23832fbad02d2
+timeCreated: 1501567791
+licenseType: Pro
+TextScriptImporter:
+  userData: 
+  assetBundleName: config
+  assetBundleVariant: 

Assets/Resource/XML/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="680" />
+  <Version value="681" />
 
   <ID value="Default" />
   <TutorialA value="1" />
@@ -32,7 +32,7 @@
   <FlowerList value="1" />
   <AchieveList value="" />
   <DressData Head="" Dress="" Shoe="" HeadWear="" Top="" Eye="" Mouse="" Wing="Empty"/>
-  <AchieveData AD="0" Skill="0" Sign="0" Share="0" ElfLevel="0" MiniGame="0" FlowerCoin="0" TotalPerson="0"/>
+  <AchieveData AD="0" Skill="0" Sign="0" Share="0" ElfLevel="0" MiniGame="0" FlowerCoin="0" TotalPerson="0" CostDiamond="0"/>
 
   <SkillList>
     <Skill ID="Skill4" SkillType="Skill" ItemStatus="Lock" Level="0" CoolTimer="0" UseTimer="0" />

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -335,6 +335,18 @@
     <Achieve224 desc=""><![CDATA[积少成多-4]]></Achieve224>
     <Achieve225 desc=""><![CDATA[积少成多-5]]></Achieve225>
     <Achieve226 desc=""><![CDATA[积少成多-6]]></Achieve226>
+    <Achieve241 desc=""><![CDATA[花费的钻石-1]]></Achieve241>
+    <Achieve242 desc=""><![CDATA[花费的钻石-2]]></Achieve242>
+    <Achieve243 desc=""><![CDATA[花费的钻石-3]]></Achieve243>
+    <Achieve244 desc=""><![CDATA[花费的钻石-4]]></Achieve244>
+    <Achieve245 desc=""><![CDATA[花费的钻石-5]]></Achieve245>
+    <Achieve246 desc=""><![CDATA[花费的钻石-6]]></Achieve246>
+    <Achieve261 desc=""><![CDATA[拥有的服装-1]]></Achieve261>
+    <Achieve262 desc=""><![CDATA[拥有的服装-2]]></Achieve262>
+    <Achieve263 desc=""><![CDATA[拥有的服装-3]]></Achieve263>
+    <Achieve264 desc=""><![CDATA[拥有的服装-4]]></Achieve264>
+    <Achieve265 desc=""><![CDATA[拥有的服装-5]]></Achieve265>
+    <Achieve266 desc=""><![CDATA[拥有的服装-6]]></Achieve266>
   </AchieveName>
   <AchieveDesc>
     <Achieve1 desc=""><![CDATA[花园等级达到 [&value&]]]></Achieve1>
@@ -411,6 +423,18 @@
     <Achieve224 desc=""><![CDATA[收集花园里的金币[&value&]次]]></Achieve224>
     <Achieve225 desc=""><![CDATA[收集花园里的金币[&value&]次]]></Achieve225>
     <Achieve226 desc=""><![CDATA[收集花园里的金币[&value&]次]]></Achieve226>
+    <Achieve241 desc=""><![CDATA[花费钻石[&value&]]]></Achieve241>
+    <Achieve242 desc=""><![CDATA[花费钻石[&value&]]]></Achieve242>
+    <Achieve243 desc=""><![CDATA[花费钻石[&value&]]]></Achieve243>
+    <Achieve244 desc=""><![CDATA[花费钻石[&value&]]]></Achieve244>
+    <Achieve245 desc=""><![CDATA[花费钻石[&value&]]]></Achieve245>
+    <Achieve246 desc=""><![CDATA[花费钻石[&value&]]]></Achieve246>
+    <Achieve261 desc=""><![CDATA[拥有[&value&]件服装]]></Achieve261>
+    <Achieve262 desc=""><![CDATA[拥有[&value&]件服装]]></Achieve262>
+    <Achieve263 desc=""><![CDATA[拥有[&value&]件服装]]></Achieve263>
+    <Achieve264 desc=""><![CDATA[拥有[&value&]件服装]]></Achieve264>
+    <Achieve265 desc=""><![CDATA[拥有[&value&]件服装]]></Achieve265>
+    <Achieve266 desc=""><![CDATA[拥有[&value&]件服装]]></Achieve266>
   </AchieveDesc>
   <IAP>
     <LoadAd desc=""><![CDATA[广告加载中,请稍后再试]]></LoadAd>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -335,6 +335,18 @@
     <Achieve224 desc=""><![CDATA[積少成多-4]]></Achieve224>
     <Achieve225 desc=""><![CDATA[積少成多-5]]></Achieve225>
     <Achieve226 desc=""><![CDATA[積少成多-6]]></Achieve226>
+    <Achieve241 desc=""><![CDATA[]]></Achieve241>
+    <Achieve242 desc=""><![CDATA[]]></Achieve242>
+    <Achieve243 desc=""><![CDATA[]]></Achieve243>
+    <Achieve244 desc=""><![CDATA[]]></Achieve244>
+    <Achieve245 desc=""><![CDATA[]]></Achieve245>
+    <Achieve246 desc=""><![CDATA[]]></Achieve246>
+    <Achieve261 desc=""><![CDATA[]]></Achieve261>
+    <Achieve262 desc=""><![CDATA[]]></Achieve262>
+    <Achieve263 desc=""><![CDATA[]]></Achieve263>
+    <Achieve264 desc=""><![CDATA[]]></Achieve264>
+    <Achieve265 desc=""><![CDATA[]]></Achieve265>
+    <Achieve266 desc=""><![CDATA[]]></Achieve266>
   </AchieveName>
   <AchieveDesc>
     <Achieve1 desc=""><![CDATA[花園等級達到 [&value&]]]></Achieve1>
@@ -411,6 +423,18 @@
     <Achieve224 desc=""><![CDATA[收集花園裡的金幣[&value&]次]]></Achieve224>
     <Achieve225 desc=""><![CDATA[收集花園裡的金幣[&value&]次]]></Achieve225>
     <Achieve226 desc=""><![CDATA[收集花園裡的金幣[&value&]次]]></Achieve226>
+    <Achieve241 desc=""><![CDATA[]]></Achieve241>
+    <Achieve242 desc=""><![CDATA[]]></Achieve242>
+    <Achieve243 desc=""><![CDATA[]]></Achieve243>
+    <Achieve244 desc=""><![CDATA[]]></Achieve244>
+    <Achieve245 desc=""><![CDATA[]]></Achieve245>
+    <Achieve246 desc=""><![CDATA[]]></Achieve246>
+    <Achieve261 desc=""><![CDATA[]]></Achieve261>
+    <Achieve262 desc=""><![CDATA[]]></Achieve262>
+    <Achieve263 desc=""><![CDATA[]]></Achieve263>
+    <Achieve264 desc=""><![CDATA[]]></Achieve264>
+    <Achieve265 desc=""><![CDATA[]]></Achieve265>
+    <Achieve266 desc=""><![CDATA[]]></Achieve266>
   </AchieveDesc>
   <IAP>
     <LoadAd desc=""><![CDATA[廣告加載中,請稍後再試]]></LoadAd>

Assets/Resource/XML/lan/English.xml

@@ -335,6 +335,18 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack6>
     <Achieve224 desc=""><![CDATA[Add Up 4]]></Achieve224>
     <Achieve225 desc=""><![CDATA[Add Up 5]]></Achieve225>
     <Achieve226 desc=""><![CDATA[Add Up 6]]></Achieve226>
+    <Achieve241 desc=""><![CDATA[]]></Achieve241>
+    <Achieve242 desc=""><![CDATA[]]></Achieve242>
+    <Achieve243 desc=""><![CDATA[]]></Achieve243>
+    <Achieve244 desc=""><![CDATA[]]></Achieve244>
+    <Achieve245 desc=""><![CDATA[]]></Achieve245>
+    <Achieve246 desc=""><![CDATA[]]></Achieve246>
+    <Achieve261 desc=""><![CDATA[]]></Achieve261>
+    <Achieve262 desc=""><![CDATA[]]></Achieve262>
+    <Achieve263 desc=""><![CDATA[]]></Achieve263>
+    <Achieve264 desc=""><![CDATA[]]></Achieve264>
+    <Achieve265 desc=""><![CDATA[]]></Achieve265>
+    <Achieve266 desc=""><![CDATA[]]></Achieve266>
   </AchieveName>
   <AchieveDesc>
     <Achieve1 desc=""><![CDATA[Garden Level [&value&]]]></Achieve1>
@@ -411,6 +423,18 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack6>
     <Achieve224 desc=""><![CDATA[Tap Coins in garden [&value&] times]]></Achieve224>
     <Achieve225 desc=""><![CDATA[Tap Coins in garden [&value&] times]]></Achieve225>
     <Achieve226 desc=""><![CDATA[Tap Coins in garden [&value&] times]]></Achieve226>
+    <Achieve241 desc=""><![CDATA[]]></Achieve241>
+    <Achieve242 desc=""><![CDATA[]]></Achieve242>
+    <Achieve243 desc=""><![CDATA[]]></Achieve243>
+    <Achieve244 desc=""><![CDATA[]]></Achieve244>
+    <Achieve245 desc=""><![CDATA[]]></Achieve245>
+    <Achieve246 desc=""><![CDATA[]]></Achieve246>
+    <Achieve261 desc=""><![CDATA[]]></Achieve261>
+    <Achieve262 desc=""><![CDATA[]]></Achieve262>
+    <Achieve263 desc=""><![CDATA[]]></Achieve263>
+    <Achieve264 desc=""><![CDATA[]]></Achieve264>
+    <Achieve265 desc=""><![CDATA[]]></Achieve265>
+    <Achieve266 desc=""><![CDATA[]]></Achieve266>
   </AchieveDesc>
   <IAP>
     <LoadAd desc=""><![CDATA[AD is loading, please try again later]]></LoadAd>

Assets/Advertisements/Editor/Resources/Android/builds.meta → Assets/Resource/Xlsx/iap_config.xlsx.meta

@@ -1,7 +1,6 @@
 fileFormatVersion: 2
-guid: 8d2d384f78b29a44a9c70c3daf45d1cb
-folderAsset: yes
-timeCreated: 1494301205
+guid: 1de472b03f93e3a41819a4e932c5aa70
+timeCreated: 1501567465
 licenseType: Pro
 DefaultImporter:
   userData: 

Assets/Script/Editor/EditorPlayerBuilder.cs

@@ -7,7 +7,9 @@ using System.Collections.Generic;
 
 public class BuildForAllPlatforms : EditorWindow
 {
-	private static int versionCode = 1;
+    private static PayChannel PayChannel;
+
+    private static int versionCode = 1;
 	private static string version = "1.0.0";
 	private static string gameName = "MyLovelyGarden";
 	private static string companyName = "DashGame Technology Inc.";
@@ -40,6 +42,17 @@ public class BuildForAllPlatforms : EditorWindow
 		version = EditorGUILayout.TextField("Version", version);
         versionCode = int.Parse(EditorGUILayout.TextField("VersionCode", versionCode.ToString()));
 
+        PayChannel = (PayChannel) EditorGUILayout.EnumPopup(PayChannel);
+
+        if (PayChannel == PayChannel.AliPay)
+        {
+            File.WriteAllText(Application.dataPath + "/Script/Editor/Setting.txt", "AliPay");
+        }
+        else if (PayChannel == PayChannel.UnityIAP)
+        {
+            File.WriteAllText(Application.dataPath + "/Script/Editor/Setting.txt", "UnityIAP");
+        }
+
 		if (GUILayout.Button("Android", GUILayout.Height(30)))
             BuildAndroid();
         if (GUILayout.Button("iOS", GUILayout.Height(30)))

Assets/Script/Editor/Setting.txt

@@ -0,0 +1 @@
+AliPay

Assets/Script/Editor/Setting.txt.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 68a23da1aaa13bd40b898e3011d11f96
+timeCreated: 1501571126
+licenseType: Pro
+TextScriptImporter:
+  userData: 
+  assetBundleName: config
+  assetBundleVariant: 

Assets/Script/Manage/Initializer.cs

@@ -27,6 +27,19 @@ public class Initializer : MonoBehaviour
 
     private void Awake()
     {
+        if (Application.platform == RuntimePlatform.IPhonePlayer)
+        {
+            DataEyeGA.Init("C5790DBD2CFE97BD18C7BE9A95482C05", DataEyeGA.PlatformType.IOS, "Official", "IOS");
+        }
+        else if (Application.isMobilePlatform)
+        {
+            DataEyeGA.Init("ADE884FAAF61A2CB45B02431A70932B8", DataEyeGA.PlatformType.ADR, "Official", "Android");
+        }
+        else if (Application.isEditor)
+        {
+            DataEyeGA.Init("ADE884FAAF61A2CB45B02431A70932B8", DataEyeGA.PlatformType.WP, "Official", "Windows");
+        }
+
         Application.targetFrameRate = 60;
 
         DontDestroyOnLoad(gameObject);

Assets/Script/Manage/ManaAchieve.cs

@@ -20,6 +20,7 @@ public enum AchieveType
     AdAmt,
     SkillAmt,
     SignAmt,
+    CloseAmt,
     ShareAmt,
     FlowerAmt,
     MiniGameAmt,
@@ -27,6 +28,8 @@ public enum AchieveType
     TotalCoin,
     FlowerCoin,
     CurrentCoin,
+
+    CostDiamond,
 }
 
 public class Achieve
@@ -254,6 +257,14 @@ public class Achieve
         {
             UpdateStatus(ManaCenter.Coin);
         }
+        else if (AchieveType == AchieveType.CostDiamond)
+        {
+            UpdateStatus(ManaCenter.CostDiamond);
+        }
+        else if (AchieveType == AchieveType.CloseAmt)
+        {
+            UpdateStatus(ManaCenter.CloseAmt);
+        }
         else
         {
             throw new Exception();
@@ -413,6 +424,14 @@ public class Achieve
         {
             return AchieveType.FlowerCoin;
         }
+        else if (integer == 13)
+        {
+            return AchieveType.CostDiamond;
+        }
+        else if (integer == 14)
+        {
+            return AchieveType.CloseAmt;
+        }
         else
         {
             throw new Exception();

Assets/Script/Manage/ManaCenter.cs

@@ -47,6 +47,16 @@ public class ManaCenter : Regist
             ManaAchieve.UpdateStatus(AchieveType.SignAmt, SignAmt_);
         }
     }
+    public static double CloseAmt
+    {
+        get { return CloseAmt_; }
+        set
+        {
+            CloseAmt_ = value;
+
+            ManaAchieve.UpdateStatus(AchieveType.CloseAmt, CloseAmt_);
+        }
+    }
     public static double ShareAmt
     {
         get { return ShareAmt_; }
@@ -107,16 +117,28 @@ public class ManaCenter : Regist
             ManaAchieve.UpdateStatus(AchieveType.TotalPerson, TotalPerson_);
         }
     }
+    public static double CostDiamond
+    {
+        get { return CostDiamond_; }
+        set
+        {
+            CostDiamond_ = value;
+
+            ManaAchieve.UpdateStatus(AchieveType.CostDiamond, CostDiamond_);
+        }
+    }
 
     private static double AdAmt_;
     private static double SkillAmt_;
     private static double SignAmt_;
+    private static double CloseAmt_;
     private static double ShareAmt_;
     private static double MiniGameAmt_;
     private static double ElfLevel_;
     private static double TotalCoin_;
     private static double FlowerCoin_;
     private static double TotalPerson_;
+    private static double CostDiamond_;
 
     #endregion
 
@@ -662,6 +684,7 @@ public class ManaCenter : Regist
         ShareAmt = dataList[3];
         FlowerCoin = dataList[6];
         TotalPerson = dataList[7];
+        CostDiamond = dataList[8];
         MiniGameAmt = dataList[5];
     }
 
@@ -887,6 +910,8 @@ public class ManaCenter : Regist
             {
                 Diamond -= amt;
 
+                CostDiamond += amt;
+
                 succeedCallback.Invoke();
 
                 StaticsManager.GetInstance().PurchaseItem(itemId, StaticsManager.ItemType.钻石, "1", amt.ToString("0"), consumeModule);

Assets/Script/Manage/ManaData.cs

@@ -420,6 +420,7 @@ public class ManaData : Regist
         PlayerNode.SelectSingleNode("AchieveData").Attributes[5].Value = ManaCenter.MiniGameAmt.ToString("0");
         PlayerNode.SelectSingleNode("AchieveData").Attributes[6].Value = ManaCenter.FlowerCoin.ToString("0");
         PlayerNode.SelectSingleNode("AchieveData").Attributes[7].Value = ManaCenter.TotalPerson.ToString("0");
+        PlayerNode.SelectSingleNode("AchieveData").Attributes[8].Value = ManaCenter.CostDiamond.ToString("0");
     }
 
     public static void SavePlantList()
@@ -694,6 +695,7 @@ public class ManaData : Regist
         dataList.Add(double.Parse(PlayerNode.SelectSingleNode("AchieveData").Attributes[5].Value));
         dataList.Add(double.Parse(PlayerNode.SelectSingleNode("AchieveData").Attributes[6].Value));
         dataList.Add(double.Parse(PlayerNode.SelectSingleNode("AchieveData").Attributes[7].Value));
+        dataList.Add(double.Parse(PlayerNode.SelectSingleNode("AchieveData").Attributes[8].Value));
 
         return dataList;
     }
@@ -776,6 +778,29 @@ public class ManaData : Regist
         return xmlNode.Attributes;
     }
 
+    public static List<XmlAttributeCollection> GetIAPConfig()
+    {
+        TextAsset textAsset;
+        XmlNodeList xmlNodeList;
+
+        XmlDocument xmlDoc = new XmlDocument();
+        List<XmlAttributeCollection> attributeList = new List<XmlAttributeCollection>();
+
+
+        textAsset = ManaReso.Load<TextAsset>("iap_config", Folder.Config);
+
+        xmlDoc.LoadXml(textAsset.text);
+
+        xmlNodeList = xmlDoc.SelectSingleNode("data").SelectNodes("item");
+
+        for (int i = 0; i < xmlNodeList.Count; i++)
+        {
+            attributeList.Add(xmlNodeList[i].Attributes);
+        }
+
+        return attributeList;
+    }
+
     public static List<XmlAttributeCollection> GetSkillConfig()
     {
         TextAsset textAsset;
@@ -924,17 +949,17 @@ public class ManaData : Regist
 
     public static XmlDocument MergeXML(int nativeVersion, XmlDocument nativeDoc, XmlDocument defaultDoc)
     {
-        if (nativeVersion < 680)
+        if (nativeVersion < 681)
         {
             Debug.LogWarning("UpdateArchive");
 
-            To680(nativeDoc, defaultDoc);
+            To681(nativeDoc, defaultDoc);
         }
 
         return nativeDoc;
     }
 
-    public static XmlDocument To680(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    public static XmlDocument To681(XmlDocument nativeDoc, XmlDocument defaultDoc)
     {
         string playerType = "";
         XmlNode xmlNode1 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("DressList");
@@ -944,6 +969,7 @@ public class ManaData : Regist
         XmlNode xmlNode5 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Player");
         XmlNode xmlNode6 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("TutorialE");
         XmlNode xmlNode7 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("TutorialIndexE");
+        XmlNode xmlNode8 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("AchieveData");
 
         if (xmlNode1 != null)
         {
@@ -986,8 +1012,13 @@ public class ManaData : Regist
             nativeDoc.SelectSingleNode("PlayerConfig").RemoveChild(xmlNode7);
         }
 
+        if (xmlNode8 != null)
+        {
+            nativeDoc.SelectSingleNode("PlayerConfig").RemoveChild(xmlNode8);
+        }
+
 
-        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 680.ToString();
+        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 681.ToString();
 
         xmlNode1 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("DressList");
         xmlNode2 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("DressData");
@@ -996,6 +1027,7 @@ public class ManaData : Regist
         xmlNode5 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Player");
         xmlNode6 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("TutorialE");
         xmlNode7 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("TutorialIndexE");
+        xmlNode8 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("AchieveData");
 
         if (playerType == "PlayerBlond")
         {
@@ -1038,6 +1070,7 @@ public class ManaData : Regist
         nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode5, true));
         nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode6, true));
         nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode7, true));
+        nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode8, true));
 
 
         xmlNode1 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("SkillList");

Assets/Script/Manage/ManaIAP.cs

@@ -12,18 +12,26 @@ using System.IO;
 using System.Collections;
 using System.Collections.Generic;
 
+public enum PayChannel
+{
+    AliPay,
+    UnityIAP,
+}
+
 public class ManaIAP : MonoBehaviour, IStoreListener
 {
     #region 变量
 
     public static bool Complete;
     public static ManaIAP Instance;
+    public static PayChannel PayChannel;
     public static UnityAction AdAction;
     public static IStoreController IStoreController;
     public static IExtensionProvider IExtensionProvider;
 
     public static List<string> ProductList = new List<string>();
-    public static Dictionary<string, UnityAction> ProductDic = new Dictionary<string, UnityAction>();
+    public static Dictionary<string, string> ProductIdDic = new Dictionary<string, string>();
+    public static Dictionary<string, UnityAction> ProductActionDic = new Dictionary<string, UnityAction>();
 
     #region Share配置
 
@@ -54,10 +62,6 @@ public class ManaIAP : MonoBehaviour, IStoreListener
         InitializeShare();
 
         GameObject.Find("I_Lab").GetComponent<Text>().text = "Share";
-
-        InitializeDataEyeGA();
-
-        GameObject.Find("I_Lab").GetComponent<Text>().text = "DataEyeGA";
     }
 
     public static void InitializeAD()
@@ -75,30 +79,61 @@ public class ManaIAP : MonoBehaviour, IStoreListener
             Advertisement.Initialize("1408493", false);
         }
 
-        //初始化vungle
-        VungleAdsManager.Instance.Init(()=>{
-            AdAction.Invoke();
+        if (!Application.isEditor)
+        {
+            //初始化vungle
+            VungleAdsManager.Instance.Init(() =>
+            {
+                AdAction.Invoke();
 
-            ManaCenter.AdAmt++;
-        });
+                ManaCenter.AdAmt++;
+            });
 
-        //初始化OneWay
-        OneWayAdsManager.Instance.Init(()=>{
-            AdAction.Invoke();
+            //初始化OneWay
+            OneWayAdsManager.Instance.Init(() =>
+            {
+                AdAction.Invoke();
 
-            ManaCenter.AdAmt++;
-        });
+                ManaCenter.AdAmt++;
+            });
+        }
     }
 
     public static void InitializeIAP()
     {
-        ConfigurationBuilder cb = ConfigurationBuilder.Instance(StandardPurchasingModule.Instance());
-        
-        cb.AddProduct("Test", ProductType.Consumable);
+        if (Application.isEditor)
+        {
+            return;
+        }
+
+        PayChannel = ManaReso.Load<TextAsset>("Setting", Folder.Config).text.ToEnum<PayChannel>();
+
+        if (PayChannel == PayChannel.AliPay)
+        {
+            foreach (var attribute in ManaData.GetIAPConfig())
+            {
+                ProductList.Add(attribute[1].Value);
 
-        ProductList.Add("Test");
+                ProductIdDic.Add(attribute[5].Value, attribute[1].Value);
+            }
+
+            AliplayManager.Instance.Init();
+        }
+        else if (PayChannel == PayChannel.UnityIAP)
+        {
+            ConfigurationBuilder cb = ConfigurationBuilder.Instance(StandardPurchasingModule.Instance());
+
+            foreach (var attribute in ManaData.GetIAPConfig())
+            {
+                cb.AddProduct(attribute[1].Value, ProductType.Consumable);
 
-        UnityPurchasing.Initialize(Instance, cb);
+                ProductList.Add(attribute[1].Value);
+
+                ProductIdDic.Add(attribute[5].Value, attribute[1].Value);
+            }
+
+            UnityPurchasing.Initialize(Instance, cb);
+        }
     }
 
     public static void InitializeShare()
@@ -113,22 +148,6 @@ public class ManaIAP : MonoBehaviour, IStoreListener
         }
     }
 
-    public static void InitializeDataEyeGA()
-    {
-        if (Application.platform == RuntimePlatform.IPhonePlayer)
-        {
-            DataEyeGA.Init("C5790DBD2CFE97BD18C7BE9A95482C05", DataEyeGA.PlatformType.IOS, "Official", "IOS");
-        }
-        else if (Application.isMobilePlatform)
-        {
-            DataEyeGA.Init("ADE884FAAF61A2CB45B02431A70932B8", DataEyeGA.PlatformType.ADR, "Official", "Android");
-        }
-        else if (Application.isEditor)
-        {
-            DataEyeGA.Init("ADE884FAAF61A2CB45B02431A70932B8", DataEyeGA.PlatformType.WP, "Official", "Windows");
-        }
-    }
-
 
     public static void PlayAD(UnityAction action)
     {
@@ -193,32 +212,50 @@ public class ManaIAP : MonoBehaviour, IStoreListener
     }
 
 
-    public static void Purchase(string id)
+    public static void Purchase(string str)
     {
-        bool freeze = true;
+        //bool freeze = true;
 
-        if (freeze)
-        {
-            Bubble.Show(null, Language.GetStr("IAP", "TemporarilyUnavailible"));
+        //if (freeze)
+        //{
+        //    Bubble.Show(null, Language.GetStr("IAP", "TemporarilyUnavailible"));
 
-            return;
-        }
-        
+        //    return;
+        //}
+        ManaDebug.Log(PayChannel.ToString());
         if (!Complete)
         {
             Bubble.Show(null, Language.GetStr("IAP", "PurchaseFail"));
 
+            InitializeIAP();
+
             return;
         }
 
-        if (!ProductList.Contains(id))
+        if (!ProductList.Contains(ProductIdDic[str]))
         {
             Bubble.Show(null, Language.GetStr("IAP", "PurchaseUnvalid"));
 
             return;
         }
 
-        IStoreController.InitiatePurchase(id);
+        if (PayChannel == PayChannel.AliPay)
+        {
+            ManaDebug.Log(ProductIdDic[str]);
+
+            ManaServer.GetProductID
+            (
+                ProductIdDic[str],
+                data =>
+                {
+                    AliplayManager.Instance.Pay(data);
+                }
+            );
+        }
+        else if (PayChannel == PayChannel.UnityIAP)
+        {
+            IStoreController.InitiatePurchase(ProductIdDic[str]);
+        }
     }
 
 
@@ -248,7 +285,7 @@ public class ManaIAP : MonoBehaviour, IStoreListener
     {
         Bubble.Show(null, Language.GetStr("IAP", "PurchaseSuccess"));
 
-        ProductDic[e.purchasedProduct.definition.id].Invoke();
+        ProductActionDic[e.purchasedProduct.definition.id].Invoke();
 
         return PurchaseProcessingResult.Complete;
     }

Assets/Script/Manage/ManaReso.cs

@@ -420,7 +420,7 @@ public class ManaReso : Regist
         else
         {
             T t = Bundle.Load<T>(goName, folder);
-
+            
             if (t == null)
             {
                 throw new Exception(goName);

Assets/Script/Manage/ManaServer.cs

@@ -107,16 +107,14 @@ public class ManaServer : Regist
     }
 
 
-    public static void GetProductID(int id, URLRequest.URLRequestCallBackDelegate callback)
+    public static void GetProductID(string id, URLRequest.URLRequestCallBackDelegate callback)
     {
         URLRequestData urlData = new URLRequestData();
 
         urlData.Add("t", 1);
-        urlData.Add("i", id.ToString());
+        urlData.Add("i", id);
         urlData.Add("u", JsonData.Inst_Object["i"].ToJson().Trim('"'));
 
-        Debug.Log(JsonData.Inst_Object["i"].ToJson().Trim('"'));
-
         URLRequest.CreateStrURLRequest("https://garden.dashgame.com/index.php/home/pay/pay", urlData, callback, URLRequest.Method.POST);
     }
 

Assets/Script/Object/Player.cs

@@ -302,6 +302,8 @@ public class CloseUnit
         BuyBtn.image.material = Lib.GrayMat;
 
         BuyBtnLab.text = Language.GetStr("UI", "P_BtnLab2");
+
+        ManaCenter.CloseAmt++;
     }
 
     public void OnBuy()

Assets/Script/Object/Skill/Pack.cs

@@ -183,7 +183,7 @@ public class Pack : SkillRoot
         ManaLan.Add(ItemTit, new LanStr("SkillName", ID));
 
 
-        ManaIAP.ProductDic.UniqueAdd(ID, PurchaseResult);
+        ManaIAP.ProductActionDic.UniqueAdd(ID, PurchaseResult);
 
         ItemStatus = ItemStatus;
     }

Assets/Script/ThirdParty/Alipay/AlipayManager.cs

@@ -11,6 +11,8 @@ public class AliplayManager : UnitySingleton<AliplayManager>
 	{
 		androidUnityTool = new AndroidJavaObject("com.dashgame.unity.UnityTool");
 		androidUnityTool.Call("setResponseGameObject", this.name);
+
+	    ManaIAP.Complete = true;
 	}
 
 	public void Pay(string id){
@@ -19,7 +21,8 @@ public class AliplayManager : UnitySingleton<AliplayManager>
 		AndroidJavaObject currentActivity = jc.GetStatic<AndroidJavaObject>("currentActivity");
 
 		//Pay(string orderInfo, Activity activity)
-		androidUnityTool.Call("pay", id, currentActivity); // 传递的参数需与服务器协商
+        ManaDebug.Log(id);
+        androidUnityTool.Call("pay", id, currentActivity); // 传递的参数需与服务器协商
 
     }
 
@@ -27,7 +30,7 @@ public class AliplayManager : UnitySingleton<AliplayManager>
 	{
 		//if result=9000 means pay success;
         
-        Debug.Log(result.Split('|')[0]);
-        Debug.Log(result.Split('|')[1]);
+        ManaDebug.Log(result.Split('|')[0]);
+        ManaDebug.Log(result.Split('|')[1]);
     }
 }

Assets/Script/Tool/Auxiliary.cs

@@ -1,4 +1,5 @@
 using LitJson;
+using MiniJSON;
 using ScottGarland;
 using DragonBones;
 
@@ -22,6 +23,8 @@ using System.Runtime.Serialization.Formatters.Binary;
 
 using System.Security;
 using System.Security.Cryptography.Xml;
+
+using Json = MiniJSONV.Json;
 using Random = UnityEngine.Random;
 using Transform = UnityEngine.Transform;
 
@@ -118,8 +121,6 @@ public class Auxiliary : Regist
     private void Awake()
     {
         Instance = this;
-
-        //gameObject.AddComponent<ManaAnim>().RegistImmed();
     }
 
     private void Update()
@@ -129,40 +130,23 @@ public class Auxiliary : Regist
         if (Input.GetKeyDown(KeyCode.Escape))
         {
             ManaServer.GetProductID
-                (
-                    1,
-                    data =>
-                    {
-                        AliplayManager.Instance.Init();
-                        AliplayManager.Instance.Pay(data);
-                    }
-                );
-
-            //try
-            //{
-            //    AliplayManager.Instance.Init();
-            //}
-            //catch (Exception e)
-            //{
-            //    ManaDebug.Log("Init");
-            //    ManaDebug.Log(e.ToString());
-
-            //    throw;
-            //}
-
-            //try
-            //{
-            //    AliplayManager.Instance.Pay("1");
-            //}
-            //catch (Exception e)
-            //{
-            //    ManaDebug.Log("Pay");
-            //    ManaDebug.Log(e.ToString());
+            (
+                "com.dashgame.garden.packfresh",
+                data =>
+                {
+                    int index = data.IndexOf('a');
+                    
+                    data = data.Substring(index);
+                   
+                    Debug.Log(data);
+                    ManaDebug.Log(data);
 
-            //    throw;
-            //}
+                    AliplayManager.Instance.Init();
+                    AliplayManager.Instance.Pay(data);
+                }
+            );
         }
-
+        
         if (Input.GetKeyDown(KeyCode.N))
         {
             //foreach (var VARIABLE in ManaGarden.FlowerInfoDic)

Assets/Script/Tool/Bundle.cs

@@ -48,7 +48,6 @@ public class Bundle : MonoBehaviour
         );
     }
 
-
     public static T Load<T>(string goName, Folder folder) where T : Object
     {
         if (Initializer.Instance.DebugMode)

ProjectSettings/ProjectSettings.asset

@@ -7,7 +7,7 @@ PlayerSettings:
   productGUID: 548c8e2bb13123a4c87608ea03ec4bff
   AndroidProfiler: 0
   defaultScreenOrientation: 4
-  targetDevice: 2
+  targetDevice: 0
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: DashGame Technology Inc.
@@ -133,7 +133,7 @@ PlayerSettings:
   AndroidPreferredInstallLocation: 1
   aotOptions: 
   apiCompatibilityLevel: 1
-  stripEngineCode: 0
+  stripEngineCode: 1
   iPhoneStrippingLevel: 0
   iPhoneScriptCallOptimization: 0
   iPhoneBuildNumber: 0

ToList.txt

@@ -1,4 +1,21 @@
-移除AnySDK
+新成就的图标
+
+完成成就时Text的Bug
+
+钻石的存档有问题
+
+购买礼包获得的钻石有问题
+
+技能免费获取金币/钻石有问题
+
+
+苹果的本地化
+
+播放广告可能有问题
+
+清空存档
+
+分享appid申请
 
 
 还原PlayerConfig
@@ -17,7 +34,4 @@
 
 先开启Service再打包
 
-//更新版本号
-
-
-分享appid申请
+//更新版本号