202 Commits

Author SHA1 Message Date
Fang
a43ea6c7d7 编译 2023-07-26 16:15:13 +08:00
Fang
654c34d0b6 动效、fix 2023-07-25 22:35:04 +08:00
Fang
aa45c8bbf2 编译 2023-07-25 20:18:47 +08:00
Fang
e7927efe57 编译 2023-07-25 15:45:24 +08:00
Fang
6b52dc9f1d 支线基金 2023-07-24 11:54:43 +08:00
Fang
3397f8d017 装备礼包 2023-07-20 22:23:44 +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
b620281b43 更新配置和优化 2023-07-17 17:21:20 +08:00
Fang
2101a422bb 英雄图鉴 2023-07-14 17:08:08 +08:00
xiekaidong
8328738e0f 优化章节礼包弹出逻辑 2023-07-13 16:53:15 +08:00
xiekaidong
6cbbcdfe9a 网络优化和bug修复 2023-07-13 11:14:29 +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
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
a2e84ce943 修改上报参数,bug修复 2023-07-11 10:21:05 +08:00
xiekaidong
1f204e3f0f 英雄试玩 2023-07-10 18:44:40 +08:00
xiekaidong
cd0a81c0db 用户属性主线阵容上报信息错误修复,竞技场消耗上报增加段位id,竞技场结算上报增加胜负 2023-07-10 17:46:59 +08:00
xiekaidong
01d8ba6a49 木兰试玩 2023-07-10 12:00:46 +08:00
xiekaidong
3690362f81 审核模式 2023-07-07 14:27:02 +08:00
xiekaidong
4be894d995 Merge branch 'dev' into audit 2023-07-07 14:13:50 +08:00
Fang
44ee6c0d52 添加头像、头像框道具解锁逻辑 2023-07-07 11:05:29 +08:00
xiekaidong
6c5f93b97c 提审开关 2023-07-07 10:17:17 +08:00
xiekaidong
1dbededa96 加一行代码 2023-07-06 21:50:31 +08:00
xiekaidong
cce53a40a2 日志上报 2023-07-06 18:26:19 +08:00
Fang
951cfb2d92 成长礼包触发方式修改 2023-07-06 18:21:15 +08:00
xiekaidong
939b0c4651 竞技场日志上报 2023-07-06 18:09:03 +08:00
Fang
5dc4ee1b78 竞技场段位替图、战令文案替换 2023-07-06 14:42:54 +08:00
Fang
0767c6eae5 编译 2023-07-05 15:04:42 +08:00
Fang
91efb4bf35 fix and 替图 2023-07-04 18:34:41 +08:00
xiekaidong
f660bfe4e7 客服红点 2023-07-04 18:15:04 +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
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
xiekaidong
b7fb8bff59 评价弹窗 2023-07-03 15:57:42 +08:00
xiekaidong
ae9b933f0c google支付问题 2023-07-03 14:25:26 +08:00
Fang
c4dabad5c5 编译 2023-07-03 14:16:50 +08:00
xiekaidong
f7c7f3ad27 bug修复 2023-06-30 17:54:39 +08:00
xiekaidong
4aaaf714bd 竞技场敌方自动战斗 2023-06-29 20:52:39 +08:00
chenxi
b56dc5fe04 白名单和审核模式 2023-06-21 11:36:31 +08:00
xiekaidong
a6c85e6741 容错 2023-06-20 22:09:40 +08:00
chenxi
030bf3f315 先屏蔽泰语 2023-06-20 15:45:20 +08:00
xiekaidong
8a358a1604 更新配置 2023-06-20 15:30:04 +08:00
chenxi
fe9ccf4325 更新配置 2023-06-20 14:44:12 +08:00
chenxi
d9befbff7a 开几个语言 2023-06-20 10:08:24 +08:00