Commit Graph

2797 Commits (3b615515d88313c6b6e41b3e1b220fb78976f515)

Author SHA1 Message Date
gaoxin c699c2f216 【战报系统】接口uid改为通过战斗id获取,兼容pve战斗数据 2020-12-18 16:27:24 +08:00
ZhangBiao 0692fbf799 【森罗幻境】重置事件点不触发修复
(cherry picked from commit c50ba93285)
2020-12-18 12:02:42 +08:00
ZhangBiao c50ba93285 【森罗幻境】重置事件点不触发修复 2020-12-18 12:00:52 +08:00
ZhangBiao 1431423c4f 【森罗幻境】移动过程中打开其他界面问题修复 2020-12-18 11:39:01 +08:00
ZhangBiao 223b816a98 【青龙秘宝】青龙秘宝等级购买报错修复 2020-12-18 11:38:47 +08:00
gaoxin 57ef5e73cf Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-12-18 11:32:23 +08:00
jiaoyangna 22785d4675 [天相几人]图片提交 2020-12-18 11:23:00 +08:00
jiaoyangna 9f01de23ea [主题活动] 2020-12-18 11:22:54 +08:00
zhangqiang 7f89708bf0 【跨服天梯】修改 2020-12-18 10:57:58 +08:00
zhangqiang 004c56ce90 【跨服天梯】修改 2020-12-18 10:57:29 +08:00
wangzhenxing 3a1bbf7cac 【战斗】 188被动修改 间接伤害不会被义结金兰分摊 2020-12-18 11:23:41 +09:00
wangzhenxing c4320e59e2 【战斗】 142被动效果修改 间接伤害不会触发回血 2020-12-18 11:22:58 +09:00
wangzhenxing 2dd63c7986 [战斗]284效果修改,非技能伤害不会回血 2020-12-18 11:22:24 +09:00
wangzhenxing 297b36eb2b [战斗] 链接符伤害,溢出伤害,舍身济世分摊伤害改为最终伤害 ,舍身济世伤害不触发284被动 2020-12-18 11:21:10 +09:00
gaoxin 9b83785b6d 【系统消息】添加法宝等级的显示 2020-12-18 09:56:39 +08:00
zhangqiang 0ff72cb455 【跨服天梯】修改 2020-12-17 19:25:53 +08:00
zhangqiang 6c57e730dd Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-12-17 19:24:52 +08:00
zhangqiang c4fb8f85a8 【跨服天梯】修改 2020-12-17 19:24:43 +08:00
gaoxin f784532f31 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-12-17 18:36:12 +08:00
gaoxin abc76576b6 【战报系统】代码添加 2020-12-17 18:36:08 +08:00
wangzhenxing 96ab4566ba 【战斗】 188被动修改 间接伤害不会被义结金兰分摊 2020-12-17 18:24:44 +09:00
wangzhenxing 3e6c6a8fe5 【战斗】 142被动效果修改 间接伤害不会触发回血 2020-12-17 18:00:15 +09:00
wangzhenxing 4184907033 [战斗]284效果修改,非技能伤害不会回血 2020-12-17 17:41:12 +09:00
wangzhenxing ce527ef108 [战斗] 链接符伤害,溢出伤害,舍身济世分摊伤害改为最终伤害 ,舍身济世伤害不触发284被动 2020-12-17 16:51:22 +09:00
jiaoyangna cfc4f0f0f6 [天相几人]图片提交 2020-12-17 15:46:28 +08:00
jiaoyangna bcef9f04f5 [主题活动] 2020-12-17 15:34:21 +08:00
zhangqiang 74aef8e711 Merge branch '0功能/跨服十绝阵' into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
2020-12-16 20:27:53 +08:00
zhangqiang d24f8c2c14 【跨服天梯】 修改提交 2020-12-16 20:20:47 +08:00
zhangqiang 476edb6428 【跨服天梯】 修改提交 2020-12-16 20:18:46 +08:00
zhangqiang 76db4f2db9 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-12-16 17:25:01 +08:00
zhangqiang e7f6bf85de 【跨服天梯】代码修改提交 2020-12-16 17:24:31 +08:00
ZhangBiao d847323693 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-12-16 17:24:02 +08:00
ZhangBiao 56eb6c613a 【森罗幻境】移动过程中打开其他界面问题修复 2020-12-16 17:23:52 +08:00
zhangqiang ec7b10d08e Merge branch '0功能/跨服天梯' into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2020-12-16 17:21:11 +08:00
zhangqiang 37336acb66 【跨服天梯】提交 2020-12-16 17:04:17 +08:00
ZhangBiao a03b4e9c5a 【青龙秘宝】青龙秘宝等级购买报错修复 2020-12-16 14:23:44 +08:00
gaoxin f4096cb18b 【战斗】v1.0.11
1、修复圣物效果数据错误
 2、不灭buff实现方式修改
 3、灵兽buff回合计算方式修改
