LiuQilin 8 anos atrás
pai
commit
2420c6b85e
42 arquivos alterados com 335 adições e 276 exclusões
  1. BIN
      .vs/MyLovelyGarden/v14/.suo
  2. BIN
      Assets/Resource/Animations/Butterfly.controller
  3. 8 0
      Assets/Resource/Animations/Butterfly.controller.meta
  4. BIN
      Assets/Resource/Animations/ElfButterfly.anim
  5. 8 0
      Assets/Resource/Animations/ElfButterfly.anim.meta
  6. BIN
      Assets/Resource/Animations/ElfButterfly.controller
  7. 8 0
      Assets/Resource/Animations/ElfButterfly.controller.meta
  8. BIN
      Assets/Resource/Animations/ElfButterflyInner.anim
  9. 8 0
      Assets/Resource/Animations/ElfButterflyInner.anim.meta
  10. BIN
      Assets/Resource/Prefab/Object/ButterflyBlue.prefab
  11. BIN
      Assets/Resource/Prefab/Object/ButterflyPurple.prefab
  12. 2 2
      Assets/Resource/Prefab/Object/ButterflyPurple.prefab.meta
  13. BIN
      Assets/Resource/Prefab/Object/ButterflyRed.prefab
  14. 2 2
      Assets/Resource/Prefab/Object/ButterflyRed.prefab.meta
  15. BIN
      Assets/Resource/Prefab/Object/ButterflyWhite.prefab
  16. 2 2
      Assets/Resource/Prefab/Object/ButterflyWhite.prefab.meta
  17. BIN
      Assets/Resource/Prefab/Object/ButterflyYellow.prefab
  18. 2 2
      Assets/Resource/Prefab/Object/ButterflyYellow.prefab.meta
  19. BIN
      Assets/Resource/Prefab/PrefabUI/GroupB.prefab
  20. BIN
      Assets/Resource/Prefab/PrefabUI/SignItem.prefab
  21. BIN
      Assets/Resource/Prefab/PrefabUI/SkillItem.prefab
  22. BIN
      Assets/Resource/Sprite/Garden/蝴蝶技能效果.png
  23. BIN
      Assets/Resource/Sprite/Garden/蝴蝶技能效果2.png
  24. BIN
      Assets/Resource/Sprite/Garden/蝴蝶技能效果3.png
  25. BIN
      Assets/Resource/Sprite/Garden/蝴蝶技能效果4.png
  26. 33 1
      Assets/Resource/Sprite/Garden/蝴蝶技能效果4.png.meta
  27. BIN
      Assets/Resource/Sprite/Garden/蝴蝶技能效果5.png
  28. 73 72
      Assets/Resource/XML/lan/ChineseSimplified.xml
  29. 73 72
      Assets/Resource/XML/lan/ChineseTraditional.xml
  30. 75 74
      Assets/Resource/XML/lan/English.xml
  31. BIN
      Assets/Resource/Xlsx/award_config.xlsx
  32. BIN
      Assets/Resource/Xlsx/language_config.xlsx
  33. 11 2
      Assets/Script/Manage/ManaAchieve.cs
  34. 1 1
      Assets/Script/Manage/ManaData.cs
  35. 8 0
      Assets/Script/Manage/ManaLan.cs
  36. 4 12
      Assets/Script/Manage/ManaMiniGame.cs
  37. 2 9
      Assets/Script/Manage/ManaUI.cs
  38. 5 7
      Assets/Script/Object/Skill/BigSkill.cs
  39. 5 5
      Assets/Script/Object/Skill/Skill.cs
  40. 5 5
      Assets/Script/Tool/Auxiliary.cs
  41. BIN
      ProjectSettings/GraphicsSettings.asset
  42. 0 8
      ToList.txt

BIN
.vs/MyLovelyGarden/v14/.suo


BIN
Assets/Resource/Animations/Butterfly.controller


+ 8 - 0
Assets/Resource/Animations/Butterfly.controller.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d59f44d83f3709b43ac2cf9e68be023b
+timeCreated: 1494555476
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Resource/Animations/ElfButterfly.anim


+ 8 - 0
Assets/Resource/Animations/ElfButterfly.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1ec3c18a72a6a0442b2af75cb120c79b
+timeCreated: 1494555014
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Resource/Animations/ElfButterfly.controller


+ 8 - 0
Assets/Resource/Animations/ElfButterfly.controller.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 366743a8f32d491429cd56f64b992376
+timeCreated: 1494555014
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Resource/Animations/ElfButterflyInner.anim


+ 8 - 0
Assets/Resource/Animations/ElfButterflyInner.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2995727a049dc5842b56b014795230f2
+timeCreated: 1494555475
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Resource/Prefab/Object/ButterflyBlue.prefab


BIN
Assets/Resource/Prefab/Object/ButterflyPurple.prefab


+ 2 - 2
Assets/Resource/Prefab/Object/ButterflyPurple.prefab.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 1d3fe64ca1c778247b93e3e24d9ad233
-timeCreated: 1491386538
+guid: 09cf4d4247d9b274eb5a15bf6f13d67a
+timeCreated: 1491386536
 licenseType: Pro
 NativeFormatImporter:
   userData: 

BIN
Assets/Resource/Prefab/Object/ButterflyRed.prefab


+ 2 - 2
Assets/Resource/Prefab/Object/ButterflyRed.prefab.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 59e4d3b5091a94b42a0e004652ffb582
-timeCreated: 1491386533
+guid: 7287fb11260867d469cb59b5a8d94fb9
+timeCreated: 1491386536
 licenseType: Pro
 NativeFormatImporter:
   userData: 

