582 Commits

Author SHA1 Message Date
xiekaidong
24b7793c44 bug修复 2023-09-04 16:55:13 +08:00
xiekaidong
ca627fc958 经验 2023-09-04 16:45:29 +08:00
xiekaidong
e4aa6e2edd 更新配置 2023-09-01 21:21:02 +08:00
Fang
9d6334e76e 新手14天乐 2023-09-01 15:35:31 +08:00
xiekaidong
b3b9e59f4a 优化 2023-08-29 21:32:29 +08:00
xiekaidong
cd1cea12fa bug修复 2023-08-29 21:04:37 +08:00
xiekaidong
1daeabac42 编译lua 2023-08-29 16:03:47 +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
a6665b8fc3 bug修复 2023-08-28 19:15:19 +08:00
xiekaidong
7722e968e3 逻辑调整 2023-08-28 19:12:19 +08:00
Fang
7f99b9d771 装备礼包fix 2023-08-28 15:26:21 +08:00
xiekaidong
dccabf26e2 bug修复 2023-08-28 15:16:30 +08:00
xiekaidong
f470bacdbb 调整一下填充和格子效果的逻辑顺序 2023-08-28 14:50:44 +08:00
xiekaidong
5d690de886 封号删除账号 2023-08-28 14:13:04 +08:00
xiekaidong
8bcf0d01e2 封号功能和屏蔽一些网络冗余操作 2023-08-28 14:04:56 +08:00
xiekaidong
c7b4a4a064 bug修复 2023-08-28 11:12:32 +08:00
Fang
2b11c3a6b0 定时器处理 2023-08-24 18:21:22 +08:00
Fang
6097fc7c7f 装备升级礼包 2023-08-24 17:29:22 +08:00
xiekaidong
1f6c432163 界面调整 2023-08-23 17:37:07 +08:00
Fang
519480c7dd 新增皮肤报错fix 2023-08-22 11:57:00 +08:00
xiekaidong
9b4ab7f785 bug修复 2023-08-21 11:24:57 +08:00
xiekaidong
713c7b8f87 bug修复 2023-08-21 10:33:37 +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
033c2e8d63 英雄基金 2023-08-18 18:10:12 +08:00
xiekaidong
06797a20de 选技能buf修复 2023-08-18 11:45:05 +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
Fang
a6cda907f0 头像、头像框道具解锁优化 2023-08-16 11:52:53 +08:00
xiekaidong
44becf62dd 设置abName 2023-08-15 21:43:21 +08:00
Fang
16d8c0e858 夏日活动上报修改 2023-08-15 20:40:46 +08:00
Fang
1e7440d170 夏日活动上报 2023-08-15 20:32:37 +08:00
xiekaidong
4b49a99d8f 容错和容错 2023-08-15 19:34:30 +08:00
xiekaidong
2ac0456b2f 复活判定 2023-08-15 17:33:50 +08:00
Fang
acf5e29ae1 bug fix 2023-08-15 15:08:35 +08:00
xiekaidong
4d1635dc3b 背景特效 2023-08-15 14:59:48 +08:00
xiekaidong
c438b6fbd3 战斗任务统计 2023-08-15 12:15:43 +08:00
xiekaidong
c4d52097e8 bug修复 2023-08-15 11:52:02 +08:00
xiekaidong
9cdeac081d 编译lua 2023-08-15 09:38:22 +08:00
Fang
f788462596 皮肤道具点开界面 2023-08-14 19:35:04 +08:00
xiekaidong
9641889e5d 重生处理 2023-08-14 16:29:01 +08:00
Fang
0531830c75 配置更新 2023-08-14 14:44:04 +08:00
Fang
a4c6fb8e38 英雄生命值显示fix、资源替换 2023-08-14 11:15:06 +08:00
Fang
5f53448c75 新加颜色生命值加成 2023-08-11 18:16:16 +08:00
xiekaidong
80fd0f2e80 bug修复 2023-08-11 17:50:30 +08:00
Fang
302452e76d 竞技场宝箱弹出优化、bugfix 2023-08-11 15:50:38 +08:00
xiekaidong
187eda1f35 Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
# Conflicts:
#	Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
2023-08-11 15:18:03 +08:00
xiekaidong
62907b1a83 边缘障碍物逻辑优化 2023-08-11 15:17:49 +08:00
Fang
d88a18d48b 活动礼包弹出逻辑补充 2023-08-11 15:09:15 +08:00