{"push_id":587071516,"size":8,"distinct_size":8,"ref":"refs/heads/master","head":"6e2b96a277dfaa0e93fe65f7e71d5d86c1c7aa94","before":"47d577bf2449817b8a1cab65d87600e5ee344202","commits":[{"sha":"4374aabfe8026d5f82d629ed3c11cf7532326698","author":{"email":"1e63c974abf9806af2e16ca4be93034ee38e6dda@UNcledeMacBook-Pro.local","name":"uncle_shawn"},"message":"Merge branch 'brance_shawn'","distinct":true,"url":"https://api.github.com/repos/uncleshawn/projectgg.game/commits/4374aabfe8026d5f82d629ed3c11cf7532326698"},{"sha":"19f7aa7363d4cf302e0fe06ef6d75d20cf234a6b","author":{"email":"838ea1b5e84a2e643118bc7841ccdbcb4f6f6d03@qq.com","name":"dsyaode"},"message":"d","distinct":true,"url":"https://api.github.com/repos/uncleshawn/projectgg.game/commits/19f7aa7363d4cf302e0fe06ef6d75d20cf234a6b"},{"sha":"07fe6687dfe0cc6fa688ab343be5ad13c3757af0","author":{"email":"838ea1b5e84a2e643118bc7841ccdbcb4f6f6d03@qq.com","name":"dsyaode"},"message":"df","distinct":true,"url":"https://api.github.com/repos/uncleshawn/projectgg.game/commits/07fe6687dfe0cc6fa688ab343be5ad13c3757af0"},{"sha":"0f8128aad0531e74b12fcab3f461e9ea636db3bd","author":{"email":"838ea1b5e84a2e643118bc7841ccdbcb4f6f6d03@qq.com","name":"dsyaode"},"message":"Merge branch 'master' into branch_ds","distinct":true,"url":"https://api.github.com/repos/uncleshawn/projectgg.game/commits/0f8128aad0531e74b12fcab3f461e9ea636db3bd"},{"sha":"ef6d613ee0179c6007c4ec19f67368bc3b7fa84e","author":{"email":"1e63c974abf9806af2e16ca4be93034ee38e6dda@UNcledeMacBook-Pro.local","name":"uncle_shawn"},"message":"Merge branch 'branch_ds' of https://github.com/dsyaode/projectgg.game","distinct":true,"url":"https://api.github.com/repos/uncleshawn/projectgg.game/commits/ef6d613ee0179c6007c4ec19f67368bc3b7fa84e"},{"sha":"1e262eb7c45a2f1f7b71d746fa224eba8c646b4f","author":{"email":"1e63c974abf9806af2e16ca4be93034ee38e6dda@UNcledeMacBook-Pro.local","name":"uncle_shawn"},"message":"Merge branch 'branch_ds' of https://github.com/dsyaode/projectgg.game","distinct":true,"url":"https://api.github.com/repos/uncleshawn/projectgg.game/commits/1e262eb7c45a2f1f7b71d746fa224eba8c646b4f"},{"sha":"c749b61a1177a419fe94411a781293afcbcb2784","author":{"email":"1e63c974abf9806af2e16ca4be93034ee38e6dda@UNcledeMacBook-Pro.local","name":"uncle_shawn"},"message":"换武器","distinct":true,"url":"https://api.github.com/repos/uncleshawn/projectgg.game/commits/c749b61a1177a419fe94411a781293afcbcb2784"},{"sha":"6e2b96a277dfaa0e93fe65f7e71d5d86c1c7aa94","author":{"email":"1e63c974abf9806af2e16ca4be93034ee38e6dda@UNcledeMacBook-Pro.local","name":"uncle_shawn"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tgreatGame/Assets/Resources/Prefabs/camera.meta\n\ngreatGame/Assets/Resources/Prefabs/dungeon/map1_1/tileMapEditorData.asse\nt\n\tgreatGame/Assets/Sprites/textures/bullets/laser/flying.meta\n\tgreatGame/greatGame.userprefs","distinct":true,"url":"https://api.github.com/repos/uncleshawn/projectgg.game/commits/6e2b96a277dfaa0e93fe65f7e71d5d86c1c7aa94"}]}