LiuQilin vor 8 Jahren
Ursprung
Commit
56a3d7f755
46 geänderte Dateien mit 973 neuen und 193 gelöschten Zeilen
  1. BIN
      .vs/MyLovelyGarden/v14/.suo
  2. BIN
      Assets/Resources/Animations/FlowerAnimContainer.controller
  3. BIN
      Assets/Resources/Garden.unity
  4. BIN
      Assets/Resources/Prefab/PrefabUI/Canvas.prefab
  5. BIN
      Assets/Resources/Prefab/PrefabUI/SignInItem.prefab
  6. 0 0
      Assets/Resources/Prefab/PrefabUI/SignInItem.prefab.meta
  7. BIN
      Assets/Resources/Shader/Gray.mat
  8. 9 0
      Assets/Resources/Temp.meta
  9. 3 2
      Assets/Resources/XML/Config/PlayerConfig.xml
  10. 17 0
      Assets/Resources/XML/Config/offline_config.xml
  11. 8 0
      Assets/Resources/XML/Config/offline_config.xml.meta
  12. 45 0
      Assets/Resources/XML/Config/signin_config.xml
  13. 8 0
      Assets/Resources/XML/Config/signin_config.xml.meta
  14. 2 2
      Assets/Resources/XML/Config/skill_config.xml
  15. 137 4
      Assets/Resources/XML/lan/ChineseSimplified.xml
  16. 136 0
      Assets/Resources/XML/lan/ChineseTraditional.xml
  17. 8 0
      Assets/Resources/XML/lan/ChineseTraditional.xml.meta
  18. 134 4
      Assets/Resources/XML/lan/English.xml
  19. 27 0
      Assets/Script/Editor/EdiotExcelExport.cs
  20. 12 0
      Assets/Script/Editor/EdiotExcelExport.cs.meta
  21. 1 0
      Assets/Script/Editor/EditorConfigExporter.cs
  22. 51 45
      Assets/Script/Editor/EditorLanguageExport.cs
  23. 2 1
      Assets/Script/Manage/Initializer.cs
  24. 24 30
      Assets/Script/Manage/ManaAnim.cs
  25. 11 1
      Assets/Script/Manage/ManaData.cs
  26. 16 6
      Assets/Script/Manage/ManaMiniGame.cs
  27. 7 0
      Assets/Script/Manage/ManaReso.cs
  28. 168 34
      Assets/Script/Manage/ManaUI.cs
  29. 1 1
      Assets/Script/Object/Flower.cs
  30. 12 6
      Assets/Script/Object/Skill/Ability.cs
  31. 1 1
      Assets/Script/Object/Skill/BigSkill.cs
  32. 4 3
      Assets/Script/Object/Skill/Pack.cs
  33. 8 7
      Assets/Script/Object/Skill/Skill.cs
  34. 1 0
      Assets/Script/Object/Skill/SkillRoot.cs
  35. 0 1
      Assets/Script/Tool/Auxiliary.cs
  36. 29 22
      Assets/Script/Tool/DashGame/Language.cs
  37. 22 1
      Assets/Script/Tool/Data.cs
  38. 24 0
      Assets/Script/Tool/ExcelExport.cs
  39. 12 0
      Assets/Script/Tool/ExcelExport.cs.meta
  40. 10 8
      Assets/Script/Tool/UI/TextPlus.cs
  41. BIN
      Assets/XlsxSource/ability_config.xlsx
  42. BIN
      Assets/XlsxSource/language_config.xlsx
  43. BIN
      Assets/XlsxSource/skill_config.xlsx
  44. 16 13
      MyLovelyGarden.sln
  45. 7 1
      MyLovelyGarden.txt
  46. BIN
      ProjectSettings/GraphicsSettings.asset

BIN
.vs/MyLovelyGarden/v14/.suo


BIN
Assets/Resources/Animations/FlowerAnimContainer.controller


BIN
Assets/Resources/Garden.unity


BIN
Assets/Resources/Prefab/PrefabUI/Canvas.prefab


BIN
Assets/Resources/Prefab/PrefabUI/DateItem.prefab → Assets/Resources/Prefab/PrefabUI/SignInItem.prefab


+ 0 - 0
Assets/Resources/Prefab/PrefabUI/DateItem.prefab.meta → Assets/Resources/Prefab/PrefabUI/SignInItem.prefab.meta


BIN
Assets/Resources/Shader/Gray.mat


+ 9 - 0
Assets/Resources/Temp.meta

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

+ 3 - 2
Assets/Resources/XML/Config/PlayerConfig.xml

@@ -1,13 +1,14 @@
 <PlayerConfig>
+  <Sign value="0" />
   <Coin value="0" />
   <Level value="0" />
   <Person value="1" />
   <Diamond value="0" />
-  <QuitTime value="3/21/2017 9:25:50 PM" />
+  <QuitTime value="3/20/2017 3:37:22 PM" />
   <CoinPerson value="1" />
   <CircleTimer value="0" />
   <PlantList FlowerTraA1="1" FlowerTraA2="2" FlowerTraA3="3" FlowerTraA4="4" FlowerTraA5="5" FlowerTraA6="6" FlowerTraA7="7" FlowerTraA8="8" FlowerTraA9="9" />
-  <FlowerList ID="1 2 3 4 5 6 7 8 9" />
+  <FlowerList ID="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20" />
   <SkillList>
     <免费获取金币 SkillType="Skill" ItemStatus="Lock" Level="0" CdTimer="0" EffectTimer="0" />
     <免费获取钻石 SkillType="Skill" ItemStatus="Lock" Level="0" CdTimer="0" EffectTimer="0" />

+ 17 - 0
Assets/Resources/XML/Config/offline_config.xml

@@ -0,0 +1,17 @@
+<data>
+  <item id="1" addtion_fml="" coin_lmt="" time_lmt="43200" />
+  <comment>
+    <id>
+id
+</id>
+    <addtion_fml>
+加成公式
+</addtion_fml>
+    <coin_lmt>
+金币上限
+</coin_lmt>
+    <time_lmt>
+时间上限
+</time_lmt>
+  </comment>
+</data>

+ 8 - 0
Assets/Resources/XML/Config/offline_config.xml.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: caf243014e695a14090095ebc1ce9c0e
+timeCreated: 1490152826
+licenseType: Pro
+TextScriptImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 45 - 0
Assets/Resources/XML/Config/signin_config.xml

@@ -0,0 +1,45 @@
+<data>
+  <item id="1" flower="" diamond="" coin="1000" />
+  <item id="2" flower="" diamond="" coin="1500" />
+  <item id="3" flower="" diamond="" coin="1500" />
+  <item id="4" flower="" diamond="" coin="2500" />
+  <item id="5" flower="" diamond="" coin="2500" />
+  <item id="6" flower="" diamond="" coin="2500" />
+  <item id="7" flower="" diamond="100" coin="" />
+  <item id="8" flower="" diamond="" coin="3000" />
+  <item id="9" flower="" diamond="" coin="3000" />
+  <item id="10" flower="" diamond="" coin="4000" />
+  <item id="11" flower="" diamond="" coin="4000" />
+  <item id="12" flower="" diamond="" coin="5000" />
+  <item id="13" flower="" diamond="" coin="5000" />
+  <item id="14" flower="" diamond="200" coin="" />
+  <item id="15" flower="" diamond="" coin="6000" />
+  <item id="16" flower="" diamond="" coin="6000" />
+  <item id="17" flower="" diamond="" coin="7000" />
+  <item id="18" flower="" diamond="" coin="7000" />
+  <item id="19" flower="" diamond="" coin="8000" />
+  <item id="20" flower="" diamond="" coin="8000" />
+  <item id="21" flower="" diamond="300" coin="" />
+  <item id="22" flower="" diamond="" coin="9000" />
+  <item id="23" flower="" diamond="" coin="9000" />
+  <item id="24" flower="" diamond="" coin="10000" />
+  <item id="25" flower="" diamond="" coin="10000" />
+  <item id="26" flower="" diamond="" coin="12000" />
+  <item id="27" flower="" diamond="" coin="12000" />
+  <item id="28" flower="21,22,23,24,25,26,27" diamond="500" coin="" />
+  <comment>
+    <id>
+id
+</id>
+    <flower>
+升级
+冷却加成
+</flower>
+    <diamond>
+钻石
+</diamond>
+    <coin>
+金币
+</coin>
+  </comment>
+</data>

+ 8 - 0
Assets/Resources/XML/Config/signin_config.xml.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2b6bf629517c01b4bbea5536b3b560fc
+timeCreated: 1490152827
+licenseType: Pro
+TextScriptImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 2
Assets/Resources/XML/Config/skill_config.xml

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

+ 137 - 4
Assets/Resources/XML/lan/ChineseSimplified.xml

@@ -1,6 +1,139 @@
 <lan>