BIN
Assets/Resource/Prefab/Object/ButterflyWhite.prefab


+ 2 - 2
Assets/Resource/Prefab/Object/ButterflyWhite.prefab.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: b4f5525af1229f74698800a4c561fb0c
-timeCreated: 1491386528
+guid: e9cc0b321aa63a34d903bcd3a67dc4a2
+timeCreated: 1491386536
 licenseType: Pro
 NativeFormatImporter:
   userData: 

BIN
Assets/Resource/Prefab/Object/ButterflyYellow.prefab


+ 2 - 2
Assets/Resource/Prefab/Object/ButterflyYellow.prefab.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: fb50d8cb36258b7459e3f99e896e3304
-timeCreated: 1491386531
+guid: 9c4d0c5738225d34fa3e1420e1d9a050
+timeCreated: 1491386536
 licenseType: Pro
 NativeFormatImporter:
   userData: 

BIN
Assets/Resource/Prefab/PrefabUI/GroupB.prefab


BIN
Assets/Resource/Prefab/PrefabUI/SignItem.prefab


BIN
Assets/Resource/Prefab/PrefabUI/SkillItem.prefab


BIN
Assets/Resource/Sprite/Garden/蝴蝶技能效果.png


BIN
Assets/Resource/Sprite/Garden/蝴蝶技能效果2.png


BIN
Assets/Resource/Sprite/Garden/蝴蝶技能效果3.png


BIN
Assets/Resource/Sprite/Garden/蝴蝶技能效果4.png


+ 33 - 1
Assets/Resource/Sprite/Garden/蝴蝶技能效果4.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 70cb02380943ab44b9b6c5f6a2425493
-timeCreated: 1491381403
+timeCreated: 1494554871
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
@@ -58,6 +58,38 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: WebGL
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

BIN
Assets/Resource/Sprite/Garden/蝴蝶技能效果5.png


+ 73 - 72
Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -16,6 +16,7 @@
     <Fe_BtnLab4 desc=""><![CDATA[等级]]></Fe_BtnLab4>
     <Fe_BtnLab6 desc=""><![CDATA[冷却中]]></Fe_BtnLab6>
     <Fe_BtnLab7 desc=""><![CDATA[剩余时间]]></Fe_BtnLab7>
+    <Fe_BtnLab8 desc=""><![CDATA[使用中]]></Fe_BtnLab8>
     <Fg_Tit desc=""><![CDATA[提示]]></Fg_Tit>
     <Fg_BtnLab desc=""><![CDATA[连接服务器]]></Fg_BtnLab>
     <Fg_Lab0 desc=""><![CDATA[该功能仅在联网时使用]]></Fg_Lab0>
@@ -269,78 +270,78 @@
     <Achieve126 desc=""><![CDATA[积少成多-6]]></Achieve126>
   </AchieveName>
   <AchieveDesc>
