Merge remote-tracking branch 'origin/develop' into develop

GameConfig/CFG.check

@@ -1,6 +1,6 @@
 D:\git\newWork\Config\GameConfig\M_game_battle_field.xls:-1668593709
 D:\git\newWork\Config\GameConfig\M_monster.xls:-1235680395
-D:\git\newWork\Config\GameConfig\M_i18n.xls:-270544830
+D:\git\newWork\Config\GameConfig\M_i18n.xls:435805162
 D:\git\newWork\Config\GameConfig\M_un_lock_battle.xls:84348074
 D:\git\newWork\Config\GameConfig\M_everyday_task.xls:949185213
 D:\git\newWork\Config\GameConfig\M_vip_config.xls:1878630432
@@ -8,10 +8,10 @@ D:\git\newWork\Config\GameConfig\M_equipment.xls:32694818
 D:\git\newWork\Config\GameConfig\M_game_level_config.xls:-610292667
 D:\git\newWork\Config\GameConfig\M_magic_array_config.xls:-124973679
 D:\git\newWork\Config\GameConfig\M_shop.xls:-598498963
-D:\git\newWork\Config\GameConfig\M_item.xls:2021392483
+D:\git\newWork\Config\GameConfig\M_item.xls:1206281347
 D:\git\newWork\Config\GameConfig\M_fish_scheme.xls:435403286
 D:\git\newWork\Config\GameConfig\M_Global_Config.xls:-1360155821
-D:\git\newWork\Config\GameConfig\M_hero.xls:1076969703
+D:\git\newWork\Config\GameConfig\M_hero.xls:-1988414807
 D:\git\newWork\Config\GameConfig\SensitiveWordCFG.xls:-583314849
 D:\git\newWork\Config\GameConfig\M_skill.xls:1915571819
 D:\git\newWork\Config\GameConfig\M_test.xls:444037689

GameRes/Battle/skill/狂战士技能1001/1001.atlas

@@ -0,0 +1,27 @@
+
+1001.png
+size: 715,401
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+1
+  rotate: true
+  xy: 407, 237
+  size: 162, 306
+  orig: 162, 306
+  offset: 0, 0
+  index: -1
+dg14
+  rotate: true
+  xy: 407, 45
+  size: 190, 193
+  orig: 205, 205
+  offset: 9, 6
+  index: -1
+dg2
+  rotate: true
+  xy: 2, 2
+  size: 397, 403
+  orig: 410, 410
+  offset: 0, 0
+  index: -1

GameRes/Battle/skill/闪电球技能1002/1002.atlas

@@ -0,0 +1,76 @@
+
+1002.png
+size: 134,275
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+1
+  rotate: false
+  xy: 2, 230
+  size: 43, 43
+  orig: 43, 43
+  offset: 0, 0
+  index: -1
+TX1/sd1_000
+  rotate: false
+  xy: 69, 2
+  size: 63, 61
+  orig: 65, 65
+  offset: 2, 3
+  index: -1
+TX1/sd1_001
+  rotate: false
+  xy: 2, 5
+  size: 65, 58
+  orig: 65, 65
+  offset: 0, 4
+  index: -1
+TX1/sd1_002
+  rotate: false
+  xy: 2, 65
+  size: 63, 55
+  orig: 65, 65
+  offset: 0, 4
+  index: -1
+TX1/sd1_003
+  rotate: false
+  xy: 47, 226
+  size: 65, 47
+  orig: 65, 65
+  offset: 0, 6
+  index: -1
+TX1/sd1_004
+  rotate: false
+  xy: 2, 176
+  size: 63, 48
+  orig: 65, 65
+  offset: 2, 7
+  index: -1
+TX1/sd1_005
+  rotate: false
+  xy: 2, 122
+  size: 65, 52
+  orig: 65, 65
+  offset: 0, 9
+  index: -1
+TX1/sd1_006
+  rotate: false
+  xy: 67, 176
+  size: 63, 48
+  orig: 65, 65
+  offset: 0, 12
+  index: -1
+TX1/sd1_007
+  rotate: false
+  xy: 69, 122
+  size: 58, 52
+  orig: 65, 65
+  offset: 0, 9
+  index: -1
+TX1/sd1_008
+  rotate: true
+  xy: 67, 65
+  size: 55, 59
+  orig: 65, 65
+  offset: 2, 1
+  index: -1