2020-12-16 11:36:29 +08:00
zhangqiang fd28024dc2 【跨服天梯】提交 2020-12-16 11:28:57 +08:00
jiaoyangna f5fface274 【十绝阵】修改提交 2020-12-15 13:59:29 +08:00
JieLing 652217ab37 【宝物合成】显示有问题 2020-12-15 11:51:40 +08:00
zhangqiang 9630a4a016 【套装属性】 bug修改 2020-12-14 17:52:37 +08:00
zhangqiang 74df46d7a8 【套装属性】 bug修改 2020-12-14 17:51:44 +08:00
gaoxin 06f487a176 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-12-12 18:00:38 +08:00
ZhangBiao 4c73219b39 【森罗幻境】诸多bug 修复 2020-12-12 18:00:18 +08:00
ZhangBiao 4da5b2ac46 【易经宝库】 2020-12-12 17:53:34 +08:00
ZhangBiao 242a85a27e 【道具自选箱】宝箱开启数量不能为0 2020-12-12 17:53:27 +08:00
jiaoyangna 720d4f5d8c Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-12-12 17:22:07 +08:00
zhangqiang 475badacc1 博闻强识图片修改 2020-12-12 17:21:28 +08:00
jiaoyangna 0a1e1666f7 【博文多识】 2020-12-12 17:21:13 +08:00
zhangqiang 1e91b33cdd Merge branch 'master_xma_local' into 0功能/1209更新内容 2020-12-12 17:08:37 +08:00
zhangqiang 66c74f5a76 【装备套装】 2020-12-12 17:08:14 +08:00
zhangqiang 328af3f66b 【装备套装】 2020-12-12 17:07:22 +08:00
wangzhenxing 9f4d3cd182 [战斗] 大闹天宫圣物相关被动,同步成和校验服一样 2020-12-12 17:58:37 +09:00
gaoxin ec3636c842 【战斗】检测不灭的方式修改 2020-12-12 16:59:15 +09:00
zhangqiang 09cea38bbd 【每日登陆领奖】背景显示不全,多次点击后各奖励详情不再弹窗 bug 修复 2020-12-12 13:58:37 +08:00
zhangqiang 10132cc75f 【每日登陆领奖】背景显示不全,多次点击后各奖励详情不再弹窗 bug 修复 2020-12-12 13:57:18 +08:00
gaoxin 8b98b9e7e3 【战斗】检测不灭的方式修改 2020-12-11 18:10:46 +08:00
zhangqiang cedbc1222f 【装备套装】 套装属性向下兼容 2020-12-11 17:33:24 +08:00
zhangqiang 03e0e73665 【装备套装】 套装属性向下兼容 2020-12-11 17:31:11 +08:00
ZhangBiao 82eeaa5084 【森罗幻境】诸多bug修复 2020-12-11 17:21:04 +08:00
zhangqiang 6ef26cdc8f 博闻强识图片修改 2020-12-11 15:33:50 +08:00
jiaoyangna 175752ea75 [跨服十绝阵] 提交 2020-12-11 15:28:44 +08:00
zhangqiang 9f2ab54d65 【跨服天梯】 提交 2020-12-11 14:08:57 +08:00
zhangqiang d20ed07826 【跨服天梯】 提交 2020-12-11 11:59:33 +08:00
ZhangBiao e151ca86c7 【易经宝库】 2020-12-10 16:57:26 +08:00
ZhangBiao d2d9818fa9 【道具自选箱】宝箱开启数量不能为0 2020-12-10 16:41:06 +08:00
zhangqiang 200d59bb4d 【灵兽召唤】 1209bug 抽灵兽的动画,有一瞬间的黑屏 2020-12-10 14:42:22 +08:00
zhangqiang b8871d725c 【竞技场】 1209bug 竞技场跳过战斗按钮,解锁条件同关卡 2020-12-10 14:41:45 +08:00
zhangqiang 72e1cd322b 【灵兽召唤】 1209bug 抽灵兽的动画,有一瞬间的黑屏 2020-12-10 14:18:38 +08:00
zhangqiang 90df5e453f 【竞技场】 1209bug 竞技场跳过战斗按钮,解锁条件同关卡 2020-12-10 13:37:44 +08:00
jiaoyangna 84f6ea27ed 【博文多识】 2020-12-10 11:38:11 +08:00
wangzhenxing 9b6e041a27 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-12-10 10:29:33 +09:00
wangzhenxing f6ef3b3d3b 战斗结束输出单位剩余血量日志 2020-12-10 10:28:56 +09:00
ZhangBiao 63c20aaab9 【道具自选箱】选择的数量为0直接关闭调整 2020-12-09 18:12:13 +08:00
ZhangBiao 2803b978c1 【道具自选箱】bug修复
(cherry picked from commit 6df7f2ef10)
2020-12-09 18:12:06 +08:00
ZhangBiao 9b58c897bf 【易经宝库】最中间的未开启 拿到大奖报错修改 2020-12-09 18:11:58 +08:00
ZhangBiao f9f31f5a44 【道具自选箱】选择的数量为0直接关闭调整 2020-12-09 18:02:15 +08:00
ZhangBiao 0937827967 【道具自选箱】bug修复
(cherry picked from commit 6df7f2ef10)
2020-12-09 17:28:43 +08:00
ZhangBiao 8289957799 【易经宝库】最中间的未开启 拿到大奖报错修改 2020-12-09 09:57:49 +08:00
zhangqiang 4493972a2f 【首冲】 首冲测试战斗修改提交 2020-12-08 17:14:08 +08:00
zhangqiang 2a6e0fdf34 【大闹天宫 bug】 失败后保存血量前端报错修改 2020-12-08 17:14:01 +08:00
zhangqiang 934e74672e 【首冲】 首冲测试战斗修改提交 2020-12-08 16:13:23 +08:00
zhangqiang b46e0f9105 【大闹天宫 bug】 失败后保存血量前端报错修改 2020-12-08 15:24:00 +08:00
ZhangBiao b9a3f19509 【GM】钱降一位、一键宝物、一键装备(顶级)
(cherry picked from commit 4ef08d456e)
2020-12-08 15:05:35 +08:00
ZhangBiao 4ef08d456e 【GM】钱降一位、一键宝物、一键装备(顶级) 2020-12-08 15:03:59 +08:00
ZhangBiao 1c7ac7e8cc 【青龙秘宝】修复延时
(cherry picked from commit 758c59dcae)
2020-12-07 19:18:04 +08:00
wangzhenxing b9a112736b [战斗] 修改灵兽给英雄附加的buff的刷新机制,改为大回合刷新,如果灵兽是在回合后释放,配置的持续回合数+1 2020-12-07 18:03:23 +09:00
zhangqiang 62fcc1fa19 【战斗 】 给英雄附加战斗单位类型 2020-12-07 18:02:49 +09:00
wangzhenxing 7da566dc76 [战斗] 神女庇佑最佳技能表现修改,吞鲸魂印修改 2020-12-07 18:01:57 +09:00
zhangqiang bf1f26662a 【跨服天梯】 2020-12-05 13:13:19 +08:00
zhangqiang ac367a1a0c 【跨服天梯】 协议提交 2020-12-05 10:38:17 +08:00
ZhangBiao 1fcb892050 【新将来袭】宝箱位置调整 2020-12-04 19:42:47 +08:00
ZhangBiao b3e374e336 【神将来袭】基本完事儿 2020-12-03 18:36:01 +08:00
ZhangBiao b2e53f8ae5 【新将来袭】战斗血条 2020-12-03 15:11:24 +08:00
ZhangBiao 86d190572a 【神将来袭】加战斗了 2020-12-02 17:14:52 +08:00
ZhangBiao ecb948a613 【神将来袭】真·差战斗 和为小游戏转盘增加log 2020-12-02 15:42:38 +08:00
ZhangBiao 2f07beaa08 【新将来袭】差战斗了 2020-12-02 09:51:17 +08:00
ZhangBiao 2d51e11e10 【神将来袭】代码完善 2020-12-01 15:52:34 +08:00
ZhangBiao 758c59dcae 【青龙秘宝】修复延时 2020-12-01 13:51:42 +08:00
ZhangBiao 1222f1df0c 【新将来袭】开坑 2020-12-01 13:51:13 +08:00
gaoxin 119be29c7d 【角色】修复角色被动技能数量计算错误,兼容多合一被动 2020-11-30 21:17:56 +08:00
gaoxin 4dbbbc7929 【战斗】修复lenthoftable方法在后端战斗中无法调用导致报错 2020-11-30 20:35:14 +08:00
zhangqiang b0f9e59672 【车迟】抢夺空队伍 提示错误 2020-11-30 11:09:07 +08:00
zhangqiang f696619328 【编队战力】 修改战力显示 2 未合 local 2020-11-30 10:17:44 +08:00
zhangqiang 6c4afae844 【编队战力】 编队界面的那个英雄战力计算修改 2020-11-30 10:17:34 +08:00
wangzhenxing a711c30c64 [战斗] 99被动修改 屏蔽金翅大鹏不灭 2020-11-28 17:59:38 +09:00
wangzhenxing 30f953f6de 【战斗】 角色查找逻辑添加 排除拥有不灭的单位 和 没有不灭的无序列表 103效果改成治疗随机多个单位 276被动 改为给随机英雄加 2020-11-28 17:58:36 +09:00
wangzhenxing ce8c206717 【战斗】效果:103修改添加1个参数 被动 147 206修改 被动添加271-284 2020-11-28 17:56:58 +09:00
gaoxin 15c862fd23 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-27 17:28:08 +08:00
zhangqiang 6a7c9b920d 【车迟斗法】 修改抢夺 挑战时会报错修复 2020-11-27 17:20:42 +08:00
zhangqiang 17882656fe 【竞技场】 修复积分规则修改别的pvp 战斗结束后报错 bug 2020-11-27 17:20:29 +08:00
zhangqiang f8dd59fdfc 【车迟斗法】 我编队为空 或者 对方编队我空 逻辑处理 2020-11-27 17:19:53 +08:00
gaoxin 4b165e3551 Merge branch '0功能/背包最大值限制提示添加' into master_xma_local 2020-11-27 17:18:01 +08:00
gaoxin b173c4384a Merge branch '0功能/系统消息结构处理' into master_xma_local 2020-11-27 17:17:57 +08:00
gaoxin 8eb823937e 【系统消息】暂时屏蔽法宝详情的显示 2020-11-27 15:06:58 +08:00
gaoxin 7ee6f446b3 【背包】背包已满提示方式改为tips 2020-11-27 14:00:53 +08:00
gaoxin d0cb62fab6 【背包】物品最大数量限制提示添加 2020-11-27 13:31:24 +08:00
zhangqiang 80c949c54d 【灵兽】 灵兽数据分页 2020-11-27 10:57:50 +08:00
gaoxin ad9c72717a 【系统消息】修改系统消息点击法宝相关消息显示为一级的法宝信息 2020-11-27 10:49:20 +08:00
ZhangBiao 2df4f34c76 【编队优化】切磋增加一键
(cherry picked from commit e7a178aa0d99c0e9257c029ecabac2dac0a9b9d4)
2020-11-26 16:09:22 +08:00
ZhangBiao 13e2fbb98d Merge branch '0功能/竞技场胜负奖励' into master_xma_local 2020-11-26 11:11:57 +08:00
zhangqiang 3f2029a681 旗开得胜 提交 2020-11-25 21:02:16 +08:00
ZhangBiao be9b79897e 【竞技场】增加产出 2020-11-25 18:23:33 +08:00
zhangqiang 46487b66f0 【跨服天梯】 2020-11-24 10:40:56 +08:00
wangzhenxing 4b6578e957 [战斗] 91 112 115 196 256 被动添加特性屏蔽修改 2020-11-24 11:31:02 +09:00
wangzhenxing 2cc096cd18 【战斗】147,206被动修改回原来的效果 2020-11-24 11:24:29 +09:00
wangzhenxing e3e609c87e [战斗] 245-256被动修改,修改英雄身上如果有两个相同类型被动只能触发一个的问题 2020-11-24 11:23:31 +09:00
gaoxin 34ae0ed497 【战斗】无用log删除,技能数量限制初始化数据位置错误 2020-11-23 21:36:34 +08:00
gaoxin 5e4f1a5165 v1.0.7
1、修复单个回合技能上限数值会在后端累加,当一场战斗结束此数值刚好达到上限时,下一场战斗毕定卡死的问题
2020-11-23 10:08:36 +08:00
ZhangBiao d938acc273 【竞技场】增加输赢奖励掉落 2020-11-23 09:58:22 +08:00
zhangqiang 50743a36b7 【跨服天梯】 提交 2020-11-20 19:10:46 +08:00
zhangqiang e3960fc466 【跨服天梯】 提交 2020-11-20 17:35:49 +08:00
gaoxin 85a608d21a Revert "Revert "【战斗】v1.0.5""
This reverts commit 941cb86845.
2020-11-20 15:15:45 +08:00
gaoxin 941cb86845 Revert "【战斗】v1.0.5"
This reverts commit 0548b16015.
2020-11-20 15:07:27 +08:00
gaoxin 2331c8d013 【战斗】添加超时检测 2020-11-20 15:07:08 +08:00
zhangqiang a0b0a19654 【跨服天梯】 红点 + 世界等级 2020-11-20 15:00:08 +08:00
gaoxin 0548b16015 【战斗】v1.0.5
1、修复人物行动前被持续伤害击杀,触发被击杀时追加技能,释放技能后战斗卡死的问题
 2、添加每回合技能释放数量上限
