Merge branch 'develop' of http://8.134.253.64:3000/huangjinghao/FishConfig into develop

GameConfig/CFG.check

@@ -1,17 +1,18 @@
-D:\project\FishConfig\GameConfig\M_un_lock_battle.xls:-1684697208
-D:\project\FishConfig\GameConfig\M_game_battle_field.xls:-1453751636
-D:\project\FishConfig\GameConfig\M_Global_Config.xls:-1360155821
-D:\project\FishConfig\GameConfig\M_skill.xls:632769922
-D:\project\FishConfig\GameConfig\M_item.xls:1897453854
-D:\project\FishConfig\GameConfig\M_magic_array_config.xls:-744971579
-D:\project\FishConfig\GameConfig\M_shop.xls:1969883197
-D:\project\FishConfig\GameConfig\M_i18n.xls:-960840821
-D:\project\FishConfig\GameConfig\M_test.xls:-85533968
-D:\project\FishConfig\GameConfig\M_equipment.xls:-40247005
-D:\project\FishConfig\GameConfig\SensitiveWordCFG.xls:-583314849
-D:\project\FishConfig\GameConfig\M_everyday_task.xls:1908970699
-D:\project\FishConfig\GameConfig\M_hero.xls:322841730
-D:\project\FishConfig\GameConfig\M_game_level_config.xls:2113044321
-D:\project\FishConfig\GameConfig\M_monster.xls:-480413514
-D:\project\FishConfig\GameConfig\M_fish_scheme.xls:731680409
-D:\project\FishConfig\GameConfig\M_vip_config.xls:-722023137
+D:\git\newWork\Config\GameConfig\M_game_battle_field.xls:-1453751636
+D:\git\newWork\Config\GameConfig\M_monster.xls:-480413514
+D:\git\newWork\Config\GameConfig\M_i18n.xls:-960840821
+D:\git\newWork\Config\GameConfig\M_un_lock_battle.xls:-1684697208
+D:\git\newWork\Config\GameConfig\M_everyday_task.xls:1908970699
+D:\git\newWork\Config\GameConfig\M_avatar.xls:-1243852077
+D:\git\newWork\Config\GameConfig\M_equipment.xls:-40247005
+D:\git\newWork\Config\GameConfig\M_game_level_config.xls:2113044321
+D:\git\newWork\Config\GameConfig\M_magic_array_config.xls:-744971579
+D:\git\newWork\Config\GameConfig\M_shop.xls:1969883197
+D:\git\newWork\Config\GameConfig\M_item.xls:-908156757
+D:\git\newWork\Config\GameConfig\M_fish_scheme.xls:731680409
+D:\git\newWork\Config\GameConfig\M_Global_Config.xls:-1360155821
+D:\git\newWork\Config\GameConfig\M_hero.xls:322841730
+D:\git\newWork\Config\GameConfig\M_vip_config.xls:-722023137
+D:\git\newWork\Config\GameConfig\SensitiveWordCFG.xls:-583314849
+D:\git\newWork\Config\GameConfig\M_skill.xls:632769922
+D:\git\newWork\Config\GameConfig\M_test.xls:-85533968