重新导出了配置

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

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

Assets/Advertisements/Editor/Resources/Android/builds.zip.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9cb5c3e4dd0dd574ba655453ad15edfa
-timeCreated: 1494301205
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

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/Advertisements/Editor/Resources/iOS/builds.zip.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: deca0ba656ca01b40a6bc5a68c0561b1
-timeCreated: 1494301205
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/ShareSDK/ShareSDK.cs

@@ -18,28 +18,15 @@ namespace cn.sharesdk.unity3d
         public static string QQAppKey = "100371282";
         public static string QQAppSecrete = "aed9b0303e3ed1e27bae87c33761161d";
 
-        //public static string WeChatAppKey = "wx4868b35061f87885";
-        //public static string WeChatSecrete = "64020361b8ec4c99936c0e3999a9f249";
-        public static string WeChatAppKey = "wxfefb3bdab3362c21";
-        public static string WeChatSecrete = "96f884bc929f8f39e5ba239738084921";
+        public static string QQZoneAppKey = "100371282";
+        public static string QQZoneAppSecreteForIOS = "aed9b0303e3ed1e27bae87c33761161d";
+        public static string QQZoneAppSecreteForAndroid = "ae36f4ee3946e1cbb98d6965b0b2ff5c";
 
-        //public static string SinaAppKey = "568898243";
-        //public static string SinaAppSecrete = "38a4f8204cc784f81f9f0daaf31e02e3";
-        public static string SinaAppKey = "1089133069";
-        public static string SinaAppSecrete = "f44fdbcf346c507cd989ebdbcb8cd251";
+        public static string SinaAppKey = "568898243";
+        public static string SinaAppSecrete = "38a4f8204cc784f81f9f0daaf31e02e3";
 
-        //public static string GoogleClientID = "682795613743-cfo3a8r4va0ujja7qofr54hobt2kv3cq.apps.googleusercontent.com";
-        //public static string GoogleAppKey = "232554794995.apps.googleusercontent.com";
-        //public static string GoogleAppSecrete = "PEdFgtrMw97aCvf0joQj7EMk";
-
-        public static string GoogleAppKey = "";
-        public static string GoogleAppSecrete = "";
-        public static string GoogleClientID = "839373660096-rekqhoistqv24rvb0luobcfmjbo6gonj.apps.googleusercontent.com";
-
-        //public static string FacebookAppKey = "107704292745179";
-        //public static string FacebookAppSecrete = "38053202e1a5fe26c80c753071f0b573";
-        public static string FacebookAppKey = "1996720443893282";
-        public static string FacebookAppSecrete = "45a70c021b5cdde6f1f82891181d0306";
+        public static string FacebookAppKey = "107704292745179";
+        public static string FacebookAppSecrete = "38053202e1a5fe26c80c753071f0b573";
 
         private int reqID;
 		public DevInfoSet devInfo;
@@ -90,7 +77,7 @@ namespace cn.sharesdk.unity3d
 #if UNITY_ANDROID
 			shareSDKUtils = new AndroidImpl(gameObject);
 #elif UNITY_IPHONE
-			//shareSDKUtils = new iOSImpl(gameObject);
+			shareSDKUtils = new iOSImpl(gameObject);
 #endif
             shareSDKUtils.InitSDK(MobAppKey);
             shareSDKUtils.SetPlatformConfig(platformConfigs);

Assets/Plugins/ShareSDK/ShareSDKDevInfo.cs

@@ -120,16 +120,16 @@ namespace cn.sharesdk.unity3d
 
 	public class QZone : DevInfo 
 	{
-		#if UNITY_ANDROID
+#if UNITY_ANDROID
 		public string SortId = "1";
 		public const int type = (int) PlatformType.QZone;
-		public string AppId = ShareSDK.QQAppKey;
-		public string AppKey = ShareSDK.QQAppSecrete;
+		public string AppId = ShareSDK.QQZoneAppKey;
+		public string AppKey = ShareSDK.QQZoneAppSecreteForAndroid;
 		public bool ShareByAppClient = true;
 #elif UNITY_IPHONE
 		public const int type = (int) PlatformType.QZone;
-		public string app_id = ShareSDK.QQAppKey;
-		public string app_key = ShareSDK.QQAppSecrete;
+		public string app_id = ShareSDK.QQZoneAppKey;
+		public string app_key = ShareSDK.QQZoneAppSecreteForIOS;
 		public string auth_type = "both";  //can pass "both","sso",or "web" 
 #endif
     }
@@ -141,13 +141,13 @@ namespace cn.sharesdk.unity3d
 		#if UNITY_ANDROID
 		public string SortId = "5";
 		public const int type = (int) PlatformType.WeChat;
-		public string AppId = ShareSDK.WeChatAppKey;
-		public string AppSecret = ShareSDK.WeChatSecrete;
+		//public string AppId = ShareSDK.WeChatAppKey;
+		//public string AppSecret = ShareSDK.WeChatSecrete;
 		public bool BypassApproval = true;
 #elif UNITY_IPHONE
 		public const int type = (int) PlatformType.WeChat;
