diff --git a/res/cityfunction@cityfunction.csv b/res/cityfunction@cityfunction.csv
index f56ab9c..191c6af 100644
--- a/res/cityfunction@cityfunction.csv
+++ b/res/cityfunction@cityfunction.csv
@@ -2,4 +2,4 @@ funtion_id,name,icon,layerId
 1,铁匠铺,,,
 2,仓库,dynmic/bg/img_warehouse,,
 3,神秘商人,,,
-4,酒馆,dynmic/bg/img_pub,50,
+4,驿站,dynmic/bg/img_pub,50,
diff --git a/res/dialog@dialog.csv b/res/dialog@dialog.csv
index 27649c1..ef14701 100644
--- a/res/dialog@dialog.csv
+++ b/res/dialog@dialog.csv
@@ -251,7 +251,7 @@ dialog_id,dialog_group_id,dialog_type,replay,shake,end_type,advroom_id,speaker_l
 10285,32,1,0,0,1,10108,0|0|0,0|0|0,hero_10011|1|0,0|0|0|0,卡丽妲,小姐，请不要对外人说这些。,0,,,,,
 10286,32,1,0,0,1,10108,hero_10003|1|0,0|0|0,0|0|0,0|0|0|0,娜娜,喂，放开我们啊，我们才不是什么精灵族间谍。,0,,,,,
 10287,32,1,0,0,1,10108,0|0|0,0|0|0,hero_10004|1|0,0|0|0|0,艾琳娜,抓住了敌国的间谍，等父亲从斯沃恩结束会议回来，一定会答应带我上战场的。先送到雪原军垒关起来，留着以后慢慢审问。,0,,,,,
-10288,33,1,0,0,1,10108,hero_10003|1|0,0|0|0,0|0|0,0|0|0|0,娜娜,精灵、半兽人、魔化战士，然后是被关进大牢，等到找齐石碑回到村子，我就写一本书来记录这一路上的经历，书名就叫《蔚蓝战纪》。,0,,,,,
+10288,33,1,0,0,1,10108,hero_10003|1|0,0|0|0,0|0|0,0|0|0|0,娜娜,精灵、半兽人、魔化战士，然后是被关进大牢，等到找齐石碑回到村子，我就写一本书来记录这一路上的经历，书名就叫《卡索战纪》。,0,,,,,
 10289,33,1,0,0,1,10108,hero_10005|1|0,0|0|0,0|0|0,0|0|0|0,里特,真不知道你怎么能一直保持这种不分场合的乐观，写书也好，收集宝物也好，还是等到有命逃出去再说吧。,0,,,,,
 10290,33,1,0,0,1,10108,0|0|0,0|0|0,hero_10006|1|0,0|0|0|0,兰,之前承蒙二位相助，今日又是因我之故身陷囹圄，不知娜娜姑娘方才提及的石碑为何物，若是他日得以脱出，请让我助你们一臂之力吧。,0,,,,,
 10291,33,1,0,0,1,10108,hero_10005|1|0,0|0|0,0|0|0,0|0|0|0,里特,也没什么特别的，简单点说就是如果找不到这东西，大概后半生我都得餐风露宿了，现在还是想想怎么从这里出去吧。,0,,,,,
diff --git a/res/draw@draw.csv b/res/draw@draw.csv
index beefc58..3bd1bcf 100644
--- a/res/draw@draw.csv
+++ b/res/draw@draw.csv
@@ -1,5 +1,5 @@
 id,cost_type,cost_num,cost_value,free_times,reward_id,activitytime
 1,50001,1,500,3,64001,2019年4月23日-2019年9月,
 2,50001,10,5000,0,64002,2019年4月23日-2019年9月,
-3,50003,1,100,1,64001,2019年4月23日-2019年9月,
-4,50003,10,1000,0,64002,2019年4月23日-2019年9月,
+3,50031,1,100,1,64001,2019年4月23日-2019年9月,
+4,50031,10,1000,0,64002,2019年4月23日-2019年9月,
diff --git a/res/guide@guide.csv b/res/guide@guide.csv
index 81cd8eb..4c2cf36 100644
--- a/res/guide@guide.csv
+++ b/res/guide@guide.csv
@@ -1,5 +1,5 @@
 guide_id,guide_group_id,guide_group_index,need_dialog,dialog_pos,force,content,effect_scale,layer_id,node_path,need_move,arrow_pos,arrow_anim,width,height,level,stage_id,map_id,complete_guide_id,complete_instance_id,show_hero,hero_id
-1,1,1,1,0|-500,1,<color=#424242>欢迎来到<color=#1E90FF>蔚蓝战纪<color=#424242>的世界。这是一片充满惊险与刺激的奇幻国度，请跟随筱雅一起开启神秘之旅。</color>,1,25,btn_container/play_btn,,,jump_vertical,130,130,1,,,,,,,
+1,1,1,1,0|-500,1,<color=#424242>欢迎来到<color=#1E90FF>卡索战纪<color=#424242>的世界。这是一片充满惊险与刺激的奇幻国度，请跟随筱雅一起开启神秘之旅。</color>,1,25,btn_container/play_btn,,,jump_vertical,130,130,1,,,,,,,
 2,5,1,1,-20|-460,1,<color=#424242>尝试第一次通关</color>,1,,,,,jump_vertical,210,250,1,10101,,,,,,
 3,7,1,1,0|40,0,<color=#424242>关卡探索阶段需要花费一点时间</color>,1,63,popup/discover_progress/pro_tansuo,,,jump_vertical_1,400,80,0,,,2,,,,
 4,7,2,1,0|40,0,<color=#FF0000>探索度满100%<color=#424242>后会有更为强大的敌人出现</color>,1,,,,,,,,0,,,3,,,,
diff --git a/res/item@item.csv b/res/item@item.csv
index f2639ed..9ce7eb5 100644
--- a/res/item@item.csv
+++ b/res/item@item.csv
@@ -20,6 +20,7 @@ item_id,name,des,icon,page,type,param,sell,quality,max_num,pile,source_map,ui_id
 50019,铁镐,挖掘魂印原石需要的道具,dynmic/item/50001,,4,,0,3,,,,,,,
 50020,迷宫钥匙,,dynmic/item/50001,,4,,0,5,,,,,,,
 50021,势力贡献,升级势力科技,dynmic/item/50001,,4,,0,5,,,,,,,
+50031,抽卡券,抽卡券,dynmic/item/scroll,,4,,0,5,,,,,,,
 50101,人之卷碎片,残卷系统升级消耗材料,dynmic/item/50101,2,2,,0,5,,9999,,,,,
 50102,地之卷碎片,残卷系统升级消耗材料,dynmic/item/50102,2,2,,0,5,,9999,,,,,
 50103,天之卷碎片,残卷系统升级消耗材料,dynmic/item/50103,2,2,,0,5,,9999,,,,,
diff --git a/res/map@map.csv b/res/map@map.csv
index 24754f9..f89d542 100644
--- a/res/map@map.csv
+++ b/res/map@map.csv
@@ -1,11 +1,11 @@
 map_id,name,desc,icon,stage_type,function_id,game_type,chapter_id,show_id,need_move,unlock_id,item_id_limit,level_limit,power_limit,drop_list,hide,animation,event_list,event_pos
-10101,地狱门入口,通向地狱之门的入口，为了防止魔兽跑出，已经被里特用巨石封住。,img_cavern,4,,,110100,,1,10102,0,1,0,50001|1|0，50002|1|0,0,,,,
-10102,地狱之门,位于巨大陨石坑的中心，是通往封印之地的地狱之门，没人知道它存在了多少年。,img_hell,4,,,110100,10101,1,10103,0,1,0,50001|1|0，50002|1|0,0,,,,
+10101,灰烬门入口,通向灰烬之门的入口，为了防止魔兽跑出，已经被里特用巨石封住。,img_cavern,4,,,110100,,1,10102,0,1,0,50001|1|0，50002|1|0,0,,,,
+10102,灰烬之门,位于巨大陨石坑的中心，是通往封印之地的灰烬之门，没人知道它存在了多少年。,img_hell,4,,,110100,10101,1,10103,0,1,0,50001|1|0，50002|1|0,0,,,,
 10103,坠石坑南-1,位于陨石坑南部，此处丘陵连绵不绝，常有凶猛的野兽出没。,img_cavern,4,,,110100,10102,1,10104,0,1,0,50001|1|0，50002|1|0,0,,,,
 10104,坠石坑南-2,位于陨石坑南部，此处丘陵连绵不绝，常有凶猛的野兽出没。,img_cavern,4,,,110100,10103,1,10105,0,1,0,50001|1|0，50002|1|0,0,,,,