-  <Public>
-    <connect_server_exception desc=""><![CDATA[服务器异常,连接服务器失败!]]></connect_server_exception>
-    <current_version desc=""><![CDATA[当前版本:{0}]]></current_version>
-  </Public>
+  <UI>
+    <C_MiniGameLab desc=""><![CDATA[快来打理花园吧!]]></C_MiniGameLab>
+    <F_StoreLab desc=""><![CDATA[商店]]></F_StoreLab>
+    <F_MagicLab desc=""><![CDATA[魔法]]></F_MagicLab>
+    <F_ElfLab desc=""><![CDATA[精灵]]></F_ElfLab>
+    <F_GardenLab desc=""><![CDATA[花园]]></F_GardenLab>
+    <Fe_BtnLab0 desc=""><![CDATA[提前解锁]]></Fe_BtnLab0>
+    <Fe_BtnLab1 desc=""><![CDATA[解锁]]></Fe_BtnLab1>
+    <Fe_BtnLab2 desc=""><![CDATA[升级]]></Fe_BtnLab2>
+    <Fe_BtnLab3 desc=""><![CDATA[购买]]></Fe_BtnLab3>
+    <Fg_Tit desc=""><![CDATA[提示]]></Fg_Tit>
+    <Fg_BtnLab desc=""><![CDATA[连接服务器]]></Fg_BtnLab>
+    <Fg_Lab desc=""><![CDATA[该功能仅在联网时使用]]></Fg_Lab>
+    <D_QuitLab desc=""><![CDATA[退出]]></D_QuitLab>
+    <D_BeginLab desc=""><![CDATA[开始]]></D_BeginLab>
+    <D_ScoreTit desc=""><![CDATA[得分:]]></D_ScoreTit>
+    <D_StatusLab0 desc=""><![CDATA[未开始]]></D_StatusLab0>
+    <D_StatusLab1 desc=""><![CDATA[进行中]]></D_StatusLab1>
+    <D_StatusLab2 desc=""><![CDATA[已暂停]]></D_StatusLab2>
+    <D_StatusLab3 desc=""><![CDATA[操作被冻结]]></D_StatusLab3>
+    <Da_Tit desc=""><![CDATA[退出游戏]]></Da_Tit>
+    <Da_Lab desc=""><![CDATA[打理完花园可能获得以下奖励,确定要退出?]]></Da_Lab>
+    <Da_QuitLab desc=""><![CDATA[退出游戏]]></Da_QuitLab>
+    <Da_CancelLab desc=""><![CDATA[取消]]></Da_CancelLab>
+    <Da_GetAwardLab desc=""><![CDATA[领取奖励]]></Da_GetAwardLab>
+    <G_Tit desc=""><![CDATA[花朵管理]]></G_Tit>
+    <G_SpecialLab desc=""><![CDATA[特殊花朵]]></G_SpecialLab>
+    <G_RegularLab desc=""><![CDATA[普通花朵]]></G_RegularLab>
+    <G_RetrieveLab desc=""><![CDATA[收回所有花]]></G_RetrieveLab>
+    <H_PlaceLab desc=""><![CDATA[放置]]></H_PlaceLab>
+    <H_RetrieveLab desc=""><![CDATA[收回]]></H_RetrieveLab>
+    <Ba_Lab desc=""><![CDATA[离开期间获得]]></Ba_Lab>
+    <Ba_ConfirmLab desc=""><![CDATA[收取]]></Ba_ConfirmLab>
+    <Bb_GetLab desc=""><![CDATA[收取]]></Bb_GetLab>
+    <Bb_Title desc=""><![CDATA[每日签到]]></Bb_Title>
+    <Bb_ConfirmLab desc=""><![CDATA[确定]]></Bb_ConfirmLab>
+  </UI>
+  <Flower>
+    <Flower1 desc=""><![CDATA[粉色小花]]></Flower1>
+    <Flower2 desc=""><![CDATA[紫色小花]]></Flower2>
+    <Flower3 desc=""><![CDATA[波斯菊(粉)]]></Flower3>
+    <Flower4 desc=""><![CDATA[康乃馨(红)]]></Flower4>
+    <Flower5 desc=""><![CDATA[铃兰(白)]]></Flower5>
+    <Flower6 desc=""><![CDATA[马蹄莲(白)]]></Flower6>
+    <Flower7 desc=""><![CDATA[蒲公英]]></Flower7>
+    <Flower8 desc=""><![CDATA[牵牛花(蓝)]]></Flower8>
+    <Flower9 desc=""><![CDATA[三色堇(紫)]]></Flower9>
+    <Flower10 desc=""><![CDATA[三叶草(粉)]]></Flower10>
+    <Flower11 desc=""><![CDATA[向日葵]]></Flower11>
+    <Flower12 desc=""><![CDATA[郁金香(粉)]]></Flower12>
+    <Flower13 desc=""><![CDATA[百合花(白)]]></Flower13>
+    <Flower14 desc=""><![CDATA[非洲菊(粉)]]></Flower14>
+    <Flower15 desc=""><![CDATA[红掌]]></Flower15>
+    <Flower16 desc=""><![CDATA[桔梗花]]></Flower16>
+    <Flower17 desc=""><![CDATA[康乃馨(白)]]></Flower17>
+    <Flower18 desc=""><![CDATA[郁金香(粉)]]></Flower18>
+    <Flower19 desc=""><![CDATA[曼陀罗(橘)]]></Flower19>
+    <Flower20 desc=""><![CDATA[玫瑰花(红)]]></Flower20>
+    <Flower21 desc=""><![CDATA[茑萝]]></Flower21>
+    <Flower22 desc=""><![CDATA[牵牛花(紫)]]></Flower22>
+    <Flower23 desc=""><![CDATA[虞美人(红)]]></Flower23>
+    <Flower24 desc=""><![CDATA[郁金香(黄)]]></Flower24>
+    <Flower25 desc=""><![CDATA[鸢尾(紫)]]></Flower25>
+    <Flower26 desc=""><![CDATA[朱槿(粉)]]></Flower26>
+    <Flower27 desc=""><![CDATA[朱槿(黄)]]></Flower27>
+  </Flower>
+  <SkillName>
+    <Pack1 desc=""><![CDATA[金币大礼包]]></Pack1>
+    <Pack2 desc=""><![CDATA[天赐大礼包]]></Pack2>
+    <Pack3 desc=""><![CDATA[花神大礼包]]></Pack3>
+    <Pack4 desc=""><![CDATA[新手礼包]]></Pack4>
+    <Pack5 desc=""><![CDATA[中级礼包]]></Pack5>
+    <Pack6 desc=""><![CDATA[高级礼包]]></Pack6>
+    <Pack7 desc=""><![CDATA[钻石100]]></Pack7>
+    <Pack8 desc=""><![CDATA[钻石500 赠送50]]></Pack8>
+    <Pack9 desc=""><![CDATA[钻石2000 赠送500]]></Pack9>
+    <Pack10 desc=""><![CDATA[钻石6000 赠送600]]></Pack10>
+    <Pack11 desc=""><![CDATA[钻石10000 赠送2000]]></Pack11>
+    <Ability1 desc=""><![CDATA[花园]]></Ability1>
+    <Ability2 desc=""><![CDATA[缤纷彩虹]]></Ability2>
+    <Ability3 desc=""><![CDATA[玉树樱花]]></Ability3>
+    <Ability4 desc=""><![CDATA[滴哩哩的小黄鹂]]></Ability4>
+    <Ability5 desc=""><![CDATA[黄色小蜜蜂]]></Ability5>
+    <Ability6 desc=""><![CDATA[紫色小蜜蜂]]></Ability6>
+    <Ability7 desc=""><![CDATA[蓝色小蜜蜂]]></Ability7>
+    <Ability8 desc=""><![CDATA[红色小蜜蜂]]></Ability8>
+    <Ability9 desc=""><![CDATA[白色小蜜蜂]]></Ability9>
+    <Ability10 desc=""><![CDATA[黄色小蝴蝶]]></Ability10>
+    <Ability11 desc=""><![CDATA[紫色小蝴蝶]]></Ability11>
+    <Ability12 desc=""><![CDATA[蓝色小蝴蝶]]></Ability12>
+    <Ability13 desc=""><![CDATA[红色小蝴蝶]]></Ability13>
+    <Ability14 desc=""><![CDATA[白色小蝴蝶]]></Ability14>
+    <Skill1 desc=""><![CDATA[人潮涌动]]></Skill1>
+    <Skill2 desc=""><![CDATA[大亨光临]]></Skill2>
+    <Skill3 desc=""><![CDATA[花之祝福]]></Skill3>
+    <Skill4 desc=""><![CDATA[繁花似锦]]></Skill4>
+    <Skill5 desc=""><![CDATA[免费获取金币]]></Skill5>
+    <Skill6 desc=""><![CDATA[免费获取钻石]]></Skill6>
+    <Skill7 desc=""><![CDATA[技能冷却]]></Skill7>
+  </SkillName>
+  <SkillDescription>
+    <Pack1 desc=""><![CDATA[立即获得金币 [&coin&]]]></Pack1>
+    <Pack2 desc=""><![CDATA[立即获得金币 [&coin&]]]></Pack2>
+    <Pack3 desc=""><![CDATA[立即获得金币 [&coin&]]]></Pack3>
+    <Pack4 desc=""><![CDATA[获得[&flower&],[&diamond&]钻石
+所有金币产出提升[&coin_person&],永久有效]]></Pack4>
+    <Pack5 desc=""><![CDATA[获得[&flower&],[&diamond&]钻石
+所有金币产出提升[&coin_person&],永久有效]]></Pack5>
+    <Pack6 desc=""><![CDATA[获得[&flower&],[&diamond&]钻石
+所有金币产出提升[&coin_person&],永久有效]]></Pack6>
+    <Pack7 desc=""><![CDATA[购买 [&diamond&]钻石]]></Pack7>
+    <Pack8 desc=""><![CDATA[共计 [&diamond&]钻石]]></Pack8>
+    <Pack9 desc=""><![CDATA[共计 [&diamond&]钻石]]></Pack9>
+    <Pack10 desc=""><![CDATA[共计 [&diamond&]钻石]]></Pack10>
+    <Pack11 desc=""><![CDATA[共计 [&diamond&]钻石]]></Pack11>
+    <Ability1 desc=""><![CDATA[每人次收入 金币[&coin_person&][lv],每分钟来访[&person&*60][lv]人]]></Ability1>
+    <Ability2 desc=""><![CDATA[每分钟增加[&person&*60][lv]人参观,永久有效]]></Ability2>
+    <Ability3 desc=""><![CDATA[每人次收入提升[&coin_person&][lv],永久有效]]></Ability3>
+    <Ability4 desc=""><![CDATA[技能冷却时间减少[&skill_cd&][lv],永久有效]]></Ability4>
+    <Ability5 desc=""><![CDATA[每人次参观获得[&coin_person&][lv]金币]]></Ability5>
+    <Ability6 desc=""><![CDATA[每人次参观获得[&coin_person&][lv]金币]]></Ability6>
+    <Ability7 desc=""><![CDATA[每人次参观获得[&coin_person&][lv]金币]]></Ability7>
+    <Ability8 desc=""><![CDATA[每人次参观获得[&coin_person&][lv]金币]]></Ability8>
+    <Ability9 desc=""><![CDATA[每人次参观获得[&coin_person&][lv]金币]]></Ability9>
+    <Ability10 desc=""><![CDATA[每人次参观获得[&coin_person&][lv]金币]]></Ability10>
+    <Ability11 desc=""><![CDATA[每人次参观获得[&coin_person&][lv]金币]]></Ability11>
+    <Ability12 desc=""><![CDATA[每人次参观获得[&coin_person&][lv]金币]]></Ability12>
+    <Ability13 desc=""><![CDATA[每人次参观获得[&coin_person&][lv]金币]]></Ability13>
+    <Ability14 desc=""><![CDATA[每人次参观获得[&coin_person&][lv]金币]]></Ability14>
+    <Skill1 desc=""><![CDATA[每分钟增加[&person&*60],持续[&duration&/60][lv]分钟]]></Skill1>
+    <Skill2 desc=""><![CDATA[立即获得每人次收入的[&coin_once&][lv]]]></Skill2>
+    <Skill3 desc=""><![CDATA[所有收入提升[&coin_person&],持续[&duration&/60][lv]]]></Skill3>
+    <Skill4 desc=""><![CDATA[所有金币产出提升[&coin_person&],持续[&duration&]分钟]]></Skill4>
+    <Skill5 desc=""><![CDATA[免费获取金币[&coin_once&]]]></Skill5>
+    <Skill6 desc=""><![CDATA[免费获取金币[&diamond_once&]]]></Skill6>
+    <Skill7 desc=""><![CDATA[]]></Skill7>
+  </SkillDescription>
 </lan>

