xiekaidong
|
4cf830d917
|
调整
|
2023-09-12 11:40:20 +08:00 |
|
xiekaidong
|
c9f1f356bf
|
bug修复
|
2023-09-12 11:21:52 +08:00 |
|
xiekaidong
|
8f06e996d7
|
bug修复
|
2023-09-05 11:54:32 +08:00 |
|
xiekaidong
|
b63a1e3ee0
|
bug修复
|
2023-09-05 10:47:55 +08:00 |
|
xiekaidong
|
f3d7d1c892
|
bug修复
|
2023-09-04 20:06:11 +08:00 |
|
xiekaidong
|
b47d779cfc
|
修复一些bug
|
2023-09-04 18:21:17 +08:00 |
|
xiekaidong
|
11f982bd04
|
主动结算
|
2023-09-04 17:14:35 +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
|
eed3f88d79
|
首领公开赛
|
2023-09-01 21:10:05 +08:00 |
|
Fang
|
89eeac3f2d
|
新手14天乐
|
2023-09-01 15:35:19 +08:00 |
|
xiekaidong
|
fe245efaba
|
接入数据
|
2023-09-01 11:55:16 +08:00 |
|
xiekaidong
|
049d7508ea
|
bossrush
|
2023-08-31 20:18:14 +08:00 |
|
xiekaidong
|
211d7cc71e
|
boss_rush
|
2023-08-30 19:11:38 +08:00 |
|
xiekaidong
|
80d263a6de
|
bug修复
|
2023-08-28 15:14:42 +08:00 |
|
xiekaidong
|
57682466f6
|
Merge branch 'herofund' into dev_20230829
|
2023-08-18 18:09:20 +08:00 |
|
xiekaidong
|
c880279be1
|
英雄基金
|
2023-08-18 18:08:48 +08:00 |
|
xiekaidong
|
d284ed0bc4
|
英雄基金
|
2023-08-18 11:38:21 +08:00 |
|
xiekaidong
|
5b119201cf
|
界面和协议
|
2023-08-17 18:16:06 +08:00 |
|
Fang
|
e85bf4888d
|
优化夏日活动请求
|
2023-08-17 12:06:56 +08:00 |
|
Fang
|
ff930c7264
|
夏日活动上报修改
|
2023-08-15 20:40:24 +08:00 |
|
Fang
|
f0767abd9f
|
夏日活动上报
|
2023-08-15 20:31:24 +08:00 |
|
Fang
|
84796cd4a8
|
活动礼包弹出逻辑补充
|
2023-08-11 15:08:23 +08:00 |
|
Fang
|
ba449382a9
|
细节完善
|
2023-08-11 14:26:52 +08:00 |
|
Fang
|
e0db8bcfda
|
夏日活动
|
2023-08-11 11:52:12 +08:00 |
|
xiekaidong
|
a47f18db07
|
日志上报
|
2023-08-03 14:20:16 +08:00 |
|
chenxi
|
8eccf012ba
|
七天乐
|
2023-05-26 15:38:55 +08:00 |
|
chenxi
|
e552761eea
|
七天乐
|
2023-05-26 11:39:23 +08:00 |
|
chenxi
|
ee23cd83ad
|
金猪和邮件
|
2023-05-23 17:02:14 +08:00 |
|
chenxi
|
be01873d54
|
金猪
|
2023-05-05 11:57:41 +08:00 |
|
chenxi
|
47cd13f4ad
|
一些系统代码
|
2023-05-05 10:32:50 +08:00 |
|