Commit Graph

1530 Commits (4077683aafd14c1a843ad8a4fddba7f8c6e70fc3)

Author SHA1 Message Date
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 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
jiaoyangna 63ea323a06 修改提交 2020-10-15 20:30:11 +08:00
jiaoyangna 6180692b3f Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-15 19:42:44 +08:00
jiaoyangna 598ca9e91f 修改提交 2020-10-15 19:41:47 +08:00
yuanshuai c954df27f4 逍遥游代码修改 2020-10-15 19:38:50 +08:00
yuanshuai c3e8e60af2 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
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua
2020-10-15 19:31:46 +08:00
yuanshuai feb8aa2f9f 逍遥游脚本预设提交 2020-10-15 19:26:17 +08:00
jiaoyangna c8a9f3f8db 逍遥游提交 2020-10-15 17:48:14 +08:00
jiaoyangna e76b41d784 预设资源提交 2020-10-15 17:08:54 +08:00
jiaoyangna 7d485277aa Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2020-10-15 16:52:38 +08:00
jiaoyangna 7a86931564 转盘,招募提交 2020-10-15 16:50:56 +08:00
yuanshuai a052877b1b 逍遥游功能完善 2020-10-15 16:30:51 +08:00
jiaoyangna f664ef0af5 Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua
2020-10-15 14:17:36 +08:00
jiaoyangna e12a075e2c bosstij 2020-10-15 14:16:57 +08:00
yuanshuai a9b9d9467f 掷骰子协议修改 2020-10-15 12:04:23 +08:00
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