+ 136 - 0
Assets/Resources/XML/lan/ChineseTraditional.xml

@@ -0,0 +1,136 @@
+<lan>
+  <UI>
+    <C_MiniGameLab desc=""><![CDATA[]]></C_MiniGameLab>
+    <F_StoreLab desc=""><![CDATA[]]></F_StoreLab>
+    <F_MagicLab desc=""><![CDATA[]]></F_MagicLab>
+    <F_ElfLab desc=""><![CDATA[]]></F_ElfLab>
+    <F_GardenLab desc=""><![CDATA[]]></F_GardenLab>
+    <Fe_BtnLab0 desc=""><![CDATA[]]></Fe_BtnLab0>
+    <Fe_BtnLab1 desc=""><![CDATA[]]></Fe_BtnLab1>
+    <Fe_BtnLab2 desc=""><![CDATA[]]></Fe_BtnLab2>
+    <Fe_BtnLab3 desc=""><![CDATA[]]></Fe_BtnLab3>
+    <Fg_Tit desc=""><![CDATA[]]></Fg_Tit>
+    <Fg_BtnLab desc=""><![CDATA[]]></Fg_BtnLab>
+    <Fg_Lab desc=""><![CDATA[]]></Fg_Lab>
+    <D_QuitLab desc=""><![CDATA[]]></D_QuitLab>
+    <D_BeginLab desc=""><![CDATA[]]></D_BeginLab>
+    <D_ScoreTit desc=""><![CDATA[]]></D_ScoreTit>
+    <D_StatusLab0 desc=""><![CDATA[]]></D_StatusLab0>
+    <D_StatusLab1 desc=""><![CDATA[]]></D_StatusLab1>
+    <D_StatusLab2 desc=""><![CDATA[]]></D_StatusLab2>
+    <D_StatusLab3 desc=""><![CDATA[]]></D_StatusLab3>
+    <Da_Tit desc=""><![CDATA[]]></Da_Tit>
+    <Da_Lab desc=""><![CDATA[]]></Da_Lab>
+    <Da_QuitLab desc=""><![CDATA[]]></Da_QuitLab>
+    <Da_CancelLab desc=""><![CDATA[]]></Da_CancelLab>
+    <Da_GetAwardLab desc=""><![CDATA[]]></Da_GetAwardLab>
+    <G_Tit desc=""><![CDATA[]]></G_Tit>
+    <G_SpecialLab desc=""><![CDATA[]]></G_SpecialLab>
+    <G_RegularLab desc=""><![CDATA[]]></G_RegularLab>
+    <G_RetrieveLab desc=""><![CDATA[]]></G_RetrieveLab>
+    <H_PlaceLab desc=""><![CDATA[]]></H_PlaceLab>
+    <H_RetrieveLab desc=""><![CDATA[]]></H_RetrieveLab>
+    <Ba_Lab desc=""><![CDATA[]]></Ba_Lab>
+    <Ba_ConfirmLab desc=""><![CDATA[]]></Ba_ConfirmLab>
+    <Bb_GetLab desc=""><![CDATA[]]></Bb_GetLab>
+    <Bb_Title desc=""><![CDATA[]]></Bb_Title>
+    <Bb_ConfirmLab desc=""><![CDATA[]]></Bb_ConfirmLab>
+  </UI>
+  <Flower>
+    <Flower1 desc=""><![CDATA[]]></Flower1>
+    <Flower2 desc=""><![CDATA[]]></Flower2>
+    <Flower3 desc=""><![CDATA[]]></Flower3>
+    <Flower4 desc=""><![CDATA[]]></Flower4>
+    <Flower5 desc=""><![CDATA[]]></Flower5>
+    <Flower6 desc=""><![CDATA[]]></Flower6>
+    <Flower7 desc=""><![CDATA[]]></Flower7>
+    <Flower8 desc=""><![CDATA[]]></Flower8>
+    <Flower9 desc=""><![CDATA[]]></Flower9>
+    <Flower10 desc=""><![CDATA[]]></Flower10>
+    <Flower11 desc=""><![CDATA[]]></Flower11>
+    <Flower12 desc=""><![CDATA[]]></Flower12>
+    <Flower13 desc=""><![CDATA[]]></Flower13>
+    <Flower14 desc=""><![CDATA[]]></Flower14>
+    <Flower15 desc=""><![CDATA[]]></Flower15>
+    <Flower16 desc=""><![CDATA[]]></Flower16>
+    <Flower17 desc=""><![CDATA[]]></Flower17>
+    <Flower18 desc=""><![CDATA[]]></Flower18>
+    <Flower19 desc=""><![CDATA[]]></Flower19>
+    <Flower20 desc=""><![CDATA[]]></Flower20>
+    <Flower21 desc=""><![CDATA[]]></Flower21>
+    <Flower22 desc=""><![CDATA[]]></Flower22>
+    <Flower23 desc=""><![CDATA[]]></Flower23>
+    <Flower24 desc=""><![CDATA[]]></Flower24>
+    <Flower25 desc=""><![CDATA[]]></Flower25>
+    <Flower26 desc=""><![CDATA[]]></Flower26>
+    <Flower27 desc=""><![CDATA[]]></Flower27>
+  </Flower>
+  <SkillName>
+    <Pack1 desc=""><![CDATA[]]></Pack1>
+    <Pack2 desc=""><![CDATA[]]></Pack2>
+    <Pack3 desc=""><![CDATA[]]></Pack3>
+    <Pack4 desc=""><![CDATA[]]></Pack4>
+    <Pack5 desc=""><![CDATA[]]></Pack5>
+    <Pack6 desc=""><![CDATA[]]></Pack6>
+    <Pack7 desc=""><![CDATA[]]></Pack7>
+    <Pack8 desc=""><![CDATA[]]></Pack8>
+    <Pack9 desc=""><![CDATA[]]></Pack9>
+    <Pack10 desc=""><![CDATA[]]></Pack10>
+    <Pack11 desc=""><![CDATA[]]></Pack11>
+    <Ability1 desc=""><![CDATA[]]></Ability1>
+    <Ability2 desc=""><![CDATA[]]></Ability2>
+    <Ability3 desc=""><![CDATA[]]></Ability3>
+    <Ability4 desc=""><![CDATA[]]></Ability4>
+    <Ability5 desc=""><![CDATA[]]></Ability5>
+    <Ability6 desc=""><![CDATA[]]></Ability6>
+    <Ability7 desc=""><![CDATA[]]></Ability7>
+    <Ability8 desc=""><![CDATA[]]></Ability8>
+    <Ability9 desc=""><![CDATA[]]></Ability9>
+    <Ability10 desc=""><![CDATA[]]></Ability10>
+    <Ability11 desc=""><![CDATA[]]></Ability11>
+    <Ability12 desc=""><![CDATA[]]></Ability12>
+    <Ability13 desc=""><![CDATA[]]></Ability13>
+    <Ability14 desc=""><![CDATA[]]></Ability14>
+    <Skill1 desc=""><![CDATA[]]></Skill1>
+    <Skill2 desc=""><![CDATA[]]></Skill2>
+    <Skill3 desc=""><![CDATA[]]></Skill3>
+    <Skill4 desc=""><![CDATA[]]></Skill4>
+    <Skill5 desc=""><![CDATA[]]></Skill5>
+    <Skill6 desc=""><![CDATA[]]></Skill6>
+    <Skill7 desc=""><![CDATA[]]></Skill7>
+  </SkillName>
+  <SkillDescription>
+    <Pack1 desc=""><![CDATA[]]></Pack1>
+    <Pack2 desc=""><![CDATA[]]></Pack2>
+    <Pack3 desc=""><![CDATA[]]></Pack3>
+    <Pack4 desc=""><![CDATA[]]></Pack4>
+    <Pack5 desc=""><![CDATA[]]></Pack5>
+    <Pack6 desc=""><![CDATA[]]></Pack6>
+    <Pack7 desc=""><![CDATA[]]></Pack7>
+    <Pack8 desc=""><![CDATA[]]></Pack8>
+    <Pack9 desc=""><![CDATA[]]></Pack9>
+    <Pack10 desc=""><![CDATA[]]></Pack10>
+    <Pack11 desc=""><![CDATA[]]></Pack11>
+    <Ability1 desc=""><![CDATA[]]></Ability1>
+    <Ability2 desc=""><![CDATA[]]></Ability2>
+    <Ability3 desc=""><![CDATA[]]></Ability3>
+    <Ability4 desc=""><![CDATA[]]></Ability4>
+    <Ability5 desc=""><![CDATA[]]></Ability5>
+    <Ability6 desc=""><![CDATA[]]></Ability6>
+    <Ability7 desc=""><![CDATA[]]></Ability7>
+    <Ability8 desc=""><![CDATA[]]></Ability8>
+    <Ability9 desc=""><![CDATA[]]></Ability9>
+    <Ability10 desc=""><![CDATA[]]></Ability10>
+    <Ability11 desc=""><![CDATA[]]></Ability11>
+    <Ability12 desc=""><![CDATA[]]></Ability12>
+    <Ability13 desc=""><![CDATA[]]></Ability13>
+    <Ability14 desc=""><![CDATA[]]></Ability14>
+    <Skill1 desc=""><![CDATA[]]></Skill1>
+    <Skill2 desc=""><![CDATA[]]></Skill2>
+    <Skill3 desc=""><![CDATA[]]></Skill3>
+    <Skill4 desc=""><![CDATA[]]></Skill4>
+    <Skill5 desc=""><![CDATA[]]></Skill5>
+    <Skill6 desc=""><![CDATA[]]></Skill6>
+    <Skill7 desc=""><![CDATA[]]></Skill7>
+  </SkillDescription>
+</lan>

+ 8 - 0
Assets/Resources/XML/lan/ChineseTraditional.xml.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: afafe6531439a494abb065b9cd9a86e1
+timeCreated: 1490150768
+licenseType: Pro
+TextScriptImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 134 - 4
Assets/Resources/XML/lan/English.xml

