配置更新。

GameConfig/CFG.check

@@ -1,5 +1,5 @@
 D:\git\newWork\Config\GameConfig\M_game_battle_field.xls:1511108716
-D:\git\newWork\Config\GameConfig\M_monster.xls:1846396672
+D:\git\newWork\Config\GameConfig\M_monster.xls:-1235680395
 D:\git\newWork\Config\GameConfig\M_i18n.xls:1797769440
 D:\git\newWork\Config\GameConfig\M_un_lock_battle.xls:84348074
 D:\git\newWork\Config\GameConfig\M_everyday_task.xls:949185213
@@ -9,9 +9,9 @@ D:\git\newWork\Config\GameConfig\M_game_level_config.xls:603799117
 D:\git\newWork\Config\GameConfig\M_magic_array_config.xls:-124973679
 D:\git\newWork\Config\GameConfig\M_shop.xls:-598498963
 D:\git\newWork\Config\GameConfig\M_item.xls:129860324
-D:\git\newWork\Config\GameConfig\M_fish_scheme.xls:-1309863969
+D:\git\newWork\Config\GameConfig\M_fish_scheme.xls:435403286
 D:\git\newWork\Config\GameConfig\M_Global_Config.xls:-532862181
-D:\git\newWork\Config\GameConfig\M_hero.xls:-988740727
+D:\git\newWork\Config\GameConfig\M_hero.xls:-182339952
 D:\git\newWork\Config\GameConfig\SensitiveWordCFG.xls:-583314849
-D:\git\newWork\Config\GameConfig\M_skill.xls:-399805309
+D:\git\newWork\Config\GameConfig\M_skill.xls:228843983
 D:\git\newWork\Config\GameConfig\M_test.xls:444037689

GameConfig/Code/Client/M_fish_scheme.cpp

@@ -51,6 +51,19 @@ void M_fish_scheme::Load()
 		data.mmonster_id = element->IntAttribute("monster_id");
 		data.mfish_group = element->IntAttribute("fish_group");
 		data.mnum = element->IntAttribute("num");
+		{
+			const char* kill_count = element->Attribute("kill_count");
+			std::vector<std::string> veckill_count;
+			boost::split(veckill_count, kill_count, boost::is_any_of(","));
+			int temp;
+			for (unsigned int i = 0; i < veckill_count.size(); i++)
+			{
+				if (tinyxml2::XMLUtil::ToInt(veckill_count[i].c_str(), &temp))
+				{
+					data.mkill_count.push_back(temp);
+				}
+			}
+		}
 		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
 		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
 		mMapData.insert(std::make_pair(data.mID, data));
@@ -77,6 +90,7 @@ void M_fish_scheme::LoadLua()
 		LuaCfgHelper::readInt(L, "monster_id", data.mmonster_id);
 		LuaCfgHelper::readInt(L, "fish_group", data.mfish_group);
 		LuaCfgHelper::readInt(L, "num", data.mnum);
+		LuaCfgHelper::readVectorInt(L, "kill_count", data.mkill_count);
 		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
 		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
 		mMapData.insert(std::make_pair(data.mID, data));

GameConfig/Code/Client/M_fish_scheme.h

@@ -10,6 +10,8 @@ struct M_fish_schemeData
 	int mfish_group;
 	//ÊýÁ¿
 	int mnum;
+	//»÷ɱ´ÎÊý
+	std::vector<int> mkill_count;
 };
 
 class M_fish_scheme

GameConfig/Code/Server/M_fish_scheme.cpp

@@ -73,6 +73,19 @@ void M_fish_scheme::Load(const std::string& path)
 		data.mmonster_id = element->IntAttribute("monster_id");
 		data.mfish_group = element->IntAttribute("fish_group");
 		data.mnum = element->IntAttribute("num");
+		{
+			const char* kill_count = element->Attribute("kill_count");
+			std::vector<std::string> veckill_count;
+			boost::split(veckill_count, kill_count, boost::is_any_of(","));
+			int temp;
+			for (unsigned int i = 0; i < veckill_count.size(); i++)
+			{
+				if (tinyxml2::XMLUtil::ToInt(veckill_count[i].c_str(), &temp))
+				{
+					data.mkill_count.push_back(temp);
+				}
+			}
+		}
 		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
 		assert(mMapData.find(data.mID) == mMapData.end());
 		mMapData.insert(std::make_pair(data.mID, data));

GameConfig/Code/Server/M_fish_scheme.h

@@ -11,6 +11,8 @@ struct M_fish_schemeData
 	int mfish_group;
 	//ÊýÁ¿
 	int mnum;
+	//»÷ɱ´ÎÊý
+	std::vector<int> mkill_count;
 };
 
 class M_fish_scheme

GameConfig/Lua/M_fish_scheme.lua

@@ -9,22 +9,22 @@ end
 
 function M_fish_scheme:init()
 	self.datas = {}
-	self.datas[1001] = {ID = 1001, monster_id = 1001, fish_group = 1, num = 200}
-	self.datas[1002] = {ID = 1002, monster_id = 1002, fish_group = 1, num = 10}
-	self.datas[1003] = {ID = 1003, monster_id = 1001, fish_group = 2, num = 200}
-	self.datas[1004] = {ID = 1004, monster_id = 1002, fish_group = 2, num = 10}
-	self.datas[1005] = {ID = 1005, monster_id = 1001, fish_group = 3, num = 200}
-	self.datas[1006] = {ID = 1006, monster_id = 1002, fish_group = 3, num = 10}
-	self.datas[1007] = {ID = 1007, monster_id = 1001, fish_group = 4, num = 200}
-	self.datas[1008] = {ID = 1008, monster_id = 1002, fish_group = 4, num = 10}
-	self.datas[1009] = {ID = 1009, monster_id = 1001, fish_group = 5, num = 200}
-	self.datas[1010] = {ID = 1010, monster_id = 1002, fish_group = 5, num = 10}
-	self.datas[1011] = {ID = 1011, monster_id = 1001, fish_group = 6, num = 200}
-	self.datas[1012] = {ID = 1012, monster_id = 1002, fish_group = 6, num = 10}
-	self.datas[1013] = {ID = 1013, monster_id = 1001, fish_group = 7, num = 200}
-	self.datas[1014] = {ID = 1014, monster_id = 1002, fish_group = 7, num = 10}
-	self.datas[1015] = {ID = 1015, monster_id = 1001, fish_group = 8, num = 200}
-	self.datas[1016] = {ID = 1016, monster_id = 1002, fish_group = 8, num = 10}
+	self.datas[1001] = {ID = 1001, monster_id = 1001, fish_group = 1, num = 200, kill_count = {1,1}}
+	self.datas[1002] = {ID = 1002, monster_id = 1002, fish_group = 1, num = 10, kill_count = {2,3}}
+	self.datas[1003] = {ID = 1003, monster_id = 1001, fish_group = 2, num = 200, kill_count = {1,1}}
+	self.datas[1004] = {ID = 1004, monster_id = 1002, fish_group = 2, num = 10, kill_count = {2,3}}
+	self.datas[1005] = {ID = 1005, monster_id = 1001, fish_group = 3, num = 200, kill_count = {1,1}}
+	self.datas[1006] = {ID = 1006, monster_id = 1002, fish_group = 3, num = 10, kill_count = {2,3}}
+	self.datas[1007] = {ID = 1007, monster_id = 1001, fish_group = 4, num = 200, kill_count = {1,1}}
+	self.datas[1008] = {ID = 1008, monster_id = 1002, fish_group = 4, num = 10, kill_count = {2,3}}
+	self.datas[1009] = {ID = 1009, monster_id = 1001, fish_group = 5, num = 200, kill_count = {1,1}}
+	self.datas[1010] = {ID = 1010, monster_id = 1002, fish_group = 5, num = 10, kill_count = {2,3}}
+	self.datas[1011] = {ID = 1011, monster_id = 1001, fish_group = 6, num = 200, kill_count = {1,1}}
+	self.datas[1012] = {ID = 1012, monster_id = 1002, fish_group = 6, num = 10, kill_count = {2,3}}
+	self.datas[1013] = {ID = 1013, monster_id = 1001, fish_group = 7, num = 200, kill_count = {1,1}}
+	self.datas[1014] = {ID = 1014, monster_id = 1002, fish_group = 7, num = 10, kill_count = {2,3}}
+	self.datas[1015] = {ID = 1015, monster_id = 1001, fish_group = 8, num = 200, kill_count = {1,1}}
+	self.datas[1016] = {ID = 1016, monster_id = 1002, fish_group = 8, num = 10, kill_count = {2,3}}
 end
 
 M_fish_scheme:init()

