配置表BUG修复。

GameConfig/CFG.check

@@ -1,17 +1,17 @@
-D:\git\newWork\Config\GameConfig\M_game_battle_field.xls:946351732
-D:\git\newWork\Config\GameConfig\M_monster.xls:-920703068
-D:\git\newWork\Config\GameConfig\M_i18n.xls:-1470678706
-D:\git\newWork\Config\GameConfig\M_un_lock_battle.xls:-497439848
-D:\git\newWork\Config\GameConfig\M_everyday_task.xls:1066732621
-D:\git\newWork\Config\GameConfig\M_vip_config.xls:-802558796
-D:\git\newWork\Config\GameConfig\M_equipment.xls:-1825178225
-D:\git\newWork\Config\GameConfig\M_game_level_config.xls:2009806508
-D:\git\newWork\Config\GameConfig\M_magic_array_config.xls:-1464488892
-D:\git\newWork\Config\GameConfig\M_shop.xls:-208000670
-D:\git\newWork\Config\GameConfig\M_item.xls:-956528580
-D:\git\newWork\Config\GameConfig\M_fish_scheme.xls:1825125196
+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_i18n.xls:-1915081204
+D:\git\newWork\Config\GameConfig\M_un_lock_battle.xls:84348074
+D:\git\newWork\Config\GameConfig\M_everyday_task.xls:949185213
+D:\git\newWork\Config\GameConfig\M_vip_config.xls:1878630432
+D:\git\newWork\Config\GameConfig\M_equipment.xls:32694818
+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_Global_Config.xls:359064959
-D:\git\newWork\Config\GameConfig\M_hero.xls:510642468
+D:\git\newWork\Config\GameConfig\M_hero.xls:1200156844
 D:\git\newWork\Config\GameConfig\SensitiveWordCFG.xls:-583314849
-D:\git\newWork\Config\GameConfig\M_skill.xls:1875916720
-D:\git\newWork\Config\GameConfig\M_test.xls:209833058
+D:\git\newWork\Config\GameConfig\M_skill.xls:1202238008
+D:\git\newWork\Config\GameConfig\M_test.xls:444037689

GameConfig/Lua/M_equipment.lua

@@ -9,6 +9,7 @@ end
 
 function M_equipment:init()
 	self.datas = {}
+	self.datas[1001] = {ID = 1001, itemType = 1, leve = 1, quality = "普通", cost1 = {2,1000}, cost2 = {9,1}, reward = {}, atk = nil, hp = 10, atkpct = nil, hppct = 100, crtpct = nil, movepct = nil}
 	self.datas[1002] = {ID = 1002, itemType = 1, leve = 2, quality = "普通", cost1 = {2,1500}, cost2 = {9,3}, reward = {}, atk = nil, hp = 15, atkpct = nil, hppct = 100, crtpct = nil, movepct = nil}
 	self.datas[1003] = {ID = 1003, itemType = 1, leve = 3, quality = "普通", cost1 = {2,2000}, cost2 = {9,5}, reward = {}, atk = nil, hp = 20, atkpct = nil, hppct = 100, crtpct = nil, movepct = nil}
 	self.datas[1004] = {ID = 1004, itemType = 1, leve = 4, quality = "普通", cost1 = {2,2500}, cost2 = {9,7}, reward = {}, atk = nil, hp = 25, atkpct = nil, hppct = 100, crtpct = nil, movepct = nil}

GameConfig/Lua/M_everyday_task.lua

@@ -9,6 +9,7 @@ end
 
 function M_everyday_task:init()
 	self.datas = {}
+	self.datas[1001] = {ID = 1001, taskType = 1, des = "无尽模式魔法阵使用2000万魔币", parameter = 20000000, reward = {7,1}, unlock = 0}
 	self.datas[1002] = {ID = 1002, taskType = 1, des = "无尽模式魔法阵使用4000万魔币", parameter = 40000000, reward = {7,1}, unlock = 0}
 	self.datas[1003] = {ID = 1003, taskType = 1, des = "无尽模式魔法阵使用6000万魔币", parameter = 60000000, reward = {7,1}, unlock = 0}
 	self.datas[1004] = {ID = 1004, taskType = 1, des = "无尽模式魔法阵使用1亿魔币", parameter = 100000000, reward = {7,2}, unlock = 0}

GameConfig/Lua/M_fish_scheme.lua

@@ -9,6 +9,7 @@ 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}

GameConfig/Lua/M_game_battle_field.lua

@@ -9,6 +9,7 @@ end
 
 function M_game_battle_field:init()
 	self.datas = {}
+	self.datas[1001] = {ID = 1001, monster_id = 1001, scene_type = 1, weight = 20, max_num = 2000, kill_count = {1,1}, award_drop_prob = 0.25}
 	self.datas[1002] = {ID = 1002, monster_id = 1002, scene_type = 1, weight = 20, max_num = 2000, kill_count = {2,3}, award_drop_prob = 0.33}
 end
 

GameConfig/Lua/M_game_level_config.lua

@@ -9,6 +9,7 @@ end
 
 function M_game_level_config:init()
 	self.datas = {}
