95 Commits

Author SHA1 Message Date
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
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
b9393f591d 购买等级fix 2023-09-28 15:33:21 +08:00
Fang
d9a9716798 编译 2023-09-28 11:07:20 +08:00
xiekaidong
00e53beccd 设置abname 2023-09-20 17:44:40 +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
xiekaidong
9ca3f79c89 bug修复 2023-09-19 14:30:19 +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
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
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
96f2d2fae8 bug修复 2023-09-13 16:28:01 +08:00
xiekaidong
7f05bf4024 兼容处理 2023-09-13 15:53:14 +08:00
xiekaidong
760e3878f4 bug修复 2023-09-13 15:34:58 +08:00
xiekaidong
75abb7d2bb 一些优化和审核模式处理 2023-09-13 14:56:25 +08:00
Fang
37bd501110 容错处理 2023-09-12 15:05:52 +08:00
xiekaidong
57131fb59b 调整 2023-09-12 11:40:45 +08:00
Fang
a586912584 添加容错 2023-09-08 10:02:17 +08:00
Fang
fd2c59552e 兑换红点修改 2023-09-06 10:16:30 +08:00
xiekaidong
e936d45746 设置abname 2023-09-05 20:55:51 +08:00
xiekaidong
ac9253f074 编译lua 2023-09-05 17:36:54 +08:00
xiekaidong
ea75430a03 bug修复 2023-09-05 15:28:33 +08:00
xiekaidong
6f0a9720b2 bug修复和优化 2023-09-05 11:47:58 +08:00
xiekaidong
0d901aff71 bug修复 2023-09-05 10:48:55 +08:00
xiekaidong
cbf95861d6 bug修复 2023-09-05 10:00:11 +08:00
xiekaidong
d1d8b37743 字段名修复 2023-09-05 09:25:20 +08:00