119 Commits

Author SHA1 Message Date
puxuan
869dad3cff 冲刺 2025-09-29 16:27:22 +08:00
puxuan
218a75adfe 冲刺 2025-09-29 15:37:24 +08:00
puxuan
d8e2d6ce43 活动 2025-09-28 20:35:26 +08:00
puxuan
9a9254de99 活动 2025-09-28 20:04:42 +08:00
puxuan
c41b85349a 冲刺活动 2025-09-28 14:42:58 +08:00
puxuan
6dd035ced6 活动 2025-09-26 09:44:16 +08:00
puxuan
6546675a6f 冲刺活动 2025-09-25 20:12:22 +08:00
puxuan
a20f3f0dd1 活动 2025-09-25 16:04:15 +08:00
puxuan
35059a2f70 签到 2025-09-25 11:40:28 +08:00
Fang
e43a551e95 锦标赛战令、礼包购买次数刷新fix 2023-10-20 18:40:34 +08:00
Fang
ffb5159944 锦标赛升级显示fix 2023-10-16 16:31:14 +08:00
Fang
d466037f7e 修改锦标赛积分规则 2023-10-09 16:21:39 +08:00
Fang
1f42a4e967 锦标赛添加开启限制 2023-10-09 11:32:21 +08:00
Fang
45931b933b 锦标赛跨组fix 2023-10-08 18:01:58 +08:00
Fang
9793884da6 锦标赛战令进度条显示修改,帮助文案修改 2023-10-08 16:56:27 +08:00
Fang
f86f962ce2 fix 2023-10-08 14:59:14 +08:00
Fang
2f953375a5 锦标赛fix 2023-10-08 11:35:43 +08:00
Fang
5323cba9bf 容错 2023-10-07 15:07:40 +08:00
Fang
8f7330a765 购买等级fix 2023-09-28 15:32:57 +08:00
Fang
327cffeb56 竞技场锦标赛 2023-09-28 10:23:25 +08:00
Fang
f6c4010add 波次锦标赛 2023-09-28 10:23:25 +08:00
Fang
5c7355d951 新号圆月活动请求fix、符文材料个数显示修改 2023-09-19 20:52:11 +08:00
xiekaidong
f5c7455cb9 修复 2023-09-19 18:32:43 +08:00
xiekaidong
28f5ca63a4 bug修复 2023-09-19 18:15:07 +08:00
xiekaidong
466aee0b61 bug修复 2023-09-19 18:11:52 +08:00
xiekaidong
317e0440ec bug修复 2023-09-19 17:17:09 +08:00
xiekaidong
62d5aa7da7 bug修复 2023-09-19 14:29:54 +08:00
xiekaidong
b955b1c4bf 优化 2023-09-19 09:26:37 +08:00
xiekaidong
01d116e0c4 bug修复 2023-09-18 21:35:17 +08:00
xiekaidong
4337490e88 优化 2023-09-18 21:28:27 +08:00
xiekaidong
0211dfe5d0 bug修复 2023-09-18 20:51:28 +08:00
xiekaidong
eb95400b81 优化和容错 2023-09-18 20:04:21 +08:00
Fang
30e6f98fff 界面优化 2023-09-18 16:37:42 +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
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
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
Fang
4c27243520 请求优化 2023-09-15 20:11:50 +08:00
Fang
8c1082793e 圆月活动 2023-09-15 19:22:15 +08:00