temp

Assets/Advertisements.meta

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

Assets/Advertisements/Editor.meta

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

Assets/Advertisements/Editor/Resources.meta

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

Assets/Advertisements/Editor/Resources/Android.meta

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

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

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

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

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

Assets/Advertisements/Editor/Resources/iOS.meta

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

Assets/Resource/Audio/theme_bg.mp3.meta

@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 0f022047fe724744cb3de49bd183af99
-timeCreated: 1493772473
-licenseType: Pro
-AudioImporter:
-  serializedVersion: 6
-  defaultSettings:
-    loadType: 0
-    sampleRateSetting: 0
-    sampleRateOverride: 44100
-    compressionFormat: 1
-    quality: 1
-    conversionMode: 0
-  platformSettingOverrides: {}
-  forceToMono: 0
-  normalize: 1
-  preloadAudioData: 1
-  loadInBackground: 0
-  3D: 1
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Resource/XML/Config/ability_config.xml

@@ -1,18 +1,18 @@
 <data>
-  <item id="1" name="花园" class="1" class_id="1" coin_person="1" person="1" skill_cd="" unlock_lv="" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="1" upgrade_amnt="200" upgrade_fml="a*1.07" upgrade_plus="10%" upgrade_person="10%" 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="50%" skill_cd="" unlock_lv="200" unlock_ahead_cur="2" unlock_ahead_amt="200" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="" upgrade_fml="a" upgrade_plus="" upgrade_person="50%" upgrade_cd="" desc="每分钟增加[&amp;person&amp;*60][lv]人参观，永久有效" icon="红-彩虹" anim="Item,Rainbow" label="" />
-  <item id="3" name="玉树樱花" class="1" class_id="6" coin_person="50%" person="" skill_cd="" unlock_lv="500" unlock_ahead_cur="2" unlock_ahead_amt="300" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="300" upgrade_fml="a" upgrade_plus="50%" 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="200" unlock_ahead_cur="2" unlock_ahead_amt="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="10" person="" skill_cd="" unlock_lv="200" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="1" upgrade_amnt="1600" upgrade_fml="a*1.07" upgrade_plus="10" 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="10" person="" skill_cd="" unlock_lv="200" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="86400" upgrade_fml="a*1.07" upgrade_plus="10" 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="10" person="" skill_cd="" unlock_lv="200" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="22118000" upgrade_fml="a*1.07" upgrade_plus="10" 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="10" person="" skill_cd="" unlock_lv="200" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="16588000000" upgrade_fml="a*1.07" upgrade_plus="10" 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="10" person="" skill_cd="" unlock_lv="200" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="28665000000000" upgrade_fml="a*1.07" upgrade_plus="10" 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="20" person="" skill_cd="" unlock_lv="300" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="28665000000000" upgrade_fml="a*1.07" upgrade_plus="20" 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="20" person="" skill_cd="" unlock_lv="300" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="28665000000000" upgrade_fml="a*1.07" upgrade_plus="20" 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="20" person="" skill_cd="" unlock_lv="300" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="28665000000000" upgrade_fml="a*1.07" upgrade_plus="20" 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="20" person="" skill_cd="" unlock_lv="300" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="28665000000000" upgrade_fml="a*1.07" upgrade_plus="20" 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="20" person="" skill_cd="" unlock_lv="300" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="28665000000000" upgrade_fml="a*1.07" upgrade_plus="20" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-白蝴蝶" anim="Elf,ButterflyWhite" label="" />
+  <item id="1" name="花园" class="1" class_id="1" coin_person="1" person="0.5" skill_cd="" unlock_lv="" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="1" upgrade_amnt="150" upgrade_fml="a*1.07" upgrade_plus="10%" upgrade_person="10%" 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="50%" skill_cd="" unlock_lv="50" unlock_ahead_cur="2" unlock_ahead_amt="200" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="" upgrade_fml="a" upgrade_plus="" upgrade_person="50%" upgrade_cd="" desc="每分钟增加[&amp;person&amp;*60][lv]人参观，永久有效" icon="红-彩虹" anim="Item,Rainbow" label="" />
+  <item id="3" name="玉树樱花" class="1" class_id="6" coin_person="50%" person="" skill_cd="" unlock_lv="150" unlock_ahead_cur="2" unlock_ahead_amt="300" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="300" upgrade_fml="a" upgrade_plus="50%" 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="300" unlock_ahead_cur="2" unlock_ahead_amt="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="10" person="" skill_cd="" unlock_lv="10" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="1" upgrade_amnt="800" upgrade_fml="a*1.07" upgrade_plus="10" 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="10" person="" skill_cd="" unlock_lv="50" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="1600" upgrade_fml="a*1.07" upgrade_plus="10" 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="10" person="" skill_cd="" unlock_lv="100" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="3200" upgrade_fml="a*1.07" upgrade_plus="10" 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="10" person="" skill_cd="" unlock_lv="150" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="6400" upgrade_fml="a*1.07" upgrade_plus="10" 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="10" person="" skill_cd="" unlock_lv="200" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="12800" upgrade_fml="a*1.07" upgrade_plus="10" 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="20" person="" skill_cd="" unlock_lv="50" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="1600" upgrade_fml="a*1.07" upgrade_plus="20" 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="20" person="" skill_cd="" unlock_lv="100" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="3200" upgrade_fml="a*1.07" upgrade_plus="20" 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="20" person="" skill_cd="" unlock_lv="150" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="6400" upgrade_fml="a*1.07" upgrade_plus="20" 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="20" person="" skill_cd="" unlock_lv="200" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="12800" upgrade_fml="a*1.07" upgrade_plus="20" 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="20" person="" skill_cd="" unlock_lv="300" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="25600" upgrade_fml="a*1.07" upgrade_plus="20" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-白蝴蝶" anim="Elf,ButterflyWhite" label="" />
   <comment>
     <id>
 id

Assets/Resource/XML/Config/achieve_config.xml

@@ -11,16 +11,66 @@
   <item id="24" index="2" name="鼓鼓的钱包-4" desc="拥有5000金币" type="2" value="5000" parent="23" del="1" diamond_once="20" coin_person="" person="" icon="成就按钮" />
   <item id="25" index="2" name="鼓鼓的钱包-5" desc="拥有8000金币" type="2" value="8000" parent="24" del="1" diamond_once="30" coin_person="" person="" icon="成就按钮" />
   <item id="26" index="2" name="鼓鼓的钱包-6" desc="拥有10000金币" type="2" value="10000" parent="25" del="0" diamond_once="40" coin_person="" person="" icon="成就按钮" />