-    <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>
-    <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>
+    <Achieve1 desc=""><![CDATA[花园等级达到 [&value&]]]></Achieve1>
+    <Achieve2 desc=""><![CDATA[花园等级达到 [&value&]]]></Achieve2>
+    <Achieve3 desc=""><![CDATA[花园等级达到 [&value&]]]></Achieve3>
+    <Achieve4 desc=""><![CDATA[花园等级达到 [&value&]]]></Achieve4>
+    <Achieve5 desc=""><![CDATA[花园等级达到 [&value&]]]></Achieve5>
+    <Achieve6 desc=""><![CDATA[花园等级达到 [&value&]]]></Achieve6>
+    <Achieve21 desc=""><![CDATA[拥有[&value&]金币]]></Achieve21>
+    <Achieve22 desc=""><![CDATA[拥有[&value&]金币]]></Achieve22>
+    <Achieve23 desc=""><![CDATA[拥有[&value&]金币]]></Achieve23>
+    <Achieve24 desc=""><![CDATA[拥有[&value&]金币]]></Achieve24>
+    <Achieve25 desc=""><![CDATA[拥有[&value&]金币]]></Achieve25>
+    <Achieve26 desc=""><![CDATA[拥有[&value&]金币]]></Achieve26>
+    <Achieve31 desc=""><![CDATA[总共获取[&value&]金币]]></Achieve31>
+    <Achieve32 desc=""><![CDATA[总共获取[&value&]金币]]></Achieve32>
+    <Achieve33 desc=""><![CDATA[总共获取[&value&]金币]]></Achieve33>
+    <Achieve34 desc=""><![CDATA[总共获取[&value&]金币]]></Achieve34>
+    <Achieve35 desc=""><![CDATA[总共获取[&value&]金币]]></Achieve35>
+    <Achieve36 desc=""><![CDATA[总共获取[&value&]金币]]></Achieve36>
+    <Achieve41 desc=""><![CDATA[所有精灵等级总和达到[&value&]级]]></Achieve41>
+    <Achieve42 desc=""><![CDATA[所有精灵等级总和达到[&value&]级]]></Achieve42>
+    <Achieve43 desc=""><![CDATA[所有精灵等级总和达到[&value&]级]]></Achieve43>
+    <Achieve44 desc=""><![CDATA[所有精灵等级总和达到[&value&]级]]></Achieve44>
+    <Achieve45 desc=""><![CDATA[所有精灵等级总和达到[&value&]级]]></Achieve45>
+    <Achieve46 desc=""><![CDATA[所有精灵等级总和达到[&value&]级]]></Achieve46>
+    <Achieve51 desc=""><![CDATA[花朵数量达到[&value&]]]></Achieve51>
+    <Achieve52 desc=""><![CDATA[花朵数量达到[&value&]]]></Achieve52>
+    <Achieve53 desc=""><![CDATA[花朵数量达到[&value&]]]></Achieve53>
+    <Achieve54 desc=""><![CDATA[花朵数量达到[&value&]]]></Achieve54>
+    <Achieve55 desc=""><![CDATA[花朵数量达到[&value&]]]></Achieve55>
+    <Achieve56 desc=""><![CDATA[花朵数量达到[&value&]]]></Achieve56>
+    <Achieve61 desc=""><![CDATA[参观人次总数达到[&value&]]]></Achieve61>
+    <Achieve62 desc=""><![CDATA[参观人次总数达到[&value&]]]></Achieve62>
+    <Achieve63 desc=""><![CDATA[参观人次总数达到[&value&]]]></Achieve63>
+    <Achieve64 desc=""><![CDATA[参观人次总数达到[&value&]]]></Achieve64>
+    <Achieve65 desc=""><![CDATA[参观人次总数达到[&value&]]]></Achieve65>
+    <Achieve66 desc=""><![CDATA[参观人次总数达到[&value&]]]></Achieve66>
+    <Achieve71 desc=""><![CDATA[使用技能[&value&]次]]></Achieve71>
+    <Achieve72 desc=""><![CDATA[使用技能[&value&]次]]></Achieve72>
+    <Achieve73 desc=""><![CDATA[使用技能[&value&]次]]></Achieve73>
+    <Achieve74 desc=""><![CDATA[使用技能[&value&]次]]></Achieve74>
+    <Achieve75 desc=""><![CDATA[使用技能[&value&]次]]></Achieve75>
+    <Achieve76 desc=""><![CDATA[使用技能[&value&]次]]></Achieve76>
+    <Achieve81 desc=""><![CDATA[观看[&value&]次广告]]></Achieve81>
+    <Achieve82 desc=""><![CDATA[观看[&value&]次广告]]></Achieve82>
+    <Achieve83 desc=""><![CDATA[观看[&value&]次广告]]></Achieve83>
+    <Achieve84 desc=""><![CDATA[观看[&value&]次广告]]></Achieve84>
+    <Achieve85 desc=""><![CDATA[观看[&value&]次广告]]></Achieve85>
+    <Achieve86 desc=""><![CDATA[观看[&value&]次广告]]></Achieve86>
+    <Achieve91 desc=""><![CDATA[签到[&value&]次]]></Achieve91>
+    <Achieve92 desc=""><![CDATA[签到[&value&]次]]></Achieve92>
+    <Achieve93 desc=""><![CDATA[签到[&value&]次]]></Achieve93>
+    <Achieve94 desc=""><![CDATA[签到[&value&]次]]></Achieve94>
+    <Achieve95 desc=""><![CDATA[签到[&value&]次]]></Achieve95>
+    <Achieve96 desc=""><![CDATA[签到[&value&]次]]></Achieve96>
+    <Achieve101 desc=""><![CDATA[分享[&value&]次]]></Achieve101>
+    <Achieve102 desc=""><![CDATA[分享[&value&]次]]></Achieve102>
+    <Achieve103 desc=""><![CDATA[分享[&value&]次]]></Achieve103>
+    <Achieve104 desc=""><![CDATA[分享[&value&]次]]></Achieve104>
+    <Achieve105 desc=""><![CDATA[分享[&value&]次]]></Achieve105>
+    <Achieve106 desc=""><![CDATA[分享[&value&]次]]></Achieve106>
+    <Achieve111 desc=""><![CDATA[完成小游戏[&value&]次]]></Achieve111>
+    <Achieve112 desc=""><![CDATA[完成小游戏[&value&]次]]></Achieve112>
+    <Achieve113 desc=""><![CDATA[完成小游戏[&value&]次]]></Achieve113>
+    <Achieve114 desc=""><![CDATA[完成小游戏[&value&]次]]></Achieve114>
+    <Achieve115 desc=""><![CDATA[完成小游戏[&value&]次]]></Achieve115>
+    <Achieve116 desc=""><![CDATA[完成小游戏[&value&]次]]></Achieve116>
+    <Achieve121 desc=""><![CDATA[收集花园里的金币[&value&]次]]></Achieve121>
+    <Achieve122 desc=""><![CDATA[收集花园里的金币[&value&]次]]></Achieve122>
+    <Achieve123 desc=""><![CDATA[收集花园里的金币[&value&]次]]></Achieve123>
+    <Achieve124 desc=""><![CDATA[收集花园里的金币[&value&]次]]></Achieve124>
+    <Achieve125 desc=""><![CDATA[收集花园里的金币[&value&]次]]></Achieve125>
+    <Achieve126 desc=""><![CDATA[收集花园里的金币[&value&]次]]></Achieve126>
   </AchieveDesc>
   <IAP>
     <LoadAd desc=""><![CDATA[广告加载中,请稍后再试]]></LoadAd>

+ 73 - 72
Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -16,6 +16,7 @@
     <Fe_BtnLab4 desc=""><![CDATA[等級]]></Fe_BtnLab4>
     <Fe_BtnLab6 desc=""><![CDATA[冷卻中]]></Fe_BtnLab6>
     <Fe_BtnLab7 desc=""><![CDATA[剩餘時間]]></Fe_BtnLab7>
