ZhangBiao
|
f4c2bd581c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-02 11:54:45 +08:00 |
ZhangBiao
|
ffb80c8750
|
【特惠神装、心愿抽卡】适配、增加上方英雄长按
|
2021-07-02 11:54:33 +08:00 |
jiaoyangna
|
11fe33f664
|
【ID1016973】
【高帧模式】设置界面显示了中文和越南语的切换
|
2021-07-02 11:53:51 +08:00 |
jiaoyangna
|
19247e296e
|
神将来源跳转修改提交
|
2021-07-02 11:23:07 +08:00 |
wangzhenxing
|
6e0c8e55c8
|
[战斗]==========被动335修改 困难副本 星级条件13修改
|
2021-07-02 11:20:52 +08:00 |
jiaoyangna
|
c85f18a814
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-02 11:14:03 +08:00 |
jiaoyangna
|
9b01d308e8
|
孙悟空添加新人商城
|
2021-07-02 11:13:59 +08:00 |
ZhangBiao
|
8cc655f107
|
【特惠神装】增加特效
|
2021-07-02 11:03:16 +08:00 |
jiaoyangna
|
26ef0d21d0
|
图鉴神将来源修改提交
|
2021-07-02 10:16:12 +08:00 |
wangzhenxing
|
d00d69ff68
|
[战斗]============第二期紫府神印提交
|
2021-07-02 09:56:06 +08:00 |
zhangqiang
|
a2528a3ded
|
【去掉无用打印】
|
2021-07-01 21:07:53 +08:00 |
zhangqiang
|
1be2dc60eb
|
【缥缈之旅】提交1
|
2021-07-01 20:13:47 +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
|
410a0cac4f
|
神将来源跳转星辰商店修改提交
|
2021-07-01 18:22:36 +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
|
dbaccf78cf
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-01 18:02:47 +08:00 |
ZhangBiao
|
bb70e92ca4
|
【心愿抽卡】界面微调
(cherry picked from commit bbe3fec745 )
|
2021-07-01 18:02:21 +08:00 |
jiaoyangna
|
21033f3260
|
特效颜色修改
|
2021-07-01 18:01:35 +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
|
8cea14036c
|
Merge branch 'china/dev' into china/dev-c-battle
|
2021-07-01 11:59:44 +08:00 |
wangzhenxing
|
1be7c40f2f
|
[战斗]==========困难副本 13类型 检测修改
|
2021-07-01 11:51:30 +08:00 |
wangzhenxing
|
7f8247acaf
|
[战斗]==========困难副本 13类型 检测修改
|
2021-07-01 11:47:40 +08:00 |
wangzhenxing
|
bc04671ed5
|
减怒数据提交
|
2021-07-01 11:31:58 +08:00 |
jiaoyangna
|
06d6cf4ab3
|
Merge branch 'china/dev' into 0功能/神将来源
|
2021-07-01 11:27:42 +08:00 |
jiaoyangna
|
2f88dbace4
|
config 添加帧率
|
2021-07-01 11:26:45 +08:00 |
jiaoyangna
|
a175e18946
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-06-30 20:39:23 +08:00 |
jiaoyangna
|
fbfb637231
|
【ID1009604】
【优化】限时心愿招募抽取的普通神将调整为同系卡
|
2021-06-30 20:39:20 +08:00 |