-  <item id="31" index="3" name="总金币量" desc="总金币量3000" type="3" value="3000" parent="" del="0" diamond_once="1" coin_person="" person="" icon="成就按钮" />
-  <item id="41" index="4" name="精灵等级总和" desc="精灵等级总和5" type="4" value="5" parent="" del="0" diamond_once="1" coin_person="" person="" icon="成就按钮" />
-  <item id="51" index="5" name="花朵数量" desc="花朵数量3" type="5" value="3" parent="" del="0" diamond_once="1" coin_person="" person="" icon="成就按钮" />
-  <item id="61" index="6" name="参观人次总数" desc="参观人次总数500" type="6" value="500" parent="" del="0" diamond_once="1" coin_person="" person="" icon="成就按钮" />
-  <item id="71" index="7" name="使用技能次数" desc="使用技能2次" type="7" value="2" parent="" del="0" diamond_once="1" coin_person="" person="" icon="成就按钮" />
-  <item id="81" index="8" name="观看广告次数" desc="观看广告2次" type="8" value="2" parent="" del="0" diamond_once="1" coin_person="" person="" icon="成就按钮" />
-  <item id="91" index="9" name="签到次数" desc="签到2次" type="9" value="2" parent="" del="0" diamond_once="1" coin_person="" person="" icon="成就按钮" />
-  <item id="101" index="10" name="分享次数" desc="分享2次" type="10" value="2" parent="" del="0" diamond_once="1" coin_person="" person="" icon="成就按钮" />
-  <item id="111" index="11" name="完成小游戏次数" desc="完成小游戏2次" type="11" value="2" parent="" del="0" diamond_once="1" coin_person="" person="" icon="成就按钮" />
-  <item id="121" index="12" name="收集花朵产出金币次数" desc="收集花朵金币10次" type="12" value="10" parent="" del="0" diamond_once="1" coin_person="" person="" icon="成就按钮" />
+  <item id="31" index="3" name="精明的商人-1" desc="总共获取3000金币" type="3" value="3000" parent="" del="1" diamond_once="5" coin_person="" person="" icon="成就按钮" />
+  <item id="32" index="3" name="精明的商人-2" desc="总共获取8000金币" type="3" value="8000" parent="31" del="1" diamond_once="10" coin_person="" person="" icon="成就按钮" />
+  <item id="33" index="3" name="精明的商人-3" desc="总共获取15000金币" type="3" value="15000" parent="32" del="1" diamond_once="15" coin_person="" person="" icon="成就按钮" />
+  <item id="34" index="3" name="精明的商人-4" desc="总共获取30000金币" type="3" value="30000" parent="33" del="1" diamond_once="20" coin_person="" person="" icon="成就按钮" />
+  <item id="35" index="3" name="精明的商人-5" desc="总共获取50000金币" type="3" value="50000" parent="34" del="1" diamond_once="30" coin_person="" person="" icon="成就按钮" />
+  <item id="36" index="3" name="精明的商人-6" desc="总共获取80000金币" type="3" value="80000" parent="35" del="0" diamond_once="40" coin_person="" person="" icon="成就按钮" />
+  <item id="41" index="4" name="花仙子-1" desc="所有精灵等级总和达到10级" type="4" value="10" parent="" del="1" diamond_once="10" coin_person="" person="" icon="成就按钮" />
+  <item id="42" index="4" name="花仙子-2" desc="所有精灵等级总和达到50级" type="4" value="30" parent="41" del="1" diamond_once="15" coin_person="" person="" icon="成就按钮" />
+  <item id="43" index="4" name="花仙子-3" desc="所有精灵等级总和达到100级" type="4" value="50" parent="42" del="1" diamond_once="20" coin_person="" person="" icon="成就按钮" />
+  <item id="44" index="4" name="花仙子-4" desc="所有精灵等级总和达到180级" type="4" value="100" parent="43" del="1" diamond_once="30" coin_person="" person="" icon="成就按钮" />
+  <item id="45" index="4" name="花仙子-5" desc="所有精灵等级总和达到400级" type="4" value="150" parent="44" del="1" diamond_once="40" coin_person="" person="" icon="成就按钮" />
+  <item id="46" index="4" name="花仙子-6" desc="所有精灵等级总和达到800级" type="4" value="300" parent="45" del="0" diamond_once="50" coin_person="" person="" icon="成就按钮" />
+  <item id="51" index="5" name="百花争艳-1" desc="花朵数量达到1" type="5" value="1" parent="" del="1" diamond_once="5" coin_person="" person="" icon="成就按钮" />
+  <item id="52" index="5" name="百花争艳-2" desc="花朵数量达到3" type="5" value="3" parent="51" del="1" diamond_once="10" coin_person="" person="" icon="成就按钮" />
+  <item id="53" index="5" name="百花争艳-3" desc="花朵数量达到5" type="5" value="5" parent="52" del="1" diamond_once="15" coin_person="" person="" icon="成就按钮" />
+  <item id="54" index="5" name="百花争艳-4" desc="花朵数量达到10" type="5" value="10" parent="53" del="1" diamond_once="20" coin_person="" person="" icon="成就按钮" />
+  <item id="55" index="5" name="百花争艳-5" desc="花朵数量达到20" type="5" value="20" parent="54" del="1" diamond_once="30" coin_person="" person="" icon="成就按钮" />
+  <item id="56" index="5" name="百花争艳-6" desc="花朵数量达到40" type="5" value="40" parent="55" del="0" diamond_once="40" coin_person="" person="" icon="成就按钮" />
+  <item id="61" index="6" name="人山人海-1" desc="参观人次总数达到500" type="6" value="500" parent="" del="1" diamond_once="5" coin_person="" person="" icon="成就按钮" />
+  <item id="62" index="6" name="人山人海-2" desc="参观人次总数达到2000" type="6" value="2000" parent="61" del="1" diamond_once="10" coin_person="" person="" icon="成就按钮" />
+  <item id="63" index="6" name="人山人海-3" desc="参观人次总数达到10000" type="6" value="10000" parent="62" del="1" diamond_once="15" coin_person="" person="" icon="成就按钮" />
+  <item id="64" index="6" name="人山人海-4" desc="参观人次总数达到50000" type="6" value="50000" parent="63" del="1" diamond_once="20" coin_person="" person="" icon="成就按钮" />
+  <item id="65" index="6" name="人山人海-5" desc="参观人次总数达到150000" type="6" value="150000" parent="64" del="1" diamond_once="30" coin_person="" person="" icon="成就按钮" />
+  <item id="66" index="6" name="人山人海-6" desc="参观人次总数达到300000" type="6" value="300000" parent="65" del="0" diamond_once="40" coin_person="" person="" icon="成就按钮" />
+  <item id="71" index="7" name="技能大师-1" desc="使用技能5次" type="7" value="5" parent="" del="1" diamond_once="10" coin_person="" person="" icon="成就按钮" />
+  <item id="72" index="7" name="技能大师-2" desc="使用技能10次" type="7" value="10" parent="71" del="1" diamond_once="15" coin_person="" person="" icon="成就按钮" />
+  <item id="73" index="7" name="技能大师-3" desc="使用技能20次" type="7" value="20" parent="72" del="1" diamond_once="20" coin_person="" person="" icon="成就按钮" />
+  <item id="74" index="7" name="技能大师-4" desc="使用技能50次" type="7" value="50" parent="73" del="1" diamond_once="30" coin_person="" person="" icon="成就按钮" />
+  <item id="75" index="7" name="技能大师-5" desc="使用技能150次" type="7" value="150" parent="74" del="1" diamond_once="40" coin_person="" person="" icon="成就按钮" />
+  <item id="76" index="7" name="技能大师-6" desc="使用技能250次" type="7" value="250" parent="75" del="0" diamond_once="50" coin_person="" person="" icon="成就按钮" />
+  <item id="81" index="8" name="鉴赏大师-1" desc="观看2次广告" type="8" value="2" parent="" del="1" diamond_once="10" coin_person="" person="" icon="成就按钮" />
+  <item id="82" index="8" name="鉴赏大师-2" desc="观看5次广告" type="8" value="5" parent="81" del="1" diamond_once="15" coin_person="" person="" icon="成就按钮" />
+  <item id="83" index="8" name="鉴赏大师-3" desc="观看10次广告" type="8" value="10" parent="82" del="1" diamond_once="20" coin_person="" person="" icon="成就按钮" />
+  <item id="84" index="8" name="鉴赏大师-4" desc="观看15次广告" type="8" value="15" parent="83" del="1" diamond_once="30" coin_person="" person="" icon="成就按钮" />
+  <item id="85" index="8" name="鉴赏大师-5" desc="观看25次广告" type="8" value="25" parent="84" del="1" diamond_once="40" coin_person="" person="" icon="成就按钮" />
+  <item id="86" index="8" name="鉴赏大师-6" desc="观看40次广告" type="8" value="40" parent="85" del="0" diamond_once="50" coin_person="" person="" icon="成就按钮" />
+  <item id="91" index="9" name="按时打卡-1" desc="签到5次" type="9" value="5" parent="" del="1" diamond_once="5" coin_person="" person="" icon="成就按钮" />
+  <item id="92" index="9" name="按时打卡-2" desc="签到10次" type="9" value="10" parent="91" del="1" diamond_once="10" coin_person="" person="" icon="成就按钮" />
+  <item id="93" index="9" name="按时打卡-3" desc="签到15次" type="9" value="15" parent="92" del="1" diamond_once="15" coin_person="" person="" icon="成就按钮" />
+  <item id="94" index="9" name="按时打卡-4" desc="签到25次" type="9" value="25" parent="93" del="1" diamond_once="20" coin_person="" person="" icon="成就按钮" />
+  <item id="95" index="9" name="按时打卡-5" desc="签到35次" type="9" value="35" parent="94" del="1" diamond_once="30" coin_person="" person="" icon="成就按钮" />
+  <item id="96" index="9" name="按时打卡-6" desc="签到50次" type="9" value="50" parent="95" del="0" diamond_once="40" coin_person="" person="" icon="成就按钮" />
+  <item id="101" index="10" name="乐于分享-1" desc="分享1次" type="10" value="1" parent="" del="1" diamond_once="5" coin_person="" person="" icon="成就按钮" />
+  <item id="102" index="10" name="乐于分享-2" desc="分享5次" type="10" value="5" parent="101" del="1" diamond_once="10" coin_person="" person="" icon="成就按钮" />
+  <item id="103" index="10" name="乐于分享-3" desc="分享10次" type="10" value="10" parent="102" del="1" diamond_once="15" coin_person="" person="" icon="成就按钮" />
+  <item id="104" index="10" name="乐于分享-4" desc="分享15次" type="10" value="15" parent="103" del="1" diamond_once="20" coin_person="" person="" icon="成就按钮" />
+  <item id="105" index="10" name="乐于分享-5" desc="分享25次" type="10" value="25" parent="104" del="1" diamond_once="30" coin_person="" person="" icon="成就按钮" />
+  <item id="106" index="10" name="乐于分享-6" desc="分享40次" type="10" value="40" parent="105" del="0" diamond_once="40" coin_person="" person="" icon="成就按钮" />
+  <item id="111" index="11" name="辛勤的花匠-1" desc="完成小游戏5次" type="11" value="5" parent="" del="1" diamond_once="5" coin_person="" person="" icon="成就按钮" />
+  <item id="112" index="11" name="辛勤的花匠-2" desc="完成小游戏10次" type="11" value="10" parent="111" del="1" diamond_once="10" coin_person="" person="" icon="成就按钮" />
+  <item id="113" index="11" name="辛勤的花匠-3" desc="完成小游戏30次" type="11" value="30" parent="112" del="1" diamond_once="15" coin_person="" person="" icon="成就按钮" />
+  <item id="114" index="11" name="辛勤的花匠-4" desc="完成小游戏50次" type="11" value="50" parent="113" del="1" diamond_once="20" coin_person="" person="" icon="成就按钮" />
+  <item id="115" index="11" name="辛勤的花匠-5" desc="完成小游戏100次" type="11" value="100" parent="114" del="1" diamond_once="30" coin_person="" person="" icon="成就按钮" />
+  <item id="116" index="11" name="辛勤的花匠-6" desc="完成小游戏200次" type="11" value="200" parent="115" del="0" diamond_once="40" coin_person="" person="" icon="成就按钮" />
+  <item id="121" index="12" name="积少成多-1" desc="收集花园里的金币50次" type="12" value="50" parent="" del="1" diamond_once="5" coin_person="" person="" icon="成就按钮" />
+  <item id="122" index="12" name="积少成多-2" desc="收集花园里的金币100次" type="12" value="100" parent="121" del="1" diamond_once="10" coin_person="" person="" icon="成就按钮" />
+  <item id="123" index="12" name="积少成多-3" desc="收集花园里的金币300次" type="12" value="300" parent="122" del="1" diamond_once="15" coin_person="" person="" icon="成就按钮" />
+  <item id="124" index="12" name="积少成多-4" desc="收集花园里的金币600次" type="12" value="600" parent="123" del="1" diamond_once="20" coin_person="" person="" icon="成就按钮" />
+  <item id="125" index="12" name="积少成多-5" desc="收集花园里的金币1000次" type="12" value="1000" parent="124" del="1" diamond_once="30" coin_person="" person="" icon="成就按钮" />
+  <item id="126" index="12" name="积少成多-6" desc="收集花园里的金币2500次" type="12" value="2500" parent="125" del="0" diamond_once="40" coin_person="" person="" icon="成就按钮" />
   <comment>
     <id>
 

Assets/Resource/XML/Config/award_config.xml

@@ -1,5 +1,5 @@
 <data>
-  <item id="1" coin="s*0.05" diamond="3,15" diamond_drop="0.5/l+l*0.0001" flower_drop="1/f+l*0.0001" flower_rate_based="0.008,0.08,0.8" rate="0,200,800" coin_drop="r*l*0.65" flower_coin="l*0.65" />
+  <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.0001" flower_rate_based="0.008,0.08,0.8" rate="0,300,650" coin_drop="r*l*0.65" flower_coin="l*0.65" />
   <comment>
     <id>
 

Assets/Resource/XML/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="143" />
+  <Version value="145" />
 
   <ID value="Default" />
   <TutorialA value="1" />
@@ -8,7 +8,7 @@
   <TutorialIndexB value="1" />
 
   <Player value="PlayerBlond" />
-  <QuitFlag value="1" />
+  <QuitFlag value="0" />
   <QuitTime value="4/23/2017 09:30:00 AM" />
   <SignTime value="4/23/2017 09:30:00 AM" />
   <Language value="ChineseSimplified" />

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -192,6 +192,7 @@
     <UnlockSlot desc=""><![CDATA[解锁精灵可以开放]]></UnlockSlot>
     <QuitGame desc=""><![CDATA[退出游戏?]]></QuitGame>
     <NoValidSlot desc=""><![CDATA[已经没有空地了]]></NoValidSlot>
+    <Unlock desc=""><![CDATA[未解锁]]></Unlock>
   </Common>
   <AchieveName>
     <Achieve1 desc=""><![CDATA[美丽花园-1]]></Achieve1>
@@ -206,16 +207,66 @@
     <Achieve24 desc=""><![CDATA[鼓鼓的钱包-4]]></Achieve24>
     <Achieve25 desc=""><![CDATA[鼓鼓的钱包-5]]></Achieve25>
     <Achieve26 desc=""><![CDATA[鼓鼓的钱包-6]]></Achieve26>
-    <Achieve31 desc=""><![CDATA[总金币量]]></Achieve31>
-    <Achieve41 desc=""><![CDATA[精灵等级总和]]></Achieve41>
-    <Achieve51 desc=""><![CDATA[花朵数量]]></Achieve51>
-    <Achieve61 desc=""><![CDATA[参观人次总数]]></Achieve61>
-    <Achieve71 desc=""><![CDATA[使用技能次数]]></Achieve71>
-    <Achieve81 desc=""><![CDATA[观看广告次数]]></Achieve81>
-    <Achieve91 desc=""><![CDATA[签到次数]]></Achieve91>
-    <Achieve101 desc=""><![CDATA[分享次数]]></Achieve101>
-    <Achieve111 desc=""><![CDATA[完成小游戏次数]]></Achieve111>
-    <Achieve121 desc=""><![CDATA[收集花朵产出金币次数]]></Achieve121>
+    <Achieve31 desc=""><![CDATA[精明的商人-1]]></Achieve31>
+    <Achieve32 desc=""><![CDATA[精明的商人-2]]></Achieve32>
+    <Achieve33 desc=""><![CDATA[精明的商人-3]]></Achieve33>
+    <Achieve34 desc=""><![CDATA[精明的商人-4]]></Achieve34>
+    <Achieve35 desc=""><![CDATA[精明的商人-5]]></Achieve35>
+    <Achieve36 desc=""><![CDATA[精明的商人-6]]></Achieve36>
+    <Achieve41 desc=""><![CDATA[花仙子-1]]></Achieve41>
+    <Achieve42 desc=""><![CDATA[花仙子-2]]></Achieve42>
+    <Achieve43 desc=""><![CDATA[花仙子-3]]></Achieve43>
+    <Achieve44 desc=""><![CDATA[花仙子-4]]></Achieve44>
+    <Achieve45 desc=""><![CDATA[花仙子-5]]></Achieve45>
+    <Achieve46 desc=""><![CDATA[花仙子-6]]></Achieve46>
+    <Achieve51 desc=""><![CDATA[百花争艳-1]]></Achieve51>
+    <Achieve52 desc=""><![CDATA[百花争艳-2]]></Achieve52>
+    <Achieve53 desc=""><![CDATA[百花争艳-3]]></Achieve53>
+    <Achieve54 desc=""><![CDATA[百花争艳-4]]></Achieve54>
+    <Achieve55 desc=""><![CDATA[百花争艳-5]]></Achieve55>
+    <Achieve56 desc=""><![CDATA[百花争艳-6]]></Achieve56>
+    <Achieve61 desc=""><![CDATA[人山人海-1]]></Achieve61>
+    <Achieve62 desc=""><![CDATA[人山人海-2]]></Achieve62>
+    <Achieve63 desc=""><![CDATA[人山人海-3]]></Achieve63>
+    <Achieve64 desc=""><![CDATA[人山人海-4]]></Achieve64>
+    <Achieve65 desc=""><![CDATA[人山人海-5]]></Achieve65>
+    <Achieve66 desc=""><![CDATA[人山人海-6]]></Achieve66>
+    <Achieve71 desc=""><![CDATA[技能大师-1]]></Achieve71>
+    <Achieve72 desc=""><![CDATA[技能大师-2]]></Achieve72>
+    <Achieve73 desc=""><![CDATA[技能大师-3]]></Achieve73>
+    <Achieve74 desc=""><![CDATA[技能大师-4]]></Achieve74>
+    <Achieve75 desc=""><![CDATA[技能大师-5]]></Achieve75>
+    <Achieve76 desc=""><![CDATA[技能大师-6]]></Achieve76>
+    <Achieve81 desc=""><![CDATA[鉴赏大师-1]]></Achieve81>
+    <Achieve82 desc=""><![CDATA[鉴赏大师-2]]></Achieve82>
+    <Achieve83 desc=""><![CDATA[鉴赏大师-3]]></Achieve83>
+    <Achieve84 desc=""><![CDATA[鉴赏大师-4]]></Achieve84>
+    <Achieve85 desc=""><![CDATA[鉴赏大师-5]]></Achieve85>
+    <Achieve86 desc=""><![CDATA[鉴赏大师-6]]></Achieve86>
+    <Achieve91 desc=""><![CDATA[按时打卡-1]]></Achieve91>
+    <Achieve92 desc=""><![CDATA[按时打卡-2]]></Achieve92>
+    <Achieve93 desc=""><![CDATA[按时打卡-3]]></Achieve93>
+    <Achieve94 desc=""><![CDATA[按时打卡-4]]></Achieve94>
+    <Achieve95 desc=""><![CDATA[按时打卡-5]]></Achieve95>
+    <Achieve96 desc=""><![CDATA[按时打卡-6]]></Achieve96>
+    <Achieve101 desc=""><![CDATA[乐于分享-1]]></Achieve101>
+    <Achieve102 desc=""><![CDATA[乐于分享-2]]></Achieve102>
+    <Achieve103 desc=""><![CDATA[乐于分享-3]]></Achieve103>
+    <Achieve104 desc=""><![CDATA[乐于分享-4]]></Achieve104>
+    <Achieve105 desc=""><![CDATA[乐于分享-5]]></Achieve105>
+    <Achieve106 desc=""><![CDATA[乐于分享-6]]></Achieve106>
+    <Achieve111 desc=""><![CDATA[辛勤的花匠-1]]></Achieve111>
+    <Achieve112 desc=""><![CDATA[辛勤的花匠-2]]></Achieve112>
+    <Achieve113 desc=""><![CDATA[辛勤的花匠-3]]></Achieve113>
+    <Achieve114 desc=""><![CDATA[辛勤的花匠-4]]></Achieve114>
+    <Achieve115 desc=""><![CDATA[辛勤的花匠-5]]></Achieve115>
+    <Achieve116 desc=""><![CDATA[辛勤的花匠-6]]></Achieve116>
+    <Achieve121 desc=""><![CDATA[积少成多-1]]></Achieve121>
+    <Achieve122 desc=""><![CDATA[积少成多-2]]></Achieve122>
+    <Achieve123 desc=""><![CDATA[积少成多-3]]></Achieve123>
+    <Achieve124 desc=""><![CDATA[积少成多-4]]></Achieve124>
+    <Achieve125 desc=""><![CDATA[积少成多-5]]></Achieve125>
+    <Achieve126 desc=""><![CDATA[积少成多-6]]></Achieve126>
   </AchieveName>
   <AchieveDesc>
     <Achieve1 desc=""><![CDATA[花园等级达到 30]]></Achieve1>