-		public string app_id = ShareSDK.WeChatAppKey;
-		public string app_secret = ShareSDK.WeChatSecrete;
+		//public string app_id = ShareSDK.WeChatAppKey;
+		//public string app_secret = ShareSDK.WeChatSecrete;
 #endif
     }
 
@@ -156,13 +156,13 @@ namespace cn.sharesdk.unity3d
 		#if UNITY_ANDROID
 		public string SortId = "6";
 		public const int type = (int) PlatformType.WeChatMoments;
-		public string AppId = ShareSDK.WeChatAppKey;
-		public string AppSecret = ShareSDK.WeChatSecrete;
+		//public string AppId = ShareSDK.WeChatAppKey;
+		//public string AppSecret = ShareSDK.WeChatSecrete;
 		public bool BypassApproval = false;
 #elif UNITY_IPHONE
 		public const int type = (int) PlatformType.WeChatMoments;
-		public string app_id = ShareSDK.WeChatAppKey;
-		public string app_secret = ShareSDK.WeChatSecrete;
+		//public string app_id = ShareSDK.WeChatAppKey;
+		//public string app_secret = ShareSDK.WeChatSecrete;
 #endif
     }
 
@@ -367,13 +367,13 @@ namespace cn.sharesdk.unity3d
 		#if UNITY_ANDROID
 		public string SortId = "19";
 		public const int type = (int) PlatformType.GooglePlus;
-	    public string ClientID = ShareSDK.GoogleAppKey;
+	    //public string ClientID = ShareSDK.GoogleAppKey;
 		public string RedirectUrl = "http://localhost";
 		public bool	ShareByAppClient = false;
 #elif UNITY_IPHONE
 		public const int type = (int) PlatformType.GooglePlus;
-		public string client_id = ShareSDK.GoogleAppKey;
-		public string client_secret = ShareSDK.GoogleAppSecrete;
+		//public string client_id = ShareSDK.GoogleAppKey;
+		//public string client_secret = ShareSDK.GoogleAppSecrete;
 		public string redirect_uri = "http://localhost";
 		public string auth_type = "both";  //can pass "both","sso",or "web" 
 #endif

Assets/Resource/XML/Config/ability_config.xml

@@ -1,17 +1,17 @@
 <data>
   <item id="1" name="花园" class="1" class_id="1" coin_person="5" person="1" skill_cd="" unlock_lv="" unlock_ahead_cur="" unlock_ahead_delta="" unlock_ahead_minimun="" unlock_cur="1" unlock_amnt="5" unlock_pos="" upgrade_cur="1" upgrade_amnt="800" upgrade_fml="a*1.07" upgrade_plus="0.5%" upgrade_person="1.7%" upgrade_cd="" desc="每人次收入 金币[&amp;coin_person&amp;][lv]，每分钟来访[&amp;person&amp;*60][lv]人" icon="红-公园" anim="" label="" />
