temp

Assets/Resources/XML/Config/PlayerConfig.xml

@@ -1,11 +1,11 @@
 <PlayerConfig>
-  <Coin value="1368" />
+  <Coin value="57" />
   <Level value="10" />
   <Person value="1" />
   <Diamond value="0" />
-  <QuitTime value="3/19/2017 7:33:36 PM" />
+  <QuitTime value="3/20/2017 7:55:45 AM" />
   <CoinPerson value="1" />
-  <CircleTimer value="7.439955" />
+  <CircleTimer value="6.959956" />
   <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 " />
   <SkillList>
@@ -15,7 +15,7 @@
     <花园 SkillType="Ability" ItemStatus="Upgrade" Level="0" />
     <繁花似锦 SkillType="Skill" ItemStatus="Lock" Level="0" CdTimer="0" EffectTimer="0" />
     <黄色小蜜蜂 SkillType="Ability" ItemStatus="Lock" Level="0" />
-    <人潮涌动 SkillType="BigSkill" ItemStatus="Upgrade" BarStatus="Use" Level="0" CdTimer="1800" EffectTimer="294.340000126511" />
+    <人潮涌动 SkillType="BigSkill" ItemStatus="Upgrade" BarStatus="Use" Level="0" CdTimer="1709.9999986589" EffectTimer="1.58000018820167" />
     <紫色小蜜蜂 SkillType="Ability" ItemStatus="Lock" Level="0" />
     <礼包 SkillType="Pack" Name="金币大礼包" ItemStatus="Buy" Level="0" />
     <礼包 SkillType="Pack" Name="新手礼包" ItemStatus="Lock" Level="0" />
@@ -28,11 +28,11 @@
     <红色小蜜蜂 SkillType="Ability" ItemStatus="Lock" Level="0" />
     <花之祝福 SkillType="BigSkill" ItemStatus="Lock" BarStatus="Buy" Level="0" CdTimer="0" EffectTimer="0" />
     <白色小蜜蜂 SkillType="Ability" ItemStatus="Lock" Level="0" />
-    <炼金石 SkillType="Ability" ItemStatus="Lock" Level="0" />
+    <缤纷彩虹 SkillType="Ability" ItemStatus="Lock" Level="0" />
     <礼包 SkillType="Pack" Name="钻石100" ItemStatus="Buy" Level="0" />
     <黄色小蝴蝶 SkillType="Ability" ItemStatus="Lock" Level="0" />
     <礼包 SkillType="Pack" Name="钻石500 赠送50" ItemStatus="Buy" Level="0" />
-    <神秘灌木 SkillType="Ability" ItemStatus="Lock" Level="0" />
+    <玉树樱花 SkillType="Ability" ItemStatus="Lock" Level="0" />
     <紫色小蝴蝶 SkillType="Ability" ItemStatus="Lock" Level="0" />
     <礼包 SkillType="Pack" Name="钻石2000 赠送500" ItemStatus="Buy" Level="0" />
     <滴哩哩的小黄鹂 SkillType="Ability" ItemStatus="Upgrade" Level="0" />

Assets/Resources/XML/Config/ability_config.xml

@@ -1,18 +1,18 @@
 <data>
   <item id="1" name="花园" class="1" class_id="1" coin_person="1" person="1" skill_cd="" unlock_lv="" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="1" upgrade_amnt="200" upgrade_fml="a*1.07" upgrade_plus="10" upgrade_person="0.1" upgrade_cd="" desc="每人次收入 金币[&amp;coin_person&amp;][lv]，每分钟来访[&amp;person&amp;*60][lv]人" icon="红-公园" anim="" label="" />