-10105,封印之地,位于地狱之门内，石质祭坛上插着的“守护者之剑”封印着地狱之门内众多远古魔兽。,img_hell,4,,,110100,10104,1,10106,0,1,0,50001|1|0，50002|1|0,0,,,,
-10106,北麓猎场,位于地狱之门北侧，地势相对缓和，是打猎的好去处。,img_cavern,4,,,110100,10105,,10107,0,1,0,50001|1|0，50002|1|0,0,,,,
-10107,坠星村,地狱之门北侧，凯兰帝国南侧边陲的村落，据说村人都是当年封印恶魔的贤者的后裔。,img_city2,1,4,,110100,10106,,10108,0,1,0,50001|1|0，50002|1|0,0,,,,
+10105,封印之地,位于灰烬之门内，石质祭坛上插着的“守护者之剑”封印着灰烬之门内众多远古魔兽。,img_hell,4,,,110100,10104,1,10106,0,1,0,50001|1|0，50002|1|0,0,,,,
+10106,北麓猎场,位于灰烬之门北侧，地势相对缓和，是打猎的好去处。,img_cavern,4,,,110100,10105,,10107,0,1,0,50001|1|0，50002|1|0,0,,,,
+10107,坠星村,灰烬之门北侧，凯兰帝国南侧边陲的村落，据说村人都是当年封印恶魔的贤者的后裔。,img_city2,1,4,,110100,10106,,10108,0,1,0,50001|1|0，50002|1|0,0,,,,
 10108,坠星村口,每当幼时的里特尝试跑出村子，都会被拖回村子毒打一顿。,img_village,4,,,110100,10107,,10109,0,1,0,50001|1|0，50002|1|0,0,,,,
 10109,凯兰国道-1,位于阿卡斯山脉和陨石坑中间的狭长道路，北接凯兰雪原，南接无领荒漠。,img_cavern,4,,,110100,10108,,10110,0,1,0,50001|1|0，50002|1|0,0,,,,
 10110,凯兰国道-2,位于阿卡斯山脉和陨石坑中间的狭长道路，北接凯兰雪原，南接无领荒漠。,img_cavern,4,,,110100,10109,,10111,0,1,0,50001|1|0，50002|1|0,0,,,,
diff --git a/res/npc@npc.csv b/res/npc@npc.csv
index 7d3298b..f25e8e0 100644
--- a/res/npc@npc.csv
+++ b/res/npc@npc.csv
@@ -1,6 +1,6 @@
 stage_id,npc_id,npc_type,npc_name,icon,idle,pre_npc_id,shopids,param1,param2,param3,param4,reward,accept_reward,start_time,end_time,time,normal_gossip,received_gossip,completed_gossip,normal_buttons,received_buttons,completed_buttons
 10107,1001,5,阿曼达,dynmic/hero/icon/10025,dynmic/mission/10025,0,1|2|3,shop,1|2|3,英雄|装备|其他,,,,0,0.999988425926,7200,坠星村的天气真是糟糕呢，要买点什么，冒险家？,,,打开商店|ShowDialog($1，$2，$3)\n离开|CloseNpcDialog(),离开|CloseNpcDialog(),离开|CloseNpcDialog(),
-10107,1002,1,村中老者,dynmic/hero/icon/10025,dynmic/mission/10105,0,,,,,,,,,,,我一辈子都不会离开村子的，因为我们都是那位击败恶魔的贤者的后代，世代守护地狱之门，是我们不可逃避的责任。,,,离开|CloseNpcDialog(),,,
+10107,1002,1,村中老者,dynmic/hero/icon/10212,dynmic/mission/10212,0,,,,,,,,,,,我一辈子都不会离开村子的，因为我们都是那位击败恶魔的贤者的后代，世代守护地狱之门，是我们不可逃避的责任。,,,离开|CloseNpcDialog(),,,
 10107,1003,3,梅尔菲斯,dynmic/hero/icon/10007,dynmic/mission/10007,0,,,,,,,60168,,,,准备好冒险了吗？,如果不是有伤在身，我也想和你们一起去冒险，这些是我偶然找到的“残卷”，或许对你有帮助。,我们所了解到的历史，都是真的么？保持求知欲，总不是一件坏事，你说呢？,对话|_AcceptMission()|CloseNpcDialog()\n离开|CloseNpcDialog(),对话|_CommitMission(),离开|CloseNpcDialog(),
 10107,1004,1,娜娜,dynmic/hero/icon/10003,dynmic/mission/10003,0,,,,,,,,,,,里特，不要总带着一副懒洋洋的样子嘛。,,终于能够出村子冒险了，村子外面应该有很多值钱的宝物吧，我先去准备一下，我一定要带一个巨大的背包。,对话|_CommitMission()|CloseNpcDialog()|HideNpc()\n离开|CloseNpcDialog(),离开|CloseNpcDialog(),离开|CloseNpcDialog(),
 10112,1005,3,艾玛,dynmic/hero/icon/10112,dynmic/mission/10112,0,,,,,,,60169,,,,这里是艾玛镇，我叫艾玛。,前阵子我偶然捡到了一本破损的笔记，可是这上面写的东西，我从来都没听说过，不如就送给你们吧。,我有一个叫伍德的表哥，他几年前去了阿卡斯，但是我还是更喜欢凯兰。,对话|_AcceptMission()|CloseNpcDialog()\n离开|CloseNpcDialog(),对话|_CommitMission(),离开|CloseNpcDialog(),
@@ -11,19 +11,19 @@ stage_id,npc_id,npc_type,npc_name,icon,idle,pre_npc_id,shopids,param1,param2,par
 10124,1010,1,艾琳娜,dynmic/hero/icon/10004,dynmic/mission/10004,0,,,,,,,,,,,阿卡斯对这个国家的人来说好像不容侵犯，但是我不喜欢这种愚蠢的虔诚。,,能直接使用魔法好像是一件很有趣的事情，但是我打赌他们连本小姐的一拳都躲不过。,对话|_CommitMission()|CloseNpcDialog()|HideNpc()\n离开|CloseNpcDialog(),离开|CloseNpcDialog(),离开|CloseNpcDialog(),
 10124,1011,3,护教骑士,dynmic/hero/icon/10102,dynmic/mission/10102,0,,,,,,,60173,,,,欢迎来到阿卡斯。,西边的港口是阿卡斯最大的港口，如果可以的话，我也想在那样美丽的海边安安稳稳地做一辈子渔民。,欢迎来到阿卡斯，愿光神阿卡斯庇佑你。,对话|_AcceptMission()|CloseNpcDialog()\n离开|CloseNpcDialog(),对话|_CommitMission(),离开|CloseNpcDialog(),
 10124,1012,1,兰,dynmic/hero/icon/10006,dynmic/mission/10006,0,,,,,,,,,,,外面的世界着实有趣呢！,,在艾西思的日子实在太无聊，若是可以，我们再去一次雪原吧，天地苍茫，甚是迷人。,对话|_CommitMission()|CloseNpcDialog()|HideNpc()\n离开|CloseNpcDialog(),离开|CloseNpcDialog(),离开|CloseNpcDialog(),
-10124,1013,1,阿卡斯传教士,dynmic/hero/icon/10112,dynmic/mission/10112,0,,,,,,,,,,,是阿卡斯大神给这个世界带来了光，我没办法想象没有光的世界是什么样子的。,,,离开|CloseNpcDialog(),,,
+10124,1013,1,阿卡斯传教士,dynmic/hero/icon/10201,dynmic/mission/10201,0,,,,,,,,,,,是阿卡斯大神给这个世界带来了光，我没办法想象没有光的世界是什么样子的。,,,离开|CloseNpcDialog(),,,
 10124,1014,3,卡诺伊,dynmic/hero/icon/10102,dynmic/mission/10102,0,,,,,,,60174,,,,最近北边的村子好像有异教徒在活动，等送走了薇薇安将军，我一定让他们知道神圣的阿卡斯是不可侵犯的。,虽然你很强，但是我敢保证和我单打独斗的话，你绝对撑不过三个回合。,这次陪薇薇安将军来北境巡视，真的学到了不少东西呢，等我回到圣光城，吉利法恩团长一定会对我刮目相看的。,对话|_AcceptMission()|CloseNpcDialog()\n离开|CloseNpcDialog(),对话|_CommitMission(),离开|CloseNpcDialog(),
 10124,1015,5,阿曼达,dynmic/hero/icon/10025,dynmic/mission/10025,0,7|8|9,shop,7|8|9,英雄|装备|其他,,,,0,0.999988425926,7200,阿卡斯的天气……真好啊，要买点什么，冒险家？,,,打开商店|ShowDialog($1，$2，$3)\n离开|CloseNpcDialog(),离开|CloseNpcDialog(),离开|CloseNpcDialog(),
