519 Commits

Author SHA1 Message Date
puxuan
1a2510264e config 2025-05-24 12:00:36 +08:00
xiekaidong
ee98d9f79a 修复 2023-12-25 11:28:48 +08:00
Fang
6ca3d26981 通行证入口banner修改 2023-11-14 18:12:50 +08:00
Fang
e5c0e0e410 竞技场界面spine导入、战令spine修改 2023-11-14 18:05:58 +08:00
xiekaidong
34a91873b6 锁定buff修复 2023-10-27 16:01:13 +08:00
Fang
cabbc6f24a 锦标赛战令、礼包购买次数刷新fix 2023-10-20 18:41:03 +08:00
Fang
2b3f91e516 锦标赛升级显示fix 2023-10-16 16:31:47 +08:00
Fang
2ae155b480 修改锦标赛积分规则 2023-10-09 16:22:19 +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
262f74311e 锦标赛添加开启限制 2023-10-09 11:32:40 +08:00
Fang
9d023efcb6 锦标赛跨组fix 2023-10-08 18:02:31 +08:00
Fang
2c40d73a0e 锦标赛战令进度条显示修改,帮助文案修改 2023-10-08 16:57:44 +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
a38f6816e3 编译 2023-10-07 17:42:49 +08:00
Fang
18d2e5c1fe 编译 2023-10-07 11:58:48 +08:00
xiekaidong
68ca7492e6 梦魇bug修复 2023-10-07 09:59:02 +08:00
Fang
b9393f591d 购买等级fix 2023-09-28 15:33:21 +08:00
Fang
d9a9716798 编译 2023-09-28 11:07:20 +08:00
Fang
45ce3c75c4 bug fix 2023-09-25 18:29:36 +08:00
xiekaidong
00e53beccd 设置abname 2023-09-20 17:44:40 +08:00
Fang
e65320206a 优化自动淬炼的随机假数据 2023-09-20 14:30:29 +08:00
Fang
ba70479f0c 符文随机假数据不展示当前等级最高两个品质 2023-09-20 09:37:04 +08:00
Fang
6f3e35243a fix、符文淬炼检查等级修改 2023-09-20 00:11:21 +08:00
Fang
22a2bb1a5e 新号圆月活动请求fix、符文材料个数显示修改 2023-09-19 20:53:05 +08:00
xiekaidong
24a0670365 配置更新 2023-09-19 18:34:04 +08:00
xiekaidong
60cb67ca4d bug修复 2023-09-19 18:13:11 +08:00
xiekaidong
1d74ee3b77 bug修复 2023-09-19 17:17:18 +08:00
Fang
0b59c2d77d 符文动画、属性fix 2023-09-19 15:03:02 +08:00
xiekaidong
9ca3f79c89 bug修复 2023-09-19 14:30:19 +08:00
Fang
505a7cb8fb fix 2023-09-19 11:22:05 +08:00
Fang
6f5f4d94e9 自动淬炼加同步 2023-09-19 10:51:20 +08:00
xiekaidong
8b235c7e3a 优化 2023-09-19 09:27:16 +08:00
xiekaidong
f4a61a5cbd bug修复 2023-09-18 21:35:23 +08:00
xiekaidong
c58757a314 优化 2023-09-18 21:29:17 +08:00
xiekaidong
41434625e2 bug修复 2023-09-18 20:52:32 +08:00
xiekaidong
c30e9d729c 优化和容错 2023-09-18 20:07:37 +08:00
Fang
b92f858295 界面优化 2023-09-18 16:38:04 +08:00
xiekaidong
188a85d723 Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919 2023-09-18 16:04:06 +08:00
xiekaidong
9b95508c42 优化 2023-09-18 16:04:03 +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
b0ca1e6132 循环活动的一些处理 2023-09-18 14:43:39 +08:00
xiekaidong
b044273afc bug修复 2023-09-18 12:00:41 +08:00
xiekaidong
79c4fd7907 优化显示 2023-09-18 11:40:53 +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