ソースを参照

修改-提前解锁计算方式

jet 8 年 前
コミット
27707dd9d7

+ 2 - 2
Assets/Extension.meta → Assets/Advertisements/Editor/Resources/Android/builds.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: b948198483a8b93419206e81215060f3
+guid: 8d2d384f78b29a44a9c70c3daf45d1cb
 folderAsset: yes
-timeCreated: 1496150477
+timeCreated: 1494301205
 licenseType: Pro
 DefaultImporter:
   userData: 

+ 8 - 0
Assets/Advertisements/Editor/Resources/Android/builds.zip.meta

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

+ 9 - 0
Assets/Advertisements/Editor/Resources/iOS/builds.meta

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

+ 8 - 0
Assets/Advertisements/Editor/Resources/iOS/builds.zip.meta

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

BIN
Assets/Resource/Logo.unity


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


+ 20 - 17
Assets/Resource/XML/Config/ability_config.xml

@@ -1,18 +1,18 @@
 <data>
-  <item id="1" name="花园" class="1" class_id="1" coin_person="5" person="1" skill_cd="" unlock_lv="" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="1" unlock_amnt="5" unlock_pos="" upgrade_cur="1" upgrade_amnt="800" upgrade_fml="a*1.07" upgrade_plus="0.5%" upgrade_person="1.7%" 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="5%" skill_cd="" unlock_lv="5" unlock_ahead_cur="2" unlock_ahead_amt="200" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="150" upgrade_fml="a" upgrade_plus="" upgrade_person="5%" upgrade_cd="" desc="每分钟增加[&amp;person&amp;*60][lv]人参观,永久有效" icon="红-彩虹" anim="Item,Rainbow" label="" />
-  <item id="3" name="玉树樱花" class="1" class_id="6" coin_person="5%" person="" skill_cd="" unlock_lv="35" unlock_ahead_cur="2" unlock_ahead_amt="300" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="150" upgrade_fml="a" upgrade_plus="5%" upgrade_person="" upgrade_cd="" desc="每人次收入提升[&amp;coin_person&amp;][lv],永久有效" icon="红-樱花树" anim="Item,Tree1,Tree2" label="" />
-  <item id="4" name="滴哩哩的小黄鹂" class="1" class_id="7" coin_person="" person="" skill_cd="5%" unlock_lv="110" unlock_ahead_cur="2" unlock_ahead_amt="500" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="300" upgrade_fml="a" upgrade_plus="" upgrade_person="" upgrade_cd="5%" desc="技能冷却时间减少[&amp;skill_cd&amp;][lv],永久有效" icon="红-黄鹂鸟" anim="Item,Bird0" label="" />
-  <item id="5" name="黄色小蜜蜂" class="2" class_id="1" coin_person="2.07" person="" skill_cd="" unlock_lv="2" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="1" upgrade_amnt="800" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-黄色蜜蜂" anim="Elf,BeeYellow" label="" />
-  <item id="6" name="紫色小蜜蜂" class="2" class_id="2" coin_person="2.96" person="" skill_cd="" unlock_lv="10" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="1" unlock_amnt="1600" unlock_pos="1" upgrade_cur="1" upgrade_amnt="1600" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-紫色蜜蜂" anim="Elf,BeePurple" label="" />
-  <item id="7" name="蓝色小蜜蜂" class="2" class_id="3" coin_person="5.34" person="" skill_cd="" unlock_lv="30" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="1" unlock_amnt="3200" unlock_pos="1" upgrade_cur="1" upgrade_amnt="3200" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-蓝色蜜蜂" anim="Elf,BeeBlue" label="" />
-  <item id="8" name="红色小蜜蜂" class="2" class_id="4" coin_person="18.2" person="" skill_cd="" unlock_lv="80" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="1" unlock_amnt="6400" unlock_pos="1" upgrade_cur="1" upgrade_amnt="6400" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-红色蜜蜂" anim="Elf,BeeRed" label="" />
-  <item id="9" name="白色小蜜蜂" class="2" class_id="5" coin_person="49.05" person="" skill_cd="" unlock_lv="120" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="1" unlock_amnt="12800" unlock_pos="1" upgrade_cur="1" upgrade_amnt="12800" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-白色蜜蜂" anim="Elf,BeeWhite" label="" />
-  <item id="10" name="黄色小蝴蝶" class="2" class_id="6" coin_person="3.68" person="" skill_cd="" unlock_lv="20" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="3200" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-黄蝴蝶" anim="Elf,ButterflyYellow" label="" />
-  <item id="11" name="紫色小蝴蝶" class="2" class_id="7" coin_person="8.27" person="" skill_cd="" unlock_lv="50" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="1" unlock_amnt="6400" unlock_pos="1" upgrade_cur="1" upgrade_amnt="6400" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-紫蝴蝶" anim="Elf,ButterflyPurple" label="" />
-  <item id="12" name="蓝色小蝴蝶" class="2" class_id="8" coin_person="28.17" person="" skill_cd="" unlock_lv="100" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="1" unlock_amnt="12800" unlock_pos="1" upgrade_cur="1" upgrade_amnt="12800" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-蓝蝴蝶" anim="Elf,ButterflyBlue" label="" />
-  <item id="13" name="红色小蝴蝶" class="2" class_id="9" coin_person="326.79" person="" skill_cd="" unlock_lv="200" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="1" unlock_amnt="25600" unlock_pos="1" upgrade_cur="1" upgrade_amnt="25600" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-红蝴蝶" anim="Elf,ButterflyRed" label="" />
-  <item id="14" name="白色小蝴蝶" class="2" class_id="10" coin_person="1387.22" person="" skill_cd="" unlock_lv="250" unlock_ahead_cur="2" unlock_ahead_amt="100" unlock_cur="1" unlock_amnt="51200" unlock_pos="1" upgrade_cur="1" upgrade_amnt="51200" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-白蝴蝶" anim="Elf,ButterflyWhite" label="" />
+  <item id="1" name="花园" class="1" class_id="1" coin_person="5" person="1" skill_cd="" unlock_lv="" unlock_ahead_cur="" unlock_ahead_delta="" unlock_ahead_minimun="" unlock_cur="1" unlock_amnt="5" unlock_pos="" upgrade_cur="1" upgrade_amnt="800" upgrade_fml="a*1.07" upgrade_plus="0.5%" upgrade_person="1.7%" 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="5%" skill_cd="" unlock_lv="5" unlock_ahead_cur="2" unlock_ahead_delta="" unlock_ahead_minimun="200" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="150" upgrade_fml="a" upgrade_plus="" upgrade_person="5%" upgrade_cd="" desc="每分钟增加[&amp;person&amp;*60][lv]人参观,永久有效" icon="红-彩虹" anim="Item,Rainbow" label="" />
+  <item id="3" name="玉树樱花" class="1" class_id="6" coin_person="5%" person="" skill_cd="" unlock_lv="35" unlock_ahead_cur="2" unlock_ahead_delta="" unlock_ahead_minimun="300" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="150" upgrade_fml="a" upgrade_plus="5%" upgrade_person="" upgrade_cd="" desc="每人次收入提升[&amp;coin_person&amp;][lv],永久有效" icon="红-樱花树" anim="Item,Tree1,Tree2" label="" />
+  <item id="4" name="滴哩哩的小黄鹂" class="1" class_id="7" coin_person="" person="" skill_cd="5%" unlock_lv="110" unlock_ahead_cur="2" unlock_ahead_delta="" unlock_ahead_minimun="500" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="300" upgrade_fml="a" upgrade_plus="" upgrade_person="" upgrade_cd="5%" desc="技能冷却时间减少[&amp;skill_cd&amp;][lv],永久有效" icon="红-黄鹂鸟" anim="Item,Bird0" label="" />
+  <item id="5" name="黄色小蜜蜂" class="2" class_id="1" coin_person="2.07" person="" skill_cd="" unlock_lv="2" unlock_ahead_cur="" unlock_ahead_delta="" unlock_ahead_minimun="" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="1" upgrade_amnt="800" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-黄色蜜蜂" anim="Elf,BeeYellow" label="" />
+  <item id="6" name="紫色小蜜蜂" class="2" class_id="2" coin_person="2.96" person="" skill_cd="" unlock_lv="10" unlock_ahead_cur="" unlock_ahead_delta="" unlock_ahead_minimun="" unlock_cur="1" unlock_amnt="1600" unlock_pos="1" upgrade_cur="1" upgrade_amnt="1600" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-紫色蜜蜂" anim="Elf,BeePurple" label="" />
+  <item id="7" name="蓝色小蜜蜂" class="2" class_id="3" coin_person="5.34" person="" skill_cd="" unlock_lv="30" unlock_ahead_cur="" unlock_ahead_delta="" unlock_ahead_minimun="" unlock_cur="1" unlock_amnt="3200" unlock_pos="1" upgrade_cur="1" upgrade_amnt="3200" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-蓝色蜜蜂" anim="Elf,BeeBlue" label="" />
+  <item id="8" name="红色小蜜蜂" class="2" class_id="4" coin_person="18.2" person="" skill_cd="" unlock_lv="80" unlock_ahead_cur="" unlock_ahead_delta="" unlock_ahead_minimun="" unlock_cur="1" unlock_amnt="6400" unlock_pos="1" upgrade_cur="1" upgrade_amnt="6400" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-红色蜜蜂" anim="Elf,BeeRed" label="" />
+  <item id="9" name="白色小蜜蜂" class="2" class_id="5" coin_person="49.05" person="" skill_cd="" unlock_lv="120" unlock_ahead_cur="" unlock_ahead_delta="" unlock_ahead_minimun="" unlock_cur="1" unlock_amnt="12800" unlock_pos="1" upgrade_cur="1" upgrade_amnt="12800" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-白色蜜蜂" anim="Elf,BeeWhite" label="" />
+  <item id="10" name="黄色小蝴蝶" class="2" class_id="6" coin_person="3.68" person="" skill_cd="" unlock_lv="20" unlock_ahead_cur="2" unlock_ahead_delta="" unlock_ahead_minimun="100" unlock_cur="" unlock_amnt="" unlock_pos="1" upgrade_cur="1" upgrade_amnt="3200" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-黄蝴蝶" anim="Elf,ButterflyYellow" label="" />
+  <item id="11" name="紫色小蝴蝶" class="2" class_id="7" coin_person="8.27" person="" skill_cd="" unlock_lv="50" unlock_ahead_cur="2" unlock_ahead_delta="" unlock_ahead_minimun="100" unlock_cur="1" unlock_amnt="6400" unlock_pos="1" upgrade_cur="1" upgrade_amnt="6400" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-紫蝴蝶" anim="Elf,ButterflyPurple" label="" />
+  <item id="12" name="蓝色小蝴蝶" class="2" class_id="8" coin_person="28.17" person="" skill_cd="" unlock_lv="100" unlock_ahead_cur="2" unlock_ahead_delta="" unlock_ahead_minimun="100" unlock_cur="1" unlock_amnt="12800" unlock_pos="1" upgrade_cur="1" upgrade_amnt="12800" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-蓝蝴蝶" anim="Elf,ButterflyBlue" label="" />
+  <item id="13" name="红色小蝴蝶" class="2" class_id="9" coin_person="326.79" person="" skill_cd="" unlock_lv="200" unlock_ahead_cur="2" unlock_ahead_delta="" unlock_ahead_minimun="100" unlock_cur="1" unlock_amnt="25600" unlock_pos="1" upgrade_cur="1" upgrade_amnt="25600" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-红蝴蝶" anim="Elf,ButterflyRed" label="" />
+  <item id="14" name="白色小蝴蝶" class="2" class_id="10" coin_person="1387.22" person="" skill_cd="" unlock_lv="250" unlock_ahead_cur="2" unlock_ahead_delta="10" unlock_ahead_minimun="100" unlock_cur="1" unlock_amnt="51200" unlock_pos="1" upgrade_cur="1" upgrade_amnt="51200" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-白蝴蝶" anim="Elf,ButterflyWhite" label="" />
   <comment>
     <id>
 id