-  <item id="2" name="缤纷彩虹" class="1" class_id="5" coin_person="" person="5%" skill_cd="" unlock_lv="5" unlock_ahead_cur="2" unlock_ahead_delta="" unlock_ahead_minimun="200" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="150" upgrade_fml="a" upgrade_plus="" upgrade_person="5%" upgrade_cd="" desc="每分钟增加[&amp;person&amp;*60][lv]人参观，永久有效" icon="红-彩虹" anim="Item,Rainbow" label="" />
-  <item id="3" name="玉树樱花" class="1" class_id="6" coin_person="5%" person="" skill_cd="" unlock_lv="35" unlock_ahead_cur="2" unlock_ahead_delta="" unlock_ahead_minimun="300" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="150" upgrade_fml="a" upgrade_plus="5%" upgrade_person="" upgrade_cd="" desc="每人次收入提升[&amp;coin_person&amp;][lv]，永久有效" icon="红-樱花树" anim="Item,Tree1,Tree2" label="" />
-  <item id="4" name="滴哩哩的小黄鹂" class="1" class_id="7" coin_person="" person="" skill_cd="5%" unlock_lv="110" unlock_ahead_cur="2" unlock_ahead_delta="" unlock_ahead_minimun="500" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="300" upgrade_fml="a" upgrade_plus="" upgrade_person="" upgrade_cd="5%" desc="技能冷却时间减少[&amp;skill_cd&amp;][lv]，永久有效" icon="红-黄鹂鸟" anim="Item,Bird0" label="" />
+  <item id="2" name="缤纷彩虹" class="1" class_id="5" coin_person="" person="5%" skill_cd="" unlock_lv="5" unlock_ahead_cur="2" unlock_ahead_delta="1" unlock_ahead_minimun="200" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="150" upgrade_fml="a" upgrade_plus="" upgrade_person="5%" upgrade_cd="" desc="每分钟增加[&amp;person&amp;*60][lv]人参观，永久有效" icon="红-彩虹" anim="Item,Rainbow" label="" />
+  <item id="3" name="玉树樱花" class="1" class_id="6" coin_person="5%" person="" skill_cd="" unlock_lv="35" unlock_ahead_cur="2" unlock_ahead_delta="1" unlock_ahead_minimun="300" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="150" upgrade_fml="a" upgrade_plus="5%" upgrade_person="" upgrade_cd="" desc="每人次收入提升[&amp;coin_person&amp;][lv]，永久有效" icon="红-樱花树" anim="Item,Tree1,Tree2" label="" />
+  <item id="4" name="滴哩哩的小黄鹂" class="1" class_id="7" coin_person="" person="" skill_cd="5%" unlock_lv="110" unlock_ahead_cur="2" unlock_ahead_delta="1" unlock_ahead_minimun="500" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="300" upgrade_fml="a" upgrade_plus="" upgrade_person="" upgrade_cd="5%" desc="技能冷却时间减少[&amp;skill_cd&amp;][lv]，永久有效" icon="红-黄鹂鸟" anim="Item,Bird0" label="" />
   <item id="5" name="黄色小蜜蜂" class="2" class_id="1" coin_person="2.07" person="" skill_cd="" unlock_lv="2" unlock_ahead_cur="" unlock_ahead_delta="" unlock_ahead_minimun="" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="1" upgrade_amnt="800" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-黄色蜜蜂" anim="Elf,BeeYellow" label="" />
   <item id="6" name="紫色小蜜蜂" class="2" class_id="2" coin_person="2.96" person="" skill_cd="" unlock_lv="10" unlock_ahead_cur="" unlock_ahead_delta="" unlock_ahead_minimun="" unlock_cur="1" unlock_amnt="1600" unlock_pos="1" upgrade_cur="1" upgrade_amnt="1600" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-紫色蜜蜂" anim="Elf,BeePurple" label="" />
   <item id="7" name="蓝色小蜜蜂" class="2" class_id="3" coin_person="5.34" person="" skill_cd="" unlock_lv="30" unlock_ahead_cur="" unlock_ahead_delta="" unlock_ahead_minimun="" unlock_cur="1" unlock_amnt="3200" unlock_pos="1" upgrade_cur="1" upgrade_amnt="3200" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-蓝色蜜蜂" anim="Elf,BeeBlue" label="" />
   <item id="8" name="红色小蜜蜂" class="2" class_id="4" coin_person="18.2" person="" skill_cd="" unlock_lv="80" unlock_ahead_cur="" unlock_ahead_delta="" unlock_ahead_minimun="" unlock_cur="1" unlock_amnt="6400" unlock_pos="1" upgrade_cur="1" upgrade_amnt="6400" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-红色蜜蜂" anim="Elf,BeeRed" label="" />
   <item id="9" name="白色小蜜蜂" class="2" class_id="5" coin_person="49.05" person="" skill_cd="" unlock_lv="120" unlock_ahead_cur="" unlock_ahead_delta="" unlock_ahead_minimun="" unlock_cur="1" unlock_amnt="12800" unlock_pos="1" upgrade_cur="1" upgrade_amnt="12800" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-白色蜜蜂" anim="Elf,BeeWhite" label="" />
