temp

Assets/Resource/Prefab/PrefabUI/AchieveItem.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 207b7751524785a428904038ac978d0a
+timeCreated: 1491466785
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: ui
+  assetBundleVariant: 

Assets/Resource/Sprite/SpriteUI/Atlas.png.meta

@@ -124,5 +124,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: ui
+  assetBundleName: atlas
   assetBundleVariant: 

Assets/Resource/XML/Config/ability_config.xml

@@ -3,16 +3,16 @@
   <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="100" 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="" 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="" label="" />
   <item id="4" name="滴哩哩的小黄鹂" class="1" class_id="7" coin_person="" person="" skill_cd="5%" unlock_lv="" 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="Bird,GardenBk4" 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="" 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="" 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="" 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="" 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="" 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="" 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="" 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="" 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="" 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="" 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="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="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="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="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="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="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="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="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="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="ButterflyWhite" label="" />
   <comment>
     <id>
 id

Assets/Resource/XML/Config/achieve_config.xml

@@ -1,10 +1,16 @@
 <data>
-  <item id="1" index="1" name="" desc="" type="1" value="10" parent="" del="1" diamond_once="10" coin_person="" person="" icon="" />
-  <item id="2" index="1" name="" desc="" type="1" value="25" parent="1" del="1" diamond_once="15" coin_person="" person="" icon="" />
-  <item id="3" index="1" name="" desc="" type="1" value="50" parent="2" del="1" diamond_once="20" coin_person="" person="" icon="" />
-  <item id="4" index="1" name="" desc="" type="1" value="100" parent="3" del="1" diamond_once="30" coin_person="" person="" icon="" />
-  <item id="5" index="1" name="" desc="" type="1" value="200" parent="4" del="1" diamond_once="40" coin_person="" person="" icon="" />
-  <item id="6" index="1" name="" desc="" type="1" value="300" parent="5" del="0" diamond_once="50" coin_person="" person="" icon="" />
+  <item id="1" index="1" name="美丽花园-1" desc="花园等级达到 30" type="1" value="30" parent="" del="1" diamond_once="10" coin_person="" person="" icon="成就按钮" />
+  <item id="2" index="1" name="美丽花园-2" desc="花园等级达到 50" type="1" value="50" parent="1" del="1" diamond_once="15" coin_person="" person="" icon="成就按钮" />
+  <item id="3" index="1" name="美丽花园-3" desc="花园等级达到 100" type="1" value="100" parent="2" del="1" diamond_once="20" coin_person="" person="" icon="成就按钮" />
+  <item id="4" index="1" name="美丽花园-4" desc="花园等级达到 200" type="1" value="200" parent="3" del="1" diamond_once="30" coin_person="" person="" icon="成就按钮" />
+  <item id="5" index="1" name="美丽花园-5" desc="花园等级达到 300" type="1" value="300" parent="4" del="1" diamond_once="40" coin_person="" person="" icon="成就按钮" />
+  <item id="6" index="1" name="美丽花园-6" desc="花园等级达到 400" type="1" value="400" parent="5" del="0" diamond_once="50" coin_person="" person="" icon="成就按钮" />
+  <item id="21" index="2" name="鼓鼓的钱包-1" desc="拥有1000金币" type="2" value="1000" parent="" del="1" diamond_once="5" coin_person="" person="" icon="成就按钮" />
+  <item id="22" index="2" name="鼓鼓的钱包-2" desc="拥有2000金币" type="2" value="2000" parent="21" del="1" diamond_once="10" coin_person="" person="" icon="成就按钮" />
+  <item id="23" index="2" name="鼓鼓的钱包-3" desc="拥有3000金币" type="2" value="3000" parent="22" del="1" diamond_once="15" coin_person="" person="" icon="成就按钮" />
+  <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="成就按钮" />
   <comment>
     <id>
 

Assets/Resource/XML/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="5" />
+  <Version value="7" />
   <Slot value="7" />
   <Sign value="0" />
   <Coin value="0" />
@@ -13,6 +13,7 @@
   <MiniGameAmt value="0" />
   <PlantList SlotA1="0" SlotA2="1" SlotA3="2" SlotA4="3" SlotA5="4" SlotA6="5" SlotA7="6" />
   <FlowerList ID="0 1 2 3 4 5 6 7 8 9" />
+  <AchieveList></AchieveList>
   <SkillList>
     <Skill5 SkillType="Skill" ItemStatus="Lock" Level="0" CdTimer="0" EffectTimer="0" />
     <Skill6 SkillType="Skill" ItemStatus="Lock" Level="0" CdTimer="0" EffectTimer="0" />

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -55,6 +55,7 @@
     <L_TraChiLab desc=""><![CDATA[繁體中文]]></L_TraChiLab>
     <L_EnglishLab desc=""><![CDATA[English]]></L_EnglishLab>
     <L_SimChiLab desc=""><![CDATA[简体中文]]></L_SimChiLab>
+    <M_Tit desc=""><![CDATA[成就]]></M_Tit>
   </UI>
   <FlowerName>
     <Flower1 desc=""><![CDATA[粉色小花]]></Flower1>
@@ -158,6 +159,41 @@
   </SkillDescription>
   <Object>
     <FlowerItemG_Lab desc=""><![CDATA[已放置]]></FlowerItemG_Lab>
+    <AchieveItem_BtnLab0 desc=""><![CDATA[奖励]]></AchieveItem_BtnLab0>
+    <AchieveItem_BtnLab1 desc=""><![CDATA[领取奖励]]></AchieveItem_BtnLab1>
+    <AchieveItem_BtnLab2 desc=""><![CDATA[已完成]]></AchieveItem_BtnLab2>
     <SlotSign desc=""><![CDATA[未开垦]]></SlotSign>
   </Object>