+	self.datas[1000] = {ID = 1000, leve = 1, up_exp = 10, monster_num = 5}
 	self.datas[1001] = {ID = 1001, leve = 2, up_exp = 20, monster_num = 7}
 	self.datas[1002] = {ID = 1002, leve = 3, up_exp = 30, monster_num = 9}
 	self.datas[1003] = {ID = 1003, leve = 4, up_exp = 40, monster_num = 10}

GameConfig/Lua/M_hero.lua

@@ -9,6 +9,7 @@ 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}

GameConfig/Lua/M_i18n.lua

@@ -9,6 +9,7 @@ end
 
 function M_i18n:init()
 	self.datas = {}
+	self.datas["10001"] = {ID = "10001", zh = "观看视频", en = "Watch Video"}
 	self.datas["10002"] = {ID = "10002", zh = "今日剩余次数：#&0次", en = "Remaining times today: #&0 times"}
 	self.datas["10003"] = {ID = "10003", zh = "魔法转盘", en = "Magic Carousel"}
 	self.datas["10004"] = {ID = "10004", zh = "神秘事务司", en = "Division of Mystery Affairs"}

GameConfig/Lua/M_item.lua

@@ -9,6 +9,7 @@ end
 
 function M_item:init()
 	self.datas = {}
+	self.datas[1] = {ID = 1, name = "水晶", desc = "充值货币", type = 1, quality = 1, icon = ""}
 	self.datas[2] = {ID = 2, name = "魔币", desc = "打怪消耗的货币", type = 1, quality = 1, icon = ""}
 	self.datas[3] = {ID = 3, name = "魔导石", desc = "可用于积分商城兑换", type = 1, quality = 1, icon = ""}
 	self.datas[4] = {ID = 4, name = "魔法石", desc = "用于解锁魔法阵等级", type = 2, quality = 3, icon = ""}

GameConfig/Lua/M_magic_array_config.lua

@@ -9,6 +9,7 @@ end
 
 function M_magic_array_config:init()
 	self.datas = {}
+	self.datas[1001] = {ID = 1001, level = 1, up_cost = {4,1}, atk_cost = {2,100}, un_lock_award = {2,100}, atk = 1, hp = 1, icon = "", m_stone = "1", mgc_stone = 0.001}
 	self.datas[1002] = {ID = 1002, level = 2, up_cost = {4,2}, atk_cost = {2,200}, un_lock_award = {2,100}, atk = 2, hp = 2, icon = "", m_stone = "2", mgc_stone = 0.002}
 	self.datas[1003] = {ID = 1003, level = 3, up_cost = {4,4}, atk_cost = {2,300}, un_lock_award = {2,100}, atk = 3, hp = 3, icon = "", m_stone = "3", mgc_stone = 0.003}
 	self.datas[1004] = {ID = 1004, level = 4, up_cost = {4,8}, atk_cost = {2,400}, un_lock_award = {2,100}, atk = 4, hp = 4, icon = "", m_stone = "4", mgc_stone = 0.004}

GameConfig/Lua/M_monster.lua

@@ -9,6 +9,7 @@ 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[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}

GameConfig/Lua/M_shop.lua

@@ -9,6 +9,7 @@ end
 
 function M_shop:init()
 	self.datas = {}
+	self.datas[1001] = {ID = 1001, shop_type = 1, cost_Item = {1,100}, reward = {2,20000}, icon = "", sort = 1, condition = nil, value = ""}
 	self.datas[1002] = {ID = 1002, shop_type = 1, cost_Item = {1,3000}, reward = {2,600000}, icon = "", sort = 2, condition = nil, value = ""}
 	self.datas[1003] = {ID = 1003, shop_type = 1, cost_Item = {1,9800}, reward = {2,1960000}, icon = "", sort = 3, condition = nil, value = ""}
 	self.datas[1004] = {ID = 1004, shop_type = 1, cost_Item = {1,19800}, reward = {2,3960000}, icon = "", sort = 4, condition = nil, value = ""}

GameConfig/Lua/M_skill.lua

@@ -9,6 +9,7 @@ end
 
 function M_skill:init()
 	self.datas = {}
+	self.datas[1001] = {ID = 1001, hero_id = 1001, skill_leve = 1, bullet_num = 1, bullet_radius = 2, attack_distance = 10, skill_des = "扔出1把旋转大刀"}
 	self.datas[1002] = {ID = 1002, hero_id = 1001, skill_leve = 2, bullet_num = 2, bullet_radius = 2, attack_distance = 10, skill_des = "扔出2把旋转大刀"}
 	self.datas[1003] = {ID = 1003, hero_id = 1001, skill_leve = 3, bullet_num = 4, bullet_radius = 2, attack_distance = 10, skill_des = "扔出4把旋转大刀"}
 	self.datas[1004] = {ID = 1004, hero_id = 1001, skill_leve = 4, bullet_num = 8, bullet_radius = 2, attack_distance = 10, skill_des = "扔出8把旋转大刀"}

GameConfig/Lua/M_test.lua

@@ -9,6 +9,7 @@ end
 
 function M_test:init()
 	self.datas = {}