-  <item id="10" name="黄色小蝴蝶" class="2" class_id="6" coin_person="3.68" person="" skill_cd="" unlock_lv="20" unlock_ahead_cur="2" unlock_ahead_delta="" unlock_ahead_minimun="100" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="3200" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-黄蝴蝶" anim="Elf,ButterflyYellow" label="" />
-  <item id="11" name="紫色小蝴蝶" class="2" class_id="7" coin_person="8.27" person="" skill_cd="" unlock_lv="50" unlock_ahead_cur="2" unlock_ahead_delta="" unlock_ahead_minimun="100" unlock_cur="1" unlock_amnt="6400" unlock_pos="1" upgrade_cur="1" upgrade_amnt="6400" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-紫蝴蝶" anim="Elf,ButterflyPurple" label="" />
-  <item id="12" name="蓝色小蝴蝶" class="2" class_id="8" coin_person="28.17" person="" skill_cd="" unlock_lv="100" unlock_ahead_cur="2" unlock_ahead_delta="" unlock_ahead_minimun="100" unlock_cur="1" unlock_amnt="12800" unlock_pos="1" upgrade_cur="1" upgrade_amnt="12800" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-蓝蝴蝶" anim="Elf,ButterflyBlue" label="" />
-  <item id="13" name="红色小蝴蝶" class="2" class_id="9" coin_person="326.79" person="" skill_cd="" unlock_lv="200" unlock_ahead_cur="2" unlock_ahead_delta="" unlock_ahead_minimun="100" unlock_cur="1" unlock_amnt="25600" unlock_pos="1" upgrade_cur="1" upgrade_amnt="25600" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-红蝴蝶" anim="Elf,ButterflyRed" label="" />
+  <item id="10" name="黄色小蝴蝶" class="2" class_id="6" coin_person="3.68" person="" skill_cd="" unlock_lv="20" unlock_ahead_cur="2" unlock_ahead_delta="5" unlock_ahead_minimun="100" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="3200" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-黄蝴蝶" anim="Elf,ButterflyYellow" label="" />
+  <item id="11" name="紫色小蝴蝶" class="2" class_id="7" coin_person="8.27" person="" skill_cd="" unlock_lv="50" unlock_ahead_cur="2" unlock_ahead_delta="5" unlock_ahead_minimun="100" unlock_cur="1" unlock_amnt="6400" unlock_pos="1" upgrade_cur="1" upgrade_amnt="6400" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-紫蝴蝶" anim="Elf,ButterflyPurple" label="" />
+  <item id="12" name="蓝色小蝴蝶" class="2" class_id="8" coin_person="28.17" person="" skill_cd="" unlock_lv="100" unlock_ahead_cur="2" unlock_ahead_delta="10" unlock_ahead_minimun="100" unlock_cur="1" unlock_amnt="12800" unlock_pos="1" upgrade_cur="1" upgrade_amnt="12800" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-蓝蝴蝶" anim="Elf,ButterflyBlue" label="" />
+  <item id="13" name="红色小蝴蝶" class="2" class_id="9" coin_person="326.79" person="" skill_cd="" unlock_lv="200" unlock_ahead_cur="2" unlock_ahead_delta="10" unlock_ahead_minimun="100" unlock_cur="1" unlock_amnt="25600" unlock_pos="1" upgrade_cur="1" upgrade_amnt="25600" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-红蝴蝶" anim="Elf,ButterflyRed" label="" />
   <item id="14" name="白色小蝴蝶" class="2" class_id="10" coin_person="1387.22" person="" skill_cd="" unlock_lv="250" unlock_ahead_cur="2" unlock_ahead_delta="10" unlock_ahead_minimun="100" unlock_cur="1" unlock_amnt="51200" unlock_pos="1" upgrade_cur="1" upgrade_amnt="51200" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-白蝴蝶" anim="Elf,ButterflyWhite" label="" />
   <comment>
     <id>

Assets/Resource/XML/Config/award_config.xml

@@ -1,5 +1,5 @@
 <data>
-  <item id="1" coin="s*0.01*l" diamond="3,15" diamond_drop="0.5/l+l*0.0001" flower_drop="(1/f+l*0.001)*0.95" flower_rate_based="0.05,0.65,0.95" rate="0,400,650" coin_drop="r*l*0.65" flower_coin="l*0.65" star_cd="1" star_time="5,20" star_duration="5" />
+  <item id="1" coin="s*0.01*l" diamond="3,15" diamond_drop="0.5/l+l*0.0001" flower_drop="(1/f+l*0.005)*0.95" flower_rate_based="0.05,0.65,0.95" rate="0,400,650" coin_drop="r*l*0.65" flower_coin="l*0.65" star_cd="1" star_time="5,20" star_duration="5" />
   <comment>
     <id>
 

Assets/Resource/XML/Config/flower_config.xml

@@ -1,31 +1,31 @@
 <data>