+  <Common>
+    <Person desc=""><![CDATA[参观人次]]></Person>
+    <CoinPerson desc=""><![CDATA[每人次金币]]></CoinPerson>
+  </Common>
+  <AchieveName>
+    <Achieve1 desc=""><![CDATA[美丽花园-1]]></Achieve1>
+    <Achieve2 desc=""><![CDATA[美丽花园-2]]></Achieve2>
+    <Achieve3 desc=""><![CDATA[美丽花园-3]]></Achieve3>
+    <Achieve4 desc=""><![CDATA[美丽花园-4]]></Achieve4>
+    <Achieve5 desc=""><![CDATA[美丽花园-5]]></Achieve5>
+    <Achieve6 desc=""><![CDATA[美丽花园-6]]></Achieve6>
+    <Achieve21 desc=""><![CDATA[鼓鼓的钱包-1]]></Achieve21>
+    <Achieve22 desc=""><![CDATA[鼓鼓的钱包-2]]></Achieve22>
+    <Achieve23 desc=""><![CDATA[鼓鼓的钱包-3]]></Achieve23>
+    <Achieve24 desc=""><![CDATA[鼓鼓的钱包-4]]></Achieve24>
+    <Achieve25 desc=""><![CDATA[鼓鼓的钱包-5]]></Achieve25>
+    <Achieve26 desc=""><![CDATA[鼓鼓的钱包-6]]></Achieve26>
+  </AchieveName>
+  <AchieveDescription>
+    <Achieve1 desc=""><![CDATA[花园等级达到 30]]></Achieve1>
+    <Achieve2 desc=""><![CDATA[花园等级达到 50]]></Achieve2>
+    <Achieve3 desc=""><![CDATA[花园等级达到 100]]></Achieve3>
+    <Achieve4 desc=""><![CDATA[花园等级达到 200]]></Achieve4>
+    <Achieve5 desc=""><![CDATA[花园等级达到 300]]></Achieve5>
+    <Achieve6 desc=""><![CDATA[花园等级达到 400]]></Achieve6>
+    <Achieve21 desc=""><![CDATA[拥有1000金币]]></Achieve21>
+    <Achieve22 desc=""><![CDATA[拥有2000金币]]></Achieve22>
+    <Achieve23 desc=""><![CDATA[拥有3000金币]]></Achieve23>
+    <Achieve24 desc=""><![CDATA[拥有5000金币]]></Achieve24>
+    <Achieve25 desc=""><![CDATA[拥有8000金币]]></Achieve25>
+    <Achieve26 desc=""><![CDATA[拥有10000金币]]></Achieve26>
+  </AchieveDescription>
 </lan>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -55,6 +55,7 @@
     <L_TraChiLab desc=""><![CDATA[繁體中文]]></L_TraChiLab>
     <L_EnglishLab desc=""><![CDATA[English]]></L_EnglishLab>
     <L_SimChiLab desc=""><![CDATA[简体中文]]></L_SimChiLab>
+    <M_Tit desc=""><![CDATA[]]></M_Tit>
   </UI>
   <FlowerName>
     <Flower1 desc=""><![CDATA[]]></Flower1>
@@ -155,6 +156,41 @@
   </SkillDescription>
   <Object>
     <FlowerItemG_Lab desc=""><![CDATA[]]></FlowerItemG_Lab>
+    <AchieveItem_BtnLab0 desc=""><![CDATA[]]></AchieveItem_BtnLab0>
+    <AchieveItem_BtnLab1 desc=""><![CDATA[]]></AchieveItem_BtnLab1>
+    <AchieveItem_BtnLab2 desc=""><![CDATA[]]></AchieveItem_BtnLab2>
     <SlotSign desc=""><![CDATA[]]></SlotSign>
   </Object>
+  <Common>
+    <Person desc=""><![CDATA[]]></Person>
+    <CoinPerson desc=""><![CDATA[]]></CoinPerson>
+  </Common>
+  <AchieveName>
+    <Achieve1 desc=""><![CDATA[]]></Achieve1>
+    <Achieve2 desc=""><![CDATA[]]></Achieve2>
+    <Achieve3 desc=""><![CDATA[]]></Achieve3>
+    <Achieve4 desc=""><![CDATA[]]></Achieve4>
+    <Achieve5 desc=""><![CDATA[]]></Achieve5>
+    <Achieve6 desc=""><![CDATA[]]></Achieve6>
+    <Achieve21 desc=""><![CDATA[]]></Achieve21>
+    <Achieve22 desc=""><![CDATA[]]></Achieve22>
+    <Achieve23 desc=""><![CDATA[]]></Achieve23>
+    <Achieve24 desc=""><![CDATA[]]></Achieve24>
+    <Achieve25 desc=""><![CDATA[]]></Achieve25>
+    <Achieve26 desc=""><![CDATA[]]></Achieve26>
+  </AchieveName>
+  <AchieveDescription>
+    <Achieve1 desc=""><![CDATA[]]></Achieve1>
+    <Achieve2 desc=""><![CDATA[]]></Achieve2>
+    <Achieve3 desc=""><![CDATA[]]></Achieve3>
+    <Achieve4 desc=""><![CDATA[]]></Achieve4>
+    <Achieve5 desc=""><![CDATA[]]></Achieve5>
+    <Achieve6 desc=""><![CDATA[]]></Achieve6>
+    <Achieve21 desc=""><![CDATA[]]></Achieve21>
+    <Achieve22 desc=""><![CDATA[]]></Achieve22>
+    <Achieve23 desc=""><![CDATA[]]></Achieve23>
+    <Achieve24 desc=""><![CDATA[]]></Achieve24>
+    <Achieve25 desc=""><![CDATA[]]></Achieve25>
+    <Achieve26 desc=""><![CDATA[]]></Achieve26>
+  </AchieveDescription>
 </lan>

Assets/Resource/XML/lan/English.xml

@@ -55,6 +55,7 @@
     <L_TraChiLab desc=""><![CDATA[繁體中文]]></L_TraChiLab>
     <L_EnglishLab desc=""><![CDATA[English]]></L_EnglishLab>
     <L_SimChiLab desc=""><![CDATA[简体中文]]></L_SimChiLab>
+    <M_Tit desc=""><![CDATA[Achievement]]></M_Tit>
   </UI>
   <FlowerName>
     <Flower1 desc=""><![CDATA[PinkFlower]]></Flower1>
@@ -155,6 +156,41 @@
   </SkillDescription>
   <Object>
     <FlowerItemG_Lab desc=""><![CDATA[Planted]]></FlowerItemG_Lab>
+    <AchieveItem_BtnLab0 desc=""><![CDATA[Reward]]></AchieveItem_BtnLab0>
+    <AchieveItem_BtnLab1 desc=""><![CDATA[Get Reward]]></AchieveItem_BtnLab1>
+    <AchieveItem_BtnLab2 desc=""><![CDATA[Completed]]></AchieveItem_BtnLab2>
     <SlotSign desc=""><![CDATA[]]></SlotSign>
   </Object>
