zhangqiang
|
52e6cdd917
|
【累计充值红点】主题活动中累计充值的红点会显示在限时活动入口
|
2021-04-27 23:04:58 +08:00 |
gaoxin
|
79b73da602
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 22:31:35 +08:00 |
gaoxin
|
fb2139ffef
|
【踏碎凌霄】战斗中掉落的宝箱特效,会在结算界面穿透
|
2021-04-27 22:30:17 +08:00 |
ZhangBiao
|
dc03b46855
|
【踏碎凌霄】活动界面提交
|
2021-04-27 22:26:36 +08:00 |
jiaoyangna
|
88f9e83e1c
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 22:25:16 +08:00 |
jiaoyangna
|
58e6a0a554
|
剧情提交
(cherry picked from commit f43cd38a73)
|
2021-04-27 22:21:46 +08:00 |
wangzhenxing
|
d2a7fdcee1
|
天尊降世活动资源提交
|
2021-04-27 22:16:42 +08:00 |
ZhangBiao
|
dfb0a68f2c
|
【踏碎凌霄】资源提交
|
2021-04-27 21:45:04 +08:00 |
ZhangBiao
|
5401776a8d
|
【踏碎凌霄】界面显示调整
|
2021-04-27 21:28:48 +08:00 |
zhangqiang
|
85136a4cc9
|
【逍遥游】奖励预览,跳转出去,再返回,奖池不显示道具
|
2021-04-27 21:17:35 +08:00 |
zhangqiang
|
8db10cf7eb
|
【神衣天降】购买次数显示修改
|
2021-04-27 21:09:29 +08:00 |
gaoxin
|
2be2ba92dd
|
【七天狂欢】偶现报错
|
2021-04-27 20:56:09 +08:00 |
zhangqiang
|
a46c7f3413
|
【恭喜获得修改】
|
2021-04-27 20:48:45 +08:00 |
jiaoyangna
|
b52e90c96a
|
Merge branch 'china/dev' into china/dev-c
|
2021-04-27 20:46:12 +08:00 |
jiaoyangna
|
dd90a200c3
|
剧情提交
|
2021-04-27 20:45:03 +08:00 |
gaoxin
|
6d38527065
|
【云游商人】排序错误
|
2021-04-27 20:44:45 +08:00 |
gaoxin
|
923034957e
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 20:26:15 +08:00 |
gaoxin
|
1e7142008c
|
【云游商人】选中武器点确定,再选中护甲点取消,最后合成的是护甲
|
2021-04-27 20:26:10 +08:00 |
jiaoyangna
|
fd9084da86
|
关掉挂机打怪的声音
|
2021-04-27 20:18:26 +08:00 |
ZhangBiao
|
b695224100
|
【商店刷新】商店刷新时间错误
|
2021-04-27 20:18:18 +08:00 |
jiaoyangna
|
ccaab65e25
|
剧情提交
|
2021-04-27 19:51:40 +08:00 |
gaoxin
|
a5b8dc1de9
|
【Log】删除一个停不下来的Log
|
2021-04-27 18:16:46 +08:00 |
gaoxin
|
8be0dd71f0
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 18:02:56 +08:00 |
gaoxin
|
68626e287e
|
【踏碎凌霄】奖励排序
|
2021-04-27 18:02:51 +08:00 |
zhangqiang
|
f20c58dc96
|
【公会援助】 每次点击援助,列表都会重新置顶显示----3
|
2021-04-27 17:56:55 +08:00 |
zhangqiang
|
4cbb65c73b
|
【超值基金】买两次 尝试修复
|
2021-04-27 17:53:15 +08:00 |
ZhangBiao
|
90fd541e99
|
【限时活动】删除timer
|
2021-04-27 17:50:26 +08:00 |
ZhangBiao
|
39f2f06563
|
【限时活动】调整
|
2021-04-27 17:05:53 +08:00 |
ZhangBiao
|
6f17dbd874
|
【恭喜获得】报错
|
2021-04-27 16:46:39 +08:00 |
ZhangBiao
|
6b26846677
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 16:37:17 +08:00 |
ZhangBiao
|
87b94c283a
|
【恭喜获得】奖励叠加
|
2021-04-27 16:37:03 +08:00 |
wangzhenxing
|
2d87367728
|
副本入口图片位置修改提交
|
2021-04-27 16:31:32 +08:00 |
gaoxin
|
2a107e99cb
|
【红点】关闭一些重复注册的红点
|
2021-04-27 16:30:08 +08:00 |
zhangqiang
|
9f69ba9d7c
|
【新的协议】
|
2021-04-27 16:23:25 +08:00 |
gaoxin
|
fe6a38cbad
|
【轩辕宝境】进入界面时,当前不开放的宝境入口也会亮起1S左右
|
2021-04-27 16:00:24 +08:00 |
gaoxin
|
16268410b7
|
【拍脸】部分界面销毁后导致报错
|
2021-04-27 15:49:56 +08:00 |
gaoxin
|
b1e3b753e4
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 15:45:53 +08:00 |
gaoxin
|
7cbec8230a
|
【跳转】跳转充值,点返回没反应,再点直接返回主城
|
2021-04-27 15:45:49 +08:00 |
ZhangBiao
|
eb81667c29
|
【碎片合成】
|
2021-04-27 15:28:18 +08:00 |
ZhangBiao
|
3512d1da7e
|
【开服累计充值】没有倒计时
|
2021-04-27 15:16:21 +08:00 |
gaoxin
|
d610d44c0f
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 14:42:23 +08:00 |
gaoxin
|
5254edb78f
|
【UI配置】多余删除还原
|
2021-04-27 14:42:13 +08:00 |
ZhangBiao
|
b18596b8b0
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 14:34:59 +08:00 |
ZhangBiao
|
d1a1d922c1
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
# Conflicts:
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
|
2021-04-27 14:34:52 +08:00 |
zhangqiang
|
b000e84564
|
【超值基金】判断是否可购买 修改 2
|
2021-04-27 14:34:29 +08:00 |
ZhangBiao
|
df76a49401
|
【碎片自选箱】通过道具详情跳转别的地方,返回后选中标识居中
|
2021-04-27 14:33:25 +08:00 |
gaoxin
|
555d046748
|
Merge branch 'china/dev' into china/dev-c
|
2021-04-27 14:16:46 +08:00 |
ZhangBiao
|
eb7d89578a
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 13:48:29 +08:00 |
ZhangBiao
|
74b2ef62ca
|
【恭喜获得】提交
|
2021-04-27 13:48:17 +08:00 |
gaoxin
|
533885679c
|
【踏碎凌霄】boss放大添加
|
2021-04-27 13:32:41 +08:00 |