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

GameConfig/CFG.check

@@ -1,8 +1,8 @@
 D:\git\newWork\Config\GameConfig\M_game_battle_field.xls:-1766331006
 D:\git\newWork\Config\GameConfig\M_monster.xls:717434001
-D:\git\newWork\Config\GameConfig\M_i18n.xls:-314618994
+D:\git\newWork\Config\GameConfig\M_i18n.xls:2090164137
 D:\git\newWork\Config\GameConfig\M_un_lock_battle.xls:821085365
-D:\git\newWork\Config\GameConfig\M_music.xls:559991838
+D:\git\newWork\Config\GameConfig\M_music.xls:-1191257532
 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
@@ -15,8 +15,8 @@ D:\git\newWork\Config\GameConfig\M_recharge.xls:1593140846
 D:\git\newWork\Config\GameConfig\M_fish_scheme.xls:488944993
 D:\git\newWork\Config\GameConfig\M_Global_Config.xls:2001309812
 D:\git\newWork\Config\GameConfig\M_stage_battle_field.xls:-312980755
-D:\git\newWork\Config\GameConfig\M_hero.xls:1462047797
+D:\git\newWork\Config\GameConfig\M_hero.xls:-157492041
 D:\git\newWork\Config\GameConfig\M_vip_config.xls:1433315728
 D:\git\newWork\Config\GameConfig\SensitiveWordCFG.xls:-583314849
-D:\git\newWork\Config\GameConfig\M_skill.xls:708748857
+D:\git\newWork\Config\GameConfig\M_skill.xls:-872168429
 D:\git\newWork\Config\GameConfig\M_test.xls:-85533968