+  <Common>
+    <Person desc=""><![CDATA[]]></Person>
+    <CoinPerson desc=""><![CDATA[]]></CoinPerson>
+  </Common>
+  <AchieveName>
+    <Achieve1 desc=""><![CDATA[LovelyGarden-1]]></Achieve1>
+    <Achieve2 desc=""><![CDATA[]]></Achieve2>
+    <Achieve3 desc=""><![CDATA[]]></Achieve3>
+    <Achieve4 desc=""><![CDATA[]]></Achieve4>
+    <Achieve5 desc=""><![CDATA[]]></Achieve5>
+    <Achieve6 desc=""><![CDATA[]]></Achieve6>
+    <Achieve21 desc=""><![CDATA[]]></Achieve21>
+    <Achieve22 desc=""><![CDATA[]]></Achieve22>
+    <Achieve23 desc=""><![CDATA[]]></Achieve23>
+    <Achieve24 desc=""><![CDATA[]]></Achieve24>
+    <Achieve25 desc=""><![CDATA[]]></Achieve25>
+    <Achieve26 desc=""><![CDATA[]]></Achieve26>
+  </AchieveName>
+  <AchieveDescription>
+    <Achieve1 desc=""><![CDATA[GardenLevel Rreach 30]]></Achieve1>
+    <Achieve2 desc=""><![CDATA[]]></Achieve2>
+    <Achieve3 desc=""><![CDATA[]]></Achieve3>
+    <Achieve4 desc=""><![CDATA[]]></Achieve4>
+    <Achieve5 desc=""><![CDATA[]]></Achieve5>
+    <Achieve6 desc=""><![CDATA[]]></Achieve6>
+    <Achieve21 desc=""><![CDATA[Possess 1000 Coin]]></Achieve21>
+    <Achieve22 desc=""><![CDATA[]]></Achieve22>
+    <Achieve23 desc=""><![CDATA[]]></Achieve23>
+    <Achieve24 desc=""><![CDATA[]]></Achieve24>
+    <Achieve25 desc=""><![CDATA[]]></Achieve25>
+    <Achieve26 desc=""><![CDATA[]]></Achieve26>
+  </AchieveDescription>
 </lan>

Assets/Script/Manage/Initializer.cs

@@ -43,6 +43,7 @@ public class Initializer : MonoBehaviour
         gameObject.AddScript<ManaData>();
         gameObject.AddScript<ManaPlayer>();
         gameObject.AddScript<ManaDebug>();
+        gameObject.AddScript<ManaAchieve>();
         gameObject.AddScript<ManaMiniGame>();
 
         StartCoroutine(IInitialize());

Assets/Script/Manage/ManaAchieve.cs

@@ -0,0 +1,378 @@
+using System;
+using UnityEngine;
+
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using System.Xml;
+using UnityEngine.UI;
+
+public enum AchieveType
+{
+    AD,
+    Skill,
+    Sign,
+    Share,
+    Flower,
+    Person,
+    ElfLevel,
+    TotalCoin,
+    MiniGame,
+    FlowerCoin,
+    CurrentCoin,
+    GardenLevel,
+}
+
+public class Achieve
+{
+    public bool Regist
+    {
+        get { return _Regist; }
+        set
+        {
+            _Regist = value;
+
+            if (_Regist)
+            {
+                RegistValue();
+            }
+        }
+    }
+    public string Desc
+    {
+        get
+        {
+            return Language.GetStr("AchieveDescription", "Achieve" + ID);
+        }
+    }
+    public string Name
+    {
+        get
+        {
+            return Language.GetStr("AchieveName", "Achieve" + ID);
+        }
+    }
+    public List<Achieve> PostAchieveList
+    {
+        get
+        {
+            if (_PostAchieveList == null)
+            {
+                _PostAchieveList = new List<Achieve>();
+            }
+
+            return _PostAchieveList;
+        }
+        set { _PostAchieveList = value; }
+    }
+
+    public bool _Regist;
+    public List<Achieve> _PostAchieveList;
+
+    public int ID;
+    public int Index;
+    public int Parent;
+    public bool Valid;
+    public bool Finish;
+    public bool Delete;
+    public float Person;
+    public float CoinPerson;
+    public float DiamondOnce;
+    public string Icon;
+    public double TargetValue;
+    public double CurrentValue;
+    public AchieveType Type;
+
+    public Text Tit;
+    public Text Lab;
+    public Text BtnLab;
+    public Slider Slider;
+    public Image Image;
+    public Button Button;
+    public Transform AchieveItem;
+
+    public Achieve(XmlAttributeCollection attribute)
+    {
+        Valid = true;
+
+        Icon = attribute[11].Value;
+        Type = TypeParse(attribute[4].Value);
+        Parent = ParentParse(attribute[6].Value);
+        Delete = Convert.ToBoolean(int.Parse(attribute[7].Value));
+        TargetValue = double.Parse(attribute[5].Value);
+
+        ID = int.Parse(attribute[0].Value);
+        Index = int.Parse(attribute[1].Value);
+
+        Person = AwardParse(attribute[10].Value);
+        CoinPerson = AwardParse(attribute[9].Value);
+        DiamondOnce = AwardParse(attribute[8].Value);
+
+        ManaAchieve.AchieveDic.Add(ID, this);
+
+        if (Parent != -1)
+        {
+            ManaAchieve.AchieveDic[ID].PostAchieveList.Add(this);
+        }
+    }
+
+
+    public void RegistValue()
+    {
+        AchieveItem = ManaReso.Get("AchieveItem", Folder.UI, false, ManaReso.Get("M_Grid"), false);
+
+        Dictionary<string, Transform> dic = new Dictionary<string, Transform>();
+
+        Auxiliary.CompileDic(AchieveItem, dic);
+
+        Tit = dic["Tit"].GetComponent<Text>();
+        Lab = dic["Lab"].GetComponent<Text>();
+        Slider = dic["Slider"].GetComponent<Slider>();
+        Image = dic["Icon"].GetComponent<Image>();
+        Button = dic["Btn"].GetComponent<Button>();
+        BtnLab = dic["BtnLab"].GetComponent<Text>();
+
+        ManaText.Add(Tit, new LanStr("AchieveName", "Achieve" + ID));
+        ManaText.Add(Lab, new LanStr("AchieveDescription", "Achieve" + ID));
+
+        Slider.value = (float)(CurrentValue/TargetValue);
+        Image.sprite = ManaReso.Load<Sprite>(Icon, Folder.UI);
+
+        UpdateStatus();
+    }
+
+    public void UpdateStatus()
+    {
+        if (Finish == false)
+        {
+            StringBuilder strB = new StringBuilder();
+
+            strB.Append(Language.GetStr("Object", "AchieveItem_BtnLab0") + "\n");
+
+            if (Math.Abs(DiamondOnce) > 0.0005f)
+            {
+                strB.Append("<(钻石)>" + DiamondOnce.ToString("0"));
+            }
+
+            if (Math.Abs(CoinPerson) > 0.0005f)
+            {
+                strB.Append(Language.GetStr("Common", "CoinPerson") + "+" + CoinPerson.ToString("0") + " ");
+            }
+
+            if (Math.Abs(Person) > 0.0005f)
+            {
+                strB.Append(Language.GetStr("Common", "Person") + "+" + Person.ToString("0"));
+            }
+
+            Button.interactable = false;
+
+            Button.image.material = ManaReso.Load<Material>("GrayMat", Folder.Shader);
+
+            BtnLab.text = strB.ToString();
+        }
+        else
+        {
+            if (Valid)
+            {
+                StringBuilder strB = new StringBuilder();
+
+                strB.Append(Language.GetStr("Object", "AchieveItem_BtnLab1") + "\n");
+
+                if (Math.Abs(DiamondOnce) > 0.0005f)
+                {
+                    strB.Append("<(钻石)>" + DiamondOnce.ToString("0"));
+                }
+
+                if (Math.Abs(CoinPerson) > 0.0005f)
+                {
+                    strB.Append(Language.GetStr("Common", "CoinPerson") + "+" + CoinPerson.ToString("0") + " ");
+                }
+
+                if (Math.Abs(Person) > 0.0005f)
+                {
+                    strB.Append(Language.GetStr("Common", "Person") + "+" + Person.ToString("0"));
+                }
+
+                Button.interactable = true;
+
+                Button.image.material = null;
+
+                BtnLab.text = strB.ToString();
+            }
+            else
+            {
+                Button.interactable = false;
+
+                Button.image.material = null;
+
+                BtnLab.text = Language.GetStr("Object", "AchieveItem_BtnLab2");
+            }
+        }
+    }
+
+    public void SwitchLanguage()
+    {
+        if (Regist)
+        {
+            UpdateStatus();
+        }
+    }
+
+
+    public int ParentParse(string str)
+    {
+        if (string.IsNullOrEmpty(str))
+        {
+            return -1;
+        }
+        else
+        {
+            return int.Parse(str);
+        }
+    }
+
+    public float AwardParse(string str)
+    {
+        if (string.IsNullOrEmpty(str))
+        {
+            return 0;
+        }
+        else
+        {
+            return float.Parse(str);
+        }
+    }
+
+
+    public AchieveType TypeParse(string str)
+    {
+        int integer = int.Parse(str);
+
+        if (integer == 1)
+        {
+            return AchieveType.GardenLevel;
+        }
+        else if (integer == 2)
+        {
+            return AchieveType.CurrentCoin;
+        }
+        else if (integer == 3)
+        {
+            return AchieveType.TotalCoin;
+        }
+        else if (integer == 4)
+        {
+            return AchieveType.ElfLevel;
+        }
+        else if (integer == 5)
+        {
+            return AchieveType.Flower;
+        }
+        else if (integer == 6)
+        {
+            return AchieveType.Person;
+        }
+        else if (integer == 7)
+        {
+            return AchieveType.Skill;
+        }
+        else if (integer == 8)
+        {
+            return AchieveType.AD;
+        }
+        else if (integer == 9)
+        {
+            return AchieveType.Sign;
+        }
+        else if (integer == 10)
+        {
+            return AchieveType.Share;
+        }
+        else if (integer == 11)
+        {
+            return AchieveType.MiniGame;
+        }
+        else if (integer == 12)
+        {
+            return AchieveType.FlowerCoin;
+        }
+        else
+        {
+            throw new Exception();
+        }
+    }
+}
+
+public class ManaAchieve : Regist 
+{
+    #region 变量
+
+    public static Dictionary<int, Achieve> AchieveDic
+    {
+        get
+        {
+            if (_AchieveDic == null)
+            {
+                _AchieveDic = new Dictionary<int, Achieve>();
+            }
+
+            return _AchieveDic;
+        }
+        set { _AchieveDic = value; }
+    }
+
+    public static Dictionary<int, Achieve> _AchieveDic;
+
+    #endregion
+
+    public override void Instantiate()
+    {
+        List<XmlAttributeCollection> attributeList = Data.GetAchieveConfig();
+
+        for (int i = 0; i < attributeList.Count; i++)
+        {
+            new Achieve(attributeList[i]);
+        }
+
+        XmlNode node = Data.PlayerNode.SelectSingleNode("AchieveList");
+
+        if (!string.IsNullOrEmpty(node.Value))
+        {
+            string[] strings = node.Value.Split(' ');
+
+            for (int i = 0; i < strings.Length; i++)
+            {
+                AchieveDic[int.Parse(strings[i])].Valid = false;
+                AchieveDic[int.Parse(strings[i])].Finish = true;
+            }
+        }
+
+        foreach (var kv in AchieveDic)
+        {
+            if (kv.Value.Valid)
+            {
+                if (kv.Value.Parent == -1 || !AchieveDic[kv.Value.Parent].Valid)
+                {
+                    kv.Value.Regist = true;
+                }
+            }
+            else
+            {
+                if (kv.Value.Delete == false)
+                {
+                    kv.Value.Regist = true;
+                }
+            }
+        }
+    }
+
+    public override void RegistValueA()
+    {
+
+    }
+
+    public override void RegistReference()
+    {
+        
+    }
+}