-  <item id="1" name="粉色小花" desc="粉色小花的描述" icon="Flower1" anim="" />
-  <item id="2" name="紫色小花" desc="紫色小花的描述" icon="Flower2" anim="" />
-  <item id="3" name="波斯菊(粉)" desc="波斯菊(粉)的描述" icon="Flower3" anim="" />
-  <item id="4" name="康乃馨(红)" desc="康乃馨(红)的描述" icon="Flower4" anim="" />
-  <item id="5" name="铃兰(白)" desc="铃兰(白)的描述" icon="Flower5" anim="" />
-  <item id="6" name="马蹄莲(白)" desc="马蹄莲(白)的描述" icon="Flower6" anim="" />
-  <item id="7" name="蒲公英" desc="蒲公英的描述" icon="Flower7" anim="" />
-  <item id="8" name="牵牛花(蓝)" desc="牵牛花(蓝)的描述" icon="Flower8" anim="" />
-  <item id="9" name="三色堇(紫)" desc="三色堇(紫)的描述" icon="Flower9" anim="" />
-  <item id="10" name="三叶草(粉)" desc="三叶草(粉)的描述" icon="Flower10" anim="" />
-  <item id="11" name="向日葵" desc="向日葵的描述" icon="Flower11" anim="" />
-  <item id="12" name="郁金香(粉)" desc="郁金香(粉)的描述" icon="Flower12" anim="" />
-  <item id="13" name="百合花(白)" desc="" icon="Flower13" anim="" />
-  <item id="14" name="非洲菊(粉)" desc="" icon="Flower14" anim="" />
-  <item id="15" name="红掌" desc="" icon="Flower15" anim="" />
-  <item id="16" name="桔梗花" desc="" icon="Flower16" anim="" />
-  <item id="17" name="康乃馨(白)" desc="" icon="Flower17" anim="" />
-  <item id="18" name="铃兰(粉)" desc="" icon="Flower18" anim="" />
-  <item id="19" name="曼陀罗(橘)" desc="" icon="Flower19" anim="" />
-  <item id="20" name="玫瑰花(红)" desc="" icon="Flower20" anim="" />
-  <item id="21" name="茑萝" desc="" icon="Flower21" anim="" />
-  <item id="22" name="牵牛花(紫)" desc="" icon="Flower22" anim="" />
-  <item id="23" name="虞美人(红)" desc="" icon="Flower23" anim="" />
-  <item id="24" name="郁金香(黄)" desc="" icon="Flower24" anim="" />
-  <item id="25" name="鸢尾(紫)" desc="" icon="Flower25" anim="" />
-  <item id="26" name="朱槿(粉)" desc="" icon="Flower26" anim="" />
-  <item id="27" name="朱槿(黄)" desc="" icon="Flower27" anim="" />
+  <item id="1" name="粉色小花" desc="粉色小花的描述" unlock_ahead_cur="" unlock_ahead="" icon="Flower1" anim="" />
+  <item id="2" name="紫色小花" desc="紫色小花的描述" unlock_ahead_cur="" unlock_ahead="" icon="Flower2" anim="" />
+  <item id="3" name="波斯菊(粉)" desc="波斯菊(粉)的描述" unlock_ahead_cur="1" unlock_ahead="100000" icon="Flower3" anim="" />
+  <item id="4" name="康乃馨(红)" desc="康乃馨(红)的描述" unlock_ahead_cur="1" unlock_ahead="500000" icon="Flower4" anim="" />
+  <item id="5" name="铃兰(白)" desc="铃兰(白)的描述" unlock_ahead_cur="1" unlock_ahead="1000000" icon="Flower5" anim="" />
+  <item id="6" name="马蹄莲(白)" desc="马蹄莲(白)的描述" unlock_ahead_cur="1" unlock_ahead="5000000" icon="Flower6" anim="" />
+  <item id="7" name="蒲公英" desc="蒲公英的描述" unlock_ahead_cur="2" unlock_ahead="200" icon="Flower7" anim="" />
+  <item id="8" name="牵牛花(蓝)" desc="牵牛花(蓝)的描述" unlock_ahead_cur="2" unlock_ahead="200" icon="Flower8" anim="" />
+  <item id="9" name="三色堇(紫)" desc="三色堇(紫)的描述" unlock_ahead_cur="2" unlock_ahead="300" icon="Flower9" anim="" />
+  <item id="10" name="三叶草(粉)" desc="三叶草(粉)的描述" unlock_ahead_cur="2" unlock_ahead="300" icon="Flower10" anim="" />
+  <item id="11" name="向日葵" desc="向日葵的描述" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower11" anim="" />
+  <item id="12" name="郁金香(粉)" desc="郁金香(粉)的描述" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower12" anim="" />
+  <item id="13" name="百合花(白)" desc="" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower13" anim="" />
+  <item id="14" name="非洲菊(粉)" desc="" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower14" anim="" />
+  <item id="15" name="红掌" desc="" unlock_ahead_cur="2" unlock_ahead="800" icon="Flower15" anim="" />
+  <item id="16" name="桔梗花" desc="" unlock_ahead_cur="2" unlock_ahead="800" icon="Flower16" anim="" />
+  <item id="17" name="康乃馨(白)" desc="" unlock_ahead_cur="2" unlock_ahead="800" icon="Flower17" anim="" />
+  <item id="18" name="铃兰(粉)" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower18" anim="" />
+  <item id="19" name="曼陀罗(橘)" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower19" anim="" />
+  <item id="20" name="玫瑰花(红)" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower20" anim="" />
+  <item id="21" name="茑萝" desc="" unlock_ahead_cur="" unlock_ahead="" icon="Flower21" anim="" />
+  <item id="22" name="牵牛花(紫)" desc="" unlock_ahead_cur="" unlock_ahead="" icon="Flower22" anim="" />
+  <item id="23" name="虞美人(红)" desc="" unlock_ahead_cur="" unlock_ahead="" icon="Flower23" anim="" />
+  <item id="24" name="郁金香(黄)" desc="" unlock_ahead_cur="" unlock_ahead="" icon="Flower24" anim="" />
+  <item id="25" name="鸢尾(紫)" desc="" unlock_ahead_cur="" unlock_ahead="" icon="Flower25" anim="" />
+  <item id="26" name="朱槿(粉)" desc="" unlock_ahead_cur="" unlock_ahead="" icon="Flower26" anim="" />
+  <item id="27" name="朱槿(黄)" desc="" unlock_ahead_cur="" unlock_ahead="" icon="Flower27" anim="" />
   <comment>
     <id>
 id
@@ -36,6 +36,13 @@ id
     <desc>
 描述
 </desc>
+    <unlock_ahead_cur>
+提前解锁
+消耗货币
+</unlock_ahead_cur>
+    <unlock_ahead>
+提前解锁消耗的货币xiao'haodehuo'bi
+</unlock_ahead>
     <icon>
 图标
 </icon>