@@ -1,6 +1,136 @@
 <lan>
-  <Public>
-    <connect_server_exception desc=""><![CDATA[connect server exception]]></connect_server_exception>
-    <current_version desc=""><![CDATA[Current version {0}]]></current_version>
-  </Public>
+  <UI>
+    <C_MiniGameLab desc=""><![CDATA[]]></C_MiniGameLab>
+    <F_StoreLab desc=""><![CDATA[]]></F_StoreLab>
+    <F_MagicLab desc=""><![CDATA[]]></F_MagicLab>
+    <F_ElfLab desc=""><![CDATA[]]></F_ElfLab>
+    <F_GardenLab desc=""><![CDATA[]]></F_GardenLab>
+    <Fe_BtnLab0 desc=""><![CDATA[]]></Fe_BtnLab0>
+    <Fe_BtnLab1 desc=""><![CDATA[]]></Fe_BtnLab1>
+    <Fe_BtnLab2 desc=""><![CDATA[]]></Fe_BtnLab2>
+    <Fe_BtnLab3 desc=""><![CDATA[]]></Fe_BtnLab3>
+    <Fg_Tit desc=""><![CDATA[]]></Fg_Tit>
+    <Fg_BtnLab desc=""><![CDATA[]]></Fg_BtnLab>
+    <Fg_Lab desc=""><![CDATA[]]></Fg_Lab>
+    <D_QuitLab desc=""><![CDATA[]]></D_QuitLab>
+    <D_BeginLab desc=""><![CDATA[]]></D_BeginLab>
+    <D_ScoreTit desc=""><![CDATA[]]></D_ScoreTit>
+    <D_StatusLab0 desc=""><![CDATA[]]></D_StatusLab0>
+    <D_StatusLab1 desc=""><![CDATA[]]></D_StatusLab1>
+    <D_StatusLab2 desc=""><![CDATA[]]></D_StatusLab2>
+    <D_StatusLab3 desc=""><![CDATA[]]></D_StatusLab3>
+    <Da_Tit desc=""><![CDATA[]]></Da_Tit>
+    <Da_Lab desc=""><![CDATA[]]></Da_Lab>
+    <Da_QuitLab desc=""><![CDATA[]]></Da_QuitLab>
+    <Da_CancelLab desc=""><![CDATA[]]></Da_CancelLab>
+    <Da_GetAwardLab desc=""><![CDATA[]]></Da_GetAwardLab>
+    <G_Tit desc=""><![CDATA[]]></G_Tit>
+    <G_SpecialLab desc=""><![CDATA[]]></G_SpecialLab>
+    <G_RegularLab desc=""><![CDATA[]]></G_RegularLab>
+    <G_RetrieveLab desc=""><![CDATA[]]></G_RetrieveLab>
+    <H_PlaceLab desc=""><![CDATA[]]></H_PlaceLab>
+    <H_RetrieveLab desc=""><![CDATA[]]></H_RetrieveLab>
+    <Ba_Lab desc=""><![CDATA[]]></Ba_Lab>
+    <Ba_ConfirmLab desc=""><![CDATA[]]></Ba_ConfirmLab>
+    <Bb_GetLab desc=""><![CDATA[]]></Bb_GetLab>
+    <Bb_Title desc=""><![CDATA[]]></Bb_Title>
+    <Bb_ConfirmLab desc=""><![CDATA[]]></Bb_ConfirmLab>
+  </UI>
+  <Flower>
+    <Flower1 desc=""><![CDATA[]]></Flower1>
+    <Flower2 desc=""><![CDATA[]]></Flower2>
+    <Flower3 desc=""><![CDATA[]]></Flower3>
+    <Flower4 desc=""><![CDATA[]]></Flower4>
+    <Flower5 desc=""><![CDATA[]]></Flower5>
+    <Flower6 desc=""><![CDATA[]]></Flower6>
+    <Flower7 desc=""><![CDATA[]]></Flower7>
+    <Flower8 desc=""><![CDATA[]]></Flower8>
+    <Flower9 desc=""><![CDATA[]]></Flower9>
+    <Flower10 desc=""><![CDATA[]]></Flower10>
+    <Flower11 desc=""><![CDATA[]]></Flower11>
+    <Flower12 desc=""><![CDATA[]]></Flower12>
+    <Flower13 desc=""><![CDATA[]]></Flower13>
+    <Flower14 desc=""><![CDATA[]]></Flower14>
+    <Flower15 desc=""><![CDATA[]]></Flower15>
+    <Flower16 desc=""><![CDATA[]]></Flower16>
+    <Flower17 desc=""><![CDATA[]]></Flower17>
+    <Flower18 desc=""><![CDATA[]]></Flower18>
+    <Flower19 desc=""><![CDATA[]]></Flower19>
+    <Flower20 desc=""><![CDATA[]]></Flower20>
+    <Flower21 desc=""><![CDATA[]]></Flower21>
+    <Flower22 desc=""><![CDATA[]]></Flower22>
+    <Flower23 desc=""><![CDATA[]]></Flower23>
+    <Flower24 desc=""><![CDATA[]]></Flower24>
+    <Flower25 desc=""><![CDATA[]]></Flower25>
+    <Flower26 desc=""><![CDATA[]]></Flower26>
+    <Flower27 desc=""><![CDATA[]]></Flower27>
+  </Flower>
+  <SkillName>
+    <Pack1 desc=""><![CDATA[]]></Pack1>
+    <Pack2 desc=""><![CDATA[]]></Pack2>
+    <Pack3 desc=""><![CDATA[]]></Pack3>
+    <Pack4 desc=""><![CDATA[]]></Pack4>
+    <Pack5 desc=""><![CDATA[]]></Pack5>
+    <Pack6 desc=""><![CDATA[]]></Pack6>
+    <Pack7 desc=""><![CDATA[]]></Pack7>
+    <Pack8 desc=""><![CDATA[]]></Pack8>
+    <Pack9 desc=""><![CDATA[]]></Pack9>
+    <Pack10 desc=""><![CDATA[]]></Pack10>
+    <Pack11 desc=""><![CDATA[]]></Pack11>
+    <Ability1 desc=""><![CDATA[]]></Ability1>
+    <Ability2 desc=""><![CDATA[]]></Ability2>
+    <Ability3 desc=""><![CDATA[]]></Ability3>
+    <Ability4 desc=""><![CDATA[]]></Ability4>
+    <Ability5 desc=""><![CDATA[]]></Ability5>
+    <Ability6 desc=""><![CDATA[]]></Ability6>
+    <Ability7 desc=""><![CDATA[]]></Ability7>
+    <Ability8 desc=""><![CDATA[]]></Ability8>
+    <Ability9 desc=""><![CDATA[]]></Ability9>
+    <Ability10 desc=""><![CDATA[]]></Ability10>
+    <Ability11 desc=""><![CDATA[]]></Ability11>
+    <Ability12 desc=""><![CDATA[]]></Ability12>
+    <Ability13 desc=""><![CDATA[]]></Ability13>
+    <Ability14 desc=""><![CDATA[]]></Ability14>
+    <Skill1 desc=""><![CDATA[]]></Skill1>
+    <Skill2 desc=""><![CDATA[]]></Skill2>
+    <Skill3 desc=""><![CDATA[]]></Skill3>
+    <Skill4 desc=""><![CDATA[]]></Skill4>
+    <Skill5 desc=""><![CDATA[]]></Skill5>
+    <Skill6 desc=""><![CDATA[]]></Skill6>
+    <Skill7 desc=""><![CDATA[]]></Skill7>
+  </SkillName>
+  <SkillDescription>
+    <Pack1 desc=""><![CDATA[]]></Pack1>
+    <Pack2 desc=""><![CDATA[]]></Pack2>
+    <Pack3 desc=""><![CDATA[]]></Pack3>
+    <Pack4 desc=""><![CDATA[]]></Pack4>
+    <Pack5 desc=""><![CDATA[]]></Pack5>
+    <Pack6 desc=""><![CDATA[]]></Pack6>
+    <Pack7 desc=""><![CDATA[]]></Pack7>
+    <Pack8 desc=""><![CDATA[]]></Pack8>
+    <Pack9 desc=""><![CDATA[]]></Pack9>
+    <Pack10 desc=""><![CDATA[]]></Pack10>
+    <Pack11 desc=""><![CDATA[]]></Pack11>
+    <Ability1 desc=""><![CDATA[]]></Ability1>
+    <Ability2 desc=""><![CDATA[]]></Ability2>
+    <Ability3 desc=""><![CDATA[]]></Ability3>
+    <Ability4 desc=""><![CDATA[]]></Ability4>
+    <Ability5 desc=""><![CDATA[]]></Ability5>
+    <Ability6 desc=""><![CDATA[]]></Ability6>
+    <Ability7 desc=""><![CDATA[]]></Ability7>
+    <Ability8 desc=""><![CDATA[]]></Ability8>
+    <Ability9 desc=""><![CDATA[]]></Ability9>
+    <Ability10 desc=""><![CDATA[]]></Ability10>
+    <Ability11 desc=""><![CDATA[]]></Ability11>
+    <Ability12 desc=""><![CDATA[]]></Ability12>
+    <Ability13 desc=""><![CDATA[]]></Ability13>
+    <Ability14 desc=""><![CDATA[]]></Ability14>
+    <Skill1 desc=""><![CDATA[]]></Skill1>
+    <Skill2 desc=""><![CDATA[]]></Skill2>
+    <Skill3 desc=""><![CDATA[]]></Skill3>
+    <Skill4 desc=""><![CDATA[]]></Skill4>
+    <Skill5 desc=""><![CDATA[]]></Skill5>
+    <Skill6 desc=""><![CDATA[]]></Skill6>
+    <Skill7 desc=""><![CDATA[]]></Skill7>
+  </SkillDescription>
 </lan>

+ 27 - 0
Assets/Script/Editor/EdiotExcelExport.cs

@@ -0,0 +1,27 @@
+using UnityEngine;
+
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.OleDb;
+using UnityEditor;
+
+[CustomEditor(typeof(ExcelExport))]
+public class EdiotExcelExport : Editor
+{
+    [MenuItem("DashGame/Design Tools/ExportSignConfig")]
+    public static void ExportSignConfig()
+    {
+        string connStr = "Provider=Microsoft.Jet.OLEDB.4.0;Data Source=Assets/XlsxSource/signin_config.xls;" + "Extended Properties='Excel 8.0'";
+
+        OleDbConnection connection = new OleDbConnection(connStr);
+        connection.Open();
+
+        DataSet dataSet = new DataSet();
+        OleDbDataAdapter adapter = new OleDbDataAdapter("select * from [Sheet1$]", connection);
+
+        adapter.Fill(dataSet);
+
+        Debug.Log(dataSet.Tables[0].Columns);
+    }
+}