-10126,1016,3,阿卡斯渔夫,dynmic/hero/icon/10105,dynmic/mission/10105,0,,,,,,,60175,,,,这里是阿卡斯唯一的海港，我家世世代代都作为渔民生活在这里。,西边的海里导了夜晚总是闪着奇怪的光，传说那里是很久以前阿卡斯大神大战海妖的地方。,阿卡斯的海岸上大多数都是险峻的山岭，只有这一处还算平坦。,对话|_AcceptMission()|CloseNpcDialog()\n离开|CloseNpcDialog(),对话|_CommitMission(),离开|CloseNpcDialog(),
+10126,1016,3,阿卡斯渔夫,dynmic/hero/icon/10214,dynmic/mission/10214,0,,,,,,,60175,,,,这里是阿卡斯唯一的海港，我家世世代代都作为渔民生活在这里。,西边的海里导了夜晚总是闪着奇怪的光，传说那里是很久以前阿卡斯大神大战海妖的地方。,阿卡斯的海岸上大多数都是险峻的山岭，只有这一处还算平坦。,对话|_AcceptMission()|CloseNpcDialog()\n离开|CloseNpcDialog(),对话|_CommitMission(),离开|CloseNpcDialog(),
 10126,1017,3,阿曼达,dynmic/hero/icon/10025,dynmic/mission/10025,0,,,,,,,60170,,,,你问我为什么总是喜欢谈论天气么？因为这被称为拯救无趣之人的最后一根稻草。,这本破旧的笔记应该卖不出什么好价钱，你们喜欢的话，就拿去吧。,今天不卖东西哦~就算是云游商人，也难得像这样偷得浮生半日闲呢。,对话|_AcceptMission()|CloseNpcDialog()\n离开|CloseNpcDialog(),对话|_CommitMission(),离开|CloseNpcDialog(),
 10126,1018,1,娜娜,dynmic/hero/icon/10003,dynmic/mission/10003,0,,,,,,,,,,,大海真美啊，这是我第一次看到海呢！,,我听说海里有一处神秘的宫殿，那里一定藏着很多宝物。里特，我们一起去寻宝吧。,对话|_CommitMission()|CloseNpcDialog()|HideNpc()\n离开|CloseNpcDialog(),离开|CloseNpcDialog(),离开|CloseNpcDialog(),
 10136,1019,3,伍德,dynmic/hero/icon/10108,dynmic/mission/10108,0,,,,,,,60171,,,,穿越中部森林一定很辛苦吧。,你说什么，原来艾玛她不喜欢这样的书么，既然这样，我这本就送给你们吧。,那些异教徒竟然说什么“光影共生”，虽然好像也没什么不对的地方，但我可是为了晴空万里的好天气才来到阿卡斯的。,对话|_AcceptMission()|CloseNpcDialog()\n离开|CloseNpcDialog(),对话|_CommitMission(),离开|CloseNpcDialog(),
-10136,1020,3,伍德镇居民,dynmic/hero/icon/10105,dynmic/mission/10105,0,,,,,,,60176,,,,伍德镇是阿卡斯的农业中心，而东边的农场是阿卡斯最大的农场。,不过很少有人去到农场的东边，听说那里只有恐怖的森林和洞穴。,听说最近阿卡斯的魔兽突然多了起来，希望那些可怕的东西千万别来深林南边。,对话|_AcceptMission()|CloseNpcDialog()\n离开|CloseNpcDialog(),对话|_CommitMission(),离开|CloseNpcDialog(),
+10136,1020,3,伍德镇居民,dynmic/hero/icon/10215,dynmic/mission/10215,0,,,,,,,60176,,,,伍德镇是阿卡斯的农业中心，而东边的农场是阿卡斯最大的农场。,不过很少有人去到农场的东边，听说那里只有恐怖的森林和洞穴。,听说最近阿卡斯的魔兽突然多了起来，希望那些可怕的东西千万别来深林南边。,对话|_AcceptMission()|CloseNpcDialog()\n离开|CloseNpcDialog(),对话|_CommitMission(),离开|CloseNpcDialog(),
 10136,1021,1,兰,dynmic/hero/icon/10006,dynmic/mission/10006,0,,,,,,,,,,,那位姑娘，她可还好……,,曾经朝夕相处之人，一旦尽殁，怕是常人都无法接受这样的打击吧。,对话|_CommitMission()|CloseNpcDialog()|HideNpc()\n离开|CloseNpcDialog(),离开|CloseNpcDialog(),离开|CloseNpcDialog(),
 10136,1022,1,艾琳娜,dynmic/hero/icon/10004,dynmic/mission/10004,0,,,,,,,,,,,能够自由在外旅行的感觉真好。,,我从小就被父亲待在身边，但是比起司令的女儿，我更喜欢别人叫我艾琳娜。,对话|_CommitMission()|CloseNpcDialog()|HideNpc()\n离开|CloseNpcDialog(),离开|CloseNpcDialog(),离开|CloseNpcDialog(),
 10136,1023,1,伊莎贝尔,dynmic/hero/icon/10029,dynmic/mission/10029,0,,,,,,,,,,,对不起，这一路上给你们添麻烦了。,,我最喜欢阿卡斯的阳光了，可是现在的阳光明明也很耀眼，为什么我却感受不到从前那种温度了。,对话|_CommitMission()|CloseNpcDialog()|HideNpc()\n离开|CloseNpcDialog(),离开|CloseNpcDialog(),离开|CloseNpcDialog(),
 10136,1024,5,阿曼达,dynmic/hero/icon/10025,dynmic/mission/10025,0,10|11|12,shop,10|11|12,英雄|装备|其他,,,,0,0.999988425926,7200,如果没钱买东西，可以在大陆四处走走，说不定会有意外惊喜。,,,打开商店|ShowDialog($1，$2，$3)\n离开|CloseNpcDialog(),离开|CloseNpcDialog(),离开|CloseNpcDialog(),
-10140,1025,1,阿卡斯居民,dynmic/hero/icon/10105,dynmic/mission/10105,0,,,,,,,,,,,我听在骑士团的侄子说，好像有了下任圣女的消息，真是太好了，再也不能让那些异教徒猖狂了。,,,离开|CloseNpcDialog(),,,
+10140,1025,1,阿卡斯居民,dynmic/hero/icon/10213,dynmic/mission/10213,0,,,,,,,,,,,我听在骑士团的侄子说，好像有了下任圣女的消息，真是太好了，再也不能让那些异教徒猖狂了。,,,离开|CloseNpcDialog(),,,
 10140,1026,3,骑士团二营长,dynmic/hero/icon/10102,dynmic/mission/10102,0,,,,,,,60177,,,,天气真好，想要找个地方散步么？,圣光城的南面的山道比你们来时候的路好走得多，一路走下去可以看到阿卡斯河的河口，那边风景不错。,我也有一个想要和她一起散步的人，可惜直到她离开，也没能说出口。,对话|_AcceptMission()|CloseNpcDialog()\n离开|CloseNpcDialog(),对话|_CommitMission(),离开|CloseNpcDialog(),
 10140,1027,1,吉法利恩,dynmic/hero/icon/10028,dynmic/mission/10028,0,,,,,,,,,,,没有人能够决定自己应该担负什么责任，在阿卡斯，神权很重要，而受阿卡斯庇护的众民，更重要。,,,离开|CloseNpcDialog(),,,
 10140,1028,1,艾琳娜,dynmic/hero/icon/10004,dynmic/mission/10004,0,,,,,,,,,,,不要一直盯着本小姐看！,,这里的骑士一点都不痛快，总是遮遮掩掩的，倒是那位叫卡诺伊的是个直性子。,对话|_CommitMission()|CloseNpcDialog()|HideNpc()\n离开|CloseNpcDialog(),离开|CloseNpcDialog(),离开|CloseNpcDialog(),
