gaoxin
|
ba87f5c181
|
【逍遥游】功能入口随功能开启添加
|
2020-10-19 22:56:05 +08:00 |
ZhangBiao
|
9bde86217d
|
Revert "逍遥游 兑换界面修改"
This reverts commit 8bed258441.
|
2020-10-19 22:23:28 +08:00 |
ZhangBiao
|
acfccff38a
|
Revert "兑换界面修改"
This reverts commit 0467627fe8.
|
2020-10-19 22:23:18 +08:00 |
ZhangBiao
|
57f1a4ee60
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 22:18:38 +08:00 |
ZhangBiao
|
072ab2ba46
|
逍遥游 commit
|
2020-10-19 22:18:31 +08:00 |
yuanshuai
|
64113b5103
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 22:12:18 +08:00 |
yuanshuai
|
6a0938655a
|
骰子资源提交
|
2020-10-19 22:12:07 +08:00 |
ZhangBiao
|
ddfca80c45
|
逍遥 commit
|
2020-10-19 21:59:48 +08:00 |
ZhangBiao
|
ec0f15f489
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 21:40:24 +08:00 |
ZhangBiao
|
bfc4e834e4
|
修改boss 奖励
|
2020-10-19 21:40:17 +08:00 |
yuanshuai
|
d97142bb6d
|
逍遥游脚本修改
|
2020-10-19 21:35:12 +08:00 |
yuanshuai
|
7b40a855b9
|
自动游历功能屏蔽
|
2020-10-19 21:31:33 +08:00 |
yuanshuai
|
4f0f06b359
|
逍遥游红点提交
|
2020-10-19 21:30:31 +08:00 |
ZhangBiao
|
27f8331e62
|
轩辕 修改 提交
|
2020-10-19 21:21:54 +08:00 |
yuanshuai
|
fab7ff6557
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 20:29:57 +08:00 |
yuanshuai
|
4316c30bf2
|
逍遥游红点和帮助弹窗提交
|
2020-10-19 20:29:49 +08:00 |
jiaoyangna
|
165d29fb73
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 20:21:41 +08:00 |
jiaoyangna
|
0467627fe8
|
兑换界面修改
|
2020-10-19 20:21:36 +08:00 |
jiaoyangna
|
8bed258441
|
逍遥游 兑换界面修改
|
2020-10-19 20:21:01 +08:00 |
gaoxin
|
8f1601a573
|
重复资源删除
|
2020-10-19 20:19:45 +08:00 |
jiaoyangna
|
4a32348f90
|
yushe xiugai
|
2020-10-19 20:10:19 +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 |