419 Commits

Author SHA1 Message Date
puxuan
d98418b50f config 2025-09-26 15:41:46 +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
56936f582b 商店 2025-09-24 16:21:47 +08:00
puxuan
d4089cb823 敌方属性计算 2025-09-23 19:55:35 +08:00
puxuan
3d1a5203a7 Merge branch 'dev_hero' into dev_equip 2025-09-19 14:51:57 +08:00
puxuan
526b1690c5 属性 2025-09-18 17:51:59 +08:00
puxuan
6347ed6f9c 装备 2025-09-17 17:23:26 +08:00
puxuan
a2eaf90572 装备 2025-09-09 19:39:38 +08:00
puxuan
96fe08e143 战斗力 2025-09-09 19:24:42 +08:00
puxuan
f18eb91d53 fix bug 2025-09-08 20:09:20 +08:00
puxuan
196c03b48b 背包 2025-09-08 17:35:56 +08:00
puxuan
26df427916 skill 2025-09-08 15:48:43 +08:00
puxuan
d4d8a89f4d . 2025-09-03 10:57:37 +08:00
puxuan
eb24f59f93 广告 2025-09-01 11:28:17 +08:00
puxuan
36cdeeee11 fix bug 2025-08-19 15:11:25 +08:00
puxuan
8b49352830 2025-08-13 17:17:24 +08:00
puxuan
027b50b152 抽卡 2025-08-13 15:38:02 +08:00
puxuan
66c6437612 抽卡 2025-08-11 20:37:29 +08:00
puxuan
93cd085ccf task 2025-08-06 20:46:06 +08:00
puxuan
a1a3238192 天赋 2025-08-04 11:43:40 +08:00
puxuan
afbe226434 talent 2025-08-04 09:42:30 +08:00
puxuan
f1e44406bf arena 2025-07-21 21:05:08 +08:00
kai
cfb6fc8c90 主界面 2025-07-07 23:35:01 +08:00
puxuan
a9e90aaf41 屏蔽报错 2025-07-07 19:57:13 +08:00
puxuan
10575642e1 英雄基础数据 2025-05-25 19:19:05 +08:00
puxuan
9acaebbcb8 c1 2025-05-13 00:11:35 +08:00
puxuan
b4fd1c5974 c1 2025-05-05 22:22:19 +08:00
Fang
327cffeb56 竞技场锦标赛 2023-09-28 10:23:25 +08:00
Fang
f6c4010add 波次锦标赛 2023-09-28 10:23:25 +08:00
Fang
2a62f2a94e 添加主线阵容符文数据上报 2023-09-19 16:55:52 +08:00
xiekaidong
6ce2886143 上报抽卡次数 2023-09-19 16:04:43 +08:00
xiekaidong
7e292c16de 初始化顺序调整 2023-09-19 15:01:48 +08:00
xiekaidong
44356ebb52 增加战斗前后上阵英雄参数,方便查询作弊 2023-09-19 10:51:40 +08:00
Fang
f27bdc4cd2 圆月活动结束不正常fix 2023-09-18 18:39:58 +08:00
xiekaidong
d9a235f62d Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-lua into dev_20230919 2023-09-18 16:38:23 +08:00
xiekaidong
10e4e1ffc6 音效 2023-09-18 16:38:13 +08:00
Fang
30e6f98fff 界面优化 2023-09-18 16:37:42 +08:00
Fang
129528ee50 符文自动淬炼修改、特效完善 2023-09-18 14:55:17 +08:00
xiekaidong
4badcc0064 循环活动的一些处理 2023-09-18 14:43:04 +08:00
xiekaidong
1979075235 优化显示 2023-09-18 11:21: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
1e30641b76 限时pvp数据层 2023-09-13 17:01:17 +08:00
xiekaidong
d4c7cf71b0 优化一下断线续关,并增加上报 2023-09-12 19:43:58 +08:00
Fang
f1f1daafa2 符文功能 2023-09-12 10:35:46 +08:00
xiekaidong
10253fbafb 符文副本 2023-09-11 20:01:55 +08:00
xiekaidong
a817d25305 符文副本 2023-09-08 18:53:46 +08:00