Commit Graph

2791 Commits (9e7d48da21dff04557c0aa0ff52a82e43203bd26)

Author SHA1 Message Date
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
zhangqiang 26778992fa 【资源导入】 buff图标 和 状态字混乱 2020-12-26 11:57:58 +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 cb5e374ebf 冲突提交 2020-12-24 16:49:53 +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 28a3341fa1 【增加跳转】化灵符跳转零售特惠
(cherry picked from commit bc582d93e0)
2020-12-24 16:43:22 +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 e95ae4724b 【优化】放生灵兽添加开启等级。 2020-12-24 16:19:32 +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
guowei df79f56b72 【优化五星成长礼包、心魔试炼礼包】 2020-12-24 13:52:28 +08:00
jiaoyangna 171e9a4690 【优化】巅峰赛,十绝阵预告图标双行文字优化 2020-12-24 10:45:15 +08:00
jiaoyangna 0054f5e646 【优化】十绝阵战斗结束后返回至挑战界面,而非编队界面(编队界面无法查看剩余挑战次数和当前绝阵排名) 2020-12-24 10:37:38 +08:00
jiaoyangna d0982716b3 [所向披靡] 提交 2020-12-24 10:24:11 +08:00
jiaoyangna 5a0bece22e 所向披靡修改 2020-12-24 10:23:02 +08:00
jiaoyangna 58de2dc2b5 【逍遥游优化】逍遥游玩法优化内容 红点修改 2020-12-24 09:55:57 +08:00
jiaoyangna 3a6e07bf1c 【逍遥游优化】逍遥游玩法优化内容 2020-12-23 20:18:43 +08:00
ZhangBiao bb8321b4e3 【新将活动】连续抽卡妖精次数不足修复 2020-12-23 17:45:16 +08:00
ZhangBiao 8801a84c2b 【新将活动】商店跳转修复 2020-12-23 17:28:20 +08:00
zhangqiang 1ba79f4627 【装备页面】神将一键装备功能提示 已为最强装备 2020-12-23 16:46:41 +08:00
ZhangBiao 8477ecf347 【降妖夺宝】抽卡妖晶限购计数错误修复 2020-12-23 16:33:41 +08:00
zhangqiang 9d6574d3b3 【优化】公会援助赠送的按钮时间间隔过长,优化按钮连续点击的效果。只加了按钮点击动画 2020-12-23 16:00:10 +08:00
jiaoyangna 4a6d8d0561 【优化】移除点将台界面的进入动画 2020-12-23 15:06:56 +08:00
guowei 47cc019082 【拍脸优化】 2020-12-23 14:54:53 +08:00
jiaoyangna 4520616bd0 Merge branch '0功能/1230版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1230版本优化内容 2020-12-23 14:52:22 +08:00
jiaoyangna 41977a85f5 【优化】删除十绝阵敌方阵容上的血条和怒气条 2020-12-23 14:52:13 +08:00
ZhangBiao d0b94a1c3b 【新将活动】新将来袭、新疆招募、升星有礼 提交 2020-12-23 14:36:15 +08:00
zhangqiang 47397d8b06 【优化】优化编队界面,现在拖动下阵/换位的操作不流畅,经常失败 2020-12-23 14:32:59 +08:00
ZhangBiao 02fe110563 【社稷大典】公会检查跳转失败修复
(cherry picked from commit 6d5a9f9f42)
2020-12-23 11:38:00 +08:00
ZhangBiao 6fc63af086 【增加跳转】增加跳转id 2020-12-23 11:31:58 +08:00
ZhangBiao 38a1eeee9a Merge branch '0活动开发聚集地/升星有礼' into 0活动开发聚集地/新将活动3个
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
2020-12-23 11:29:12 +08:00
ZhangBiao 239dc826df 【升星有礼】合并分支资源名修改 2020-12-23 11:22:44 +08:00
ZhangBiao e40364082c Merge branch '0活动开发聚集地/降妖夺宝' into 0活动开发聚集地/新将活动3个
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
2020-12-23 11:21:27 +08:00
ZhangBiao 9e7f7454e8 【降妖夺宝】合并分支资源名修改 2020-12-23 11:15:54 +08:00
ZhangBiao 30f8049ef5 Merge branch '0活动开发聚集地/新将来袭' into 0活动开发聚集地/新将活动3个
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2020-12-23 11:13:48 +08:00
ZhangBiao f7f0d4099f 【降妖夺宝】结束 2020-12-23 10:34:47 +08:00
guowei fcb2e4604a 【优化】提交 2020-12-23 10:10:48 +08:00
JieLing 83e3b23e28 Merge branch 'master_xma_test' into master_online_hw 2020-12-22 18:37:22 +08:00
JieLing a03cd232ee Merge branch 'master_xma_local' into master_xma_test 2020-12-22 11:17:42 +08:00
gaoxin a0f059ca9b 【皮肤】修复未解锁皮肤,拖动不切换回到默认位置时显示错误 2020-12-21 18:45:58 +08:00
DESKTOP-98AVA47\Administrator b11cf4dfe3 【巅峰赛】拍脸修改 有表 张强提交 2020-12-24 21:04:33 +08:00
gaoxin f26796653d 【皮肤】修复未解锁皮肤,拖动不切换回到默认位置时显示错误 2020-12-21 18:45:03 +08:00
ZhangBiao 8d245aab44 【降妖夺宝】开坑 2020-12-21 17:13:05 +08:00
gaoxin 03e3d77bb6 【优化】橙色改为金色 2020-12-21 16:15:17 +08:00
ZhangBiao 12760d7cb1 【升星有礼】完成 2020-12-21 15:41:31 +08:00
ZhangBiao 3262a6203c 【社稷大典】连续捐献-1修复
(cherry picked from commit 1d5551eee7)
2020-12-21 14:19:41 +08:00
JieLing a9543de95d Merge branch 'master_xma_local' into master_xma_test 2020-12-18 20:11:43 +08:00
JieLing fa24af770b 【协议】战斗协议添加id字段 2020-12-18 19:38:18 +08:00
JieLing e8aa2751a9 Merge branch 'master_xma_local' into master_xma_test 2020-12-18 19:33:25 +08:00
gaoxin 79f6090afb 【协议】回滚系统消息item字段类型 2020-12-18 18:22:52 +08:00
gaoxin eeb7ecba91 【资源】资源名重复修改 2020-12-18 18:01:08 +08:00
gaoxin ec47ec2b1c 【战报系统】接口uid改为通过战斗id获取,兼容pve战斗数据 2020-12-18 16:51:28 +08:00
gaoxin ef1ced3ef7 【战报系统】基础功能添加 2020-12-18 16:51:13 +08:00
ZhangBiao 72f2dd0e90 【主题活动】删除多余的预设 2020-12-18 14:05:17 +08:00
ZhangBiao 0692fbf799 【森罗幻境】重置事件点不触发修复
(cherry picked from commit c50ba93285)
2020-12-18 12:02:42 +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 cf83adb214 【资源导入】 zbj音效替换 2020-12-18 11:22:27 +08:00
zhangqiang 85c47c5ce5 【资源导入】 zbj技能音效提交 2020-12-18 11:22:17 +08:00
liujiaqi 1ecb31cb89 【资源】猪八戒小头像大卡牌 2020-12-18 11:22:06 +08:00
zhangqiang 282e557425 【资源导入】 猪八戒新皮肤 live2d 2020-12-18 11:21:59 +08:00
zhangqiang 5ac11ac291 【资源导入】猪八戒新皮肤特效 2020-12-18 11:21:53 +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
JieLing d5333adb34 Merge branch 'master_xma_test' into master_online_hw 2020-12-16 14:13:21 +08:00
JieLing 72893d588f Merge branch 'master_xma_local' into master_xma_test 2020-12-16 11:38:24 +08:00
gaoxin f4096cb18b 【战斗】v1.0.11
1、修复圣物效果数据错误
 2、不灭buff实现方式修改
 3、灵兽buff回合计算方式修改
