Commit Graph

1940 Commits (962c41e11caebb5436a4fa1c8b92c95c22fbc88e)

Author SHA1 Message Date
JieLing 650de3dc74 Merge branch 'master_xma_local' into master_xma_test 2020-12-29 15:57:39 +08:00
ZhangBiao c84656e705 【降妖夺宝】取消抽卡前摇 2020-12-29 14:51:30 +08:00
ZhangBiao 927aa7053b .进入无尽副本上阵阵容之后推出副本,在挑战关卡、神将-编队无法上三星及以下英雄(不显示) 2020-12-29 10:28:10 +08:00
JieLing d4862c1064 Merge branch 'master_xma_local' into master_xma_test 2020-12-28 19:49:46 +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
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
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
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 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 7fe3b4f39f 【战斗】魂印力战之躯不再免疫间接伤害 2020-12-26 18:34:02 +08:00
gaoxin bf4fbffe3d 【幸运探宝】修复奖池奖励显示错误 2020-12-26 18:33:04 +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
jiaoyangna d5d30fd6a8 刷新礼包修改 2020-12-26 11:47:16 +08:00
gaoxin aaf7a4f470 【引导】修复会部分功能重复开启会重复引导的问题 2020-12-25 15:34:38 +08:00
ZhangBiao 6945cbcacf 【森罗幻境】红点修改 2020-12-25 12:05:23 +08:00
ZhangBiao 6befa383c8 【降妖夺宝】界面调整 2020-12-24 18:36:38 +08:00
ZhangBiao 49dc0f172c 【无尽副本】重置事件点无法触碰修复
(cherry picked from commit e5b00c5cd9)
2020-12-24 18:01:11 +08:00
ZhangBiao 3516c10cc6 [森罗环境] 扎小怪计入击杀奖励 2020-12-24 17:16:33 +08:00
ZhangBiao 601eefb120 【降妖夺宝】点击抽卡时可以切换其他界面修复 2020-12-24 16:57:39 +08:00
zhangqiang 95c753a70e 【大闹天宫】上阵纯治疗神将,战斗失败后选择保留状态,报错 2020-12-24 16:52:46 +08:00
jiaoyangna a6a596746d Merge branch '0功能/1230版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1230版本优化内容 2020-12-24 16:46:48 +08:00
jiaoyangna 6e96218bc3 逍遥 红点 2020-12-24 16:45:36 +08:00
jiaoyangna 4fea51e35f 逍遥红点 2020-12-24 16:45:13 +08:00
ZhangBiao c5022043fd 【道具使用跳转】跳转后返回关闭弹窗界面
(cherry picked from commit 150ec3eb2f)
2020-12-24 16:43:37 +08:00
ZhangBiao 4faa39ab2a 【道具使用跳转】使用跳转修改,活动道具要大于10000
(cherry picked from commit b2f8d14470)
2020-12-24 16:42:24 +08:00
jiaoyangna 1f05f5f8f6 逍遥游 红点提交 2020-12-24 16:19:46 +08:00
jiaoyangna 29c5c08ea4 【优化】放生灵兽添加开启等级。 2020-12-24 16:19:22 +08:00
zhangqiang 26d714e1c5 【优化】等级成长礼 2020-12-24 16:06:10 +08:00
ZhangBiao c57944e742 Merge branch '0功能/1230版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1230版本优化内容 2020-12-24 15:13:15 +08:00
ZhangBiao 78ead0e8ad 【大闹天宫】一键上阵招募英雄 2020-12-24 15:13:03 +08:00
guowei f25f253479 【合成优化修改】 2020-12-24 15:03:14 +08:00
ZhangBiao 8376d74230 【无尽副本】战斗失败自动复位时,自动进行一次一键上阵 2020-12-24 14:13:58 +08:00
ZhangBiao 8f9a58468f 【新将来袭】左上货币刷新不及时修复 2020-12-24 14:06:51 +08:00