Commit Graph

3974 Commits (175edb62190858bfd3db093b2a77f7127993f85d)
 

Author SHA1 Message Date
DESKTOP-98AVA47\Administrator 175edb6219 【鸿蒙阵】添加界面 2020-11-25 20:39:48 +08:00
gaoxin b382a91ba8 【资源】孟姜女立绘删除老旧资源 2020-11-25 15:58:22 +08:00
gaoxin c12cdf7848 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-25 15:11:13 +08:00
gaoxin aec7dbd25d 【屏幕适配】修改ipad适配的方式 2020-11-25 15:11:04 +08:00
gaoxin 6d4dd819f8 【屏幕适配】修改ipad适配的方式 2020-11-25 14:57:48 +08:00
gongjiawei 955af5caa9 音频更新 2020-11-25 14:17:23 +08:00
gaoxin 82d325bb59 【特效】孟姜女技能裁切处理 2020-11-24 20:35:53 +08:00
gaoxin d8be2456ea 【战斗】修复技能单回合限制会导致战斗卡死的问题 2020-11-24 19:18:59 +08:00
gaoxin e3429b5547 【资源】三四星技能音效添加 2020-11-24 14:32:53 +08:00
wangzhenxing 26519a2158 [战斗] 91 112 115 196 256 被动添加特性屏蔽修改 2020-11-23 15:08:22 +09:00
zhangqiang 8bc7d38cb5 【特效】 巨锟 皮丘 2020-11-23 14:26:03 +08:00
gaoxin 393dfb6c0d 【资源】特效节点改为recttransform 2020-11-20 19:23:11 +08:00
gaoxin bdde50f26a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-20 18:42:49 +08:00
gaoxin 908fdc05a8 【资源】迦楼罗,聂小倩特效修改 2020-11-20 18:42:39 +08:00
zhangqiang 298d19ef1a 【孟姜女】特效替换 2020-11-20 18:21:48 +08:00
gaoxin a4315b19a1 【资源】名称重复修改 2020-11-20 16:29:29 +08:00
gaoxin 2b2df7a106 【资源】孟姜女,迦楼罗特效资源修改,幽魂姬资源新增 2020-11-20 16:16:56 +08:00
gaoxin d0c0cd3f2c Merge branch 'master_xma_local' into master_develop 2020-11-20 15:39:30 +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
gaoxin 0548b16015 【战斗】v1.0.5
1、修复人物行动前被持续伤害击杀,触发被击杀时追加技能,释放技能后战斗卡死的问题
 2、添加每回合技能释放数量上限
2020-11-20 14:27:23 +08:00
wangzhenxing 53e473c325 【战斗】147,206被动修改回原来的效果 2020-11-20 10:00:16 +09:00
zhangqiang 899903104f 【特权礼包】加等级显示前端
【公会副本】 加前端五点刷新不能扫荡
2020-11-19 19:30:46 +08:00
wangzhenxing 6ce8000c0b [战斗] 245-256被动修改,修改英雄身上如果有两个相同类型被动只能触发一个的问题 2020-11-19 20:24:30 +09:00
jiaoyangna 1303495f3d Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-19 18:31:19 +08:00
jiaoyangna ffdb9c20eb 图片提交 2020-11-19 18:31:11 +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 1a88c57864 Merge remote-tracking branch 'origin/master_xma_local' into master_develop 2020-11-19 15:44:53 +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
jiaoyangna 20564aee0f 【日常副本】解锁所有副本后,没有自动滚动到最后一个副本 2020-11-19 15:28:21 +08:00
jiaoyangna 0914dd6dc8 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-19 15:09:24 +08:00
jiaoyangna 2c72089def 【逍遥游】掷骰子播放时需要加限制,不能点击关闭,或者直接显示结果 2020-11-19 15:09:00 +08:00
gaoxin b516397443 Merge branch 'master_xma_local' into master_develop 2020-11-19 14:54:12 +08:00
gaoxin 59937a1132 【战斗】修改自动下落特效的时间为表配置 2020-11-19 14:53:45 +08:00
gaoxin 680e3eb9e6 【资源】阿修罗特效裁切问题修改 2020-11-19 14:51:48 +08:00
gaoxin 8c692349db 【资源】修复聂小倩光效切割问题,修复阿修罗释放特效错误的问题 2020-11-19 14:37:51 +08:00
jiaoyangna d8f31bab35 主题活动修改提交 2020-11-19 14:26:57 +08:00
gaoxin a96b128965 【资源】鬼差,木吒,水德星君光效切割问题修复 2020-11-19 13:52:44 +08:00
jiaoyangna 2a9b4cb5ab 动态立绘修改 2020-11-19 11:49:34 +08:00
jiaoyangna e09872eb7f 限时招募修改提交 2020-11-19 10:35:21 +08:00
jiaoyangna 3e7c24c029 【主题活动】降龙伏虎 2020-11-18 18:15:50 +08:00