2020-12-16 11:36:29 +08:00
JieLing 55a3395437 Merge branch 'master_xma_test' into master_online_hw 2020-12-15 17:12:19 +08:00
JieLing eb93ce3f48 Merge branch 'master_xma_local' into master_xma_test 2020-12-15 12:04:53 +08:00
JieLing 652217ab37 【宝物合成】显示有问题 2020-12-15 11:51:40 +08:00
zhangqiang 74df46d7a8 【套装属性】 bug修改 2020-12-14 17:51:44 +08:00
JieLing 3c67f34b18 Merge branch 'master_xma_local' into master_xma_test 2020-12-14 11:53:15 +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 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 10132cc75f 【每日登陆领奖】背景显示不全,多次点击后各奖励详情不再弹窗 bug 修复 2020-12-12 13:57:18 +08:00
zhangqiang 03e0e73665 【装备套装】 套装属性向下兼容 2020-12-11 17:31:11 +08:00
zhangqiang 72e1cd322b 【灵兽召唤】 1209bug 抽灵兽的动画,有一瞬间的黑屏 2020-12-10 14:18:38 +08:00
zhangqiang 90df5e453f 【竞技场】 1209bug 竞技场跳过战斗按钮,解锁条件同关卡 2020-12-10 13:37:44 +08:00
JieLing 0b250fcf74 Merge branch 'master_xma_test' into master_online_hw 2020-12-09 22:49:14 +08: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
JieLing 2a9740387a Merge branch 'master_xma_local' into master_xma_test 2020-12-08 19:52:56 +08:00
zhangqiang 4493972a2f 【首冲】 首冲测试战斗修改提交 2020-12-08 17:14:08 +08:00
zhangqiang 2a6e0fdf34 【大闹天宫 bug】 失败后保存血量前端报错修改 2020-12-08 17:14:01 +08:00
ZhangBiao b9a3f19509 【GM】钱降一位、一键宝物、一键装备(顶级)
(cherry picked from commit 4ef08d456e)
2020-12-08 15:05:35 +08:00
JieLing 9fdb48ee0b Merge branch 'master_xma_local' into master_xma_test 2020-12-07 20:25:17 +08:00
ZhangBiao 2b3ad467dd 【百宝商会】时间字体颜色提交 2020-12-07 19:48:21 +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
liujiaqi f3dc2797fa 新增3个灵兽小头像 2020-12-07 17:50:05 +08:00
jiaoyangna a446b83908 冲突修改提交 2020-12-07 16:29:22 +08:00
ZhangBiao 523932cc25 【新将来袭】宝箱显示修改 2020-12-07 10:22:43 +08:00
ZhangBiao 1fcb892050 【新将来袭】宝箱位置调整 2020-12-04 19:42:47 +08:00