+ 12 - 0
Assets/Script/Editor/EdiotExcelExport.cs.meta

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

+ 1 - 0
Assets/Script/Editor/EditorConfigExporter.cs

@@ -83,6 +83,7 @@ public class EditorConfigExporter : EditorWindow
                 if (pathSplit.Length > 1)
                 {
                     nameArray.Add(subDirectory + "\\" + pathSplit[0]);
+                    Debug.Log(subDirectory + "\\" + pathSplit[0]);
                 }
             }
 

+ 51 - 45
Assets/Script/Editor/EditorLanguageExport.cs

@@ -119,8 +119,8 @@ public class EditorLanguageExport : EditorWindow
         {
             XmlDocument xmlDoc = new XmlDocument();
 
-            try
-            {
+            //try
+            //{
 				FileStream stream = File.Open(defaultPath, FileMode.Open, FileAccess.Read);
                 IExcelDataReader excelReader = ExcelReaderFactory.CreateOpenXmlReader(stream);
 
@@ -168,61 +168,67 @@ public class EditorLanguageExport : EditorWindow
                 {
    					// parent
 					string nvalue = result.Tables[0].Rows[i][parentidex].ToString();
+
+                    if (string.IsNullOrEmpty(nvalue))
+                    {
+                        break;
+                    }
+
 					if (!parentNodeDict.ContainsKey(nvalue))
 					{
 						XmlNode node = xmlDoc.CreateElement(nvalue);
 						parentNodeDict.Add(nvalue, node);
 					}
 					parentNodeName = nvalue;
-
+                    
 					// name
 					nvalue = result.Tables[0].Rows[i][nameindex].ToString();
 					currentChildNode = xmlDoc.CreateElement(nvalue);
 					parentNodeDict[parentNodeName].AppendChild(currentChildNode);
-
+                    
 					// content
 					nvalue = result.Tables[0].Rows[i][contentindex].ToString();
 					XmlCDataSection cData = xmlDoc.CreateCDataSection(nvalue);
 					currentChildNode.AppendChild(cData);
-
-					// desc
-					nvalue = result.Tables[0].Rows[i][descindex].ToString();
+                    
+                    // desc
+                    nvalue = result.Tables[0].Rows[i][descindex].ToString();
 					XmlAttribute comment = xmlDoc.CreateAttribute("desc");
 					comment.Value = nvalue;
 					currentChildNode.Attributes.Append(comment);
 
-//                    for (int j = 0; j < columns; j++)
-//                    {
-//                        string nvalue = result.Tables[0].Rows[i][j].ToString();
-//
-//                            switch (j)
-//                            {
-//                                case 0:
-//                                    if (!parentNodeDict.ContainsKey(nvalue))
-//                                    {
-//                                        XmlNode node = xmlDoc.CreateElement(nvalue);
-//                                        parentNodeDict.Add(nvalue, node);
-//                                    }
-//                                    parentNodeName = nvalue;
-//                                break;
-//                                case 1:
-//                                    currentChildNode = xmlDoc.CreateElement(nvalue);
-//                                    parentNodeDict[parentNodeName].AppendChild(currentChildNode);
-//                                break;
-//                                case 2:
-//                                    XmlCDataSection cData = xmlDoc.CreateCDataSection(nvalue);
-//                                    currentChildNode.AppendChild(cData);
-//                                    break;
-//                                case 3:
-//                                    XmlAttribute comment = xmlDoc.CreateAttribute("desc");
-//                                    comment.Value = nvalue;
-//                                    currentChildNode.Attributes.Append(comment);
-//                                    break;
-//                            }
-//
-//                            //Debug.Log("labels[j] is " + labels[j] + ", nvalue is " + nvalue);
-//                        //Debug.Log(nvalue);
-//                    }
+                    //                    for (int j = 0; j < columns; j++)
+                    //                    {
+                    //                        string nvalue = result.Tables[0].Rows[i][j].ToString();
+                    //
+                    //                            switch (j)
+                    //                            {
+                    //                                case 0:
+                    //                                    if (!parentNodeDict.ContainsKey(nvalue))
+                    //                                    {
+                    //                                        XmlNode node = xmlDoc.CreateElement(nvalue);
+                    //                                        parentNodeDict.Add(nvalue, node);
+                    //                                    }
+                    //                                    parentNodeName = nvalue;
+                    //                                break;
+                    //                                case 1:
+                    //                                    currentChildNode = xmlDoc.CreateElement(nvalue);
+                    //                                    parentNodeDict[parentNodeName].AppendChild(currentChildNode);
+                    //                                break;
+                    //                                case 2:
+                    //                                    XmlCDataSection cData = xmlDoc.CreateCDataSection(nvalue);
+                    //                                    currentChildNode.AppendChild(cData);
+                    //                                    break;
+                    //                                case 3:
+                    //                                    XmlAttribute comment = xmlDoc.CreateAttribute("desc");
+                    //                                    comment.Value = nvalue;
+                    //                                    currentChildNode.Attributes.Append(comment);
+                    //                                    break;
+                    //                            }
+                    //
+                    //                            //Debug.Log("labels[j] is " + labels[j] + ", nvalue is " + nvalue);
+                    //                        //Debug.Log(nvalue);
+                    //                    }
 
                 }
 
@@ -236,12 +242,12 @@ public class EditorLanguageExport : EditorWindow
                 //Debug.Log(fileName + ".xml is saved to " + filepath + ", count is " + idArr.Count);
 
                 isSuccess = true;
-            }
-            catch (Exception e)
-            {
-                text += "Exception " + e.Message;
-                Debug.Log("Exception " + e.Message);
-            }
+            //}
+            //catch (Exception e)
+            //{
+            //    text += "Exception " + e.Message;
+            //    Debug.Log("Exception " + e.Message);
+            //}
         }
     }
 

+ 2 - 1
Assets/Script/Manage/Initializer.cs

@@ -23,8 +23,9 @@ public class Initializer : MonoBehaviour
         gameObject.AddComponent<ManaAnim>();
         gameObject.AddComponent<ManaAudio>();
 
-        gameObject.AddComponent<ManaUI>();
         gameObject.AddComponent<ManaData>();
+
+        gameObject.AddComponent<ManaUI>();
         gameObject.AddComponent<ManaGarden>();
 
         gameObject.AddComponent<ManaPlayer>();

+ 24 - 30
Assets/Script/Manage/ManaAnim.cs

@@ -42,7 +42,30 @@ public class ManaAnim : MonoBehaviour
 
     private void Awake()
     {
-        Initializer.RegistValue += RegistValue;
+        MoveList = new List<Move>();
+        TweenForList = new List<Tween>();
+        TweenBacList = new List<Tween>();
+
+        FunctionDicF = new Dictionary<Curve, CurveFunctionF>();
+        FunctionDicC = new Dictionary<Curve, CurveFunctionC>();
+        FunctionDicV = new Dictionary<Curve, CurveFunctionV>();
+
+        MoveVecDic = new Dictionary<Transform, MoveVec>();
+        TweenCgDic = new Dictionary<Transform, TweenCG>();
+        TweenGraDic = new Dictionary<Transform, TweenGra>();
+        TweenVecDic = new Dictionary<Transform, TweenVec>();
+        TweenRectDic = new Dictionary<Transform, TweenRect>();
+        TweenScaleDic = new Dictionary<Transform, TweenScale>();
+        TweenAudioDic = new Dictionary<Transform, TweenAudio>();
+
+        FunctionDicF.Add(Curve.Linear, Linear);
+        FunctionDicF.Add(Curve.EaseOutQuad, EaseOutQuad);
+
+        FunctionDicC.Add(Curve.Linear, Linear);
+        FunctionDicC.Add(Curve.EaseOutQuad, EaseOutQuad);
+
+        FunctionDicV.Add(Curve.Linear, Linear);
+        FunctionDicV.Add(Curve.EaseOutQuad, EaseOutQuad);
     }
 
     private void FixedUpdate()
@@ -73,35 +96,6 @@ public class ManaAnim : MonoBehaviour
     }
 
 
-    private void RegistValue()
-    {
-        MoveList = new List<Move>();
-        TweenForList = new List<Tween>();
-        TweenBacList = new List<Tween>();
-
-        FunctionDicF = new Dictionary<Curve, CurveFunctionF>();
-        FunctionDicC = new Dictionary<Curve, CurveFunctionC>();
-        FunctionDicV = new Dictionary<Curve, CurveFunctionV>();
-
-        MoveVecDic = new Dictionary<Transform, MoveVec>();
-        TweenCgDic = new Dictionary<Transform, TweenCG>();
-        TweenGraDic = new Dictionary<Transform, TweenGra>();
-        TweenVecDic = new Dictionary<Transform, TweenVec>();
-        TweenRectDic = new Dictionary<Transform, TweenRect>();
-        TweenScaleDic = new Dictionary<Transform, TweenScale>();
-        TweenAudioDic = new Dictionary<Transform, TweenAudio>();
-
-        FunctionDicF.Add(Curve.Linear, Linear);
-        FunctionDicF.Add(Curve.EaseOutQuad, EaseOutQuad);
-
-        FunctionDicC.Add(Curve.Linear, Linear);
-        FunctionDicC.Add(Curve.EaseOutQuad, EaseOutQuad);
-
-        FunctionDicV.Add(Curve.Linear, Linear);
-        FunctionDicV.Add(Curve.EaseOutQuad, EaseOutQuad);
-    }
-
-
     #region 曲线
 
     public static float Linear(float timer, float duration, float start, float delta)

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

@@ -80,6 +80,7 @@ public class ManaData : MonoBehaviour
     public static float SkillPersonBuff;
     public static float SkillCoinPerson;
 
+    public static int Sign;
     public static int Main;
     public static bool SkillBar;
     public static bool Connect;
