829 Commits

Author SHA1 Message Date
Fang
667e9dbe11 更换皮肤卡面变化 2023-08-30 17:32:14 +08:00
xiekaidong
b3b9e59f4a 优化 2023-08-29 21:32:29 +08:00
Fang
79f1369068 加载资源优化 2023-08-29 17:11:49 +08:00
xiekaidong
eb1a197cc0 Merge branch 'master' into dev_20230829
# Conflicts:
#	Assets/lua/app/config/skill_rogue.lua.bytes
#	Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes
2023-08-29 16:02:44 +08:00
xiekaidong
67a46e7d06 增加容错 2023-08-29 14:55:13 +08:00
xiekaidong
66bf185bd7 每日任务宝箱动画 2023-08-28 18:56:35 +08:00
xiekaidong
6533c64892 Merge branch 'dev_20230829' of http://git.juzugame.com/b6-client/b6-unity into dev_20230829 2023-08-28 18:36:19 +08:00
xiekaidong
b5c144a98e 显示修复 2023-08-28 18:36:15 +08:00
Fang
eeae9e8382 段位奖励添加奖励光效 2023-08-28 17:42:13 +08:00
Fang
7f99b9d771 装备礼包fix 2023-08-28 15:26:21 +08:00
xiekaidong
5d690de886 封号删除账号 2023-08-28 14:13:04 +08:00
Fang
efd26331b4 档位奖励进度显示fix 2023-08-28 10:15:37 +08:00
Fang
b460d9d8c5 段位奖励段位图标显示修改 2023-08-25 10:36:35 +08:00
xiekaidong
c180b32e81 动画 2023-08-24 18:29:57 +08:00
xiekaidong
5bffd844c1 Merge branch 'dev_20230829' of http://git.juzugame.com/b6-client/b6-unity into dev_20230829 2023-08-24 18:26:12 +08:00
xiekaidong
0ec05b592c 更改基金开启时间 2023-08-24 18:26:03 +08:00
陈希
ca7f897efe Merge branch 'fang/装备礼包' into 'dev_20230829'
装备升级礼包

See merge request b6-client/b6-unity!15
2023-08-24 10:24:23 +00:00
Fang
be98aa91d8 段位奖励展示修改、添加收集标签红点 2023-08-24 18:09:55 +08:00
Fang
6097fc7c7f 装备升级礼包 2023-08-24 17:29:22 +08:00
xiekaidong
7b7ee7aa0c 容错 2023-08-24 14:30:53 +08:00
xiekaidong
d716440747 界面处理 2023-08-23 17:46:57 +08:00
xiekaidong
1f6c432163 界面调整 2023-08-23 17:37:07 +08:00
xiekaidong
e4df3deb60 提升版本号 2023-08-21 16:02:56 +08:00
Fang
ad82aba16d 连续快速扫荡显示fix 2023-08-21 14:55:22 +08:00
Fang
20aa364195 连续快速扫荡显示fix 2023-08-21 14:38:25 +08:00
xiekaidong
7134e96cc8 Merge branch 'master' into dev_20230829
# Conflicts:
#	Assets/lua/app/common/event_manager.lua.bytes
#	Assets/lua/app/proto/proto_msg_type.lua.bytes
#	Assets/proto/protocol.bytes
2023-08-21 09:47:38 +08:00
xiekaidong
deae480ef3 诅咒回血被腐败影响 2023-08-18 18:56:09 +08:00
xiekaidong
6441196517 一些描述 2023-08-18 18:36:08 +08:00
xiekaidong
033c2e8d63 英雄基金 2023-08-18 18:10:12 +08:00
xiekaidong
3ace779c74 一些优化和容错 2023-08-18 10:56:29 +08:00
Fang
0a5e37baa3 优化夏日活动请求 2023-08-17 14:06:58 +08:00
xiekaidong
60a2c2ee3a 战令一键领取 2023-08-16 17:36:18 +08:00
xiekaidong
3bcb923eda 层级调整 2023-08-16 11:28:22 +08:00
xiekaidong
44becf62dd 设置abName 2023-08-15 21:43:21 +08:00
xiekaidong
c597e71285 优化 2023-08-15 19:41:11 +08:00
xiekaidong
4b49a99d8f 容错和容错 2023-08-15 19:34:30 +08:00
xiekaidong
6d480fc8b7 更新配置 2023-08-15 18:43:01 +08:00
Fang
3b4a03cde8 多语言遮挡处理 2023-08-15 16:17:49 +08:00
Fang
be4c77474e 显示fix 2023-08-15 15:35:02 +08:00
Fang
acf5e29ae1 bug fix 2023-08-15 15:08:35 +08:00
Fang
335ab77238 竞技场皮肤属性完善 2023-08-15 12:20:55 +08:00
Fang
ea1d84b065 编译 2023-08-15 11:37:54 +08:00
Fang
212c93632b 活动等级达到最大报错fix 2023-08-15 10:28:42 +08:00
Fang
f788462596 皮肤道具点开界面 2023-08-14 19:35:04 +08:00
xiekaidong
cbce761a98 竞技场弹出礼包界面 2023-08-14 14:52:58 +08:00
Fang
a4c6fb8e38 英雄生命值显示fix、资源替换 2023-08-14 11:15:06 +08:00
Fang
7dd9c5e88a 夏日活动战令购买spine动画调换 2023-08-14 09:58:52 +08:00
Fang
d8c5fb61a3 资源替换 2023-08-11 17:02:46 +08:00
Fang
78fac50fc5 装备副本界面添加礼包入口 2023-08-11 16:35:21 +08:00
Fang
30bf431636 编译 2023-08-11 16:03:20 +08:00