+	self.datas["10001"] = {ID = "10001", xxx = "观看视频", ttt = "Watch Video"}
 	self.datas["10002"] = {ID = "10002", xxx = "今日剩余次数：#&0次", ttt = "Remaining times today: #&0 times"}
 	self.datas["10003"] = {ID = "10003", xxx = "魔法转盘", ttt = "Magic Carousel"}
 	self.datas["10004"] = {ID = "10004", xxx = "神秘事务司", ttt = "Division of Mystery Affairs"}

GameConfig/Lua/M_un_lock_battle.lua

@@ -9,6 +9,7 @@ end
 
 function M_un_lock_battle:init()
 	self.datas = {}
+	self.datas[1001] = {ID = 1001, battle_type = 1, un_lock_magic = 1, demand = 100, prohibit = 3000000, use_magic = {1,10}, fish_wave = {4,6}, fish_scheme = "1,1|2,1|3,2|4,2|5,2|6,2"}
 	self.datas[1002] = {ID = 1002, battle_type = 2, un_lock_magic = 11, demand = 2000, prohibit = 20000000, use_magic = {11,20}, fish_wave = {5,6}, fish_scheme = "1,1|2,1|3,2|4,2|5,2|6,2"}
 	self.datas[1003] = {ID = 1003, battle_type = 3, un_lock_magic = 19, demand = 10000, prohibit = 0, use_magic = {19,30}, fish_wave = {6,8}, fish_scheme = "1,1|2,1|3,2|4,2|5,2|6,2|7,2|8,2"}
 end

GameConfig/Lua/M_vip_config.lua

@@ -9,6 +9,7 @@ end
 
 function M_vip_config:init()
 	self.datas = {}
+	self.datas[1000] = {ID = 1000, leve = 0, vipexp = 6, everdayreward = {2,100}, skillquantity = 0}
 	self.datas[1001] = {ID = 1001, leve = 1, vipexp = 60, everdayreward = {2,200}, skillquantity = 1}
 	self.datas[1002] = {ID = 1002, leve = 2, vipexp = 120, everdayreward = {2,400}, skillquantity = 2}
 	self.datas[1003] = {ID = 1003, leve = 3, vipexp = 400, everdayreward = {2,800}, skillquantity = 3}

GameConfig/Xml/M_equipment.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Root>
+	<Data ID="1001" itemType="1" leve="1" quality="普通" cost1="2,1000" cost2="9,1" reward="" atk="" hp="10" atkpct="" hppct="100" crtpct="" movepct="" />
 	<Data ID="1002" itemType="1" leve="2" quality="普通" cost1="2,1500" cost2="9,3" reward="" atk="" hp="15" atkpct="" hppct="100" crtpct="" movepct="" />
 	<Data ID="1003" itemType="1" leve="3" quality="普通" cost1="2,2000" cost2="9,5" reward="" atk="" hp="20" atkpct="" hppct="100" crtpct="" movepct="" />
 	<Data ID="1004" itemType="1" leve="4" quality="普通" cost1="2,2500" cost2="9,7" reward="" atk="" hp="25" atkpct="" hppct="100" crtpct="" movepct="" />

GameConfig/Xml/M_everyday_task.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Root>
+	<Data ID="1001" taskType="1" des="无尽模式魔法阵使用2000万魔币" parameter="20000000" reward="7,1" unlock="0" />
 	<Data ID="1002" taskType="1" des="无尽模式魔法阵使用4000万魔币" parameter="40000000" reward="7,1" unlock="0" />
 	<Data ID="1003" taskType="1" des="无尽模式魔法阵使用6000万魔币" parameter="60000000" reward="7,1" unlock="0" />
 	<Data ID="1004" taskType="1" des="无尽模式魔法阵使用1亿魔币" parameter="100000000" reward="7,2" unlock="0" />

GameConfig/Xml/M_fish_scheme.xml

@@ -1,5 +1,6 @@
 <?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" />

GameConfig/Xml/M_game_battle_field.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Root>
+	<Data ID="1001" monster_id="1001" scene_type="1" weight="20" max_num="2000" kill_count="1,1" award_drop_prob="0.25" />
 	<Data ID="1002" monster_id="1002" scene_type="1" weight="20" max_num="2000" kill_count="2,3" award_drop_prob="0.33" />
 </Root>

GameConfig/Xml/M_game_level_config.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Root>
+	<Data ID="1000" leve="1" up_exp="10" monster_num="5" />
 	<Data ID="1001" leve="2" up_exp="20" monster_num="7" />
 	<Data ID="1002" leve="3" up_exp="30" monster_num="9" />
 	<Data ID="1003" leve="4" up_exp="40" monster_num="10" />

GameConfig/Xml/M_hero.xml

@@ -1,5 +1,6 @@
 <?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" />

GameConfig/Xml/M_i18n.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Root>
+	<Data ID="10001" zh="观看视频" en="Watch Video" />
 	<Data ID="10002" zh="今日剩余次数：#&amp;0次" en="Remaining times today: #&amp;0 times" />
 	<Data ID="10003" zh="魔法转盘" en="Magic Carousel" />
 	<Data ID="10004" zh="神秘事务司" en="Division of Mystery Affairs" />

