puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,757 Commits 6 Branches 94 Tags
Commit Graph

66 Commits

Author SHA1 Message Date
puxuan
196c03b48b 背包 2025-09-08 17:35:56 +08:00
puxuan
36cdeeee11 fix bug 2025-08-19 15:11:25 +08:00
puxuan
afbe226434 talent 2025-08-04 09:42:30 +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
1e30641b76 限时pvp数据层 2023-09-13 17:01:17 +08:00
Fang
f1f1daafa2 符文功能 2023-09-12 10:35:46 +08:00
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
211d7cc71e boss_rush 2023-08-30 19:11:38 +08:00
xiekaidong
5b119201cf 界面和协议 2023-08-17 18:16:06 +08:00
Fang
e0db8bcfda 夏日活动 2023-08-11 11:52:12 +08:00
Fang
9c42fe1da6 皮肤功能 2023-08-09 14:16:27 +08:00
xiekaidong
100e125c19 Merge branch 'dev_20230725' into dungeon 
# Conflicts:
#	lua/app/common/bi_report.lua
#	lua/app/common/module_manager.lua
#	lua/app/config/localization/localization_global_const.lua
#	lua/app/config/strings/cn/global.lua
 2023-07-20 19:45:54 +08:00
xiekaidong
8b4933f4f0 支线副本 2023-07-20 17:41:42 +08:00
Fang
28bf5ab6ad 装备系统 2023-07-20 10:15:42 +08:00
xiekaidong
000bc5e926 武器副本的一些界面 2023-07-19 16:52:28 +08:00
xiekaidong
854ce2b986 通用扫荡弹窗 2023-07-19 10:39:22 +08:00
xiekaidong
2610718eb2 副本入口 2023-07-18 17:01:27 +08:00
Fang
b2dba1de2e 英雄图鉴 2023-07-14 17:07:03 +08:00
Fang
e580b332a9 添加头像、头像框道具解锁逻辑 2023-07-07 11:04:22 +08:00
Fang
abe661f228 空名称处理 2023-07-03 14:16:03 +08:00
Fang
10f3747396 处理新号报错 2023-06-29 10:03:42 +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
b88c471ce0 Merge branch 'dev' into arena 
# Conflicts:
#	lua/app/common/bi_report.lua
 2023-06-27 17:25:42 +08:00
CloudJ
b59a8d20d6 入门礼包 2023-06-27 17:24:32 +08:00
CloudJ
fdc773df09 竞技场战令 2023-06-26 11:26:28 +08:00
Fang
bf1e7b7885 活动副本 2023-06-09 18:46:22 +08:00
chenxi
fe3c8849b8 删除账号 2023-05-31 17:53:41 +08:00
Fang
325d906a3c 每日挑战跨天请求时机优化 2023-05-31 11:59:50 +08:00
CloudJ
0b6af4320d Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 
# Conflicts:
#	lua/app/common/module_manager.lua
 2023-05-30 19:35:22 +08:00
CloudJ
3baef020b0 替换首充界面 2023-05-30 19:34:37 +08:00
chenxi
284f7ce3c7 设置界面里的邮箱加一个开启限制 2023-05-30 18:17:51 +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
c106607a65 成长礼包逻辑 2023-05-26 19:57:13 +08:00
xiekaidong
5c1307ad0d 一些数据和更新配置 2023-05-26 15:43:01 +08:00
Fang
9830ac3cbd 每日挑战 2023-05-26 15:42:35 +08:00
chenxi
e552761eea 七天乐 2023-05-26 11:39:23 +08:00
chenxi
fdc400fd8d 基金 2023-05-24 19:19:34 +08:00
CloudJ
38a9faffb6 提交一波 2023-05-23 16:37:01 +08:00
CloudJ
13d53c5166 提一波 2023-05-23 14:17:29 +08:00
CloudJ
46a2c52ca4 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 
# Conflicts:
#	lua/app/common/bi_report.lua
 2023-05-22 17:50:24 +08:00
CloudJ
58de179979 每日特惠 2023-05-22 17:27:12 +08:00
chenxi
e97c1cd4e9 玩家升级界面 2023-05-22 16:22:26 +08:00
chenxi
0ab51fcc07 购买体力和邮箱 2023-05-19 18:32:23 +08:00
chenxi
84be3f721b 挂机 2023-05-17 22:27:58 +08:00