jiaoyangna
|
a7c7bd26ff
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 21:57:23 +08:00 |
jiaoyangna
|
50a40cc7b6
|
破阵诛仙修改
|
2020-08-26 21:57:10 +08:00 |
zhangqiang
|
7044422ebf
|
装备合成bug修复
|
2020-08-26 21:55:39 +08:00 |
jiaoyangna
|
9a0d461ada
|
jwel commit
|
2020-08-26 21:37:19 +08:00 |
jiaoyangna
|
1cdaf20d08
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 21:35:04 +08:00 |
jiaoyangna
|
a6e3ddcd7d
|
【宝物】精炼,弹服务器开小差
|
2020-08-26 21:34:48 +08:00 |
zhangqiang
|
012a01ec20
|
移动主界面虚化坛位置
|
2020-08-26 21:27:58 +08:00 |
zhangqiang
|
812450c032
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 20:56:48 +08:00 |
zhangqiang
|
6dec0b0307
|
修改公会技能升级 更新英雄战力
|
2020-08-26 20:56:28 +08:00 |
gaoxin
|
dbebfeddf7
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 20:54:37 +08:00 |
gaoxin
|
ee71156c2c
|
修复背包界面装备战斗力不显示的问题
|
2020-08-26 20:53:56 +08:00 |
jiaoyangna
|
1482d308cb
|
日常副本修改
|
2020-08-26 20:37:31 +08:00 |
jiaoyangna
|
b987f3124a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 20:31:07 +08:00 |
jiaoyangna
|
1cc497b2fd
|
qinglong commit
|
2020-08-26 20:30:52 +08:00 |
gaoxin
|
8b0c138f68
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 20:20:53 +08:00 |
gaoxin
|
4b41b5def9
|
副本界面显示优化
|
2020-08-26 20:20:40 +08:00 |
jiaoyangna
|
f28c176f18
|
add activity status
|
2020-08-26 20:17:37 +08:00 |
jiaoyangna
|
3c6a636d0d
|
qinglong commit
|
2020-08-26 20:04:36 +08:00 |
jiaoyangna
|
03048116e4
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 20:04:13 +08:00 |
jiaoyangna
|
c2ec9c93f8
|
【秘宝试炼】周试炼刷新后时间显示负,青龙秘宝结束不关闭
|
2020-08-26 20:04:02 +08:00 |
zhangqiang
|
86361419cc
|
神将合成bug
|
2020-08-26 19:44:29 +08:00 |
ZhangBiao
|
f47dc8f441
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 19:08:31 +08:00 |
ZhangBiao
|
134b70ce33
|
成长礼包美元符号位置
|
2020-08-26 19:08:21 +08:00 |
gaoxin
|
a972b4993b
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 18:33:57 +08:00 |
gaoxin
|
e834044de0
|
修复战斗最后一回合结束还会再打一次的问题
|
2020-08-26 18:33:47 +08:00 |
jiaoyangna
|
8a4f24ce77
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 18:29:35 +08:00 |
jiaoyangna
|
f62a007edb
|
qinglong commit
|
2020-08-26 18:29:27 +08:00 |
ZhangBiao
|
87891b2798
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 18:29:10 +08:00 |
ZhangBiao
|
42b0ffe95d
|
月基金价格修改
|
2020-08-26 18:29:02 +08:00 |
gaoxin
|
093c6d1f41
|
竞技场按钮功能未开启不再显示
|
2020-08-26 18:18:12 +08:00 |
gaoxin
|
46403f1431
|
创建角色界面显示优化
|
2020-08-26 18:17:43 +08:00 |
gaoxin
|
80e2f16169
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 17:58:51 +08:00 |
gaoxin
|
fcf0557f01
|
修复公会boss立绘会创建多次的问题
|
2020-08-26 17:58:46 +08:00 |
gaoxin
|
bab4148db6
|
主界面十绝阵,巅峰赛按钮添加
|
2020-08-26 17:58:23 +08:00 |
ZhangBiao
|
ed22b5b9d2
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 17:57:12 +08:00 |
ZhangBiao
|
8dd4feeead
|
乾坤宝囊特效增加
|
2020-08-26 17:56:59 +08:00 |
zhangqiang
|
730a39cd69
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 17:45:32 +08:00 |
zhangqiang
|
efaa3e51cc
|
公会副本刷新问题
|
2020-08-26 17:45:18 +08:00 |
ZhangBiao
|
ca6862831a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 17:22:03 +08:00 |
ZhangBiao
|
09c72dc362
|
神将界面点击前往化虚坛提示75级问题修改
|
2020-08-26 17:21:50 +08:00 |
jiaoyangna
|
4fd97151a5
|
qinglong commit
|
2020-08-26 17:13:27 +08:00 |
jiaoyangna
|
265f0f8781
|
qinglong commit
|
2020-08-26 17:08:04 +08:00 |
ZhangBiao
|
1f35f84243
|
四元阵赠送20置换玉提示
|
2020-08-26 16:59:19 +08:00 |
zhangqiang
|
1b8f1631b7
|
巅峰战八强替换资源
|
2020-08-26 16:43:07 +08:00 |
jiaoyangna
|
d8d8dc5721
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 16:32:17 +08:00 |
jiaoyangna
|
24b4852ea7
|
qinglong commit
|
2020-08-26 16:32:12 +08:00 |
gaoxin
|
cafdcbcd40
|
聊天刷新时间延长为每5秒刷新一次
|
2020-08-26 16:29:52 +08:00 |
ZhangBiao
|
c5e245fca4
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 16:22:49 +08:00 |
ZhangBiao
|
dc9615b4fc
|
无尽进图武神将问题、取消对话战斗结束神将数据界面
|
2020-08-26 16:22:37 +08:00 |
jiaoyangna
|
e1a2a7cd52
|
qinglong commit
|
2020-08-26 16:15:52 +08:00 |
jiaoyangna
|
b3774c7a44
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 15:57:12 +08:00 |
jiaoyangna
|
22fa2b0d4c
|
qinglong commit
|
2020-08-26 15:57:06 +08:00 |
gaoxin
|
ec45a9688d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 15:51:41 +08:00 |
gaoxin
|
57a3c0ce37
|
首充引导10级开放
|
2020-08-26 15:51:36 +08:00 |
zhangqiang
|
64802afd2b
|
巅峰战编队提示bug提交
|
2020-08-26 15:47:01 +08:00 |
gaoxin
|
15f355b402
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 15:16:23 +08:00 |
gaoxin
|
9ff8dbf943
|
我要变强界面匹配当前版本修改
|
2020-08-26 15:16:17 +08:00 |
ZhangBiao
|
0db40d1c9b
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 15:14:37 +08:00 |
ZhangBiao
|
d644b64450
|
删除限时活动中的五行成长礼,试炼副本治疗神将不能一键上阵
|
2020-08-26 15:14:27 +08:00 |
zhangqiang
|
d51276f132
|
公会副本提交
|
2020-08-26 15:10:33 +08:00 |
jiaoyangna
|
d17427269a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 15:04:52 +08:00 |
jiaoyangna
|
1d3e961196
|
qinglong commit
|
2020-08-26 15:04:41 +08:00 |
zhangqiang
|
384b3b35c3
|
编队修改
|
2020-08-26 15:00:13 +08:00 |
jiaoyangna
|
3deb27c862
|
跳转无尽副本修改
|
2020-08-26 14:53:31 +08:00 |
jiaoyangna
|
8d41c89eee
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 14:51:15 +08:00 |
jiaoyangna
|
7f9c8122c4
|
跳转修改提交
|
2020-08-26 14:51:10 +08:00 |
wangzhenxing
|
8a285e4227
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 15:24:54 +09:00 |
jiaoyangna
|
f8fc1da3b3
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 15:23:26 +08:00 |
jiaoyangna
|
66fb6f04d4
|
box update
|
2020-08-26 15:23:20 +08:00 |
zhangqiang
|
63ce11cda4
|
替换底图
|
2020-08-26 15:18:44 +08:00 |
wangzhenxing
|
c9638f15e9
|
检测不灭效果还原
|
2020-08-26 15:24:37 +09:00 |
jiaoyangna
|
a52ea7f6b7
|
qinglong commit
|
2020-08-26 14:04:26 +08:00 |
JieLing
|
ad7bd17a38
|
修复八日登陆扫光错误的问题
|
2020-08-26 13:53:39 +08:00 |
JieLing
|
be1d62a888
|
修复登陆界面扫光显示错误的问题
|
2020-08-26 13:47:26 +08:00 |
JieLing
|
33538bdaa3
|
字体文件需要手动删除材质后再添加才会生效
|
2020-08-26 13:43:16 +08:00 |
gaoxin
|
6451739628
|
艺术字体文件修改
|
2020-08-26 13:37:16 +08:00 |
JieLing
|
c23947edcd
|
艺术字体优化
|
2020-08-26 13:35:33 +08:00 |
wangzhenxing
|
0a255a5c1f
|
选择对位英雄逻辑修改
|
2020-08-26 14:11:00 +09:00 |
gaoxin
|
d73b816bb3
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 12:26:33 +08:00 |
gaoxin
|
b0222ccd61
|
艺术字体替换,美元显示优化
|
2020-08-26 12:26:19 +08:00 |
jiaoyangna
|
676fec2f81
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 12:23:26 +08:00 |
jiaoyangna
|
78ea78303d
|
日常 轩辕 列表优化
|
2020-08-26 12:23:10 +08:00 |
gaoxin
|
a4c5383917
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 11:41:26 +08:00 |
zhangqiang
|
4bc63fb367
|
编队bug
|
2020-08-26 11:26:32 +08:00 |
ZhangBiao
|
a86e5b6d4c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 11:19:58 +08:00 |
ZhangBiao
|
cc9c498c7d
|
云梦祈福刷新按钮、乾坤商店白片
|
2020-08-26 11:19:37 +08:00 |
gaoxin
|
fa787f83d5
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 11:11:27 +08:00 |
gaoxin
|
b175890bc3
|
累充活动金额处理
|
2020-08-26 11:11:14 +08:00 |
jiaoyangna
|
59204790d2
|
xuanyuan commit
|
2020-08-26 10:58:41 +08:00 |
jiaoyangna
|
03712f9069
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 10:19:00 +08:00 |
jiaoyangna
|
06abcb4ee3
|
宝物commit
|
2020-08-26 10:18:46 +08:00 |
ZhangBiao
|
c293aba881
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 10:18:38 +08:00 |
ZhangBiao
|
09ed357e08
|
森罗敌人信息显示界面空白问题修改
|
2020-08-26 10:18:31 +08:00 |
jiaoyangna
|
03ec954c9c
|
删除log
|
2020-08-26 10:16:16 +08:00 |
gaoxin
|
b8f87fa28f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 09:44:04 +08:00 |
zhangqiang
|
8eb1e19f85
|
公会副本时间
|
2020-08-26 09:40:32 +08:00 |
gaoxin
|
b7bf5e975a
|
删除白驹工作室
|
2020-08-26 09:40:03 +08:00 |
JieLing
|
fcc9a5eb2a
|
修复打开限时活动界面报错的问题
|
2020-08-25 21:55:13 +08:00 |
JieLing
|
1ac3dbb7f6
|
五星成长礼原价显示走表配置
|
2020-08-25 21:35:00 +08:00 |
JieLing
|
b1774c3853
|
累充界面金额转换为美元显示
|
2020-08-25 21:21:34 +08:00 |