GameConfig/Lua/M_hero.lua

@@ -9,18 +9,8 @@ end
 
 function M_hero:init()
 	self.datas = {}
-	self.datas[1001] = {ID = 1001, name = "狂屠", grade_type = 1, default_have = 1, skill_id = 1001, attribute = 1, atk = 15, icon = "", aspect = "hero1001", speed = 1, zoom_factor = 1}
-	self.datas[1002] = {ID = 1002, name = "圣天使", grade_type = 1, default_have = 1, skill_id = 1001, attribute = 2, atk = 15, icon = "", aspect = "hero1001", speed = 1, zoom_factor = 1}
-	self.datas[1003] = {ID = 1003, name = "英雄3", grade_type = 1, default_have = 1, skill_id = 1001, attribute = 3, atk = 15, icon = "", aspect = "hero1001", speed = 1, zoom_factor = 1}
-	self.datas[1004] = {ID = 1004, name = "英雄4", grade_type = 1, default_have = 1, skill_id = 1001, attribute = 4, atk = 15, icon = "", aspect = "hero1001", speed = 1, zoom_factor = 1}
-	self.datas[1005] = {ID = 1005, name = "英雄5", grade_type = 1, default_have = 1, skill_id = 1001, attribute = 1, atk = 15, icon = "", aspect = "hero1001", speed = 1, zoom_factor = 1}
-	self.datas[1006] = {ID = 1006, name = "英雄6", grade_type = 1, default_have = 1, skill_id = 1001, attribute = 2, atk = 15, icon = "", aspect = "hero1001", speed = 1, zoom_factor = 1}
-	self.datas[1007] = {ID = 1007, name = "英雄7", grade_type = 1, default_have = 1, skill_id = 1001, attribute = 3, atk = 15, icon = "", aspect = "hero1001", speed = 1, zoom_factor = 1}
-	self.datas[1008] = {ID = 1008, name = "英雄8", grade_type = 1, default_have = 1, skill_id = 1001, attribute = 4, atk = 15, icon = "", aspect = "hero1001", speed = 1, zoom_factor = 1}
-	self.datas[1009] = {ID = 1009, name = "传说英雄1", grade_type = 2, default_have = 0, skill_id = 1001, attribute = 1, atk = 20, icon = "", aspect = "hero1001", speed = 1, zoom_factor = 1}
-	self.datas[1010] = {ID = 1010, name = "传说英雄2", grade_type = 2, default_have = 0, skill_id = 1001, attribute = 2, atk = 20, icon = "", aspect = "hero1001", speed = 1, zoom_factor = 1}
-	self.datas[1011] = {ID = 1011, name = "传说英雄3", grade_type = 2, default_have = 0, skill_id = 1001, attribute = 3, atk = 20, icon = "", aspect = "hero1001", speed = 1, zoom_factor = 1}
-	self.datas[1012] = {ID = 1012, name = "传说英雄4", grade_type = 2, default_have = 0, skill_id = 1001, attribute = 4, atk = 20, icon = "", aspect = "hero1001", speed = 1, zoom_factor = 1}
+	self.datas[1001] = {ID = 1001, name = "狂屠", grade_type = 1, default_have = 1, skill_id = 1001, attribute = 1, atk = 15, icon = "", aspect = "hero1001", speed = 3, zoom_factor = 1}
+	self.datas[1002] = {ID = 1002, name = "圣天使", grade_type = 1, default_have = 1, skill_id = 1002, attribute = 2, atk = 15, icon = "", aspect = "hero1002", speed = 3, zoom_factor = 1}
 end
 
 M_hero:init()

GameConfig/Lua/M_monster.lua

@@ -10,20 +10,20 @@ end
 function M_monster:init()
 	self.datas = {}
 	self.datas[1001] = {ID = 1001, name = "蛇蝇", type = 1, multiple = 2, icon = "", aspect = "1001", speed = 1, super_speed = 1.5, zoom_factor = 1, exp_value = 5}
-	self.datas[1002] = {ID = 1002, name = "哥布林刺客", type = 1, multiple = 3, icon = "", aspect = "1002", speed = 1, super_speed = 1.5, zoom_factor = 1, exp_value = 5}
+	self.datas[1002] = {ID = 1002, name = "冥蛊虫", type = 1, multiple = 3, icon = "", aspect = "1002", speed = 1, super_speed = 1.5, zoom_factor = 1, exp_value = 5}
 	self.datas[1003] = {ID = 1003, name = "哥布林战士", type = 1, multiple = 4, icon = "", aspect = "1003", speed = 1, super_speed = 1.5, zoom_factor = 1, exp_value = 5}
-	self.datas[1004] = {ID = 1004, name = "鬼蛛", type = 1, multiple = 5, icon = "", aspect = "1003", speed = 1, super_speed = 1.5, zoom_factor = 1, exp_value = 5}
-	self.datas[1005] = {ID = 1005, name = "祭师", type = 1, multiple = 6, icon = "", aspect = "1003", speed = 1, super_speed = 2, zoom_factor = 1, exp_value = 5}
-	self.datas[1006] = {ID = 1006, name = "祭祀小鬼", type = 1, multiple = 7, icon = "", aspect = "1003", speed = 1, super_speed = 2, zoom_factor = 1, exp_value = 5}
-	self.datas[1007] = {ID = 1007, name = "冥蛊虫", type = 1, multiple = 8, icon = "", aspect = "1003", speed = 1, super_speed = 2, zoom_factor = 1, exp_value = 5}
-	self.datas[1008] = {ID = 1008, name = "独眼魔", type = 1, multiple = 9, icon = "", aspect = "1003", speed = 1, super_speed = 2, zoom_factor = 1, exp_value = 5}
-	self.datas[1009] = {ID = 1009, name = "石头人", type = 1, multiple = 10, icon = "", aspect = "1003", speed = 1, super_speed = 2, zoom_factor = 1, exp_value = 5}
-	self.datas[1010] = {ID = 1010, name = "武器哥布林", type = 1, multiple = 12, icon = "", aspect = "1003", speed = 1, super_speed = 2, zoom_factor = 1, exp_value = 5}
-	self.datas[1011] = {ID = 1011, name = "岩鼠", type = 1, multiple = 15, icon = "", aspect = "1003", speed = 1, super_speed = 2, zoom_factor = 1, exp_value = 5}
-	self.datas[1012] = {ID = 1012, name = "幽面", type = 1, multiple = 18, icon = "", aspect = "1003", speed = 1, super_speed = 2, zoom_factor = 1, exp_value = 5}
-	self.datas[1013] = {ID = 1013, name = "普通怪物13", type = 1, multiple = 20, icon = "", aspect = "1003", speed = 1, super_speed = 2, zoom_factor = 1, exp_value = 5}
-	self.datas[1014] = {ID = 1014, name = "普通怪物14", type = 1, multiple = 20, icon = "", aspect = "1003", speed = 1, super_speed = 2, zoom_factor = 1, exp_value = 5}
-	self.datas[1015] = {ID = 1015, name = "普通怪物15", type = 1, multiple = 25, icon = "", aspect = "1003", speed = 1, super_speed = 2, zoom_factor = 1, exp_value = 5}
+	self.datas[1004] = {ID = 1004, name = "鬼蛛", type = 1, multiple = 5, icon = "", aspect = "1004", speed = 1, super_speed = 1.5, zoom_factor = 1, exp_value = 5}
+	self.datas[1005] = {ID = 1005, name = "异化蛇蝇", type = 1, multiple = 6, icon = "", aspect = "1005", speed = 1, super_speed = 1.5, zoom_factor = 1, exp_value = 5}
+	self.datas[1006] = {ID = 1006, name = "哥布林刺客", type = 1, multiple = 7, icon = "", aspect = "1006", speed = 1, super_speed = 1.5, zoom_factor = 1, exp_value = 5}
+	self.datas[1007] = {ID = 1007, name = "岩鼠", type = 1, multiple = 8, icon = "", aspect = "1007", speed = 1, super_speed = 1.5, zoom_factor = 1, exp_value = 5}
+	self.datas[1008] = {ID = 1008, name = "异化冥蛊虫", type = 1, multiple = 9, icon = "", aspect = "1008", speed = 1, super_speed = 1.5, zoom_factor = 1, exp_value = 5}
+	self.datas[1009] = {ID = 1009, name = "祭祀小鬼", type = 1, multiple = 10, icon = "", aspect = "1009", speed = 1, super_speed = 1.5, zoom_factor = 1, exp_value = 5}
+	self.datas[1010] = {ID = 1010, name = "幽面", type = 1, multiple = 12, icon = "", aspect = "1010", speed = 1, super_speed = 1.5, zoom_factor = 1, exp_value = 5}
+	self.datas[1011] = {ID = 1011, name = "祭师", type = 1, multiple = 15, icon = "", aspect = "1011", speed = 1, super_speed = 1.5, zoom_factor = 1, exp_value = 5}
+	self.datas[1012] = {ID = 1012, name = "武器哥布林", type = 1, multiple = 18, icon = "", aspect = "1012", speed = 1, super_speed = 1.5, zoom_factor = 1, exp_value = 5}
+	self.datas[1013] = {ID = 1013, name = "石头人", type = 1, multiple = 20, icon = "", aspect = "1013", speed = 1, super_speed = 1.5, zoom_factor = 1, exp_value = 5}
+	self.datas[1014] = {ID = 1014, name = "异化石头人", type = 1, multiple = 20, icon = "", aspect = "1014", speed = 1, super_speed = 1.5, zoom_factor = 1, exp_value = 5}
+	self.datas[1015] = {ID = 1015, name = "独眼魔", type = 1, multiple = 25, icon = "", aspect = "1015", speed = 1, super_speed = 1.5, zoom_factor = 1, exp_value = 5}
 	self.datas[2001] = {ID = 2001, name = "精英怪物1", type = 2, multiple = 30, icon = "", aspect = "1003", speed = 1, super_speed = 2, zoom_factor = 1, exp_value = 6}
 	self.datas[2002] = {ID = 2002, name = "精英怪物2", type = 2, multiple = 50, icon = "", aspect = "1003", speed = 1, super_speed = 2, zoom_factor = 1, exp_value = 6}
 	self.datas[2003] = {ID = 2003, name = "精英怪物3", type = 2, multiple = 60, icon = "", aspect = "1003", speed = 1, super_speed = 2, zoom_factor = 1, exp_value = 6}