diff --git a/res/question_content@questionnaire.csv b/res/question_content@questionnaire.csv
index 4281d3e..d210aa6 100644
--- a/res/question_content@questionnaire.csv
+++ b/res/question_content@questionnaire.csv
@@ -1,14 +1,14 @@
 content_id,type_id,question_id,question_type,question_text,option1,option2,option3,option4,option5,option6,option7,option8,option9,option10
-1,1,1,1,请问吸引您想继续进行《蔚蓝战纪》的主要原因是？【多选】,1|0|我喜欢放置类型的游戏,2|0|地图探索式的冒险与发现,3|0|喜欢这个游戏的世界观/题材,4|0|尝鲜，看到新游戏想体验一下,5|0|喜欢Q萌搞怪的二次元美术风格,6|1|其他,,,,,
-2,1,2,0,您测试期间每天有多少时间在玩《蔚蓝战纪》？,1|0|10分钟以内,2|0|10-20分钟,3|0|20-30分钟,4|0|30-60分钟,5|0|超过60分钟,,,,,,
-3,1,3,0,您对《蔚蓝战纪》剧情的总体满意度如何？,1|0|剧情很有趣,2|0|剧情一般,3|0|完全没意思,4|0|玩游戏从不看剧情,,,,,,,
+1,1,1,1,请问吸引您想继续进行《卡索战纪》的主要原因是？【多选】,1|0|我喜欢放置类型的游戏,2|0|地图探索式的冒险与发现,3|0|喜欢这个游戏的世界观/题材,4|0|尝鲜，看到新游戏想体验一下,5|0|喜欢Q萌搞怪的二次元美术风格,6|1|其他,,,,,
+2,1,2,0,您测试期间每天有多少时间在玩《卡索战纪》？,1|0|10分钟以内,2|0|10-20分钟,3|0|20-30分钟,4|0|30-60分钟,5|0|超过60分钟,,,,,,
+3,1,3,0,您对《卡索战纪》剧情的总体满意度如何？,1|0|剧情很有趣,2|0|剧情一般,3|0|完全没意思,4|0|玩游戏从不看剧情,,,,,,,
 4,1,4,0,游戏整体画风是否喜欢？,1|0|喜欢,2|0|一般,3|0|不喜欢,,,,,,,,
 5,1,5,0,角色的卡牌立绘是否吸引你？,1|0|角色很漂亮,2|0|画的一般,3|0|毫无吸引力,4|0|只关心强弱，不在意形象,,,,,,,
-6,1,6,0,您对《蔚蓝战纪》探索系统的满意度如何？,1|0|满意（9分以上）,2|0|比较满意（7-9分）,3|0|一般（5-7分）,4|0|不满意（5分以下）,,,,,,,
+6,1,6,0,您对《卡索战纪》探索系统的满意度如何？,1|0|满意（9分以上）,2|0|比较满意（7-9分）,3|0|一般（5-7分）,4|0|不满意（5分以下）,,,,,,,
 7,1,7,0,游戏内最让您惊喜的内容是？,1|0|小游戏,2|0|隐藏关卡,3|0|剧情,4|0|角色形象,5|0|武器变形,,,,,,
 8,1,8,0,经过一周的体验，您对本次测试的总体感受是？,1|0|非常有趣,2|0|一般,3|0|趣味性不大,,,,,,,,
 9,1,9,0,到目前为止，您对游戏运行流畅程度的感受是？,1|0|非常流畅，完全不卡,2|0|比较流畅，偶尔会卡,3|0|一般，有时候会卡,4|0|不太流畅，经常卡,5|0|很不流畅，非常卡,,,,,,
-10,1,10,0,您在玩《蔚蓝战纪》的过程中是否有清晰的目标？,1|0|目标很清晰,2|0|一般,3|0|目标模糊,4|0|不在乎游戏目标，享受休闲的乐趣,,,,,,,
+10,1,10,0,您在玩《卡索战纪》的过程中是否有清晰的目标？,1|0|目标很清晰,2|0|一般,3|0|目标模糊,4|0|不在乎游戏目标，享受休闲的乐趣,,,,,,,
 11,1,11,1,对于现在战斗的表现及打击反馈，您不满意的地方是？【多选】,1|0|受击时的动作,2|0|角色移动、攻击等动作的流畅性,3|0|技能特效,4|0|震屏和定帧效果,5|0|技能音效,6|0|战斗时长,,,,,
 12,1,12,0,您最期待的PVP战场玩法是？,1|0|抢点占领,2|0|夺旗玩法,3|0|守卫据点,4|1|其他,,,,,,,
 13,1,13,0,您觉得游戏内现有副本的难度如何？,1|0|太难了,2|0|正合适,3|0|太简单,,,,,,,,
@@ -22,5 +22,5 @@ content_id,type_id,question_id,question_type,question_text,option1,option2,optio
 21,1,21,1,您经常使用的公共社交平台有哪些？【多选】,1|0|抖音/头条,2|0|微博,3|0|贴吧,4|0|博客,5|0|微信公众号,6|0|Facebook,7|0|知乎,8|0|豆瓣,9|1|其他,,
 22,1,22,0,您日常使用的手机价格区间？,1|0|0-999元,2|0|1000-1499,3|0|1500-1999,4|0|2000-2999,5|0|3000-5000,6|0|5000以上,,,,,
 23,1,23,0,您对地图探索玩法的建议是？,1|2|,,,,,,,,,,
-24,1,24,0,您对《蔚蓝战纪》还有什么意见和建议，请告诉我们~,1|2|,,,,,,,,,,
+24,1,24,0,您对《卡索战纪》还有什么意见和建议，请告诉我们~,1|2|,,,,,,,,,,
 25,2,1,0,请简要说明您遇到的问题,1|2|,,,,,,,,,,
diff --git a/res/reward@reward.csv b/res/reward@reward.csv
index 9a6e6bf..91eb91e 100644
--- a/res/reward@reward.csv
+++ b/res/reward@reward.csv
@@ -10,8 +10,22 @@ reward_id,level_range,item_id,num,weight,type
 60008,1|100,50002|50001,100|100,100000|100000,1,
 60009,1|100,50002,1,100000,1,
 60010,1|100,50002|50001,1|1,100000|100000,1,
-60101,1|100,50002|50001|50006|50431|50432|50433,100|100|100|100|100|100,100000|100000|100000|100000|100000|100000,1,
-60168,1|100,59001,1,100000,1,
+60101,1|100,50001|50002|50006|50431|50432|50433,100000|100000|100|100|100|100,100000|100000|100000|100000|100000|100000,1,
+60102,1|100,50001|50002|50006|50431|50432|50433,200000|200000|200|200|200|200,100000|100000|100000|100000|100000|100000,1,
+60103,1|100,50001|50002|50006|50431|50432|50433,300000|300000|300|300|300|300,100000|100000|100000|100000|100000|100000,1,
+60104,1|100,50001|50002|50006|50431|50432|50433,400000|400000|400|400|400|400,100000|100000|100000|100000|100000|100000,1,
+60105,1|100,50001|50002|50006|50431|50432|50433,500000|500000|500|500|500|500,100000|100000|100000|100000|100000|100000,1,
+60106,1|100,50001|50002|50006|50431|50432|50433,600000|600000|600|600|600|600,100000|100000|100000|100000|100000|100000,1,
+60107,1|100,50001|50002|50006|50431|50432|50433,700000|700000|700|700|700|700,100000|100000|100000|100000|100000|100000,1,
+60108,1|100,50001|50002|50006|50431|50432|50433,800000|800000|800|800|800|800,100000|100000|100000|100000|100000|100000,1,
+60109,1|100,50001|50002|50006|50431|50432|50433,900000|900000|900|900|900|900,100000|100000|100000|100000|100000|100000,1,
+60110,1|100,50001|50002|50006|50431|50432|50433,1000000|1000000|1000|1000|1000|1000,100000|100000|100000|100000|100000|100000,1,
+60111,1|100,50001|50002|50006|50431|50432|50433,1100000|1100000|1100|1100|1100|1100,100000|100000|100000|100000|100000|100000,1,
+60112,1|100,50001|50002|50006|50431|50432|50433,1200000|1200000|1200|1200|1200|1200,100000|100000|100000|100000|100000|100000,1,
+60113,1|100,50001|50002|50006|50431|50432|50433,1300000|1300000|1300|1300|1300|1300,100000|100000|100000|100000|100000|100000,1,
+60114,1|100,50001|50002|50006|50431|50432|50433,1400000|1400000|1400|1400|1400|1400,100000|100000|100000|100000|100000|100000,1,
+60115,1|100,50001|50002|50006|50431|50432|50433,1500000|1500000|1500|1500|1500|1500,100000|100000|100000|100000|100000|100000,1,
+60116,1|100,50001|50002|50006|50431|50432|50433,1600000|1600000|1600|1600|1600|1600,100000|100000|100000|100000|100000|100000,1,
 60169,1|100,59002,1,100000,1,
 60170,1|100,59003,1,100000,1,
 60171,1|100,59004,1,100000,1,