2020-11-20 14:27:23 +08:00
zhangqiang 3279c14746 【跨服天梯】 提交 2020-11-19 20:51:19 +08:00
zhangqiang 899903104f 【特权礼包】加等级显示前端
【公会副本】 加前端五点刷新不能扫荡
2020-11-19 19:30:46 +08:00
zhangqiang 098c66e5b8 【跨服天梯】资源预设提交 2020-11-19 18:30:19 +08:00
ZhangBiao 532e766de5 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-19 17:37:28 +08:00
ZhangBiao d789b9e98e 【编队优化】轩辕宝镜一键特殊处理 2020-11-19 17:37:13 +08:00
ZhangBiao c5c4efef63 Merge branch '0功能/增加一键上阵' into master_xma_local 2020-12-03 05:30:39 +08:00
jiaoyangna 8198b24720 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-19 17:22:33 +08:00
jiaoyangna 1299b62feb 灵兽宝阁位置名称修改 2020-11-19 17:22:10 +08:00
gaoxin 37631ebc67 【战斗】技能特效播放层级修改 2020-11-19 15:44:23 +08:00
jiaoyangna 8ceb1b4a51 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-19 15:28:27 +08:00
ZhangBiao 68cf2e356a 【竞技场】在线刷新没红点修复 2020-12-03 05:10:15 +08:00
ZhangBiao 3b4826c235 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-12-03 04:56:01 +08:00
ZhangBiao 2fbe5aa120 【大闹天宫】重置前五分钟踢出玩家 2020-12-03 04:55:51 +08:00