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 |
|
xiekaidong
|
213e82f2c1
|
优化逻辑
|
2023-08-11 11:59:47 +08:00 |
|
Fang
|
e0db8bcfda
|
夏日活动
|
2023-08-11 11:52:12 +08:00 |
|
xiekaidong
|
f5ed280271
|
优化木棍障碍物
|
2023-08-11 11:24:52 +08:00 |
|
xiekaidong
|
4c65578099
|
更新配置
|
2023-08-11 10:41:09 +08:00 |
|
xiekaidong
|
0d979c5275
|
bug修复
|
2023-08-11 10:05:28 +08:00 |
|
xiekaidong
|
9c8b20f1fb
|
bug修复
|
2023-08-10 19:27:48 +08:00 |
|
xiekaidong
|
5eff2c3633
|
上报和容错
|
2023-08-10 18:41:24 +08:00 |
|
xiekaidong
|
84f22f6123
|
bug修复
|
2023-08-10 17:33:30 +08:00 |
|
Fang
|
8c88139a09
|
皮肤属性增加生命加成显示
|
2023-08-10 16:31:25 +08:00 |
|
xiekaidong
|
aca97b775e
|
bug修复
|
2023-08-10 16:27:36 +08:00 |
|
xiekaidong
|
18d447de17
|
名称修改
|
2023-08-10 11:56:45 +08:00 |
|
xiekaidong
|
04a2694461
|
bug修复
|
2023-08-10 11:45:16 +08:00 |
|
xiekaidong
|
5b8030552d
|
皮肤技能表现
|
2023-08-10 10:48:30 +08:00 |
|
xiekaidong
|
e17c9bf4cf
|
更新配置
|
2023-08-10 09:40:35 +08:00 |
|
xiekaidong
|
d311ea14aa
|
Merge branch 'master' into dev_20230815
# Conflicts:
# lua/app/config/avatar_frame.lua
# lua/app/config/chapter_board.lua
# lua/app/config/grid_type.lua
# lua/app/config/strings/cn/avatar.lua
# lua/app/config/strings/cn/avatar_frame.lua
# lua/app/config/strings/en/avatar.lua
# lua/app/config/strings/en/avatar_frame.lua
# lua/app/config/strings/en/item.lua
# lua/app/config/strings/es/avatar.lua
# lua/app/config/strings/es/avatar_frame.lua
# lua/app/config/strings/es/item.lua
# lua/app/config/strings/id/avatar.lua
# lua/app/config/strings/id/avatar_frame.lua
# lua/app/config/strings/id/item.lua
# lua/app/config/strings/ja/avatar.lua
# lua/app/config/strings/ja/avatar_frame.lua
# lua/app/config/strings/ja/item.lua
# lua/app/config/strings/ko/avatar.lua
# lua/app/config/strings/ko/avatar_frame.lua
# lua/app/config/strings/ko/item.lua
# lua/app/config/strings/pt/avatar.lua
# lua/app/config/strings/pt/avatar_frame.lua
# lua/app/config/strings/pt/item.lua
# lua/app/config/strings/th/avatar.lua
# lua/app/config/strings/th/avatar_frame.lua
# lua/app/config/strings/th/item.lua
# lua/app/config/strings/vi/avatar.lua
# lua/app/config/strings/vi/avatar_frame.lua
# lua/app/config/strings/vi/item.lua
# lua/app/config/strings/zh/avatar.lua
# lua/app/config/strings/zh/avatar_frame.lua
# lua/app/config/strings/zh/item.lua
# lua/app/config/summon.lua
# lua/app/module/battle/component/battle_unit_comp.lua
# lua/app/module/battle/team/battle_team.lua
|
2023-08-10 09:39:07 +08:00 |
|
Fang
|
260b299f08
|
协议更新
|
2023-08-09 17:34:16 +08:00 |
|
xiekaidong
|
efc8aa3dde
|
延迟提高一点
|
2023-08-09 17:32:57 +08:00 |
|
Fang
|
0e71260aad
|
更表
|
2023-08-09 17:25:38 +08:00 |
|