diff --git a/res/shop_config@shop.csv b/res/shop_config@shop.csv
index cd22a32..660df64 100644
--- a/res/shop_config@shop.csv
+++ b/res/shop_config@shop.csv
@@ -1,24 +1,24 @@
 shop_id,shop_name,shop_type,item_cnt,refresh_time,refresh_cost,refresh_times
-1,英雄,1,30,86400,888,5,
-2,装备,1,30,86400,888,5,
-3,其他,1,30,86400,888,5,
-4,英雄,1,30,86400,888,5,
-5,装备,1,30,86400,888,5,
-6,其他,1,30,86400,888,5,
-7,英雄,1,30,86400,888,5,
-8,装备,1,30,86400,888,5,
-9,其他,1,30,86400,888,5,
-10,英雄,1,30,86400,888,5,
-11,装备,1,30,86400,888,5,
-12,其他,1,30,86400,888,5,
-13,英雄,1,30,86400,888,5,
-14,装备,1,30,86400,888,5,
-15,其他,1,30,86400,888,5,
-16,英雄,1,30,86400,888,5,
-17,装备,1,30,86400,888,5,
-18,其他,1,30,86400,888,5,
-10001,神翼商城,2,30,86400,888,5,
-10002,宝石商城,2,30,86400,888,5,
-10003,宠物商城,2,30,86400,888,5,
-10004,竞技商城,2,30,86400,888,5,
-10005,残卷商城,2,30,86400,888,5,
+1,英雄,1,30,86400,8888,5,
+2,装备,1,30,86400,8888,5,
+3,其他,1,30,86400,8888,5,
+4,英雄,1,30,86400,8888,5,
+5,装备,1,30,86400,8888,5,
+6,其他,1,30,86400,8888,5,
+7,英雄,1,30,86400,8888,5,
+8,装备,1,30,86400,8888,5,
+9,其他,1,30,86400,8888,5,
+10,英雄,1,30,86400,8888,5,
+11,装备,1,30,86400,8888,5,
+12,其他,1,30,86400,8888,5,
+13,英雄,1,30,86400,8888,5,
+14,装备,1,30,86400,8888,5,
+15,其他,1,30,86400,8888,5,
+16,英雄,1,30,86400,8888,5,
+17,装备,1,30,86400,8888,5,
+18,其他,1,30,86400,8888,5,
+10001,神翼,2,30,86400,8888,5,
+10002,宝石,2,30,86400,8888,5,
+10003,宠物,2,30,86400,8888,5,
+10004,竞技,2,30,86400,8888,5,
+10005,残卷,2,30,86400,8888,5,
diff --git a/res/shop_item@shop.csv b/res/shop_item@shop.csv
index e60c9a9..d7dabd1 100644
--- a/res/shop_item@shop.csv
+++ b/res/shop_item@shop.csv
@@ -1,74 +1,74 @@
 shop_id,goods_id,item_id,item_num,coin_type,price
-1,50001,50004,3,1,1,
-1,50002,50005,3,1,1,
-1,50003,50006,3,1,1,
-2,50004,50016,3,1,1,
-2,50005,50017,3,1,1,
-2,50006,50199,3,1,1,
-3,50007,50199,1,1,1,
-4,50008,50007,3,1,1,
-4,50009,50055,3,1,1,
-4,50010,50056,3,1,1,
-5,50011,50008,3,1,1,
-5,50012,50012,3,1,1,
-5,50013,50063,3,1,1,
-6,50014,52002,1,1,1,
-7,50015,50057,3,1,1,
-7,50016,50058,3,1,1,
-7,50017,50059,3,1,1,
-8,50018,50009,3,1,1,
-8,50019,50013,3,1,1,
-8,50020,50064,3,1,1,
-9,50021,50199,1,1,1,
-10,50022,50060,3,1,1,
-10,50023,50061,3,1,1,
-10,50024,50062,3,1,1,
-11,50025,50010,3,1,1,
-11,50026,50014,3,1,1,
-11,50027,50065,3,1,1,
-12,50028,50199,1,1,1,
-13,50029,50079,3,1,1,
-13,50030,50084,3,1,1,
-14,50031,50011,3,1,1,
-14,50032,50015,3,1,1,
-14,50033,50066,3,1,1,
-15,50034,50199,1,1,1,
-16,50035,50004,3,1,1,
-16,50036,50005,3,1,1,
-16,50037,50006,3,1,1,
-16,50038,50007,3,1,1,
-16,50039,50055,3,1,1,
-16,50040,50056,3,1,1,
-16,50041,50057,3,1,1,
-16,50042,50058,3,1,1,
-16,50043,50059,3,1,1,
-16,50044,50060,3,1,1,
-16,50045,50061,3,1,1,
-16,50046,50062,3,1,1,
-16,50047,50079,3,1,1,
-16,50048,50084,3,1,1,
-17,50049,50008,3,1,1,
-17,50050,50009,3,1,1,
-17,50051,50010,3,1,1,
-17,50052,50011,3,1,1,
-17,50053,50012,3,1,1,
-17,50054,50013,3,1,1,
-17,50055,50014,3,1,1,
-17,50056,50015,3,1,1,
-17,50057,50063,3,1,1,
-17,50058,50064,3,1,1,
-17,50059,50065,3,1,1,
-17,50060,50066,3,1,1,
-17,50061,50016,3,1,1,
-17,50062,50017,3,1,1,
-17,50999,50199,3,1,1,
-18,51001,50199,1,1,1,
-18,51002,50199,1,1,1,
-18,51003,50199,1,1,1,
-18,51004,50199,1,1,1,
-18,51005,50199,1,1,1,
-18,51006,50199,1,1,1,
-18,51007,50199,1,1,1,
+1,50001,50501,3,1,10000,
+1,50002,50502,3,1,10000,
+1,50003,50503,3,1,10000,
+2,50004,50431,3,1,10000,
+2,50005,50432,3,1,10000,
+2,50006,50433,3,1,10000,
+3,50007,50002,10000,1,10000,
+4,50008,50504,3,1,10000,
+4,50009,50505,3,1,10000,
+4,50010,50506,3,1,10000,
+5,50011,50431,3,1,10000,
+5,50012,50432,3,1,10000,
+5,50013,50433,3,1,10000,
+6,50014,52002,10000,1,10000,
+7,50015,50507,3,1,10000,
+7,50016,50508,3,1,10000,
+7,50017,50509,3,1,10000,
+8,50018,50431,3,1,10000,
+8,50019,50432,3,1,10000,
+8,50020,50433,3,1,10000,
+9,50021,52002,10000,1,10000,
+10,50022,50510,3,1,10000,
+10,50023,50511,3,1,10000,
+10,50024,50512,3,1,10000,
+11,50025,50431,3,1,10000,
+11,50026,50432,3,1,10000,
+11,50027,50433,3,1,10000,
+12,50028,52002,10000,1,10000,
+13,50029,50514,3,1,10000,
+13,50030,50515,3,1,10000,
+14,50031,50431,3,1,10000,
+14,50032,50432,3,1,10000,
+14,50033,50433,3,1,10000,
+15,50034,52002,10000,1,10000,
+16,50035,50503,3,1,10000,
+16,50036,50504,3,1,10000,
+16,50037,50505,3,1,10000,
+16,50038,50506,3,1,10000,
+16,50039,50507,3,1,10000,
+16,50040,50508,3,1,10000,
+16,50041,50509,3,1,10000,
+16,50042,50510,3,1,10000,
+16,50043,50511,3,1,10000,
+16,50044,50512,3,1,10000,
+16,50045,50514,3,1,10000,
+16,50046,50515,3,1,10000,
+16,50047,50517,3,1,10000,
+16,50048,50519,3,1,10000,
+17,50049,50431,3,1,10000,
+17,50050,50432,3,1,10000,
+17,50051,50433,3,1,10000,
+17,50052,50401,3,1,10000,
+17,50053,50402,3,1,10000,
+17,50054,50403,3,1,10000,
+17,50055,50404,3,1,10000,
+17,50056,50411,3,1,10000,
+17,50057,50412,3,1,10000,
+17,50058,50413,3,1,10000,
+17,50059,50414,3,1,10000,
+17,50060,50421,3,1,10000,
+17,50061,50422,3,1,10000,
+17,50062,50423,3,1,10000,
+17,50999,50424,3,1,10000,
+18,51001,52002,50000,1,10000,
+18,51002,50004,1,1,10000,
+18,51003,50004,2,1,15000,
+18,51004,50004,3,1,20000,
+18,51005,50004,4,1,25000,
+18,51006,50004,5,1,30000,
+18,51007,50004,6,1,35000,
 10001,51008,50251,1,3,111,
 10001,51009,50252,1,3,222,
 10001,51010,50253,1,3,333,