+    <Fe_BtnLab8 desc=""><![CDATA[使用中]]></Fe_BtnLab8>
     <Fg_Tit desc=""><![CDATA[提示]]></Fg_Tit>
     <Fg_BtnLab desc=""><![CDATA[連接伺服器]]></Fg_BtnLab>
     <Fg_Lab0 desc=""><![CDATA[該功能僅在聯網時使用]]></Fg_Lab0>
@@ -269,78 +270,78 @@
     <Achieve126 desc=""><![CDATA[積少成多-6]]></Achieve126>
   </AchieveName>
   <AchieveDesc>
-    <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>
-    <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>
+    <Achieve1 desc=""><![CDATA[花園等級達到 [&value&]]]></Achieve1>
+    <Achieve2 desc=""><![CDATA[花園等級達到 [&value&]]]></Achieve2>
+    <Achieve3 desc=""><![CDATA[花園等級達到 [&value&]]]></Achieve3>
+    <Achieve4 desc=""><![CDATA[花園等級達到 [&value&]]]></Achieve4>
+    <Achieve5 desc=""><![CDATA[花園等級達到 [&value&]]]></Achieve5>
+    <Achieve6 desc=""><![CDATA[花園等級達到 [&value&]]]></Achieve6>
+    <Achieve21 desc=""><![CDATA[擁有[&value&]金幣]]></Achieve21>
+    <Achieve22 desc=""><![CDATA[擁有[&value&]金幣]]></Achieve22>
+    <Achieve23 desc=""><![CDATA[擁有[&value&]金幣]]></Achieve23>
+    <Achieve24 desc=""><![CDATA[擁有[&value&]金幣]]></Achieve24>
+    <Achieve25 desc=""><![CDATA[擁有[&value&]金幣]]></Achieve25>
+    <Achieve26 desc=""><![CDATA[擁有[&value&]金幣]]></Achieve26>
+    <Achieve31 desc=""><![CDATA[總共獲取[&value&]金幣]]></Achieve31>
+    <Achieve32 desc=""><![CDATA[總共獲取[&value&]金幣]]></Achieve32>
+    <Achieve33 desc=""><![CDATA[總共獲取[&value&]金幣]]></Achieve33>
+    <Achieve34 desc=""><![CDATA[總共獲取[&value&]金幣]]></Achieve34>
+    <Achieve35 desc=""><![CDATA[總共獲取[&value&]金幣]]></Achieve35>
+    <Achieve36 desc=""><![CDATA[總共獲取[&value&]金幣]]></Achieve36>
+    <Achieve41 desc=""><![CDATA[所有精靈等級總和達到[&value&]級]]></Achieve41>
+    <Achieve42 desc=""><![CDATA[所有精靈等級總和達到[&value&]級]]></Achieve42>
+    <Achieve43 desc=""><![CDATA[所有精靈等級總和達到[&value&]級]]></Achieve43>
+    <Achieve44 desc=""><![CDATA[所有精靈等級總和達到[&value&]級]]></Achieve44>
+    <Achieve45 desc=""><![CDATA[所有精靈等級總和達到[&value&]級]]></Achieve45>
+    <Achieve46 desc=""><![CDATA[所有精靈等級總和達到[&value&]級]]></Achieve46>
+    <Achieve51 desc=""><![CDATA[花朵數量達到[&value&]]]></Achieve51>
+    <Achieve52 desc=""><![CDATA[花朵數量達到[&value&]]]></Achieve52>
+    <Achieve53 desc=""><![CDATA[花朵數量達到[&value&]]]></Achieve53>
+    <Achieve54 desc=""><![CDATA[花朵數量達到[&value&]]]></Achieve54>
+    <Achieve55 desc=""><![CDATA[花朵數量達到[&value&]]]></Achieve55>
+    <Achieve56 desc=""><![CDATA[花朵數量達到[&value&]]]></Achieve56>
+    <Achieve61 desc=""><![CDATA[參觀人次總數達到[&value&]]]></Achieve61>
+    <Achieve62 desc=""><![CDATA[參觀人次總數達到[&value&]]]></Achieve62>
+    <Achieve63 desc=""><![CDATA[參觀人次總數達到[&value&]]]></Achieve63>
+    <Achieve64 desc=""><![CDATA[參觀人次總數達到[&value&]]]></Achieve64>
+    <Achieve65 desc=""><![CDATA[參觀人次總數達到[&value&]]]></Achieve65>
+    <Achieve66 desc=""><![CDATA[參觀人次總數達到[&value&]]]></Achieve66>
+    <Achieve71 desc=""><![CDATA[使用技能[&value&]次]]></Achieve71>
+    <Achieve72 desc=""><![CDATA[使用技能[&value&]次]]></Achieve72>
+    <Achieve73 desc=""><![CDATA[使用技能[&value&]次]]></Achieve73>
+    <Achieve74 desc=""><![CDATA[使用技能[&value&]次]]></Achieve74>
+    <Achieve75 desc=""><![CDATA[使用技能[&value&]次]]></Achieve75>
+    <Achieve76 desc=""><![CDATA[使用技能[&value&]次]]></Achieve76>
+    <Achieve81 desc=""><![CDATA[觀看[&value&]次廣告]]></Achieve81>
+    <Achieve82 desc=""><![CDATA[觀看[&value&]次廣告]]></Achieve82>
+    <Achieve83 desc=""><![CDATA[觀看[&value&]次廣告]]></Achieve83>
+    <Achieve84 desc=""><![CDATA[觀看[&value&]次廣告]]></Achieve84>
+    <Achieve85 desc=""><![CDATA[觀看[&value&]次廣告]]></Achieve85>
+    <Achieve86 desc=""><![CDATA[觀看[&value&]次廣告]]></Achieve86>
+    <Achieve91 desc=""><![CDATA[簽到[&value&]次]]></Achieve91>
+    <Achieve92 desc=""><![CDATA[簽到[&value&]次]]></Achieve92>
+    <Achieve93 desc=""><![CDATA[簽到[&value&]次]]></Achieve93>
+    <Achieve94 desc=""><![CDATA[簽到[&value&]次]]></Achieve94>
+    <Achieve95 desc=""><![CDATA[簽到[&value&]次]]></Achieve95>
+    <Achieve96 desc=""><![CDATA[簽到[&value&]次]]></Achieve96>
+    <Achieve101 desc=""><![CDATA[分享[&value&]次]]></Achieve101>
+    <Achieve102 desc=""><![CDATA[分享[&value&]次]]></Achieve102>
+    <Achieve103 desc=""><![CDATA[分享[&value&]次]]></Achieve103>
+    <Achieve104 desc=""><![CDATA[分享[&value&]次]]></Achieve104>
+    <Achieve105 desc=""><![CDATA[分享[&value&]次]]></Achieve105>
+    <Achieve106 desc=""><![CDATA[分享[&value&]次]]></Achieve106>
+    <Achieve111 desc=""><![CDATA[完成小遊戲[&value&]次]]></Achieve111>
+    <Achieve112 desc=""><![CDATA[完成小遊戲[&value&]次]]></Achieve112>
+    <Achieve113 desc=""><![CDATA[完成小遊戲[&value&]次]]></Achieve113>
+    <Achieve114 desc=""><![CDATA[完成小遊戲[&value&]次]]></Achieve114>
+    <Achieve115 desc=""><![CDATA[完成小遊戲[&value&]次]]></Achieve115>
+    <Achieve116 desc=""><![CDATA[完成小遊戲[&value&]次]]></Achieve116>
+    <Achieve121 desc=""><![CDATA[收集花園裡的金幣[&value&]次]]></Achieve121>
+    <Achieve122 desc=""><![CDATA[收集花園裡的金幣[&value&]次]]></Achieve122>
+    <Achieve123 desc=""><![CDATA[收集花園裡的金幣[&value&]次]]></Achieve123>
+    <Achieve124 desc=""><![CDATA[收集花園裡的金幣[&value&]次]]></Achieve124>
+    <Achieve125 desc=""><![CDATA[收集花園裡的金幣[&value&]次]]></Achieve125>
+    <Achieve126 desc=""><![CDATA[收集花園裡的金幣[&value&]次]]></Achieve126>
   </AchieveDesc>
   <IAP>
     <LoadAd desc=""><![CDATA[廣告加載中,請稍後再試]]></LoadAd>

