jiaoyangna
|
ef4c4fccba
|
power change update
|
2020-11-14 14:31:38 +08:00 |
jiaoyangna
|
c639ea1c6b
|
delete log
|
2020-11-14 14:16:41 +08:00 |
jiaoyangna
|
069d42baca
|
皮肤到期刷新
|
2020-11-14 14:16:10 +08:00 |
zhangqiang
|
68979d577e
|
【神将觉醒】 觉醒成功界面
|
2020-11-07 15:15:49 +08:00 |
jiaoyangna
|
3a481d6d5f
|
[皮肤]修改提交
|
2020-11-06 21:05:39 +08:00 |
jiaoyangna
|
0a772f466b
|
皮肤提交
|
2020-11-06 20:36:38 +08:00 |
jiaoyangna
|
cd99dd509b
|
立绘加载错误修改
|
2020-11-06 16:37:52 +08:00 |
zhangqiang
|
1a4349d93b
|
【觉醒】 界面提交
|
2020-11-06 16:23:02 +08:00 |
jiaoyangna
|
5251bc4059
|
[神将界面修改]
|
2020-11-06 16:11:37 +08:00 |
jiaoyangna
|
ccf02fb171
|
【皮肤】添加倒计时
|
2020-11-05 18:26:38 +08:00 |
jiaoyangna
|
5026bdd0c3
|
【皮肤】提交
|
2020-11-05 16:02:49 +08:00 |
jiaoyangna
|
360727419e
|
【皮肤】修改皮肤显示
|
2020-11-04 16:51:45 +08:00 |
jiaoyangna
|
4cb31d8f38
|
[皮肤]提交
|
2020-11-04 10:59:04 +08:00 |
jiaoyangna
|
1fcdf5b2a6
|
【皮肤】添加皮肤属性加成
|
2020-11-03 19:37:05 +08:00 |
jiaoyangna
|
e92e63444b
|
皮肤提交
|
2020-11-03 17:27:32 +08:00 |
jiaoyangna
|
d040e4dded
|
神将界面结构修改
|
2020-11-03 15:17:48 +08:00 |
zhangqiang
|
721418b30a
|
线上问题 宝器分解bug
|
2020-10-12 15:55:04 +08:00 |
gaoxin
|
9ff73bfa4c
|
添加重复穿戴的宝器的处理,重复穿戴的自动卸下,并自动穿戴在战斗力最大的人身上
|
2020-10-09 21:46:03 +08:00 |
jiaoyangna
|
2e272debe3
|
一键宝物重复穿戴宝物bug 修改
|
2020-10-15 14:06:06 +08:00 |
JieLing
|
0fdac5e7d3
|
成长基金领取报错修改,签到报错修改,天赋提示文字
|
2020-09-28 15:41:17 +08:00 |
gaoxin
|
b3d15c1945
|
头像特效添加
|
2020-09-27 16:58:10 +08:00 |
zhangqiang
|
f6a3178926
|
xiugai
|
2020-09-04 17:34:59 +08:00 |
zhangqiang
|
56092d5572
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-04 17:21:51 +08:00 |
zhangqiang
|
d1e44c360d
|
xiugai
|
2020-09-04 17:21:16 +08:00 |
jiaoyangna
|
5a861862d5
|
商店添加动画
|
2020-09-04 16:54:58 +08:00 |
zhangqiang
|
352f338abe
|
界面战力不一致
|
2020-09-03 16:03:14 +08:00 |
jiaoyangna
|
6a951e8fd7
|
神将,进阶提交
|
2020-09-03 14:12:32 +08:00 |
gaoxin
|
6e400a4db1
|
屏幕适配提交
|
2020-09-02 22:29:33 +08:00 |
jiaoyangna
|
d2e94cfdea
|
hero compound and replace
|
2020-09-02 17:21:54 +08:00 |
gaoxin
|
97eaf77009
|
主界面底部界面经验条显示调整
|
2020-09-01 17:12:00 +08:00 |
jiaoyangna
|
3a791c802e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-01 10:23:51 +08:00 |
jiaoyangna
|
33a6471c05
|
【宝物】共鸣界面等级上限显示不正确
|
2020-09-01 10:23:35 +08:00 |
zhangqiang
|
70a17dc502
|
法宝添加红点提示
|
2020-08-31 19:47:57 +08:00 |
gaoxin
|
fbcaa5b83f
|
修复装备界面套装属性显示会累加的问题
|
2020-08-31 17:06:14 +08:00 |
zhangqiang
|
daf0f8bca7
|
装备界面战力计算修改
|
2020-08-31 11:03:16 +08:00 |
ZhangBiao
|
238aa19209
|
神将情报点击装备查看详情 报错修改
|
2020-08-28 14:01:34 +08:00 |
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 |
jiaoyangna
|
9fbcc3b77b
|
【神将】升星,需要四个三星同阵营不应该自动给选择上
|
2020-07-21 14:16:40 +08:00 |
jiaoyangna
|
7faa067c52
|
宝物分解提交
|
2020-07-17 14:15:42 +08:00 |
jiaoyangna
|
96c16ca7f8
|
去掉log
|
2020-07-17 11:38:18 +08:00 |
jiaoyangna
|
adc3b71e40
|
分解修改提交
|
2020-07-16 10:49:01 +08:00 |
jiaoyangna
|
f54529ce21
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-14 15:54:47 +08:00 |
jiaoyangna
|
798c730f56
|
公会红点显示,
|
2020-07-14 15:54:18 +08:00 |
zhangqiang
|
592d3385e8
|
129 战力计算
|
2020-07-14 14:49:15 +08:00 |
ZhangBiao
|
7785a7c472
|
神将生阶属性显示错误问题修复
|
2020-07-14 14:03:08 +08:00 |
jiaoyangna
|
3953a76280
|
【宝物】一键装备替下来的,不在背包显示
|
2020-07-13 15:00:07 +08:00 |
ZhangBiao
|
310802e967
|
language导出
|
2020-07-10 19:13:29 +08:00 |
jiaoyangna
|
f9c49d00e3
|
宝物bug修改
|
2020-07-09 10:53:15 +08:00 |
jiaoyangna
|
c15b84b096
|
Merge branch 'master_develop' into equip
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
# Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
|
2020-07-07 18:13:34 +08:00 |
jiaoyangna
|
c6bfa772e5
|
装备提交
|
2020-07-07 16:35:57 +08:00 |
jiaoyangna
|
7f54e3c88a
|
装备提交
|
2020-07-06 20:35:39 +08:00 |