diff --git a/res/skill_active@skill_active.csv b/res/skill_active@skill_active.csv
index 8a594d7..4855866 100644
--- a/res/skill_active@skill_active.csv
+++ b/res/skill_active@skill_active.csv
@@ -4,7 +4,7 @@ skill_id,name,desc,skill_type,hero_instant,hero_move_type,skill_attack_type,skil
 20003,开天辟地,攻击单体目标，造成200%物理伤害，并提升前排友方20%物理防御,3,1,1,4,100000,1,200000,-100,1,1,5,1,0,skill2,,,,,,,,hit_1,skilleffect,,,,100000,9,30002,17,2,,,1,20,1|1|1|1|1,0,
 20011,普攻,攻击单体目标，造成100%法术伤害,1,1,0,3,100000,2,100000,30,1,1,1,0,0,attack,skill_1,attackeffect,,,,,,hit_1,skilleffect,,,,,,,,,,,1,5,0,0,
 20012,歌姬荣耀,攻击单体目标，造成150%法术伤害，并且几率混乱目标,2,1,0,2,30000,2,150000,30,1,1,1,0,0,skill1,hero_effect_10002,chongjibo,,,,,,hit_1,skilleffect,,,,50000,9,30003,,,,,1,5,1,0,
-20013,失堕的魔女,攻击随机单体目标，造成200%法术伤害，并且混乱目标2回合（混乱期间只能使用普攻，并且不分敌我攻击）,3,0,2,2,100000,2,200000,-100,1,1,3,0,1,skill2,hero_effect_10002,chongjibo,,,,,,hit_1,skilleffect,,,,50000,9,30004,,,,,1,20,1|2|3,0,
+20013,失落的魔女,攻击随机单体目标，造成200%法术伤害，并且混乱目标2回合（混乱期间只能使用普攻，并且不分敌我攻击）,3,0,2,2,100000,2,200000,-100,1,1,3,0,1,skill2,hero_effect_10002,chongjibo,,,,,,hit_1,skilleffect,,,,50000,9,30004,,,,,1,20,1|2|3,0,
 20021,普攻,给己方血量最低的目标10%的生命值,1,0,0,5,100000,4,10000,30,19,1,1,0,0,attack,buff_jiaxue,buff_jiaxue,,,,,,,,,,,,,,,,,,1,5,0,0,
 20022,晨曦,复活一名以死亡的角色，每场战斗只能使用1次,2,0,3,6,30000,6,20000,30,25,1,1,0,0,skill1,,,,,,,,,,,,,,,,,,1,1,1,5,0,0,
 20023,圣母咏叹,给己方血量最低的目标恢复15%生命值，并获得持续3回合每回合恢复5%的生命值,3,0,0,5,100000,4,15000,-100,19,1,1,0,0,skill2,buff_jiaxue,buff_jiaxue,,,,,,,,,,,100000,9,30005,19,1,,,1,20,0,0,
@@ -19,10 +19,10 @@ skill_id,name,desc,skill_type,hero_instant,hero_move_type,skill_attack_type,skil
 20053,兰大技能,大招,3,0,4,41,100000,4,200000,-100,16,4,1,0,0,skill2,hero_10006,skill2_2,hero_effect_10006,skill2,,,,hit_1,skilleffect,,,,,,,,,,,1,20,1,0,
 20061,普攻,攻击单体目标，造成100%法术伤害,1,1,0,3,100000,2,100000,30,1,1,1,0,0,attack,hero_effect_10007,attack,,,,,,hit_1,skilleffect,,,,,,,,,,,1,5,0,0,
 20062,天降落星,攻击前排所有目标，造成100%法术伤害，并点燃目标,2,1,0,39,30000,2,100000,30,6,2,4,0,0,skill1,hero_effect_10007,skill1,,,,,,hit_1,skilleffect,,,,100000,9,30013,,,,,1,5,1,0,
-20063,哈雷克火葬,攻击前排所有目标，造成130%法术伤害，如果目标被点燃，则额外造成20%法术伤害,3,1,0,40,100000,2,130000,-100,6,2,1,0,0,skill2,,,hero_effect_10007,skill2,hero_effect_10007,skill2_2,,hit_1,skilleffect,,1,,100000,2,20000,,,,,1,20,1,2,
+20063,哈雷克火焰,攻击前排所有目标，造成130%法术伤害，如果目标被点燃，则额外造成20%法术伤害,3,1,0,40,100000,2,130000,-100,6,2,1,0,0,skill2,,,hero_effect_10007,skill2,hero_effect_10007,skill2_2,,hit_1,skilleffect,,1,,100000,2,20000,,,,,1,20,1,2,
 20071,普攻,攻击单体目标，造成100%物理伤害,1,1,1,1,100000,1,100000,30,1,1,1,0,0,attack,skill_1,attackeffect,,,,,,hit_1,skilleffect,,,,,,,,,,,1,5,0,0,
 20072,冲刺击,攻击单体目标，造成150%物理伤害，本次暴击则再攻击一次,2,1,4,28,30000,1,150000,30,1,1,2,0,0,skill1,hero_effect_10008,skill1,,,,,,hit_1,skilleffect,,2,,100000,1,100000,,,,,1,5,1,1,
-20073,断罪者,攻击单体目标，造成200%物理伤害，如果敌方血量低于50%，暴击率提升30%,3,1,1,29,100000,1,200000,-100,1,1,6,1,0,skill2,hero_effect_10008,skill2,,,,,,hit_1,skilleffect,,3,50000,100000,9,30009,,,,,1,20,1,0,
+20073,断罚者,攻击单体目标，造成200%物理伤害，如果敌方血量低于50%，暴击率提升30%,3,1,1,29,100000,1,200000,-100,1,1,6,1,0,skill2,hero_effect_10008,skill2,,,,,,hit_1,skilleffect,,3,50000,100000,9,30009,,,,,1,20,1,0,
 20081,普攻,普攻,1,1,1,3,100000,1,100000,30,1,1,1,0,0,attack,skill_1,attackeffect,,,,,,hit_1,skilleffect,,,,,,,,,,,1,5,0,0,
 20082,艾莉丝小技能,小技能,2,1,1,3,30000,1,100000,30,4,2,1,0,0,skill1,skill_1,attackeffect,,,,,,hit_1,skilleffect,,,,,,,,,,,1,5,1,0,
 20083,艾莉丝大技能,大招,3,1,1,3,100000,1,200000,-100,4,2,1,0,0,skill2,skill_1,attackeffect,,,,,,hit_1,skilleffect,,,,100000,12,10000,,,,,1,20,1,0,
@@ -145,9 +145,9 @@ skill_id,name,desc,skill_type,hero_instant,hero_move_type,skill_attack_type,skil
 20921,普攻,攻击单体目标，造成100%法术伤害,1,0,0,22,100000,2,100000,30,1,1,1,0,0,attack,hero_effect_10112,sdq,,,,,,hit_1,skilleffect,,,,,,,,,,,1,5,0,0,
 20922,精灵祭司小技能,攻击物攻最高的单体，造成150%物理伤害,2,0,0,27,30000,2,150000,30,9,1,3,0,0,skill1,hero_effect_10112,sdq,,,,,,hit_1,skilleffect,,,,,,,,,,,1,5,1,0,
 20800,歌姬荣耀,攻击单体目标，造成150%法术伤害，并且几率混乱目标,2,1,0,2,100000,2,150000,100,1,1,1,0,0,skill1,hero_effect_10002,chongjibo,,,,,,hit_1,skilleffect,,,,50000,9,30003,,,,,1,5,1,0,
