{"push_id":589130099,"size":6,"distinct_size":6,"ref":"refs/heads/master","head":"f72569d02799689557606a5be3e6f74de49c7560","before":"da9eafe8481585ed387e53b39272b88d5c55bf9e","commits":[{"sha":"9d2948790ffc4cda43e6455c53f6f73e20f79973","author":{"email":"8fa6c5b29b53aa1d0de66bc7914a6fac1a3b91b3@qq.com","name":"Uncle_SHAwn"},"message":"Merge pull request #4 from dsyaode/master\n\n合并到shawn本地","distinct":true,"url":"https://api.github.com/repos/dsyaode/projectgg.game/commits/9d2948790ffc4cda43e6455c53f6f73e20f79973"},{"sha":"00cefab5495974419f0a378e25affe74da7d5240","author":{"email":"1e63c974abf9806af2e16ca4be93034ee38e6dda@UNcledeMacBook-Pro.local","name":"uncle_shawn"},"message":"3.2\n\nmaplogic 道具 相关","distinct":true,"url":"https://api.github.com/repos/dsyaode/projectgg.game/commits/00cefab5495974419f0a378e25affe74da7d5240"},{"sha":"85c9f920ebc318769c379152255a2d50ae110123","author":{"email":"1e63c974abf9806af2e16ca4be93034ee38e6dda@UNcledeMacBook-Pro.local","name":"uncle_shawn"},"message":"Merge branch 'pr/5' into project_3.2_night\n\nConflicts:\n\tgreatGame/greatGame.userprefs","distinct":true,"url":"https://api.github.com/repos/dsyaode/projectgg.game/commits/85c9f920ebc318769c379152255a2d50ae110123"},{"sha":"068c8d764adf8cf21141c10dd88f6c607f63198c","author":{"email":"1e63c974abf9806af2e16ca4be93034ee38e6dda@UNcledeMacBook-Pro.local","name":"uncle_shawn"},"message":"Merge branch 'pr/6' into project_3.2_night\n\nConflicts:\n\tgreatGame/Assets/Resources/GameFonts/demobmfont/ShowDamageFont.prefab\n\ngreatGame/Assets/Resources/Prefabs/dungeon/map1_1/tileMapEditorData.asse\nt\n\tgreatGame/Assets/Resources/Prefabs/ui/UI_showDamage.prefab\n\tgreatGame/Assets/Scenes/leveltest1.unity\n\tgreatGame/greatGame.userprefs","distinct":true,"url":"https://api.github.com/repos/dsyaode/projectgg.game/commits/068c8d764adf8cf21141c10dd88f6c607f63198c"},{"sha":"e765c4931cb9d5160f953a38c807d010c999d19b","author":{"email":"1e63c974abf9806af2e16ca4be93034ee38e6dda@UNcledeMacBook-Pro.local","name":"uncle_shawn"},"message":"fix hp show","distinct":true,"url":"https://api.github.com/repos/dsyaode/projectgg.game/commits/e765c4931cb9d5160f953a38c807d010c999d19b"},{"sha":"f72569d02799689557606a5be3e6f74de49c7560","author":{"email":"838ea1b5e84a2e643118bc7841ccdbcb4f6f6d03@qq.com","name":"dsyaode"},"message":"Merge pull request #12 from uncleshawn/project_3.2_night\n\nProject 3.2 night meger into ds branch master","distinct":true,"url":"https://api.github.com/repos/dsyaode/projectgg.game/commits/f72569d02799689557606a5be3e6f74de49c7560"}]}