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

GameConfig/CFG.check

@@ -6,7 +6,7 @@ D:\git\newWork\Config\GameConfig\M_music.xls:-1600470119
 D:\git\newWork\Config\GameConfig\M_everyday_task.xls:1313859929
 D:\git\newWork\Config\GameConfig\M_avatar.xls:-1243852077
 D:\git\newWork\Config\GameConfig\M_equipment.xls:1464015089
-D:\git\newWork\Config\GameConfig\M_stage_battle.xls:1603555430
+D:\git\newWork\Config\GameConfig\M_stage_battle.xls:993590214
 D:\git\newWork\Config\GameConfig\M_game_level_config.xls:-1372247746
 D:\git\newWork\Config\GameConfig\M_magic_array_config.xls:-1146600581
 D:\git\newWork\Config\GameConfig\M_shop.xls:-1571633677