-  <item id="2" name="炼金石" class="1" class_id="5" coin_person="" person="" skill_cd="" unlock_lv="200" unlock_ahead_cur="2" unlock_ahead_amt="200" unlock_cur="" unlock_amnt="100" unlock_pos="" upgrade_cur="2" upgrade_amnt="" upgrade_fml="a" upgrade_plus="50%" upgrade_person="50%" upgrade_cd="" desc="" icon="红-彩虹" anim="" label="" />
-  <item id="3" name="神秘灌木" class="1" class_id="6" coin_person="" person="" skill_cd="" unlock_lv="500" unlock_ahead_cur="2" unlock_ahead_amt="300" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="300" upgrade_fml="a" upgrade_plus="50%" upgrade_person="" upgrade_cd="" desc="" icon="红-樱花树" anim="" label="" />
-  <item id="4" name="滴哩哩的小黄鹂" class="1" class_id="7" coin_person="" person="" skill_cd="5" unlock_lv="" unlock_ahead_cur="2" unlock_ahead_amt="500" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="300" upgrade_fml="a" upgrade_plus="" upgrade_person="" upgrade_cd="5" desc="" icon="红-黄鹂鸟" anim="" label="" />
-  <item id="5" name="黄色小蜜蜂" class="2" class_id="1" coin_person="10" person="" skill_cd="" unlock_lv="200" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="1" upgrade_amnt="1600" upgrade_fml="a*1.07" upgrade_plus="10" upgrade_person="" upgrade_cd="" desc="" icon="黄-黄色蜜蜂" anim="" label="" />
-  <item id="6" name="紫色小蜜蜂" class="2" class_id="2" coin_person="10" person="" skill_cd="" unlock_lv="200" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="86400" upgrade_fml="a*1.07" upgrade_plus="10" upgrade_person="" upgrade_cd="" desc="" icon="黄-紫色蜜蜂" anim="" label="" />
-  <item id="7" name="蓝色小蜜蜂" class="2" class_id="3" coin_person="10" person="" skill_cd="" unlock_lv="200" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="22118000" upgrade_fml="a*1.07" upgrade_plus="10" upgrade_person="" upgrade_cd="" desc="" icon="黄-蓝色蜜蜂" anim="" label="" />
-  <item id="8" name="红色小蜜蜂" class="2" class_id="4" coin_person="10" person="" skill_cd="" unlock_lv="200" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="16588000000" upgrade_fml="a*1.07" upgrade_plus="10" upgrade_person="" upgrade_cd="" desc="" icon="黄-红色蜜蜂" anim="" label="" />
-  <item id="9" name="白色小蜜蜂" class="2" class_id="5" coin_person="10" person="" skill_cd="" unlock_lv="200" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="28665000000000" upgrade_fml="a*1.07" upgrade_plus="10" upgrade_person="" upgrade_cd="" desc="" icon="黄-白色蜜蜂" anim="" label="" />
-  <item id="10" name="黄色小蝴蝶" class="2" class_id="6" coin_person="20" person="" skill_cd="" unlock_lv="300" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="28665000000000" upgrade_fml="a*1.07" upgrade_plus="20" upgrade_person="" upgrade_cd="" desc="" icon="黄-黄蝴蝶" anim="" label="" />
-  <item id="11" name="紫色小蝴蝶" class="2" class_id="7" coin_person="20" person="" skill_cd="" unlock_lv="300" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="28665000000000" upgrade_fml="a*1.07" upgrade_plus="20" upgrade_person="" upgrade_cd="" desc="" icon="黄-紫蝴蝶" anim="" label="" />
-  <item id="12" name="蓝色小蝴蝶" class="2" class_id="8" coin_person="20" person="" skill_cd="" unlock_lv="300" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="28665000000000" upgrade_fml="a*1.07" upgrade_plus="20" upgrade_person="" upgrade_cd="" desc="" icon="黄-蓝蝴蝶" anim="" label="" />
-  <item id="13" name="红色小蝴蝶" class="2" class_id="9" coin_person="20" person="" skill_cd="" unlock_lv="300" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="28665000000000" upgrade_fml="a*1.07" upgrade_plus="20" upgrade_person="" upgrade_cd="" desc="" icon="黄-红蝴蝶" anim="" label="" />
-  <item id="14" name="白色小蝴蝶" class="2" class_id="10" coin_person="20" person="" skill_cd="" unlock_lv="300" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="28665000000000" upgrade_fml="a*1.07" upgrade_plus="20" upgrade_person="" upgrade_cd="" desc="" icon="黄-白蝴蝶" anim="" label="" />
+  <item id="2" name="缤纷彩虹" class="1" class_id="5" coin_person="" person="" skill_cd="" unlock_lv="200" unlock_ahead_cur="2" unlock_ahead_amt="200" unlock_cur="" unlock_amnt="100" unlock_pos="" upgrade_cur="2" upgrade_amnt="" upgrade_fml="a" upgrade_plus="50%" upgrade_person="50%" upgrade_cd="" desc="每分钟增加[&amp;person&amp;*60][lv]人参观，永久有效" icon="红-彩虹" anim="" label="" />
+  <item id="3" name="玉树樱花" class="1" class_id="6" coin_person="" person="" skill_cd="" unlock_lv="500" unlock_ahead_cur="2" unlock_ahead_amt="300" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="300" upgrade_fml="a" upgrade_plus="50%" upgrade_person="" upgrade_cd="" desc="每人次收入提升[&amp;coin_person&amp;][lv]，永久有效" icon="红-樱花树" anim="" label="" />
+  <item id="4" name="滴哩哩的小黄鹂" class="1" class_id="7" coin_person="" person="" skill_cd="5%" unlock_lv="" unlock_ahead_cur="2" unlock_ahead_amt="500" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="300" upgrade_fml="a" upgrade_plus="" upgrade_person="" upgrade_cd="5%" desc="技能冷却时间减少[&amp;skill_cd&amp;][lv]，永久有效" icon="红-黄鹂鸟" anim="" label="" />
+  <item id="5" name="黄色小蜜蜂" class="2" class_id="1" coin_person="10" person="" skill_cd="" unlock_lv="200" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="1" upgrade_amnt="1600" upgrade_fml="a*1.07" upgrade_plus="10" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-黄色蜜蜂" anim="" label="" />
+  <item id="6" name="紫色小蜜蜂" class="2" class_id="2" coin_person="10" person="" skill_cd="" unlock_lv="200" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="86400" upgrade_fml="a*1.07" upgrade_plus="10" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-紫色蜜蜂" anim="" label="" />
+  <item id="7" name="蓝色小蜜蜂" class="2" class_id="3" coin_person="10" person="" skill_cd="" unlock_lv="200" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="22118000" upgrade_fml="a*1.07" upgrade_plus="10" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-蓝色蜜蜂" anim="" label="" />
+  <item id="8" name="红色小蜜蜂" class="2" class_id="4" coin_person="10" person="" skill_cd="" unlock_lv="200" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="16588000000" upgrade_fml="a*1.07" upgrade_plus="10" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-红色蜜蜂" anim="" label="" />
+  <item id="9" name="白色小蜜蜂" class="2" class_id="5" coin_person="10" person="" skill_cd="" unlock_lv="200" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="28665000000000" upgrade_fml="a*1.07" upgrade_plus="10" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-白色蜜蜂" anim="" label="" />
+  <item id="10" name="黄色小蝴蝶" class="2" class_id="6" coin_person="20" person="" skill_cd="" unlock_lv="300" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="28665000000000" upgrade_fml="a*1.07" upgrade_plus="20" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-黄蝴蝶" anim="" label="" />
+  <item id="11" name="紫色小蝴蝶" class="2" class_id="7" coin_person="20" person="" skill_cd="" unlock_lv="300" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="28665000000000" upgrade_fml="a*1.07" upgrade_plus="20" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-紫蝴蝶" anim="" label="" />
+  <item id="12" name="蓝色小蝴蝶" class="2" class_id="8" coin_person="20" person="" skill_cd="" unlock_lv="300" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="28665000000000" upgrade_fml="a*1.07" upgrade_plus="20" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-蓝蝴蝶" anim="" label="" />
+  <item id="13" name="红色小蝴蝶" class="2" class_id="9" coin_person="20" person="" skill_cd="" unlock_lv="300" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="28665000000000" upgrade_fml="a*1.07" upgrade_plus="20" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-红蝴蝶" anim="" label="" />
+  <item id="14" name="白色小蝴蝶" class="2" class_id="10" coin_person="20" person="" skill_cd="" unlock_lv="300" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="28665000000000" upgrade_fml="a*1.07" upgrade_plus="20" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-白蝴蝶" anim="" label="" />
   <comment>
     <id>
 id