@@ -230,16 +281,66 @@
     <Achieve24 desc=""><![CDATA[拥有5000金币]]></Achieve24>
     <Achieve25 desc=""><![CDATA[拥有8000金币]]></Achieve25>
     <Achieve26 desc=""><![CDATA[拥有10000金币]]></Achieve26>
-    <Achieve31 desc=""><![CDATA[总金币量3000]]></Achieve31>
-    <Achieve41 desc=""><![CDATA[精灵等级总和5]]></Achieve41>
-    <Achieve51 desc=""><![CDATA[花朵数量3]]></Achieve51>
-    <Achieve61 desc=""><![CDATA[参观人次总数500]]></Achieve61>
-    <Achieve71 desc=""><![CDATA[使用技能2次]]></Achieve71>
-    <Achieve81 desc=""><![CDATA[观看广告2次]]></Achieve81>
-    <Achieve91 desc=""><![CDATA[签到2次]]></Achieve91>
-    <Achieve101 desc=""><![CDATA[分享2次]]></Achieve101>
-    <Achieve111 desc=""><![CDATA[完成小游戏2次]]></Achieve111>
-    <Achieve121 desc=""><![CDATA[收集花朵金币10次]]></Achieve121>
+    <Achieve31 desc=""><![CDATA[总共获取3000金币]]></Achieve31>
+    <Achieve32 desc=""><![CDATA[总共获取8000金币]]></Achieve32>
+    <Achieve33 desc=""><![CDATA[总共获取15000金币]]></Achieve33>
+    <Achieve34 desc=""><![CDATA[总共获取30000金币]]></Achieve34>
+    <Achieve35 desc=""><![CDATA[总共获取50000金币]]></Achieve35>
+    <Achieve36 desc=""><![CDATA[总共获取80000金币]]></Achieve36>
+    <Achieve41 desc=""><![CDATA[所有精灵等级总和达到10级]]></Achieve41>
+    <Achieve42 desc=""><![CDATA[所有精灵等级总和达到50级]]></Achieve42>
+    <Achieve43 desc=""><![CDATA[所有精灵等级总和达到100级]]></Achieve43>
+    <Achieve44 desc=""><![CDATA[所有精灵等级总和达到180级]]></Achieve44>
+    <Achieve45 desc=""><![CDATA[所有精灵等级总和达到400级]]></Achieve45>
+    <Achieve46 desc=""><![CDATA[所有精灵等级总和达到800级]]></Achieve46>
+    <Achieve51 desc=""><![CDATA[花朵数量达到1]]></Achieve51>
+    <Achieve52 desc=""><![CDATA[花朵数量达到3]]></Achieve52>
+    <Achieve53 desc=""><![CDATA[花朵数量达到5]]></Achieve53>
+    <Achieve54 desc=""><![CDATA[花朵数量达到10]]></Achieve54>
+    <Achieve55 desc=""><![CDATA[花朵数量达到20]]></Achieve55>
+    <Achieve56 desc=""><![CDATA[花朵数量达到40]]></Achieve56>
+    <Achieve61 desc=""><![CDATA[参观人次总数达到500]]></Achieve61>
+    <Achieve62 desc=""><![CDATA[参观人次总数达到2000]]></Achieve62>
+    <Achieve63 desc=""><![CDATA[参观人次总数达到10000]]></Achieve63>
+    <Achieve64 desc=""><![CDATA[参观人次总数达到50000]]></Achieve64>
+    <Achieve65 desc=""><![CDATA[参观人次总数达到150000]]></Achieve65>
+    <Achieve66 desc=""><![CDATA[参观人次总数达到300000]]></Achieve66>
+    <Achieve71 desc=""><![CDATA[使用技能5次]]></Achieve71>
+    <Achieve72 desc=""><![CDATA[使用技能10次]]></Achieve72>
+    <Achieve73 desc=""><![CDATA[使用技能20次]]></Achieve73>
+    <Achieve74 desc=""><![CDATA[使用技能50次]]></Achieve74>
+    <Achieve75 desc=""><![CDATA[使用技能150次]]></Achieve75>
+    <Achieve76 desc=""><![CDATA[使用技能250次]]></Achieve76>
+    <Achieve81 desc=""><![CDATA[观看2次广告]]></Achieve81>
+    <Achieve82 desc=""><![CDATA[观看5次广告]]></Achieve82>
+    <Achieve83 desc=""><![CDATA[观看10次广告]]></Achieve83>
+    <Achieve84 desc=""><![CDATA[观看15次广告]]></Achieve84>
+    <Achieve85 desc=""><![CDATA[观看25次广告]]></Achieve85>
+    <Achieve86 desc=""><![CDATA[观看40次广告]]></Achieve86>
+    <Achieve91 desc=""><![CDATA[签到5次]]></Achieve91>
+    <Achieve92 desc=""><![CDATA[签到10次]]></Achieve92>
+    <Achieve93 desc=""><![CDATA[签到15次]]></Achieve93>
+    <Achieve94 desc=""><![CDATA[签到25次]]></Achieve94>
+    <Achieve95 desc=""><![CDATA[签到35次]]></Achieve95>
+    <Achieve96 desc=""><![CDATA[签到50次]]></Achieve96>
+    <Achieve101 desc=""><![CDATA[分享1次]]></Achieve101>
+    <Achieve102 desc=""><![CDATA[分享5次]]></Achieve102>
+    <Achieve103 desc=""><![CDATA[分享10次]]></Achieve103>
+    <Achieve104 desc=""><![CDATA[分享15次]]></Achieve104>
+    <Achieve105 desc=""><![CDATA[分享25次]]></Achieve105>
+    <Achieve106 desc=""><![CDATA[分享40次]]></Achieve106>
+    <Achieve111 desc=""><![CDATA[完成小游戏5次]]></Achieve111>
+    <Achieve112 desc=""><![CDATA[完成小游戏10次]]></Achieve112>
+    <Achieve113 desc=""><![CDATA[完成小游戏30次]]></Achieve113>
+    <Achieve114 desc=""><![CDATA[完成小游戏50次]]></Achieve114>
+    <Achieve115 desc=""><![CDATA[完成小游戏100次]]></Achieve115>
+    <Achieve116 desc=""><![CDATA[完成小游戏200次]]></Achieve116>
+    <Achieve121 desc=""><![CDATA[收集花园里的金币50次]]></Achieve121>
+    <Achieve122 desc=""><![CDATA[收集花园里的金币100次]]></Achieve122>
+    <Achieve123 desc=""><![CDATA[收集花园里的金币300次]]></Achieve123>
+    <Achieve124 desc=""><![CDATA[收集花园里的金币600次]]></Achieve124>
+    <Achieve125 desc=""><![CDATA[收集花园里的金币1000次]]></Achieve125>
+    <Achieve126 desc=""><![CDATA[收集花园里的金币2500次]]></Achieve126>
   </AchieveDesc>
   <IAP>
     <LoadAd desc=""><![CDATA[广告加载中,请稍后再试]]></LoadAd>
@@ -247,6 +348,6 @@
     <FailAd desc=""><![CDATA[广告播放失败]]></FailAd>
     <PurchaseSuccess desc=""><![CDATA[购买成功]]></PurchaseSuccess>
     <PurchaseFail desc=""><![CDATA[购买失败]]></PurchaseFail>
-    <UnvalidCommodity desc=""><![CDATA[该商品不存在]]></UnvalidCommodity>
+    <PurchaseUnvalid desc=""><![CDATA[没有找到该商品]]></PurchaseUnvalid>
   </IAP>
 </lan>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -192,6 +192,7 @@
     <UnlockSlot desc=""><![CDATA[解鎖精靈可以開放]]></UnlockSlot>
     <QuitGame desc=""><![CDATA[退出遊戲?]]></QuitGame>
     <NoValidSlot desc=""><![CDATA[已經沒有空地了]]></NoValidSlot>
+    <Unlock desc=""><![CDATA[未解鎖]]></Unlock>
   </Common>
   <AchieveName>
     <Achieve1 desc=""><![CDATA[美麗花園-1]]></Achieve1>
@@ -206,16 +207,66 @@
     <Achieve24 desc=""><![CDATA[鼓鼓的錢包-4]]></Achieve24>
     <Achieve25 desc=""><![CDATA[鼓鼓的錢包-5]]></Achieve25>
     <Achieve26 desc=""><![CDATA[鼓鼓的錢包-6]]></Achieve26>