GameConfig/Lua/M_skill.lua

@@ -9,10 +9,14 @@ end
 
 function M_skill:init()
 	self.datas = {}
-	self.datas[1001] = {ID = 1001, hero_id = 1001, skill_leve = 1, bullet_num = 1, bullet_radius = 200, attack_distance = 1000, skill_des = "扔出1把旋转大刀"}
-	self.datas[1002] = {ID = 1002, hero_id = 1001, skill_leve = 2, bullet_num = 2, bullet_radius = 200, attack_distance = 1000, skill_des = "扔出2把旋转大刀"}
-	self.datas[1003] = {ID = 1003, hero_id = 1001, skill_leve = 3, bullet_num = 4, bullet_radius = 200, attack_distance = 1000, skill_des = "扔出4把旋转大刀"}
-	self.datas[1004] = {ID = 1004, hero_id = 1001, skill_leve = 4, bullet_num = 8, bullet_radius = 200, attack_distance = 1000, skill_des = "扔出8把旋转大刀"}
+	self.datas[1001] = {ID = 1001, hero_id = 1001, skill_leve = 1, bullet_num = 1, bullet_radius = 20, attack_distance = 1000, skill_des = "扔出1把旋转大刀"}
+	self.datas[1002] = {ID = 1002, hero_id = 1001, skill_leve = 2, bullet_num = 2, bullet_radius = 20, attack_distance = 1000, skill_des = "扔出2把旋转大刀"}
+	self.datas[1003] = {ID = 1003, hero_id = 1001, skill_leve = 3, bullet_num = 4, bullet_radius = 20, attack_distance = 1000, skill_des = "扔出4把旋转大刀"}
+	self.datas[1004] = {ID = 1004, hero_id = 1001, skill_leve = 4, bullet_num = 8, bullet_radius = 20, attack_distance = 1000, skill_des = "扔出8把旋转大刀"}
+	self.datas[1101] = {ID = 1101, hero_id = 1002, skill_leve = 1, bullet_num = 1, bullet_radius = 20, attack_distance = 100, skill_des = "围绕1个魔法雷球"}
+	self.datas[1102] = {ID = 1102, hero_id = 1002, skill_leve = 2, bullet_num = 2, bullet_radius = 20, attack_distance = 100, skill_des = "围绕2个魔法雷球"}
+	self.datas[1103] = {ID = 1103, hero_id = 1002, skill_leve = 3, bullet_num = 4, bullet_radius = 20, attack_distance = 100, skill_des = "围绕4个魔法雷球"}
+	self.datas[1104] = {ID = 1104, hero_id = 1002, skill_leve = 4, bullet_num = 6, bullet_radius = 20, attack_distance = 100, skill_des = "围绕6个魔法雷球"}
 end
 
 M_skill:init()

GameConfig/Xml/M_fish_scheme.xml

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Root>
-	<Data ID="1001" monster_id="1001" fish_group="1" num="200" />
-	<Data ID="1002" monster_id="1002" fish_group="1" num="10" />
-	<Data ID="1003" monster_id="1001" fish_group="2" num="200" />
-	<Data ID="1004" monster_id="1002" fish_group="2" num="10" />
-	<Data ID="1005" monster_id="1001" fish_group="3" num="200" />
-	<Data ID="1006" monster_id="1002" fish_group="3" num="10" />
-	<Data ID="1007" monster_id="1001" fish_group="4" num="200" />
-	<Data ID="1008" monster_id="1002" fish_group="4" num="10" />
-	<Data ID="1009" monster_id="1001" fish_group="5" num="200" />
-	<Data ID="1010" monster_id="1002" fish_group="5" num="10" />
-	<Data ID="1011" monster_id="1001" fish_group="6" num="200" />
-	<Data ID="1012" monster_id="1002" fish_group="6" num="10" />
-	<Data ID="1013" monster_id="1001" fish_group="7" num="200" />
-	<Data ID="1014" monster_id="1002" fish_group="7" num="10" />
-	<Data ID="1015" monster_id="1001" fish_group="8" num="200" />
-	<Data ID="1016" monster_id="1002" fish_group="8" num="10" />
+	<Data ID="1001" monster_id="1001" fish_group="1" num="200" kill_count="1,1" />
+	<Data ID="1002" monster_id="1002" fish_group="1" num="10" kill_count="2,3" />
+	<Data ID="1003" monster_id="1001" fish_group="2" num="200" kill_count="1,1" />
+	<Data ID="1004" monster_id="1002" fish_group="2" num="10" kill_count="2,3" />
+	<Data ID="1005" monster_id="1001" fish_group="3" num="200" kill_count="1,1" />
+	<Data ID="1006" monster_id="1002" fish_group="3" num="10" kill_count="2,3" />
+	<Data ID="1007" monster_id="1001" fish_group="4" num="200" kill_count="1,1" />
+	<Data ID="1008" monster_id="1002" fish_group="4" num="10" kill_count="2,3" />
+	<Data ID="1009" monster_id="1001" fish_group="5" num="200" kill_count="1,1" />
+	<Data ID="1010" monster_id="1002" fish_group="5" num="10" kill_count="2,3" />
+	<Data ID="1011" monster_id="1001" fish_group="6" num="200" kill_count="1,1" />
+	<Data ID="1012" monster_id="1002" fish_group="6" num="10" kill_count="2,3" />
+	<Data ID="1013" monster_id="1001" fish_group="7" num="200" kill_count="1,1" />
+	<Data ID="1014" monster_id="1002" fish_group="7" num="10" kill_count="2,3" />
+	<Data ID="1015" monster_id="1001" fish_group="8" num="200" kill_count="1,1" />
+	<Data ID="1016" monster_id="1002" fish_group="8" num="10" kill_count="2,3" />
 </Root>

GameConfig/Xml/M_hero.xml