Assets/Resources/XML/Config/flower_config.xml

@@ -15,17 +15,17 @@
   <item id="14" name="非洲菊(粉)" desc="" icon="Flower14" anim="" />
   <item id="15" name="红掌" desc="" icon="Flower15" anim="" />
   <item id="16" name="桔梗花" desc="" icon="Flower16" anim="" />
-  <item id="17" name="康乃馨（白）" desc="" icon="Flower17" anim="" />
-  <item id="18" name="郁金香（粉）" desc="" icon="Flower18" anim="" />
-  <item id="19" name="曼陀罗（橘）" desc="" icon="Flower19" anim="" />
-  <item id="20" name="玫瑰花（红）" desc="" icon="Flower20" anim="" />
+  <item id="17" name="康乃馨(白)" desc="" icon="Flower17" anim="" />
+  <item id="18" name="郁金香(粉)" desc="" icon="Flower18" anim="" />
+  <item id="19" name="曼陀罗(橘)" desc="" icon="Flower19" anim="" />
+  <item id="20" name="玫瑰花(红)" desc="" icon="Flower20" anim="" />
   <item id="21" name="茑萝" desc="" icon="Flower21" anim="" />
-  <item id="22" name="牵牛花（紫）" desc="" icon="Flower22" anim="" />
-  <item id="23" name="虞美人（红）" desc="" icon="Flower23" anim="" />
-  <item id="24" name="郁金香（黄）" desc="" icon="Flower24" anim="" />
-  <item id="25" name="鸢尾（紫）" desc="" icon="Flower25" anim="" />
-  <item id="26" name="朱槿（粉）" desc="" icon="Flower26" anim="" />
-  <item id="27" name="朱槿（黄）" desc="" icon="Flower27" anim="" />
+  <item id="22" name="牵牛花(紫)" desc="" icon="Flower22" anim="" />
+  <item id="23" name="虞美人(红)" desc="" icon="Flower23" anim="" />
+  <item id="24" name="郁金香(黄)" desc="" icon="Flower24" anim="" />
+  <item id="25" name="鸢尾(紫)" desc="" icon="Flower25" anim="" />
+  <item id="26" name="朱槿(粉)" desc="" icon="Flower26" anim="" />
+  <item id="27" name="朱槿(黄)" desc="" icon="Flower27" anim="" />
   <comment>
     <id>
 id

