gaoxin
|
711b240235
|
骰子音效遴选提交
|
2020-10-20 18:10:07 +08:00 |
yuanshuai
|
8cb68ceaa4
|
逍遥游地图界面优化:1.自动游历返回时提示二级确认弹窗 2.记录自动游历状态
|
2020-10-20 18:05:33 +08:00 |
jiaoyangna
|
ecd0cc8f22
|
逍遥游云游宝玉修改提交
|
2020-10-20 17:40:47 +08:00 |
yuanshuai
|
c3a67ef9aa
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-20 16:07:02 +08:00 |
yuanshuai
|
85507e2f6a
|
逍遙游自动游历开启 相关脚本资源提交
|
2020-10-20 16:06:52 +08:00 |
wangzhenxing
|
a3b8be0abe
|
技能期间只触发一次被动触发条件修改
|
2020-10-20 16:20:14 +09:00 |
wangzhenxing
|
ab4fa7925d
|
Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统
|
2020-10-20 16:17:21 +09:00 |
zhangqiang
|
c6f34794f3
|
灵兽提交
|
2020-10-20 16:08:51 +08:00 |
wangzhenxing
|
4e047140a8
|
灵兽提交
|
2020-10-20 16:17:08 +09:00 |
JieLing
|
3666441445
|
【逍遥游】修复行动力不会恢复满的问题
|
2020-10-20 15:16:07 +08:00 |
JieLing
|
e3cac704d0
|
【逍遥游】优化奖励界面显示
|
2020-10-20 15:16:01 +08:00 |
ZhangBiao
|
23f4b9c65d
|
【推送礼包】推送最新礼包的拍脸
(cherry picked from commit 958234c826)
|
2020-10-20 14:59:25 +08:00 |
gaoxin
|
8aa4abdbeb
|
【逍遥游】云游值自动恢复修改
|
2020-10-20 00:23:42 +08:00 |
gaoxin
|
7ea442ff5d
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua
|
2020-10-19 23:52:22 +08:00 |
gaoxin
|
27eaa02a88
|
修复部分奖励不刷新的问题
|
2020-10-19 23:51:15 +08:00 |
yuanshuai
|
92af021625
|
倒计时云游值回复问题修改
|
2020-10-19 23:49:21 +08:00 |
yuanshuai
|
7e0f32ec1f
|
逍遥游bug修改
|
2020-10-19 23:24:07 +08:00 |
gaoxin
|
4eb846d8c3
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 22:56:22 +08:00 |
gaoxin
|
ba87f5c181
|
【逍遥游】功能入口随功能开启添加
|
2020-10-19 22:56:05 +08:00 |
yuanshuai
|
8f4464e693
|
骰子动画添加提交
|
2020-10-19 22:54:59 +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 |
jiaoyangna
|
2d4ce422da
|
monterr gift patface
|
2020-10-19 21:59:07 +08:00 |
jiaoyangna
|
1d8ac73a44
|
拍脸commit
|
2020-10-19 21:57:56 +08:00 |
jiaoyangna
|
1677642f3b
|
tuisonglibao patface
|
2020-10-19 21:57:39 +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 |
zhangqiang
|
e47a1d5a45
|
灵兽提交
|
2020-10-19 20:30:28 +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 |
wangzhenxing
|
63adfc1097
|
修改188被动 义结金兰不触发其他被动
|
2020-10-19 21:28:47 +09:00 |
wangzhenxing
|
4a21eae8f4
|
188被动普攻排序修改
|
2020-10-19 21:22:13 +09: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 |
wangzhenxing
|
cddd7a8824
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-19 21:08:17 +09:00 |
gaoxin
|
f7a10bb23b
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Battle/View/RoleView.lua
|
2020-10-19 21:05:26 +08:00 |
gaoxin
|
f006531707
|
【战斗0.0.4】修复战斗开始时偶现卡牌人物裁切显示错误的问题
|
2020-10-19 21:05:05 +08:00 |
wangzhenxing
|
f7865231ef
|
被动188 改为血量百分比排序
|
2020-10-19 21:07:53 +09:00 |