816 Commits

Author SHA1 Message Date
Fang
2f953375a5 锦标赛fix 2023-10-08 11:35:43 +08:00
Fang
5323cba9bf 容错 2023-10-07 15:07:40 +08:00
Fang
3e2713506e 容错 2023-10-07 10:41:41 +08:00
xiekaidong
86e1bfa704 梦魇减能量肉鸽技能失效问题 2023-10-07 09:46:16 +08:00
Fang
8f7330a765 购买等级fix 2023-09-28 15:32:57 +08:00
Fang
327cffeb56 竞技场锦标赛 2023-09-28 10:23:25 +08:00
Fang
f6c4010add 波次锦标赛 2023-09-28 10:23:25 +08:00
Fang
e8d94feff0 优化 2023-09-20 14:29:51 +08:00
Fang
52909a4f1e 优化自动淬炼的随机假数据 2023-09-20 14:23:20 +08:00
Fang
218aa308e8 符文随机假数据不展示当前等级最高两个品质 2023-09-20 09:36:23 +08:00
Fang
7a475edcfc fix 2023-09-20 00:10:31 +08:00
Fang
5c7355d951 新号圆月活动请求fix、符文材料个数显示修改 2023-09-19 20:52:11 +08:00
xiekaidong
f5c7455cb9 修复 2023-09-19 18:32:43 +08:00
xiekaidong
28f5ca63a4 bug修复 2023-09-19 18:15:07 +08:00
xiekaidong
56830e2dae Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-lua into dev_20230919 2023-09-19 18:11:55 +08:00
xiekaidong
466aee0b61 bug修复 2023-09-19 18:11:52 +08:00
Fang
c9eecc4f76 符文动效fix、皮肤解锁头像fix 2023-09-19 17:26:56 +08:00
xiekaidong
72e966f8c1 Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-lua into dev_20230919 2023-09-19 17:17:11 +08:00
xiekaidong
317e0440ec bug修复 2023-09-19 17:17:09 +08:00
Fang
8650d1b340 属性调整 2023-09-19 16:55:52 +08:00
Fang
2a62f2a94e 添加主线阵容符文数据上报 2023-09-19 16:55:52 +08:00
Fang
1b66ce7d16 符文数据修改 2023-09-19 15:02:06 +08:00
xiekaidong
a3b4fff14b Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-lua into dev_20230919 2023-09-19 14:29:57 +08:00
xiekaidong
62d5aa7da7 bug修复 2023-09-19 14:29:54 +08:00
Fang
930cf8df28 fix 2023-09-19 11:21:52 +08:00
Fang
016c68edfc 自动淬炼加同步 2023-09-19 10:50:56 +08:00
xiekaidong
b955b1c4bf 优化 2023-09-19 09:26:37 +08:00
xiekaidong
01d116e0c4 bug修复 2023-09-18 21:35:17 +08:00
xiekaidong
4337490e88 优化 2023-09-18 21:28:27 +08:00
xiekaidong
0211dfe5d0 bug修复 2023-09-18 20:51:28 +08:00
xiekaidong
eb95400b81 优化和容错 2023-09-18 20:04:21 +08:00
Fang
30e6f98fff 界面优化 2023-09-18 16:37:42 +08:00
xiekaidong
6ed811ca75 Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-lua into dev_20230919 2023-09-18 16:03:38 +08:00
xiekaidong
26cbfc51eb 优化 2023-09-18 16:03:35 +08:00
Fang
129528ee50 符文自动淬炼修改、特效完善 2023-09-18 14:55:17 +08:00
xiekaidong
a69389e473 更新图集,编译lua 2023-09-18 14:53:52 +08:00
xiekaidong
45174e1f9f Merge branch 'master' into dev_20230919 2023-09-18 14:50:51 +08:00
xiekaidong
4badcc0064 循环活动的一些处理 2023-09-18 14:43:04 +08:00
xiekaidong
b9dcd70ffe bug修复 2023-09-18 12:00:29 +08:00
xiekaidong
1979075235 优化显示 2023-09-18 11:21:25 +08:00
xiekaidong
c4af5f7e5e 显示优化 2023-09-18 10:52:26 +08:00
xiekaidong
4778ebc5a3 bug修复 2023-09-18 10:36:23 +08:00
xiekaidong
b60db0e3ef 结算界面的表现 2023-09-16 20:07:15 +08:00
xiekaidong
68575924be 选择界面表现 2023-09-16 19:39:43 +08:00
xiekaidong
d2d1dd612e 升级表现 2023-09-16 19:17:47 +08:00
xiekaidong
2038237e6c 界面优化 2023-09-16 18:45:50 +08:00
xiekaidong
2dbe46c258 第一版梦魇酒馆,差表现 2023-09-16 18:08:18 +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
xiekaidong
8173e46209 界面 2023-09-16 17:52:18 +08:00
Fang
b36fde93c3 整理代码 2023-09-15 20:53:50 +08:00