+ 75 - 74
Assets/Resource/XML/lan/English.xml

@@ -13,9 +13,10 @@
     <Fe_BtnLab1 desc=""><![CDATA[Unlock]]></Fe_BtnLab1>
     <Fe_BtnLab2 desc=""><![CDATA[Upgrade]]></Fe_BtnLab2>
     <Fe_BtnLab3 desc=""><![CDATA[Buy]]></Fe_BtnLab3>
-    <Fe_BtnLab4 desc=""><![CDATA[Level]]></Fe_BtnLab4>
+    <Fe_BtnLab4 desc=""><![CDATA[Level ]]></Fe_BtnLab4>
     <Fe_BtnLab6 desc=""><![CDATA[CD]]></Fe_BtnLab6>
-    <Fe_BtnLab7 desc=""><![CDATA[Left]]></Fe_BtnLab7>
+    <Fe_BtnLab7 desc=""><![CDATA[Left ]]></Fe_BtnLab7>
+    <Fe_BtnLab8 desc=""><![CDATA[Using ]]></Fe_BtnLab8>
     <Fg_Tit desc=""><![CDATA[Alert]]></Fg_Tit>
     <Fg_BtnLab desc=""><![CDATA[Connet]]></Fg_BtnLab>
     <Fg_Lab0 desc=""><![CDATA[Internet required]]></Fg_Lab0>
@@ -269,78 +270,78 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack6>
     <Achieve126 desc=""><![CDATA[Add Up 6]]></Achieve126>
   </AchieveName>
   <AchieveDesc>
