Fang
|
f15917914c
|
竞技场段位奖励
|
2023-08-23 14:40:52 +08:00 |
|
xiekaidong
|
7fdadd75b4
|
层级调整
|
2023-08-16 11:27:54 +08:00 |
|
xiekaidong
|
5d910f5ebc
|
容错和容错
|
2023-08-15 19:34:02 +08:00 |
|
Fang
|
eb566b7782
|
fix
|
2023-08-11 16:03:00 +08:00 |
|
xiekaidong
|
9c8b20f1fb
|
bug修复
|
2023-08-10 19:27:48 +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 |
|
xiekaidong
|
42ad5ec9fa
|
Merge branch 'dev_20230809' into dev_20230815
# Conflicts:
# lua/app/config/const.lua
# lua/app/config/item.lua
# lua/app/config/skill_rogue.lua
# lua/app/config/strings/cn/buff.lua
# lua/app/config/strings/cn/item.lua
# lua/app/config/strings/de/item.lua
# lua/app/config/strings/en/item.lua
# lua/app/config/strings/es/item.lua
# lua/app/config/strings/fr/item.lua
# lua/app/config/strings/id/item.lua
# lua/app/config/strings/ja/item.lua
# lua/app/config/strings/ja/skill.lua
# lua/app/config/strings/ko/item.lua
# lua/app/config/strings/pt/item.lua
# lua/app/config/strings/ru/item.lua
# lua/app/config/strings/th/item.lua
# lua/app/config/strings/vi/item.lua
# lua/app/config/strings/zh/item.lua
# lua/app/config/strings/zh/skill.lua
|
2023-08-08 15:58:56 +08:00 |
|
xiekaidong
|
38cd167a9b
|
显示调整
|
2023-08-07 17:21:45 +08:00 |
|
xiekaidong
|
24d90bfd1c
|
战斗血条优化
|
2023-08-02 20:34:25 +08:00 |
|
xiekaidong
|
62ee8bab01
|
木棍边缘障碍物
|
2023-08-02 18:07:44 +08:00 |
|
xiekaidong
|
c21607c52e
|
回合数优化
|
2023-08-01 17:38:53 +08:00 |
|
xiekaidong
|
caf1fd0af9
|
战斗续关
|
2023-07-31 16:22:05 +08:00 |
|
Fang
|
0d04b99d3e
|
显示fix
|
2023-07-24 21:39:18 +08:00 |
|
xiekaidong
|
0e2bb42a25
|
一些报错修复
|
2023-07-24 18:32:41 +08:00 |
|
xiekaidong
|
6bc0ce7738
|
添加一些容错
|
2023-07-24 17:04:40 +08:00 |
|
xiekaidong
|
ff21cd5b2b
|
界面调整
|
2023-07-21 16:15:25 +08:00 |
|
xiekaidong
|
026166478e
|
buff机制修改
|
2023-07-21 11:37:29 +08:00 |
|
xiekaidong
|
cd41579159
|
支线副本
|
2023-07-20 21:46:49 +08:00 |
|
xiekaidong
|
ef1b59db67
|
支线副本战斗中的任务
|
2023-07-20 20:41:17 +08:00 |
|
xiekaidong
|
2ffd6e88ba
|
装备副本
|
2023-07-19 20:16:17 +08:00 |
|
xiekaidong
|
8e17ed9850
|
技能显示bug修复
|
2023-07-07 18:00:02 +08:00 |
|
xiekaidong
|
b6171cef38
|
竞技场暂停界面可滑动
|
2023-07-07 11:43:53 +08:00 |
|
Fang
|
e580b332a9
|
添加头像、头像框道具解锁逻辑
|
2023-07-07 11:04:22 +08:00 |
|
xiekaidong
|
8ee590a831
|
bug修复
|
2023-07-06 17:41:58 +08:00 |
|
Fang
|
47418bab2e
|
竞技场宝箱增加每日次数控制
|
2023-07-06 10:24:53 +08:00 |
|
xiekaidong
|
0162bce262
|
显示
|
2023-07-05 18:35:58 +08:00 |
|
xiekaidong
|
c9b32741cb
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-07-05 17:55:03 +08:00 |
|
xiekaidong
|
7abf7a253b
|
bug修复
|
2023-07-05 17:54:59 +08:00 |
|
Fang
|
73b3a451e9
|
修改头像框界面布局、竞技场赛季刷新fix等
|
2023-07-05 17:48:46 +08:00 |
|
Fang
|
f24f8d5e75
|
显示修复
|
2023-07-05 15:55:44 +08:00 |
|
Fang
|
68f80b45d3
|
竞技场ad宝箱功能补全
|
2023-07-05 15:02:59 +08:00 |
|
xiekaidong
|
c2622e3013
|
bug修复
|
2023-07-05 14:44:48 +08:00 |
|
xiekaidong
|
21365f487e
|
显示问题修复
|
2023-07-05 14:25:27 +08:00 |
|
xiekaidong
|
6209b4be52
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-07-05 11:22:49 +08:00 |
|
xiekaidong
|
afd2c11ef1
|
连击提示
|
2023-07-05 11:22:46 +08:00 |
|
Fang
|
bb12bdd100
|
添加段位变化特效
|
2023-07-05 11:14:37 +08:00 |
|
Fang
|
c07a54b828
|
竞技场fix
|
2023-07-05 10:51:13 +08:00 |
|
xiekaidong
|
d4237d18b9
|
适配
|
2023-07-05 10:42:28 +08:00 |
|
xiekaidong
|
9718eca3d7
|
竞技场任务
|
2023-07-05 10:15:33 +08:00 |
|
xiekaidong
|
c1592accae
|
敌方也显示combo
|
2023-07-04 21:04:50 +08:00 |
|
xiekaidong
|
faf1e2487d
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-07-04 20:13:28 +08:00 |
|
xiekaidong
|
d7cf21fde6
|
竞技场波次显示
|
2023-07-04 20:13:24 +08:00 |
|
Fang
|
6099fe08fb
|
fix
|
2023-07-04 18:29:05 +08:00 |
|
xiekaidong
|
045b774449
|
战斗速度
|
2023-07-04 18:24:33 +08:00 |
|
xiekaidong
|
47d5b00318
|
取消连线
|
2023-07-04 18:05:17 +08:00 |
|
Fang
|
5cd90eab7e
|
fix
|
2023-07-04 15:14:41 +08:00 |
|
xiekaidong
|
6b60a73944
|
竞技场主动退出判负
|
2023-07-04 15:12:33 +08:00 |
|
xiekaidong
|
87cacec30c
|
竞技场暂停界面
|
2023-07-04 15:03:37 +08:00 |
|
xiekaidong
|
2d9c5b02b8
|
Merge branch 'new_arena' into arena
|
2023-07-04 10:44:09 +08:00 |
|