Commit Graph

6 Commits (a05cb7cc439ab0f8b88a86c441210362f2795acd)

Author SHA1 Message Date
yuanshuai a05cb7cc43 协议修改 2020-10-15 11:53:03 +08:00
jiaoyangna 864535ca9b Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua
2020-10-11 11:11:49 +08:00
yuanshuai 8487c445a3 逍遥游资源预设脚本提交 2020-10-15 10:53:00 +08:00
jiaoyangna db5dbbf700 boss 提交 2020-10-11 11:10:07 +08:00
jiaoyangna 5bf0f64989 boss 和 转盘数据 提交 2020-10-11 09:40:22 +08:00
yuanshuai 57c7fd0890 逍遥游脚本资源预设提交 2020-10-14 16:57:35 +08:00