666 Commits

Author SHA1 Message Date
xiekaidong
b36d71eaf3 符文之塔bug修复 2023-12-25 09:51:39 +08:00
xiekaidong
956e0fc450 竞技场bug修复 2023-11-10 10:37:24 +08:00
xiekaidong
34a91873b6 锁定buff修复 2023-10-27 16:01:13 +08:00
xiekaidong
b8f3b9530e bug修复 2023-10-26 10:39:37 +08:00
Fang
cabbc6f24a 锦标赛战令、礼包购买次数刷新fix 2023-10-20 18:41:03 +08:00
Fang
bf52ed6083 锦标赛领全部奖励修改 2023-10-09 16:34:37 +08:00
xiekaidong
16d550aefa 设置abname 2023-10-09 16:01:10 +08:00
xiekaidong
c86b965ee6 Merge branch 'master' into dev_20231009
# Conflicts:
#	Assets/lua/app/config/act_gift.lua.bytes
#	Assets/lua/app/config/const.lua.bytes
#	Assets/lua/app/config/skill.lua.bytes
#	Assets/lua/app/config/skill_rogue.lua.bytes
2023-10-09 15:48:59 +08:00
Fang
09c0fb8c4f 符文副本结算波次处理 2023-10-09 11:10:10 +08:00
Fang
d4272eb86b 1 2023-10-09 10:57:00 +08:00
Fang
130d25ec22 符文副本结算去掉波次数据 2023-10-09 10:55:49 +08:00
Fang
2f9f35b98d fix、导入新赛季头像 2023-10-08 15:00:02 +08:00
Fang
f76dd842fc 锦标赛fix 2023-10-08 11:36:15 +08:00
Fang
18d2e5c1fe 编译 2023-10-07 11:58:48 +08:00
Fang
b71c87b4b8 review 2023-09-28 12:00:07 +08:00
Fang
d9a9716798 编译 2023-09-28 11:07:20 +08:00
xiekaidong
401c2bd48f 容错 2023-09-22 09:58:41 +08:00
xiekaidong
de5805d1dc bug修复 2023-09-22 09:52:30 +08:00
xiekaidong
00e53beccd 设置abname 2023-09-20 17:44:40 +08:00
xiekaidong
43d34f274e 试玩功能属性加成 2023-09-20 15:16:41 +08:00
xiekaidong
16b6f9b4bc bug修复 2023-09-20 11:27:32 +08:00
xiekaidong
8a961ae07b 复活优化 2023-09-20 11:16:41 +08:00
xiekaidong
eeede315a6 优化体验 2023-09-20 10:56:35 +08:00
xiekaidong
07fb378809 优化符文副本重生 2023-09-20 10:54:41 +08:00
Fang
6f3e35243a fix、符文淬炼检查等级修改 2023-09-20 00:11:21 +08:00
xiekaidong
60cb67ca4d bug修复 2023-09-19 18:13:11 +08:00
xiekaidong
02f32f15df 上报抽卡次数、特效 2023-09-19 16:05:58 +08:00
xiekaidong
d32e88ac01 编译lua 2023-09-19 15:03:21 +08:00
xiekaidong
9ca3f79c89 bug修复 2023-09-19 14:30:19 +08:00
Fang
8ec42e8a10 导入战令banner、fix 2023-09-19 11:52:59 +08:00
xiekaidong
37979729e0 Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919 2023-09-19 11:05:00 +08:00
xiekaidong
5c3b431d25 提示 2023-09-19 11:04:57 +08:00
Fang
9a44044fa6 修改 2023-09-19 10:59:02 +08:00
xiekaidong
1e766a87c7 Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919 2023-09-19 10:52:15 +08:00
xiekaidong
71058ccfee 增加战斗前后上阵英雄参数,方便查询作弊 2023-09-19 10:52:11 +08:00
Fang
6f5f4d94e9 自动淬炼加同步 2023-09-19 10:51:20 +08:00
xiekaidong
f07e452b82 提示 2023-09-18 21:51:21 +08:00
xiekaidong
41434625e2 bug修复 2023-09-18 20:52:32 +08:00
Fang
448aa0659e 符文自动淬炼修改、特效完善 2023-09-18 14:57:00 +08:00
xiekaidong
c54a6c48b9 更新图集,编译lua 2023-09-18 14:53:41 +08:00
xiekaidong
b6345dce5a Merge branch 'master' into dev_20230919
# Conflicts:
#	Assets/arts/atlas/ui/common.asset
#	Assets/arts/textures/ui/common/common_lock_1.png
#	Assets/arts/textures/ui/common/common_lock_1.png.meta
#	Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
#	Assets/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua.bytes
#	Assets/lua/app/userdata/battle/battle_base_data.lua.bytes
2023-09-18 14:51:32 +08:00
xiekaidong
b044273afc bug修复 2023-09-18 12:00:41 +08:00
xiekaidong
33e84e5cc1 优化显示 2023-09-18 11:21:37 +08:00
xiekaidong
c0aeccf71a 显示优化 2023-09-18 10:52:38 +08:00
xiekaidong
b3f490c9ac bug修复 2023-09-18 10:38:18 +08:00
xiekaidong
ae1aeba1c5 编译lua 2023-09-18 09:39:22 +08:00
xiekaidong
1cf27e1a54 编译lua 2023-09-16 20:26:20 +08:00
Fang
0d50692a4f 请求优化 2023-09-15 20:54:35 +08:00
Fang
769cfbe34d 圆月活动 2023-09-15 19:23:25 +08:00
xiekaidong
cccce0625e pvp战斗取消元素随机加权 2023-09-15 17:41:37 +08:00