ZhangBiao
|
1980c01573
|
【竞技场】时间到弹出
|
2021-04-30 11:49:45 +08:00 |
gaoxin
|
de827b3ae3
|
【至尊降世】延时四秒后才能关闭界面否则会出现立绘消失的问题
|
2021-04-30 11:29:40 +08:00 |
gaoxin
|
72ab9438d1
|
【关卡】修复突破第一章最后一关进入第二章时,切换地图出现黑屏
|
2021-04-30 11:22:19 +08:00 |
gaoxin
|
e4b747c2bc
|
Merge branch 'china/dev-c' into china/dev
|
2021-04-30 11:21:54 +08:00 |
wangzhenxing
|
d4a0a902bd
|
聊天界面称号特效显示修改
|
2021-04-30 11:17:02 +08:00 |
jiaoyangna
|
b3ca5ee026
|
剧情提交
(cherry picked from commit 6c673de50a )
|
2021-04-30 09:51:23 +08:00 |
jiaoyangna
|
6c673de50a
|
剧情提交
|
2021-04-30 09:50:35 +08:00 |
gaoxin
|
dbbf02f48d
|
Merge branch 'china/dev-c' into china/dev
|
2021-04-29 21:28:31 +08:00 |
jiaoyangna
|
1ab93a245a
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-29 21:17:45 +08:00 |
jiaoyangna
|
a26b2b7829
|
公会刷新时间修改
|
2021-04-29 21:17:40 +08:00 |
gaoxin
|
4a9cdc80fa
|
【资源】资源名重复修整
|
2021-04-29 21:08:11 +08:00 |
gaoxin
|
a26bdd837e
|
【资源】遗漏资源补齐
|
2021-04-29 20:53:00 +08:00 |
gaoxin
|
3c251062ea
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-29 20:48:44 +08:00 |
gaoxin
|
0b260fd03a
|
【资源】至尊降世资源修改
|
2021-04-29 20:48:39 +08:00 |
jiaoyangna
|
b66367fd85
|
修改对话出现时间
|
2021-04-29 20:20:37 +08:00 |
gaoxin
|
5f09e64257
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-29 20:19:10 +08:00 |
jiaoyangna
|
3578f57882
|
关闭假战斗回放
|
2021-04-29 20:16:37 +08:00 |
jiaoyangna
|
8e976f0cab
|
Merge branch 'china/dev' into china/dev-c
|
2021-04-29 19:44:54 +08:00 |
jiaoyangna
|
45eef519df
|
战斗剧情播放两边修改
|
2021-04-29 19:44:41 +08:00 |
jiaoyangna
|
fd79af8e4b
|
Merge branch 'china/dev' into china/dev-c
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-04-29 19:38:26 +08:00 |
jiaoyangna
|
dd8d7df89f
|
剧情特效提交
|
2021-04-29 18:55:31 +08:00 |
gaoxin
|
7bae49b1c2
|
【至尊降世】特效修改
|
2021-04-29 17:53:40 +08:00 |
ZhangBiao
|
22df869cd9
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-29 17:46:40 +08:00 |
ZhangBiao
|
4f2c8ad573
|
【竞技场】回滚提交
|
2021-04-29 17:46:23 +08:00 |
jiaoyangna
|
f86caefd7d
|
Merge branch 'china/dev' into china/dev-c
|
2021-04-29 17:44:52 +08:00 |
jiaoyangna
|
fb9d2b7272
|
剧情提交
|
2021-04-29 17:44:35 +08:00 |
ZhangBiao
|
f634ae4e4b
|
【竞技场、云游商人】竞技场时间到未弹出,云游增加log
|
2021-04-29 17:42:35 +08:00 |
ZhangBiao
|
2133dc0209
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-29 17:23:16 +08:00 |
ZhangBiao
|
441495fcfe
|
【踏碎凌霄】奖励增加序号
|
2021-04-29 17:23:06 +08:00 |
gaoxin
|
4950e48b2f
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-29 17:12:38 +08:00 |
gaoxin
|
d413915c6a
|
【竞技场】修复竞技场赛季切换时也会显示红点儿的问题
|
2021-04-29 17:12:12 +08:00 |
jiaoyangna
|
aba55c9b7c
|
Merge branch 'china/dev' into china/dev-c
|
2021-04-29 17:10:13 +08:00 |
gaoxin
|
bfe66493ab
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-29 17:03:47 +08:00 |
gaoxin
|
e4fea4a6dd
|
【竞技场】新赛季重置积分,一进来是上赛季的积分,再点进去才是本赛季的积分
|
2021-04-29 17:03:41 +08:00 |
jiaoyangna
|
ed9c058ece
|
修改剧情入口
|
2021-04-29 17:00:12 +08:00 |
ZhangBiao
|
e5a19b76f1
|
【踏碎凌霄】报错修改
|
2021-04-29 16:24:55 +08:00 |
ZhangBiao
|
8645d3f4e5
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-29 16:20:14 +08:00 |
ZhangBiao
|
bc1b55d7f3
|
【踏碎凌霄】增加包厢数量显示
|
2021-04-29 16:19:58 +08:00 |
gaoxin
|
871e4c4257
|
【资源】修复特惠商城资源变形
|
2021-04-29 16:19:15 +08:00 |
gaoxin
|
a4b0ad41b7
|
【资源】玉帝动作替换
|
2021-04-29 16:17:10 +08:00 |
jiaoyangna
|
8c7208dff3
|
删除log
|
2021-04-29 15:57:00 +08:00 |
ZhangBiao
|
79fb3ef29f
|
【踏碎凌霄】“下档奖励”问题修改
|
2021-04-29 15:46:39 +08:00 |
ZhangBiao
|
c8cd8174d9
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-29 15:40:19 +08:00 |
ZhangBiao
|
a725565ac6
|
【踏碎凌霄】修改提交
|
2021-04-29 15:40:10 +08:00 |
jiaoyangna
|
bd1f264452
|
剧情提交
|
2021-04-29 15:36:36 +08:00 |
jiaoyangna
|
73b094b9a4
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-29 15:35:22 +08:00 |
jiaoyangna
|
1da013efda
|
剧情提交
|
2021-04-29 15:35:18 +08:00 |
gaoxin
|
b6366a970e
|
【首充】云动画每天只播放一次
|
2021-04-29 15:08:34 +08:00 |
zhangqiang
|
f6a600b3fc
|
【月卡时间】时分秒时候刷新延迟一秒
|
2021-04-29 14:56:19 +08:00 |
ZhangBiao
|
6e4b930e84
|
【踏碎凌霄】宝箱修改
|
2021-04-29 14:52:14 +08:00 |