Assets/Resource/XML/Config/offline_config.xml

@@ -1,5 +1,5 @@
 <data>
-  <item id="1" addtion_fml="c*1" coin_lmt="" time_lmt="43200" />
+  <item id="1" addtion_fml="c*0.75" coin_lmt="" time_lmt="14400" />
   <comment>
     <id>
 id

Assets/Resource/XML/Config/skill_config.xml

@@ -1,8 +1,8 @@
 <data>
   <item id="1" name="人潮涌动" class="1" class_id="2" skill_index="1" reduce_cd="1" coin_person="" person="1" coin_once="" diamond_once="" skill_cd="" duration="300" cd="1800" unlock_lv="" unlock_ahead_cur="" unlock_ahead_delta="" unlock_ahead_minimun="" unlock_cur="1" unlock_amnt="5" unlock_pos="" use__cur="" use_amnt="" upgrade_cur="2" upgrade_amnt="200" upgrade_fml="a" upgrade_plus="" upgrade_person="" upgrade_coin_once="" upgrade_duration="60" upgrade_cd="" desc="每分钟增加[&amp;person&amp;*60]，持续[&amp;duration&amp;/60][lv]分钟" icon="4大技能1" anim="" label="" />
-  <item id="2" name="大亨光临" class="1" class_id="3" skill_index="2" reduce_cd="1" coin_person="" person="" coin_once="50000%" diamond_once="" skill_cd="" duration="" cd="3600" unlock_lv="25" unlock_ahead_cur="2" unlock_ahead_delta="10" unlock_ahead_minimun="200" unlock_cur="1" unlock_amnt="100" unlock_pos="" use__cur="" use_amnt="" upgrade_cur="2" upgrade_amnt="300" upgrade_fml="a" upgrade_plus="" upgrade_person="" upgrade_coin_once="5000%" upgrade_duration="" upgrade_cd="" desc="立即获得每人次收入的[&amp;coin_once&amp;][lv]倍" icon="4大技能2" anim="" label="" />
-  <item id="3" name="花之祝福" class="1" class_id="4" skill_index="3" reduce_cd="1" coin_person="200%" person="" coin_once="" diamond_once="" skill_cd="" duration="300" cd="3600" unlock_lv="75" unlock_ahead_cur="2" unlock_ahead_delta="" unlock_ahead_minimun="300" unlock_cur="" unlock_amnt="" unlock_pos="" use__cur="" use_amnt="" upgrade_cur="2" upgrade_amnt="300" upgrade_fml="a" upgrade_plus="" upgrade_person="" upgrade_coin_once="" upgrade_duration="60" upgrade_cd="" desc="所有收入提升[&amp;coin_person&amp;]，持续[&amp;duration&amp;/60][lv]" icon="4大技能3" anim="" label="" />
-  <item id="4" name="繁花似锦" class="4" class_id="1" skill_index="" reduce_cd="" coin_person="200%" person="" coin_once="" diamond_once="" skill_cd="" duration="900" cd="900" unlock_lv="40" unlock_ahead_cur="2" unlock_ahead_delta="" unlock_ahead_minimun="100" unlock_cur="" unlock_amnt="" unlock_pos="" use__cur="2" use_amnt="150" upgrade_cur="" upgrade_amnt="" upgrade_fml="" upgrade_plus="" upgrade_person="" upgrade_coin_once="" upgrade_duration="" upgrade_cd="" desc="所有金币产出提升[&amp;coin_person&amp;]，持续[&amp;duration&amp;]分钟" icon="绿-繁花似锦" anim="" label="" />
+  <item id="2" name="大亨光临" class="1" class_id="3" skill_index="2" reduce_cd="1" coin_person="" person="" coin_once="50000%" diamond_once="" skill_cd="" duration="" cd="3600" unlock_lv="25" unlock_ahead_cur="2" unlock_ahead_delta="5" unlock_ahead_minimun="200" unlock_cur="1" unlock_amnt="100" unlock_pos="" use__cur="" use_amnt="" upgrade_cur="2" upgrade_amnt="300" upgrade_fml="a" upgrade_plus="" upgrade_person="" upgrade_coin_once="5000%" upgrade_duration="" upgrade_cd="" desc="立即获得每人次收入的[&amp;coin_once&amp;][lv]倍" icon="4大技能2" anim="" label="" />
+  <item id="3" name="花之祝福" class="1" class_id="4" skill_index="3" reduce_cd="1" coin_person="200%" person="" coin_once="" diamond_once="" skill_cd="" duration="300" cd="3600" unlock_lv="75" unlock_ahead_cur="2" unlock_ahead_delta="10" unlock_ahead_minimun="300" unlock_cur="" unlock_amnt="" unlock_pos="" use__cur="" use_amnt="" upgrade_cur="2" upgrade_amnt="300" upgrade_fml="a" upgrade_plus="" upgrade_person="" upgrade_coin_once="" upgrade_duration="60" upgrade_cd="" desc="所有收入提升[&amp;coin_person&amp;]，持续[&amp;duration&amp;/60][lv]" icon="4大技能3" anim="" label="" />
+  <item id="4" name="繁花似锦" class="4" class_id="1" skill_index="" reduce_cd="" coin_person="200%" person="" coin_once="" diamond_once="" skill_cd="" duration="900" cd="900" unlock_lv="40" unlock_ahead_cur="2" unlock_ahead_delta="10" unlock_ahead_minimun="100" unlock_cur="" unlock_amnt="" unlock_pos="" use__cur="2" use_amnt="150" upgrade_cur="" upgrade_amnt="" upgrade_fml="" upgrade_plus="" upgrade_person="" upgrade_coin_once="" upgrade_duration="" upgrade_cd="" desc="所有金币产出提升[&amp;coin_person&amp;]，持续[&amp;duration&amp;]分钟" icon="绿-繁花似锦" anim="" label="" />
   <item id="5" name="免费获取金币" class="3" class_id="0" skill_index="" reduce_cd="" coin_person="" person="" coin_once="30000%" diamond_once="" skill_cd="" duration="" cd="600" unlock_lv="" unlock_ahead_cur="" unlock_ahead_delta="" unlock_ahead_minimun="" unlock_cur="" unlock_amnt="" unlock_pos="" use__cur="5" use_amnt="" upgrade_cur="" upgrade_amnt="" upgrade_fml="" upgrade_plus="" upgrade_person="" upgrade_coin_once="" upgrade_duration="" upgrade_cd="" desc="免费获取金币[&amp;coin_once&amp;]" icon="绿-免费金币" anim="" label="" />
   <item id="6" name="免费获取钻石" class="4" class_id="0" skill_index="" reduce_cd="" coin_person="" person="" coin_once="" diamond_once="10" skill_cd="" duration="" cd="900" unlock_lv="" unlock_ahead_cur="" unlock_ahead_delta="" unlock_ahead_minimun="" unlock_cur="" unlock_amnt="" unlock_pos="" use__cur="5" use_amnt="" upgrade_cur="" upgrade_amnt="" upgrade_fml="" upgrade_plus="" upgrade_person="" upgrade_coin_once="" upgrade_duration="" upgrade_cd="" desc="免费获取金币[&amp;diamond_once&amp;]" icon="蓝-免费钻" anim="" label="" />
   <item id="7" name="技能冷却" class="" class_id="" skill_index="4" reduce_cd="" coin_person="" person="" coin_once="" diamond_once="" skill_cd="100%" duration="" cd="900" unlock_lv="15" unlock_ahead_cur="" unlock_ahead_delta="" unlock_ahead_minimun="" unlock_cur="" unlock_amnt="" unlock_pos="" use__cur="5" use_amnt="" upgrade_cur="" upgrade_amnt="" upgrade_fml="" upgrade_plus="" upgrade_person="" upgrade_coin_once="" upgrade_duration="" upgrade_cd="" desc="" icon="4大技能4" anim="" label="" />

