470 Commits

Author SHA1 Message Date
xiekaidong
b38cc4acca 新增buff和叠加方式优化 2023-07-21 14:40:39 +08:00
xiekaidong
ef7fed0faa buff机制修改 2023-07-21 11:39:02 +08:00
xiekaidong
16425b276a Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725 2023-07-21 09:55:57 +08:00
xiekaidong
10653fa887 修改评价弹窗关卡 2023-07-21 09:55:39 +08:00
Fang
02da483630 装备升级材料获取 2023-07-21 09:51:28 +08:00
Fang
3397f8d017 装备礼包 2023-07-20 22:23:44 +08:00
xiekaidong
f052906d83 结算界面异常处理 2023-07-20 22:05:03 +08:00
xiekaidong
7011bbce34 支线副本 2023-07-20 21:47:56 +08:00
Fang
69e0ea2db1 英雄升级显示、战斗报错fix 2023-07-20 21:23:42 +08:00
xiekaidong
cdcc498a7e 支线副本 2023-07-20 19:46:26 +08:00
Fang
043dbf29c1 review 2023-07-20 19:35:17 +08:00
Fang
047f17e6f3 装备系统 2023-07-20 19:35:17 +08:00
xiekaidong
61336e5d6c 编译lua 2023-07-19 20:24:13 +08:00
xiekaidong
32704fc6cc Merge branch 'master' into dev_20230725
# Conflicts:
#	Assets/lua/app/ui/hero/hero_comp.lua.bytes
2023-07-18 09:34:10 +08:00
xiekaidong
8978455495 战斗引导问题 2023-07-17 18:38:25 +08:00
xiekaidong
11ea2e87fc 战报阵容 2023-07-17 15:52:44 +08:00
Fang
6f8acc2673 新号报错处理 2023-07-17 15:18:57 +08:00
Fang
2101a422bb 英雄图鉴 2023-07-14 17:08:08 +08:00
xiekaidong
8328738e0f 优化章节礼包弹出逻辑 2023-07-13 16:53:15 +08:00
xiekaidong
641deeedf0 侧边栏增加前往优惠商城的按钮,修改战斗内技能链接显示bug 2023-07-13 15:52:56 +08:00
xiekaidong
bbda3be68f 出包前资源检查和设置ABName 2023-07-12 14:56:43 +08:00
xiekaidong
e1120e654b 编译lua 2023-07-12 09:49:10 +08:00
xiekaidong
364d84ae09 Merge branch 'master' into dev_20230712
# Conflicts:
#	Assets/lua/app/module/chapter/chapter_manager.lua.bytes
#	Assets/lua/app/module/login/login_manager.lua.bytes
2023-07-12 09:48:12 +08:00
xiekaidong
6576bb731b Merge branch 'dev_20230712' of http://git.juzugame.com/b6-client/b6-unity into dev_20230712
# Conflicts:
#	Assets/lua/app/config/localization/localization_global_const.lua.bytes
#	Assets/lua/app/config/strings/cn/global.lua.bytes
2023-07-11 15:46:43 +08:00
xiekaidong
cdf3186a61 设置界面新增社区链接按钮 2023-07-11 15:46:31 +08:00
Fang
eb54d58240 碎片副本奖励展示优化 2023-07-11 14:53:58 +08:00
xiekaidong
3ff2ce8651 bug修复 2023-07-11 11:43:05 +08:00
xiekaidong
85c0709552 Merge branch 'master' into dev_20230712 2023-07-11 11:05:55 +08:00
xiekaidong
678d368026 一些日志上报混乱修复 2023-07-11 11:02:33 +08:00
xiekaidong
36af88f4b5 更新配置 2023-07-10 18:30:47 +08:00
xiekaidong
cd0a81c0db 用户属性主线阵容上报信息错误修复,竞技场消耗上报增加段位id,竞技场结算上报增加胜负 2023-07-10 17:46:59 +08:00
xiekaidong
47a5446628 修改战斗伤害公式 2023-07-10 16:07:46 +08:00
xiekaidong
db42f547d4 竞技场引导优化 2023-07-10 15:47:10 +08:00
xiekaidong
1107b0831d 竞技场匹配阵容提示优化 2023-07-10 15:39:59 +08:00
xiekaidong
aec6bfc13c 竞技场引导问题修复 2023-07-10 15:22:56 +08:00
xiekaidong
01d8ba6a49 木兰试玩 2023-07-10 12:00:46 +08:00
xiekaidong
c8e1980dac 编译lua 2023-07-07 17:20:00 +08:00
xiekaidong
84ae5c96c6 出包前得资源检查和设置abName 2023-07-07 16:04:44 +08:00
Fang
7e0c87de1a 竞技场挑战前判断阵容、超框 2023-07-07 11:55:27 +08:00
Fang
44ee6c0d52 添加头像、头像框道具解锁逻辑 2023-07-07 11:05:29 +08:00
xiekaidong
92b4bb8c23 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-07-06 18:42:52 +08:00
xiekaidong
50f4e6c871 bug修复 2023-07-06 18:42:49 +08:00
Fang
a8574eef7d 掉段显示fix 2023-07-06 18:31:16 +08:00
Fang
951cfb2d92 成长礼包触发方式修改 2023-07-06 18:21:15 +08:00
xiekaidong
939b0c4651 竞技场日志上报 2023-07-06 18:09:03 +08:00
xiekaidong
3b67015da8 bug修复 2023-07-06 17:42:19 +08:00
xiekaidong
f96c9a574a 网络模块优化,重连被拒绝后,后台静默重新登陆 2023-07-06 17:21:11 +08:00
xiekaidong
f98da34bda 引导延迟 2023-07-06 14:44:48 +08:00
Fang
5dc4ee1b78 竞技场段位替图、战令文案替换 2023-07-06 14:42:54 +08:00
xiekaidong
3405a1b1ae Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-07-05 17:55:15 +08:00