Assets/Script/Manage/ManaAchieve.cs.meta

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

Assets/Script/Manage/ManaData.cs

@@ -214,11 +214,11 @@ public class ManaData : Regist
                 ManaReso.Get("C_MiniGame").TweenForCG();
             }
         }
-
+        
         if (Auxiliary.AnyKeyUp)
         {
             OpTimer = 0;
-
+            
             if (Main == 0)
             {
                 ManaReso.Get("C_Main").TweenForCG();

Assets/Script/Manage/ManaData.cs.meta

@@ -1,11 +1,11 @@
 fileFormatVersion: 2
 guid: f5745dc1dc78a7047ba230acc00e97b4
-timeCreated: 1487642173
+timeCreated: 1491476854
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2
   defaultReferences: []
-  executionOrder: 0
+  executionOrder: 300
   icon: {instanceID: 0}
   userData: 
   assetBundleName: 

Assets/Script/Manage/ManaGarden.cs

@@ -73,6 +73,20 @@ public class ManaGarden : Regist
         }
     }
 
+    public static List<ObjType> AnimList
+    {
+        get
+        {
+            if (_AnimList == null)
+            {
+                _AnimList = new List<ObjType>();
+            }
+
+            return _AnimList;
+        }
+        set { _AnimList = value; }
+    }
+
     private static int _MyFlower;
     private static int _MyFlowerSpec;
     private static int _MyFlowerRegu;
@@ -81,8 +95,11 @@ public class ManaGarden : Regist
     private static int _TotalFlowerSpec;
     private static int _TotalFlowerRegu;
 
+    private static List<ObjType> _AnimList;
+
     public static bool Award;
     public static bool AwardLock;
+    public static float AnimTimer;
     public static float AwardTimer;
 
     public static Slot SeleSlot;
