ZhangBiao
|
6012b533ca
|
【灵脉秘境】提交
|
2021-11-16 17:34:37 +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 |
ZhangBiao
|
a4151f51b2
|
【灵脉秘境】提交
|
2021-11-15 18:38:53 +08:00 |
gaoxin
|
b6ea250096
|
【新手战斗】选择女角色后,战斗中立绘替换为女角色
|
2021-11-15 18:34:25 +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
|
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
|
9fca63f5a1
|
【成长基金】配合后端修改
|
2021-11-15 15:44:02 +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 |
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 |
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 |
wangzhenxing
|
4756c0b19e
|
[战斗]========363被动替换逻辑修改
|
2021-11-12 15:31:01 +08:00 |
gaoxin
|
02114f269f
|
【资源】神魂功能开启资源位置修改
|
2021-11-12 15:00:16 +08:00 |
gaoxin
|
fb47648fd7
|
【技能特效】唐僧技能再优化
|
2021-11-12 14:53:03 +08:00 |
gaoxin
|
1d22b10e61
|
【引导】通过关卡时引导添加
|
2021-11-12 14:52:30 +08:00 |
gaoxin
|
f6a6512c4b
|
【技能】唐僧特效优化
|
2021-11-12 13:29:42 +08:00 |
gaoxin
|
9f2507879b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-12 11:59:46 +08:00 |
gaoxin
|
451d8f4460
|
【战斗】伤害数字延时显示
|
2021-11-12 11:59:40 +08:00 |
jiaoyangna
|
aedad781aa
|
灵兽宝阁展示概率错误修改
|
2021-11-12 11:30:04 +08:00 |
jiaoyangna
|
f2ff37ced8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-12 11:26:16 +08:00 |
jiaoyangna
|
021b0e03be
|
魂灵宝界面修改提交
|
2021-11-12 11:26:02 +08:00 |
gaoxin
|
cdb02f6142
|
【修行】资源替换为主角
|
2021-11-12 11:17:46 +08:00 |
jiaoyangna
|
bbb1c8e1a6
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-12 11:14:39 +08:00 |
jiaoyangna
|
63b1f6456e
|
魂灵宝界面修改提交
|
2021-11-12 11:14:26 +08:00 |
gaoxin
|
c00a3b603e
|
【Vip】修复等级奖励刷新不及时的问题
|
2021-11-12 10:07:44 +08:00 |
jiaoyangna
|
9a261f5c13
|
法宝界面文字大小修改
|
2021-11-12 09:55:00 +08:00 |
jiaoyangna
|
a82622585e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-12 09:40:25 +08:00 |
jiaoyangna
|
6ed696b426
|
法宝界面文字大小修改
|
2021-11-12 09:40:13 +08:00 |