Commit Graph

867 Commits (b0222ccd61d4fc6b4991b29cf717df8b9be1cd34)

Author SHA1 Message Date
gaoxin b0222ccd61 艺术字体替换,美元显示优化 2020-08-26 12:26:19 +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 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
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
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
JieLing 223234f582 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-25 18:00:42 +08:00
JieLing 5a89f52577 充值商品价格改为按配置显示 2020-08-25 17:59:34 +08:00
JieLing 2eeb381608 登陆界面资源替换 2020-08-25 17:56:55 +08:00
zhangqiang 060cc081bb 修改bug 2020-08-25 17:50:52 +08:00
ZhangBiao e6946944b0 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-25 17:31:16 +08:00
ZhangBiao 58aa9c2dce 每日豪礼 显示升级礼包 资源修改 2020-08-25 17:29:03 +08:00
JieLing 399f033bd6 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-25 16:33:11 +08:00
JieLing 0da90f06a5 添加无敌吸血盾的判断 2020-08-25 16:33:04 +08:00
wangzhenxing 7d11f4b25f 还原之前死亡逻辑 2020-08-25 17:27:48 +09:00
jiaoyangna d1ab290cf7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel.lua
2020-08-25 16:26:13 +08:00
jiaoyangna 87cc8867c7 宝物 commit 2020-08-25 16:23:41 +08:00
JieLing 8e9e944279 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2020-08-25 16:18:27 +08:00
wangzhenxing 6eaedb249d 解决 【ID1008832】
【技能】单独两个金翅大鹏,都触发了不灭,应该是先触发不灭的一方失败
2020-08-25 17:09:46 +09:00
JieLing ff27e11daa 修复第五章会导致挂机界面卡死的问题 2020-08-25 16:06:06 +08:00
JieLing 30cb8b37cf 登陆接口添加admin 2020-08-25 15:51:35 +08:00
zhangqiang 4d19e7ce98 中文表导出提交 2020-08-25 15:46:38 +08:00
zhangqiang 1efd100e31 奖励弹窗路径修改 公会副本选择框修改 2020-08-25 15:39:57 +08:00
zhangqiang 0ba113ddbc 首冲修改提交 2020-08-25 15:25:27 +08:00
zhangqiang fe44f28958 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/FirstRecharge/FirstRechargePanel.prefab
2020-08-25 14:49:13 +08:00
zhangqiang 77706e50cc 首冲有礼加特效 2020-08-25 14:46:57 +08:00
ZhangBiao e3b872d31a 元-》$ 2020-08-25 14:37:28 +08:00
ZhangBiao 1496c5e29a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-25 13:57:35 +08:00