Temp

Assets/Plugins/Android/libs/armeabi-v7a.meta

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

Assets/Plugins/Android/libs/x86.meta

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

Assets/Plugins/Android/res/anim.meta

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

Assets/Plugins/Android/res/drawable.meta

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

Assets/Plugins/Android/res/layout.meta

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

Assets/Plugins/Android/res/values-en.meta

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

Assets/Plugins/Android/res/values.meta

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

Assets/Plugins/UnityPurchasing/Bin/Security/live.meta

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

Assets/Plugins/UnityPurchasing/UnityIAP.unitypackage.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 00074c1c02ec64cdd831187c085efe75
-timeCreated: 1477083777
-licenseType: Store
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/script.meta

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

Assets/Script/Manage/ManaCenter.cs

@@ -281,7 +281,7 @@ public class ManaCenter : Regist
             }
 
             Coin_ = value;
-            
+
             ManaReso.SetText("F_CoinLab", Auxiliary.ShrinkNumberStr(Coin_, 0));
             ManaReso.SetText("C_CoinLab", Auxiliary.ShrinkNumberStr(Coin_, 0));
             ManaReso.SetText("P_CoinLab", Auxiliary.ShrinkNumberStr(Coin_, 0));

Assets/Script/Object/Skill/BigSkill.cs

@@ -383,7 +383,11 @@ public class BigSkill : Skill
 
                 BarStatus = SkillStatus.Buy;
                 ItemStatus = SkillStatus.Upgrade;
-                ItemIcon.material = null;
+
+                if (SkillTab != SkillTab.Null)
+                {
+                    ItemIcon.material = null;
+                }
 
                 if (UnlockCur != Current.Free)
                 {

Assets/Script/Tool/Auxiliary.cs

@@ -45,6 +45,8 @@ public class Amount
     public static double 千兆 = 1000000000000000;
     public static double 京 = 10000000000000000;
     public static double 千京 = 10000000000000000000;
+    public static BigInteger 垓 = new BigInteger("100000000000000000000");
+    public static BigInteger 千垓 = new BigInteger("100000000000000000000000");
 }
 
 public class Auxiliary : Regist
@@ -120,14 +122,23 @@ public class Auxiliary : Regist
         //gameObject.AddComponent<ManaAnim>().RegistImmed();
     }
 
-    public double test;
+    public Text Text;
+    private double testDouble;
     private void Update()
     {
+        //ManaLan.CurrentLan = Lan.ChineseSimplified;
+
+        //testDouble = Amount.千京 + Amount.京*10;
+
+        //Text.text = ShrinkNumberStr(testDouble,2);
+
         #region 调试
 
         if (Input.GetKeyDown(KeyCode.Escape))
         {
-            Debug.Log(ShrinkNumberStr(test));
+            ManaCenter.Coin = 15400;
+
+            ManaCenter.Pay("",15600,Current.Coin, ()=> {Debug.Log("Done");});
         }
 
         if (Input.GetKeyDown(KeyCode.N))
@@ -616,81 +627,123 @@ public class Auxiliary : Regist
         }
         else
         {
-            return str.Substring(0, index + accuray + 1);
+            for (int i = index + 1; i < index + accuray + 1; i++)
+            {
+                if (str[i] != '0')
+                {
+                    return str.Substring(0, index + accuray + 1);
+                }
+            }
+
+            return str.Substring(0, index);
         }
     }
 
 