-    <Achieve1 desc=""><![CDATA[Garden Level 30]]></Achieve1>
-    <Achieve2 desc=""><![CDATA[Garden Level 50]]></Achieve2>
-    <Achieve3 desc=""><![CDATA[Garden Level 100]]></Achieve3>
-    <Achieve4 desc=""><![CDATA[Garden Level 200]]></Achieve4>
-    <Achieve5 desc=""><![CDATA[Garden Level 300]]></Achieve5>
-    <Achieve6 desc=""><![CDATA[Garden Level 400]]></Achieve6>
-    <Achieve21 desc=""><![CDATA[Own 1000 Coins]]></Achieve21>
-    <Achieve22 desc=""><![CDATA[Own 2000 Coins]]></Achieve22>
-    <Achieve23 desc=""><![CDATA[Own 3000 Coins]]></Achieve23>
-    <Achieve24 desc=""><![CDATA[Own 5000 Coins]]></Achieve24>
-    <Achieve25 desc=""><![CDATA[Own 8000 Coins]]></Achieve25>
-    <Achieve26 desc=""><![CDATA[Own 10000 Coins]]></Achieve26>
-    <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>
+    <Achieve1 desc=""><![CDATA[Garden Level [&value&]]]></Achieve1>
+    <Achieve2 desc=""><![CDATA[Garden Level [&value&]]]></Achieve2>
+    <Achieve3 desc=""><![CDATA[Garden Level [&value&]]]></Achieve3>
+    <Achieve4 desc=""><![CDATA[Garden Level [&value&]]]></Achieve4>
+    <Achieve5 desc=""><![CDATA[Garden Level [&value&]]]></Achieve5>
+    <Achieve6 desc=""><![CDATA[Garden Level [&value&]]]></Achieve6>
+    <Achieve21 desc=""><![CDATA[Own [&value&] Coins]]></Achieve21>
+    <Achieve22 desc=""><![CDATA[Own [&value&] Coins]]></Achieve22>
+    <Achieve23 desc=""><![CDATA[Own [&value&] Coins]]></Achieve23>
+    <Achieve24 desc=""><![CDATA[Own [&value&] Coins]]></Achieve24>
+    <Achieve25 desc=""><![CDATA[Own [&value&] Coins]]></Achieve25>
+    <Achieve26 desc=""><![CDATA[Own [&value&] Coins]]></Achieve26>
+    <Achieve31 desc=""><![CDATA[Collect [&value&] Coins]]></Achieve31>
+    <Achieve32 desc=""><![CDATA[Collect [&value&] Coins]]></Achieve32>
+    <Achieve33 desc=""><![CDATA[Collect [&value&] Coins]]></Achieve33>
+    <Achieve34 desc=""><![CDATA[Collect [&value&] Coins]]></Achieve34>
+    <Achieve35 desc=""><![CDATA[Collect [&value&] Coins]]></Achieve35>
+    <Achieve36 desc=""><![CDATA[Collect [&value&] Coins]]></Achieve36>
+    <Achieve41 desc=""><![CDATA[Achieve total of [&value&] Elf levels]]></Achieve41>
+    <Achieve42 desc=""><![CDATA[Achieve total of [&value&] Elf levels]]></Achieve42>
+    <Achieve43 desc=""><![CDATA[Achieve total of [&value&] Elf levels]]></Achieve43>
+    <Achieve44 desc=""><![CDATA[Achieve total of [&value&] Elf levels]]></Achieve44>
+    <Achieve45 desc=""><![CDATA[Achieve total of [&value&] Elf levels]]></Achieve45>
+    <Achieve46 desc=""><![CDATA[Achieve total of [&value&] Elf levels]]></Achieve46>
+    <Achieve51 desc=""><![CDATA[Collect [&value&] type of Flower]]></Achieve51>
+    <Achieve52 desc=""><![CDATA[Collect [&value&] types of Flower]]></Achieve52>
+    <Achieve53 desc=""><![CDATA[Collect [&value&] types of Flower]]></Achieve53>
+    <Achieve54 desc=""><![CDATA[Collect [&value&] types of Flower]]></Achieve54>
+    <Achieve55 desc=""><![CDATA[Collect [&value&] types of Flower]]></Achieve55>
+    <Achieve56 desc=""><![CDATA[Collect [&value&] types of Flower]]></Achieve56>
+    <Achieve61 desc=""><![CDATA[Achieve total of [&value&] Visitors]]></Achieve61>
+    <Achieve62 desc=""><![CDATA[Achieve total of [&value&] Visitors]]></Achieve62>
+    <Achieve63 desc=""><![CDATA[Achieve total of [&value&] Visitors]]></Achieve63>
+    <Achieve64 desc=""><![CDATA[Achieve total of [&value&] Visitors]]></Achieve64>
+    <Achieve65 desc=""><![CDATA[Achieve total of [&value&] Visitors]]></Achieve65>
+    <Achieve66 desc=""><![CDATA[Achieve total of [&value&] Visitors]]></Achieve66>
+    <Achieve71 desc=""><![CDATA[Use Skill [&value&] times]]></Achieve71>
+    <Achieve72 desc=""><![CDATA[Use Skill [&value&] times]]></Achieve72>
+    <Achieve73 desc=""><![CDATA[Use Skill [&value&] times]]></Achieve73>
+    <Achieve74 desc=""><![CDATA[Use Skill [&value&] times]]></Achieve74>
+    <Achieve75 desc=""><![CDATA[Use Skill [&value&] times]]></Achieve75>
+    <Achieve76 desc=""><![CDATA[Use Skill [&value&] times]]></Achieve76>
+    <Achieve81 desc=""><![CDATA[Watch video [&value&] times]]></Achieve81>
+    <Achieve82 desc=""><![CDATA[Watch video [&value&] times]]></Achieve82>
+    <Achieve83 desc=""><![CDATA[Watch video [&value&] times]]></Achieve83>
+    <Achieve84 desc=""><![CDATA[Watch video [&value&] times]]></Achieve84>
+    <Achieve85 desc=""><![CDATA[Watch video [&value&] times]]></Achieve85>
+    <Achieve86 desc=""><![CDATA[Watch video [&value&] times]]></Achieve86>
+    <Achieve91 desc=""><![CDATA[Play game for [&value&] days]]></Achieve91>
+    <Achieve92 desc=""><![CDATA[Play game for [&value&] days]]></Achieve92>
+    <Achieve93 desc=""><![CDATA[Play game for [&value&] days]]></Achieve93>
+    <Achieve94 desc=""><![CDATA[Play game for [&value&] days]]></Achieve94>
+    <Achieve95 desc=""><![CDATA[Play game for [&value&] days]]></Achieve95>
+    <Achieve96 desc=""><![CDATA[Play game for [&value&] days]]></Achieve96>
+    <Achieve101 desc=""><![CDATA[Share [&value&] time]]></Achieve101>
+    <Achieve102 desc=""><![CDATA[Share [&value&] times]]></Achieve102>
+    <Achieve103 desc=""><![CDATA[Share [&value&] times]]></Achieve103>
+    <Achieve104 desc=""><![CDATA[Share [&value&] times]]></Achieve104>
+    <Achieve105 desc=""><![CDATA[Share [&value&] times]]></Achieve105>
+    <Achieve106 desc=""><![CDATA[Share [&value&] times]]></Achieve106>
+    <Achieve111 desc=""><![CDATA[Play mini game [&value&] times]]></Achieve111>
+    <Achieve112 desc=""><![CDATA[Play mini game [&value&] times]]></Achieve112>
+    <Achieve113 desc=""><![CDATA[Play mini game [&value&] times]]></Achieve113>
+    <Achieve114 desc=""><![CDATA[Play mini game [&value&] times]]></Achieve114>
+    <Achieve115 desc=""><![CDATA[Play mini game [&value&] times]]></Achieve115>
+    <Achieve116 desc=""><![CDATA[Play mini game [&value&] times]]></Achieve116>
+    <Achieve121 desc=""><![CDATA[Tap Coins in garden [&value&] times]]></Achieve121>
+    <Achieve122 desc=""><![CDATA[Tap Coins in garden [&value&] times]]></Achieve122>
+    <Achieve123 desc=""><![CDATA[Tap Coins in garden [&value&] times]]></Achieve123>
+    <Achieve124 desc=""><![CDATA[Tap Coins in garden [&value&] times]]></Achieve124>
+    <Achieve125 desc=""><![CDATA[Tap Coins in garden [&value&] times]]></Achieve125>
+    <Achieve126 desc=""><![CDATA[Tap Coins in garden [&value&] times]]></Achieve126>
   </AchieveDesc>
   <IAP>
     <LoadAd desc=""><![CDATA[AD is loading, please try again later]]></LoadAd>

