19 Commits

Author SHA1 Message Date
puxuan
3e1693d91d 签到 2025-10-07 17:18:55 +08:00
xiekaidong
2e6541445e 复活优化 2023-09-20 11:16:33 +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
e5547541e3 更新配置和优化显示 2023-09-15 17:37:03 +08:00
xiekaidong
8b6b8d2772 数据层 2023-09-15 17:28:14 +08:00
xiekaidong
9b5c3ab2fc 优化 2023-09-12 20:34:26 +08:00
xiekaidong
b20644f4cb 显示bug修复 2023-09-12 20:26:49 +08:00
xiekaidong
c8c30b9aec 优化点击 2023-09-12 20:12:07 +08:00
xiekaidong
f7fe3e48ab 点击优化 2023-09-12 20:10:12 +08:00
xiekaidong
d56fd65a70 显示优化 2023-09-12 20:07:45 +08:00
xiekaidong
1687c7fcea 回合数提示 2023-09-12 14:34:46 +08:00
xiekaidong
1ef1f34c7a 战斗优化调整 2023-09-12 12:23:07 +08:00
xiekaidong
61b73d9c8f zancun 2023-09-12 11:15:52 +08:00
xiekaidong
5544693612 符文副本 2023-09-12 10:07:16 +08:00
xiekaidong
10253fbafb 符文副本 2023-09-11 20:01:55 +08:00
xiekaidong
37b12e064e 处理界面 2023-09-11 10:07:43 +08:00
xiekaidong
704ac4757e cell 2023-09-09 12:58:01 +08:00
xiekaidong
a817d25305 符文副本 2023-09-08 18:53:46 +08:00
xiekaidong
c0a3356cfd 符文副本主界面 2023-09-07 19:14:39 +08:00