@@ -100,7 +101,10 @@ public class ManaData : MonoBehaviour
     private void Awake()
     {
         Initializer.RegistValue += RegistValue;
-        
+
+        ManaReso.Get("Canvas", Folder.PrefabUI, true, null, true);
+        ManaReso.Get("EventSystem", Folder.PrefabUI, false, null, false);
+
         #region 读技能配置
 
         SkillDic = new Dictionary<string, SkillRoot>();
@@ -272,6 +276,11 @@ public class ManaData : MonoBehaviour
 
         double elapse = DateTime.Now.Subtract(DateTime.Parse(Data.PlayerNode.SelectSingleNode("QuitTime").Attributes[0].Value)).TotalSeconds;
 
+        if (elapse > 43200)
+        {
+            elapse = 43200;
+        }
+
         XmlNodeList xmlNodeList = Data.PlayerNode.SelectSingleNode("SkillList").ChildNodes;
 
         List<SkillRoot> ffCoolList = new List<SkillRoot>();
@@ -382,6 +391,7 @@ public class ManaData : MonoBehaviour
 
         #region 读数据存档
 
+        Sign = int.Parse(Data.PlayerNode.SelectSingleNode("Sign").Attributes[0].Value);
         Level = int.Parse(Data.PlayerNode.SelectSingleNode("Level").Attributes[0].Value);
 
         Coin = double.Parse(Data.PlayerNode.SelectSingleNode("Coin").Attributes[0].Value);

+ 16 - 6
Assets/Script/Manage/ManaMiniGame.cs

@@ -44,11 +44,11 @@ public class ManaMiniGame : MonoBehaviour
 
             if (_Game)
             {
-                StatusLab.text = "进行中";
+                StatusLab.text = Language.GetStr("UI", "D_StatusLab1");
             }
             else
             {
-                StatusLab.text = "未开始";
+                StatusLab.text = Language.GetStr("UI", "D_StatusLab0");
             }
         }
     }
@@ -63,11 +63,11 @@ public class ManaMiniGame : MonoBehaviour
             {
                 if (_Pause)
                 {
-                    StatusLab.text = "已暂停";
+                    StatusLab.text = Language.GetStr("UI", "D_StatusLab2");
                 }
                 else
                 {
-                    StatusLab.text = "进行中";
+                    StatusLab.text = Language.GetStr("UI", "D_StatusLab1");
                 }
             }
         }
@@ -81,11 +81,11 @@ public class ManaMiniGame : MonoBehaviour
 
             if (_Panalty)
             {
-                StatusLab.text = "操作被冻结";
+                StatusLab.text = Language.GetStr("UI", "D_StatusLab3");
             }
             else
             {
-                StatusLab.text = "进行中";
+                StatusLab.text = Language.GetStr("UI", "D_StatusLab1");
             }
         }
     }
@@ -141,6 +141,11 @@ public class ManaMiniGame : MonoBehaviour
         if (PenaltyTimer > 0) //冻结时间计时
         {
             PenaltyTimer -= Time.fixedDeltaTime;
+
+            if (PenaltyTimer <= 0)
+            {
+                Panalty = false;
+            }
         }
 
         OpTimer -= Time.fixedDeltaTime; //生成操作计时
@@ -204,6 +209,7 @@ public class ManaMiniGame : MonoBehaviour
             }
             else //操作错误
             {
+                Panalty = true;
                 PenaltyTimer = PenaltyTime;
 
                 ManaLog.Log(string.Format("惩罚<color=red>{0:0}</color>秒", PenaltyTime));
@@ -229,7 +235,9 @@ public class ManaMiniGame : MonoBehaviour
             }
             else //操作错误
             {
+                Panalty = true;
                 PenaltyTimer = PenaltyTime;
+
                 ManaLog.Log(string.Format("惩罚<color=red>{0:0}</color>秒", PenaltyTime));
             }
         }
@@ -253,7 +261,9 @@ public class ManaMiniGame : MonoBehaviour
             }
             else //操作错误
             {
+                Panalty = true;
                 PenaltyTimer = PenaltyTime;
+
                 ManaLog.Log(string.Format("惩罚<color=red>{0:0}</color>秒", PenaltyTime));
             }
         }

+ 7 - 0
Assets/Script/Manage/ManaReso.cs

@@ -363,6 +363,13 @@ public class ManaReso : MonoBehaviour
 
     #region ShortCut
 
+    public static void SetText(string goName)
+    {
+        Text tempText = Get<Text>(goName);
+
+        tempText.text = Language.GetStr("UI", goName);
+    }
+
     public static void SetText(string goName, string text)
     {
         Text tempText = Get<Text>(goName);

+ 168 - 34
Assets/Script/Manage/ManaUI.cs

@@ -1,30 +1,132 @@
-using UnityEngine;
+using System;
+using UnityEngine;
 using UnityEngine.UI;
 
 using System.Collections;
 using System.Collections.Generic;
+using System.Xml;
 using UnityEngine.EventSystems;
 
+public class Sign
+{
+    public int Coin;
+    public int Diamond;
+    public List<int> Flower;
+
+    public Transform Item;
+
+    public Sign(Transform transform, XmlAttributeCollection attribute)
+    {
+        Item = transform;
+
+        if (!string.IsNullOrEmpty(attribute[1].Value))
+        {
+            string[] strings = attribute[1].Value.Split(',');
+            Item.GetChild(0).GetComponent<Image>().sprite = ManaReso.Load<Sprite>("管理花园按钮", Folder.SpriteUI);
+
+            Flower = new List<int>();
+
+            for (int i = 0; i < strings.Length; i++)
+            {
+                Flower.Add(int.Parse(strings[i]));
+            }
+        }
+
+        if (!string.IsNullOrEmpty(attribute[2].Value))
+        {
+            Diamond = int.Parse(attribute[2].Value);
+
+            if (Flower == null)
+            {
+                Item.GetChild(0).GetComponent<Image>().sprite = ManaReso.Load<Sprite>("钻石", Folder.SpriteUI);
+            }
+        }
+        else if (!string.IsNullOrEmpty(attribute[3].Value))
+        {
+            Coin = int.Parse(attribute[3].Value);
+            Item.GetChild(0).GetComponent<Image>().sprite = ManaReso.Load<Sprite>("金币", Folder.SpriteUI);
+        }
+        else
+        {
+            throw new Exception();
+        }
+    }
+
+    public void Get()
+    {
+        Item.GetChild(1).SetActive(true);
+
+        if (Flower != null)
+        {
+            for (int i = 0; i < Flower.Count; i++)
+            {
+                if (ManaGarden.FlowerDic[Flower[i]].Unlock == false)
+                {
+                    ManaGarden.FlowerDic[Flower[i]].Unlock = true;
+
+                    if (ManaData.Sign < 27)
+                    {
+                        ManaData.Sign++;
+                    }
+
+                    ManaReso.SetText("Bb_InfoLab", Flower[i].ToString());
+
+                    ManaReso.Get<Image>("Bb_Info").sprite = ManaReso.Load<Sprite>("管理花园按钮", Folder.SpriteUI);
+                    return;
+                }
+            }
+        }
+
+        if (Diamond > 0)
+        {
+            if (ManaData.Sign < 27)
+            {
+                ManaData.Sign++;
+            }
+
+            ManaData.Diamond += Diamond;
+
+            ManaReso.SetText("Bb_InfoLab", Diamond.ToString());
+
+            ManaReso.Get<Image>("Bb_Info").sprite = ManaReso.Load<Sprite>("钻石", Folder.SpriteUI);
+        }
+        else if (Coin > 0)
+        {
+            if (ManaData.Sign < 27)
+            {
+                ManaData.Sign++;
+            }
+
+            ManaData.Coin += Coin;
+
+            ManaReso.SetText("Bb_InfoLab", Coin.ToString());
+
+            ManaReso.Get<Image>("Bb_Info").sprite = ManaReso.Load<Sprite>("金币", Folder.SpriteUI);
+        }
+        else
+        {
+            throw new Exception();
+        }
+    }
+}
+
 public class ManaUI : MonoBehaviour
 {
 	#region 变量
 
-    public static Transform SeleDateItem;
+    public static List<Sign> SignList;
 
     #endregion
 
-	private void Awake()
+    private void Awake()
     {
         Initializer.RegistValue += RegistValue;
-        Initializer.RegistReference += RegistReference;
-
-        ManaReso.Get("Canvas", Folder.PrefabUI, true, null, true);
-        ManaReso.Get("EventSystem", Folder.PrefabUI, false, null, false);
     }
 
-
     private void RegistValue()
     {
+        List<XmlAttributeCollection> attributeList = Data.GetSignConfig();
+
         #region A
 
         #region A_Confirm
@@ -46,6 +148,12 @@ public class ManaUI : MonoBehaviour
 
         #region B
 
+        ManaReso.SetText("Ba_Lab");
+        ManaReso.SetText("Ba_ConfirmLab");
+        ManaReso.SetText("Bb_GetLab");
+        ManaReso.SetText("Bb_Title");
+        ManaReso.SetText("Bb_ConfirmLab");
+
         #region Bb_Get
 
         ManaReso.AddButtonEvent
@@ -57,8 +165,7 @@ public class ManaUI : MonoBehaviour
                 ManaReso.SetActive("Bb_Info", true);
                 ManaReso.SetActive("Bb_Confirm", true);
 
-                SeleDateItem.GetChild(1).SetActive(true);
-                ManaData.Coin += 1500;
+                SignList[ManaData.Sign].Get();
             }
         );
 
@@ -78,16 +185,6 @@ public class ManaUI : MonoBehaviour
             ManaData.Main--;
         };
 
-        Transform tra = ManaReso.Get("Bb_Grid");
-
-        SeleDateItem = ManaReso.Get("DateItem", Folder.PrefabUI, false, tra, false);
-        ManaReso.Get("DateItem", Folder.PrefabUI, false, tra, false);
-        ManaReso.Get("DateItem", Folder.PrefabUI, false, tra, false);
-        ManaReso.Get("DateItem", Folder.PrefabUI, false, tra, false);
-        ManaReso.Get("DateItem", Folder.PrefabUI, false, tra, false);
-        ManaReso.Get("DateItem", Folder.PrefabUI, false, tra, false);
-        ManaReso.Get("DateItem", Folder.PrefabUI, false, tra, false);
-
         #endregion
 
         #region Bb_SignIn
@@ -99,9 +196,24 @@ public class ManaUI : MonoBehaviour
             ManaData.Main--;
         };
 
+        Transform tra = ManaReso.Get("Bb_Grid");
+
+        SignList = new List<Sign>();
+        for (int i = 0; i < attributeList.Count; i++)
+        {
+            Transform tra1 = ManaReso.Get("SignInItem", Folder.PrefabUI, false, tra, false);
+
+            SignList.Add(new Sign(tra1, attributeList[i]));
+        }
+        
+        for (int i = 0; i < ManaData.Sign; i++)
+        {
+            tra.GetChild(i).GetChild(1).SetActive(true);
+        }
+
         #endregion
 
