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 |
|
xiekaidong
|
8b6b8d2772
|
数据层
|
2023-09-15 17:28:14 +08:00 |
|
xiekaidong
|
1e30641b76
|
限时pvp数据层
|
2023-09-13 17:01:17 +08:00 |
|
xiekaidong
|
9ae91b8668
|
bug修复
|
2023-09-13 16:27:23 +08:00 |
|
xiekaidong
|
c365bc65f2
|
兼容处理
|
2023-09-13 15:53:02 +08:00 |
|
xiekaidong
|
9b86946d2c
|
bug修复
|
2023-09-13 15:34:17 +08:00 |
|
xiekaidong
|
ed65ae452b
|
一些优化和审核模式处理
|
2023-09-13 14:55:52 +08:00 |
|
Fang
|
a92ceb5650
|
添加容错
|
2023-09-12 11:24:42 +08:00 |
|
Fang
|
afd1cdbcf6
|
兑换红点修改
|
2023-09-06 10:16:04 +08:00 |
|
xiekaidong
|
d7f60f5002
|
bossrush阵容
|
2023-09-05 17:36:43 +08:00 |
|
xiekaidong
|
35d84fead7
|
bug修复
|
2023-09-05 15:28:24 +08:00 |
|
xiekaidong
|
950ecacee5
|
bug修复和优化
|
2023-09-05 11:47:28 +08:00 |
|
xiekaidong
|
b63a1e3ee0
|
bug修复
|
2023-09-05 10:47:55 +08:00 |
|
xiekaidong
|
94064c92ed
|
bug修复
|
2023-09-05 09:58:29 +08:00 |
|
xiekaidong
|
4aff8fd8c2
|
字段名修复
|
2023-09-05 09:23:35 +08:00 |
|
xiekaidong
|
408bd933c6
|
bug修复
|
2023-09-04 20:21:02 +08:00 |
|
xiekaidong
|
c6e44efbd6
|
bug修复
|
2023-09-04 19:25:50 +08:00 |
|
xiekaidong
|
b47d779cfc
|
修复一些bug
|
2023-09-04 18:21:17 +08:00 |
|
xiekaidong
|
d003c8a551
|
bug修复
|
2023-09-04 16:51:34 +08:00 |
|
xiekaidong
|
4e5021741d
|
Merge branch 'dev_20230905' into boss_rush
# Conflicts:
# lua/app/common/bi_report.lua
# lua/app/common/data_manager.lua
# lua/app/common/local_data.lua
# lua/app/common/module_manager.lua
# lua/app/config/act_fourteen_bounty.lua.meta
# lua/app/config/act_fourteen_exchange.lua.meta
# lua/app/config/act_fourteen_quest.lua
# lua/app/config/act_fourteen_quest.lua.meta
# lua/app/config/activity_boss_rush_chapter.lua.meta
# lua/app/config/activity_boss_rush_exchange.lua.meta
# lua/app/config/activity_boss_rush_rank.lua.meta
# lua/app/config/activity_exchange.lua.meta
# lua/app/config/avatar_frame.lua
# lua/app/config/chapter_board_bossrush.lua.meta
# lua/app/config/monster_activity.lua.meta
# lua/app/config/strings/cn/act_fourteen_quest.lua.meta
# lua/app/config/strings/cn/global.lua
# lua/app/config/strings/cn/task_type.lua.meta
# lua/app/config/strings/de/act_fourteen_quest.lua.meta
# lua/app/config/strings/de/task_type.lua.meta
# lua/app/config/strings/en/act_fourteen_quest.lua.meta
# lua/app/config/strings/en/task_type.lua.meta
# lua/app/config/strings/es/act_fourteen_quest.lua.meta
# lua/app/config/strings/es/task_type.lua.meta
# lua/app/config/strings/fr/act_fourteen_quest.lua.meta
# lua/app/config/strings/fr/task_type.lua.meta
# lua/app/config/strings/id/act_fourteen_quest.lua.meta
# lua/app/config/strings/id/task_type.lua.meta
# lua/app/config/strings/ja/act_fourteen_quest.lua.meta
# lua/app/config/strings/ja/task_type.lua.meta
# lua/app/config/strings/ko/act_fourteen_quest.lua.meta
# lua/app/config/strings/ko/task_type.lua.meta
# lua/app/config/strings/pt/act_fourteen_quest.lua.meta
# lua/app/config/strings/pt/task_type.lua.meta
# lua/app/config/strings/ru/act_fourteen_quest.lua.meta
# lua/app/config/strings/th/act_fourteen_quest.lua.meta
# lua/app/config/strings/th/task_type.lua.meta
# lua/app/config/strings/vi/act_fourteen_quest.lua.meta
# lua/app/config/strings/vi/task_type.lua.meta
# lua/app/config/strings/zh/act_fourteen_quest.lua.meta
# lua/app/config/strings/zh/task_type.lua.meta
# lua/app/proto/proto_msg_type.lua
|
2023-09-01 21:18:54 +08:00 |
|
xiekaidong
|
e182698950
|
红点
|
2023-09-01 21:16:56 +08:00 |
|
xiekaidong
|
eed3f88d79
|
首领公开赛
|
2023-09-01 21:10:05 +08:00 |
|