xiekaidong
|
7babd6aaec
|
英雄排序方式
|
2023-08-18 18:46:44 +08:00 |
|
xiekaidong
|
57682466f6
|
Merge branch 'herofund' into dev_20230829
|
2023-08-18 18:09:20 +08:00 |
|
xiekaidong
|
c880279be1
|
英雄基金
|
2023-08-18 18:08:48 +08:00 |
|
xiekaidong
|
b5fb7a7e28
|
英雄基金
|
2023-08-18 14:39:01 +08:00 |
|
xiekaidong
|
d284ed0bc4
|
英雄基金
|
2023-08-18 11:38:21 +08:00 |
|
xiekaidong
|
5b119201cf
|
界面和协议
|
2023-08-17 18:16:06 +08:00 |
|
Fang
|
e85bf4888d
|
优化夏日活动请求
|
2023-08-17 12:06:56 +08:00 |
|
xiekaidong
|
254a27563a
|
战令一键领取
|
2023-08-16 17:35:17 +08:00 |
|
Fang
|
e85055d67a
|
头像、头像框道具解锁优化
|
2023-08-16 11:52:00 +08:00 |
|
Fang
|
ff930c7264
|
夏日活动上报修改
|
2023-08-15 20:40:24 +08:00 |
|
Fang
|
f0767abd9f
|
夏日活动上报
|
2023-08-15 20:31:24 +08:00 |
|
xiekaidong
|
5d910f5ebc
|
容错和容错
|
2023-08-15 19:34:02 +08:00 |
|
xiekaidong
|
eeeadeace0
|
复活判定逻辑
|
2023-08-15 17:32:54 +08:00 |
|
Fang
|
8cfd6358d8
|
bug fix
|
2023-08-15 15:08:07 +08:00 |
|
xiekaidong
|
aff0c425bf
|
背景特效
|
2023-08-15 14:59:15 +08:00 |
|
xiekaidong
|
c515a8be09
|
战斗任务统计
|
2023-08-15 12:15:21 +08:00 |
|
xiekaidong
|
27388b3238
|
bug修复
|
2023-08-15 11:51:36 +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 |
|
Fang
|
39ae534750
|
皮肤道具点开界面
|
2023-08-14 19:34:02 +08:00 |
|
xiekaidong
|
9249ee3210
|
重生处理
|
2023-08-14 16:27:52 +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
|
69790fd563
|
新加颜色生命值加成
|
2023-08-11 18:15:27 +08:00 |
|
xiekaidong
|
de16254cb0
|
bug修复
|
2023-08-11 17:50:15 +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
|
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
|
0d979c5275
|
bug修复
|
2023-08-11 10:05:28 +08:00 |
|
xiekaidong
|
84f22f6123
|
bug修复
|
2023-08-10 17:33:30 +08:00 |
|
xiekaidong
|
aca97b775e
|
bug修复
|
2023-08-10 16:27:36 +08:00 |
|
xiekaidong
|
04a2694461
|
bug修复
|
2023-08-10 11:45:16 +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 |
|
xiekaidong
|
efc8aa3dde
|
延迟提高一点
|
2023-08-09 17:32:57 +08:00 |
|
xiekaidong
|
1ecb11124d
|
补充
|
2023-08-09 17:18:14 +08:00 |
|
xiekaidong
|
e8ad813399
|
删除打印
|
2023-08-09 16:50:39 +08:00 |
|
xiekaidong
|
996f3deeee
|
添加打印
|
2023-08-09 16:21:12 +08:00 |
|
Fang
|
9c42fe1da6
|
皮肤功能
|
2023-08-09 14:16:27 +08:00 |
|
Fang
|
a81f9de468
|
装备副本扫荡触发礼包未立即弹出fix
|
2023-08-09 10:19:42 +08:00 |
|
xiekaidong
|
189d421c2b
|
反伤bug修复
|
2023-08-08 17:49:03 +08:00 |
|
xiekaidong
|
c950bc52be
|
排序
|
2023-08-08 16:55:43 +08:00 |
|
xiekaidong
|
8f07e19054
|
新机制
|
2023-08-08 16:37:57 +08:00 |
|
xiekaidong
|
26862b0e02
|
Merge branch 'dev_20230815' into battle
# Conflicts:
# lua/app/config/buff.lua
# lua/app/config/strings/de/buff.lua
# lua/app/config/strings/en/buff.lua
# lua/app/config/strings/es/buff.lua
# lua/app/config/strings/fr/buff.lua
# lua/app/config/strings/id/buff.lua
# lua/app/config/strings/ja/buff.lua
# lua/app/config/strings/ko/buff.lua
# lua/app/config/strings/pt/buff.lua
# lua/app/config/strings/ru/buff.lua
# lua/app/config/strings/th/buff.lua
# lua/app/config/strings/vi/buff.lua
# lua/app/config/strings/zh/buff.lua
# lua/app/module/battle/battle_const.lua
# lua/app/module/battle/helper/battle_buff_handle.lua
|
2023-08-08 16:02:24 +08:00 |
|