-20801,失堕的魔女,攻击随机单体目标，造成200%法术伤害，并且混乱目标2回合（混乱期间只能使用普攻，并且不分敌我攻击）,3,0,2,2,100000,2,200000,-100,1,1,3,0,1,skill2,hero_effect_10002,chongjibo,,,,,,hit_1,skilleffect,,,,50000,9,30004,,,,,1,20,1|2|3,0,
+20801,失落的魔女,攻击随机单体目标，造成200%法术伤害，并且混乱目标2回合（混乱期间只能使用普攻，并且不分敌我攻击）,3,0,2,2,100000,2,200000,-100,1,1,3,0,1,skill2,hero_effect_10002,chongjibo,,,,,,hit_1,skilleffect,,,,50000,9,30004,,,,,1,20,1|2|3,0,
 20802,天降落星,攻击前排所有目标，造成100%法术伤害，并点燃目标,2,1,0,39,100000,2,100000,100,6,2,4,0,0,skill1,hero_effect_10007,skill1,,,,,,hit_1,skilleffect,,,,100000,9,30013,,,,,1,5,1,0,
-20803,哈雷克火葬,攻击前排所有目标，造成130%法术伤害，如果目标被点燃，则额外造成20%法术伤害,3,1,0,40,100000,2,130000,-100,6,2,1,0,0,skill2,,,hero_effect_10007,skill2,hero_effect_10007,skill2_2,,hit_1,skilleffect,,1,,100000,2,20000,,,,,1,20,1,2,
+20803,哈雷克火焰,攻击前排所有目标，造成130%法术伤害，如果目标被点燃，则额外造成20%法术伤害,3,1,0,40,100000,2,130000,-100,6,2,1,0,0,skill2,,,hero_effect_10007,skill2,hero_effect_10007,skill2_2,,hit_1,skilleffect,,1,,100000,2,20000,,,,,1,20,1,2,
 20804,寄生之爪,攻击血量最少的单位，并造成150%点物理伤害,2,1,1,1,100000,1,150000,100,8,1,3,0,0,skill1,,,hero_effect_10010,skill1,,,,hit_1,skilleffect,,,,,,,,,,,1,5,1,0,
 20805,裂地击,攻击血量最少的单位，并造成200%点物理伤害，如果敌方血量低于20%，物理伤害增加20%,3,1,0,33,100000,1,200000,-100,8,1,5,0,0,skill2,hero_effect_10010,skill2_2,hero_effect_10010,skill2,hero_10010,skill2_1,,hit_1,skilleffect,,3,20000,100000,1,20000,,,,,1,20,1,0,
 20806,圣母之柩,复活一名以死亡的角色，每场战斗只能使用1次,2,0,2,35,100000,6,20000,100,25,1,1,0,0,skill1,,,hero_effect_10025,skill1,,,,hit_1,skilleffect,,,,,,,,,1,1,0,5,0,0,
@@ -155,7 +155,7 @@ skill_id,name,desc,skill_type,hero_instant,hero_move_type,skill_attack_type,skil
 20808,阴阳连击,攻击单体目标，造成150%物理伤害，并提升自己10%物理防御,2,1,1,4,100000,1,150000,100,1,1,2,0,0,skill1,,,,,,,,hit_1,skilleffect,,,,100000,9,30001,12,1,,,1,5,1|2,0,
 20809,开天辟地,攻击单体目标，造成200%物理伤害，并提升前排友方20%物理防御,3,1,1,4,100000,1,200000,-100,1,1,5,1,0,skill2,,,,,,,,hit_1,skilleffect,,,,100000,9,30002,17,2,,,1,20,1|1|1|1|1,0,
 20810,冲刺击,攻击单体目标，造成150%物理伤害，本次暴击则再攻击一次,2,1,4,28,100000,1,150000,100,1,1,2,0,0,skill1,hero_effect_10008,skill1,,,,,,hit_1,skilleffect,,2,,100000,1,100000,,,,,1,5,1,1,
-20811,断罪者,攻击单体目标，造成200%物理伤害，如果敌方血量低于50%，暴击率提升30%,3,1,1,29,100000,1,200000,-100,1,1,6,1,0,skill2,hero_effect_10008,skill2,,,,,,hit_1,skilleffect,,3,50000,100000,9,30009,,,,,1,20,1,0,
+20811,断罚者,攻击单体目标，造成200%物理伤害，如果敌方血量低于50%，暴击率提升30%,3,1,1,29,100000,1,200000,-100,1,1,6,1,0,skill2,hero_effect_10008,skill2,,,,,,hit_1,skilleffect,,3,50000,100000,9,30009,,,,,1,20,1,0,
 20812,二连矢,攻击后排目标，造成100%物理伤害,2,0,2,7,100000,1,100000,100,7,2,1,0,0,skill1,hero_effect_10011,skill1,,,hero_effect_10011,skill1hit,,hit_1,skilleffect,,,,,,,,,,,1,5,2,0,
 20813,闪耀的星之光,攻击全体目标，造成80%物理伤害,3,0,0,8,100000,1,80000,-100,5,4,5,0,0,skill2,hero_effect_10011,skill2,,,,,,hit_1,skilleffect,,,,,,,,,,,1,20,3,0,
 20814,金小技能,小技能,2,1,0,43,100000,1,100000,100,3,1,1,0,0,skill1,,,,,,,,hit_1,skilleffect,,,,,,,,,,,1,5,0,0,
diff --git a/res/vip@vip.csv b/res/vip@vip.csv
index 8afcd4c..748547a 100644
--- a/res/vip@vip.csv
+++ b/res/vip@vip.csv
@@ -1,17 +1,17 @@
 level,max_value,reward_id,desc
 0,0,60101,1.泰斯特\n1.拉黑宋浩,
-1,60,60101,1.泰斯特\n2.拉黑宋浩,
-2,300,60101,1.泰斯特\n3.拉黑宋浩,
-3,1000,60101,1.泰斯特\n4.拉黑宋浩,
-4,2000,60101,1.泰斯特\n5.拉黑宋浩,
-5,5000,60101,1.泰斯特\n6.拉黑宋浩,
-6,10000,60101,1.泰斯特\n7.拉黑宋浩,
-7,20000,60101,1.泰斯特\n8.拉黑宋浩,
-8,50000,60101,1.泰斯特\n9.拉黑宋浩,
-9,100000,60101,1.泰斯特\n10.拉黑宋浩,
-10,200000,60101,1.泰斯特\n11.拉黑宋浩,
-11,500000,60101,1.泰斯特\n12.拉黑宋浩,
-12,1000000,60101,1.泰斯特\n13.拉黑宋浩,
-13,2000000,60101,1.泰斯特\n14.拉黑宋浩,
-14,5000000,60101,1.泰斯特\n15.拉黑宋浩,
-15,10000000,60101,1.泰斯特\n16.拉黑宋浩,
+1,60,60102,1.泰斯特\n2.拉黑宋浩,
+2,300,60103,1.泰斯特\n3.拉黑宋浩,
+3,1000,60104,1.泰斯特\n4.拉黑宋浩,
+4,2000,60105,1.泰斯特\n5.拉黑宋浩,
+5,5000,60106,1.泰斯特\n6.拉黑宋浩,
+6,10000,60107,1.泰斯特\n7.拉黑宋浩,
+7,20000,60108,1.泰斯特\n8.拉黑宋浩,
+8,50000,60109,1.泰斯特\n9.拉黑宋浩,
+9,100000,60110,1.泰斯特\n10.拉黑宋浩,
+10,200000,60111,1.泰斯特\n11.拉黑宋浩,
+11,500000,60112,1.泰斯特\n12.拉黑宋浩,
+12,1000000,60113,1.泰斯特\n13.拉黑宋浩,
+13,2000000,60114,1.泰斯特\n14.拉黑宋浩,
+14,5000000,60115,1.泰斯特\n15.拉黑宋浩,
+15,10000000,60116,1.泰斯特\n16.拉黑宋浩,
diff --git a/res/vip_function@vip.csv b/res/vip_function@vip.csv
index f60698d..8f31fbc 100644
--- a/res/vip_function@vip.csv
+++ b/res/vip_function@vip.csv
@@ -1,48 +1,48 @@
 id,des,type,level,param1,param2
 1,势力捐献,1,1,10,,
