Merge branch 'master' of http://git.dashgame.com/gsgundam/garden_resources

art/人物初设3套/人物动画/stand_tex.json

@@ -1 +0,0 @@
-{"imagePath":"stand_tex.png","SubTexture":[{"width":646,"y":1,"height":391,"name":"脑壳1","x":1},{"width":45,"y":370,"height":188,"name":"腿2个提供1个","x":965},{"width":62,"y":185,"height":183,"name":"右手你的右手！！","x":915},{"y":217,"frameX":0,"frameHeight":142,"frameY":-3,"width":212,"frameWidth":212,"height":135,"name":"裙子1","x":649},{"width":86,"y":1,"height":182,"name":"左手看清左手你的左手！！","x":877},{"width":35,"y":185,"height":51,"name":"脖子","x":877},{"y":238,"frameX":0,"frameHeight":48,"frameY":-10,"width":31,"frameWidth":44,"height":38,"name":"鞋子1","x":863},{"y":217,"frameX":-22,"frameHeight":35,"frameY":-12,"width":12,"frameWidth":56,"height":10,"name":"嘴巴1","x":863},{"width":264,"y":354,"height":95,"name":"眼睛1","x":649},{"width":226,"y":1,"height":214,"name":"头饰品1","x":649},{"width":165,"y":394,"height":111,"name":"上衣1","x":1}],"name":"stand_ske"}

art/人物初设3套/人物动画/备份/stand_tex.json

@@ -1 +0,0 @@
-{"imagePath":"stand_tex.png","SubTexture":[{"width":45,"y":138,"height":188,"name":"腿2个提供1个","x":649},{"width":62,"y":1,"height":183,"name":"右手你的右手！！","x":951},{"y":1,"frameX":0,"frameHeight":142,"frameY":-3,"width":212,"frameWidth":212,"height":135,"name":"裙子1","x":649},{"width":86,"y":1,"height":182,"name":"左手看清左手你的左手！！","x":863},{"width":646,"y":1,"height":391,"name":"脑壳1","x":1},{"width":35,"y":138,"height":51,"name":"脖子","x":696},{"width":165,"y":394,"height":111,"name":"上衣1","x":267},{"y":138,"frameX":0,"frameHeight":48,"frameY":-10,"width":31,"frameWidth":44,"height":38,"name":"鞋子1","x":733},{"y":491,"frameX":-22,"frameHeight":35,"frameY":-12,"width":12,"frameWidth":56,"height":10,"name":"嘴巴1","x":1},{"width":264,"y":394,"height":95,"name":"眼睛1","x":1}],"name":"NewProject"}