Assets/Resources/XML/Config/skill_config.xml

@@ -1,10 +1,10 @@
 <data>
-  <item id="1" name="人潮涌动" class="1" class_id="2" skill_index="1" reduce_cd="1" coin_person="" person="1" coin_once="" diamond_once="" skill_cd="" duration="300" cd="1800" unlock_lv="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="" 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="" 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="" 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="" icon="绿-免费金币" anim="" label="" />
-  <item id="6" name="免费获取钻石" class="4" class_id="0" skill_index="" reduce_cd="" coin_person="" person="" coin_once="" diamond_once="10" skill_cd="" duration="" cd="900" unlock_lv="" unlock_ahead_cur="" unlock_ahead_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="" icon="蓝-免费钻" 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="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="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="" />
+  <item id="6" name="免费获取钻石" class="4" class_id="0" skill_index="" reduce_cd="" coin_person="" person="" coin_once="" diamond_once="10" skill_cd="" duration="" cd="900" unlock_lv="" unlock_ahead_cur="" unlock_ahead_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;diamond_once&amp;]" icon="蓝-免费钻" anim="" label="" />
   <item id="7" name="技能冷却" class="" class_id="" skill_index="4" reduce_cd="" coin_person="" person="" coin_once="" diamond_once="" skill_cd="100%" duration="" cd="900" unlock_lv="100" 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="" icon="4大技能4" anim="" label="" />
   <comment>
     <id>