@@ -96,6 +113,29 @@ public class ManaGarden : Regist
 
     public void FixedUpdate()
     {
+        AnimThread();
+
+        AwardThread();
+    }
+
+
+    public void AnimThread()
+    {
+        AnimTimer -= Time.fixedDeltaTime;
+
+        if (AnimTimer < 0)
+        {
+            AnimTimer = Random.Range(0f, 30f);
+            
+            if (AnimList.Count > 0 && PlantList.Count > 0)
+            {
+                PlantList.Random().Flower.PlayAnim(AnimList.Random());
+            }
+        }
+    }
+
+    public void AwardThread()
+    {
         if (Award && !AwardLock)
         {
             AwardTimer -= Time.fixedDeltaTime;
@@ -166,12 +206,12 @@ public class ManaGarden : Regist
         #endregion
     }
 
-
     public override void RegistValueA()
     {
         Award = true;
         AwardLock = false;
-        AwardTimer = Random.Range(20, 60);
+        AnimTimer = Random.Range(0f, 30f);
+        AwardTimer = Random.Range(20f, 60f);
 
         SlotList = new List<Slot>()
         {

Assets/Script/Manage/ManaReso.cs

@@ -46,15 +46,6 @@ public enum ObjType
     ButterflyYellow,
 }
 
-public enum AnimColor
-{
-    Red,
-    Blue,
-    White,
-    Purple,
-    Yellow,
-}
-
 public class ManaReso : Regist
 {
     #region 变量
@@ -315,170 +306,36 @@ public class ManaReso : Regist
         return hudText;
     }
 
-    public static Transform GetBee(AnimColor color, Transform parTra, Transform posTra)
+    public static Transform GetAnim(Bounds bounds, ObjType obj, Vector3 pos, Transform parTra)
     {
-        if (color == AnimColor.Red)
-        {
-            Transform tra = Get("BeeRed", Folder.Character, false, parTra, posTra.position, ObjType.BeeRed);
-
-            ObjRoot objRoot = tra.GetComponent<ObjRoot>();
+        Transform tra;
 
-            if (objRoot == null)
-            {
-                tra.AddComponent<ObjRoot>().ObjType = ObjType.BeeRed;
+        tra = Get(obj.ToString(), Folder.Character, false, parTra, pos, obj);
 
-                tra.GetChild(0).AddComponent<AnimationReceiver>();
-            }
+        ObjRoot objRoot = tra.GetComponent<ObjRoot>();
 
-            return tra;
-        }
-        else if (color == AnimColor.Blue)
+        if (objRoot == null)
         {
-            Transform tra = Get("BeeBlue", Folder.Character, false, parTra, posTra.position, ObjType.BeeBlue);
+            tra.AddComponent<ObjRoot>().ObjType = obj;
 
-            ObjRoot objRoot = tra.GetComponent<ObjRoot>();
-
-            if (objRoot == null)
-            {
-                tra.AddComponent<ObjRoot>().ObjType = ObjType.BeeBlue;
-
-                tra.GetChild(0).AddComponent<AnimationReceiver>();
-            }
-
-            return tra;
+            tra.GetChild(0).AddComponent<AnimationReceiver>();
         }
-        else if (color == AnimColor.White)
-        {
-            Transform tra = Get("BeeWhite", Folder.Character, false, parTra, posTra.position, ObjType.BeeWhite);
-
-            ObjRoot objRoot = tra.GetComponent<ObjRoot>();
-
-            if (objRoot == null)
-            {
-                tra.AddComponent<ObjRoot>().ObjType = ObjType.BeeWhite;
-
-                tra.GetChild(0).AddComponent<AnimationReceiver>();
-            }
 
-            return tra;
-        }
-        else if (color == AnimColor.Purple)
+        if (Random.Range(0f, 1f) <= 0.5f)
         {
-            Transform tra = Get("BeePurple", Folder.Character, false, parTra, posTra.position, ObjType.BeePurple);
-
-            ObjRoot objRoot = tra.GetComponent<ObjRoot>();
-
-            if (objRoot == null)
-            {
-                tra.AddComponent<ObjRoot>().ObjType = ObjType.BeePurple;
-
-                tra.GetChild(0).AddComponent<AnimationReceiver>();
-            }
-
-            return tra;
-        }
-        else if (color == AnimColor.Yellow)
-        {
-            Transform tra = Get("BeeYellow", Folder.Character, false, parTra, posTra.position, ObjType.BeeYellow);
-
-            ObjRoot objRoot = tra.GetComponent<ObjRoot>();
-
-            if (objRoot == null)
-            {
-                tra.AddComponent<ObjRoot>().ObjType = ObjType.BeeYellow;
-
-                tra.GetChild(0).AddComponent<AnimationReceiver>();
-            }
-
-            return tra;
+            tra.SetEY(180);
         }
         else
         {
-            throw new Exception();
+            tra.SetEY(0);
         }
-    }
 
-    public static Transform GetButterfly(AnimColor color, Transform parTra, Transform posTra)
-    {
-        if (color == AnimColor.Red)
-        {
-            Transform tra = Get("ButterflyRed", Folder.Character, false, parTra, posTra.position, ObjType.BeeRed);
+        float offsetX = Mathf.Lerp(-0.75f*bounds.extents.x, 0.75f*bounds.extents.x, Random.Range(0f, 1f));
+        float offsetY = Mathf.Lerp(0, 0.75f*bounds.extents.y, Random.Range(0f, 1f));
 
-            ObjRoot objRoot = tra.GetComponent<ObjRoot>();
+        tra.position += new Vector3(offsetX, offsetY, 0);
 
-            if (objRoot == null)
-            {
-                tra.AddComponent<ObjRoot>().ObjType = ObjType.BeeRed;
-
-                tra.GetChild(0).AddComponent<AnimationReceiver>();
-            }
-
-            return tra;
-        }
-        else if (color == AnimColor.Blue)
-        {
-            Transform tra = Get("ButterflyBlue", Folder.Character, false, parTra, posTra.position, ObjType.ButterflyBlue);
-
-            ObjRoot objRoot = tra.GetComponent<ObjRoot>();
-
-            if (objRoot == null)
-            {
-                tra.AddComponent<ObjRoot>().ObjType = ObjType.ButterflyBlue;
-
-                tra.GetChild(0).AddComponent<AnimationReceiver>();
-            }
-
-            return tra;
-        }
-        else if (color == AnimColor.White)
-        {
-            Transform tra = Get("ButterflyWhite", Folder.Character, false, parTra, posTra.position, ObjType.ButterflyWhite);
-
-            ObjRoot objRoot = tra.GetComponent<ObjRoot>();
-
-            if (objRoot == null)
-            {
-                tra.AddComponent<ObjRoot>().ObjType = ObjType.ButterflyWhite;
-
-                tra.GetChild(0).AddComponent<AnimationReceiver>();
-            }
-
-            return tra;
-        }
-        else if (color == AnimColor.Purple)
-        {
-            Transform tra = Get("ButterflyPurple", Folder.Character, false, parTra, posTra.position, ObjType.ButterflyPurple);
-
-            ObjRoot objRoot = tra.GetComponent<ObjRoot>();
-
-            if (objRoot == null)
-            {
-                tra.AddComponent<ObjRoot>().ObjType = ObjType.ButterflyPurple;
-
-                tra.GetChild(0).AddComponent<AnimationReceiver>();
-            }
-
-            return tra;
-        }
-        else if (color == AnimColor.Yellow)
-        {
-            Transform tra = Get("ButterflyYellow", Folder.Character, false, parTra, posTra.position, ObjType.ButterflyYellow);
-
-            ObjRoot objRoot = tra.GetComponent<ObjRoot>();
-
-            if (objRoot == null)
-            {
-                tra.AddComponent<ObjRoot>().ObjType = ObjType.ButterflyYellow;
-
-                tra.GetChild(0).AddComponent<AnimationReceiver>();
-            }
-
-            return tra;
-        }
-        else
-        {
-            throw new Exception();
-        }
+        return tra;
     }
 
     public static Transform GetSkillItem(SkillRoot skillRoot)

Assets/Script/Manage/ManaText.cs

@@ -25,17 +25,38 @@ public class ManaText : Regist
 {
     #region 变量
 
-    public static Dictionary<Text, object[]> TextDic;
-    public static Dictionary<TextMesh, object[]> TextMeshDic;
-
-    #endregion
+    public static Dictionary<Text, object[]> TextDic
+    {
+        get
+        {
+            if (_TextDic == null)
+            {
+                _TextDic = new Dictionary<Text, object[]>();
+            }
 
-    public override void RegistValueA()
+            return _TextDic;
+        }
+        set { _TextDic = value; }
+    }
+    public static Dictionary<TextMesh, object[]> TextMeshDic
     {
-        TextDic = new Dictionary<Text, object[]>();
-        TextMeshDic = new Dictionary<TextMesh, object[]>();
+        get
+        {
+            if (_TextMeshDic == null)
+            {
+                _TextMeshDic = new Dictionary<TextMesh, object[]>();
+            }
+
+            return _TextMeshDic;
+        }
+        set { _TextMeshDic = value; }
     }
 
+    public static Dictionary<Text, object[]> _TextDic;
+    public static Dictionary<TextMesh, object[]> _TextMeshDic;
+
+    #endregion
+
 
     public static void Add(Text text, params object[] objs)
     {
@@ -84,6 +105,11 @@ public class ManaText : Regist
             kv.Key.text = LanguageText(kv.Value);
         }
 
+        foreach (var kv in ManaAchieve.AchieveDic)
+        {
+            kv.Value.SwitchLanguage();
+        }
+
         for (int i = 0; i < ManaData.SkillList.Count; i++)
         {
             ManaData.SkillList[i].SwitchLanguage();

Assets/Script/Manage/ManaUI.cs

@@ -134,8 +134,6 @@ public class ManaUI : Regist
             "C_Manage",
             () =>
             {
-                ManaReso.Get("C_Main").TweenBacCG();
-
                 ManaReso.Get("F_Manage0").TweenForVec();
             }
         );
@@ -182,6 +180,19 @@ public class ManaUI : Regist
 
         #endregion
 
+        #region C_Achieve
+
+        ManaReso.AddButtonEvent
+        (
+            "C_Achieve",
+            () =>
+            {
+                ManaReso.Get("M_Achieve0").TweenForVec();
+            }
+        );
+
+        #endregion
+
         #endregion
 
         #region D
@@ -1062,7 +1073,19 @@ public class ManaUI : Regist
         ManaText.Add(ManaReso.Get<Text>("L_EnglishLab"), new LanStr("UI", "L_EnglishLab"));
         ManaText.Add(ManaReso.Get<Text>("L_SimChiLab"), new LanStr("UI", "L_SimChiLab"));
 
-        ManaReso.Get("L_Setting").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+        tween = ManaReso.Get("L_Setting").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+
+        tween.OnForwardStart += () =>
+        {
+            ManaReso.Get("C_Main").TweenBacCG();
+
+            ManaData.Main++;
+        };
+
+        tween.OnBackwardFinish += () =>
+        {
+            ManaReso.Get("C_Main").TweenForCG();
+        };
 
         ManaReso.SetButtonEvent
         (
@@ -1135,5 +1158,71 @@ public class ManaUI : Regist
         );
 
         #endregion
+
+        #region M
+
+        #region M_Close
+
+        ManaText.Add(ManaReso.Get<Text>("M_Tit"), new LanStr("UI", "M_Tit"));
+
+        ManaReso.AddButtonEvent
+        (
+            "M_Close",
+            () =>
+            {
+                ManaReso.Get("M_Achieve").TweenBacGra();
+            }
+        );
+
+        #endregion
+
+        tween = ManaReso.Get("M_Achieve").CreateTweenGra(new Color(0, 0, 0, 180 / 255f), 0.5f, true, true, Curve.EaseOutQuad);
+
+        var tween2 = tween;
+        tween.OnForwardStart += () =>
+        {
+            tween2.Duration = 0.5f;
+        };
+
+        tween.OnBackwardStart += () =>
+        {
+            tween2.Duration = 0.25f;
+        };
+
+        tween.OnBackwardFinish += () =>
+        {
+            ManaReso.Get("M_Achieve0").TweenBacVec();
+        };
+
+        tween = ManaReso.Get("M_Achieve0").CreateTweenVec(ManaReso.Get("M_PageTra").position, 0.5f, false, false, true, Curve.EaseOutQuad);
+
+        tween.OnForwardStart += () =>
+        {
+            ManaReso.Get("C_Main").TweenBacCG();
+
+            ManaReso.SetActive("M_Achieve", true);
+
+            ManaData.Main++;
+        };
+
+        tween.OnForwardFinish += () =>
+        {
+            ManaReso.Get("M_Achieve").TweenForGra();
+        };
+
+        tween.OnBackwardStart += () =>
+        {
+            ManaData.Main--;
+        };
+
+        tween.OnBackwardFinish += () =>
+        {
+            ManaReso.Get("C_Main").TweenForCG();
+
+            ManaReso.SetActive("M_Achieve", false);
+            ManaReso.SetActive("M_Achieve0", false);
+        };
+
+        #endregion
     }
 }

Assets/Script/Object/Flower.cs

@@ -168,11 +168,11 @@ public class Flower : ObjRoot, IPointerClickHandler
 
     private int _Phase;
 
-    private OpType OpType;
-    private SpriteRenderer FlowerIcon;
-    private SpriteRenderer OperateBk;
-    private SpriteRenderer OperateIcon;
-    private SpriteRenderer OperateOutline;
+    public OpType OpType;
+    public SpriteRenderer FlowerIcon;
+    public SpriteRenderer OperateBk;
+    public SpriteRenderer OperateIcon;
+    public SpriteRenderer OperateOutline;
 
     #endregion
 
@@ -364,9 +364,9 @@ public class Flower : ObjRoot, IPointerClickHandler
     #endregion
 
 
-    public void PlayAnim()
+    public void PlayAnim(ObjType obj)
     {
-        Animator animator = ManaReso.GetBee(AnimColor.Purple, transform, ChildDic["OperateBk"]).GetComponentInChildren<Animator>();
+        Animator animator = ManaReso.GetAnim(FlowerIcon.bounds, obj, FlowerIcon.transform.position, transform).GetComponentInChildren<Animator>();
 
         animator.SetTrigger("Play");
     }

Assets/Script/Object/Skill/Ability.cs

@@ -234,10 +234,10 @@ public class Ability : SkillRoot
     {
         if (ManaData.Pay(UnlockAmt, UnlockCur))
         {
-            UseConti();
-
             ManaDebug.Log(string.Format("技能<color=red>{0}</color>已解锁", Name));
 
+            UseConti();
+
             if (UpgradeCur != Current.Free)
             {
                 ItemStatus = SkillStatus.Upgrade;
@@ -354,7 +354,14 @@ public class Ability : SkillRoot
             {
                 string[] strings = Anim.Split(',');
 
-                ManaReso.Get(strings[0], Folder.Character, false, ManaReso.Get(strings[1]), true);
+                if (strings.Length == 1)
+                {
+                    ManaGarden.AnimList.Add((ObjType) Enum.Parse(typeof(ObjType), strings[0]));
+                }
+                else if (strings.Length > 1)
+                {
+                    ManaReso.Get(strings[0], Folder.Character, false, ManaReso.Get(strings[1]), true);
+                }
             }
         }
 
@@ -454,6 +461,8 @@ public class Ability : SkillRoot
 
         if (ManaData.Pay(UnlockAheadAmt, UnlockAheadCur))
         {
+            ManaDebug.Log(string.Format("技能<color=red>{0}</color>已解锁", Name));
+
             UseConti();
 
             if (UpgradeCur != Current.Free)
@@ -464,8 +473,6 @@ public class Ability : SkillRoot
             {
                 throw new Exception();
             }
-
-            ManaDebug.Log(string.Format("技能<color=red>{0}</color>已解锁", Name));
         }
     }
 

Assets/Script/Tool/Anim/TweenAudio.cs

@@ -140,6 +140,7 @@ public class TweenAudio : Tween
             Timer = 0;
 
             InForward = false;
+            InDestination = true;
 
             OnForwardFinish.Invoke();
 
@@ -164,6 +165,7 @@ public class TweenAudio : Tween
             Timer = 0;
 
             InBackward = false;
+            InOrigin = true;
 
             OnBackwardFinish.Invoke();
 

Assets/Script/Tool/Anim/TweenCG.cs

@@ -148,6 +148,7 @@ public class TweenCG : Tween
             Timer = 0;
 
             InForward = false;
+            InDestination = true;
 
             OnForwardFinish.Invoke();
 
@@ -172,6 +173,7 @@ public class TweenCG : Tween
             Timer = 0;
 
             InBackward = false;
+            InOrigin = true;
 
             OnBackwardFinish.Invoke();
 

Assets/Script/Tool/Anim/TweenGra.cs

@@ -145,6 +145,7 @@ public class TweenGra : Tween
             Timer = 0;
 
             InForward = false;
+            InDestination = true;
 
             OnForwardFinish.Invoke();
 
@@ -169,6 +170,7 @@ public class TweenGra : Tween
             Timer = 0;
 
             InBackward = false;
+            InOrigin = true;
 
             OnBackwardFinish.Invoke();
 

Assets/Script/Tool/Anim/TweenRect.cs

@@ -164,6 +164,7 @@ public class TweenRect : Tween
             Timer = 0;
 
             InForward = false;
+            InDestination = true;
 
             OnForwardFinish.Invoke();
 
@@ -188,6 +189,7 @@ public class TweenRect : Tween
             Timer = 0;
 
             InBackward = false;
+            InOrigin = true;
 
             OnBackwardFinish.Invoke();
 

Assets/Script/Tool/Anim/TweenScale.cs

@@ -166,6 +166,7 @@ public class TweenScale : Tween
             Timer = 0;
 
             InForward = false;
+            InDestination = true;
 
             OnForwardFinish.Invoke();
 
@@ -190,6 +191,7 @@ public class TweenScale : Tween
             Timer = 0;
 
             InBackward = false;
+            InOrigin = true;
 
             OnBackwardFinish.Invoke();
 

Assets/Script/Tool/Anim/TweenSr.cs

@@ -142,6 +142,7 @@ public class TweenSr : Tween
             Timer = 0;
 
             InForward = false;
+            InDestination = true;
 
             OnForwardFinish.Invoke();
 
@@ -166,6 +167,7 @@ public class TweenSr : Tween
             Timer = 0;
 
             InBackward = false;
+            InOrigin = true;
 
             OnBackwardFinish.Invoke();
 

Assets/Script/Tool/Anim/TweenText.cs

@@ -145,6 +145,7 @@ public class TweenText : Tween
             Timer = 0;
 
             InForward = false;
+            InDestination = true;
 
             OnForwardFinish.Invoke();
 
@@ -169,6 +170,7 @@ public class TweenText : Tween
             Timer = 0;
 
             InBackward = false;
+            InOrigin = true;
 
             OnBackwardFinish.Invoke();
 

Assets/Script/Tool/Anim/TweenVec.cs

@@ -228,6 +228,7 @@ public class TweenVec : Tween
             Timer = 0;
 
             InForward = false;
+            InDestination = true;
 
             OnForwardFinish.Invoke();
 
@@ -259,6 +260,7 @@ public class TweenVec : Tween
             Timer = 0;
 
             InBackward = false;
+            InOrigin = true;
 
             OnBackwardFinish.Invoke();
 

Assets/Script/Tool/Auxiliary.cs

@@ -71,11 +71,6 @@ public class Auxiliary : MonoBehaviour
     {
         #region 调试
 
-        if (Input.GetKeyDown(KeyCode.Space))
-        {
-            ManaGarden.PlantList[5].Flower.PlayAnim();
-        }
-
         if (Input.GetKeyDown(KeyCode.P))
         {
             ManaData.Level += 20;
@@ -118,7 +113,7 @@ public class Auxiliary : MonoBehaviour
         #endregion
 
         #region 输入检测
-
+        
         if (AnyKeyUp)
         {
             if (Input.anyKey == false)
@@ -131,7 +126,7 @@ public class Auxiliary : MonoBehaviour
         {
             AnyKeyDown = true;
         }
-
+        
         if (AnyKeyDown)
         {
             if (Input.anyKey == false)

Assets/Script/Tool/Data.cs

@@ -567,4 +567,28 @@ public class Data
 
         return attributesList;
     }
+
+    public static List<XmlAttributeCollection> GetAchieveConfig()
+    {
+        TextAsset textAsset;
+
+        XmlNodeList xmlNodeList;
+
+        XmlDocument xmlDoc = new XmlDocument();
+
+        List<XmlAttributeCollection> attributesList = new List<XmlAttributeCollection>();
+
+        textAsset = Bundle.Config.LoadAsset<TextAsset>("achieve_config");
+
+        xmlDoc.LoadXml(textAsset.text);
+
+        xmlNodeList = xmlDoc.SelectSingleNode("data").SelectNodes("item");
+
+        for (int i = 0; i < xmlNodeList.Count; i++)
+        {
+            attributesList.Add(xmlNodeList[i].Attributes);
+        }
+
+        return attributesList;
+    }
 }

Assets/Script/Tool/Extension.cs

@@ -18,6 +18,11 @@ public static class Extension
 
     public static T Random<T>(this List<T> list)
     {
+        if (list.Count == 0)
+        {
+            Debug.Log("Count is 0");
+        }
+
         return list[UnityEngine.Random.Range(0, list.Count)];
     }
 
@@ -553,6 +558,25 @@ public static class Extension
 
     #endregion
 
+    #region EulerAngle
+
+    public static void SetEX(this Transform tra, float x)
+    {
+        tra.eulerAngles = new Vector3(x, tra.eulerAngles.y, tra.eulerAngles.z);
+    }
+
+    public static void SetEY(this Transform tra, float y)
+    {
+        tra.eulerAngles = new Vector3(tra.eulerAngles.x, y, tra.eulerAngles.z);
+    }
+
+    public static void SetEZ(this Transform tra, float z)
+    {
+        tra.eulerAngles = new Vector3(tra.eulerAngles.x, tra.eulerAngles.y, z);
+    }
+
+    #endregion
+
     #region AddComponent
 
     public static T AddComponent<T>(this Component comp) where T : Component

Assets/Script/Tool/UI/SpriteAsset.cs

@@ -1,4 +1,10 @@
-using UnityEngine;
+#if UNITY_EDITOR
+
+using UnityEditor;
+
+#endif
+
+using UnityEngine;
 
 using System;
 using System.Collections;
@@ -43,9 +49,26 @@ public class SpriteAsset : MonoBehaviour
 
     public static void GetSpriteInfo()
     {
-        Object[] objects = Bundle.Atlas.LoadAllAssets();
+        Object[] objects = new Object[0];
+
+        Texture2D texture = new Texture2D(0,0);
+        
+        if (Application.isPlaying == false)
+        {
+#if UNITY_EDITOR
 
-        Texture2D texture = Bundle.Atlas.LoadAsset<Texture2D>("Atlas");
+            objects = AssetDatabase.LoadAllAssetsAtPath("Assets/Resource/Sprite/SpriteUI/Atlas.png");
+
+            texture = AssetDatabase.LoadAssetAtPath<Texture2D>("Assets/Resource/Sprite/SpriteUI/Atlas.png");
+            
+#endif
+        }
+        else
+        {
+            objects = Bundle.Atlas.LoadAllAssets();
+            
+            texture = Bundle.Atlas.LoadAsset<Texture2D>("Atlas");
+        }
 
         _SpriteInfoDic = new Dictionary<string, SpriteInfo>();
 

Assets/XlsxSource.meta

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

MyLovelyGarden.Editor.csproj

@@ -158,6 +158,7 @@
     <Compile Include="Assets\Script\Editor\EditorSpriteAsste.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Assets\Resource\Shader\Anim.shader" />
     <None Include="Assets\Resource\Shader\Discard.shader" />
     <None Include="Assets\Resource\Shader\Gray.shader" />
     <None Include="Assets\Resource\Shader\HighLight.shader" />

MyLovelyGarden.csproj

@@ -13,11 +13,13 @@
     <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <TargetFrameworkProfile>Unity Subset v3.5</TargetFrameworkProfile>
-    <CompilerResponseFile></CompilerResponseFile>
+    <CompilerResponseFile>
+    </CompilerResponseFile>
     <UnityProjectType>Game:1</UnityProjectType>
     <UnityBuildTarget>StandaloneWindows64:19</UnityBuildTarget>
     <UnityVersion>5.5.0f3</UnityVersion>
-    <RootNamespace></RootNamespace>
+    <RootNamespace>
+    </RootNamespace>
     <LangVersion Condition=" '$(VisualStudioVersion)' != '10.0' ">4</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -99,6 +101,7 @@
     <Compile Include="Assets\Script\Interface\Regist.cs" />
     <Compile Include="Assets\Script\Manage\Initializer.cs" />
     <Compile Include="Assets\Script\Manage\Main.cs" />
+    <Compile Include="Assets\Script\Manage\ManaAchieve.cs" />
     <Compile Include="Assets\Script\Manage\ManaAnim.cs" />
     <Compile Include="Assets\Script\Manage\ManaAudio.cs" />
     <Compile Include="Assets\Script\Manage\ManaColor.cs" />
@@ -111,6 +114,7 @@
     <Compile Include="Assets\Script\Manage\ManaSign.cs" />
     <Compile Include="Assets\Script\Manage\ManaText.cs" />
     <Compile Include="Assets\Script\Manage\ManaUI.cs" />
+    <Compile Include="Assets\Script\Object\AnimationReceiver.cs" />
     <Compile Include="Assets\Script\Object\Drop.cs" />
     <Compile Include="Assets\Script\Object\DropDiamond.cs" />
     <Compile Include="Assets\Script\Object\DropGold.cs" />
@@ -164,6 +168,7 @@
     <Compile Include="Assets\Script\Utils\StringUtil.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Assets\Resource\Shader\Anim.shader" />
     <None Include="Assets\Resource\Shader\Discard.shader" />
     <None Include="Assets\Resource\Shader\Gray.shader" />
     <None Include="Assets\Resource\Shader\HighLight.shader" />
@@ -175,11 +180,13 @@
     <None Include="Assets\Resource\XML\Config\pack_config.xml" />
     <None Include="Assets\Resource\XML\Config\signin_config.xml" />
     <None Include="Assets\Resource\XML\Config\skill_config.xml" />
-    <None Include="Assets\Resource\XML\PlayerConfig.xml" />
+    <None Include="Assets\Resource\XML\PlayerConfig.xml">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="Assets\Resource\XML\lan\ChineseSimplified.xml" />
     <None Include="Assets\Resource\XML\lan\ChineseTraditional.xml" />
     <None Include="Assets\Resource\XML\lan\English.xml" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="GenerateTargetFrameworkMonikerAttribute" />
-</Project>
+</Project>

MyLovelyGarden.sln

@@ -1,9 +1,9 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2008
-
-Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp.csproj", "{21BB93BC-2239-D8F5-1219-201F8DCBAF49}"
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2015
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden", "MyLovelyGarden.csproj", "{9F3A3259-D53B-F6C8-8878-C5B99621035A}"
 EndProject
-Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp-Editor.csproj", "{A08052E5-32CE-91C0-FF56-C60C901D6BEF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden.Editor", "MyLovelyGarden.Editor.csproj", "{B575449E-FD9A-1672-368B-EC1E1252F6E4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,19 +11,16 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = Assembly-CSharp.csproj
-	EndGlobalSection
 EndGlobal

ToList.txt

@@ -1,10 +1,14 @@
-蜜蜂蝴蝶(位置偏移 翻转)
-
 成就
 
+成就完成状态的存档
+
 切换后台
 
-场景加载机制
+分段加载场景
+
+Extension重新分类
+
+修改动画脚本(同一组件上的不同对象 不同组件上的统一对象 把Snap等操作放入OnFinish中)
 
 
 字体