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

GameConfig/A_New_BuildAll.bat

@@ -17,6 +17,7 @@ node copy.js ts\M_equipment.ts ..\..\game-client\assets\Script\Config
 node copy.js ts\M_everyday_task.ts ..\..\game-client\assets\Script\Config
 node copy.js ts\M_shop.ts ..\..\game-client\assets\Script\Config
 node copy.js ts\M_vip_config.ts ..\..\game-client\assets\Script\Config
+node copy.js ts\M_avatar.ts ..\..\game-client\assets\Script\Config
 
 @echo off
 ::if "%nopause%" == "true" (@echo on) else (pause)

GameConfig/CFG.check

@@ -1,10 +1,10 @@
 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_i18n.xls:983202679
 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_equipment.xls:114573732
 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