-        #region B_Confirm
+        #region Bb_Confirm
 
         ManaReso.AddButtonEvent
         (
@@ -142,6 +254,8 @@ public class ManaUI : MonoBehaviour
 
         #region C_MiniGame
 
+        ManaReso.SetText("C_MiniGameLab");
+
         Button enterGameA = ManaReso.Get<Button>("C_MiniGame");
 
         enterGameA.onClick.AddListener
@@ -166,6 +280,18 @@ public class ManaUI : MonoBehaviour
 
         #region D
 
+        ManaReso.SetText("D_QuitLab");
+        ManaReso.SetText("D_BeginLab");
+        ManaReso.SetText("D_ScoreTit");
+        ManaReso.SetText("D_StatusLab", Language.GetStr("UI", "D_StatusLab0"));
+
+        ManaReso.SetText("Da_Tit");
+        ManaReso.SetText("Da_Lab");
+        ManaReso.SetText("Da_QuitLab");
+        ManaReso.SetText("Da_CancelLab");
+        ManaReso.SetText("Da_GetAwardLab");
+
+
         #region D_Rip
 
         ManaReso.AddButtonEvent
@@ -255,8 +381,8 @@ public class ManaUI : MonoBehaviour
 
         #region Da_Grid
 
-        ManaReso.Get("AwardItem", Folder.PrefabUI, false, ManaReso.Get("Da_Grid"),  false);
-        ManaReso.Get("AwardItem", Folder.PrefabUI, false, ManaReso.Get("Da_Grid"),  false);
+        ManaReso.Get("AwardItem", Folder.PrefabUI, false, ManaReso.Get("Da_Grid"), false);
+        ManaReso.Get("AwardItem", Folder.PrefabUI, false, ManaReso.Get("Da_Grid"), false);
 
         #endregion
 
@@ -325,6 +451,15 @@ public class ManaUI : MonoBehaviour
 
         #region F
 
+        ManaReso.SetText("F_StoreLab");
+        ManaReso.SetText("F_MagicLab");
+        ManaReso.SetText("F_ElfLab");
+        ManaReso.SetText("F_GardenLab");
+
+        ManaReso.SetText("Fg_Tit");
+        ManaReso.SetText("Fg_BtnLab");
+        ManaReso.SetText("Fg_Lab");
+
         #region F_Close
 
         ManaReso.AddButtonEvent
@@ -515,8 +650,6 @@ public class ManaUI : MonoBehaviour
 
         #endregion
 
-        #region MyRegion
-
         ManaReso.Get("Fg_Reconnect").CreateTweenCG(0f, 1f, 0.1f, false, true, Curve.EaseOutQuad);
 
         ManaReso.AddButtonEvent
@@ -540,10 +673,13 @@ public class ManaUI : MonoBehaviour
 
         #endregion
 
-        #endregion
-
         #region G
 
+        ManaReso.SetText("G_Tit");
+        ManaReso.SetText("G_SpecialLab");
+        ManaReso.SetText("G_RegularLab");
+        ManaReso.SetText("G_RetrieveLab");
+
         #region G_Close
 
         ManaReso.AddButtonEvent
@@ -601,7 +737,7 @@ public class ManaUI : MonoBehaviour
             () =>
             {
                 ManaGarden.RetriveFlowerAll();
-                
+
                 ManaReso.Get("G_Flower").TweenBacCG();
             }
         );
@@ -641,9 +777,12 @@ public class ManaUI : MonoBehaviour
 
         #region H
 
+        ManaReso.SetText("H_PlaceLab");
+        ManaReso.SetText("H_RetrieveLab");
+
         #region H_Prev
 
-            ManaReso.AddButtonEvent
+        ManaReso.AddButtonEvent
         (
             "H_Prev",
             () =>
@@ -748,9 +887,4 @@ public class ManaUI : MonoBehaviour
 
         #endregion
     }
-
-    private void RegistReference()
-    {
-
-    }
 }

+ 1 - 1
Assets/Script/Object/Flower.cs

@@ -97,7 +97,7 @@ public class FlowerInfo
 
         Id = int.Parse(attributes[0].Value);
         Sprite = ManaReso.Load<Sprite>(attributes[3].Value, Folder.Garden);
-        Name = attributes[1].Value;
+        Name = Language.GetStr("Flower", "Flower" + Id);
         Description = attributes[2].Value;
 
         Image.sprite = Sprite;

+ 12 - 6
Assets/Script/Object/Skill/Ability.cs