GameConfig/Xml/M_item.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Root>
+	<Data ID="1" name="水晶" desc="充值货币" type="1" quality="1" icon="" />
 	<Data ID="2" name="魔币" desc="打怪消耗的货币" type="1" quality="1" icon="" />
 	<Data ID="3" name="魔导石" desc="可用于积分商城兑换" type="1" quality="1" icon="" />
 	<Data ID="4" name="魔法石" desc="用于解锁魔法阵等级" type="2" quality="3" icon="" />

GameConfig/Xml/M_magic_array_config.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Root>
+	<Data ID="1001" level="1" up_cost="4,1" atk_cost="2,100" un_lock_award="2,100" atk="1" hp="1" icon="" m_stone="1" mgc_stone="0.001" />
 	<Data ID="1002" level="2" up_cost="4,2" atk_cost="2,200" un_lock_award="2,100" atk="2" hp="2" icon="" m_stone="2" mgc_stone="0.002" />
 	<Data ID="1003" level="3" up_cost="4,4" atk_cost="2,300" un_lock_award="2,100" atk="3" hp="3" icon="" m_stone="3" mgc_stone="0.003" />
 	<Data ID="1004" level="4" up_cost="4,8" atk_cost="2,400" un_lock_award="2,100" atk="4" hp="4" icon="" m_stone="4" mgc_stone="0.004" />

GameConfig/Xml/M_monster.xml

@@ -1,5 +1,6 @@
 <?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="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" />

GameConfig/Xml/M_shop.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Root>
+	<Data ID="1001" shop_type="1" cost_Item="1,100" reward="2,20000" icon="" sort="1" condition="" value="" />
 	<Data ID="1002" shop_type="1" cost_Item="1,3000" reward="2,600000" icon="" sort="2" condition="" value="" />
 	<Data ID="1003" shop_type="1" cost_Item="1,9800" reward="2,1960000" icon="" sort="3" condition="" value="" />
 	<Data ID="1004" shop_type="1" cost_Item="1,19800" reward="2,3960000" icon="" sort="4" condition="" value="" />

GameConfig/Xml/M_skill.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Root>
+	<Data ID="1001" hero_id="1001" skill_leve="1" bullet_num="1" bullet_radius="2" attack_distance="10" skill_des="扔出1把旋转大刀" />
 	<Data ID="1002" hero_id="1001" skill_leve="2" bullet_num="2" bullet_radius="2" attack_distance="10" skill_des="扔出2把旋转大刀" />
 	<Data ID="1003" hero_id="1001" skill_leve="3" bullet_num="4" bullet_radius="2" attack_distance="10" skill_des="扔出4把旋转大刀" />
 	<Data ID="1004" hero_id="1001" skill_leve="4" bullet_num="8" bullet_radius="2" attack_distance="10" skill_des="扔出8把旋转大刀" />

GameConfig/Xml/M_test.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Root>
+	<Data ID="10001" xxx="观看视频" ttt="Watch Video" />
 	<Data ID="10002" xxx="今日剩余次数：#&amp;0次" ttt="Remaining times today: #&amp;0 times" />
 	<Data ID="10003" xxx="魔法转盘" ttt="Magic Carousel" />
 	<Data ID="10004" xxx="神秘事务司" ttt="Division of Mystery Affairs" />

GameConfig/Xml/M_un_lock_battle.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Root>
+	<Data ID="1001" battle_type="1" un_lock_magic="1" demand="100" prohibit="3000000" use_magic="1,10" fish_wave="4,6" fish_scheme="1,1|2,1|3,2|4,2|5,2|6,2" />
 	<Data ID="1002" battle_type="2" un_lock_magic="11" demand="2000" prohibit="20000000" use_magic="11,20" fish_wave="5,6" fish_scheme="1,1|2,1|3,2|4,2|5,2|6,2" />
 	<Data ID="1003" battle_type="3" un_lock_magic="19" demand="10000" prohibit="0" use_magic="19,30" fish_wave="6,8" fish_scheme="1,1|2,1|3,2|4,2|5,2|6,2|7,2|8,2" />
 </Root>

GameConfig/Xml/M_vip_config.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Root>
+	<Data ID="1000" leve="0" vipexp="6" everdayreward="2,100" skillquantity="0" />
 	<Data ID="1001" leve="1" vipexp="60" everdayreward="2,200" skillquantity="1" />
 	<Data ID="1002" leve="2" vipexp="120" everdayreward="2,400" skillquantity="2" />
 	<Data ID="1003" leve="3" vipexp="400" everdayreward="2,800" skillquantity="3" />

GameConfig/json/M_equipment.json