Assets/Resource/XML/Config/visit_config.xml

@@ -1,5 +1,5 @@
 <data>
-  <item id="1" award_rate="0.75" award_min="l*0.8-1" award_max="l*1.5" cool_time="5" cost="l*0.8" create="0.75" fancy="0.25" />
+  <item id="1" award_rate="0.75" award_min="l*0.8-1" award_max="l*1.8" cool_time="5" cost="l*0.8" create="0.75" fancy="0.25" />
   <comment>
     <id>
 id

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -24,8 +24,8 @@
     <Fg_Lab1 desc=""><![CDATA[连接中]]></Fg_Lab1>
     <Fg_Lab2 desc=""><![CDATA[连接成功]]></Fg_Lab2>
     <Fg_Lab3 desc=""><![CDATA[连接失败 请检查你的网络设置]]></Fg_Lab3>
-    <D_DescA desc=""><![CDATA[小游戏A的描述小游戏A的描述小游戏A的描述小游戏A的描述小游戏A的描述小游戏A的描述]]></D_DescA>
-    <D_DescB desc=""><![CDATA[小游戏B的描述小游戏B的描述小游戏B的描述小游戏B的描述小游戏B的描述小游戏B的描述]]></D_DescB>
+    <D_DescA desc=""><![CDATA[观察左侧花朵亮起的紫色外框，记住框中的图案，并点击右侧相应的按钮]]></D_DescA>
+    <D_DescB desc=""><![CDATA[记住左侧花朵消失的顺序，在右侧按顺序点击图标依次还原]]></D_DescB>
     <D_QuitLab desc=""><![CDATA[退出]]></D_QuitLab>
     <D_BeginLab0 desc=""><![CDATA[开始]]></D_BeginLab0>
     <D_BeginLab1 desc=""><![CDATA[准备]]></D_BeginLab1>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -24,8 +24,8 @@
     <Fg_Lab1 desc=""><![CDATA[連接中]]></Fg_Lab1>
     <Fg_Lab2 desc=""><![CDATA[連接成功]]></Fg_Lab2>
     <Fg_Lab3 desc=""><![CDATA[連接失敗 請檢查你的網路設置]]></Fg_Lab3>