@@ -1,15 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Root>
-	<Data ID="1001" name="狂屠" grade_type="1" default_have="1" skill_id="1001" attribute="1" atk="15" icon="" aspect="hero1001" speed="1" zoom_factor="1" />
-	<Data ID="1002" name="圣天使" grade_type="1" default_have="1" skill_id="1001" attribute="2" atk="15" icon="" aspect="hero1001" speed="1" zoom_factor="1" />
-	<Data ID="1003" name="英雄3" grade_type="1" default_have="1" skill_id="1001" attribute="3" atk="15" icon="" aspect="hero1001" speed="1" zoom_factor="1" />
-	<Data ID="1004" name="英雄4" grade_type="1" default_have="1" skill_id="1001" attribute="4" atk="15" icon="" aspect="hero1001" speed="1" zoom_factor="1" />
-	<Data ID="1005" name="英雄5" grade_type="1" default_have="1" skill_id="1001" attribute="1" atk="15" icon="" aspect="hero1001" speed="1" zoom_factor="1" />
-	<Data ID="1006" name="英雄6" grade_type="1" default_have="1" skill_id="1001" attribute="2" atk="15" icon="" aspect="hero1001" speed="1" zoom_factor="1" />
-	<Data ID="1007" name="英雄7" grade_type="1" default_have="1" skill_id="1001" attribute="3" atk="15" icon="" aspect="hero1001" speed="1" zoom_factor="1" />
-	<Data ID="1008" name="英雄8" grade_type="1" default_have="1" skill_id="1001" attribute="4" atk="15" icon="" aspect="hero1001" speed="1" zoom_factor="1" />
-	<Data ID="1009" name="传说英雄1" grade_type="2" default_have="0" skill_id="1001" attribute="1" atk="20" icon="" aspect="hero1001" speed="1" zoom_factor="1" />
-	<Data ID="1010" name="传说英雄2" grade_type="2" default_have="0" skill_id="1001" attribute="2" atk="20" icon="" aspect="hero1001" speed="1" zoom_factor="1" />
-	<Data ID="1011" name="传说英雄3" grade_type="2" default_have="0" skill_id="1001" attribute="3" atk="20" icon="" aspect="hero1001" speed="1" zoom_factor="1" />
-	<Data ID="1012" name="传说英雄4" grade_type="2" default_have="0" skill_id="1001" attribute="4" atk="20" icon="" aspect="hero1001" speed="1" zoom_factor="1" />
+	<Data ID="1001" name="狂屠" grade_type="1" default_have="1" skill_id="1001" attribute="1" atk="15" icon="" aspect="hero1001" speed="3" zoom_factor="1" />
+	<Data ID="1002" name="圣天使" grade_type="1" default_have="1" skill_id="1002" attribute="2" atk="15" icon="" aspect="hero1002" speed="3" zoom_factor="1" />
 </Root>

GameConfig/Xml/M_monster.xml

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Root>
 	<Data ID="1001" name="蛇蝇" type="1" multiple="2" icon="" aspect="1001" speed="1" super_speed="1.5" zoom_factor="1" exp_value="5" />
-	<Data ID="1002" name="哥布林刺客" type="1" multiple="3" icon="" aspect="1002" speed="1" super_speed="1.5" zoom_factor="1" exp_value="5" />
+	<Data ID="1002" name="冥蛊虫" type="1" multiple="3" icon="" aspect="1002" speed="1" super_speed="1.5" zoom_factor="1" exp_value="5" />
 	<Data ID="1003" name="哥布林战士" type="1" multiple="4" icon="" aspect="1003" speed="1" super_speed="1.5" zoom_factor="1" exp_value="5" />
-	<Data ID="1004" name="鬼蛛" type="1" multiple="5" icon="" aspect="1003" speed="1" super_speed="1.5" zoom_factor="1" exp_value="5" />
-	<Data ID="1005" name="祭师" type="1" multiple="6" icon="" aspect="1003" speed="1" super_speed="2" zoom_factor="1" exp_value="5" />
-	<Data ID="1006" name="祭祀小鬼" type="1" multiple="7" icon="" aspect="1003" speed="1" super_speed="2" zoom_factor="1" exp_value="5" />
-	<Data ID="1007" name="冥蛊虫" type="1" multiple="8" icon="" aspect="1003" speed="1" super_speed="2" zoom_factor="1" exp_value="5" />
-	<Data ID="1008" name="独眼魔" type="1" multiple="9" icon="" aspect="1003" speed="1" super_speed="2" zoom_factor="1" exp_value="5" />
-	<Data ID="1009" name="石头人" type="1" multiple="10" icon="" aspect="1003" speed="1" super_speed="2" zoom_factor="1" exp_value="5" />
-	<Data ID="1010" name="武器哥布林" type="1" multiple="12" icon="" aspect="1003" speed="1" super_speed="2" zoom_factor="1" exp_value="5" />
-	<Data ID="1011" name="岩鼠" type="1" multiple="15" icon="" aspect="1003" speed="1" super_speed="2" zoom_factor="1" exp_value="5" />
-	<Data ID="1012" name="幽面" type="1" multiple="18" icon="" aspect="1003" speed="1" super_speed="2" zoom_factor="1" exp_value="5" />
-	<Data ID="1013" name="普通怪物13" type="1" multiple="20" icon="" aspect="1003" speed="1" super_speed="2" zoom_factor="1" exp_value="5" />
-	<Data ID="1014" name="普通怪物14" type="1" multiple="20" icon="" aspect="1003" speed="1" super_speed="2" zoom_factor="1" exp_value="5" />
-	<Data ID="1015" name="普通怪物15" type="1" multiple="25" icon="" aspect="1003" speed="1" super_speed="2" zoom_factor="1" exp_value="5" />
+	<Data ID="1004" name="鬼蛛" type="1" multiple="5" icon="" aspect="1004" speed="1" super_speed="1.5" zoom_factor="1" exp_value="5" />
+	<Data ID="1005" name="异化蛇蝇" type="1" multiple="6" icon="" aspect="1005" speed="1" super_speed="1.5" zoom_factor="1" exp_value="5" />
+	<Data ID="1006" name="哥布林刺客" type="1" multiple="7" icon="" aspect="1006" speed="1" super_speed="1.5" zoom_factor="1" exp_value="5" />
+	<Data ID="1007" name="岩鼠" type="1" multiple="8" icon="" aspect="1007" speed="1" super_speed="1.5" zoom_factor="1" exp_value="5" />
+	<Data ID="1008" name="异化冥蛊虫" type="1" multiple="9" icon="" aspect="1008" speed="1" super_speed="1.5" zoom_factor="1" exp_value="5" />
+	<Data ID="1009" name="祭祀小鬼" type="1" multiple="10" icon="" aspect="1009" speed="1" super_speed="1.5" zoom_factor="1" exp_value="5" />
+	<Data ID="1010" name="幽面" type="1" multiple="12" icon="" aspect="1010" speed="1" super_speed="1.5" zoom_factor="1" exp_value="5" />
+	<Data ID="1011" name="祭师" type="1" multiple="15" icon="" aspect="1011" speed="1" super_speed="1.5" zoom_factor="1" exp_value="5" />
+	<Data ID="1012" name="武器哥布林" type="1" multiple="18" icon="" aspect="1012" speed="1" super_speed="1.5" zoom_factor="1" exp_value="5" />
+	<Data ID="1013" name="石头人" type="1" multiple="20" icon="" aspect="1013" speed="1" super_speed="1.5" zoom_factor="1" exp_value="5" />
+	<Data ID="1014" name="异化石头人" type="1" multiple="20" icon="" aspect="1014" speed="1" super_speed="1.5" zoom_factor="1" exp_value="5" />
+	<Data ID="1015" name="独眼魔" type="1" multiple="25" icon="" aspect="1015" speed="1" super_speed="1.5" zoom_factor="1" exp_value="5" />
 	<Data ID="2001" name="精英怪物1" type="2" multiple="30" icon="" aspect="1003" speed="1" super_speed="2" zoom_factor="1" exp_value="6" />
 	<Data ID="2002" name="精英怪物2" type="2" multiple="50" icon="" aspect="1003" speed="1" super_speed="2" zoom_factor="1" exp_value="6" />
 	<Data ID="2003" name="精英怪物3" type="2" multiple="60" icon="" aspect="1003" speed="1" super_speed="2" zoom_factor="1" exp_value="6" />