@@ -1,4 +1,6 @@
-{"1002":{"ID":1002,"itemType":1,"leve":2,"quality":"普通","cost1":[2,1500],"cost2":[9,3],"reward":[],"atk":0,"hp":15,"atkpct":0,"hppct":100,"crtpct":0,"movepct":0}
+{"1001":{"ID":1001,"itemType":1,"leve":1,"quality":"普通","cost1":[2,1000],"cost2":[9,1],"reward":[],"atk":0,"hp":10,"atkpct":0,"hppct":100,"crtpct":0,"movepct":0}
+
+,"1002":{"ID":1002,"itemType":1,"leve":2,"quality":"普通","cost1":[2,1500],"cost2":[9,3],"reward":[],"atk":0,"hp":15,"atkpct":0,"hppct":100,"crtpct":0,"movepct":0}
 
 ,"1003":{"ID":1003,"itemType":1,"leve":3,"quality":"普通","cost1":[2,2000],"cost2":[9,5],"reward":[],"atk":0,"hp":20,"atkpct":0,"hppct":100,"crtpct":0,"movepct":0}
 

GameConfig/json/M_everyday_task.json

@@ -1,4 +1,6 @@
-{"1002":{"ID":1002,"taskType":1,"des":"无尽模式魔法阵使用4000万魔币","parameter":40000000,"reward":[7,1],"unlock":0}
+{"1001":{"ID":1001,"taskType":1,"des":"无尽模式魔法阵使用2000万魔币","parameter":20000000,"reward":[7,1],"unlock":0}
+
+,"1002":{"ID":1002,"taskType":1,"des":"无尽模式魔法阵使用4000万魔币","parameter":40000000,"reward":[7,1],"unlock":0}
 
 ,"1003":{"ID":1003,"taskType":1,"des":"无尽模式魔法阵使用6000万魔币","parameter":60000000,"reward":[7,1],"unlock":0}
 

GameConfig/json/M_fish_scheme.json

@@ -1,4 +1,6 @@
-{"1002":{"ID":1002,"monster_id":1002,"fish_group":1,"num":10}
+{"1001":{"ID":1001,"monster_id":1001,"fish_group":1,"num":200}
+
+,"1002":{"ID":1002,"monster_id":1002,"fish_group":1,"num":10}
 
 ,"1003":{"ID":1003,"monster_id":1001,"fish_group":2,"num":200}
 

GameConfig/json/M_game_battle_field.json

@@ -1,3 +1,5 @@
-{"1002":{"ID":1002,"monster_id":1002,"scene_type":1,"weight":20,"max_num":2000,"kill_count":[2,3],"award_drop_prob":0.33}
+{"1001":{"ID":1001,"monster_id":1001,"scene_type":1,"weight":20,"max_num":2000,"kill_count":[1,1],"award_drop_prob":0.25}
+
+,"1002":{"ID":1002,"monster_id":1002,"scene_type":1,"weight":20,"max_num":2000,"kill_count":[2,3],"award_drop_prob":0.33}
 
 }

GameConfig/json/M_game_level_config.json

@@ -1,4 +1,6 @@
-{"1001":{"ID":1001,"leve":2,"up_exp":20,"monster_num":7}
+{"1000":{"ID":1000,"leve":1,"up_exp":10,"monster_num":5}
+
+,"1001":{"ID":1001,"leve":2,"up_exp":20,"monster_num":7}
 
 ,"1002":{"ID":1002,"leve":3,"up_exp":30,"monster_num":9}
 

GameConfig/json/M_hero.json

@@ -1,4 +1,6 @@
-{"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}
+{"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}
+
+,"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}
 

GameConfig/json/M_i18n.json

@@ -1,4 +1,6 @@
-{"10002":{"ID":"10002","zh":"今日剩余次数：#&0次","en":"Remaining times today: #&0 times"}
+{"10001":{"ID":"10001","zh":"观看视频","en":"Watch Video"}
+
+,"10002":{"ID":"10002","zh":"今日剩余次数：#&0次","en":"Remaining times today: #&0 times"}
 
 ,"10003":{"ID":"10003","zh":"魔法转盘","en":"Magic Carousel"}
 

GameConfig/json/M_item.json

@@ -1,4 +1,6 @@
-{"2":{"ID":2,"name":"魔币","desc":"打怪消耗的货币","type":1,"quality":1,"icon":""}
+{"1":{"ID":1,"name":"水晶","desc":"充值货币","type":1,"quality":1,"icon":""}
+
+,"2":{"ID":2,"name":"魔币","desc":"打怪消耗的货币","type":1,"quality":1,"icon":""}
 
 ,"3":{"ID":3,"name":"魔导石","desc":"可用于积分商城兑换","type":1,"quality":1,"icon":""}
 

GameConfig/json/M_magic_array_config.json

@@ -1,4 +1,6 @@
-{"1002":{"ID":1002,"level":2,"up_cost":[4,2],"atk_cost":[2,200],"un_lock_award":[2,100],"atk":2,"hp":2,"icon":"","m_stone":"2","mgc_stone":0.002}
+{"1001":{"ID":1001,"level":1,"up_cost":[4,1],"atk_cost":[2,100],"un_lock_award":[2,100],"atk":1,"hp":1,"icon":"","m_stone":"1","mgc_stone":0.001}
+
+,"1002":{"ID":1002,"level":2,"up_cost":[4,2],"atk_cost":[2,200],"un_lock_award":[2,100],"atk":2,"hp":2,"icon":"","m_stone":"2","mgc_stone":0.002}
 
 ,"1003":{"ID":1003,"level":3,"up_cost":[4,4],"atk_cost":[2,300],"un_lock_award":[2,100],"atk":3,"hp":3,"icon":"","m_stone":"3","mgc_stone":0.003}
 

GameConfig/json/M_monster.json

@@ -1,4 +1,6 @@
-{"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}
+{"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}
 
 ,"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}
 

GameConfig/json/M_shop.json

@@ -1,4 +1,6 @@
-{"1002":{"ID":1002,"shop_type":1,"cost_Item":[1,3000],"reward":[2,600000],"icon":"","sort":2,"condition":0,"value":""}
+{"1001":{"ID":1001,"shop_type":1,"cost_Item":[1,100],"reward":[2,20000],"icon":"","sort":1,"condition":0,"value":""}
+
+,"1002":{"ID":1002,"shop_type":1,"cost_Item":[1,3000],"reward":[2,600000],"icon":"","sort":2,"condition":0,"value":""}
 
 ,"1003":{"ID":1003,"shop_type":1,"cost_Item":[1,9800],"reward":[2,1960000],"icon":"","sort":3,"condition":0,"value":""}
 

GameConfig/json/M_skill.json

@@ -1,4 +1,6 @@
-{"1002":{"ID":1002,"hero_id":1001,"skill_leve":2,"bullet_num":2,"bullet_radius":2,"attack_distance":10,"skill_des":"扔出2把旋转大刀"}
+{"1001":{"ID":1001,"hero_id":1001,"skill_leve":1,"bullet_num":1,"bullet_radius":2,"attack_distance":10,"skill_des":"扔出1把旋转大刀"}
+
+,"1002":{"ID":1002,"hero_id":1001,"skill_leve":2,"bullet_num":2,"bullet_radius":2,"attack_distance":10,"skill_des":"扔出2把旋转大刀"}
 
 ,"1003":{"ID":1003,"hero_id":1001,"skill_leve":3,"bullet_num":4,"bullet_radius":2,"attack_distance":10,"skill_des":"扔出4把旋转大刀"}
 

GameConfig/json/M_test.json

@@ -1,4 +1,6 @@
-{"10002":{"ID":"10002","xxx":"今日剩余次数：#&0次","ttt":"Remaining times today: #&0 times"}
+{"10001":{"ID":"10001","xxx":"观看视频","ttt":"Watch Video"}
+
+,"10002":{"ID":"10002","xxx":"今日剩余次数：#&0次","ttt":"Remaining times today: #&0 times"}
 
 ,"10003":{"ID":"10003","xxx":"魔法转盘","ttt":"Magic Carousel"}
 

GameConfig/json/M_un_lock_battle.json

@@ -1,4 +1,6 @@
-{"1002":{"ID":1002,"battle_type":2,"un_lock_magic":11,"demand":2000,"prohibit":20000000,"use_magic":[11,20],"fish_wave":[5,6],"fish_scheme":"1,1|2,1|3,2|4,2|5,2|6,2"}
+{"1001":{"ID":1001,"battle_type":1,"un_lock_magic":1,"demand":100,"prohibit":3000000,"use_magic":[1,10],"fish_wave":[4,6],"fish_scheme":"1,1|2,1|3,2|4,2|5,2|6,2"}
+
+,"1002":{"ID":1002,"battle_type":2,"un_lock_magic":11,"demand":2000,"prohibit":20000000,"use_magic":[11,20],"fish_wave":[5,6],"fish_scheme":"1,1|2,1|3,2|4,2|5,2|6,2"}
 
 ,"1003":{"ID":1003,"battle_type":3,"un_lock_magic":19,"demand":10000,"prohibit":0,"use_magic":[19,30],"fish_wave":[6,8],"fish_scheme":"1,1|2,1|3,2|4,2|5,2|6,2|7,2|8,2"}
 

GameConfig/json/M_vip_config.json

@@ -1,4 +1,6 @@
-{"1001":{"ID":1001,"leve":1,"vipexp":60,"everdayreward":[2,200],"skillquantity":1}
+{"1000":{"ID":1000,"leve":0,"vipexp":6,"everdayreward":[2,100],"skillquantity":0}
+
+,"1001":{"ID":1001,"leve":1,"vipexp":60,"everdayreward":[2,200],"skillquantity":1}
 
 ,"1002":{"ID":1002,"leve":2,"vipexp":120,"everdayreward":[2,400],"skillquantity":2}
 

GameConfig/ts/M_equipment.ts

@@ -2,7 +2,9 @@
 
 export default class M_equipment {
   private static data =
-      {"1002":{"ID":1002,"itemType":1,"leve":2,"quality":"普通","cost1":[2,1500],"cost2":[9,3],"reward":[],"atk":0,"hp":15,"atkpct":0,"hppct":100,"crtpct":0,"movepct":0}
+      {"1001":{"ID":1001,"itemType":1,"leve":1,"quality":"普通","cost1":[2,1000],"cost2":[9,1],"reward":[],"atk":0,"hp":10,"atkpct":0,"hppct":100,"crtpct":0,"movepct":0}
+
+      ,"1002":{"ID":1002,"itemType":1,"leve":2,"quality":"普通","cost1":[2,1500],"cost2":[9,3],"reward":[],"atk":0,"hp":15,"atkpct":0,"hppct":100,"crtpct":0,"movepct":0}
 
       ,"1003":{"ID":1003,"itemType":1,"leve":3,"quality":"普通","cost1":[2,2000],"cost2":[9,5],"reward":[],"atk":0,"hp":20,"atkpct":0,"hppct":100,"crtpct":0,"movepct":0}
 

GameConfig/ts/M_everyday_task.ts

@@ -2,7 +2,9 @@
 
 export default class M_everyday_task {
   private static data =
-      {"1002":{"ID":1002,"taskType":1,"des":"无尽模式魔法阵使用4000万魔币","parameter":40000000,"reward":[7,1],"unlock":0}
+      {"1001":{"ID":1001,"taskType":1,"des":"无尽模式魔法阵使用2000万魔币","parameter":20000000,"reward":[7,1],"unlock":0}
+
+      ,"1002":{"ID":1002,"taskType":1,"des":"无尽模式魔法阵使用4000万魔币","parameter":40000000,"reward":[7,1],"unlock":0}
 
       ,"1003":{"ID":1003,"taskType":1,"des":"无尽模式魔法阵使用6000万魔币","parameter":60000000,"reward":[7,1],"unlock":0}
 

GameConfig/ts/M_fish_scheme.ts

@@ -2,7 +2,9 @@
 
 export default class M_fish_scheme {
   private static data =
-      {"1002":{"ID":1002,"monster_id":1002,"fish_group":1,"num":10}
+      {"1001":{"ID":1001,"monster_id":1001,"fish_group":1,"num":200}
+
+      ,"1002":{"ID":1002,"monster_id":1002,"fish_group":1,"num":10}
 
       ,"1003":{"ID":1003,"monster_id":1001,"fish_group":2,"num":200}
 

GameConfig/ts/M_game_battle_field.ts

@@ -2,7 +2,9 @@
 
 export default class M_game_battle_field {
   private static data =
-      {"1002":{"ID":1002,"monster_id":1002,"scene_type":1,"weight":20,"max_num":2000,"kill_count":[2,3],"award_drop_prob":0.33}
+      {"1001":{"ID":1001,"monster_id":1001,"scene_type":1,"weight":20,"max_num":2000,"kill_count":[1,1],"award_drop_prob":0.25}
+
+      ,"1002":{"ID":1002,"monster_id":1002,"scene_type":1,"weight":20,"max_num":2000,"kill_count":[2,3],"award_drop_prob":0.33}
 
       }// ID:ID, monster_id:怪物ID, scene_type:场地类型, weight:出场权重, max_num:最大数量, kill_count:击杀次数, award_drop_prob:魔币掉落概率（百分比）
 

GameConfig/ts/M_game_level_config.ts

@@ -2,7 +2,9 @@
 
 export default class M_game_level_config {
   private static data =
-      {"1001":{"ID":1001,"leve":2,"up_exp":20,"monster_num":7}
+      {"1000":{"ID":1000,"leve":1,"up_exp":10,"monster_num":5}
+
+      ,"1001":{"ID":1001,"leve":2,"up_exp":20,"monster_num":7}
 
       ,"1002":{"ID":1002,"leve":3,"up_exp":30,"monster_num":9}
 

GameConfig/ts/M_hero.ts

@@ -2,7 +2,9 @@
 
 export default class M_hero {
   private static data =
-      {"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}
+      {"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}
+
+      ,"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}
 

GameConfig/ts/M_i18n.ts

@@ -2,7 +2,9 @@
 
 export default class M_i18n {
   private static data =
-      {"10002":{"ID":"10002","zh":"今日剩余次数：#&0次","en":"Remaining times today: #&0 times"}
+      {"10001":{"ID":"10001","zh":"观看视频","en":"Watch Video"}
+
+      ,"10002":{"ID":"10002","zh":"今日剩余次数：#&0次","en":"Remaining times today: #&0 times"}
 
       ,"10003":{"ID":"10003","zh":"魔法转盘","en":"Magic Carousel"}
 

GameConfig/ts/M_item.ts

@@ -2,7 +2,9 @@
 
 export default class M_item {
   private static data =
-      {"2":{"ID":2,"name":"魔币","desc":"打怪消耗的货币","type":1,"quality":1,"icon":""}
+      {"1":{"ID":1,"name":"水晶","desc":"充值货币","type":1,"quality":1,"icon":""}
+
+      ,"2":{"ID":2,"name":"魔币","desc":"打怪消耗的货币","type":1,"quality":1,"icon":""}
 
       ,"3":{"ID":3,"name":"魔导石","desc":"可用于积分商城兑换","type":1,"quality":1,"icon":""}
 

GameConfig/ts/M_magic_array_config.ts

@@ -2,7 +2,9 @@
 
 export default class M_magic_array_config {
   private static data =
-      {"1002":{"ID":1002,"level":2,"up_cost":[4,2],"atk_cost":[2,200],"un_lock_award":[2,100],"atk":2,"hp":2,"icon":"","m_stone":"2","mgc_stone":0.002}
+      {"1001":{"ID":1001,"level":1,"up_cost":[4,1],"atk_cost":[2,100],"un_lock_award":[2,100],"atk":1,"hp":1,"icon":"","m_stone":"1","mgc_stone":0.001}
+
+      ,"1002":{"ID":1002,"level":2,"up_cost":[4,2],"atk_cost":[2,200],"un_lock_award":[2,100],"atk":2,"hp":2,"icon":"","m_stone":"2","mgc_stone":0.002}
 
       ,"1003":{"ID":1003,"level":3,"up_cost":[4,4],"atk_cost":[2,300],"un_lock_award":[2,100],"atk":3,"hp":3,"icon":"","m_stone":"3","mgc_stone":0.003}
 

GameConfig/ts/M_monster.ts

@@ -2,7 +2,9 @@
 
 export default class M_monster {
   private static data =
-      {"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}
+      {"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}
 
       ,"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}
 

GameConfig/ts/M_shop.ts

@@ -2,7 +2,9 @@
 
 export default class M_shop {
   private static data =
-      {"1002":{"ID":1002,"shop_type":1,"cost_Item":[1,3000],"reward":[2,600000],"icon":"","sort":2,"condition":0,"value":""}
+      {"1001":{"ID":1001,"shop_type":1,"cost_Item":[1,100],"reward":[2,20000],"icon":"","sort":1,"condition":0,"value":""}
+
+      ,"1002":{"ID":1002,"shop_type":1,"cost_Item":[1,3000],"reward":[2,600000],"icon":"","sort":2,"condition":0,"value":""}
 
       ,"1003":{"ID":1003,"shop_type":1,"cost_Item":[1,9800],"reward":[2,1960000],"icon":"","sort":3,"condition":0,"value":""}
 

GameConfig/ts/M_skill.ts

@@ -2,7 +2,9 @@
 
 export default class M_skill {
   private static data =
-      {"1002":{"ID":1002,"hero_id":1001,"skill_leve":2,"bullet_num":2,"bullet_radius":2,"attack_distance":10,"skill_des":"扔出2把旋转大刀"}
+      {"1001":{"ID":1001,"hero_id":1001,"skill_leve":1,"bullet_num":1,"bullet_radius":2,"attack_distance":10,"skill_des":"扔出1把旋转大刀"}
+
+      ,"1002":{"ID":1002,"hero_id":1001,"skill_leve":2,"bullet_num":2,"bullet_radius":2,"attack_distance":10,"skill_des":"扔出2把旋转大刀"}
 
       ,"1003":{"ID":1003,"hero_id":1001,"skill_leve":3,"bullet_num":4,"bullet_radius":2,"attack_distance":10,"skill_des":"扔出4把旋转大刀"}
 

GameConfig/ts/M_test.ts

@@ -2,7 +2,9 @@
 
 export default class M_test {
   private static data =
-      {"10002":{"ID":"10002","xxx":"今日剩余次数：#&0次","ttt":"Remaining times today: #&0 times"}
+      {"10001":{"ID":"10001","xxx":"观看视频","ttt":"Watch Video"}
+
+      ,"10002":{"ID":"10002","xxx":"今日剩余次数：#&0次","ttt":"Remaining times today: #&0 times"}
 
       ,"10003":{"ID":"10003","xxx":"魔法转盘","ttt":"Magic Carousel"}
 

GameConfig/ts/M_un_lock_battle.ts

@@ -2,7 +2,9 @@
 
 export default class M_un_lock_battle {
   private static data =
-      {"1002":{"ID":1002,"battle_type":2,"un_lock_magic":11,"demand":2000,"prohibit":20000000,"use_magic":[11,20],"fish_wave":[5,6],"fish_scheme":"1,1|2,1|3,2|4,2|5,2|6,2"}
+      {"1001":{"ID":1001,"battle_type":1,"un_lock_magic":1,"demand":100,"prohibit":3000000,"use_magic":[1,10],"fish_wave":[4,6],"fish_scheme":"1,1|2,1|3,2|4,2|5,2|6,2"}
+
+      ,"1002":{"ID":1002,"battle_type":2,"un_lock_magic":11,"demand":2000,"prohibit":20000000,"use_magic":[11,20],"fish_wave":[5,6],"fish_scheme":"1,1|2,1|3,2|4,2|5,2|6,2"}
 
       ,"1003":{"ID":1003,"battle_type":3,"un_lock_magic":19,"demand":10000,"prohibit":0,"use_magic":[19,30],"fish_wave":[6,8],"fish_scheme":"1,1|2,1|3,2|4,2|5,2|6,2|7,2|8,2"}
 

GameConfig/ts/M_vip_config.ts

@@ -2,7 +2,9 @@
 
 export default class M_vip_config {
   private static data =
-      {"1001":{"ID":1001,"leve":1,"vipexp":60,"everdayreward":[2,200],"skillquantity":1}
+      {"1000":{"ID":1000,"leve":0,"vipexp":6,"everdayreward":[2,100],"skillquantity":0}
+
+      ,"1001":{"ID":1001,"leve":1,"vipexp":60,"everdayreward":[2,200],"skillquantity":1}
 
       ,"1002":{"ID":1002,"leve":2,"vipexp":120,"everdayreward":[2,400],"skillquantity":2}