-    <Achieve31 desc=""><![CDATA[]]></Achieve31>
-    <Achieve41 desc=""><![CDATA[]]></Achieve41>
-    <Achieve51 desc=""><![CDATA[]]></Achieve51>
-    <Achieve61 desc=""><![CDATA[]]></Achieve61>
-    <Achieve71 desc=""><![CDATA[]]></Achieve71>
-    <Achieve81 desc=""><![CDATA[]]></Achieve81>
-    <Achieve91 desc=""><![CDATA[]]></Achieve91>
-    <Achieve101 desc=""><![CDATA[]]></Achieve101>
-    <Achieve111 desc=""><![CDATA[]]></Achieve111>
-    <Achieve121 desc=""><![CDATA[]]></Achieve121>
+    <Achieve31 desc=""><![CDATA[精明的商人-1]]></Achieve31>
+    <Achieve32 desc=""><![CDATA[精明的商人-2]]></Achieve32>
+    <Achieve33 desc=""><![CDATA[精明的商人-3]]></Achieve33>
+    <Achieve34 desc=""><![CDATA[精明的商人-4]]></Achieve34>
+    <Achieve35 desc=""><![CDATA[精明的商人-5]]></Achieve35>
+    <Achieve36 desc=""><![CDATA[精明的商人-6]]></Achieve36>
+    <Achieve41 desc=""><![CDATA[花仙子-1]]></Achieve41>
+    <Achieve42 desc=""><![CDATA[花仙子-2]]></Achieve42>
+    <Achieve43 desc=""><![CDATA[花仙子-3]]></Achieve43>
+    <Achieve44 desc=""><![CDATA[花仙子-4]]></Achieve44>
+    <Achieve45 desc=""><![CDATA[花仙子-5]]></Achieve45>
+    <Achieve46 desc=""><![CDATA[花仙子-6]]></Achieve46>
+    <Achieve51 desc=""><![CDATA[百花爭豔-1]]></Achieve51>
+    <Achieve52 desc=""><![CDATA[百花爭豔-2]]></Achieve52>
+    <Achieve53 desc=""><![CDATA[百花爭豔-3]]></Achieve53>
+    <Achieve54 desc=""><![CDATA[百花爭豔-4]]></Achieve54>
+    <Achieve55 desc=""><![CDATA[百花爭豔-5]]></Achieve55>
+    <Achieve56 desc=""><![CDATA[百花爭豔-6]]></Achieve56>
+    <Achieve61 desc=""><![CDATA[人山人海-1]]></Achieve61>
+    <Achieve62 desc=""><![CDATA[人山人海-2]]></Achieve62>
+    <Achieve63 desc=""><![CDATA[人山人海-3]]></Achieve63>
+    <Achieve64 desc=""><![CDATA[人山人海-4]]></Achieve64>
+    <Achieve65 desc=""><![CDATA[人山人海-5]]></Achieve65>
+    <Achieve66 desc=""><![CDATA[人山人海-6]]></Achieve66>
+    <Achieve71 desc=""><![CDATA[技能大師-1]]></Achieve71>
+    <Achieve72 desc=""><![CDATA[技能大師-2]]></Achieve72>
+    <Achieve73 desc=""><![CDATA[技能大師-3]]></Achieve73>
+    <Achieve74 desc=""><![CDATA[技能大師-4]]></Achieve74>
+    <Achieve75 desc=""><![CDATA[技能大師-5]]></Achieve75>
+    <Achieve76 desc=""><![CDATA[技能大師-6]]></Achieve76>
+    <Achieve81 desc=""><![CDATA[鑒賞大師-1]]></Achieve81>
+    <Achieve82 desc=""><![CDATA[鑒賞大師-2]]></Achieve82>
+    <Achieve83 desc=""><![CDATA[鑒賞大師-3]]></Achieve83>
+    <Achieve84 desc=""><![CDATA[鑒賞大師-4]]></Achieve84>
+    <Achieve85 desc=""><![CDATA[鑒賞大師-5]]></Achieve85>
+    <Achieve86 desc=""><![CDATA[鑒賞大師-6]]></Achieve86>
+    <Achieve91 desc=""><![CDATA[按時打卡-1]]></Achieve91>
+    <Achieve92 desc=""><![CDATA[按時打卡-2]]></Achieve92>
+    <Achieve93 desc=""><![CDATA[按時打卡-3]]></Achieve93>
+    <Achieve94 desc=""><![CDATA[按時打卡-4]]></Achieve94>
+    <Achieve95 desc=""><![CDATA[按時打卡-5]]></Achieve95>
+    <Achieve96 desc=""><![CDATA[按時打卡-6]]></Achieve96>
+    <Achieve101 desc=""><![CDATA[樂於分享-1]]></Achieve101>
+    <Achieve102 desc=""><![CDATA[樂於分享-2]]></Achieve102>
+    <Achieve103 desc=""><![CDATA[樂於分享-3]]></Achieve103>
+    <Achieve104 desc=""><![CDATA[樂於分享-4]]></Achieve104>
+    <Achieve105 desc=""><![CDATA[樂於分享-5]]></Achieve105>
+    <Achieve106 desc=""><![CDATA[樂於分享-6]]></Achieve106>
+    <Achieve111 desc=""><![CDATA[辛勤的花匠-1]]></Achieve111>
+    <Achieve112 desc=""><![CDATA[辛勤的花匠-2]]></Achieve112>
+    <Achieve113 desc=""><![CDATA[辛勤的花匠-3]]></Achieve113>
+    <Achieve114 desc=""><![CDATA[辛勤的花匠-4]]></Achieve114>
+    <Achieve115 desc=""><![CDATA[辛勤的花匠-5]]></Achieve115>
+    <Achieve116 desc=""><![CDATA[辛勤的花匠-6]]></Achieve116>
+    <Achieve121 desc=""><![CDATA[積少成多-1]]></Achieve121>
+    <Achieve122 desc=""><![CDATA[積少成多-2]]></Achieve122>
+    <Achieve123 desc=""><![CDATA[積少成多-3]]></Achieve123>
+    <Achieve124 desc=""><![CDATA[積少成多-4]]></Achieve124>
+    <Achieve125 desc=""><![CDATA[積少成多-5]]></Achieve125>
+    <Achieve126 desc=""><![CDATA[積少成多-6]]></Achieve126>
   </AchieveName>
   <AchieveDesc>
     <Achieve1 desc=""><![CDATA[花園等級達到 30]]></Achieve1>
@@ -230,16 +281,66 @@
     <Achieve24 desc=""><![CDATA[擁有5000金幣]]></Achieve24>
     <Achieve25 desc=""><![CDATA[擁有8000金幣]]></Achieve25>
     <Achieve26 desc=""><![CDATA[擁有10000金幣]]></Achieve26>
-    <Achieve31 desc=""><![CDATA[]]></Achieve31>
-    <Achieve41 desc=""><![CDATA[]]></Achieve41>
-    <Achieve51 desc=""><![CDATA[]]></Achieve51>
-    <Achieve61 desc=""><![CDATA[]]></Achieve61>
-    <Achieve71 desc=""><![CDATA[]]></Achieve71>
-    <Achieve81 desc=""><![CDATA[]]></Achieve81>
-    <Achieve91 desc=""><![CDATA[]]></Achieve91>
-    <Achieve101 desc=""><![CDATA[]]></Achieve101>
-    <Achieve111 desc=""><![CDATA[]]></Achieve111>
-    <Achieve121 desc=""><![CDATA[]]></Achieve121>
+    <Achieve31 desc=""><![CDATA[總共獲取3000金幣]]></Achieve31>
+    <Achieve32 desc=""><![CDATA[總共獲取8000金幣]]></Achieve32>
+    <Achieve33 desc=""><![CDATA[總共獲取15000金幣]]></Achieve33>
+    <Achieve34 desc=""><![CDATA[總共獲取30000金幣]]></Achieve34>
+    <Achieve35 desc=""><![CDATA[總共獲取50000金幣]]></Achieve35>
+    <Achieve36 desc=""><![CDATA[總共獲取80000金幣]]></Achieve36>
+    <Achieve41 desc=""><![CDATA[所有精靈等級總和達到10級]]></Achieve41>
+    <Achieve42 desc=""><![CDATA[所有精靈等級總和達到50級]]></Achieve42>
+    <Achieve43 desc=""><![CDATA[所有精靈等級總和達到100級]]></Achieve43>
+    <Achieve44 desc=""><![CDATA[所有精靈等級總和達到180級]]></Achieve44>
+    <Achieve45 desc=""><![CDATA[所有精靈等級總和達到400級]]></Achieve45>
+    <Achieve46 desc=""><![CDATA[所有精靈等級總和達到800級]]></Achieve46>
+    <Achieve51 desc=""><![CDATA[花朵數量達到1]]></Achieve51>
+    <Achieve52 desc=""><![CDATA[花朵數量達到3]]></Achieve52>
+    <Achieve53 desc=""><![CDATA[花朵數量達到5]]></Achieve53>
+    <Achieve54 desc=""><![CDATA[花朵數量達到10]]></Achieve54>
+    <Achieve55 desc=""><![CDATA[花朵數量達到20]]></Achieve55>
+    <Achieve56 desc=""><![CDATA[花朵數量達到40]]></Achieve56>
+    <Achieve61 desc=""><![CDATA[參觀人次總數達到500]]></Achieve61>
+    <Achieve62 desc=""><![CDATA[參觀人次總數達到2000]]></Achieve62>
+    <Achieve63 desc=""><![CDATA[參觀人次總數達到10000]]></Achieve63>
+    <Achieve64 desc=""><![CDATA[參觀人次總數達到50000]]></Achieve64>
+    <Achieve65 desc=""><![CDATA[參觀人次總數達到150000]]></Achieve65>
+    <Achieve66 desc=""><![CDATA[參觀人次總數達到300000]]></Achieve66>
+    <Achieve71 desc=""><![CDATA[使用技能5次]]></Achieve71>
+    <Achieve72 desc=""><![CDATA[使用技能10次]]></Achieve72>
+    <Achieve73 desc=""><![CDATA[使用技能20次]]></Achieve73>
+    <Achieve74 desc=""><![CDATA[使用技能50次]]></Achieve74>
+    <Achieve75 desc=""><![CDATA[使用技能150次]]></Achieve75>
+    <Achieve76 desc=""><![CDATA[使用技能250次]]></Achieve76>
+    <Achieve81 desc=""><![CDATA[觀看2次廣告]]></Achieve81>
+    <Achieve82 desc=""><![CDATA[觀看5次廣告]]></Achieve82>
+    <Achieve83 desc=""><![CDATA[觀看10次廣告]]></Achieve83>
+    <Achieve84 desc=""><![CDATA[觀看15次廣告]]></Achieve84>
+    <Achieve85 desc=""><![CDATA[觀看25次廣告]]></Achieve85>
+    <Achieve86 desc=""><![CDATA[觀看40次廣告]]></Achieve86>
+    <Achieve91 desc=""><![CDATA[簽到5次]]></Achieve91>
+    <Achieve92 desc=""><![CDATA[簽到10次]]></Achieve92>
+    <Achieve93 desc=""><![CDATA[簽到15次]]></Achieve93>
+    <Achieve94 desc=""><![CDATA[簽到25次]]></Achieve94>
+    <Achieve95 desc=""><![CDATA[簽到35次]]></Achieve95>
+    <Achieve96 desc=""><![CDATA[簽到50次]]></Achieve96>
+    <Achieve101 desc=""><![CDATA[分享1次]]></Achieve101>
+    <Achieve102 desc=""><![CDATA[分享5次]]></Achieve102>
+    <Achieve103 desc=""><![CDATA[分享10次]]></Achieve103>
+    <Achieve104 desc=""><![CDATA[分享15次]]></Achieve104>
+    <Achieve105 desc=""><![CDATA[分享25次]]></Achieve105>
+    <Achieve106 desc=""><![CDATA[分享40次]]></Achieve106>
+    <Achieve111 desc=""><![CDATA[完成小遊戲5次]]></Achieve111>
+    <Achieve112 desc=""><![CDATA[完成小遊戲10次]]></Achieve112>
+    <Achieve113 desc=""><![CDATA[完成小遊戲30次]]></Achieve113>
+    <Achieve114 desc=""><![CDATA[完成小遊戲50次]]></Achieve114>
+    <Achieve115 desc=""><![CDATA[完成小遊戲100次]]></Achieve115>
+    <Achieve116 desc=""><![CDATA[完成小遊戲200次]]></Achieve116>
+    <Achieve121 desc=""><![CDATA[收集花園裡的金幣50次]]></Achieve121>
+    <Achieve122 desc=""><![CDATA[收集花園裡的金幣100次]]></Achieve122>
+    <Achieve123 desc=""><![CDATA[收集花園裡的金幣300次]]></Achieve123>
+    <Achieve124 desc=""><![CDATA[收集花園裡的金幣600次]]></Achieve124>
+    <Achieve125 desc=""><![CDATA[收集花園裡的金幣1000次]]></Achieve125>
+    <Achieve126 desc=""><![CDATA[收集花園裡的金幣2500次]]></Achieve126>
   </AchieveDesc>
   <IAP>
     <LoadAd desc=""><![CDATA[廣告加載中,請稍後再試]]></LoadAd>
@@ -247,6 +348,6 @@
     <FailAd desc=""><![CDATA[廣告播放失敗]]></FailAd>
     <PurchaseSuccess desc=""><![CDATA[購買成功]]></PurchaseSuccess>
     <PurchaseFail desc=""><![CDATA[購買失敗]]></PurchaseFail>
-    <UnvalidCommodity desc=""><![CDATA[該商品不存在]]></UnvalidCommodity>
+    <PurchaseUnvalid desc=""><![CDATA[沒有找到該商品]]></PurchaseUnvalid>
   </IAP>
 </lan>

Assets/Resource/XML/lan/English.xml

@@ -9,7 +9,7 @@
     <F_PersonBtn1 desc=""><![CDATA[Visitors per minute]]></F_PersonBtn1>
     <F_CoinPersonBtn0 desc=""><![CDATA[Ticket]]></F_CoinPersonBtn0>
     <F_CoinPersonBtn1 desc=""><![CDATA[Ticket per visitor]]></F_CoinPersonBtn1>
-    <Fe_BtnLab0 desc=""><![CDATA[UnlockAhead]]></Fe_BtnLab0>
+    <Fe_BtnLab0 desc=""><![CDATA[Unlock Now]]></Fe_BtnLab0>
     <Fe_BtnLab1 desc=""><![CDATA[Unlock]]></Fe_BtnLab1>
     <Fe_BtnLab2 desc=""><![CDATA[Upgrade]]></Fe_BtnLab2>
     <Fe_BtnLab3 desc=""><![CDATA[Buy]]></Fe_BtnLab3>
@@ -192,6 +192,7 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack6>
     <UnlockSlot desc=""><![CDATA[Get Elfs to unlock it]]></UnlockSlot>
     <QuitGame desc=""><![CDATA[Are you sure to quit?]]></QuitGame>
     <NoValidSlot desc=""><![CDATA[There is no valid slot]]></NoValidSlot>
+    <Unlock desc=""><![CDATA[Unlock]]></Unlock>
   </Common>
   <AchieveName>
     <Achieve1 desc=""><![CDATA[Lovely Garden 1]]></Achieve1>
@@ -206,16 +207,66 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack6>
     <Achieve24 desc=""><![CDATA[Fat Wallet 4]]></Achieve24>
     <Achieve25 desc=""><![CDATA[Fat Wallet 5]]></Achieve25>
     <Achieve26 desc=""><![CDATA[Fat Wallet 6]]></Achieve26>
