110 Commits

Author SHA1 Message Date
puxuan
45e600be69 新加任务 2025-10-07 19:59:53 +08:00
puxuan
3e1693d91d 签到 2025-10-07 17:18:55 +08:00
puxuan
933bbc243f 活动整理 2025-10-07 11:18:52 +08:00
puxuan
bc3e832daa 礼包 2025-09-29 21:09:54 +08:00
puxuan
8cf688aeae 活动 2025-09-29 17:02:47 +08:00
puxuan
869dad3cff 冲刺 2025-09-29 16:27:22 +08:00
puxuan
218a75adfe 冲刺 2025-09-29 15:37:24 +08:00
puxuan
c41b85349a 冲刺活动 2025-09-28 14:42:58 +08:00
puxuan
6546675a6f 冲刺活动 2025-09-25 20:12:22 +08:00
puxuan
a20f3f0dd1 活动 2025-09-25 16:04:15 +08:00
puxuan
25b80d6f67 fix bug 2025-08-22 10:55:23 +08:00
Fang
b66e018abc 锦标赛倒计时刷新fix 2023-10-08 18:30:34 +08:00
Fang
9793884da6 锦标赛战令进度条显示修改,帮助文案修改 2023-10-08 16:56:27 +08:00
Fang
61e86c3f03 fix 2023-10-08 14:52:48 +08:00
Fang
2f953375a5 锦标赛fix 2023-10-08 11:35:43 +08:00
Fang
5515c9f419 锦标赛奖励领取效果 2023-10-07 18:11:56 +08:00
Fang
7912b93911 锦标赛请求优化 2023-10-07 17:41:58 +08:00
Fang
caf1f2a8d7 文案修改 2023-09-28 14:44:20 +08:00
Fang
327cffeb56 竞技场锦标赛 2023-09-28 10:23:25 +08:00
Fang
f6c4010add 波次锦标赛 2023-09-28 10:23:25 +08:00
xiekaidong
466aee0b61 bug修复 2023-09-19 18:11:52 +08:00
xiekaidong
8917dde12b 提示 2023-09-18 21:50:49 +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
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
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
1979075235 优化显示 2023-09-18 11:21:25 +08:00
xiekaidong
c4af5f7e5e 显示优化 2023-09-18 10:52:26 +08:00
xiekaidong
4778ebc5a3 bug修复 2023-09-18 10:36:23 +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
2dbe46c258 第一版梦魇酒馆,差表现 2023-09-16 18:08:18 +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
Fang
8c1082793e 圆月活动 2023-09-15 19:22:15 +08:00
xiekaidong
8b6b8d2772 数据层 2023-09-15 17:28:14 +08:00
xiekaidong
ed65ae452b 一些优化和审核模式处理 2023-09-13 14:55:52 +08:00