Commit Graph

2084 Commits (d2e94cfdea074273e751b2ac937c50ca3769b08e)
 

Author SHA1 Message Date
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
JieLing dfac8836db Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 14:09:13 +08:00
JieLing f8e5ba9dfe version文件添加 2020-08-26 14:09:00 +08: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
JieLing 94a1aaea9f 修复部分界面艺术字体不显示显示的问题 2020-08-25 20:44:55 +08:00
JieLing 934b78e022 珍奇宝阁排序修改,198礼包放到最前面 2020-08-25 20:39:03 +08:00
JieLing abd9e6b65a 好友切磋添加结果显示 2020-08-25 20:28:32 +08:00
JieLing 745150e59a 修复破阵诛仙界面销毁后,再次打开报错,显示异常的问题 2020-08-25 19:48:14 +08:00
JieLing 7c786a4573 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-25 19:26:58 +08:00
JieLing b28309e14e 资源位置移动 2020-08-25 19:26:51 +08:00
zhangqiang 2ea0c63999 日常副本 2020-08-25 18:39:57 +08:00
ZhangBiao d37af43f37 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-25 18:35:19 +08:00
ZhangBiao 617cb53270 森罗回春散星星、升级礼包调整 2020-08-25 18:35:04 +08:00
altair ae760879c5 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-25 18:33:38 +08:00
altair a8352e16e0 修改特效预设 2020-08-25 18:33:29 +08:00
zhangqiang f223c0c3e1 副本修改 2020-08-25 18:24:17 +08:00
jiaoyangna ca137cd5a5 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-25 18:17:20 +08:00
jiaoyangna 13d2a5f81a 装备宝物修改 2020-08-25 18:17:15 +08:00