BIN
Assets/Resource/Xlsx/award_config.xlsx


BIN
Assets/Resource/Xlsx/language_config.xlsx


+ 11 - 2
Assets/Script/Manage/ManaAchieve.cs

@@ -124,7 +124,8 @@ public class Achieve
         BtnLab = dic["BtnLab"].GetComponent<Text>();
 
         ManaLan.Add(Tit, new LanStr("AchieveName", ID));
-        ManaLan.Add(Lab, new LanStr("AchieveDesc", ID));
+
+        Lab.text = GetDescription(Desc, Value);
 
         Image.sprite = Icon;
         AchieveItem.SetSiblingIndex(Index);
@@ -150,7 +151,7 @@ public class Achieve
 
         ManaDebug.Log(string.Format("获得钻石<color=red>{0}</color> 参观人次+<color=red>{1}</color> 每人次金币+<color=red>{2}</color>", DiamondOnce, Person, CoinPerson));
 
-        ManaAudio.PlayClip(Clip.BtnClip);
+        ManaAudio.PlayClip(Clip.CurrentClip);
 
         ManaData.Diamond += DiamondOnce;
         ManaData.SkillPerson += Person;
@@ -164,6 +165,8 @@ public class Achieve
         {
             ManaReso.Save(AchieveItem);
 
+            AchieveItem = null;
+
             if (PostAchieveList.Count > 0)
             {
                 PostAchieveList[0].Regist();
@@ -392,6 +395,12 @@ public class Achieve
 
         ManaLan.Add(BtnLab, new LanStr("Object", "AchieveItem_BtnLab2"));
     }
+
+
+    public static string GetDescription(string desc, double value)
+    {
+        return desc.Replace("[&value&]", value.ToString("0"));
+    }
 }
 
 public class ManaAchieve : Regist 

+ 1 - 1
Assets/Script/Manage/ManaData.cs

@@ -439,7 +439,7 @@ public class ManaData : Regist
         {
             OpTimer += Time.deltaTime;
 
-            if (OpTimer >= 90)
+            if (OpTimer >= 60)
             {
                 OpTimer = 0;
 

+ 8 - 0
Assets/Script/Manage/ManaLan.cs

@@ -92,6 +92,14 @@ public class ManaLan : Regist
             kv.Key.text = Translate(kv.Value);
         }
 
+        foreach (var kv in ManaAchieve.AchieveDic)
+        {
+            if (kv.Value.AchieveItem != null)
+            {
+                kv.Value.Lab.text = Achieve.GetDescription(kv.Value.Desc, kv.Value.Value);
+            }
+        }
+
         for (int i = 0; i < ManaData.SkillList.Count; i++)
         {
             ManaData.SkillList[i].SwitchLanguage();

+ 4 - 12
Assets/Script/Manage/ManaMiniGame.cs

@@ -583,17 +583,8 @@ public class ManaMiniGame : Regist
 
             TimerLab.text = (GameTime-_GameTimer).ToString("0.0");
 
-            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>");
-            }
+            TimerBk.fillAmount = _GameTimer/GameTime;
+            TimerBk.material.SetFloat("_Fill", TimerBk.fillAmount);
         }
     }
     public static float PrepareTimer
@@ -661,7 +652,7 @@ public class ManaMiniGame : Regist
             return;
         }
 
