xiekaidong
|
4ffcda7f0e
|
优化
|
2023-08-15 19:41:17 +08:00 |
|
xiekaidong
|
5d910f5ebc
|
容错和容错
|
2023-08-15 19:34:02 +08:00 |
|
xiekaidong
|
a62d759abc
|
更新配置
|
2023-08-15 18:42:55 +08:00 |
|
xiekaidong
|
b3a00ab628
|
优化
|
2023-08-15 18:42:13 +08:00 |
|
xiekaidong
|
eeeadeace0
|
复活判定逻辑
|
2023-08-15 17:32:54 +08:00 |
|
Fang
|
1ccef0858b
|
红点遮挡处理
|
2023-08-15 16:17:21 +08:00 |
|
Fang
|
fe726dbebf
|
显示fix
|
2023-08-15 15:34:27 +08:00 |
|
Fang
|
8cfd6358d8
|
bug fix
|
2023-08-15 15:08:07 +08:00 |
|
xiekaidong
|
2aff8266ac
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-lua into dev_20230815
|
2023-08-15 14:59:18 +08:00 |
|
xiekaidong
|
aff0c425bf
|
背景特效
|
2023-08-15 14:59:15 +08:00 |
|
Fang
|
2f59d74b96
|
竞技场皮肤属性完善
|
2023-08-15 12:20:17 +08:00 |
|
xiekaidong
|
c515a8be09
|
战斗任务统计
|
2023-08-15 12:15:21 +08:00 |
|
xiekaidong
|
27388b3238
|
bug修复
|
2023-08-15 11:51:36 +08:00 |
|
Fang
|
fbe290212e
|
导表
|
2023-08-15 11:37:27 +08:00 |
|
Fang
|
73257960b8
|
bug fix
|
2023-08-15 11:30:21 +08:00 |
|
Fang
|
e802a03550
|
活动等级达到最大报错fix
|
2023-08-15 10:28:20 +08:00 |
|
xiekaidong
|
75be639da9
|
Merge branch 'master' into dev_20230815
# Conflicts:
# lua/app/module/battle/controller/battle_base_controller.lua
|
2023-08-15 09:36:53 +08:00 |
|
xiekaidong
|
5bd2b94cd8
|
技能位置
|
2023-08-15 09:21:50 +08:00 |
|
Fang
|
39ae534750
|
皮肤道具点开界面
|
2023-08-14 19:34:02 +08:00 |
|
Fang
|
4845fd5480
|
报错fix
|
2023-08-14 18:40:22 +08:00 |
|
Fang
|
b06ed8a9eb
|
导表
|
2023-08-14 18:32:48 +08:00 |
|
Fang
|
8b51ce9f07
|
容错
|
2023-08-14 18:32:28 +08:00 |
|
xiekaidong
|
56e20065ca
|
删除刘海屏
|
2023-08-14 17:07:09 +08:00 |
|
xiekaidong
|
4b2744d5c7
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-lua into dev_20230815
|
2023-08-14 16:27:56 +08:00 |
|
xiekaidong
|
9249ee3210
|
重生处理
|
2023-08-14 16:27:52 +08:00 |
|
Fang
|
e3ef0c1f5f
|
容错处理
|
2023-08-14 16:13:22 +08:00 |
|
xiekaidong
|
4a4b25e11c
|
竞技场弹出礼包界面
|
2023-08-14 14:52:38 +08:00 |
|
xiekaidong
|
e7aa9dcb1b
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-lua into dev_20230815
|
2023-08-14 14:45:39 +08:00 |
|
xiekaidong
|
ef847947d8
|
初始化刘海屏
|
2023-08-14 14:45:35 +08:00 |
|
Fang
|
6bfc886dd5
|
配置更新
|
2023-08-14 14:43:50 +08:00 |
|
xiekaidong
|
b99ec64aa0
|
删除打印
|
2023-08-14 14:11:24 +08:00 |
|
xiekaidong
|
155d81c1eb
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-lua into dev_20230815
|
2023-08-14 11:15:29 +08:00 |
|
xiekaidong
|
c94018809f
|
一个容错
|
2023-08-14 11:15:21 +08:00 |
|
Fang
|
0eebc9b6cd
|
英雄生命值显示fix
|
2023-08-14 11:12:57 +08:00 |
|
Fang
|
a1a13036c9
|
夏日活动战令购买spine动画调换
|
2023-08-14 09:58:26 +08:00 |
|
Fang
|
0ed6abb0f4
|
更新配置
|
2023-08-14 09:47:37 +08:00 |
|
Fang
|
69790fd563
|
新加颜色生命值加成
|
2023-08-11 18:15:27 +08:00 |
|
xiekaidong
|
5cfb937723
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-lua into dev_20230815
|
2023-08-11 17:50:19 +08:00 |
|
xiekaidong
|
de16254cb0
|
bug修复
|
2023-08-11 17:50:15 +08:00 |
|
Fang
|
391e171497
|
资源替换
|
2023-08-11 17:02:08 +08:00 |
|
Fang
|
fde89edddb
|
装备副本界面添加礼包入口
|
2023-08-11 16:34:50 +08:00 |
|
Fang
|
eb566b7782
|
fix
|
2023-08-11 16:03:00 +08:00 |
|
Fang
|
03ed69d44a
|
竞技场宝箱tips
|
2023-08-11 15:49:06 +08:00 |
|
Fang
|
34282dc81b
|
竞技场宝箱弹出规则优化、bugfix
|
2023-08-11 15:37:26 +08:00 |
|
xiekaidong
|
7247cada75
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-lua into dev_20230815
|
2023-08-11 15:17:32 +08:00 |
|
xiekaidong
|
866094a76f
|
边缘障碍物逻辑优化
|
2023-08-11 15:17:28 +08:00 |
|
Fang
|
84796cd4a8
|
活动礼包弹出逻辑补充
|
2023-08-11 15:08:23 +08:00 |
|
Fang
|
a749cbfa94
|
导表
|
2023-08-11 14:27:14 +08:00 |
|
Fang
|
ba449382a9
|
细节完善
|
2023-08-11 14:26:52 +08:00 |
|
陈希
|
78c18dac68
|
Merge branch 'fang/夏日活动' into 'dev_20230815'
夏日活动
See merge request b6-client/b6-lua!11
|
2023-08-11 04:06:02 +00:00 |
|