Commit Graph

1643 Commits (911bacc56c143fb55020b9d1fe0626837653303a)

Author SHA1 Message Date
yuanshuai 911bacc56c 逍遙游預設脚本提交 2020-10-19 16:00:48 +08:00
yuanshuai b1c9e0a986 Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-19 15:13:07 +08:00
yuanshuai 1297d0682b 資源提交 2020-10-19 15:12:47 +08:00
jiaoyangna 8baa135cba Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-19 15:06:33 +08:00
jiaoyangna b93b5eaedb xiaoyao commit 2020-10-19 15:06:27 +08:00
yuanshuai 773fb4085e Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-19 14:38:56 +08:00
yuanshuai d844a36917 逍遥游脚本提交 2020-10-19 14:38:44 +08:00
gaoxin 00a39a450b Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-19 14:08:36 +08:00
gaoxin 7a540133bd 【逍遥游】优化返回逍遥游界面时重置滚动位置的问题 2020-10-19 14:08:28 +08:00
jiaoyangna 01f5227c72 xiaoyao commit 2020-10-19 13:50:23 +08:00
yuanshuai aff5e01480 Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua
2020-10-19 11:57:59 +08:00
yuanshuai 964abba2a0 逍遥游脚本预设提交 2020-10-19 11:53:47 +08:00
jiaoyangna 707e824aed Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-19 11:42:22 +08:00
gaoxin 3b62c91c69 优化逍遥游地图进度显示,添加暂不开放的地图处理 2020-10-19 11:40:05 +08:00
jiaoyangna be359476d4 Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-19 11:39:30 +08:00
jiaoyangna 86ca33c7a4 xiaoyao commit 2020-10-19 11:39:11 +08:00
gaoxin f3e675903a 优化逍遥游地图界面显示, 2020-10-19 11:15:32 +08:00
gaoxin fc3a8f78f2 逍遥游地图界面提交 2020-10-19 10:36:40 +08:00
jiaoyangna 4077683aaf Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-19 10:24:48 +08:00
jiaoyangna f62f3de37c xiaoyao tijiao 2020-10-19 10:24:42 +08:00
yuanshuai 8735fcf83e Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-17 20:05:28 +08:00
yuanshuai 8a9b32f050 逍遥游显示优化 2020-10-17 20:05:16 +08:00
jiaoyangna 633761b2a4 Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-17 20:00:15 +08:00
jiaoyangna d4bcdd2975 xiaoyao boss xiugai 2020-10-17 19:59:11 +08:00
yuanshuai 82d6754cd0 Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-17 18:10:10 +08:00
yuanshuai 69ed1376aa Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua
2020-10-17 18:09:45 +08:00
jiaoyangna efa085707d 逍遥commit 2020-10-17 18:09:06 +08:00
yuanshuai 966822040f 逍遥游优化 2020-10-17 18:06:29 +08:00
jiaoyangna 5341483985 刷新界面 2020-10-17 17:09:48 +08:00
jiaoyangna 00da9f73a7 添加次数 2020-10-17 17:06:27 +08:00
jiaoyangna a90bb04673 添加云游值消耗 2020-10-17 16:07:05 +08:00
yuanshuai a7abe7aee5 Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua
2020-10-17 14:32:31 +08:00
yuanshuai ecd4695a7b 逍遥游地图界面预设脚本修改 2020-10-17 14:31:23 +08:00
jiaoyangna 3ccf8c0dc2 xiaoyaoyou 修改 2020-10-17 14:27:19 +08:00
jiaoyangna 8635a61e78 转盘,boss 修改 2020-10-17 13:48:38 +08:00
jiaoyangna 93218d9e62 时间返回修改 2020-10-17 13:37:54 +08:00
jiaoyangna cb6e29076a Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-16 19:19:41 +08:00
jiaoyangna 0703ea4f45 逍遥提交 2020-10-16 19:19:37 +08:00
yuanshuai f25854797e 逍遥游 资源脚本预设提交 2020-10-16 18:39:49 +08:00
jiaoyangna 6db6317da2 添加剩余时间接口 2020-10-16 18:01:29 +08:00
jiaoyangna 2a5a23f3ed 显示优化提交 2020-10-16 17:37:54 +08:00
yuanshuai 7498b4dc01 脚本預設提交 2020-10-16 15:39:48 +08:00
yuanshuai a441b04d91 Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-16 15:04:40 +08:00
yuanshuai 4017b81bd3 逍遙游脚本於是提交 2020-10-16 15:04:31 +08:00
jiaoyangna 3c14447d17 Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-16 10:33:00 +08:00
jiaoyangna 7b368e3cd9 数据报错修改 2020-10-16 10:32:50 +08:00
yuanshuai 2924f06560 协议提交 2020-10-16 10:25:57 +08:00
yuanshuai 5877c9e587 Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-16 10:09:40 +08:00
jiaoyangna e2ebe3ee18 逍遥游事件数据提交 2020-10-16 10:06:48 +08:00
yuanshuai c54f19b3f1 逍遥游脚本 2020-10-16 10:06:10 +08:00