658 Commits

Author SHA1 Message Date
Fang
02da483630 装备升级材料获取 2023-07-21 09:51:28 +08:00
Fang
3397f8d017 装备礼包 2023-07-20 22:23:44 +08:00
xiekaidong
7011bbce34 支线副本 2023-07-20 21:47:56 +08:00
Fang
69e0ea2db1 英雄升级显示、战斗报错fix 2023-07-20 21:23:42 +08:00
Fang
2c7f90f837 英雄升级报错fix 2023-07-20 20:28:30 +08:00
xiekaidong
cdcc498a7e 支线副本 2023-07-20 19:46:26 +08:00
Fang
622234139b review 2023-07-20 19:35:17 +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
Fang
6f8acc2673 新号报错处理 2023-07-17 15:18:57 +08:00
Fang
56f5506bba review 2023-07-17 11:17:19 +08:00
Fang
ce09322f82 红点 2023-07-14 17:36:18 +08:00
Fang
2101a422bb 英雄图鉴 2023-07-14 17:08:08 +08:00
xiekaidong
8328738e0f 优化章节礼包弹出逻辑 2023-07-13 16:53:15 +08:00
xiekaidong
03106ca454 试玩 2023-07-12 09:44:32 +08:00
Fang
eb54d58240 碎片副本奖励展示优化 2023-07-11 14:53:58 +08:00
xiekaidong
85c0709552 Merge branch 'master' into dev_20230712 2023-07-11 11:05:55 +08:00
xiekaidong
cd0a81c0db 用户属性主线阵容上报信息错误修复,竞技场消耗上报增加段位id,竞技场结算上报增加胜负 2023-07-10 17:46:59 +08:00
xiekaidong
47a5446628 修改战斗伤害公式 2023-07-10 16:07:46 +08:00
xiekaidong
01d8ba6a49 木兰试玩 2023-07-10 12:00:46 +08:00
xiekaidong
84ae5c96c6 出包前得资源检查和设置abName 2023-07-07 16:04:44 +08:00
xiekaidong
747b8a27ad 审核模式不显示竞技场礼包 2023-07-07 14:13:37 +08:00
Fang
44ee6c0d52 添加头像、头像框道具解锁逻辑 2023-07-07 11:05:29 +08:00
Fang
951cfb2d92 成长礼包触发方式修改 2023-07-06 18:21:15 +08:00
xiekaidong
939b0c4651 竞技场日志上报 2023-07-06 18:09:03 +08:00
xiekaidong
a048f7d2d9 编译lua 2023-07-06 10:42:17 +08:00
xiekaidong
6ac555593c 引导处理一下 2023-07-05 21:59:04 +08:00
xiekaidong
288370bb15 战斗开始时更新英雄数据 2023-07-05 18:24:56 +08:00
xiekaidong
b8e057fab3 英雄面板属性加密 2023-07-05 17:25:46 +08:00
Fang
1d337ed62f 显示修复 2023-07-05 15:56:46 +08:00
xiekaidong
b267679bcb 英雄红点 2023-07-05 11:46:45 +08:00
Fang
7000dff1bb 竞技场fix 2023-07-05 10:52:36 +08:00
Fang
91efb4bf35 fix and 替图 2023-07-04 18:34:41 +08:00
xiekaidong
cc0b2c05f8 战斗速度 2023-07-04 18:25:20 +08:00
xiekaidong
3c66b5c3da 取消连线 2023-07-04 18:05:41 +08:00
xiekaidong
c3789374c6 更新配置 2023-07-04 15:38:28 +08:00
xiekaidong
83b8dbe82d Merge branch 'dev' into arena
# Conflicts:
#	Assets/arts/atlas/ui/common.spriteatlas
#	Assets/lua/app/common/bi_report.lua.bytes
#	Assets/lua/app/common/data_manager.lua.bytes
#	Assets/lua/app/config/localization/localization_global_const.lua.bytes
#	Assets/lua/app/config/strings/cn/global.lua.bytes
#	Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
#	Assets/lua/app/module/chapter/chapter_manager.lua.bytes
#	Assets/lua/app/proto/proto_msg_type.lua.bytes
#	Assets/lua/app/ui/main_city/main_city_ui.lua.bytes
#	Assets/lua/app/userdata/hero/hero_data.lua.bytes
#	Assets/proto/protocol.bytes
2023-07-04 15:33:45 +08:00
Fang
47fa64a007 中途退出不重置对手 2023-07-04 15:25:06 +08:00
Fang
829a6e65b0 fix 2023-07-04 15:15:36 +08:00
xiekaidong
2867cae558 客服红点 2023-07-04 10:42:37 +08:00
xiekaidong
efb2fc57ba 竞技场弹窗礼包 2023-07-03 20:02:46 +08:00
Fang
efe355a0c4 完善细节 2023-07-03 18:35:49 +08:00
Fang
c4dabad5c5 编译 2023-07-03 14:16:50 +08:00
xiekaidong
6df7c9294f 英雄红点优化 2023-07-03 10:06:20 +08:00
Fang
0e7f765ca2 fix 2023-07-03 09:51:15 +08:00
xiekaidong
f7c7f3ad27 bug修复 2023-06-30 17:54:39 +08:00
xiekaidong
4aaaf714bd 竞技场敌方自动战斗 2023-06-29 20:52:39 +08:00
Fang
14790f04b8 审核处理 2023-06-21 21:21:22 +08:00
xiekaidong
a6c85e6741 容错 2023-06-20 22:09:40 +08:00