zhangqiang
|
a2528a3ded
|
【去掉无用打印】
|
2021-07-01 21:07:53 +08:00 |
ZhangBiao
|
70b42de2ac
|
Merge branch 'china/dev' into 0活动开发聚集地/特惠神装
|
2021-07-01 20:09:56 +08:00 |
ZhangBiao
|
c9eec4864a
|
【特惠神装】完成
|
2021-07-01 20:09:34 +08:00 |
ZhangBiao
|
a37fd67704
|
【特惠神装】基本完成
|
2021-07-01 19:56:28 +08:00 |
jiaoyangna
|
0d7eacc772
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-01 18:12:41 +08:00 |
jiaoyangna
|
4f34d6ed42
|
神将来源返回时打开
|
2021-07-01 18:12:20 +08:00 |
ZhangBiao
|
bb70e92ca4
|
【心愿抽卡】界面微调
(cherry picked from commit bbe3fec745 )
|
2021-07-01 18:02:21 +08:00 |
ZhangBiao
|
bbe3fec745
|
【心愿抽卡】界面微调
|
2021-07-01 17:31:55 +08:00 |
ZhangBiao
|
92fa3e34d8
|
【Log】清除颜色Log
|
2021-07-01 17:30:20 +08:00 |
ZhangBiao
|
d2a10051e5
|
Merge branch 'china/dev' into 0活动开发聚集地/特惠神装
|
2021-07-01 16:36:16 +08:00 |
ZhangBiao
|
53567ea586
|
【Log】清除带颜色的Log
|
2021-07-01 16:33:40 +08:00 |
jiaoyangna
|
a1584af31c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-01 15:55:07 +08:00 |
ZhangBiao
|
3b674faa07
|
Merge branch 'china/dev' into 0活动开发聚集地/特惠神装
|
2021-07-01 15:44:19 +08:00 |
ZhangBiao
|
fb7c5c69fd
|
【森罗幻境】提交
|
2021-07-01 15:43:50 +08:00 |
ZhangBiao
|
36ccbe968b
|
【森罗幻境】排行榜信息冗余修改
|
2021-07-01 15:42:23 +08:00 |
jiaoyangna
|
b395550303
|
【ID1016634】
【无尽副本】有没领取的任务,在线刷新无尽副本后,任务显示可领取
|
2021-07-01 15:40:44 +08:00 |
jiaoyangna
|
8b187bfd5f
|
获取途径报错修改
|
2021-07-01 15:27:04 +08:00 |
jiaoyangna
|
5e02167ef9
|
帧率修改
|
2021-07-01 15:15:15 +08:00 |
jiaoyangna
|
e7544da64e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-01 15:08:15 +08:00 |
jiaoyangna
|
aabb8357e2
|
Merge branch '0功能/神将来源' into china/dev
|
2021-07-01 15:08:08 +08:00 |
zhangqiang
|
b792491a5a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-01 15:02:22 +08:00 |
zhangqiang
|
deb6eeca03
|
【跳转】增加惊喜礼盒跳转
|
2021-07-01 15:01:57 +08:00 |
ZhangBiao
|
47f6335b55
|
Merge branch 'china/dev' into 0活动开发聚集地/特惠神装
|
2021-07-01 14:44:48 +08:00 |
ZhangBiao
|
dc4581433e
|
【主城】右侧下拉调修复
|
2021-07-01 14:43:14 +08:00 |
jiaoyangna
|
dcfd444fb2
|
删log
|
2021-07-01 13:57:19 +08:00 |
jiaoyangna
|
d828d272ec
|
【ID1009619】
【帧率设置】在游戏内可以修改游戏帧率
|
2021-07-01 13:56:18 +08:00 |
gaoxin
|
67dd2abbcb
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-01 12:31:01 +08:00 |
gaoxin
|
99b2c98128
|
【成长基金】修复红点不消失的问题
|
2021-07-01 12:30:56 +08:00 |
wangzhenxing
|
7f8247acaf
|
[战斗]==========困难副本 13类型 检测修改
|
2021-07-01 11:47:40 +08:00 |
jiaoyangna
|
fbfb637231
|
【ID1009604】
【优化】限时心愿招募抽取的普通神将调整为同系卡
|
2021-06-30 20:39:20 +08:00 |
jiaoyangna
|
bb9b58d489
|
Merge branch '0功能/神将来源' into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
|
2021-06-30 19:57:49 +08:00 |
jiaoyangna
|
bfd653a98f
|
【ID1009604】
【优化】限时心愿招募抽取的普通神将调整为同系卡
|
2021-06-30 19:48:05 +08:00 |
jiaoyangna
|
349404d50e
|
【ID1009604】
【优化】限时心愿招募抽取的普通神将调整为同系卡
|
2021-06-30 19:28:43 +08:00 |
jiaoyangna
|
2cbb0b0a59
|
添加特效
|
2021-06-30 18:46:15 +08:00 |
ZhangBiao
|
555ccd253f
|
【特惠神装】提交
|
2021-06-30 18:38:20 +08:00 |
zhangqiang
|
34fbfe02d1
|
【线上问题】十绝阵挑战次数显示负数
|
2021-06-30 18:28:51 +08:00 |
jiaoyangna
|
3fadc63852
|
商店物品添加特效
|
2021-06-30 18:12:24 +08:00 |
wangzhenxing
|
2578107be4
|
【战斗】============战斗图片字显示修改
|
2021-06-30 18:06:56 +08:00 |
wangzhenxing
|
b99c52d22c
|
【bug】========【ID1016790】
灼烧 中毒等buff 在携带者被杀死的情况不提示清除
|
2021-06-30 18:03:13 +08:00 |
wangzhenxing
|
b3650db6ae
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-06-30 18:01:13 +08:00 |
wangzhenxing
|
4ad64a41f2
|
[bug]==========福利红包红点修改
|
2021-06-30 18:00:52 +08:00 |
jiaoyangna
|
36cb3db3af
|
底图修改提交
|
2021-06-30 16:17:50 +08:00 |
jiaoyangna
|
a4281ed031
|
四元阵跳转修改
|
2021-06-30 16:07:37 +08:00 |
jiaoyangna
|
e44449391d
|
神将来源修改提交
|
2021-06-30 15:47:13 +08:00 |
jiaoyangna
|
b5324c165a
|
神将来源碎皮合成修改提交
|
2021-06-30 15:27:27 +08:00 |
ZhangBiao
|
eeee396c3a
|
【特惠神装】提交
|
2021-06-30 14:39:31 +08:00 |
ZhangBiao
|
cebee6a95b
|
【邮件】置顶邮件报错修改
|
2021-06-30 14:26:05 +08:00 |
jiaoyangna
|
6e0eccfde5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-06-30 14:11:00 +08:00 |
jiaoyangna
|
a556ee7e2d
|
关闭界面时 称号预设未关闭 错误 问题修改
|
2021-06-30 14:10:30 +08:00 |
ZhangBiao
|
4507a0d139
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-06-30 13:51:56 +08:00 |