-    public static long ShrinkNumber(double value, int accuracy = 1)
+    public static double ShrinkNumber(double value, int accuracy = 1)
     {
-        long longValue = (long) value;
-        
         if (ManaLan.CurrentLan == Lan.English)
         {
-            if (longValue < Amount.千)
+            if (value < Amount.千)
             {
-                return longValue;
+                return value;
             }
-            else if (longValue < Amount.百万)
+            else if (value < Amount.百万)
             {
-                long temp = (long) Amount.百;
+                string str = (value / Amount.千).ToString("F" + (accuracy + 1));
 
-                return (longValue/ temp) * temp;
+                return double.Parse(OmitNumberStr(accuracy, str)) * Amount.千;
             }
-            else if (longValue < Amount.十亿)
+            else if (value < Amount.十亿)
             {
-                long temp = (long)Amount.十万;
+                string str = (value / Amount.百万).ToString("F" + (accuracy + 1));
 
-                return (longValue / temp) * temp;
+                return double.Parse(OmitNumberStr(accuracy, str)) * Amount.百万;
             }
-            else if (longValue < Amount.兆)
+            else if (value < Amount.兆)
             {
-                long temp = (long)Amount.亿;
+                string str = (value / Amount.十亿).ToString("F" + (accuracy + 1));
 
-                return (longValue / temp) * temp;
+                return double.Parse(OmitNumberStr(accuracy, str)) * Amount.十亿;
             }
-            else if (longValue < Amount.千兆)
+            else if (value < Amount.千兆)
             {
-                long temp = (long)Amount.千亿;
+                string str = (value / Amount.兆).ToString("F" + (accuracy + 1));
 
-                return (longValue / temp) * temp;
+                return double.Parse(OmitNumberStr(accuracy, str)) * Amount.兆;
             }
             else
             {
-                long temp = (long)Amount.千亿;
+                string str = (value / Amount.兆).ToString("F" + (accuracy + 1));
 
-                return (longValue / temp) * temp;
+                return double.Parse(OmitNumberStr(accuracy, str)) * Amount.兆;
             }
         }
         else if (ManaLan.CurrentLan == Lan.ChineseSimplified || ManaLan.CurrentLan == Lan.ChineseTraditional)
         {
-            if (longValue < Amount.万)
+            if (value < Amount.万)
+            {
+                return value;
+            }
+            else if (value < Amount.千万)
             {
-                return longValue;
+                string str = (value / Amount.万).ToString("F" + (accuracy + 1));
+
+                return double.Parse(OmitNumberStr(accuracy, str)) * Amount.;
+            }
+            else if (value < Amount.亿)
+            {
+                string str = (value / Amount.千万).ToString("F" + (accuracy + 1));
+
+                return double.Parse(OmitNumberStr(accuracy, str)) * Amount.;
             }
-            else if (longValue < Amount.亿)
+            else if (value < Amount.千亿)
             {
-                long temp = (long)Amount.千;
+                string str = (value / Amount.亿).ToString("F" + (accuracy + 1));
 
-                return (longValue / temp) * temp;
+                return double.Parse(OmitNumberStr(accuracy, str)) * Amount.;
             }
-            else if (longValue < Amount.兆)
+            else if (value < Amount.兆)
             {
-                long temp = (long)Amount.千万;
+                string str = (value / Amount.千亿).ToString("F" + (accuracy + 1));
 
-                return (longValue / temp) * temp;
+                return double.Parse(OmitNumberStr(accuracy, str)) * Amount.;
             }
-            else if (longValue < Amount.京)
+            else if (value < Amount.千兆)
             {
-                long temp = (long)Amount.千亿;
+                string str = (value / Amount.兆).ToString("F" + (accuracy + 1));
 
-                return (longValue / temp) * temp;
+                return double.Parse(OmitNumberStr(accuracy, str)) * Amount.;
+            }
+            else if (value < Amount.京)
+            {
+                string str = (value / Amount.千兆).ToString("F" + (accuracy + 1));
+
+                return double.Parse(OmitNumberStr(accuracy, str)) * Amount.;
+            }
+            else if (value < Amount.千京)
+            {
+                string str = (value / Amount.京).ToString("F" + (accuracy + 1));
+
+                return double.Parse(OmitNumberStr(accuracy, str)) * Amount.;
+            }
+            else if (new BigInteger(value.ToString("0")) < Amount.垓)
+            {
+                string str = (value / Amount.千京).ToString("F" + (accuracy + 1));
+
+                return double.Parse(OmitNumberStr(accuracy, str)) * Amount.;
+            }
+            else if (new BigInteger(value.ToString("0")) < Amount.千垓)
+            {
+                string str = (new BigInteger(value.ToString("0")) / Amount.垓).ToString();
+
+                return OmitNumberStr(0, str) + "垓";
             }
             else
             {
-                long temp = (long)Amount.千亿;
+                string str = (new BigInteger(value.ToString("0")) / Amount.千垓).ToString();
 
-                return (longValue / temp) * temp;
+                return OmitNumberStr(0, str) + "千垓";
             }
         }
         else
@@ -701,123 +754,175 @@ public class Auxiliary : Regist
 
     public static string ShrinkNumberStr(double value, int accuracy = 1)
     {
-        long longValue = (long) value;
-
         if (ManaLan.CurrentLan == Lan.English)
         {
-            if (longValue < Amount.千)
+            if (value < Amount.千)
             {
-                return longValue.ToString();
+                return value.ToString("0");
             }
-            else if (longValue < Amount.百万)
+            else if (value < Amount.百万)
             {
-                string str = (longValue / Amount.千).ToString();
+                string str = (value / Amount.千).ToString("F" + (accuracy + 1));
 
                 return OmitNumberStr(accuracy, str) + "K";
             }
-            else if (longValue < Amount.十亿)
+            else if (value < Amount.十亿)
             {
-                string str = (longValue / Amount.百万).ToString();
+                string str = (value / Amount.百万).ToString("F" + (accuracy + 1));
 
                 return OmitNumberStr(accuracy, str) + "M";
             }
-            else if (longValue < Amount.兆)
+            else if (value < Amount.兆)
             {
-                string str = (longValue / Amount.十亿).ToString();
+                string str = (value / Amount.十亿).ToString("F" + (accuracy + 1));
 
                 return OmitNumberStr(accuracy, str) + "B";
             }
-            else if (longValue < Amount.千兆)
+            else if (value < Amount.千兆)
             {
-                string str = (longValue / Amount.兆).ToString();
+                string str = (value / Amount.兆).ToString("F" + (accuracy + 1));
 
                 return OmitNumberStr(accuracy, str) + "T";
             }
             else
             {
-                string str = (longValue / Amount.兆).ToString();
+                string str = (value / Amount.兆).ToString("F" + (accuracy + 1));
 
                 return OmitNumberStr(accuracy, str) + "T";
             }
         }
         else if (ManaLan.CurrentLan == Lan.ChineseSimplified)
         {
-            if (longValue < Amount.千)
+            if (value < Amount.万)
             {
-                return longValue.ToString();
+                return value.ToString("0");
             }
-            else if (longValue < Amount.万)
+            else if (value < Amount.千万)
             {
-                string str = (longValue / Amount.千).ToString();
+                string str = (value / Amount.万).ToString("F" + (accuracy + 1));
 
-                return OmitNumberStr(accuracy, str) + "千";
+                return OmitNumberStr(accuracy, str) + "万";
             }
-            else if (longValue < Amount.百万)
+            else if (value < Amount.亿)
             {
-                string str = (longValue / Amount.十万).ToString();
+                string str = (value/Amount.千万).ToString("F" + (accuracy + 1));
 
-                return OmitNumberStr(accuracy, str) + "十万";
+                return OmitNumberStr(accuracy, str) + "千万";
             }
-            else if (longValue < Amount.千万)
+            else if (value < Amount.千亿)
             {
-                string str = (longValue / Amount.百万).ToString();
+                string str = (value / Amount.亿).ToString("F" + (accuracy + 1));
 
-                return OmitNumberStr(accuracy, str) + "百万";
+                return OmitNumberStr(accuracy, str) + "亿";
             }
-            else if (longValue < Amount.亿)
+            else if (value < Amount.兆)
             {
-                string str = (longValue/Amount.千万).ToString();
+                string str = (value / Amount.千亿).ToString("F" + (accuracy + 1));
 
-                return OmitNumberStr(accuracy, str) + "千万";
+                return OmitNumberStr(accuracy, str) + "千亿";
             }
-            else if (longValue < Amount.兆)
+            else if (value < Amount.千兆)
             {
-                string str = (longValue / Amount.千亿).ToString();
+                string str = (value / Amount.兆).ToString("F" + (accuracy + 1));
 
-                return OmitNumberStr(accuracy, str) + "千亿";
+                return OmitNumberStr(accuracy, str) + "兆";
             }
-            else if (longValue < Amount.京)
+            else if (value < Amount.京)
             {
-                string str = (longValue / Amount.千兆).ToString();
+                string str = (value / Amount.千兆).ToString("F" + (accuracy + 1));
 
                 return OmitNumberStr(accuracy, str) + "千兆";
             }
-            else
+            else if (value < Amount.千京)
+            {
+                string str = (value / Amount.京).ToString("F" + (accuracy + 1));
+
+                return OmitNumberStr(accuracy, str) + "京";
+            }
+            else if (new BigInteger(value.ToString("0")) < Amount.垓)
             {
-                string str = (longValue / Amount.千京).ToString();
+                string str = (value / Amount.千京).ToString("F" + (accuracy + 1));
 
                 return OmitNumberStr(accuracy, str) + "千京";
             }
+            else if (new BigInteger(value.ToString("0")) < Amount.千垓)
+            {
+                string str = (new BigInteger(value.ToString("0")) / Amount.垓).ToString();
+
+                return OmitNumberStr(0, str) + "垓";
+            }
+            else
+            {
+                string str = (new BigInteger(value.ToString("0")) / Amount.千垓).ToString();
+
+                return OmitNumberStr(0, str) + "千垓";
+            }
         }
         else if (ManaLan.CurrentLan == Lan.ChineseTraditional)
         {
-            if (longValue < Amount.万)
+            if (value < Amount.万)
             {
-                return longValue.ToString();
+                return value.ToString("0");
             }
-            else if (longValue < Amount.亿)
+            else if (value < Amount.千万)
             {
-                string str = (longValue / Amount.万).ToString();
+                string str = (value / Amount.万).ToString("F" + (accuracy + 1));
 
                 return OmitNumberStr(accuracy, str) + "萬";
             }
-            else if (longValue < Amount.兆)
+            else if (value < Amount.亿)
             {
-                string str = (longValue / Amount.亿).ToString();
+                string str = (value / Amount.千万).ToString("F" + (accuracy + 1));
+
+                return OmitNumberStr(accuracy, str) + "千萬";
+            }
+            else if (value < Amount.千亿)
+            {
+                string str = (value / Amount.亿).ToString("F" + (accuracy + 1));
 
                 return OmitNumberStr(accuracy, str) + "億";
             }
-            else if (longValue < Amount.京)
+            else if (value < Amount.兆)
+            {
+                string str = (value / Amount.千亿).ToString("F" + (accuracy + 1));
+
+                return OmitNumberStr(accuracy, str) + "千億";
+            }
+            else if (value < Amount.千兆)
+            {
+                string str = (value / Amount.兆).ToString("F" + (accuracy + 1));
+
+                return OmitNumberStr(accuracy, str) + "兆";
+            }
+            else if (value < Amount.京)
+            {
+                string str = (value / Amount.千兆).ToString("F" + (accuracy + 1));
+
+                return OmitNumberStr(accuracy, str) + "千兆";
+            }
+            else if (value < Amount.千京)
+            {
+                string str = (value / Amount.京).ToString("F" + (accuracy + 1));
+
+                return OmitNumberStr(accuracy, str) + "京";
+            }
+            else if (new BigInteger(value.ToString("0")) < Amount.垓)
+            {
+                string str = (value / Amount.千京).ToString("F" + (accuracy + 1));
+
+                return OmitNumberStr(accuracy, str) + "千京";
+            }
+            else if (new BigInteger(value.ToString("0")) < Amount.千垓)
             {
-                string str = (longValue / Amount.兆).ToString();
+                string str = (new BigInteger(value.ToString("0")) / Amount.垓).ToString();
 
-                return OmitNumberStr(accuracy, str) + "萬億";
+                return OmitNumberStr(0, str) + "垓";
             }
             else
             {
-                string str = (longValue / Amount.兆).ToString();
+                string str = (new BigInteger(value.ToString("0")) / Amount.千垓).ToString();
 
-                return OmitNumberStr(accuracy, str) + "萬億";
+                return OmitNumberStr(0, str) + "千垓";
             }
         }
         else

Assets/Script/Tool/BigInteger.cs

@@ -1568,6 +1568,11 @@ namespace ScottGarland
 			}
 			return System.UInt64.Parse(value.ToString(), System.Globalization.NumberStyles.Integer, System.Globalization.CultureInfo.CurrentCulture);
 		}
-		#endregion
-	}
+
+        internal object ToString(string v)
+        {
+            throw new NotImplementedException();
+        }
+        #endregion
+    }
 }

ToList.txt

@@ -1,3 +1,6 @@
+ﾊｹﾓﾃShrinkNum
+
+
 ｻｹﾔｭPlayerConfig
 
 ｹﾘｱﾕｵ�ﾔｽ酖