-2,势力捐献,1,2,10,,
-3,势力捐献,1,3,10,,
-4,势力捐献,1,4,10,,
-5,势力捐献,1,5,10,,
-6,势力捐献,1,6,10,,
-7,势力捐献,1,7,10,,
-8,势力捐献,1,8,10,,
-9,势力捐献,1,9,10,,
-10,势力捐献,1,10,10,,
-11,势力捐献,1,11,10,,
-12,势力捐献,1,12,10,,
-13,势力捐献,1,13,10,,
-14,势力捐献,1,14,10,,
-15,势力捐献,1,15,10,,
-16,挂机金币收益加成,2,1,150000,,
-17,挂机金币收益加成,2,2,150000,,
-18,挂机金币收益加成,2,3,150000,,
-19,挂机金币收益加成,2,4,150000,,
-20,挂机金币收益加成,2,5,150000,,
-21,挂机金币收益加成,2,6,150000,,
-22,挂机金币收益加成,2,7,150000,,
-23,挂机金币收益加成,2,8,150000,,
-24,挂机金币收益加成,2,9,150000,,
-25,挂机金币收益加成,2,10,150000,,
-26,挂机金币收益加成,2,11,150000,,
-27,挂机金币收益加成,2,12,150000,,
-28,挂机金币收益加成,2,13,150000,,
-29,挂机金币收益加成,2,14,150000,,
+2,势力捐献,1,2,20,,
+3,势力捐献,1,3,30,,
+4,势力捐献,1,4,40,,
+5,势力捐献,1,5,50,,
+6,势力捐献,1,6,60,,
+7,势力捐献,1,7,70,,
+8,势力捐献,1,8,80,,
+9,势力捐献,1,9,90,,
+10,势力捐献,1,10,100,,
+11,势力捐献,1,11,110,,
+12,势力捐献,1,12,120,,
+13,势力捐献,1,13,130,,
+14,势力捐献,1,14,140,,
+15,势力捐献,1,15,150,,
+16,挂机金币收益加成,2,1,10000,,
+17,挂机金币收益加成,2,2,20000,,
+18,挂机金币收益加成,2,3,30000,,
+19,挂机金币收益加成,2,4,40000,,
+20,挂机金币收益加成,2,5,50000,,
+21,挂机金币收益加成,2,6,60000,,
+22,挂机金币收益加成,2,7,70000,,
+23,挂机金币收益加成,2,8,80000,,
+24,挂机金币收益加成,2,9,90000,,
+25,挂机金币收益加成,2,10,100000,,
+26,挂机金币收益加成,2,11,110000,,
+27,挂机金币收益加成,2,12,120000,,
+28,挂机金币收益加成,2,13,130000,,
+29,挂机金币收益加成,2,14,140000,,
 30,挂机金币收益加成,2,15,150000,,
-31,挂机经验收益加成,3,1,150000,,
-32,挂机经验收益加成,3,2,150000,,
-33,挂机经验收益加成,3,3,150000,,
-34,挂机经验收益加成,3,4,150000,,
-35,挂机经验收益加成,3,5,150000,,
-36,挂机经验收益加成,3,6,150000,,
-37,挂机经验收益加成,3,7,150000,,
-38,挂机经验收益加成,3,8,150000,,
-39,挂机经验收益加成,3,9,150000,,
-40,挂机经验收益加成,3,10,150000,,
-41,挂机经验收益加成,3,11,150000,,
-42,挂机经验收益加成,3,12,150000,,
-43,挂机经验收益加成,3,13,150000,,
-44,挂机经验收益加成,3,14,150000,,
+31,挂机经验收益加成,3,1,10000,,
+32,挂机经验收益加成,3,2,20000,,
+33,挂机经验收益加成,3,3,30000,,
+34,挂机经验收益加成,3,4,40000,,
+35,挂机经验收益加成,3,5,50000,,
+36,挂机经验收益加成,3,6,60000,,
+37,挂机经验收益加成,3,7,70000,,
+38,挂机经验收益加成,3,8,80000,,
+39,挂机经验收益加成,3,9,90000,,
+40,挂机经验收益加成,3,10,100000,,
+41,挂机经验收益加成,3,11,110000,,
+42,挂机经验收益加成,3,12,120000,,
+43,挂机经验收益加成,3,13,130000,,
+44,挂机经验收益加成,3,14,140000,,
 45,挂机经验收益加成,3,15,150000,,
 46,购买竞技场挑战,4,4,1,,
 47,购买竞技场挑战,4,5,2,,
@@ -96,20 +96,20 @@ id,des,type,level,param1,param2
 95,宝石强化一键,10,13,,,
 96,宝石强化一键,10,14,,,
 97,宝石强化一键,10,15,,,
-98,背包格增加,11,1,15,,
-99,背包格增加,11,2,15,,
-100,背包格增加,11,3,15,,
-101,背包格增加,11,4,15,,
-102,背包格增加,11,5,15,,
-103,背包格增加,11,6,15,,
-104,背包格增加,11,7,15,,
-105,背包格增加,11,8,15,,
-106,背包格增加,11,9,15,,
-107,背包格增加,11,10,15,,
-108,背包格增加,11,11,15,,
-109,背包格增加,11,12,15,,
-110,背包格增加,11,13,15,,
-111,背包格增加,11,14,15,,
+98,背包格增加,11,1,1,,
+99,背包格增加,11,2,2,,
+100,背包格增加,11,3,3,,
+101,背包格增加,11,4,4,,
+102,背包格增加,11,5,5,,
+103,背包格增加,11,6,6,,
+104,背包格增加,11,7,7,,
+105,背包格增加,11,8,8,,
+106,背包格增加,11,9,9,,
+107,背包格增加,11,10,10,,
+108,背包格增加,11,11,11,,
+109,背包格增加,11,12,12,,
+110,背包格增加,11,13,13,,
+111,背包格增加,11,14,14,,
 112,背包格增加,11,15,15,,
 113,精英副本购买权限,12,5,1,,
 114,精英副本购买权限,12,6,2,,
@@ -156,29 +156,29 @@ id,des,type,level,param1,param2
 155,战斗加速,17,13,,,
 156,战斗加速,17,14,,,
 157,战斗加速,17,15,,,
-158,放置金币收益加成,18,3,150000,,
-159,放置金币收益加成,18,4,150000,,
-160,放置金币收益加成,18,5,150000,,
-161,放置金币收益加成,18,6,150000,,
-162,放置金币收益加成,18,7,150000,,
-163,放置金币收益加成,18,8,150000,,
-164,放置金币收益加成,18,9,150000,,
-165,放置金币收益加成,18,10,150000,,
-166,放置金币收益加成,18,11,150000,,
-167,放置金币收益加成,18,12,150000,,
-168,放置金币收益加成,18,13,150000,,
-169,放置金币收益加成,18,14,150000,,
+158,放置金币收益加成,18,3,50000,,
+159,放置金币收益加成,18,4,50000,,
+160,放置金币收益加成,18,5,50000,,
+161,放置金币收益加成,18,6,60000,,
+162,放置金币收益加成,18,7,70000,,
+163,放置金币收益加成,18,8,80000,,
+164,放置金币收益加成,18,9,90000,,
+165,放置金币收益加成,18,10,100000,,
+166,放置金币收益加成,18,11,110000,,
+167,放置金币收益加成,18,12,120000,,
+168,放置金币收益加成,18,13,130000,,
+169,放置金币收益加成,18,14,140000,,
 170,放置金币收益加成,18,15,150000,,
-171,放置金币收益加成,19,3,150000,,
-172,放置金币收益加成,19,4,150000,,
-173,放置经验收益加成,19,5,150000,,
-174,放置经验收益加成,19,6,150000,,
-175,放置经验收益加成,19,7,150000,,
-176,放置经验收益加成,19,8,150000,,
-177,放置经验收益加成,19,9,150000,,
-178,放置经验收益加成,19,10,150000,,
-179,放置经验收益加成,19,11,150000,,
-180,放置经验收益加成,19,12,150000,,
-181,放置经验收益加成,19,13,150000,,
-182,放置经验收益加成,19,14,150000,,
+171,放置金币收益加成,19,3,50000,,
+172,放置金币收益加成,19,4,50000,,
+173,放置经验收益加成,19,5,50000,,
+174,放置经验收益加成,19,6,60000,,
+175,放置经验收益加成,19,7,70000,,
+176,放置经验收益加成,19,8,80000,,
+177,放置经验收益加成,19,9,90000,,
+178,放置经验收益加成,19,10,100000,,
+179,放置经验收益加成,19,11,110000,,
+180,放置经验收益加成,19,12,120000,,
+181,放置经验收益加成,19,13,130000,,
+182,放置经验收益加成,19,14,140000,,
 183,放置经验收益加成,19,15,150000,,