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

GameConfig/A_New_BuildAll.bat

@@ -18,6 +18,7 @@ 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
+node copy.js ts\M_recharge.ts ..\..\game-client\assets\Script\Config
 
 @echo off
 ::if "%nopause%" == "true" (@echo on) else (pause)

GameConfig/CFG.check

@@ -1,6 +1,6 @@
 D:\git\newWork\Config\GameConfig\M_game_battle_field.xls:-529626676
 D:\git\newWork\Config\GameConfig\M_monster.xls:1945104606
-D:\git\newWork\Config\GameConfig\M_i18n.xls:-1815190029
+D:\git\newWork\Config\GameConfig\M_i18n.xls:1060674419
 D:\git\newWork\Config\GameConfig\M_un_lock_battle.xls:2101922363
 D:\git\newWork\Config\GameConfig\M_everyday_task.xls:105106037
 D:\git\newWork\Config\GameConfig\M_avatar.xls:-1243852077
@@ -10,10 +10,11 @@ D:\git\newWork\Config\GameConfig\M_game_level_config.xls:-128301575
 D:\git\newWork\Config\GameConfig\M_magic_array_config.xls:1031783913
 D:\git\newWork\Config\GameConfig\M_shop.xls:-1571633677
 D:\git\newWork\Config\GameConfig\M_item.xls:1006663114
+D:\git\newWork\Config\GameConfig\M_recharge.xls:924085572
 D:\git\newWork\Config\GameConfig\M_fish_scheme.xls:1727121218
 D:\git\newWork\Config\GameConfig\M_Global_Config.xls:-1354809079
 D:\git\newWork\Config\GameConfig\M_hero.xls:-1291198417
-D:\git\newWork\Config\GameConfig\M_vip_config.xls:-752457200
+D:\git\newWork\Config\GameConfig\M_vip_config.xls:314790118
 D:\git\newWork\Config\GameConfig\SensitiveWordCFG.xls:-583314849
-D:\git\newWork\Config\GameConfig\M_skill.xls:-1810360543
+D:\git\newWork\Config\GameConfig\M_skill.xls:2023171520
 D:\git\newWork\Config\GameConfig\M_test.xls:-85533968