jiaoyangna
|
a793dccf22
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-17 14:47:50 +08:00 |
jiaoyangna
|
32ba399115
|
【ID1018484】
【森罗幻境】抽到整只灵兽,需要重登才会显示在背包
|
2021-09-17 14:47:20 +08:00 |
ZhangBiao
|
2925de34e8
|
【七界试炼】结算界面提交
|
2021-09-17 14:38:05 +08:00 |
wangzhenxing
|
52221aca04
|
【战斗】==========被动196 修改
|
2021-09-17 14:26:30 +08:00 |
ZhangBiao
|
ad4c218f01
|
【七界试炼】提交
|
2021-09-17 13:42:27 +08:00 |
jiaoyangna
|
0cce699bac
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-17 13:34:27 +08:00 |
jiaoyangna
|
80c4f8cd23
|
【ID1018487】
【鸿蒙阵】共鸣的装备和宝物不显示共鸣的箭头
|
2021-09-17 13:34:15 +08:00 |
wangzhenxing
|
4511eec383
|
【战斗】==========被动196 修改
|
2021-09-17 11:55:18 +08:00 |
gaoxin
|
38fcf555dd
|
【山河社稷图】修复战斗不一致
|
2021-09-16 22:43:38 +08:00 |
ZhangBiao
|
4d8576d200
|
【七界试炼】战斗层数锁住了
|
2021-09-16 21:05:43 +08:00 |
wangzhenxing
|
e584db1eaa
|
[战斗]===========被动196 200 188修改
|
2021-09-16 20:31:12 +08:00 |
ZhangBiao
|
60c954bf38
|
【七界试炼】提交
|
2021-09-16 19:36:16 +08:00 |
ZhangBiao
|
688c8081fc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-16 18:11:47 +08:00 |
ZhangBiao
|
7e97b7c90b
|
【通用大弹窗】修改
|
2021-09-16 18:11:33 +08:00 |
wangzhenxing
|
28d68a2d43
|
玉虚论道修改
|
2021-09-16 18:10:51 +08:00 |
wangzhenxing
|
5e07162f81
|
[战斗]====燃烧特效预设修改
|
2021-09-16 17:54:25 +08:00 |
ZhangBiao
|
6c17058b8e
|
【寻宝迷踪】活动结束跳回还弹出奖励修改
|
2021-09-16 17:45:14 +08:00 |
ZhangBiao
|
9d8fa02bcc
|
【寻宝迷踪】提交
|
2021-09-16 17:33:23 +08:00 |
jiaoyangna
|
3d948e7f0c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-16 17:29:40 +08:00 |
jiaoyangna
|
da21b0ba37
|
修改提交
|
2021-09-16 17:29:16 +08:00 |
wangzhenxing
|
3b42d8034d
|
[战斗]==============技能实例里 技能是否能释放添加判断 如果没有攻击目标就返回 false
|
2021-09-16 17:27:16 +08:00 |
jiaoyangna
|
6c5552524b
|
报错修改
(cherry picked from commit 80e81f9f9b )
|
2021-09-16 17:16:25 +08:00 |
jiaoyangna
|
b4a2cdb018
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-16 17:11:50 +08:00 |
jiaoyangna
|
8293c56b37
|
建木神树图片修改提交
(cherry picked from commit f127a0e858 )
|
2021-09-16 17:11:29 +08:00 |
ZhangBiao
|
3730a6b28f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-16 17:05:36 +08:00 |
ZhangBiao
|
1809ae7890
|
【魂灵宝】回收界面排序
|
2021-09-16 17:05:27 +08:00 |
jiaoyangna
|
58611fc517
|
bat Resource Commit:2021/09/16,17:03:02
|
2021-09-16 17:03:02 +08:00 |
jiaoyangna
|
61e3034702
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-16 16:57:26 +08:00 |
jiaoyangna
|
52ca68fe7e
|
提交资源日志修正
|
2021-09-16 16:57:13 +08:00 |
skuld
|
b83bf2dff4
|
bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/09/16,16:53:49
|
2021-09-16 16:53:50 +08:00 |
ZhangBiao
|
20c122e096
|
【寻宝迷踪】红点修改
|
2021-09-16 16:52:22 +08:00 |
ZhangBiao
|
a0da25c2d0
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-16 16:41:33 +08:00 |
ZhangBiao
|
90a9abba0d
|
【寻宝迷踪】提价
|
2021-09-16 16:41:23 +08:00 |
wangzhenxing
|
9a5a18268e
|
【战斗】=====战斗界面预设修改提交
|
2021-09-16 16:28:43 +08:00 |
ZhangBiao
|
a79d425b3b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-16 16:16:59 +08:00 |
ZhangBiao
|
1e17301cc8
|
【背包优化】宝物背包按照品质优先级进行排序,并增加阵营筛选功能
|
2021-09-16 16:16:50 +08:00 |
wangzhenxing
|
6ba0d264fd
|
【战斗】=========战斗界面预设 我方阵容适配修改提交
|
2021-09-16 16:13:55 +08:00 |
wangzhenxing
|
a20c226704
|
[战斗]====御甲图片资源提交
|
2021-09-16 15:47:17 +08:00 |
wangzhenxing
|
fcd3213688
|
[战斗]========战斗界面我方灵兽位置修改
|
2021-09-16 15:02:14 +08:00 |
jiaoyangna
|
4e4a53d447
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-16 14:08:41 +08:00 |
jiaoyangna
|
415eb7a947
|
【寻宝迷踪】寻宝返回后默认返回显示活动第一个页签
|
2021-09-16 14:06:37 +08:00 |
ZhangBiao
|
537af282e6
|
【寻宝迷踪】提交
|
2021-09-16 14:05:07 +08:00 |
ZhangBiao
|
f035b30e59
|
【寻宝迷踪】tip遮盖修改
|
2021-09-16 13:43:10 +08:00 |
ZhangBiao
|
95adcb6b1d
|
Revert "【寻宝迷踪】修改提交"
This reverts commit 31304cc252 .
|
2021-09-16 13:39:23 +08:00 |
gaoxin
|
2494b16f89
|
Merge branch 'china/dev' into 0功能/角色战斗力计算2
|
2021-09-16 13:37:16 +08:00 |
gaoxin
|
66efc9d4e3
|
【战斗力】新战斗力计算系统完成
|
2021-09-16 13:35:33 +08:00 |
ZhangBiao
|
31304cc252
|
【寻宝迷踪】修改提交
|
2021-09-16 13:25:15 +08:00 |
ZhangBiao
|
512a12cc72
|
【七界试炼】提交
|
2021-09-16 11:24:35 +08:00 |
ZhangBiao
|
d49d73dcb5
|
【寻宝迷踪】跳转提交
|
2021-09-15 19:14:18 +08:00 |
ZhangBiao
|
45de3d5c99
|
【七界试炼】提交
|
2021-09-15 18:09:21 +08:00 |