修复3-20Bug

Assets/Resource/XML/Config/cost_config.xml

@@ -6,14 +6,14 @@
   <item id="5" fml="0.15" desc="留言获得金币的概率" />
   <item id="6" fml="300" desc="留言获得金币的时间间隔" />
   <comment>
-    <id>
-
+    <id>
+
 </id>
-    <fml>
-公式
+    <fml>
+公式
 </fml>
-    <desc>
-说明
+    <desc>
+说明
 </desc>
   </comment>
 </data>

Assets/Resource/XML/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="45" />
+  <Version value="46" />
   <ReplayVersion value="1" />
   
   <ID value="Default" />

Assets/Script/AssetBundleUtility/AssetBundleUtility.prefab

@@ -56,13 +56,13 @@ MonoBehaviour:
     MD5DictionaryFileName: AndroidMD5Dictionary#VERSION.txt
     OutputPath: Assets\HotUpdate\Android
     AssetBundleSets:
-    - Object: {fileID: 102900000, guid: 0db33fbef35d83548b4ce06d1aef020e, type: 3}
+    - Object: {fileID: 102900000, guid: 13fe4f9d5847ea148a39f68e9ef92eb8, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: 6c815a3ce50b41e41a21b1c378a47149, type: 3}
+    - Object: {fileID: 102900000, guid: 388a5c43c35e7544884a089d2cf6f181, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: b058981ed9ba2814a87635c8a9d773dd, type: 3}
+    - Object: {fileID: 102900000, guid: 25b10c846474dc6418c567898b3b4dfd, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: f27b048cfa763b8478e7fbbab230d9b4, type: 3}
+    - Object: {fileID: 102900000, guid: 580c4f53c0a30b24a9fa17d1c8fc3314, type: 3}
       URL: null
   - MD5FileName: IOSMD5#VERSION.txt
     MD5DictionaryFileName: IOSMD5Dictionary#VERSION.txt
@@ -80,11 +80,11 @@ MonoBehaviour:
     MD5DictionaryFileName: WindowsMD5Dictionary#VERSION.txt
     OutputPath: Assets\HotUpdate\Windows
     AssetBundleSets:
-    - Object: {fileID: 102900000, guid: 4cd12ca873c72504c95e42a5d558687d, type: 3}
+    - Object: {fileID: 102900000, guid: f089e7ad47a95af4693f43e5470e202c, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: c2aa22318a7180f49a828e217b313dc9, type: 3}
+    - Object: {fileID: 102900000, guid: 41bf4caf323967a498d23ad62e1e3eb1, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: 0b4c1963d0856884ea2d79d1e5ea4c27, type: 3}
+    - Object: {fileID: 102900000, guid: 37e819226cc80c94ea26b6f87f9c89b1, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: f4c714a841199494b89b686f3de11e63, type: 3}
+    - Object: {fileID: 102900000, guid: 9366859891fa5a44aa92ad52a9194870, type: 3}
       URL: null

Assets/Script/Manage/CommentRewardManager.cs

@@ -20,17 +20,28 @@ public class CommentRewardManager : Regist
 
     public override void ThirdInit()
     {
-        XmlDocument document = ConfigManager.GetXmlDocument(ResourceLabel.CostConfig);
-        XmlNodeList nodes = document.SelectSingleNode(ConfigLabel.RootNode).ChildNodes;
-        rewardCoinFml = nodes[3].Attributes[1].Value;
-        rewardChanceFml = nodes[4].Attributes[1].Value;
-        rewardTimeFml = nodes[5].Attributes[1].Value;
+        try
+        {
+            XmlDocument document = ConfigManager.GetXmlDocument(ResourceLabel.CostConfig);
+            XmlNodeList nodes = document.SelectSingleNode(ConfigLabel.RootNode).ChildNodes;
+            rewardCoinFml = nodes[3].Attributes[1].Value;
+            rewardChanceFml = nodes[4].Attributes[1].Value;
+            rewardTimeFml = nodes[5].Attributes[1].Value;
 
-        rewardCoin = Auxiliary.FmlParse(rewardCoinFml, "c", (Manager.CircleIncome*6).ToString("0"));
-        rewardCoin = (long) rewardCoin;
-        rewardTime = (float) Auxiliary.FmlParse(rewardTimeFml);
-        rewardChance = (float) Auxiliary.FmlParse(rewardChanceFml);
+            rewardCoin = Auxiliary.FmlParse(rewardCoinFml, "c", (Manager.CircleIncome * 6).ToString("0"));
+            rewardCoin = (long)rewardCoin;
+            rewardTime = (float)Auxiliary.FmlParse(rewardTimeFml);
+            rewardChance = (float)Auxiliary.FmlParse(rewardChanceFml);
+        }
+        catch (Exception e)
+        {
+            Debug.Log(e);
 
+            rewardCoin = (long) (Manager.CircleIncome*6*0.01f);
+            rewardTime = 300f;
+            rewardChance = 0.15f;
+        }
+        
         //rewardChance = 1;
         //rewardTime = 1;
     }