GameConfig/Xml/M_skill.xml

@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Root>
-	<Data ID="1001" hero_id="1001" skill_leve="1" bullet_num="1" bullet_radius="200" attack_distance="1000" skill_des="扔出1把旋转大刀" />
-	<Data ID="1002" hero_id="1001" skill_leve="2" bullet_num="2" bullet_radius="200" attack_distance="1000" skill_des="扔出2把旋转大刀" />
-	<Data ID="1003" hero_id="1001" skill_leve="3" bullet_num="4" bullet_radius="200" attack_distance="1000" skill_des="扔出4把旋转大刀" />
-	<Data ID="1004" hero_id="1001" skill_leve="4" bullet_num="8" bullet_radius="200" attack_distance="1000" skill_des="扔出8把旋转大刀" />
+	<Data ID="1001" hero_id="1001" skill_leve="1" bullet_num="1" bullet_radius="20" attack_distance="1000" skill_des="扔出1把旋转大刀" />
+	<Data ID="1002" hero_id="1001" skill_leve="2" bullet_num="2" bullet_radius="20" attack_distance="1000" skill_des="扔出2把旋转大刀" />
+	<Data ID="1003" hero_id="1001" skill_leve="3" bullet_num="4" bullet_radius="20" attack_distance="1000" skill_des="扔出4把旋转大刀" />
+	<Data ID="1004" hero_id="1001" skill_leve="4" bullet_num="8" bullet_radius="20" attack_distance="1000" skill_des="扔出8把旋转大刀" />
+	<Data ID="1101" hero_id="1002" skill_leve="1" bullet_num="1" bullet_radius="20" attack_distance="100" skill_des="围绕1个魔法雷球" />
+	<Data ID="1102" hero_id="1002" skill_leve="2" bullet_num="2" bullet_radius="20" attack_distance="100" skill_des="围绕2个魔法雷球" />
+	<Data ID="1103" hero_id="1002" skill_leve="3" bullet_num="4" bullet_radius="20" attack_distance="100" skill_des="围绕4个魔法雷球" />
+	<Data ID="1104" hero_id="1002" skill_leve="4" bullet_num="6" bullet_radius="20" attack_distance="100" skill_des="围绕6个魔法雷球" />
 </Root>

GameConfig/json/M_fish_scheme.json

