ZhangBiao
|
3280394186
|
【抽卡优化】连续十连或单抽也有确认提示
(cherry picked from commit becdc2dd88 )
(cherry picked from commit 47378d9c50b36d9576a88dccb66016f2ca10127b)
|
2020-12-31 10:49:39 +08:00 |
ZhangBiao
|
c84656e705
|
【降妖夺宝】取消抽卡前摇
|
2020-12-29 14:51:30 +08:00 |
zhangqiang
|
2576c5bcdd
|
【新将来袭】banner 图片替换
|
2020-12-29 12:13:29 +08:00 |
ZhangBiao
|
927aa7053b
|
.进入无尽副本上阵阵容之后推出副本,在挑战关卡、神将-编队无法上三星及以下英雄(不显示)
|
2020-12-29 10:28:10 +08:00 |
JieLing
|
d86c2dc822
|
【资源修改】
|
2020-12-28 20:04:59 +08:00 |
zhangqiang
|
f2ac961e39
|
【提交】
|
2020-12-28 19:46:44 +08:00 |
zhangqiang
|
66e2b0b25d
|
【新将来袭】资源引用丢失
|
2020-12-28 19:41:17 +08:00 |
JieLing
|
91cfcb8ccd
|
【资源文件夹】
|
2020-12-28 19:28:05 +08:00 |
JieLing
|
f799c5432c
|
【资源调整】2
|
2020-12-28 18:59:53 +08:00 |
zhangqiang
|
bbddb9e2ec
|
【资源调整】
|
2020-12-28 18:25:51 +08:00 |
zhangqiang
|
680d112657
|
【乾坤宝盒】 修改
|
2020-12-28 15:56:33 +08:00 |
zhangqiang
|
f553b7275d
|
【跨服天梯】世界等级 加空推送协议
|
2020-12-28 14:27:52 +08:00 |
zhangqiang
|
7729c433e7
|
【跨服天梯】加一个空推送
|
2020-12-28 13:56:06 +08:00 |
zhangqiang
|
46d090b509
|
【抽卡横线】去掉
|
2020-12-28 13:54:34 +08:00 |
wangzhenxing
|
4571f9e5a5
|
[战斗] 不灭buff更新修改提交
|
2020-12-28 12:11:03 +09:00 |
ZhangBiao
|
4010991f0d
|
【森罗幻境】奖励红点修改
(cherry picked from commit b6037a00e3 )
(cherry picked from commit c2b399aa43e39dfd58a624ee27531ddbecbd4828)
|
2020-12-28 12:00:36 +08:00 |
ZhangBiao
|
f35e941cf3
|
【抽卡】没有动画 修改
(cherry picked from commit 95436e5710 )
(cherry picked from commit 1297c9cb18cc57626bd143a351bedc2fbc2c401d)
|
2020-12-28 11:50:59 +08:00 |
gaoxin
|
2c6da4aaf0
|
【装备】装备出售界面文字显示修改
|
2020-12-28 10:46:26 +08:00 |
gaoxin
|
ab7a389f6e
|
【装备】装备出售界面文字显示修改
|
2020-12-28 10:46:18 +08:00 |
wangzhenxing
|
10156d63e6
|
【特效】混乱特效,删除冗余资源
|
2020-12-26 21:06:57 +08:00 |
ZhangBiao
|
5b22a0f671
|
【特效】混乱特效添加
|
2020-12-26 21:04:02 +08:00 |
ZhangBiao
|
9d0c6a30c2
|
【特效】混乱特效添加
|
2020-12-26 21:03:21 +08:00 |
gaoxin
|
f2715c77bc
|
【特效】混乱特效资源文件缺失补齐
|
2020-12-26 20:39:31 +08:00 |
gaoxin
|
f29b6518fa
|
【协议】误删恢复
|
2020-12-26 20:27:54 +08:00 |
gaoxin
|
bf6fd2d13d
|
Merge remote-tracking branch 'origin/0活动开发聚集地/新将活动3个' into master_xma_local
# Conflicts:
# Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/View/UpView.lua
|
2020-12-26 20:22:23 +08:00 |
gaoxin
|
9e67dcb248
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-12-26 19:57:14 +08:00 |
gaoxin
|
f043773668
|
【资源】遗漏资源补齐
|
2020-12-26 19:56:59 +08:00 |
wangzhenxing
|
ed9efaf4e8
|
【战斗】 白骨精追加普攻必定暴击修改
|
2020-12-26 19:54:46 +09:00 |
wangzhenxing
|
fcc8724fca
|
【战斗】=====292被动位置修改
|
2020-12-26 19:52:51 +09:00 |
wangzhenxing
|
4bc92b8b21
|
[战斗]白骨精法宝添加普攻不触发任何特性
|
2020-12-26 19:49:45 +09:00 |
wangzhenxing
|
e9c4cab292
|
[战斗]289被动修改,协议数据提交
|
2020-12-26 19:48:59 +09:00 |
wangzhenxing
|
8503667fc8
|
【战斗】==========混乱特效名称修改
|
2020-12-26 19:48:06 +09:00 |
wangzhenxing
|
f07b8a14d2
|
[战斗]修改切磋判断胜负条件
|
2020-12-26 19:46:18 +09:00 |
wangzhenxing
|
96f31b63ad
|
[优化]魂宝灵宝加号点击区域扩大
|
2020-12-26 19:45:44 +09:00 |
wangzhenxing
|
e4596beb99
|
【宝物】==========宝物添加加号提示
|
2020-12-26 19:44:48 +09:00 |
wangzhenxing
|
8ad04c122c
|
[优化] 巅峰争霸赛,切磋超时改为只判断总伤害,不再判断总治疗
|
2020-12-26 19:36:11 +09:00 |
wangzhenxing
|
f0c2913433
|
[战斗] 修改初始怒气无法增加修改
|
2020-12-26 19:29:44 +09:00 |
wangzhenxing
|
064e00c029
|
[战斗]白骨精技能,被动,魂印效果提交
|
2020-12-26 19:28:29 +09:00 |
jiaoyangna
|
f0f423bbd4
|
红点报错 修改
|
2020-12-26 18:40:28 +08:00 |
jiaoyangna
|
c1f87eb208
|
逍遥红点 提交
|
2020-12-26 18:39:47 +08:00 |
gaoxin
|
1171415e74
|
【技能Tip】修复大小不能自适应文字的问题
|
2020-12-26 18:34:08 +08:00 |
gaoxin
|
7fe3b4f39f
|
【战斗】魂印力战之躯不再免疫间接伤害
|
2020-12-26 18:34:02 +08:00 |
gaoxin
|
f548b3647a
|
【特效】金乌特效动画文件修改
|
2020-12-26 18:33:46 +08:00 |
gaoxin
|
741f7d0448
|
【特效】修复白骨精特效全屏显示
|
2020-12-26 18:33:11 +08:00 |
gaoxin
|
bf4fbffe3d
|
【幸运探宝】修复奖池奖励显示错误
|
2020-12-26 18:33:04 +08:00 |
gaoxin
|
f4b682db17
|
【资源】增加活动及系统需求图片资源 meta文件提交
|
2020-12-26 18:32:56 +08:00 |
liuyipeng
|
56ffc108b1
|
增加活动及系统需求图片资源
|
2020-12-26 18:32:14 +08:00 |
liuyipeng
|
715670308f
|
替换白骨精法宝图片
|
2020-12-26 18:30:54 +08:00 |
gaoxin
|
104505622a
|
Merge branch 'gx/xma_local' into master_xma_local
|
2020-12-26 18:28:21 +08:00 |
zhangqiang
|
a90dc5ff6b
|
【抽卡修改】提交
|
2020-12-26 17:20:38 +08:00 |