Assets/Script/Manage/ConfigManager.cs

@@ -1671,6 +1671,13 @@ public class ConfigManager : Regist
             ToVersion45(nativeDoc, defaultDoc);
         }
 
+        if (nativeVersion < 46)
+        {
+            Debug.LogWarning("UpdateArchive to 46");
+
+            ToVersion46(nativeDoc, defaultDoc);
+        }
+
         return nativeDoc;
     }
 
@@ -2307,4 +2314,17 @@ public class ConfigManager : Regist
 
         return nativeDoc;
     }
+
+    public static XmlDocument ToVersion46(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    {
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 46.ToString();
+
+        string persistentFolderPath = string.Format("{0}{1}HotUpdate", Application.persistentDataPath, Path.DirectorySeparatorChar);
+        if (Directory.Exists(persistentFolderPath))
+        {
+            Directory.Delete(persistentFolderPath, true);
+        }
+
+        return nativeDoc;
+    }
 }

Assets/Script/Manage/HttpManager.cs

@@ -1430,6 +1430,7 @@ public class HttpManager : Regist
                 if (jData.Inst_Object.ContainsKey("l"))
                 {
                     jData = jData["l"];
+                    //Debug.Log(jData.ToJson());
                     List<AccountData> accountDatas = new List<AccountData>();
                     for (int i = 0; i < jData.Count; i++)
                     {

Assets/Script/Manage/Initializer.cs

@@ -359,6 +359,7 @@ public class Initializer : MonoBehaviour
 
         for (int i = 0; i < RegistList.Count; i++)
         {
+            //Debug.Log(RegistList[i].GetType() + " " + i);
             DebugText.text = "Error code : 3-" + i;
             RegistList[i].FirstInit();
         }

Assets/Script/Tool/Auxiliary.cs

@@ -157,8 +157,9 @@ public class Auxiliary : Regist
 
         //if (Input.GetKey(KeyCode.Space))
         //{
-        //    Vector3 pos = ResourceManager.Get(CanvasLabel.Lc_CreditsContent).position;
-        //    ResourceManager.Get(CanvasLabel.Lc_CreditsContent).position = pos + new Vector3(0, 2f, 0);
+        //    Manager.AddCoin(10000000, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.None);
+        //    //Vector3 pos = ResourceManager.Get(CanvasLabel.Lc_CreditsContent).position;
+        //    //ResourceManager.Get(CanvasLabel.Lc_CreditsContent).position = pos + new Vector3(0, 2f, 0);
         //}
 
         //if (Input.GetKeyDown(KeyCode.Space))

Assets/Script/Tool/Bundle.cs

@@ -20,7 +20,7 @@ public class Bundle : MonoBehaviour
 {
     #region
 
-    public static string version = "1_3_7";
+    public static string version = "1_3_8";
 
     public static bool CopyComplete
     {

ProjectSettings/GraphicsSettings.asset

@@ -39,6 +39,7 @@ GraphicsSettings:
   - {fileID: 4800000, guid: ac390d8200b91bd419e2d7b9e580d07d, type: 3}
   - {fileID: 4800000, guid: e73e8e8cfe7b2344abcbf572918e22a1, type: 3}
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16002, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}

ProjectSettings/ProjectSettings.asset

@@ -125,7 +125,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.3.7
+  bundleVersion: 1.3.8
   preloadedAssets: []
   metroInputSource: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -156,8 +156,8 @@ PlayerSettings:
     iOS: com.dashgame.garden
     tvOS: com.dashgame.garden
   buildNumber:
-    iOS: 23
-  AndroidBundleVersionCode: 31
+    iOS: 24
+  AndroidBundleVersionCode: 32
   AndroidMinSdkVersion: 16
   AndroidTargetSdkVersion: 0
   AndroidPreferredInstallLocation: 1

ProjectSettings/UnityConnectSettings.asset

@@ -31,6 +31,6 @@ UnityConnectSettings:
     m_GameIds:
       AndroidPlayer: 1408493
       iPhonePlayer: 1408492
-    m_GameId: 
+    m_GameId: 1408493
   PerformanceReportingSettings:
     m_Enabled: 0