@@ -1,33 +1,33 @@
-{"1001":{"ID":1001,"monster_id":1001,"fish_group":1,"num":200}
+{"1001":{"ID":1001,"monster_id":1001,"fish_group":1,"num":200,"kill_count":[1,1]}
 
-,"1002":{"ID":1002,"monster_id":1002,"fish_group":1,"num":10}
+,"1002":{"ID":1002,"monster_id":1002,"fish_group":1,"num":10,"kill_count":[2,3]}
 
-,"1003":{"ID":1003,"monster_id":1001,"fish_group":2,"num":200}
+,"1003":{"ID":1003,"monster_id":1001,"fish_group":2,"num":200,"kill_count":[1,1]}
 
-,"1004":{"ID":1004,"monster_id":1002,"fish_group":2,"num":10}
+,"1004":{"ID":1004,"monster_id":1002,"fish_group":2,"num":10,"kill_count":[2,3]}
 
-,"1005":{"ID":1005,"monster_id":1001,"fish_group":3,"num":200}
+,"1005":{"ID":1005,"monster_id":1001,"fish_group":3,"num":200,"kill_count":[1,1]}
 
-,"1006":{"ID":1006,"monster_id":1002,"fish_group":3,"num":10}
+,"1006":{"ID":1006,"monster_id":1002,"fish_group":3,"num":10,"kill_count":[2,3]}
 
-,"1007":{"ID":1007,"monster_id":1001,"fish_group":4,"num":200}
+,"1007":{"ID":1007,"monster_id":1001,"fish_group":4,"num":200,"kill_count":[1,1]}
 
-,"1008":{"ID":1008,"monster_id":1002,"fish_group":4,"num":10}
+,"1008":{"ID":1008,"monster_id":1002,"fish_group":4,"num":10,"kill_count":[2,3]}
 
-,"1009":{"ID":1009,"monster_id":1001,"fish_group":5,"num":200}
+,"1009":{"ID":1009,"monster_id":1001,"fish_group":5,"num":200,"kill_count":[1,1]}
 
-,"1010":{"ID":1010,"monster_id":1002,"fish_group":5,"num":10}
+,"1010":{"ID":1010,"monster_id":1002,"fish_group":5,"num":10,"kill_count":[2,3]}
 
-,"1011":{"ID":1011,"monster_id":1001,"fish_group":6,"num":200}
+,"1011":{"ID":1011,"monster_id":1001,"fish_group":6,"num":200,"kill_count":[1,1]}
 
-,"1012":{"ID":1012,"monster_id":1002,"fish_group":6,"num":10}
+,"1012":{"ID":1012,"monster_id":1002,"fish_group":6,"num":10,"kill_count":[2,3]}
 
-,"1013":{"ID":1013,"monster_id":1001,"fish_group":7,"num":200}
+,"1013":{"ID":1013,"monster_id":1001,"fish_group":7,"num":200,"kill_count":[1,1]}
 
-,"1014":{"ID":1014,"monster_id":1002,"fish_group":7,"num":10}
+,"1014":{"ID":1014,"monster_id":1002,"fish_group":7,"num":10,"kill_count":[2,3]}
 
-,"1015":{"ID":1015,"monster_id":1001,"fish_group":8,"num":200}
+,"1015":{"ID":1015,"monster_id":1001,"fish_group":8,"num":200,"kill_count":[1,1]}
 
-,"1016":{"ID":1016,"monster_id":1002,"fish_group":8,"num":10}
+,"1016":{"ID":1016,"monster_id":1002,"fish_group":8,"num":10,"kill_count":[2,3]}
 
 }

GameConfig/json/M_hero.json

@@ -1,25 +1,5 @@
-{"1001":{"ID":1001,"name":"狂屠","grade_type":1,"default_have":1,"skill_id":1001,"attribute":1,"atk":15,"icon":"","aspect":"hero1001","speed":1.0,"zoom_factor":1.0}
+{"1001":{"ID":1001,"name":"狂屠","grade_type":1,"default_have":1,"skill_id":1001,"attribute":1,"atk":15,"icon":"","aspect":"hero1001","speed":3.0,"zoom_factor":1.0}
 
-,"1002":{"ID":1002,"name":"圣天使","grade_type":1,"default_have":1,"skill_id":1001,"attribute":2,"atk":15,"icon":"","aspect":"hero1001","speed":1.0,"zoom_factor":1.0}
-
-,"1003":{"ID":1003,"name":"英雄3","grade_type":1,"default_have":1,"skill_id":1001,"attribute":3,"atk":15,"icon":"","aspect":"hero1001","speed":1.0,"zoom_factor":1.0}
-
-,"1004":{"ID":1004,"name":"英雄4","grade_type":1,"default_have":1,"skill_id":1001,"attribute":4,"atk":15,"icon":"","aspect":"hero1001","speed":1.0,"zoom_factor":1.0}
-
-,"1005":{"ID":1005,"name":"英雄5","grade_type":1,"default_have":1,"skill_id":1001,"attribute":1,"atk":15,"icon":"","aspect":"hero1001","speed":1.0,"zoom_factor":1.0}
-
-,"1006":{"ID":1006,"name":"英雄6","grade_type":1,"default_have":1,"skill_id":1001,"attribute":2,"atk":15,"icon":"","aspect":"hero1001","speed":1.0,"zoom_factor":1.0}
-
-,"1007":{"ID":1007,"name":"英雄7","grade_type":1,"default_have":1,"skill_id":1001,"attribute":3,"atk":15,"icon":"","aspect":"hero1001","speed":1.0,"zoom_factor":1.0}
-
-,"1008":{"ID":1008,"name":"英雄8","grade_type":1,"default_have":1,"skill_id":1001,"attribute":4,"atk":15,"icon":"","aspect":"hero1001","speed":1.0,"zoom_factor":1.0}
-
-,"1009":{"ID":1009,"name":"传说英雄1","grade_type":2,"default_have":0,"skill_id":1001,"attribute":1,"atk":20,"icon":"","aspect":"hero1001","speed":1.0,"zoom_factor":1.0}
-
-,"1010":{"ID":1010,"name":"传说英雄2","grade_type":2,"default_have":0,"skill_id":1001,"attribute":2,"atk":20,"icon":"","aspect":"hero1001","speed":1.0,"zoom_factor":1.0}
-
-,"1011":{"ID":1011,"name":"传说英雄3","grade_type":2,"default_have":0,"skill_id":1001,"attribute":3,"atk":20,"icon":"","aspect":"hero1001","speed":1.0,"zoom_factor":1.0}
-
-,"1012":{"ID":1012,"name":"传说英雄4","grade_type":2,"default_have":0,"skill_id":1001,"attribute":4,"atk":20,"icon":"","aspect":"hero1001","speed":1.0,"zoom_factor":1.0}
+,"1002":{"ID":1002,"name":"圣天使","grade_type":1,"default_have":1,"skill_id":1002,"attribute":2,"atk":15,"icon":"","aspect":"hero1002","speed":3.0,"zoom_factor":1.0}
 
 }

GameConfig/json/M_monster.json

@@ -1,32 +1,32 @@
 {"1001":{"ID":1001,"name":"蛇蝇","type":1,"multiple":2,"icon":"","aspect":"1001","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
 
-,"1002":{"ID":1002,"name":"哥布林刺客","type":1,"multiple":3,"icon":"","aspect":"1002","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
+,"1002":{"ID":1002,"name":"冥蛊虫","type":1,"multiple":3,"icon":"","aspect":"1002","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
 
 ,"1003":{"ID":1003,"name":"哥布林战士","type":1,"multiple":4,"icon":"","aspect":"1003","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
 
-,"1004":{"ID":1004,"name":"鬼蛛","type":1,"multiple":5,"icon":"","aspect":"1003","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
+,"1004":{"ID":1004,"name":"鬼蛛","type":1,"multiple":5,"icon":"","aspect":"1004","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
 
-,"1005":{"ID":1005,"name":"祭师","type":1,"multiple":6,"icon":"","aspect":"1003","speed":1.0,"super_speed":2.0,"zoom_factor":1.0,"exp_value":5}
+,"1005":{"ID":1005,"name":"异化蛇蝇","type":1,"multiple":6,"icon":"","aspect":"1005","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
 
-,"1006":{"ID":1006,"name":"祭祀小鬼","type":1,"multiple":7,"icon":"","aspect":"1003","speed":1.0,"super_speed":2.0,"zoom_factor":1.0,"exp_value":5}
+,"1006":{"ID":1006,"name":"哥布林刺客","type":1,"multiple":7,"icon":"","aspect":"1006","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
 
-,"1007":{"ID":1007,"name":"冥蛊虫","type":1,"multiple":8,"icon":"","aspect":"1003","speed":1.0,"super_speed":2.0,"zoom_factor":1.0,"exp_value":5}
+,"1007":{"ID":1007,"name":"岩鼠","type":1,"multiple":8,"icon":"","aspect":"1007","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
 
-,"1008":{"ID":1008,"name":"独眼魔","type":1,"multiple":9,"icon":"","aspect":"1003","speed":1.0,"super_speed":2.0,"zoom_factor":1.0,"exp_value":5}
+,"1008":{"ID":1008,"name":"异化冥蛊虫","type":1,"multiple":9,"icon":"","aspect":"1008","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
 
-,"1009":{"ID":1009,"name":"石头人","type":1,"multiple":10,"icon":"","aspect":"1003","speed":1.0,"super_speed":2.0,"zoom_factor":1.0,"exp_value":5}
+,"1009":{"ID":1009,"name":"祭祀小鬼","type":1,"multiple":10,"icon":"","aspect":"1009","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
 
-,"1010":{"ID":1010,"name":"武器哥布林","type":1,"multiple":12,"icon":"","aspect":"1003","speed":1.0,"super_speed":2.0,"zoom_factor":1.0,"exp_value":5}
+,"1010":{"ID":1010,"name":"幽面","type":1,"multiple":12,"icon":"","aspect":"1010","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
 
-,"1011":{"ID":1011,"name":"岩鼠","type":1,"multiple":15,"icon":"","aspect":"1003","speed":1.0,"super_speed":2.0,"zoom_factor":1.0,"exp_value":5}
+,"1011":{"ID":1011,"name":"祭师","type":1,"multiple":15,"icon":"","aspect":"1011","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
 
-,"1012":{"ID":1012,"name":"幽面","type":1,"multiple":18,"icon":"","aspect":"1003","speed":1.0,"super_speed":2.0,"zoom_factor":1.0,"exp_value":5}
+,"1012":{"ID":1012,"name":"武器哥布林","type":1,"multiple":18,"icon":"","aspect":"1012","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
 
-,"1013":{"ID":1013,"name":"普通怪物13","type":1,"multiple":20,"icon":"","aspect":"1003","speed":1.0,"super_speed":2.0,"zoom_factor":1.0,"exp_value":5}
+,"1013":{"ID":1013,"name":"石头人","type":1,"multiple":20,"icon":"","aspect":"1013","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
 
-,"1014":{"ID":1014,"name":"普通怪物14","type":1,"multiple":20,"icon":"","aspect":"1003","speed":1.0,"super_speed":2.0,"zoom_factor":1.0,"exp_value":5}
+,"1014":{"ID":1014,"name":"异化石头人","type":1,"multiple":20,"icon":"","aspect":"1014","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
 
-,"1015":{"ID":1015,"name":"普通怪物15","type":1,"multiple":25,"icon":"","aspect":"1003","speed":1.0,"super_speed":2.0,"zoom_factor":1.0,"exp_value":5}
+,"1015":{"ID":1015,"name":"独眼魔","type":1,"multiple":25,"icon":"","aspect":"1015","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
 
 ,"2001":{"ID":2001,"name":"精英怪物1","type":2,"multiple":30,"icon":"","aspect":"1003","speed":1.0,"super_speed":2.0,"zoom_factor":1.0,"exp_value":6}
 

GameConfig/json/M_skill.json

@@ -1,9 +1,17 @@
-{"1001":{"ID":1001,"hero_id":1001,"skill_leve":1,"bullet_num":1,"bullet_radius":200,"attack_distance":1000,"skill_des":"扔出1把旋转大刀"}
+{"1001":{"ID":1001,"hero_id":1001,"skill_leve":1,"bullet_num":1,"bullet_radius":20,"attack_distance":1000,"skill_des":"扔出1把旋转大刀"}
 
-,"1002":{"ID":1002,"hero_id":1001,"skill_leve":2,"bullet_num":2,"bullet_radius":200,"attack_distance":1000,"skill_des":"扔出2把旋转大刀"}
+,"1002":{"ID":1002,"hero_id":1001,"skill_leve":2,"bullet_num":2,"bullet_radius":20,"attack_distance":1000,"skill_des":"扔出2把旋转大刀"}
 
-,"1003":{"ID":1003,"hero_id":1001,"skill_leve":3,"bullet_num":4,"bullet_radius":200,"attack_distance":1000,"skill_des":"扔出4把旋转大刀"}
+,"1003":{"ID":1003,"hero_id":1001,"skill_leve":3,"bullet_num":4,"bullet_radius":20,"attack_distance":1000,"skill_des":"扔出4把旋转大刀"}
 
-,"1004":{"ID":1004,"hero_id":1001,"skill_leve":4,"bullet_num":8,"bullet_radius":200,"attack_distance":1000,"skill_des":"扔出8把旋转大刀"}
+,"1004":{"ID":1004,"hero_id":1001,"skill_leve":4,"bullet_num":8,"bullet_radius":20,"attack_distance":1000,"skill_des":"扔出8把旋转大刀"}
+
+,"1101":{"ID":1101,"hero_id":1002,"skill_leve":1,"bullet_num":1,"bullet_radius":20,"attack_distance":100,"skill_des":"围绕1个魔法雷球"}
+
+,"1102":{"ID":1102,"hero_id":1002,"skill_leve":2,"bullet_num":2,"bullet_radius":20,"attack_distance":100,"skill_des":"围绕2个魔法雷球"}
+
+,"1103":{"ID":1103,"hero_id":1002,"skill_leve":3,"bullet_num":4,"bullet_radius":20,"attack_distance":100,"skill_des":"围绕4个魔法雷球"}
+
+,"1104":{"ID":1104,"hero_id":1002,"skill_leve":4,"bullet_num":6,"bullet_radius":20,"attack_distance":100,"skill_des":"围绕6个魔法雷球"}
 
 }

GameConfig/ts/M_fish_scheme.ts

@@ -1,40 +1,40 @@
-// ID:ID, monster_id:怪物ID, fish_group:鱼阵方案组, num:数量
+// ID:ID, monster_id:怪物ID, fish_group:鱼阵方案组, num:数量, kill_count:击杀次数
 
 export default class M_fish_scheme {
   private static data =
-      {"1001":{"ID":1001,"monster_id":1001,"fish_group":1,"num":200}
+      {"1001":{"ID":1001,"monster_id":1001,"fish_group":1,"num":200,"kill_count":[1,1]}
 
-      ,"1002":{"ID":1002,"monster_id":1002,"fish_group":1,"num":10}
+      ,"1002":{"ID":1002,"monster_id":1002,"fish_group":1,"num":10,"kill_count":[2,3]}
 
-      ,"1003":{"ID":1003,"monster_id":1001,"fish_group":2,"num":200}
+      ,"1003":{"ID":1003,"monster_id":1001,"fish_group":2,"num":200,"kill_count":[1,1]}
 
-      ,"1004":{"ID":1004,"monster_id":1002,"fish_group":2,"num":10}
+      ,"1004":{"ID":1004,"monster_id":1002,"fish_group":2,"num":10,"kill_count":[2,3]}
 
-      ,"1005":{"ID":1005,"monster_id":1001,"fish_group":3,"num":200}
+      ,"1005":{"ID":1005,"monster_id":1001,"fish_group":3,"num":200,"kill_count":[1,1]}
 
-      ,"1006":{"ID":1006,"monster_id":1002,"fish_group":3,"num":10}
+      ,"1006":{"ID":1006,"monster_id":1002,"fish_group":3,"num":10,"kill_count":[2,3]}
 
-      ,"1007":{"ID":1007,"monster_id":1001,"fish_group":4,"num":200}
+      ,"1007":{"ID":1007,"monster_id":1001,"fish_group":4,"num":200,"kill_count":[1,1]}
 
-      ,"1008":{"ID":1008,"monster_id":1002,"fish_group":4,"num":10}
+      ,"1008":{"ID":1008,"monster_id":1002,"fish_group":4,"num":10,"kill_count":[2,3]}
 
-      ,"1009":{"ID":1009,"monster_id":1001,"fish_group":5,"num":200}
+      ,"1009":{"ID":1009,"monster_id":1001,"fish_group":5,"num":200,"kill_count":[1,1]}
 
-      ,"1010":{"ID":1010,"monster_id":1002,"fish_group":5,"num":10}
+      ,"1010":{"ID":1010,"monster_id":1002,"fish_group":5,"num":10,"kill_count":[2,3]}
 
-      ,"1011":{"ID":1011,"monster_id":1001,"fish_group":6,"num":200}
+      ,"1011":{"ID":1011,"monster_id":1001,"fish_group":6,"num":200,"kill_count":[1,1]}
 
-      ,"1012":{"ID":1012,"monster_id":1002,"fish_group":6,"num":10}
+      ,"1012":{"ID":1012,"monster_id":1002,"fish_group":6,"num":10,"kill_count":[2,3]}
 
-      ,"1013":{"ID":1013,"monster_id":1001,"fish_group":7,"num":200}
+      ,"1013":{"ID":1013,"monster_id":1001,"fish_group":7,"num":200,"kill_count":[1,1]}
 
-      ,"1014":{"ID":1014,"monster_id":1002,"fish_group":7,"num":10}
+      ,"1014":{"ID":1014,"monster_id":1002,"fish_group":7,"num":10,"kill_count":[2,3]}
 
-      ,"1015":{"ID":1015,"monster_id":1001,"fish_group":8,"num":200}
+      ,"1015":{"ID":1015,"monster_id":1001,"fish_group":8,"num":200,"kill_count":[1,1]}
 
-      ,"1016":{"ID":1016,"monster_id":1002,"fish_group":8,"num":10}
+      ,"1016":{"ID":1016,"monster_id":1002,"fish_group":8,"num":10,"kill_count":[2,3]}
 
-      }// ID:ID, monster_id:怪物ID, fish_group:鱼阵方案组, num:数量
+      }// ID:ID, monster_id:怪物ID, fish_group:鱼阵方案组, num:数量, kill_count:击杀次数
 
 
     static getData(key: any): any {

GameConfig/ts/M_hero.ts

@@ -2,29 +2,9 @@
 
 export default class M_hero {
   private static data =
-      {"1001":{"ID":1001,"name":"狂屠","grade_type":1,"default_have":1,"skill_id":1001,"attribute":1,"atk":15,"icon":"","aspect":"hero1001","speed":1.0,"zoom_factor":1.0}
+      {"1001":{"ID":1001,"name":"狂屠","grade_type":1,"default_have":1,"skill_id":1001,"attribute":1,"atk":15,"icon":"","aspect":"hero1001","speed":3.0,"zoom_factor":1.0}
 
-      ,"1002":{"ID":1002,"name":"圣天使","grade_type":1,"default_have":1,"skill_id":1001,"attribute":2,"atk":15,"icon":"","aspect":"hero1001","speed":1.0,"zoom_factor":1.0}
-
-      ,"1003":{"ID":1003,"name":"英雄3","grade_type":1,"default_have":1,"skill_id":1001,"attribute":3,"atk":15,"icon":"","aspect":"hero1001","speed":1.0,"zoom_factor":1.0}
-
-      ,"1004":{"ID":1004,"name":"英雄4","grade_type":1,"default_have":1,"skill_id":1001,"attribute":4,"atk":15,"icon":"","aspect":"hero1001","speed":1.0,"zoom_factor":1.0}
-
-      ,"1005":{"ID":1005,"name":"英雄5","grade_type":1,"default_have":1,"skill_id":1001,"attribute":1,"atk":15,"icon":"","aspect":"hero1001","speed":1.0,"zoom_factor":1.0}
-
-      ,"1006":{"ID":1006,"name":"英雄6","grade_type":1,"default_have":1,"skill_id":1001,"attribute":2,"atk":15,"icon":"","aspect":"hero1001","speed":1.0,"zoom_factor":1.0}
-
-      ,"1007":{"ID":1007,"name":"英雄7","grade_type":1,"default_have":1,"skill_id":1001,"attribute":3,"atk":15,"icon":"","aspect":"hero1001","speed":1.0,"zoom_factor":1.0}
-
-      ,"1008":{"ID":1008,"name":"英雄8","grade_type":1,"default_have":1,"skill_id":1001,"attribute":4,"atk":15,"icon":"","aspect":"hero1001","speed":1.0,"zoom_factor":1.0}
-
-      ,"1009":{"ID":1009,"name":"传说英雄1","grade_type":2,"default_have":0,"skill_id":1001,"attribute":1,"atk":20,"icon":"","aspect":"hero1001","speed":1.0,"zoom_factor":1.0}
-
-      ,"1010":{"ID":1010,"name":"传说英雄2","grade_type":2,"default_have":0,"skill_id":1001,"attribute":2,"atk":20,"icon":"","aspect":"hero1001","speed":1.0,"zoom_factor":1.0}
-
-      ,"1011":{"ID":1011,"name":"传说英雄3","grade_type":2,"default_have":0,"skill_id":1001,"attribute":3,"atk":20,"icon":"","aspect":"hero1001","speed":1.0,"zoom_factor":1.0}
-
-      ,"1012":{"ID":1012,"name":"传说英雄4","grade_type":2,"default_have":0,"skill_id":1001,"attribute":4,"atk":20,"icon":"","aspect":"hero1001","speed":1.0,"zoom_factor":1.0}
+      ,"1002":{"ID":1002,"name":"圣天使","grade_type":1,"default_have":1,"skill_id":1002,"attribute":2,"atk":15,"icon":"","aspect":"hero1002","speed":3.0,"zoom_factor":1.0}
 
       }// ID:ID, name:英雄名称, grade_type:英雄品质, default_have:默认拥有, skill_id:技能, attribute:属性, atk:攻击力, icon:英雄图标, aspect:英雄形象, speed:移动速度, zoom_factor:缩放倍数
 

GameConfig/ts/M_monster.ts

@@ -4,33 +4,33 @@ export default class M_monster {
   private static data =
       {"1001":{"ID":1001,"name":"蛇蝇","type":1,"multiple":2,"icon":"","aspect":"1001","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
 
-      ,"1002":{"ID":1002,"name":"哥布林刺客","type":1,"multiple":3,"icon":"","aspect":"1002","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
+      ,"1002":{"ID":1002,"name":"冥蛊虫","type":1,"multiple":3,"icon":"","aspect":"1002","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
 
       ,"1003":{"ID":1003,"name":"哥布林战士","type":1,"multiple":4,"icon":"","aspect":"1003","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
 
-      ,"1004":{"ID":1004,"name":"鬼蛛","type":1,"multiple":5,"icon":"","aspect":"1003","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
+      ,"1004":{"ID":1004,"name":"鬼蛛","type":1,"multiple":5,"icon":"","aspect":"1004","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
 
-      ,"1005":{"ID":1005,"name":"祭师","type":1,"multiple":6,"icon":"","aspect":"1003","speed":1.0,"super_speed":2.0,"zoom_factor":1.0,"exp_value":5}
+      ,"1005":{"ID":1005,"name":"异化蛇蝇","type":1,"multiple":6,"icon":"","aspect":"1005","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
 
-      ,"1006":{"ID":1006,"name":"祭祀小鬼","type":1,"multiple":7,"icon":"","aspect":"1003","speed":1.0,"super_speed":2.0,"zoom_factor":1.0,"exp_value":5}
+      ,"1006":{"ID":1006,"name":"哥布林刺客","type":1,"multiple":7,"icon":"","aspect":"1006","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
 
-      ,"1007":{"ID":1007,"name":"冥蛊虫","type":1,"multiple":8,"icon":"","aspect":"1003","speed":1.0,"super_speed":2.0,"zoom_factor":1.0,"exp_value":5}
+      ,"1007":{"ID":1007,"name":"岩鼠","type":1,"multiple":8,"icon":"","aspect":"1007","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
 
-      ,"1008":{"ID":1008,"name":"独眼魔","type":1,"multiple":9,"icon":"","aspect":"1003","speed":1.0,"super_speed":2.0,"zoom_factor":1.0,"exp_value":5}
+      ,"1008":{"ID":1008,"name":"异化冥蛊虫","type":1,"multiple":9,"icon":"","aspect":"1008","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
 
-      ,"1009":{"ID":1009,"name":"石头人","type":1,"multiple":10,"icon":"","aspect":"1003","speed":1.0,"super_speed":2.0,"zoom_factor":1.0,"exp_value":5}
+      ,"1009":{"ID":1009,"name":"祭祀小鬼","type":1,"multiple":10,"icon":"","aspect":"1009","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
 
-      ,"1010":{"ID":1010,"name":"武器哥布林","type":1,"multiple":12,"icon":"","aspect":"1003","speed":1.0,"super_speed":2.0,"zoom_factor":1.0,"exp_value":5}
+      ,"1010":{"ID":1010,"name":"幽面","type":1,"multiple":12,"icon":"","aspect":"1010","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
 
-      ,"1011":{"ID":1011,"name":"岩鼠","type":1,"multiple":15,"icon":"","aspect":"1003","speed":1.0,"super_speed":2.0,"zoom_factor":1.0,"exp_value":5}
+      ,"1011":{"ID":1011,"name":"祭师","type":1,"multiple":15,"icon":"","aspect":"1011","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
 
-      ,"1012":{"ID":1012,"name":"幽面","type":1,"multiple":18,"icon":"","aspect":"1003","speed":1.0,"super_speed":2.0,"zoom_factor":1.0,"exp_value":5}
+      ,"1012":{"ID":1012,"name":"武器哥布林","type":1,"multiple":18,"icon":"","aspect":"1012","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
 
-      ,"1013":{"ID":1013,"name":"普通怪物13","type":1,"multiple":20,"icon":"","aspect":"1003","speed":1.0,"super_speed":2.0,"zoom_factor":1.0,"exp_value":5}
+      ,"1013":{"ID":1013,"name":"石头人","type":1,"multiple":20,"icon":"","aspect":"1013","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
 
-      ,"1014":{"ID":1014,"name":"普通怪物14","type":1,"multiple":20,"icon":"","aspect":"1003","speed":1.0,"super_speed":2.0,"zoom_factor":1.0,"exp_value":5}
+      ,"1014":{"ID":1014,"name":"异化石头人","type":1,"multiple":20,"icon":"","aspect":"1014","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
 
-      ,"1015":{"ID":1015,"name":"普通怪物15","type":1,"multiple":25,"icon":"","aspect":"1003","speed":1.0,"super_speed":2.0,"zoom_factor":1.0,"exp_value":5}
+      ,"1015":{"ID":1015,"name":"独眼魔","type":1,"multiple":25,"icon":"","aspect":"1015","speed":1.0,"super_speed":1.5,"zoom_factor":1.0,"exp_value":5}
 
       ,"2001":{"ID":2001,"name":"精英怪物1","type":2,"multiple":30,"icon":"","aspect":"1003","speed":1.0,"super_speed":2.0,"zoom_factor":1.0,"exp_value":6}
 

GameConfig/ts/M_skill.ts

@@ -2,13 +2,21 @@
 
 export default class M_skill {
   private static data =
-      {"1001":{"ID":1001,"hero_id":1001,"skill_leve":1,"bullet_num":1,"bullet_radius":200,"attack_distance":1000,"skill_des":"扔出1把旋转大刀"}
+      {"1001":{"ID":1001,"hero_id":1001,"skill_leve":1,"bullet_num":1,"bullet_radius":20,"attack_distance":1000,"skill_des":"扔出1把旋转大刀"}
 
-      ,"1002":{"ID":1002,"hero_id":1001,"skill_leve":2,"bullet_num":2,"bullet_radius":200,"attack_distance":1000,"skill_des":"扔出2把旋转大刀"}
+      ,"1002":{"ID":1002,"hero_id":1001,"skill_leve":2,"bullet_num":2,"bullet_radius":20,"attack_distance":1000,"skill_des":"扔出2把旋转大刀"}
 
-      ,"1003":{"ID":1003,"hero_id":1001,"skill_leve":3,"bullet_num":4,"bullet_radius":200,"attack_distance":1000,"skill_des":"扔出4把旋转大刀"}
+      ,"1003":{"ID":1003,"hero_id":1001,"skill_leve":3,"bullet_num":4,"bullet_radius":20,"attack_distance":1000,"skill_des":"扔出4把旋转大刀"}
 
-      ,"1004":{"ID":1004,"hero_id":1001,"skill_leve":4,"bullet_num":8,"bullet_radius":200,"attack_distance":1000,"skill_des":"扔出8把旋转大刀"}
+      ,"1004":{"ID":1004,"hero_id":1001,"skill_leve":4,"bullet_num":8,"bullet_radius":20,"attack_distance":1000,"skill_des":"扔出8把旋转大刀"}
+
+      ,"1101":{"ID":1101,"hero_id":1002,"skill_leve":1,"bullet_num":1,"bullet_radius":20,"attack_distance":100,"skill_des":"围绕1个魔法雷球"}
+
+      ,"1102":{"ID":1102,"hero_id":1002,"skill_leve":2,"bullet_num":2,"bullet_radius":20,"attack_distance":100,"skill_des":"围绕2个魔法雷球"}
+
+      ,"1103":{"ID":1103,"hero_id":1002,"skill_leve":3,"bullet_num":4,"bullet_radius":20,"attack_distance":100,"skill_des":"围绕4个魔法雷球"}
+
+      ,"1104":{"ID":1104,"hero_id":1002,"skill_leve":4,"bullet_num":6,"bullet_radius":20,"attack_distance":100,"skill_des":"围绕6个魔法雷球"}
 
       }// ID:ID, hero_id:英雄ID, skill_leve:技能等级, bullet_num:子弹数量, bullet_radius:子弹半径, attack_distance:攻击距离, skill_des:技能描述