-    <D_DescA desc=""><![CDATA[小游戏A的描述小游戏A的描述小游戏A的描述小游戏A的描述小游戏A的描述小游戏A的描述]]></D_DescA>
-    <D_DescB desc=""><![CDATA[小游戏B的描述小游戏B的描述小游戏B的描述小游戏B的描述小游戏B的描述小游戏B的描述]]></D_DescB>
+    <D_DescA desc=""><![CDATA[觀察左側花朵亮起的紫色外框，記住框中的圖案，並點擊右側相應的按鈕]]></D_DescA>
+    <D_DescB desc=""><![CDATA[記住左側花朵消失的順序，在右側按順序點擊圖標依次還原]]></D_DescB>
     <D_QuitLab desc=""><![CDATA[退出]]></D_QuitLab>
     <D_BeginLab0 desc=""><![CDATA[開始]]></D_BeginLab0>
     <D_BeginLab1 desc=""><![CDATA[準備]]></D_BeginLab1>

Assets/Resource/XML/lan/English.xml

@@ -24,8 +24,8 @@
     <Fg_Lab1 desc=""><![CDATA[Conneting]]></Fg_Lab1>
     <Fg_Lab2 desc=""><![CDATA[Connet successful]]></Fg_Lab2>
     <Fg_Lab3 desc=""><![CDATA[Connet fail, please check your network]]></Fg_Lab3>
-    <D_DescA desc=""><![CDATA[DescriptionADescriptionADescriptionADescriptionADescriptionADescriptionA]]></D_DescA>
-    <D_DescB desc=""><![CDATA[DescriptionBDescriptionBDescriptionBDescriptionBDescriptionBDescriptionB]]></D_DescB>
+    <D_DescA desc=""><![CDATA[Take a look at the purple bordered shape on the flowers in the left view, remember it, and tap the same shape in the right view.]]></D_DescA>
+    <D_DescB desc=""><![CDATA[Remember the order of the flower's disappearance, and reproduce it by the icons in the right view.]]></D_DescB>
     <D_QuitLab desc=""><![CDATA[Quit]]></D_QuitLab>
     <D_BeginLab0 desc=""><![CDATA[Start]]></D_BeginLab0>
     <D_BeginLab1 desc=""><![CDATA[Ready]]></D_BeginLab1>

Assets/Script/Manage/ManaIAP.cs

@@ -44,9 +44,15 @@ public class ManaIAP : MonoBehaviour, IStoreListener
     {
         InitializeAD();
 
+        GameObject.Find("I_Lab").GetComponent<Text>().text = "AD";
+
         InitializeIAP();
 
+        GameObject.Find("I_Lab").GetComponent<Text>().text = "IAP";
+
         InitializeShare();
+
+        GameObject.Find("I_Lab").GetComponent<Text>().text = "Share";
     }
 
     public static void InitializeAD()

Assets/Script/Object/Flower.cs

@@ -129,7 +129,7 @@ public class FlowerInfo
         UIPartical = dic["UIParticle System"].GetComponent<UIPartical>();
 
         ID_ = int.Parse(attribute[0].Value);
-        Icon_ = attribute[3].Value;
+        Icon_ = attribute[5].Value;
 
 
         Image.sprite = Icon;

Assets/Script/Tool/UI/BestfitText.cs

@@ -25,7 +25,7 @@ public class BestfitText : Text
         if (text != FormerText)
         {
             FormerText = text;
-
+            
             StartCoroutine(DelayCall(Bestfit, 2));
         }
     }
@@ -50,11 +50,7 @@ public class BestfitText : Text
                 break;
             }
 
-            int preferredLineHeight = Mathf.CeilToInt(cachedTextGenerator.GetPreferredHeight("1", textGenerationSettings));
-
-            int preferredLineCount = Mathf.CeilToInt(cachedTextGenerator.GetPreferredHeight(text, textGenerationSettings)) / preferredLineHeight;
-
-            int bestHeight = preferredLineHeight * preferredLineCount;
+            float bestHeight = cachedTextGenerator.GetPreferredHeight(text, textGenerationSettings);
             
             if (bestHeight > rectTransform.rect.size.y)
             {
@@ -83,7 +79,7 @@ public class BestfitText : Text
                 break;
             }
         }
-
+        
         fontSize = textGenerationSettings.fontSize;
     }
 

ProjectSettings/ProjectVersion.txt

@@ -1 +1 @@
-m_EditorVersion: 5.5.2f1
+m_EditorVersion: 5.5.0f3

ToList.txt

@@ -1,3 +1,6 @@
+分享appid申请
+
+
 //还原PlayerConfig
 
 //关闭调试界面
@@ -17,9 +20,4 @@
 //更新版本号
 
 
-ShareSDK有些失效了
-
-分享成功后收不到回调
-
-
 监督补上循环特效