Assets/Script/Manage/ManaData.cs

@@ -171,6 +171,11 @@ public class ManaData : MonoBehaviour
         {
             OpTimer = 0;
 
+            if (ManaReso.Get("GardenMini").gameObject.activeSelf || ManaReso.Get("F_Manage").gameObject.activeSelf)
+            {
+                return;
+            }
+
             GameObject go = ManaReso.Get("C_Main").gameObject;
 
             if (go.activeSelf == false)
@@ -257,15 +262,16 @@ public class ManaData : MonoBehaviour
 
         XmlNodeList xmlNodeList = Data.PlayerNode.SelectSingleNode("SkillList").ChildNodes;
 
-        List<List<SkillRoot>> collectList = new List<List<SkillRoot>>();
+        List<SkillRoot> ffCoolList = new List<SkillRoot>();
+        List<List<SkillRoot>> ffList = new List<List<SkillRoot>>();
 
         if (elapse > CircleTimer)
         {
-            int lastCircle = 1 + Mathf.FloorToInt((float)((elapse - CircleTimer) / CircleTime));
+            int ffCircle = 1 + Mathf.FloorToInt((float)((elapse - CircleTimer) / CircleTime));
 
-            for (int i = 0; i < lastCircle; i++)
+            for (int i = 0; i < ffCircle; i++)
             {
-                collectList.Add(new List<SkillRoot>());
+                ffList.Add(new List<SkillRoot>());
             }
         }
 
@@ -283,7 +289,7 @@ public class ManaData : MonoBehaviour
 
                 skill._ItemStatus = (SkillStatus)Enum.Parse(typeof(SkillStatus), xmlNodeList[i].Attributes[1].Value);
 
-                skill.RegistValue(elapse, collectList);
+                skill.RegistValue(elapse, ffList);
             }
             else if (xmlNodeList[i].Attributes[0].Value == SkillType.BigSkill.ToString())
             {
@@ -298,7 +304,7 @@ public class ManaData : MonoBehaviour
                 bigSkill._ItemStatus = (SkillStatus)Enum.Parse(typeof(SkillStatus), xmlNodeList[i].Attributes[1].Value); //Sa0
                 bigSkill._BarStatus = (SkillStatus)Enum.Parse(typeof(SkillStatus), xmlNodeList[i].Attributes[2].Value); //Sa1
 
-                bigSkill.RegistValue(elapse, collectList);
+                bigSkill.RegistValue(elapse, ffList);
             }
             else if (xmlNodeList[i].Attributes[0].Value == SkillType.Pack.ToString())
             {
@@ -309,7 +315,7 @@ public class ManaData : MonoBehaviour
                 pack.Level = int.Parse(xmlNodeList[i].Attributes[3].Value);
                 pack._ItemStatus = (SkillStatus)Enum.Parse(typeof(SkillStatus), xmlNodeList[i].Attributes[2].Value);
 
-                pack.RegistValue(elapse, collectList);
+                pack.RegistValue(elapse, ffList);
             }
             else if (xmlNodeList[i].Attributes[0].Value == SkillType.Ability.ToString())
             {
@@ -320,7 +326,7 @@ public class ManaData : MonoBehaviour
                 ability.Level = int.Parse(xmlNodeList[i].Attributes[2].Value);
                 ability._ItemStatus = (SkillStatus)Enum.Parse(typeof(SkillStatus), xmlNodeList[i].Attributes[1].Value);
 
-                ability.RegistValue(elapse, collectList);
+                ability.RegistValue(elapse, ffList);
             }
             else
             {
@@ -375,13 +381,29 @@ public class ManaData : MonoBehaviour
 
         double collectCoin = 0;
 
-        if (collectList.Count > 0)
+        if (ffList.Count > 0)
         {
-            for (int i = 0; i < collectList.Count; i++)
+            for (int i = 0; i < ffList.Count; i++)
             {
-                for (int j = 0; j < collectList[i].Count; j++)
+                for (int j = 0; j < ffCoolList.Count; j++)
                 {
-                    collectList[i][j].Annul();
+                    if (ffCoolList[j].SkillType == SkillType.Skill || ffCoolList[j].SkillType == SkillType.BigSkill)
+                    {
+                        if (i == 0)
+                        {
+                            ((Skill) ffCoolList[j]).CoolTimer -= CircleTimer;
+                        }
+                        else
+                        {
+                            ((Skill)ffCoolList[j]).CoolTimer -= CircleTime;
+                        } 
+                    }
+                }
+                
+                for (int j = 0; j < ffList[i].Count; j++)
+                {
+                    ffList[i][j].Annul();
+                    ffCoolList.Add(ffList[i][j]);
                 }
 
                 NewPerson = Person * (1 + SkillPersonBuff) + SkillPerson;
@@ -391,7 +413,7 @@ public class ManaData : MonoBehaviour
             }
 
             Coin += collectCoin;
-
+            
             ManaReso.SetText("A_IconLab", collectCoin.ToString("0"));
 
             CircleTimer = (float)((elapse - CircleTimer) % CircleTime);

Assets/Script/Object/Skill/Ability.cs

@@ -122,7 +122,7 @@ public class Ability : SkillRoot
     }
 
 
-    public override void RegistValue(double elapse, List<List<SkillRoot>> collectList)
+    public override void RegistValue(double elapse, List<List<SkillRoot>> ffList)
     {
         ItemTit.text = Name;
         ItemLab.text = GetDescription(0);

Assets/Script/Object/Skill/BigSkill.cs

@@ -161,7 +161,7 @@ public class BigSkill : Skill
         }
     }
 