@@ -45,10 +45,13 @@ id
 提前解锁
 消耗货币
 </unlock_ahead_cur>
-    <unlock_ahead_amt>
+    <unlock_ahead_delta>
+提前解锁每一级增加值
+</unlock_ahead_delta>
+    <unlock_ahead_minimun>
 提前解锁
-消耗数值
-</unlock_ahead_amt>
+消耗最小
+</unlock_ahead_minimun>
     <unlock_cur>
 解锁
 消耗货币

+ 13 - 10
Assets/Resource/XML/Config/skill_config.xml

@@ -1,11 +1,11 @@
 <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="" unlock_ahead_cur="" unlock_ahead_amt="" unlock_cur="1" unlock_amnt="5" unlock_pos="" use__cur="" use_amnt="" upgrade_cur="2" 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="25" 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="200%" person="" coin_once="" diamond_once="" skill_cd="" duration="300" cd="3600" unlock_lv="75" 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="40" 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="30000%" diamond_once="" skill_cd="" duration="" cd="600" 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="15" 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="" />
+  <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="" unlock_ahead_cur="" unlock_ahead_delta="" unlock_ahead_minimun="" unlock_cur="1" unlock_amnt="5" unlock_pos="" use__cur="" use_amnt="" upgrade_cur="2" 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="25" unlock_ahead_cur="2" unlock_ahead_delta="10" unlock_ahead_minimun="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="200%" person="" coin_once="" diamond_once="" skill_cd="" duration="300" cd="3600" unlock_lv="75" unlock_ahead_cur="2" unlock_ahead_delta="" unlock_ahead_minimun="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="40" unlock_ahead_cur="2" unlock_ahead_delta="" unlock_ahead_minimun="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="30000%" diamond_once="" skill_cd="" duration="" cd="600" unlock_lv="" unlock_ahead_cur="" unlock_ahead_delta="" unlock_ahead_minimun="" 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_delta="" unlock_ahead_minimun="" 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="15" unlock_ahead_cur="" unlock_ahead_delta="" unlock_ahead_minimun="" 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>
 id