-        GameTimer += Time.fixedDeltaTime * 15;
+        GameTimer += Time.fixedDeltaTime;
         if (GameTimer >= GameTime)
         {
             GameOver();
@@ -852,6 +843,7 @@ public class ManaMiniGame : Regist
         Game = false;
         Panalty = false;
         Prepare = false;
+        GameTimer = GameTime;
 
         for (int i = 0; i < OpList.Count; i++)
         {

+ 2 - 9
Assets/Script/Manage/ManaUI.cs

@@ -436,15 +436,8 @@ public class ManaUI : Regist
         #endregion
 
         #region D_TimerIcon
-        
-        try
-        {
-            ManaReso.Get<Image>("D_TimerIcon").material = ManaReso.Load<Material>("TimerMat", Folder.Effect);
-        }
-        catch (Exception e)
-        {
-            ManaDebug.Log("<color=blue>" + e.Message + "</color>");
-        }
+
+        ManaReso.Get<Image>("D_TimerIcon").material = ManaReso.Load<Material>("TimerMat", Folder.Effect);
 
         #endregion
 

+ 5 - 7
Assets/Script/Object/Skill/BigSkill.cs

@@ -102,7 +102,7 @@ public class BigSkill : Skill
     {
         CoolTimer = CD * (1 + CdBuff);
 
-        BarLab.color = Color.white;
+        //BarLab.color = Color.white;
 
         BarStatus = SkillStatus.Cool;
 
@@ -125,7 +125,7 @@ public class BigSkill : Skill
 
         TimeSpan timeSpan = new TimeSpan(0, 0, 0, (int)UseTimer);
 
-        BarLab.text = string.Format("{0} : {1}", timeSpan.Minutes, timeSpan.Seconds);
+        BarLab.text = string.Format("{0} : {1}", timeSpan.Minutes.ToString("00"), timeSpan.Seconds.ToString("00"));
 
         if (UseTimer <= 0)
         {
@@ -145,7 +145,7 @@ public class BigSkill : Skill
 
         TimeSpan timeSpan = new TimeSpan(0, 0, 0, (int)CoolTimer);
 
-        BarLab.text = string.Format("{0} : {1}", timeSpan.Minutes, timeSpan.Seconds);
+        BarLab.text = string.Format("{0} : {1}", timeSpan.Minutes.ToString("00"), timeSpan.Seconds.ToString("00"));
 
         BarBk0.fillAmount = CoolTimer / CD;
 
@@ -204,8 +204,6 @@ public class BigSkill : Skill
         {
             BarBk1.sprite = BarIcon;
 
-            BarBk1.material = null;
-
             BarBtn.onClick.RemoveAllListeners();
             BarBtn.onClick.AddListener(Buy);
         }
@@ -429,7 +427,7 @@ public class BigSkill : Skill
 
             BarStatus = SkillStatus.Use;
 
-            BarLab.color = Color.blue;
+            //BarLab.color = Color.blue;
 
             UseA();
             UseB();
@@ -438,7 +436,7 @@ public class BigSkill : Skill
 
     protected override void UseA()
     {
-        BarLab.color = Color.blue;
+        //BarLab.color = Color.blue;
 
         BarBtn.interactable = false;
 

+ 5 - 5
Assets/Script/Object/Skill/Skill.cs

@@ -163,7 +163,7 @@ public class Skill : SkillRoot
 
         TimeSpan timeSpan = new TimeSpan(0, 0, (int)CoolTimer);
 
-        ItemBtnLab.text = string.Format("{0}\n{1}{2}:{3}", Language.GetStr("UI", "Fe_BtnLab6"), Language.GetStr("UI", "Fe_BtnLab7"), timeSpan.Minutes, timeSpan.Seconds);
+        ItemBtnLab.text = string.Format("{0}\n{1}{2}:{3}", Language.GetStr("UI", "Fe_BtnLab6"), Language.GetStr("UI", "Fe_BtnLab7"), timeSpan.Minutes.ToString("00"), timeSpan.Seconds.ToString("00"));
 
         if (CoolTimer <= 0)
         {
@@ -209,7 +209,7 @@ public class Skill : SkillRoot
 
         ItemStatus = SkillStatus.Cool;
 
-        ItemBtnLab.color = Color.white;
+        //ItemBtnLab.color = Color.white;
 
         AnnulA();
     }
@@ -220,7 +220,7 @@ public class Skill : SkillRoot
 
         TimeSpan timeSpan = new TimeSpan(0, 0, (int)UseTimer);
 
-        ItemBtnLab.text = string.Format("{0} : {1}", timeSpan.Minutes, timeSpan.Seconds);
+        ItemBtnLab.text = string.Format("{0}\n{1}{2}:{3}", Language.GetStr("UI", "Fe_BtnLab8"), Language.GetStr("UI", "Fe_BtnLab7"), timeSpan.Minutes.ToString("00"), timeSpan.Seconds.ToString("00"));
 
         if (UseTimer <= 0)
         {
@@ -248,7 +248,7 @@ public class Skill : SkillRoot
 
     protected virtual void UseA()
     {
-        ItemBtnLab.color = Color.blue;
+        //ItemBtnLab.color = Color.blue;
 
         ManaData.UseList.Add(this);
 
@@ -448,7 +448,7 @@ public class Skill : SkillRoot
             {
                 UseTimer -= elapse;
 
-                ItemBtnLab.color = Color.blue;
+                //ItemBtnLab.color = Color.blue;
             }
         }
         else if (ItemStatus_ == SkillStatus.Cool)

+ 5 - 5
Assets/Script/Tool/Auxiliary.cs

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

BIN
ProjectSettings/GraphicsSettings.asset


+ 0 - 8
ToList.txt

@@ -7,18 +7,10 @@ ScrollRect
 
 超时Bug
 
-拖尾Shader
-
 分享
 
-蝴蝶动画
-
-成就描述
-
 成就中的分享
 
-小游戏时间 Scale
-
 
 收益控制