-    public override void RegistValue(double elapse, List<List<SkillRoot>> collectList)
+    public override void RegistValue(double elapse, List<List<SkillRoot>> ffList)
     {
         BarBtn.onClick.AddListener(Use);
         BarBk1.sprite = ManaReso.Load<Sprite>(Icon + "副", Folder.Skill);
@@ -221,27 +221,27 @@ public class BigSkill : Skill
 
         if (_BarStatus == SkillStatus.Use)
         {
+            Effect();
             if (UsingTimer < elapse)
             {
-                if (UsingTimer < ManaData.CircleTimer)
-                {
-                    collectList[0].UniqueAdd(this);
-                }
-                else
+                if (ffList.Count > 0)
                 {
-                    int lastCircle = 1 + Mathf.FloorToInt((float)((UsingTimer - ManaData.CircleTimer) / ManaData.CircleTime));
+                    if (UsingTimer < ManaData.CircleTimer)
+                    {
+                        ffList[0].UniqueAdd(this);
+                    }
+                    else
+                    {
+                        int ffCircle = 1 + Mathf.FloorToInt((float)((UsingTimer - ManaData.CircleTimer) / ManaData.CircleTime));
 
-                    collectList[lastCircle].UniqueAdd(this);
+                        ffList[ffCircle].UniqueAdd(this);
+                    }
                 }
-
-                CoolTimer = CD - (elapse - UsingTimer);
             }
             else
             {
                 ManaLog.Log(string.Format("初始化<color=red>{0}</color> 等级 : {1}", Name, Level));
 
-                Effect();
-
                 UsingTimer -= elapse;
 
                 BarLab.color = new Color(38 / 255f, 155 / 255f, 1, 1);
@@ -258,11 +258,11 @@ public class BigSkill : Skill
 
     public override void ReceiveCool(float amt, bool isCurrent, bool isBuff)
     {
-        if (!ReduceCD || BarStatus != SkillStatus.Cool)
+        if (!ReduceCD)
         {
             return;
         }
-        Debug.Log(Name);
+        
         if (isCurrent) //减少当前值
         {
             if (isBuff) //按比例减少
@@ -287,8 +287,6 @@ public class BigSkill : Skill
         }
     }
 
-
-
     private void ShowSkillBar()
     {
         if (!ManaData.SkillBar)

Assets/Script/Object/Skill/Pack.cs

@@ -95,7 +95,7 @@ public class Pack : SkillRoot
     }
 
 
-    public override void RegistValue(double elapse, List<List<SkillRoot>> collectList)
+    public override void RegistValue(double elapse, List<List<SkillRoot>> ffList)
     {
         ItemTit.text = Name;
         ItemLab.text = GetDescription(0);

Assets/Script/Object/Skill/Skill.cs

@@ -163,7 +163,7 @@ public class Skill : SkillRoot
     }
 
 
-    public override void RegistValue(double elapse, List<List<SkillRoot>> collectList)
+    public override void RegistValue(double elapse, List<List<SkillRoot>> ffList)
     {
         NewPlus = Plus;
         NewPerson = Person;
@@ -206,25 +206,26 @@ public class Skill : SkillRoot
 
         if (_ItemStatus == SkillStatus.Use)
         {
+            Effect();
+
             if (UsingTimer < elapse)
             {
-                if (UsingTimer < ManaData.CircleTimer)
-                {
-                    collectList[0].UniqueAdd(this);
-                }
-                else
+                if (ffList.Count > 0)
                 {
-                    int lastCircle = 1 + Mathf.FloorToInt((float)(UsingTimer - ManaData.CircleTimer / ManaData.CircleTime));
-
-                    collectList[lastCircle].UniqueAdd(this);
+                    if (UsingTimer < ManaData.CircleTimer)
+                    {
+                        ffList[0].UniqueAdd(this);
+                    }
+                    else
+                    {
+                        int ffCircle = 1 + Mathf.FloorToInt((float)(UsingTimer - ManaData.CircleTimer / ManaData.CircleTime));
+
+                        ffList[ffCircle].UniqueAdd(this);
+                    }
                 }
-
-                CoolTimer = CD - (elapse - UsingTimer);
             }
             else
             {
-                Effect();
-
                 UsingTimer -= elapse;
 
                 ItemBtnLab.color = new Color(38 / 255f, 155 / 255f, 1, 1);
@@ -238,7 +239,6 @@ public class Skill : SkillRoot
         ItemStatus = ItemStatus;
     }
 
-
     public virtual bool DoCool()
     {
         CoolTimer -= Time.deltaTime;

Assets/Script/Object/Skill/SkillRoot.cs

@@ -64,7 +64,7 @@ public abstract class SkillRoot
     public SkillType SkillType;
 
     public abstract bool DoUse();
-    public abstract void RegistValue(double elapse, List<List<SkillRoot>> collectList);
+    public abstract void RegistValue(double elapse, List<List<SkillRoot>> ffList);
     public abstract void OnLevelChange();
 
     #endregion
@@ -128,6 +128,11 @@ public abstract class SkillRoot
         
     }
 
+    public virtual void FastForward(List<List<SkillRoot>> ffList, float time, int index)
+    {
+        
+    }
+
     public virtual void RegistReference()
     {
         

MyLovelyGarden.txt

@@ -1,5 +1,3 @@
-时间线中的CD CD效果没有 C_Main会弹出来
-
 进行到ManaData
 
 Xml加密