puxuan
|
920aa71690
|
特权
|
2025-10-08 16:02:30 +08:00 |
|
puxuan
|
869dad3cff
|
冲刺
|
2025-09-29 16:27:22 +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 |
|
puxuan
|
96fe08e143
|
战斗力
|
2025-09-09 19:24:42 +08:00 |
|
puxuan
|
b1fa6a4444
|
fix bug
|
2025-08-21 11:33:07 +08:00 |
|
puxuan
|
81943774f4
|
主线
|
2025-08-14 11:48:50 +08:00 |
|
puxuan
|
6ab80119eb
|
局内
|
2025-08-08 11:41:36 +08:00 |
|
puxuan
|
a1a3238192
|
天赋
|
2025-08-04 11:43:40 +08:00 |
|
puxuan
|
7d4a361039
|
公司
|
2025-07-28 21:38:05 +08:00 |
|
puxuan
|
35440839e9
|
主界面箱子
|
2025-07-14 20:47:59 +08:00 |
|
kai
|
cfb6fc8c90
|
主界面
|
2025-07-07 23:35:01 +08:00 |
|
puxuan
|
a9e90aaf41
|
屏蔽报错
|
2025-07-07 19:57:13 +08:00 |
|
kai
|
4725d4ac06
|
主界面
|
2025-06-29 15:15:19 +08:00 |
|
kai
|
a2d6fcc50e
|
主界面
|
2025-06-29 13:37:33 +08:00 |
|
Fang
|
327cffeb56
|
竞技场锦标赛
|
2023-09-28 10:23:25 +08:00 |
|
Fang
|
f6c4010add
|
波次锦标赛
|
2023-09-28 10:23:25 +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 |
|
Fang
|
8c1082793e
|
圆月活动
|
2023-09-15 19:22:15 +08:00 |
|
xiekaidong
|
8b6b8d2772
|
数据层
|
2023-09-15 17:28:14 +08:00 |
|
xiekaidong
|
d8aa8cce2c
|
bug修复
|
2023-09-04 16:54:44 +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
|
b5fb7a7e28
|
英雄基金
|
2023-08-18 14:39:01 +08:00 |
|
Fang
|
e0db8bcfda
|
夏日活动
|
2023-08-11 11:52:12 +08:00 |
|
Fang
|
61b302305e
|
装备礼包
|
2023-07-21 09:35:21 +08:00 |
|
xiekaidong
|
99a26d953d
|
侧边栏增加前往优惠商城的按钮，修改战斗内技能链接显示bug
|
2023-07-13 15:52:18 +08:00 |
|
Fang
|
b8155b97de
|
成长礼包触发方式修改
|
2023-07-06 18:17:37 +08:00 |
|
xiekaidong
|
cb34322f99
|
竞技场解锁动画
|
2023-07-05 15:33:39 +08:00 |
|
CloudJ
|
519dc9822e
|
Merge branch 'arena' of git.juzugame.com:b6-client/b6-lua into arena
# Conflicts:
# lua/app/common/module_manager.lua
|
2023-06-28 09:38:58 +08:00 |
|
Fang
|
cd09e79bca
|
竞技场
|
2023-06-27 18:27:11 +08:00 |
|
CloudJ
|
b59a8d20d6
|
入门礼包
|
2023-06-27 17:24:32 +08:00 |
|
Fang
|
bf1e7b7885
|
活动副本
|
2023-06-09 18:46:22 +08:00 |
|
xiekaidong
|
0b1b9f262e
|
新增一些上报信息
|
2023-06-07 15:27:11 +08:00 |
|
Fang
|
be6d42fe88
|
战斗退出后显示主界面控制
|
2023-06-06 17:30:50 +08:00 |
|
chenxi
|
30d134ecc8
|
调整一下侧边栏的按钮顺序
|
2023-06-05 16:25:41 +08:00 |
|
chenxi
|
5216c8ff69
|
侧边栏优化
|
2023-06-05 16:23:55 +08:00 |
|
Fang
|
5ee2be8837
|
fix
|
2023-06-02 18:42:19 +08:00 |
|
Fang
|
b6936a2c4a
|
功能解锁飞行动画
|
2023-06-02 18:35:36 +08:00 |
|
chenxi
|
80619b8e94
|
支付相关
|
2023-06-01 18:09:30 +08:00 |
|
Fang
|
2b92ed0909
|
main界面模块切换逻辑重构
|
2023-05-31 14:40:08 +08:00 |
|
chenxi
|
5d7771fd87
|
解锁新功能弹窗
|
2023-05-30 15:32:58 +08:00 |
|
Fang
|
3880dfd3d2
|
Merge remote-tracking branch 'origin/dev' into fang/daily_challenge
# Conflicts:
# lua/app/common/module_manager.lua
# lua/app/config/buff_daily_challenge.lua
# lua/app/config/chapter.lua
# lua/app/config/hero.lua
# lua/app/config/localization/localization_global_const.lua
# lua/app/config/skill.lua
# lua/app/config/strings/cn/buff.lua
# lua/app/config/strings/cn/global.lua
|
2023-05-29 18:24:33 +08:00 |
|
CloudJ
|
2fffb5c88a
|
商城
|
2023-05-29 15:10:04 +08:00 |
|
CloudJ
|
8ed5c657b1
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
# lua/app/module/maincity/maincity_const.lua
|
2023-05-29 11:04:25 +08:00 |
|
CloudJ
|
792830c90e
|
首充礼包
|
2023-05-29 11:03:43 +08:00 |
|
chenxi
|
5ab6aac2b6
|
代码重命名
|
2023-05-29 10:54:10 +08:00 |
|
CloudJ
|
c106607a65
|
成长礼包逻辑
|
2023-05-26 19:57:13 +08:00 |
|