Commit Graph

2731 Commits (4316c30bf28c5e2eea40476bcc63b451be8a097c)
 

Author SHA1 Message Date
yuanshuai 4316c30bf2 逍遥游红点和帮助弹窗提交 2020-10-19 20:29:49 +08:00
jiaoyangna f72b3d8fe0 Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-19 18:33:40 +08:00
jiaoyangna 875ed67864 购买 commit 2020-10-19 18:33:29 +08:00
yuanshuai 95ed2ba352 Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-19 18:19:22 +08:00
yuanshuai fdf1fe5724 逍遥游脚本修改 2020-10-19 18:19:05 +08:00
jiaoyangna 66a3754adb boss commit 2020-10-19 18:03:58 +08:00
gaoxin affdfb81aa 【逍遥游】地图界面3、4、5位置调整 2020-10-19 17:15:16 +08:00
gaoxin 0e19f21805 【自动恢复物品】物品恢复机制改为前端计算 2020-10-19 16:48:42 +08:00
jiaoyangna 56898d9c26 逍遥commit 2020-10-19 16:41:04 +08:00
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
jiaoyangna 00cef72905 prefab 修改提交 2020-10-19 14:25:13 +08:00
jiaoyangna 30c03acf1e Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-19 14:11:11 +08:00
jiaoyangna c45d8ac743 灵兽 提交 2020-10-19 14:10:46 +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 9143bd4236 yushetijiao 2020-10-19 12:16:20 +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