Commit Graph

11234 Commits (33f0b51d948f1857df432bd16e7b12ec6b152988)
 

Author SHA1 Message Date
jiaoyangna a9709ad212 【ID1019165】
【灵兽列表】部分星星显示位置错误
2021-11-16 16:40:34 +08:00
gaoxin 63fedf2d3c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-16 16:31:24 +08:00
gaoxin 2a5c5962e8 【开天专服】打包场景添加 2021-11-16 16:31:12 +08:00
jiaoyangna 2ec40af5e5 【ID1019177】
【鸿蒙阵】共鸣区上阵激活神魂将,下拉必现

(cherry picked from commit 7f5a36cf4b)
2021-11-16 16:29:16 +08:00
jiaoyangna 7f5a36cf4b 【ID1019177】
【鸿蒙阵】共鸣区上阵激活神魂将,下拉必现
2021-11-16 16:28:36 +08:00
jiaoyangna 1e4a7a57be 法宝之魂 提交 2021-11-16 15:24:17 +08:00
wangzhenxing 1361867887 【坐骑】=======四不像提交 2021-11-16 13:31:28 +08:00
ZhangBiao ec1d668524 Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-16 13:11:47 +08:00
ZhangBiao 5eaf88defb 【GM】修改GM 2021-11-16 11:53:19 +08:00
ZhangBiao d717519d93 【灵脉秘境】提交 2021-11-16 11:21:37 +08:00
jiaoyangna aa6a031fdf 法宝聚灵提交 2021-11-16 09:33:10 +08:00
zhangshanxue 6dc9993671 Merge branch 'china/dev' into china/test 2021-11-15 18:39:21 +08:00
ZhangBiao a4151f51b2 【灵脉秘境】提交 2021-11-15 18:38:53 +08:00
gaoxin b6ea250096 【新手战斗】选择女角色后,战斗中立绘替换为女角色 2021-11-15 18:34:25 +08:00
jiaoyangna e6f4e50656 法宝聚灵 2021-11-15 18:24:39 +08:00
gaoxin 3a70720f9c 【新手战斗】第一场战斗关闭跳过 2021-11-15 17:26:04 +08:00
liujiaqi 1498cd7661 【新手战斗】报错修复 2021-11-19 17:20:28 +08:00
ZhangBiao 336ea6b8d3 Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-15 17:19:01 +08:00
gaoxin 79d22b0545 【新手战斗】回合开始触发改为回合结束触发 2021-11-15 17:09:52 +08:00
ZhangBiao e43d15f213 【神魂】头像框错误修改 2021-11-15 17:07:25 +08:00
ZhangBiao d58d81cbbf 【神魂】神魂头像框修改 2021-11-15 17:07:18 +08:00
ZhangBiao 254a420fb7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-15 16:59:01 +08:00
ZhangBiao 2c0032b829 【神魂】头像框错误修改 2021-11-15 16:58:49 +08:00
gaoxin 9c50acee09 【引导战斗】添加第N回合开始时触发剧情 2021-11-15 16:46:41 +08:00
ZhangBiao d815fbb69f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-15 16:44:59 +08:00
ZhangBiao b7c354befe 【神魂】神魂头像框修改 2021-11-15 16:44:46 +08:00
gaoxin f7a1ddbc94 【假战斗】背景走表配置 2021-11-15 16:39:38 +08:00
ZhangBiao c9d11c44ec 【成长基金】配合后端修改 2021-11-15 16:36:18 +08:00
ZhangBiao 9fca63f5a1 【成长基金】配合后端修改 2021-11-15 15:44:02 +08:00
wangzhenxing 5eef9ba873 [特效]=========主角一技能特效 2021-11-15 14:39:36 +08:00
gaoxin 1e5f397ac1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-15 13:11:18 +08:00
gaoxin 5be38dacb1 【新手剧情】起名界面添加回调 2021-11-15 13:10:59 +08:00
wangzhenxing 7790f90d8f 【战斗】=======被动处理伤害修改 2021-11-15 10:34:13 +08:00
ZhangBiao ff3fcf3db9 Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-15 09:56:59 +08:00
ZhangBiao 07a87548aa 【灵脉秘境】提交 2021-11-15 09:56:02 +08:00
wangzhenxing f23dfe81e7 [战斗]======我方单位显示立绘提交 2021-11-12 18:58:55 +08:00
zhangshanxue 37d3b277bf Merge branch 'china/dev' into china/test 2021-11-12 18:22:32 +08:00
gaoxin f1f407fdd6 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-12 18:19:01 +08:00
gaoxin ee6e1265d8 【活动】修复红点会显示灰色的问题 2021-11-12 18:18:56 +08:00
gaoxin 6033aa6128 【战斗力】修复条件属性计算不完全的问题 2021-11-12 18:18:50 +08:00
wangzhenxing 7dfa28321c [战斗]======被动376 377修改 2021-11-12 17:38:28 +08:00
zhangshanxue 224120068c Merge branch 'china/dev' into china/test 2021-11-12 16:56:44 +08:00
gaoxin 83583747ad Merge branch '0功能/和谐资源后台控制' into china/dev 2021-11-12 16:39:53 +08:00
skuld b63ad78128 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-28 16:30:29 +08:00
skuld 9f64c64712 【森罗环境】商店无法拖动修改 2021-11-28 16:30:11 +08:00
gaoxin 69f0ebc6d0 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-12 15:56:04 +08:00
gaoxin 93640449f3 【引导】副本前引导添加 2021-11-12 15:55:53 +08:00
wangzhenxing 41dc490d28 【战斗】=============== 被动处理伤害方法只处理减伤 2021-11-12 15:54:54 +08:00
jiaoyangna 075de29090 编队界面看神将情报错误修改
(cherry picked from commit c8e7d0cdd4)
2021-11-12 15:52:09 +08:00
jiaoyangna c8e7d0cdd4 编队界面看神将情报错误修改 2021-11-12 15:51:26 +08:00