-    <Achieve31 desc=""><![CDATA[]]></Achieve31>
-    <Achieve41 desc=""><![CDATA[]]></Achieve41>
-    <Achieve51 desc=""><![CDATA[]]></Achieve51>
-    <Achieve61 desc=""><![CDATA[]]></Achieve61>
-    <Achieve71 desc=""><![CDATA[]]></Achieve71>
-    <Achieve81 desc=""><![CDATA[]]></Achieve81>
-    <Achieve91 desc=""><![CDATA[]]></Achieve91>
-    <Achieve101 desc=""><![CDATA[]]></Achieve101>
-    <Achieve111 desc=""><![CDATA[]]></Achieve111>
-    <Achieve121 desc=""><![CDATA[]]></Achieve121>
+    <Achieve31 desc=""><![CDATA[Businessman 1]]></Achieve31>
+    <Achieve32 desc=""><![CDATA[Businessman 2]]></Achieve32>
+    <Achieve33 desc=""><![CDATA[Businessman 3]]></Achieve33>
+    <Achieve34 desc=""><![CDATA[Businessman 4]]></Achieve34>
+    <Achieve35 desc=""><![CDATA[Businessman 5]]></Achieve35>
+    <Achieve36 desc=""><![CDATA[Businessman 6]]></Achieve36>
+    <Achieve41 desc=""><![CDATA[Flower Elfs 1]]></Achieve41>
+    <Achieve42 desc=""><![CDATA[Flower Elfs 2]]></Achieve42>
+    <Achieve43 desc=""><![CDATA[Flower Elfs 3]]></Achieve43>
+    <Achieve44 desc=""><![CDATA[Flower Elfs 4]]></Achieve44>
+    <Achieve45 desc=""><![CDATA[Flower Elfs 5]]></Achieve45>
+    <Achieve46 desc=""><![CDATA[Flower Elfs 6]]></Achieve46>
+    <Achieve51 desc=""><![CDATA[Flowers Blooming 1]]></Achieve51>
+    <Achieve52 desc=""><![CDATA[Flowers Blooming 2]]></Achieve52>
+    <Achieve53 desc=""><![CDATA[Flowers Blooming 3]]></Achieve53>
+    <Achieve54 desc=""><![CDATA[Flowers Blooming 4]]></Achieve54>
+    <Achieve55 desc=""><![CDATA[Flowers Blooming 5]]></Achieve55>
+    <Achieve56 desc=""><![CDATA[Flowers Blooming 6]]></Achieve56>
+    <Achieve61 desc=""><![CDATA[Crowded Garden 1]]></Achieve61>
+    <Achieve62 desc=""><![CDATA[Crowded Garden 2]]></Achieve62>
+    <Achieve63 desc=""><![CDATA[Crowded Garden 3]]></Achieve63>
+    <Achieve64 desc=""><![CDATA[Crowded Garden 4]]></Achieve64>
+    <Achieve65 desc=""><![CDATA[Crowded Garden 5]]></Achieve65>
+    <Achieve66 desc=""><![CDATA[Crowded Garden 6]]></Achieve66>
+    <Achieve71 desc=""><![CDATA[Skill Master 1]]></Achieve71>
+    <Achieve72 desc=""><![CDATA[Skill Master 2]]></Achieve72>
+    <Achieve73 desc=""><![CDATA[Skill Master 3]]></Achieve73>
+    <Achieve74 desc=""><![CDATA[Skill Master 4]]></Achieve74>
+    <Achieve75 desc=""><![CDATA[Skill Master 5]]></Achieve75>
+    <Achieve76 desc=""><![CDATA[Skill Master 6]]></Achieve76>
+    <Achieve81 desc=""><![CDATA[Commercial Break 1]]></Achieve81>
+    <Achieve82 desc=""><![CDATA[Commercial Break 2]]></Achieve82>
+    <Achieve83 desc=""><![CDATA[Commercial Break 3]]></Achieve83>
+    <Achieve84 desc=""><![CDATA[Commercial Break 4]]></Achieve84>
+    <Achieve85 desc=""><![CDATA[Commercial Break 5]]></Achieve85>
+    <Achieve86 desc=""><![CDATA[Commercial Break 6]]></Achieve86>
+    <Achieve91 desc=""><![CDATA[Check Attendance 1]]></Achieve91>
+    <Achieve92 desc=""><![CDATA[Check Attendance 2]]></Achieve92>
+    <Achieve93 desc=""><![CDATA[Check Attendance 3]]></Achieve93>
+    <Achieve94 desc=""><![CDATA[Check Attendance 4]]></Achieve94>
+    <Achieve95 desc=""><![CDATA[Check Attendance 5]]></Achieve95>
+    <Achieve96 desc=""><![CDATA[Check Attendance 6]]></Achieve96>
+    <Achieve101 desc=""><![CDATA[Share Now 1]]></Achieve101>
+    <Achieve102 desc=""><![CDATA[Share Now 2]]></Achieve102>
+    <Achieve103 desc=""><![CDATA[Share Now 3]]></Achieve103>
+    <Achieve104 desc=""><![CDATA[Share Now 4]]></Achieve104>
+    <Achieve105 desc=""><![CDATA[Share Now 5]]></Achieve105>
+    <Achieve106 desc=""><![CDATA[Share Now 6]]></Achieve106>
+    <Achieve111 desc=""><![CDATA[Hard Worker 1]]></Achieve111>
+    <Achieve112 desc=""><![CDATA[Hard Worker 2]]></Achieve112>
+    <Achieve113 desc=""><![CDATA[Hard Worker 3]]></Achieve113>
+    <Achieve114 desc=""><![CDATA[Hard Worker 4]]></Achieve114>
+    <Achieve115 desc=""><![CDATA[Hard Worker 5]]></Achieve115>
+    <Achieve116 desc=""><![CDATA[Hard Worker 6]]></Achieve116>
+    <Achieve121 desc=""><![CDATA[Add Up 1]]></Achieve121>
+    <Achieve122 desc=""><![CDATA[Add Up 2]]></Achieve122>
+    <Achieve123 desc=""><![CDATA[Add Up 3]]></Achieve123>
+    <Achieve124 desc=""><![CDATA[Add Up 4]]></Achieve124>
+    <Achieve125 desc=""><![CDATA[Add Up 5]]></Achieve125>
+    <Achieve126 desc=""><![CDATA[Add Up 6]]></Achieve126>
   </AchieveName>
   <AchieveDesc>
     <Achieve1 desc=""><![CDATA[Garden Level 30]]></Achieve1>
@@ -230,23 +281,73 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack6>
     <Achieve24 desc=""><![CDATA[Own 5000 Coins]]></Achieve24>
     <Achieve25 desc=""><![CDATA[Own 8000 Coins]]></Achieve25>
     <Achieve26 desc=""><![CDATA[Own 10000 Coins]]></Achieve26>
-    <Achieve31 desc=""><![CDATA[]]></Achieve31>
-    <Achieve41 desc=""><![CDATA[]]></Achieve41>
-    <Achieve51 desc=""><![CDATA[]]></Achieve51>
-    <Achieve61 desc=""><![CDATA[]]></Achieve61>
-    <Achieve71 desc=""><![CDATA[]]></Achieve71>
-    <Achieve81 desc=""><![CDATA[]]></Achieve81>
-    <Achieve91 desc=""><![CDATA[]]></Achieve91>
-    <Achieve101 desc=""><![CDATA[]]></Achieve101>
-    <Achieve111 desc=""><![CDATA[]]></Achieve111>
-    <Achieve121 desc=""><![CDATA[]]></Achieve121>
+    <Achieve31 desc=""><![CDATA[Collect 3000 Coins]]></Achieve31>
+    <Achieve32 desc=""><![CDATA[Collect 8000 Coins]]></Achieve32>
+    <Achieve33 desc=""><![CDATA[Collect 15000 Coins]]></Achieve33>
+    <Achieve34 desc=""><![CDATA[Collect 30000 Coins]]></Achieve34>
+    <Achieve35 desc=""><![CDATA[Collect 50000 Coins]]></Achieve35>
+    <Achieve36 desc=""><![CDATA[Collect 80000 Coins]]></Achieve36>
+    <Achieve41 desc=""><![CDATA[Achieve total of 10 Elf levels]]></Achieve41>
+    <Achieve42 desc=""><![CDATA[Achieve total of 50 Elf levels]]></Achieve42>
+    <Achieve43 desc=""><![CDATA[Achieve total of 100 Elf levels]]></Achieve43>
+    <Achieve44 desc=""><![CDATA[Achieve total of 180 Elf levels]]></Achieve44>
+    <Achieve45 desc=""><![CDATA[Achieve total of 400 Elf levels]]></Achieve45>
+    <Achieve46 desc=""><![CDATA[Achieve total of 800 Elf levels]]></Achieve46>
+    <Achieve51 desc=""><![CDATA[Collect 1 type of Flower]]></Achieve51>
+    <Achieve52 desc=""><![CDATA[Collect 3 types of Flower]]></Achieve52>
+    <Achieve53 desc=""><![CDATA[Collect 5 types of Flower]]></Achieve53>
+    <Achieve54 desc=""><![CDATA[Collect 10 types of Flower]]></Achieve54>
+    <Achieve55 desc=""><![CDATA[Collect 20 types of Flower]]></Achieve55>
+    <Achieve56 desc=""><![CDATA[Collect 40 types of Flower]]></Achieve56>
+    <Achieve61 desc=""><![CDATA[Achieve total of 500 Visitors]]></Achieve61>
+    <Achieve62 desc=""><![CDATA[Achieve total of 2000 Visitors]]></Achieve62>
+    <Achieve63 desc=""><![CDATA[Achieve total of 10000 Visitors]]></Achieve63>
+    <Achieve64 desc=""><![CDATA[Achieve total of 50000 Visitors]]></Achieve64>
+    <Achieve65 desc=""><![CDATA[Achieve total of 150000 Visitors]]></Achieve65>
+    <Achieve66 desc=""><![CDATA[Achieve total of 300000 Visitors]]></Achieve66>
+    <Achieve71 desc=""><![CDATA[Use Skill 5 times]]></Achieve71>
+    <Achieve72 desc=""><![CDATA[Use Skill 10 times]]></Achieve72>
+    <Achieve73 desc=""><![CDATA[Use Skill 20 times]]></Achieve73>
+    <Achieve74 desc=""><![CDATA[Use Skill 50 times]]></Achieve74>
+    <Achieve75 desc=""><![CDATA[Use Skill 150 times]]></Achieve75>
+    <Achieve76 desc=""><![CDATA[Use Skill 250 times]]></Achieve76>
+    <Achieve81 desc=""><![CDATA[Watch video 2 times]]></Achieve81>
+    <Achieve82 desc=""><![CDATA[Watch video 5 times]]></Achieve82>
+    <Achieve83 desc=""><![CDATA[Watch video 10 times]]></Achieve83>
+    <Achieve84 desc=""><![CDATA[Watch video 15 times]]></Achieve84>
+    <Achieve85 desc=""><![CDATA[Watch video 25 times]]></Achieve85>
+    <Achieve86 desc=""><![CDATA[Watch video 40 times]]></Achieve86>
+    <Achieve91 desc=""><![CDATA[Play game for 5 days]]></Achieve91>
+    <Achieve92 desc=""><![CDATA[Play game for 10 days]]></Achieve92>
+    <Achieve93 desc=""><![CDATA[Play game for 15 days]]></Achieve93>
+    <Achieve94 desc=""><![CDATA[Play game for 25 days]]></Achieve94>
+    <Achieve95 desc=""><![CDATA[Play game for 35 days]]></Achieve95>
+    <Achieve96 desc=""><![CDATA[Play game for 50 days]]></Achieve96>
+    <Achieve101 desc=""><![CDATA[Share 1 time]]></Achieve101>
+    <Achieve102 desc=""><![CDATA[Share 5 times]]></Achieve102>
+    <Achieve103 desc=""><![CDATA[Share 10 times]]></Achieve103>
+    <Achieve104 desc=""><![CDATA[Share 15 times]]></Achieve104>
+    <Achieve105 desc=""><![CDATA[Share 25 times]]></Achieve105>
+    <Achieve106 desc=""><![CDATA[Share 40 times]]></Achieve106>
+    <Achieve111 desc=""><![CDATA[Play mini game 5 times]]></Achieve111>
+    <Achieve112 desc=""><![CDATA[Play mini game 10 times]]></Achieve112>
+    <Achieve113 desc=""><![CDATA[Play mini game 30 times]]></Achieve113>
+    <Achieve114 desc=""><![CDATA[Play mini game 50 times]]></Achieve114>
+    <Achieve115 desc=""><![CDATA[Play mini game 100 times]]></Achieve115>
+    <Achieve116 desc=""><![CDATA[Play mini game 200 times]]></Achieve116>
+    <Achieve121 desc=""><![CDATA[Tap Coins in garden 50 times]]></Achieve121>
+    <Achieve122 desc=""><![CDATA[Tap Coins in garden 100 times]]></Achieve122>
+    <Achieve123 desc=""><![CDATA[Tap Coins in garden 300 times]]></Achieve123>
+    <Achieve124 desc=""><![CDATA[Tap Coins in garden 600 times]]></Achieve124>
+    <Achieve125 desc=""><![CDATA[Tap Coins in garden 1000 times]]></Achieve125>
+    <Achieve126 desc=""><![CDATA[Tap Coins in garden 2500 times]]></Achieve126>
   </AchieveDesc>
   <IAP>