@@ -58,10 +58,13 @@ id
 提前解锁
 消耗货币
 </unlock_ahead_cur>
-    <unlock_ahead_amt>
+    <unlock_ahead_delta>
+提前解锁每一级增加值
+</unlock_ahead_delta>
+    <unlock_ahead_minimun>
 提前解锁
-消耗数值
-</unlock_ahead_amt>
+消耗最小
+</unlock_ahead_minimun>
     <unlock_cur>
 解锁
 消耗货币

BIN
Assets/Resource/Xlsx/ability_config.xlsx


BIN
Assets/Resource/Xlsx/skill_config.xlsx


+ 2 - 2
Assets/Script/Manage/ManaCenter.cs

@@ -576,11 +576,11 @@ public class ManaCenter : Regist
             {
                 skillRoot = new Pack(attributeList[i]);
             }
-            else if (attributeList[i].Count == 23)
+            else if (attributeList[i].Count == 24)
             {
                 skillRoot = new Ability(attributeList[i]);
             }
-            else if (attributeList[i].Count == 33)
+            else if (attributeList[i].Count == 34)
             {
                 if (string.IsNullOrEmpty(attributeList[i][4].Value))
                 {

+ 21 - 15
Assets/Script/Object/Skill/Ability.cs

@@ -15,6 +15,10 @@ public class Ability : SkillRoot
 
     #region 配置
 
+    public float UnlockAheadAmt
+    {
+        get { return UnlockAheadBaseAmt + (UnlockLv - ManaCenter.Level - 1)*UnlockAheadDeltaAmt; }
+    }
     public override string ID
     {
         get { return "Ability" + ID_; }
@@ -31,7 +35,8 @@ public class Ability : SkillRoot
 
     public int UnlockLv;
     public float UnlockAmt;
-    public float UnlockAheadAmt;
+    public float UnlockAheadBaseAmt;
+    public float UnlockAheadDeltaAmt;
     public string UnlockPos;
 
     public Current UnlockCur;
@@ -105,27 +110,28 @@ public class Ability : SkillRoot
         #region 配置
 
         ID_ = int.Parse(attribute[0].Value);
-        Icon_ = attribute[20].Value;
-        Anim = attribute[21].Value;
-        Label = attribute[22].Value;
+        Icon_ = attribute[21].Value;
+        Anim = attribute[22].Value;
+        Label = attribute[23].Value;
 
-        UnlockPos = attribute[12].Value;
-        UpgradeCD = attribute[18].Value;
-        UpgradeFml = attribute[15].Value;
-        UpgradePlus = attribute[16].Value;
-        UpgradePerson = attribute[17].Value;
+        UnlockPos = attribute[13].Value;
+        UpgradeCD = attribute[19].Value;
+        UpgradeFml = attribute[16].Value;
+        UpgradePlus = attribute[17].Value;
+        UpgradePerson = attribute[18].Value;
 
         UnlockLv = Auxiliary.IntParse(attribute[7].Value,0);
         ItemIndex = Auxiliary.IntParse(attribute[3].Value,0);
 
-        UnlockAmt = Auxiliary.FloatParse(attribute[11].Value,0);
-        UnlockAheadAmt = Auxiliary.FloatParse(attribute[9].Value,0);
+        UnlockAmt = Auxiliary.FloatParse(attribute[12].Value,0);
+        UnlockAheadBaseAmt = Auxiliary.FloatParse(attribute[10].Value,0);
+        UnlockAheadDeltaAmt = Auxiliary.FloatParse(attribute[9].Value, 0);
 
         SkillTab = SkillClassParse(attribute[2].Value);
-        UpgradeAmt = UpgradeAmtParse(attribute[14].Value);
+        UpgradeAmt = UpgradeAmtParse(attribute[15].Value);
         
-        UnlockCur = CurrentParse(attribute[10].Value);
-        UpgradeCur = CurrentParse(attribute[13].Value);
+        UnlockCur = CurrentParse(attribute[11].Value);
+        UpgradeCur = CurrentParse(attribute[14].Value);
         UnlockAheadCur = CurrentParse(attribute[8].Value);
 
         ValueBuffParse(out Person, out PersonBuff, attribute[5].Value);
@@ -268,7 +274,7 @@ public class Ability : SkillRoot
 
         ManaCenter.Person += NewPerson;
         ManaCenter.CoinPerson += NewCoinPerson;
-
+        
         ManaCenter.SkillPlus += NewPlus;
         ManaCenter.SkillPersonBuff += NewPersonBuff;
 

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

@@ -515,7 +515,7 @@ public class BigSkill : Skill
             ManaReso.SetText("Fe_Lab0", "");
             ManaReso.SetText("Fe_Lab1", GetDescription(0));
 
-            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab0"), ImageParse(UnlockAheadCur), UnlockAheadAmt));
+            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab0"), ImageParse(UnlockAheadCur), UnlockAheadAmt.ToString("0")));
 
             ManaReso.SetButtonEvent
             (

+ 26 - 20
Assets/Script/Object/Skill/Skill.cs

@@ -14,6 +14,10 @@ public class Skill : SkillRoot
 
     #region 配置
 
+    public float UnlockAheadAmt
+    {
+        get { return UnlockAheadBaseAmt + (UnlockLv - ManaCenter.Level - 1) * UnlockAheadDeltaAmt; }
+    }
     public override string ID
     {
         get
@@ -42,7 +46,8 @@ public class Skill : SkillRoot
 
     public int UnlockLv;
     public float UnlockAmt;
-    public float UnlockAheadAmt;
+    public float UnlockAheadBaseAmt;
+    public float UnlockAheadDeltaAmt;
     public string UnlockPos;
 
     public Current BuyCur;
@@ -120,35 +125,36 @@ public class Skill : SkillRoot
         #region 配置
 
         ID_ = int.Parse(attribute[0].Value);
-        Icon_ = attribute[30].Value;
-        Anim = attribute[31].Value;
-        Label = attribute[32].Value;
-
-        UnlockPos = attribute[18].Value;
-        UpgradeCD = attribute[28].Value;
-        UpgradeFml = attribute[23].Value;
-        UpgradePlus = attribute[24].Value;
-        UpgradePerson = attribute[25].Value;
-        UpgradeDuration = attribute[27].Value;
-        UpgradeCoinOnce = attribute[26].Value;
+        Icon_ = attribute[31].Value;
+        Anim = attribute[32].Value;
+        Label = attribute[33].Value;
+
+        UnlockPos = attribute[19].Value;
+        UpgradeCD = attribute[29].Value;
+        UpgradeFml = attribute[24].Value;
+        UpgradePlus = attribute[25].Value;
+        UpgradePerson = attribute[26].Value;
+        UpgradeDuration = attribute[28].Value;
+        UpgradeCoinOnce = attribute[27].Value;
 
         UnlockLv = Auxiliary.IntParse(attribute[13].Value,0);
         ItemIndex = Auxiliary.IntParse(attribute[3].Value,0);
 
         CD = Auxiliary.FloatParse(attribute[12].Value,0);
-        UseAmt = Auxiliary.FloatParse(attribute[20].Value,0);
+        UseAmt = Auxiliary.FloatParse(attribute[21].Value,0);
         Duration = Auxiliary.FloatParse(attribute[11].Value,0);
-        UnlockAmt = Auxiliary.FloatParse(attribute[17].Value,0);
+        UnlockAmt = Auxiliary.FloatParse(attribute[18].Value,0);
         DiamondOnce = Auxiliary.FloatParse(attribute[9].Value,0);
-        UnlockAheadAmt = Auxiliary.FloatParse(attribute[15].Value,0);
+        UnlockAheadBaseAmt = Auxiliary.FloatParse(attribute[16].Value,0);
+        UnlockAheadDeltaAmt = Auxiliary.FloatParse(attribute[15].Value, 0);
 
         SkillTab = SkillClassParse(attribute[2].Value);
         CoolLock = Auxiliary.BoolParse(attribute[5].Value, false);
-        UpgradeAmt = UpgradeAmtParse(attribute[22].Value);
+        UpgradeAmt = UpgradeAmtParse(attribute[23].Value);
         
-        BuyCur = CurrentParse(attribute[19].Value);
-        UnlockCur = CurrentParse(attribute[16].Value);
-        UpgradeCur = CurrentParse(attribute[21].Value);
+        BuyCur = CurrentParse(attribute[20].Value);
+        UnlockCur = CurrentParse(attribute[17].Value);
+        UpgradeCur = CurrentParse(attribute[22].Value);
         UnlockAheadCur = CurrentParse(attribute[14].Value);
         
         ValueBuffParse(out Person, out PersonBuff, attribute[7].Value);
@@ -408,7 +414,7 @@ public class Skill : SkillRoot
             ManaReso.SetText("Fe_Lab0", "");
             ManaReso.SetText("Fe_Lab1", GetDescription(0));
 
-            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab0"), ImageParse(UnlockAheadCur), UnlockAheadAmt));
+            ManaReso.SetText("Fe_BtnLab", string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab0"), ImageParse(UnlockAheadCur), UnlockAheadAmt.ToString("0")));
 
             ManaReso.SetButtonEvent
             (

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

@@ -125,7 +125,7 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Z))
         {
-            //ManaTutorial.PayExemptAmt = 99;
+            //ManaServer.Download("hsoiv1", data => Debug.Log(data.ToJson()));
         }
 
         if (Input.GetKeyDown(KeyCode.X))

BIN
ProjectSettings/GraphicsSettings.asset


BIN
ProjectSettings/ProjectSettings.asset


+ 1 - 1
ProjectSettings/ProjectVersion.txt

@@ -1 +1 @@
-m_EditorVersion: 5.5.0f3
+m_EditorVersion: 5.5.2f1

+ 7 - 3
ToList.txt

@@ -4,13 +4,17 @@
 
 //关闭调试按键
 
+//关闭DebugMode
+
 //注意存档覆盖情况
 
-//打包时重新导入配置
+打包时重新导入配置
+
+打包时重新导入Bundle
 
-//先开启Service再打包
+先开启Service再打包
 
-//更新版本号
+更新版本号
 
 
 监督补上循环特效