xiekaidong
|
c0a3356cfd
|
符文副本主界面
|
2023-09-07 19:14:39 +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 |
|
Fang
|
89eeac3f2d
|
新手14天乐
|
2023-09-01 15:35:19 +08:00 |
|
xiekaidong
|
0498aaf75f
|
战斗波次加密
|
2023-09-01 10:41:55 +08:00 |
|
xiekaidong
|
3753255d93
|
显示bug修复
|
2023-08-04 11:33:43 +08:00 |
|
Fang
|
23d9fec3ac
|
基金购买状态fix
|
2023-07-31 09:45:28 +08:00 |
|
xiekaidong
|
3e8a90ce04
|
bug修复
|
2023-07-27 10:04:01 +08:00 |
|
xiekaidong
|
260b6f0c95
|
修改
|
2023-07-26 16:25:35 +08:00 |
|
Fang
|
6d3a0748a1
|
fix
|
2023-07-25 23:32:59 +08:00 |
|
Fang
|
0448dd5fa2
|
支线基金跨阶段fix
|
2023-07-25 23:10:35 +08:00 |
|
Fang
|
5d8cb4bfff
|
装备礼包重登不弹窗
|
2023-07-25 22:48:49 +08:00 |
|
Fang
|
3dbb432b51
|
显示fix
|
2023-07-25 21:01:32 +08:00 |
|
Fang
|
a5d2749ede
|
支线基金看完广告直接领奖
|
2023-07-25 19:59:31 +08:00 |
|
Fang
|
5fcf27a659
|
基金ad奖励显示fix
|
2023-07-25 15:44:10 +08:00 |
|
xiekaidong
|
7d9265a831
|
bug修复
|
2023-07-26 00:16:32 +08:00 |
|
xiekaidong
|
e59b7f1ccb
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725
|
2023-07-24 18:47:54 +08:00 |
|
xiekaidong
|
c6d10d8825
|
调整一下逻辑
|
2023-07-24 18:47:46 +08:00 |
|
Fang
|
d10b9049f7
|
装备属性加成计算fix
|
2023-07-24 18:37:43 +08:00 |
|
Fang
|
2933776048
|
支线基金
|
2023-07-24 11:54:09 +08:00 |
|
xiekaidong
|
e85f2ba4f2
|
bug修复
|
2023-07-21 10:00:13 +08:00 |
|
Fang
|
bafb8673ec
|
装备升级材料获取
|
2023-07-21 09:50:45 +08:00 |
|
Fang
|
61b302305e
|
装备礼包
|
2023-07-21 09:35:21 +08:00 |
|
xiekaidong
|
ef1b59db67
|
支线副本战斗中的任务
|
2023-07-20 20:41:17 +08:00 |
|
xiekaidong
|
b8751b9229
|
支线副本
|
2023-07-20 19:44:41 +08:00 |
|
xiekaidong
|
8b4933f4f0
|
支线副本
|
2023-07-20 17:41:42 +08:00 |
|
xiekaidong
|
27ef576c8f
|
副本入口
|
2023-07-18 21:00:12 +08:00 |
|
xiekaidong
|
2610718eb2
|
副本入口
|
2023-07-18 17:01:27 +08:00 |
|