-    <LoadAd desc=""><![CDATA[AD is loading,please try again later]]></LoadAd>
+    <LoadAd desc=""><![CDATA[AD is loading, please try again later]]></LoadAd>
     <IncompleteAd desc=""><![CDATA[AD is incomplete]]></IncompleteAd>
     <FailAd desc=""><![CDATA[Failed to play AD]]></FailAd>
     <PurchaseSuccess desc=""><![CDATA[Purchase success]]></PurchaseSuccess>
     <PurchaseFail desc=""><![CDATA[Purchase failed]]></PurchaseFail>
-    <UnvalidCommodity desc=""><![CDATA[No such commodity]]></UnvalidCommodity>
+    <PurchaseUnvalid desc=""><![CDATA[No such product]]></PurchaseUnvalid>
   </IAP>
 </lan>

Assets/Script/Manage/ManaAchieve.cs

@@ -66,6 +66,7 @@ public class Achieve
     public int Index;
     public int Parent;
     public bool Delete;
+    public bool Availible;
     public float Person;
     public float CoinPerson;
     public float DiamondOnce;
@@ -145,6 +146,8 @@ public class Achieve
 
     public void GetAward()
     {
+        ManaAchieve.AchieveDepth--;
+
         ManaDebug.Log(string.Format("获得钻石<color=red>{0}</color> 参观人次+<color=red>{1}</color> 每人次金币+<color=red>{2}</color>", DiamondOnce, Person, CoinPerson));
 
         ManaAudio.PlayClip(Clip.BtnClip);
@@ -308,6 +311,8 @@ public class Achieve
 
     public void ToProcess(double value)
     {
+        Availible = false;
+
         List<object> objList = new List<object>();
         
         objList.Add(new LanStr("Object", "AchieveItem_BtnLab0"));
@@ -340,6 +345,13 @@ public class Achieve
 
     public void ToAvailible()
     {
+        if (!Availible)
+        {
+            ManaAchieve.AchieveDepth++;
+        }
+
+        Availible = true;
+
         List<object> objList = new List<object>();
 
         objList.Add(new LanStr("Object", "AchieveItem_BtnLab1"));
@@ -373,6 +385,7 @@ public class Achieve
     public void ToComplete()
     {
         Slider.value = 1;
+        Availible = false;
 
         Button.image.material = null;
         Button.interactable = false;
@@ -385,6 +398,42 @@ public class ManaAchieve : Regist
 {
     #region 变量
 
+    public static int AchieveDepth
+    {
+        get { return AchieveDepth_; }
+        set
+        {
+            AchieveDepth_ = value;
+
+            if (ManaTutorial.TutorialA)
+            {
+                return;
+            }
+
+            Outline outline = ManaReso.Get<Outline>("C_Achieve");
+
+            if (outline != null)
+            {
+                if (AchieveDepth_ == 0)
+                {
+                    outline.enabled = false;
+                }
+                else if (AchieveDepth_ > 0)
+                {
+                    outline.enabled = true;
+
+                    ManaReso.Get("C_Achieve").TweenForOutline();
+                }
+                else
+                {
+                    throw new Exception();
+                }
+            }
+        }
+    }
+
+    public static int AchieveDepth_;
+
     public static UnityAction<double> TotalPerson;
     public static UnityAction<double> AdAmt;
     public static UnityAction<double> SkillAmt;
@@ -457,6 +506,11 @@ public class ManaAchieve : Regist
         }
     }
 
+    public override void RegistValueB()
+    {
+        AchieveDepth = AchieveDepth;
+    }
+
 
     public static void UpdateStatus(AchieveType type, double value)
     {

Assets/Script/Manage/ManaAnim.cs

@@ -67,6 +67,7 @@ public class ManaAnim : Regist
     public static Dictionary<Transform, TweenFont> TweenFontDic = new Dictionary<Transform, TweenFont>();
     public static Dictionary<Transform, TweenRect> TweenRectDic = new Dictionary<Transform, TweenRect>();
     public static Dictionary<Transform, TweenScale> TweenScaleDic = new Dictionary<Transform, TweenScale>();
+    public static Dictionary<Transform, TweenOutline> TweenOutlineDic = new Dictionary<Transform, TweenOutline>();
     public static Dictionary<Transform, TweenNumber> TweenNumberDic = new Dictionary<Transform, TweenNumber>();
     public static Dictionary<AudioSource, TweenAudio> TweenAudioDic = new Dictionary<AudioSource, TweenAudio>();
 
@@ -758,6 +759,22 @@ public class ManaAnim : Regist
         return tween;
     }
 
+    public static TweenOutline TweenForOutline(Transform target)
+    {
+        TweenOutline tween;
+
+        if (TweenOutlineDic.TryGetValue(target, out tween))
+        {
+            tween.StartForward();
+        }
+        else
+        {
+            throw new Exception();
+        }
+
+        return tween;
+    }
+
     public static TweenNumber TweenForNumber(Transform target)
     {
         TweenNumber tween;
@@ -920,6 +937,22 @@ public class ManaAnim : Regist
         return tween;
     }
 
+    public static TweenOutline TweenBacOutline(Transform target)
+    {
+        TweenOutline tween;
+
+        if (TweenOutlineDic.TryGetValue(target, out tween))
+        {
+            tween.StartBackward();
+        }
+        else
+        {
+            throw new Exception();
+        }
+
+        return tween;
+    }
+
     public static TweenNumber TweenBacNumber(Transform target)
     {
         TweenNumber tween;
@@ -1406,6 +1439,22 @@ public class ManaAnim : Regist
         return tween;
     }
 
+    public static TweenOutline TweenReForOutline(Transform target)
+    {
+        TweenOutline tween;
+
+        if (TweenOutlineDic.TryGetValue(target, out tween))
+        {
+            tween.ReForward();
+        }
+        else
+        {
+            throw new Exception();
+        }
+
+        return tween;
+    }
+
     public static TweenNumber TweenReForNumber(Transform target)
     {
         TweenNumber tween;
@@ -1568,6 +1617,22 @@ public class ManaAnim : Regist
         return tween;
     }
 
+    public static TweenOutline TweenReBacOutline(Transform target)
+    {
+        TweenOutline tween;
+
+        if (TweenOutlineDic.TryGetValue(target, out tween))
+        {
+            tween.ReBackward();
+        }
+        else
+        {
+            throw new Exception();
+        }
+
+        return tween;
+    }
+
     public static TweenNumber TweenReBacNumber(Transform target)
     {
         TweenNumber tween;
@@ -1837,6 +1902,20 @@ public class ManaAnim : Regist
         }
     }
 
+    public static TweenOutline GetTweenOutline(Transform target)
+    {
+        TweenOutline tween;
+
+        if (TweenOutlineDic.TryGetValue(target, out tween))
+        {
+            return tween;
+        }
+        else
+        {
+            throw new Exception();
+        }
+    }
+
     public static TweenNumber GetTweenNumber(Transform target)
     {
         TweenNumber tween;
@@ -2668,6 +2747,109 @@ public class ManaAnim : Regist
     }
 
 
+    public static TweenOutline CreateTweenOutline(Transform target, float originAlpha, float destinationAlpha, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
+    {
+        Outline outline = target.GetComponent<Outline>();
+        TweenOutline tweenOutline;
+
+        Color origin = outline.effectColor;
+        Color destination = outline.effectColor;
+
+        origin.a = originAlpha;
+        destination.a = destinationAlpha;
+
+        if (TweenOutlineDic.ContainsKey(target))
+        {
+            tweenOutline = TweenOutlineDic[target];
+
+            TweenOutlineDic[target] = new TweenOutline(outline, origin, destination, duration, originActive, destActive, curve, cg);
+
+            return tweenOutline;
+        }
+        else
+        {
+            tweenOutline = new TweenOutline(outline, origin, destination, duration, originActive, destActive, curve, cg);
+
+            TweenOutlineDic.Add(target, tweenOutline);
+
+            return tweenOutline;
+        }
+    }
+
+    public static TweenOutline CreateTweenOutline(Transform target, float destinationAlpha, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
+    {
+        Outline graphic = target.GetComponent<Outline>();
+        TweenOutline tweenOutline;
+
+        Color destination = graphic.effectColor;
+
+        destination.a = destinationAlpha;
+
+        if (TweenOutlineDic.ContainsKey(target))
+        {
+            tweenOutline = TweenOutlineDic[target];
+
+            TweenOutlineDic[target] = new TweenOutline(graphic, graphic.effectColor, destination, duration, originActive, destActive, curve, cg);
+
+            return tweenOutline;
+        }
+        else
+        {
+            tweenOutline = new TweenOutline(graphic, graphic.effectColor, destination, duration, originActive, destActive, curve, cg);
+
+            TweenOutlineDic.Add(target, tweenOutline);
+
+            return tweenOutline;
+        }
+    }
+
+    public static TweenOutline CreateTweenOutline(Transform target, Color origin, Color destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
+    {
+        Outline outline = target.GetComponent<Outline>();
+        TweenOutline tweenOutline;
+
+        if (TweenOutlineDic.ContainsKey(target))
+        {
+            tweenOutline = TweenOutlineDic[target];
+
+            TweenOutlineDic[target] = new TweenOutline(outline, origin, destination, duration, originActive, destActive, curve, cg);
+
+            return tweenOutline;
+        }
+        else
+        {
+            tweenOutline = new TweenOutline(outline, origin, destination, duration, originActive, destActive, curve, cg);
+
+            TweenOutlineDic.Add(target, tweenOutline);
+
+            return tweenOutline;
+        }
+    }
+
+    public static TweenOutline CreateTweenOutline(Transform target, Color destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
+    {
+        Outline graphic = target.GetComponent<Outline>();
+        TweenOutline tweenOutline;
+
+        if (TweenOutlineDic.ContainsKey(target))
+        {
+            tweenOutline = TweenOutlineDic[target];
+
+            TweenOutlineDic[target] = new TweenOutline(graphic, graphic.effectColor, destination, duration, originActive, destActive, curve, cg);
+
+            return tweenOutline;
+        }
+        else
+        {
+            tweenOutline = new TweenOutline(graphic, graphic.effectColor, destination, duration, originActive, destActive, curve, cg);
+
+            TweenOutlineDic.Add(target, tweenOutline);
+
+            return tweenOutline;
+        }
+    }
+
+
     public static TweenNumber CreateTweenNumber(Transform target, int origin, int destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
     {
         Text text = target.GetComponent<Text>();

Assets/Script/Manage/ManaData.cs

@@ -432,7 +432,7 @@ public class ManaData : Regist
 
             if (MainDepth == 0)
             {
-                ManaReso.Get("C_Main").TweenConForCG();
+                ManaReso.Get("C_Group").TweenConForCG();
             }
         }
         else
@@ -445,7 +445,7 @@ public class ManaData : Regist
 
                 if (MainDepth == -1)
                 {
-                    ManaReso.Get("C_Main").TweenConBacCG();
+                    ManaReso.Get("C_Group").TweenConBacCG();
                 }
             }
         }
@@ -511,7 +511,7 @@ public class ManaData : Regist
         {
             if (!ManaTutorial.TutorialA && !ManaTutorial.TutorialB)
             {
-                ManaReso.Get("C_Main").TweenConBacCG();
+                ManaReso.Get("C_Group").TweenConBacCG();
                 ManaReso.Get("B_SignIn").TweenConForCG();
             }
         }

Assets/Script/Manage/ManaMiniGame.cs

@@ -94,7 +94,7 @@ public class Award
 
         #region Coin
 
-        int coin = (int)Auxiliary.FmlParse(CoinFml, "s", score.ToString());
+        int coin = (int)Auxiliary.FmlParse(CoinFml, "s", score.ToString(), "l", Mathf.Clamp(ManaData.Level, 1, 9999).ToString());
         coin = (int) (coin*(1 + ManaData.SkillPlus) + BonusCoin);
 
         ManaData.Coin += coin;
@@ -583,8 +583,17 @@ public class ManaMiniGame : Regist
 
             TimerLab.text = (GameTime-_GameTimer).ToString("0.0");
 
-            TimerBk.fillAmount = _GameTimer / GameTime;
-            TimerBk.material.SetFloat("_Fill", TimerBk.fillAmount);
+            try
+            {
+                TimerBk.fillAmount = _GameTimer/GameTime;
+                TimerBk.material.SetFloat("_Fill", TimerBk.fillAmount);
+
+                ManaDebug.Log("<color=blue>" + "fillAmount :" + TimerBk.fillAmount + "</color>");
+            }
+            catch (Exception e)
+            {
+                ManaDebug.Log("<color=blue>" + e.Message + "</color>");
+            }
         }
     }
     public static float PrepareTimer
@@ -652,7 +661,7 @@ public class ManaMiniGame : Regist
             return;
         }
 
-        GameTimer += Time.fixedDeltaTime;
+        GameTimer += Time.fixedDeltaTime * 15;
         if (GameTimer >= GameTime)
         {
             GameOver();

Assets/Script/Manage/ManaServer.cs

@@ -8,6 +8,7 @@ using System.Collections;
 using System.Net;
 using System.Net.Mail;
 using System.Security.Cryptography.X509Certificates;
+using System.Text;
 using UnityEngine.UI;
 
 public class MyCredentials : ICredentialsByHost
@@ -67,7 +68,7 @@ public class ManaServer : Regist
 
     private void Update()
     {
-        if (!LoginComplete)
+        if (!ManaData.InitiateComplete)
         {
             Timer += UnityEngine.Time.fixedDeltaTime;
 
@@ -90,36 +91,49 @@ public class ManaServer : Regist
 
     private static void LoginCallback(JsonData jsonData)
     {
-        LoginComplete = true;
-
-        if (jsonData.Inst_Object.ContainsKey("c") && jsonData["c"].ToJson() == "0")
+        try
         {
-            Connect = true;
+            LoginComplete = true;
 
-            JsonData = jsonData;
+            if (jsonData.Inst_Object.ContainsKey("c") && jsonData["c"].ToJson() == "0")
+            {
+                Connect = true;
 
-            Time = DateUtil.GetTime(jsonData["time"].ToJson());
+                JsonData = jsonData;
 
-            if (Data._PlayerDoc != null)
-            {
-                if (Data.GetPlayerString("ID") == "Default")
-                {
-                    ID = jsonData["o"].ToString();
+                Time = DateUtil.GetTime(jsonData["time"].ToJson());
 
-                    if (Initializer.LoadComplete)
+                if (Data._PlayerDoc != null)
+                {
+                    if (Data.GetPlayerString("ID") == "Default")
                     {
-                        ManaReso.SetText("L_UserLab", ID);
+                        ID = jsonData["o"].ToString();
+
+                        if (Initializer.LoadComplete)
+                        {
+                            ManaReso.SetText("L_UserLab", ID);
+                        }
                     }
                 }
+
+                ManaDebug.Log("<color=red>连接成功</color>");
             }
+            else
+            {
+                Connect = false;
 
-            ManaDebug.Log("<color=red>连接成功</color>");
+                ManaDebug.Log("<color=red>连接失败</color>");
+            }
         }
-        else
+        catch (Exception e)
         {
-            Connect = false;
+            ManaDebug.Log(e.Message);
+            ManaDebug.Log(jsonData.ToJson());
+            ManaDebug.Log("如果看到这个Bug,把上面的调试信息发给我,thank you");
 
-            ManaDebug.Log("<color=red>连接失败</color>");
+            Debug.Log(e.Message);
+            Debug.Log(jsonData.ToJson());
+            Debug.LogError("如果看到这个Bug,把上面的调试信息发给我,thank you");
         }
     }
 
@@ -177,7 +191,7 @@ public class ManaServer : Regist
 
             ReportStr = str;
 
-            mailMessage.Body = ReportStr;
+            mailMessage.Body = ReportStr + '\n' + GetSystemInfo();
 
             mailMessage.Subject = ID + " MyLovelyGargen Issue";
 
@@ -189,4 +203,59 @@ public class ManaServer : Regist
             Bubble.Show(null, Language.GetStr("UI", "Lb_Send0"));
         }
     }
+
+    public static string GetSystemInfo()
+    {
+        StringBuilder sb = new StringBuilder();
+
+        sb.AppendLine("deviceType :" + SystemInfo.deviceType.ToString());
+        sb.AppendLine("deviceName :" + SystemInfo.deviceName.ToString());
+        sb.AppendLine("deviceModel :" + SystemInfo.deviceModel.ToString());
+        sb.AppendLine("deviceUniqueIdentifier :" + SystemInfo.deviceUniqueIdentifier.ToString());
+
+        sb.AppendLine("graphicsDeviceID :" + SystemInfo.graphicsDeviceID.ToString());
+        sb.AppendLine("graphicsDeviceType :" + SystemInfo.graphicsDeviceType.ToString());
+        sb.AppendLine("graphicsDeviceName :" + SystemInfo.graphicsDeviceName.ToString());
+        sb.AppendLine("graphicsShaderLevel :" + SystemInfo.graphicsShaderLevel.ToString());
+        sb.AppendLine("graphicsMemorySize :" + SystemInfo.graphicsMemorySize.ToString());
+        sb.AppendLine("graphicsDeviceVersion :" + SystemInfo.graphicsDeviceVersion.ToString());
+        sb.AppendLine("graphicsMultiThreaded :" + SystemInfo.graphicsMultiThreaded.ToString());
+        sb.AppendLine("graphicsDeviceVendor :" + SystemInfo.graphicsDeviceVendor.ToString());
+        sb.AppendLine("graphicsDeviceVendorID :" + SystemInfo.graphicsDeviceVendorID.ToString());
+
+        sb.AppendLine("npotSupport :" + SystemInfo.npotSupport.ToString());
+        sb.AppendLine("maxTextureSize :" + SystemInfo.maxTextureSize.ToString());
+
+        sb.AppendLine("operatingSystem :" + SystemInfo.operatingSystem.ToString());
+        sb.AppendLine("operatingSystemFamily :" + SystemInfo.operatingSystemFamily.ToString());
+
+        sb.AppendLine("processorType :" + SystemInfo.processorType.ToString());
+        sb.AppendLine("processorCount :" + SystemInfo.processorCount.ToString());
+        sb.AppendLine("processorFrequency :" + SystemInfo.processorFrequency.ToString());
+
+        sb.AppendLine("copyTextureSupport :" + SystemInfo.copyTextureSupport.ToString());
+        sb.AppendLine("graphicsMultiThreaded :" + SystemInfo.graphicsMultiThreaded.ToString());
+        sb.AppendLine("supportedRenderTargetCount :" + SystemInfo.supportedRenderTargetCount.ToString());
+        sb.AppendLine("supports3DTextures :" + SystemInfo.supports3DTextures.ToString());
+        sb.AppendLine("supports2DArrayTextures :" + SystemInfo.supports2DArrayTextures.ToString());
+        sb.AppendLine("supportsAccelerometer :" + SystemInfo.supportsAccelerometer.ToString());
+        sb.AppendLine("supportsAudio :" + SystemInfo.supportsAudio.ToString());
+        sb.AppendLine("supportsComputeShaders :" + SystemInfo.supportsComputeShaders.ToString());
+        sb.AppendLine("supportsCubemapArrayTextures :" + SystemInfo.supportsCubemapArrayTextures.ToString());
+        sb.AppendLine("supportsGyroscope :" + SystemInfo.supportsGyroscope.ToString());
+        sb.AppendLine("supportsImageEffects :" + SystemInfo.supportsImageEffects.ToString());
+        sb.AppendLine("supportsInstancing :" + SystemInfo.supportsInstancing.ToString());
+        sb.AppendLine("supportsLocationService :" + SystemInfo.supportsLocationService.ToString());
+        sb.AppendLine("supportsMotionVectors :" + SystemInfo.supportsMotionVectors.ToString());
+        sb.AppendLine("supportsRawShadowDepthSampling :" + SystemInfo.supportsRawShadowDepthSampling.ToString());
+        sb.AppendLine("supportsRenderToCubemap :" + SystemInfo.supportsRenderToCubemap.ToString());
+        sb.AppendLine("supportsShadows :" + SystemInfo.supportsShadows.ToString());
+        sb.AppendLine("supportsSparseTextures :" + SystemInfo.supportsSparseTextures.ToString());
+        sb.AppendLine("supportsVibration :" + SystemInfo.supportsVibration.ToString());
+
+        sb.AppendLine("systemMemorySize :" + SystemInfo.systemMemorySize.ToString());
+        sb.AppendLine("usesReversedZBuffer :" + SystemInfo.usesReversedZBuffer.ToString());
+
+        return sb.ToString();
+    }
 }

Assets/Script/Manage/ManaTutorial.cs

@@ -201,6 +201,8 @@ public class ManaTutorial : Regist
     {
         TutorialA = false;
 
+        ManaAchieve.AchieveDepth = ManaAchieve.AchieveDepth;
+
         Tutorial.HightDisable();
 
         ManaReso.SetActive("Tutorial", false);
@@ -276,7 +278,7 @@ public class ManaTutorial : Regist
 
         ManaUI.Instance.TutorialToRegular();
 
-        ManaReso.Get("C_Main").TweenForCG();
+        ManaReso.Get("C_Group").TweenForCG();
         ManaReso.Get("C_MiniGame").TweenForCG();
 
         ManaReso.SetActive("C_Coin", false);
@@ -426,7 +428,7 @@ public class ManaTutorial : Regist
 
         ManaReso.SetActive("N_Tutorial", true);
 
-        Tween tween = ManaReso.Get("C_Main").TweenForCG();
+        Tween tween = ManaReso.Get("C_Group").TweenForCG();
 
         tween.AddEventOnetime
         (

Assets/Script/Manage/ManaUI.cs

@@ -13,7 +13,7 @@ using Random = UnityEngine.Random;
 
 public class ManaUI : Regist
 {
-	#region 变量
+    #region 变量
 
     public static ManaUI Instance;
     public static Transform Canvas;
@@ -27,11 +27,11 @@ public class ManaUI : Regist
     public static void InitialInstantiate()
     {
         Transform tra = new GameObject("UI").transform;
-        
+
         tra.parent = Transform;
 
         Canvas = ManaReso.Get<ObjRoot>("Canvas", Folder.UI, false, tra, false, ObjType.Canvas);
-        Camera = ManaReso.Get<ObjRoot>("MainCamera", Folder.UI, true, tra,  false, ObjType.MainCamera);
+        Camera = ManaReso.Get<ObjRoot>("MainCamera", Folder.UI, true, tra, false, ObjType.MainCamera);
         EventSystem = ManaReso.Get<ObjRoot>("EventSystem", Folder.UI, false, tra, false, ObjType.EventSystem);
 
         tra = ManaReso.Get<ObjRoot>("GroupA", Folder.UI, true, Canvas, false, ObjType.GroupA);
@@ -45,7 +45,7 @@ public class ManaUI : Regist
 
         tra = ManaReso.Get<ObjRoot>("GroupD", Folder.UI, true, Canvas, false, ObjType.GroupD);
         tra.SetActive(true);
-        
+
         ManaReso.TraDic.Add(Canvas.name, Canvas);
     }
 
@@ -104,7 +104,7 @@ public class ManaUI : Regist
             "Ba_Confirm",
             () =>
             {
-                ManaAudio.PlayClip(Clip.BtnClip);
+                ManaAudio.PlayClip(Clip.CurrentClip);
 
                 int daySpan = ManaServer.Time.Day - ManaSign.SignTime.Day;
                 int monthSpan = ManaServer.Time.Month - ManaSign.SignTime.Month;
@@ -138,7 +138,7 @@ public class ManaUI : Regist
                 ManaReso.SetActive("Bb_Rotate", true);
                 ManaReso.SetActive("Bb_Confirm", true);
 
-                ManaAudio.PlayClip(Clip.BtnClip);
+                ManaAudio.PlayClip(Clip.CurrentClip);
             }
         );
 
@@ -179,9 +179,9 @@ public class ManaUI : Regist
 
         ManaLan.Add(ManaReso.Get<Text>("C_MiniGameLab"), new LanStr("UI", "C_MiniGameLab"));
 
-        #region C_Main
+        #region C_Group
 
-        tween = ManaReso.Get("C_Main").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+        tween = ManaReso.Get("C_Group").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
 
         tween.OnForwardStart += () =>
         {
@@ -211,6 +211,20 @@ public class ManaUI : Regist
 
         #region C_Achieve
 
+        tween = ManaAnim.CreateTweenOutline(ManaReso.Get("C_Achieve"), 0, 201/255f, true, true, Curve.EaseOutQuad);
+
+        var tween3 = tween;
+        tween.OnForwardFinish += () =>
+        {
+            tween3.StartBackward();
+        };
+
+        var tween4 = tween;
+        tween.OnBackwardFinish += () =>
+        {
+            tween4.StartForward();
+        };
+
         ManaReso.AddButtonEvent
         (
             "C_Achieve",
@@ -422,8 +436,15 @@ public class ManaUI : Regist
         #endregion
 
         #region D_TimerIcon
-
-        ManaReso.Get<Image>("D_TimerIcon").material = ManaReso.Load<Material>("TimerMat", Folder.Effect);
+        
+        try
+        {
+            ManaReso.Get<Image>("D_TimerIcon").material = ManaReso.Load<Material>("TimerMat", Folder.Effect);
+        }
+        catch (Exception e)
+        {
+            ManaDebug.Log("<color=blue>" + e.Message + "</color>");
+        }
 
         #endregion
 
@@ -433,7 +454,7 @@ public class ManaUI : Regist
 
         tween.OnForwardStart += () =>
         {
-            ManaReso.Get("C_Main").TweenBacCG();
+            ManaReso.Get("C_Group").TweenBacCG();
 
             ManaAudio.MusicTheme.TweenBacAudio();
 
@@ -494,13 +515,13 @@ public class ManaUI : Regist
             false,
             new List<UnityAction>()
             {
-                    () => { text.text = "3"; },
+                    () => { text.text = "3"; ManaAudio.PlayClip(Clip.BubbleClip); },
                     () => { },
-                    () => { text.text = "2"; },
+                    () => { text.text = "2";; ManaAudio.PlayClip(Clip.BubbleClip); },
                     () => { },
-                    () => { text.text = "1"; },
+                    () => { text.text = "1";; ManaAudio.PlayClip(Clip.BubbleClip); },
                     () => { },
-                    () => { text.text = Language.GetStr("UI", "D_PrepareLab"); },
+                    () => { text.text = Language.GetStr("UI", "D_PrepareLab"); ManaAudio.PlayClip(Clip.CurrentClip); },
                     () => { },
                     () => { },
             }
@@ -531,7 +552,7 @@ public class ManaUI : Regist
             () =>
             {
                 ManaAudio.PlayClip(Clip.CloseClip);
-                ManaReso.Get("C_Main").TweenForCG();
+                ManaReso.Get("C_Group").TweenForCG();
 
                 ManaReso.Get("Da_Info").TweenBacCG();
                 ManaReso.Get("GardenMini").TweenBacVec();
@@ -574,8 +595,8 @@ public class ManaUI : Regist
             "Da_GetAward",
             () =>
             {
-                ManaAudio.PlayClip(Clip.BtnClip);
-                ManaReso.Get("C_Main").TweenForCG();
+                ManaAudio.PlayClip(Clip.CurrentClip);
+                ManaReso.Get("C_Group").TweenForCG();
 
                 ManaReso.Get("Da_Info").TweenBacCG();
                 ManaReso.Get("GardenMini").TweenBacVec();
@@ -943,7 +964,7 @@ public class ManaUI : Regist
 
         tween.OnForwardStart += () =>
         {
-            ManaReso.Get("C_Main").TweenBacCG();
+            ManaReso.Get("C_Group").TweenBacCG();
 
             ManaReso.SetActive("F_Manage", true);
 
@@ -962,7 +983,7 @@ public class ManaUI : Regist
 
         tween.OnBackwardFinish += () =>
         {
-            ManaReso.Get("C_Main").TweenForCG();
+            ManaReso.Get("C_Group").TweenForCG();
 
             ManaReso.SetActive("F_Manage", false);
         };
@@ -1095,7 +1116,7 @@ public class ManaUI : Regist
 
             if (ManaData.MainDepth == -1) 
             {
-                ManaReso.Get("C_Main").TweenBacCG();
+                ManaReso.Get("C_Group").TweenBacCG();
             }
 
             ManaData.MainDepth++;
@@ -1220,7 +1241,7 @@ public class ManaUI : Regist
         {
             if (ManaData.MainDepth == -1)
             {
-                ManaReso.Get("C_Main").TweenBacCG();
+                ManaReso.Get("C_Group").TweenBacCG();
             }
 
             ManaData.MainDepth++;
@@ -1286,14 +1307,14 @@ public class ManaUI : Regist
 
         tween.OnForwardStart += () =>
         {
-            ManaReso.Get("C_Main").TweenBacCG();
+            ManaReso.Get("C_Group").TweenBacCG();
 
             ManaData.MainDepth++;
         };
 
         tween.OnBackwardFinish += () =>
         {
-            ManaReso.Get("C_Main").TweenForCG();
+            ManaReso.Get("C_Group").TweenForCG();
         };
 
         #endregion
@@ -1549,7 +1570,7 @@ public class ManaUI : Regist
 
         tween.OnForwardStart += () =>
         {
-            ManaReso.Get("C_Main").TweenBacCG();
+            ManaReso.Get("C_Group").TweenBacCG();
 
             ManaReso.SetActive("M_Achieve", true);
 
@@ -1568,7 +1589,7 @@ public class ManaUI : Regist
 
         tween.OnBackwardFinish += () =>
         {
-            ManaReso.Get("C_Main").TweenForCG();
+            ManaReso.Get("C_Group").TweenForCG();
 
             ManaReso.SetActive("M_Achieve", false);
             ManaReso.SetActive("M_Achieve0", false);

Assets/Script/Manage/ManagerIAP.cs

@@ -86,7 +86,7 @@ public class ManagerIAP : IStoreListener
 
         if (!ProductList.Contains(id))
         {
-            Bubble.Show(null, Language.GetStr("IAP", "UnvalidCommodity"));
+            Bubble.Show(null, Language.GetStr("IAP", "PurchaseUnvalid"));
 
             return;
         }

Assets/Script/Object/Flower.cs

@@ -54,8 +54,6 @@ public class FlowerInfo
             {
                 Image.material = null;
 
-                Button.interactable = true;
-
                 if (Special)
                 {
                     if (ManaGarden.MyFlowerSpec == 0)
@@ -144,7 +142,14 @@ public class FlowerInfo
         (
             () =>
             {
-                ManaGarden.PlantFlower(this);
+                if (Unlock)
+                {
+                    ManaGarden.PlantFlower(this);
+                }
+                else
+                {
+                    Toast.Show(1.5f, Name + " " + Language.GetStr("Common", "Unlock"));
+                }
             }
         );
     }
@@ -456,7 +461,7 @@ public class Flower : ObjRoot, IPointerClickHandler
 
     public void GetAward()
     {
-        ManaAudio.PlayClip(Clip.BubbleClip);
+        ManaAudio.PlayClip(Clip.CurrentClip);
 
         PlayParticle();
 

Assets/Script/Tool/Anim/TweenOutline.cs

@@ -0,0 +1,166 @@
+using UnityEngine;
+using UnityEngine.UI;
+
+using System;
+using System.Collections;
+
+public class TweenOutline : Tween
+{
+    #region 变量
+
+    public override bool InOrigin
+    {
+        get
+        {
+            if (Target.effectColor.Equal(Origin))
+            {
+                _InOrigin = true;
+            }
+            else
+            {
+                _InOrigin = false;
+            }
+
+            return _InOrigin;
+        }
+        set
+        {
+            _InOrigin = value;
+
+            if (_InOrigin)
+            {
+                Target.effectColor = Origin;
+
+                FinishBackward();
+            }
+        }
+    }
+
+    public override bool InDestination
+    {
+        get
+        {
+            if (Target.effectColor.Equal(Destination))
+            {
+                _InDestination = true;
+            }
+            else
+            {
+                _InDestination = false;
+            }
+
+            return _InDestination;
+        }
+        set
+        {
+            _InDestination = value;
+
+            if (_InDestination)
+            {
+                Target.effectColor = Destination;
+
+                FinishForward();
+            }
+        }
+    }
+
+    public Color Delta;
+    public Color Origin;
+    public Color Destination;
+    public Outline Target;
+    public CurveFunctionC Func;
+
+    #endregion
+
+    public TweenOutline(Outline target, Color origin, Color destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false) : base(cg, curve, target)
+    {
+        Func = ManaAnim.CurveFuncDicC[curve];
+        Target = target;
+
+        InForward = false;
+        InBackward = false;
+
+        Delta = destination - origin;
+        Origin = origin;
+        Duration = duration;
+        DestActive = destActive;
+        Destination = destination;
+        OriginActive = originActive;
+    }
+
+    public override void StartForward()
+    {
+        base.StartForward();
+
+        if (InBackward)
+        {
+            Timer = ManaAnim.GetTimerColor(Target.effectColor, Duration, Origin, Delta, Curve);
+        }
+    }
+
+    public override void StartBackward()
+    {
+        base.StartBackward();
+
+        if (InForward)
+        {
+            Timer = ManaAnim.GetTimerColor(Target.effectColor, Duration, Destination, new Color(-Delta.r, -Delta.g, -Delta.b, -Delta.a), Curve);
+        }
+    }
+
+    public override bool DoForward()
+    {
+        Timer += Time.fixedDeltaTime;
+
+        if (Timer > Duration)
+        {
+            FinishForward();
+
+            Timer = 0;
+
+            InForward = false;
+            InDestination = true;
+
+            if (OnForwardFinish != null)
+            {
+                OnForwardFinish.Invoke();
+            }
+
+            return true;
+        }
+        else
+        {
+            Target.effectColor = Func(Timer, Duration, Origin, Delta);
+
+            return false;
+        }
+    }
+
+    public override bool DoBackward()
+    {
+        Timer += Time.fixedDeltaTime;
+
+        if (Timer > Duration)
+        {
+            FinishBackward();
+
+            Timer = 0;
+
+            InBackward = false;
+            InOrigin = true;
+
+            if (OnBackwardFinish != null)
+            {
+                OnBackwardFinish.Invoke();
+            }
+
+            return true;
+        }
+        else
+        {
+            Target.effectColor = Func(Timer, Duration, Destination, new Color(-Delta.r, -Delta.g, -Delta.b, -Delta.a));
+
+            return false;
+        }
+    }
+}

Assets/Script/Tool/Anim/TweenOutline.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: df8a0cc7d53953d4d837ad6143fe25db
+timeCreated: 1494558448
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/Tool/Auxiliary.cs

@@ -121,11 +121,11 @@ public class Auxiliary : Regist
         //    }
         //}
 
-        //if (Input.GetKeyDown(KeyCode.I))
-        //{
-        //    ManaData.Coin += 100000;
-        //    ManaData.Diamond += 1000;
-        //}
+        if (Input.GetKeyDown(KeyCode.I))
+        {
+            ManaData.Coin += 1000;
+            ManaData.Diamond += 1000;
+        }
 
         //if (Input.GetKeyDown(KeyCode.U))
         //{

Assets/Script/Tool/Extension.cs

@@ -451,6 +451,11 @@ public static class Extension
         return ManaAnim.TweenForAudio(audioSource);
     }
 
+    public static TweenOutline TweenForOutline(this Component comp)
+    {
+        return ManaAnim.TweenForOutline(comp.transform);
+    }
+
     public static TweenNumber TweenForNumber(this Component comp)
     {
         return ManaAnim.TweenForNumber(comp.transform);
@@ -502,6 +507,11 @@ public static class Extension
         return ManaAnim.TweenBacAudio(audioSource);
     }
 
+    public static TweenOutline TweenBacOutline(this Component comp)
+    {
+        return ManaAnim.TweenBacOutline(comp.transform);
+    }
+
     public static TweenNumber TweenBacNumber(this Component comp)
     {
         return ManaAnim.TweenBacNumber(comp.transform);
@@ -553,6 +563,11 @@ public static class Extension
         return ManaAnim.TweenReForAudio(audioSource);
     }
 
+    public static TweenOutline TweenReForOutline(this Component comp)
+    {
+        return ManaAnim.TweenReForOutline(comp.transform);
+    }
+
     public static TweenNumber TweenReForNumber(this Component comp)
     {
         return ManaAnim.TweenReForNumber(comp.transform);
@@ -604,6 +619,11 @@ public static class Extension
         return ManaAnim.TweenReBacAudio(audioSource);
     }
 
+    public static TweenOutline TweenReBacOutline(this Component comp)
+    {
+        return ManaAnim.TweenReBacOutline(comp.transform);
+    }
+
     public static TweenNumber TweenReBacNumber(this Component comp)
     {
         return ManaAnim.TweenReBacNumber(comp.transform);
@@ -757,6 +777,11 @@ public static class Extension
         return ManaAnim.GetTweenAudio(audioSource);
     }
 
+    public static TweenOutline GetTweenOutline(this Component comp)
+    {
+        return ManaAnim.GetTweenOutline(comp.transform);
+    }
+
     public static TweenNumber GetTweenNumber(this Component comp)
     {
         return ManaAnim.GetTweenNumber(comp.transform);
@@ -901,6 +926,27 @@ public static class Extension
     }
 
 
+    public static TweenOutline CreateTweenOutline(this Component comp, float origin, float destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
+    {
+        return ManaAnim.CreateTweenOutline(comp.transform, origin, destination, duration, originActive, destActive, curve, cg);
+    }
+
+    public static TweenOutline CreateTweenOutline(this Component comp, float destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
+    {
+        return ManaAnim.CreateTweenOutline(comp.transform, destination, duration, originActive, destActive, curve, cg);
+    }
+
+    public static TweenOutline CreateTweenOutline(this Component comp, Color origin, Color destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
+    {
+        return ManaAnim.CreateTweenOutline(comp.transform, origin, destination, duration, originActive, destActive, curve, cg);
+    }
+
+    public static TweenOutline CreateTweenOutline(this Component comp, Color destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
+    {
+        return ManaAnim.CreateTweenOutline(comp.transform, destination, duration, originActive, destActive, curve, cg);
+    }
+
+
     public static TweenNumber CreateTweenNumber(this Component comp, int origin, int destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
     {
         return ManaAnim.CreateTweenNumber(comp.transform, origin, destination, duration, originActive, destActive, curve, cg);

ToList.txt

@@ -5,9 +5,19 @@ ObjRoot(
 ScrollRect的Locate好像有点误差(金币不够时的导航)
 
 
-第一次启动慢 但之后就快了
+超时Bug
 
-从购买到购买失败显示有点问题
+拖尾Shader
+
+分享
+
+蝴蝶动画
+
+成就描述
+
+成就中的分享
+
+小游戏时间 Scale
 
 
 收益控制