{"push_id":1270299911,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"d25a8d7ad49eecd8fd1e8d91e07f0d8751fc7612","before":"15e72324e75f271d87a7737cb46fd42f2dda2a73","commits":[{"sha":"269837a2af7becb41cd568bc1976ecbdd7108c70","author":{"name":"WilsomLi","email":"da7a2ddab362057cbc9368336c02af1b7afda84c@qq.com"},"message":"回滚祖立删除的","distinct":true,"url":"https://api.github.com/repos/XManGame/XGameCard/commits/269837a2af7becb41cd568bc1976ecbdd7108c70"},{"sha":"d25a8d7ad49eecd8fd1e8d91e07f0d8751fc7612","author":{"name":"WilsomLi","email":"da7a2ddab362057cbc9368336c02af1b7afda84c@qq.com"},"message":"Merge remote-tracking branch 'origin/master'\n\n# Conflicts:\n#\tAssets/LuaFramework/XGameCard/01_loading.unity\n#\tAssets/LuaFramework/XGameCard/Fonts.meta\n#\tAssets/LuaFramework/XGameCard/animation/01_Button.controller\n#\tAssets/LuaFramework/XGameCard/icon.meta\n#\tAssets/LuaFramework/XGameCard/texture.meta\n#\tAssets/StreamingAssets/StreamingAssets.manifest.meta\n#\tAssets/StreamingAssets/StreamingAssets.meta\n#\tAssets/StreamingAssets/files.txt\n#\tAssets/StreamingAssets/files.txt.meta\n#\tAssets/StreamingAssets/lua.meta\n#\tAssets/StreamingAssets/lua/3rd.meta\n#\tAssets/StreamingAssets/lua/3rd/cjson.meta\n#\tAssets/StreamingAssets/lua/3rd/cjson/example1.json.meta\n#\tAssets/StreamingAssets/lua/3rd/cjson/example2.json.meta\n#\tAssets/StreamingAssets/lua/3rd/cjson/example3.json.meta\n#\tAssets/StreamingAssets/lua/3rd/cjson/example4.json.meta\n#\tAssets/StreamingAssets/lua/3rd/cjson/example5.json.meta\n#\tAssets/StreamingAssets/lua/3rd/luabitop.meta\n#\tAssets/StreamingAssets/lua/3rd/luabitop/Makefile.meta\n#\tAssets/StreamingAssets/lua/3rd/luabitop/Makefile.mingw.meta\n#\tAssets/StreamingAssets/lua/3rd/luabitop/README.meta\n#\tAssets/StreamingAssets/lua/3rd/luabitop/doc.meta\n#\tAssets/StreamingAssets/lua/3rd/luabitop/doc/api.html.meta\n#\tAssets/StreamingAssets/lua/3rd/luabitop/doc/bluequad-print.css.meta\n#\tAssets/StreamingAssets/lua/3rd/luabitop/doc/bluequad.css.meta\n#\tAssets/StreamingAssets/lua/3rd/luabitop/doc/changes.html.meta\n#\tAssets/StreamingAssets/lua/3rd/luabitop/doc/contact.html.meta\n#\tAssets/StreamingAssets/lua/3rd/luabitop/doc/img.meta\n#\tAssets/StreamingAssets/lua/3rd/luabitop/doc/img/contact.png.meta\n#\tAssets/StreamingAssets/lua/3rd/luabitop/doc/index.html.meta\n#\tAssets/StreamingAssets/lua/3rd/luabitop/doc/install.html.meta\n#\tAssets/StreamingAssets/lua/3rd/luabitop/doc/semantics.html.meta\n#\tAssets/StreamingAssets/lua/3rd/luabitop/msvcbuild.bat.meta\n#\tAssets/StreamingAssets/lua/3rd/luabitop/msvctest.bat.meta\n#\tAssets/StreamingAssets/lua/3rd/pbc.meta\n#\tAssets/StreamingAssets/lua/3rd/pbc/addressbook.pb.meta\n#\tAssets/StreamingAssets/lua/3rd/pbc/addressbook.proto.meta\n#\tAssets/StreamingAssets/lua/3rd/pblua.meta\n#\tAssets/StreamingAssets/lua/3rd/pblua/login.proto.meta\n#\tAssets/StreamingAssets/message.unity3d.manifest.meta\n#\tAssets/StreamingAssets/message.unity3d.meta\n#\tAssets/StreamingAssets/prompt.unity3d.manifest\n#\tAssets/StreamingAssets/prompt.unity3d.manifest.meta\n#\tAssets/StreamingAssets/prompt.unity3d.meta\n#\tAssets/StreamingAssets/prompt_asset.unity3d.manifest.meta\n#\tAssets/StreamingAssets/prompt_asset.unity3d.meta\n#\tAssets/StreamingAssets/shared_asset.unity3d.manifest.meta\n#\tAssets/StreamingAssets/shared_asset.unity3d.meta","distinct":true,"url":"https://api.github.com/repos/XManGame/XGameCard/commits/d25a8d7ad49eecd8fd1e8d91e07f0d8751fc7612"}]}
{"actor":{"display_login":"WilsomLi"}}