@@ -83,11 +83,12 @@ public class Ability : SkillRoot
     {
         #region 配置
 
+        ID = int.Parse(attributes[0].Value);
         Icon = attributes[20].Value;
-        Desc = attributes[19].Value;
+        Desc = Language.GetStr("SkillDescription", "Ability" + ID);
         Anim = attributes[21].Value;
         Label = attributes[22].Value;
-        Name = attributes[1].Value;
+        Name = Language.GetStr("SkillName", "Ability" + ID);
 
         UnlockPos = attributes[12].Value;
         UpgradeCD = attributes[18].Value;
@@ -246,7 +247,7 @@ public class Ability : SkillRoot
         {
             ManaReso.SetText("Fe_Lab0", "");
             ManaReso.SetText("Fe_Lab1", GetDescription(0));
-            ManaReso.SetText("Fe_BtnLab", string.Format("提前解锁({0}{1})", UnlockAheadCur, UnlockAheadAmt));
+            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2})", Language.GetStr("UI", "Fe_BtnLab0"), UnlockAheadCur, UnlockAheadAmt));
 
             ManaReso.SetButtonEvent
             (
@@ -262,7 +263,7 @@ public class Ability : SkillRoot
         {
             ManaReso.SetText("Fe_Lab0", "");
             ManaReso.SetText("Fe_Lab1", GetDescription(0));
-            ManaReso.SetText("Fe_BtnLab", string.Format("解锁({0}{1})", UnlockCur, UnlockAmt));
+            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2})", Language.GetStr("UI", "Fe_BtnLab1"), UnlockCur, UnlockAmt));
 
             ManaReso.SetButtonEvent
             (
@@ -278,7 +279,7 @@ public class Ability : SkillRoot
         {
             ManaReso.SetText("Fe_Lab0", GetDescription(0));
             ManaReso.SetText("Fe_Lab1", GetDescription(1));
-            ManaReso.SetText("Fe_BtnLab", string.Format("升级({0}{1:0})", UpgradeCur, NewUpgradeAmt));
+            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab2"), UpgradeCur, NewUpgradeAmt));
 
             ManaReso.SetButtonEvent
             (
@@ -313,7 +314,7 @@ public class Ability : SkillRoot
             ItemLab.text = GetDescription(0);
             ManaReso.SetText("Fe_Lab0", GetDescription(0));
             ManaReso.SetText("Fe_Lab1", GetDescription(1));
-            ManaReso.SetText("Fe_BtnLab", string.Format("升级({0}{1:0})", UpgradeCur, NewUpgradeAmt));
+            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab2"), UpgradeCur, NewUpgradeAmt));
 
             ManaLog.Log(string.Format("<color=red>{0}</color> 升级 : {1}", Name, Level));
 
@@ -333,6 +334,11 @@ public class Ability : SkillRoot
 
     protected void Effect()
     {
+        if (!string.IsNullOrEmpty(Anim))
+        {
+            ManaReso.Get(Anim, Folder.Object, false, ManaReso.Get("Garden"), true);
+        }
+
         if (Name == "花园")
         {
             ManaData.Person += Person;

+ 1 - 1
Assets/Script/Object/Skill/BigSkill.cs

@@ -489,7 +489,7 @@ public class BigSkill : Skill
             ItemLab.text = GetDescription(0);
             ManaReso.SetText("Fe_Lab0", GetDescription(0));
             ManaReso.SetText("Fe_Lab1", GetDescription(1));
-            ManaReso.SetText("Fe_BtnLab", string.Format("升级({0}{1:0})", UpgradeCur, NewUpgradeAmt));
+            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab2"), UpgradeCur, NewUpgradeAmt));
 
             ManaLog.Log(string.Format("<color=red>{0}</color> 升级 : {1}", Name, Level));
 

+ 4 - 3
Assets/Script/Object/Skill/Pack.cs

@@ -68,11 +68,12 @@ public class Pack : SkillRoot
     {
         #region 配置
 
+        ID = int.Parse(attributes[0].Value);
         Icon = attributes[14].Value;
-        Desc = attributes[13].Value;
+        Desc = Language.GetStr("SkillDescription", "Pack" + ID);
         Anim = attributes[15].Value;
         Label = attributes[16].Value;
-        Name = attributes[1].Value;
+        Name = Language.GetStr("SkillName", "Pack" + ID);
 
         Flower = IntParse(attributes[9].Value);
         ClassID = IntParse(attributes[3].Value);
@@ -158,7 +159,7 @@ public class Pack : SkillRoot
         if (ItemStatus == SkillStatus.Buy)
         {
             ManaReso.SetText("Fe_Lab1", GetDescription(0));
-            ManaReso.SetText("Fe_BtnLab", string.Format("购买({0}{1})", UseCur, UseAmt));
+            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2})", Language.GetStr("UI", "Fe_BtnLab3"), UseCur, UseAmt));
 
             ManaReso.SetButtonEvent
             (

+ 8 - 7
Assets/Script/Object/Skill/Skill.cs

@@ -119,11 +119,12 @@ public class Skill : SkillRoot
     {
         #region 配置
 
+        ID = int.Parse(attributes[0].Value);
         Icon = attributes[30].Value;
-        Desc = attributes[29].Value;
+        Desc = Language.GetStr("SkillDescription", "Skill" + ID);
         Anim = attributes[31].Value;
         Label = attributes[32].Value;
-        Name = attributes[1].Value;
+        Name = Language.GetStr("SkillName", "Skill" +ID);
 
         UnlockPos = attributes[18].Value;
         UpgradeCD = attributes[28].Value;
@@ -326,7 +327,7 @@ public class Skill : SkillRoot
         if (ItemStatus == SkillStatus.Buy)
         {
             ManaReso.SetText("Fe_Lab1", GetDescription(0));
-            ManaReso.SetText("Fe_BtnLab", string.Format("购买({0}{1})", UseCur, UseAmt));
+            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2})", Language.GetStr("UI", "Fe_BtnLab3"), UseCur, UseAmt));
 
             ManaReso.SetButtonEvent
             (
@@ -346,7 +347,7 @@ public class Skill : SkillRoot
         {
             ManaReso.SetText("Fe_Lab0", "");
             ManaReso.SetText("Fe_Lab1", GetDescription(0));
-            ManaReso.SetText("Fe_BtnLab", string.Format("提前解锁({0}{1})", UnlockAheadCur, UnlockAheadAmt));
+            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2})", Language.GetStr("UI", "Fe_BtnLab0"), UnlockAheadCur, UnlockAheadAmt));
 
             ManaReso.SetButtonEvent
             (
@@ -362,7 +363,7 @@ public class Skill : SkillRoot
         {
             ManaReso.SetText("Fe_Lab0", "");
             ManaReso.SetText("Fe_Lab1", GetDescription(0));
-            ManaReso.SetText("Fe_BtnLab", string.Format("解锁({0}{1})", UnlockCur, UnlockAmt));
+            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2})", Language.GetStr("UI", "Fe_BtnLab1"), UnlockCur, UnlockAmt));
 
             ManaReso.SetButtonEvent
             (
@@ -378,7 +379,7 @@ public class Skill : SkillRoot
         {
             ManaReso.SetText("Fe_Lab0", GetDescription(0));
             ManaReso.SetText("Fe_Lab1", GetDescription(1));
-            ManaReso.SetText("Fe_BtnLab", string.Format("升级({0}{1:0})", UpgradeCur, NewUpgradeAmt));
+            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab2"), UpgradeCur, NewUpgradeAmt));
 
             ManaReso.SetButtonEvent
             (
@@ -417,7 +418,7 @@ public class Skill : SkillRoot
             ItemLab.text = GetDescription(0);
             ManaReso.SetText("Fe_Lab0", GetDescription(0));
             ManaReso.SetText("Fe_Lab1", GetDescription(1));
-            ManaReso.SetText("Fe_BtnLab", string.Format("升级({0}{1:0})", UpgradeCur, NewUpgradeAmt));
+            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab2"), UpgradeCur, NewUpgradeAmt));
 
             ManaLog.Log(string.Format("<color=red>{0}</color> 升级 : {1}", Name, Level));
 

+ 1 - 0
Assets/Script/Object/Skill/SkillRoot.cs

@@ -48,6 +48,7 @@ public abstract class SkillRoot
 
     #region 配置
 
+    public int ID;
     public int ClassID;
     public string Icon;
     public string Name;

+ 0 - 1
Assets/Script/Tool/Auxiliary.cs

@@ -51,7 +51,6 @@ public class Auxiliary : MonoBehaviour
         Inst = this;
     }
 
-    
     private void Update()
     {
         if (AnyKeyUp)

+ 29 - 22
Assets/Script/Tool/DashGame/Language.cs

@@ -21,30 +21,38 @@ public class Language
 	public static string[] availableArr = new string[]{Enabled.ChineseSimplified.ToString(), Enabled.English.ToString(), Enabled.ChineseTraditional.ToString() };
 
 	private static SystemLanguage defaultLan = SystemLanguage.English;
-	private static XmlDocument xml;
+	public static XmlDocument xml;
 
 	public static string lan = SystemLanguage.English.ToString();
     public static string lanForUI = SystemLanguage.English.ToString();
 
-    //	public static void Init (string lan)
-    //	{
-    //		Debug.Log("Init Language "+lan);
-    //
-    //        Language.lan = lan;
-    //
-    //		string path = "XML/Language/";
-    //        TextAsset textAsset = ResourcesUtil.GetInstance().GetTextAsset("XML/Language/" + lan);
-    //		if(textAsset == null)
-    //		{
-    //			Debug.LogError("Can not find language use default "+defaultLan);
-    //			textAsset = ResourcesUtil.GetInstance().GetTextAsset("XML/Language/"+defaultLan.ToString());
-    //			Language.lan = defaultLan.ToString();
-    //		}
-    //
-    //		if(xml == null)
-    //			xml = new XmlDocument();
-    //		xml.LoadXml(text);
-    //	}
+    public static void Initialize()
+    {
+        TextAsset textAsset = (TextAsset)Resources.Load(@"XML\lan\ChineseSimplified");
+
+        xml = new XmlDocument();
+        xml.LoadXml(textAsset.text);
+    }
+
+    //public static void Init(string lan)
+    //{
+    //    Debug.Log("Init Language " + lan);
+
+    //    Language.lan = lan;
+
+    //    string path = "XML/Language/";
+    //    TextAsset textAsset = ResourcesUtil.GetInstance().GetTextAsset("XML/Language/" + lan);
+    //    if (textAsset == null)
+    //    {
+    //        Debug.LogError("Can not find language use default " + defaultLan);
+    //        textAsset = ResourcesUtil.GetInstance().GetTextAsset("XML/Language/" + defaultLan.ToString());
+    //        Language.lan = defaultLan.ToString();
+    //    }
+
+    //    if (xml == null)
+    //        xml = new XmlDocument();
+    //    xml.LoadXml(text);
+    //}
 
     public static bool initialized
 	{
@@ -116,8 +124,7 @@ public class Language
 	{
 		if(xml == null) 
 		{
-			Debug.LogError("Language not init");
-			return "Language not init";
+			Initialize();
         }
 
         try

+ 22 - 1
Assets/Script/Tool/Data.cs

@@ -4,6 +4,7 @@ using UnityEngine;
 using System.Xml;
 using System.Collections;
 using System.Collections.Generic;
+using System.Text;
 
 public class Data
 {
@@ -177,6 +178,7 @@ public class Data
 
     private static void SaveCommon()
     {
+        PlayerNode.SelectSingleNode("Sign").Attributes[0].Value = ManaData.Sign.ToString();
         PlayerNode.SelectSingleNode("Coin").Attributes[0].Value = ManaData.Coin.ToString("0");
         PlayerNode.SelectSingleNode("Level").Attributes[0].Value = ManaData.Level.ToString();
         PlayerNode.SelectSingleNode("Person").Attributes[0].Value = ManaData.Person.ToString();
@@ -369,6 +371,7 @@ public class Data
 
     private static void ResetCommon()
     {
+        PlayerNode.SelectSingleNode("Sign").Attributes[0].Value = "0";
         PlayerNode.SelectSingleNode("Coin").Attributes[0].Value = "0";
         PlayerNode.SelectSingleNode("Level").Attributes[0].Value = "0";
         PlayerNode.SelectSingleNode("Person").Attributes[0].Value = "1";
@@ -386,7 +389,7 @@ public class Data
         attributes[0].RemoveAll();
 
         XmlAttribute xmlAttribute = attributes.Append(PlayerDoc.CreateAttribute("ID"));
-        xmlAttribute.Value = "1 2 3 4 5 6 7 8 9";
+        xmlAttribute.Value = "1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20";
 
         PlayerDoc.Save(Application.dataPath + @"\Resources\XML\Config\PlayerConfig.xml");
     }
@@ -402,6 +405,24 @@ public class Data
     }
 
 
+    public static List<XmlAttributeCollection> GetSignConfig()
+    {
+        TextAsset textAsset;
+        XmlDocument xmlDoc = new XmlDocument();
+        List<XmlAttributeCollection> attributeList = new List<XmlAttributeCollection>();
+
+        textAsset = (TextAsset)Resources.Load(@"XML\Config\signin_config");
+        xmlDoc.LoadXml(textAsset.text);
+        XmlNodeList xmlNodeList = xmlDoc.SelectSingleNode("data").SelectNodes("item");
+        
+        for (int i = 0; i < xmlNodeList.Count; i++)
+        {
+            attributeList.Add(xmlNodeList[i].Attributes);
+        }
+
+        return attributeList;
+    }
+
     public static List<XmlAttributeCollection> GetSkillConfig()
     {
         TextAsset textAsset;

+ 24 - 0
Assets/Script/Tool/ExcelExport.cs

@@ -0,0 +1,24 @@
+using UnityEngine;
+
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+
+public class ExcelExport : MonoBehaviour
+{
+	#region 变量
+
+    
+
+    #endregion
+
+	private void Awake()
+	{
+	    
+	}
+	
+	private void FixedUpdate()
+    {
+		
+	}
+}

+ 12 - 0
Assets/Script/Tool/ExcelExport.cs.meta

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

+ 10 - 8
Assets/Script/Tool/UI/TextPlus.cs

@@ -2,19 +2,21 @@
 using UnityEngine.UI;
 
 using System.Collections;
+using System.Collections.Generic;
 
-public class TextPlus : Text
+public class TextPlus : Image
 {
     protected override void OnPopulateMesh(VertexHelper toFill)
     {
-        base.OnPopulateMesh(toFill);
+        //base.OnPopulateMesh(toFill);
 
-        Mesh mesh = new Mesh();
+        toFill.Clear();
+        toFill.AddVert(new Vector3(0, 0, 0), Color.white, new Vector2(0.5f, 0));
+        toFill.AddVert(new Vector3(0, 100, 0), Color.white, new Vector2(0.5f, 1));
+        toFill.AddVert(new Vector3(100, 100, 0), Color.white, new Vector2(1, 1));
+        toFill.AddVert(new Vector3(100, 0, 0), Color.white, new Vector2(1, 0));
 
-        mesh.vertices = new[] { new Vector3(0, 0, 0), new Vector3(0, 100, 0), new Vector3(100, 0, 0) };
-        mesh.colors = new[] { new Color(1, 1, 1, 1), new Color(1, 1, 1, 1), new Color(1, 1, 1, 1) };
-        mesh.triangles = new[] { 0, 1, 2 };
-
-        toFill.FillMesh(mesh);
+        toFill.AddTriangle(0,1,2);
+        toFill.AddTriangle(0,2,3);
     }
 }

BIN
Assets/XlsxSource/ability_config.xlsx


BIN
Assets/XlsxSource/language_config.xlsx


BIN
Assets/XlsxSource/skill_config.xlsx


+ 16 - 13
MyLovelyGarden.sln

@@ -1,9 +1,9 @@
-
-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}"
+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}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden.Editor", "MyLovelyGarden.Editor.csproj", "{B575449E-FD9A-1672-368B-EC1E1252F6E4}"
+Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp-Editor.csproj", "{A08052E5-32CE-91C0-FF56-C60C901D6BEF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,16 +11,19 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{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
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		StartupItem = Assembly-CSharp.csproj
+	EndGlobalSection
 EndGlobal

+ 7 - 1
MyLovelyGarden.txt

@@ -1,7 +1,13 @@
-整理到ManaData
+共享一个动画
+
+RegistValue开分支
 
 图文混排
 
+语言工具(Prefab到Excel,Excel转XML,读XML)
+
+Ability中的说明使用coin_person Skill中少了一个倍字
+
 
 Anchor
 

BIN
ProjectSettings/GraphicsSettings.asset