xiekaidong
|
c03e46432f
|
修复
|
2023-09-19 11:20:48 +08:00 |
|
xiekaidong
|
630326bda3
|
Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-lua into dev_20230919
|
2023-09-19 11:04:44 +08:00 |
|
xiekaidong
|
17074b8359
|
提示
|
2023-09-19 11:04:41 +08:00 |
|
Fang
|
5b09dd0ccf
|
修改
|
2023-09-19 10:58:04 +08:00 |
|
xiekaidong
|
3d60bcfbf6
|
Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-lua into dev_20230919
|
2023-09-19 10:51:46 +08:00 |
|
xiekaidong
|
44356ebb52
|
增加战斗前后上阵英雄参数，方便查询作弊
|
2023-09-19 10:51:40 +08:00 |
|
Fang
|
016c68edfc
|
自动淬炼加同步
|
2023-09-19 10:50:56 +08:00 |
|
xiekaidong
|
b955b1c4bf
|
优化
|
2023-09-19 09:26:37 +08:00 |
|
xiekaidong
|
8917dde12b
|
提示
|
2023-09-18 21:50:49 +08:00 |
|
xiekaidong
|
01d116e0c4
|
bug修复
|
2023-09-18 21:35:17 +08:00 |
|
xiekaidong
|
4337490e88
|
优化
|
2023-09-18 21:28:27 +08:00 |
|
xiekaidong
|
2559d621e3
|
优化显示
|
2023-09-18 21:05:42 +08:00 |
|
xiekaidong
|
0211dfe5d0
|
bug修复
|
2023-09-18 20:51:28 +08:00 |
|
xiekaidong
|
531961e843
|
帮助界面
|
2023-09-18 20:21:41 +08:00 |
|
xiekaidong
|
eb95400b81
|
优化和容错
|
2023-09-18 20:04:21 +08:00 |
|
Fang
|
f27bdc4cd2
|
圆月活动结束不正常fix
|
2023-09-18 18:39:58 +08:00 |
|
Fang
|
f144b834f6
|
自动淬炼检查次数修改
|
2023-09-18 16:49:46 +08:00 |
|
xiekaidong
|
d9a235f62d
|
Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-lua into dev_20230919
|
2023-09-18 16:38:23 +08:00 |
|
xiekaidong
|
10e4e1ffc6
|
音效
|
2023-09-18 16:38:13 +08:00 |
|
Fang
|
30e6f98fff
|
界面优化
|
2023-09-18 16:37:42 +08:00 |
|
xiekaidong
|
6ed811ca75
|
Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-lua into dev_20230919
|
2023-09-18 16:03:38 +08:00 |
|
xiekaidong
|
26cbfc51eb
|
优化
|
2023-09-18 16:03:35 +08:00 |
|
Fang
|
60c84e66ac
|
Merge branch 'fang/runes' into dev_20230919
|
2023-09-18 14:56:31 +08:00 |
|
Fang
|
129528ee50
|
符文自动淬炼修改、特效完善
|
2023-09-18 14:55:17 +08:00 |
|
xiekaidong
|
a69389e473
|
更新图集，编译lua
|
2023-09-18 14:53:52 +08:00 |
|
xiekaidong
|
45174e1f9f
|
Merge branch 'master' into dev_20230919
|
2023-09-18 14:50:51 +08:00 |
|
xiekaidong
|
4badcc0064
|
循环活动的一些处理
|
2023-09-18 14:43:04 +08:00 |
|
xiekaidong
|
b9dcd70ffe
|
bug修复
|
2023-09-18 12:00:29 +08:00 |
|
xiekaidong
|
c9d73ceaf6
|
优化显示
|
2023-09-18 11:40:42 +08:00 |
|
xiekaidong
|
1979075235
|
优化显示
|
2023-09-18 11:21:25 +08:00 |
|
xiekaidong
|
c4af5f7e5e
|
显示优化
|
2023-09-18 10:52:26 +08:00 |
|
xiekaidong
|
84a3eaefb0
|
Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-lua into dev_20230919
|
2023-09-18 10:36:26 +08:00 |
|
xiekaidong
|
4778ebc5a3
|
bug修复
|
2023-09-18 10:36:23 +08:00 |
|
Fang
|
a1098edc2e
|
更新
|
2023-09-18 10:16:54 +08:00 |
|
xiekaidong
|
28c21af47e
|
bug修复
|
2023-09-18 09:37:43 +08:00 |
|
xiekaidong
|
e41a9b0b1a
|
帮助界面
|
2023-09-16 20:17:13 +08:00 |
|
xiekaidong
|
b60db0e3ef
|
结算界面的表现
|
2023-09-16 20:07:15 +08:00 |
|
xiekaidong
|
68575924be
|
选择界面表现
|
2023-09-16 19:39:43 +08:00 |
|
xiekaidong
|
d2d1dd612e
|
升级表现
|
2023-09-16 19:17:47 +08:00 |
|
xiekaidong
|
2038237e6c
|
界面优化
|
2023-09-16 18:45:50 +08:00 |
|
xiekaidong
|
fd24935c4b
|
优化
|
2023-09-16 18:13:25 +08:00 |
|
xiekaidong
|
2dbe46c258
|
第一版梦魇酒馆，差表现
|
2023-09-16 18:08:18 +08:00 |
|
xiekaidong
|
d511ae2e86
|
更新配置
|
2023-09-16 17:57:42 +08:00 |
|
xiekaidong
|
820a22b051
|
Merge branch 'dev_20230919' into limit_pvp
# Conflicts:
# lua/app/common/bi_report.lua
# lua/app/common/data_manager.lua
# lua/app/common/pay_manager.lua
# lua/app/config/activity_pvp_board.lua.meta
# lua/app/config/const.lua
# lua/app/config/item.lua
# lua/app/config/monster_activity.lua
# lua/app/config/monster_base.lua
# lua/app/config/skill.lua
# lua/app/config/skin.lua
# lua/app/config/skin_skill.lua
# lua/app/config/strings/cn/global.lua
# lua/app/config/strings/cn/item.lua
# lua/app/config/strings/cn/skill_rogue.lua
# lua/app/config/strings/cn/skin.lua
# lua/app/config/strings/de/item.lua
# lua/app/config/strings/de/skin.lua
# lua/app/config/strings/en/item.lua
# lua/app/config/strings/en/skin.lua
# lua/app/config/strings/es/item.lua
# lua/app/config/strings/es/skin.lua
# lua/app/config/strings/fr/item.lua
# lua/app/config/strings/fr/skin.lua
# lua/app/config/strings/id/item.lua
# lua/app/config/strings/id/skin.lua
# lua/app/config/strings/ja/item.lua
# lua/app/config/strings/ja/skin.lua
# lua/app/config/strings/ko/item.lua
# lua/app/config/strings/ko/skin.lua
# lua/app/config/strings/pt/item.lua
# lua/app/config/strings/pt/skin.lua
# lua/app/config/strings/ru/item.lua
# lua/app/config/strings/ru/skin.lua
# lua/app/config/strings/th/item.lua
# lua/app/config/strings/th/skin.lua
# lua/app/config/strings/vi/item.lua
# lua/app/config/strings/vi/skin.lua
# lua/app/config/strings/zh/item.lua
# lua/app/config/strings/zh/skin.lua
# lua/app/config/task_type.lua.meta
# lua/app/global/global_const.lua
# lua/app/module/battle/battle_const.lua
# lua/app/module/battle/battle_manager.lua
|
2023-09-16 17:55:38 +08:00 |
|
xiekaidong
|
8173e46209
|
界面
|
2023-09-16 17:52:18 +08:00 |
|
Fang
|
b36fde93c3
|
整理代码
|
2023-09-15 20:53:50 +08:00 |
|
xiekaidong
|
ea8b6f6214
|
界面处理
|
2023-09-15 20:46:20 +08:00 |
|
Fang
|
4c27243520
|
请求优化
|
2023-09-15 20:11:50 +08:00 |
|
陈希
|
3d0425ec10
|
Merge branch 'fang/act' into 'dev_20230919'
圆月活动
See merge request b6-client/b6-lua!16
|
2023-09-15 11:33:25 +00:00 |
|
Fang
|
33526b2d2f
|
review
|
2023-09-15 19:22:15 +08:00 |
|