Commit Graph

82 Commits (fa3003fdc684decfaa83eec95b5b124401deb515)

Author SHA1 Message Date
jiaoyangna 19465ac1b2 【宝物】共鸣界面等级上限显示不正确 2020-08-27 12:01:01 +08:00
zhangqiang 241a858968 首冲十星展示 法宝返回顺序修复 2020-08-26 22:15:23 +08:00
jiaoyangna 9a0d461ada jwel commit 2020-08-26 21:37:19 +08:00
jiaoyangna a6e3ddcd7d 【宝物】精炼,弹服务器开小差 2020-08-26 21:34:48 +08:00
ZhangBiao 09c72dc362 神将界面点击前往化虚坛提示75级问题修改 2020-08-26 17:21:50 +08:00
gaoxin 9ff8dbf943 我要变强界面匹配当前版本修改 2020-08-26 15:16:17 +08:00
jiaoyangna 06abcb4ee3 宝物commit 2020-08-26 10:18:46 +08:00
jiaoyangna 03ec954c9c 删除log 2020-08-26 10:16:16 +08:00
jiaoyangna 13d2a5f81a 装备宝物修改 2020-08-25 18:17:15 +08: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
zhangqiang 4d19e7ce98 中文表导出提交 2020-08-25 15:46:38 +08:00
zhangqiang 1ec1329fdf 公会副本入口提交 2020-08-25 11:18:20 +08:00
zhangqiang 3a209ba629 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-24 16:31:34 +08:00
zhangqiang b36ebe510c 修改宝物分解 2020-08-24 16:29:27 +08:00
jiaoyangna d7258b7fa5 一键装备提交 2020-08-24 15:40:58 +08:00
jiaoyangna 7c069c390d 一键装备报错修改 2020-08-24 15:08:21 +08:00
jiaoyangna af58044b17 【宝物】宝物合成,合成预览和恭喜获得不一致 2020-08-24 14:31:44 +08:00
zhangqiang 6df142b067 修改bug 分解吞宝器 宝器穿的不显示属性 婚姻副本跳转 宝器合成背景隐藏 2020-08-17 11:39:41 +08:00
zhangqiang 783583404e 神将合成修改提交 2020-08-12 20:59:20 +08:00
shihongyi e797e9f48d 合并develop &2 进程中,暂时不要更新 2020-08-12 11:37:26 +08:00
zhangqiang 22ad34291b 献祭 和 吞卡 掉落身上装备不显示提交 2020-08-10 14:16:48 +08:00
zhangqiang a417e88b0b 恭送编队不检测大门闹天宫 and 车迟斗法失败刷新顺序修改 2020-08-10 11:30:27 +08:00
jiaoyangna e0359bb37a encoding upate 2020-08-06 17:52:32 +08:00
jiaoyangna 1b7f35e41f bg update 2020-08-04 20:49:42 +08:00
zhangqiang 7b73f4ae77 升星成功界面加天赋解锁显示 2020-08-04 17:24:15 +08:00
zhangqiang 72dd128c1f 添加星级天赋描述叠加 去掉无用打印 2020-08-03 16:49:44 +08:00
jiaoyangna 5f20e3e100 fixed bug 2020-08-03 13:37:21 +08:00
zhangqiang b37009ea25 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-18 17:32:48 +08:00
zhangqiang d727e866a7 英雄升级卡顿优化 2020-08-18 17:32:26 +08:00
jiaoyangna d3a71d96aa upstar view material head frame error commit 2020-07-31 09:47:06 +08:00
zhangqiang b2a54634d2 适配调整 巅峰赛入口 2020-08-15 00:08:25 +08:00
zhangqiang 74b9cc5c55 成员红点检测 巅峰战编队入口显示修复 2020-08-11 00:08:56 +08:00
jiaoyangna 38a69a4017 编队添加特效 2020-07-28 16:54:38 +08:00
jiaoyangna d5b15a17ee Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/functions.lua
2020-07-28 15:08:24 +08:00
zhangqiang b63e9b7e81 英雄添加按战力排序 2020-07-31 14:45:32 +08:00
jiaoyangna 99f9e7169e 添加特效 2020-07-28 15:06:47 +08:00
jiaoyangna 46f091f09c 头像框修改提交 2020-07-25 20:28:41 +08:00
jiaoyangna 8bc87ca492 按钮位置不对提交 2020-07-25 17:08:20 +08:00
jiaoyangna a688050060 修改星星提交 2020-07-25 14:21:33 +08:00
jiaoyangna 5f556b7b5c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
2020-07-25 13:22:33 +08:00
zhangqiang f19188797f 英雄背景替换修改出发位置 2020-08-25 15:11:32 +08:00
zhangqiang 4117095996 一键上阵优化 2020-08-24 23:38:17 +08:00
jiaoyangna 0c2239bd11 编队修改提交 2020-07-25 13:21:30 +08:00
jiaoyangna caadda04e1 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab
2020-07-24 20:04:44 +08:00
jiaoyangna 064b819f4a 修改星星提交 2020-07-24 20:03:06 +08:00
zhangqiang a6744aaa90 替换英雄详情背景 2020-08-24 22:03:28 +08:00
jiaoyangna 69f61467a2 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-22 15:57:01 +08:00
jiaoyangna ba8b5a3c93 【宝物合成】一键合成预览处显示错误 2020-07-22 15:50:18 +08:00
ZhangBiao ae502e8322 bug修复 2020-07-21 16:04:07 +08:00