284 Commits

Author SHA1 Message Date
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
xiekaidong
dfd66067ec 更新配置 2023-06-20 21:03:38 +08:00
Fang
0d624772e7 添加头像背景品质 2023-06-20 14:23:48 +08:00
Fang
700b38d1fc 添加重命名与当前昵称相同提示 2023-06-19 16:25:25 +08:00
Fang
7939d1630d 跨天关闭副本关卡选择界面 2023-06-19 16:00:11 +08:00
xiekaidong
9d0901dc2b 免控 2023-06-19 11:55:52 +08:00
Fang
d275c58ad4 头像昵称 2023-06-19 10:57:28 +08:00
chenxi
3791c54170 ab name 2023-06-16 21:55:12 +08:00
xiekaidong
da555bd8f3 怪物经验可配置根据血量的分段经验 2023-06-16 18:44:43 +08:00
xiekaidong
989a7c63e5 火蛇海蛇效果 2023-06-16 15:14:33 +08:00
xiekaidong
e62e198b8e bug修复 2023-06-16 11:49:17 +08:00
xiekaidong
62f45a0392 战斗支持血量换皮肤 2023-06-15 18:56:07 +08:00
chenxi
2ac2d73e0b 战令红点bug 2023-06-15 16:58:13 +08:00
Fang
fa28d96027 修改副本显示顺序、碎片副本奖励逻辑 2023-06-15 16:09:12 +08:00
xiekaidong
2b3f4255a0 buff显示修改 2023-06-15 14:18:22 +08:00
Fang
a5ca47d201 金币副本新增boss抗性 2023-06-15 10:47:11 +08:00
chenxi
358a41e2ed 参数以及上报 2023-06-14 21:43:46 +08:00
xiekaidong
a3a9ac1fb7 连携提示 2023-06-14 18:21:48 +08:00
xiekaidong
b7a592bd51 日志上报 2023-06-14 16:06:21 +08:00
chenxi
7a141820b4 merge 2023-06-14 15:43:17 +08:00
chenxi
b51d130b3b Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
# Conflicts:
#	Assets/proto/protocol.bytes
2023-06-14 15:41:50 +08:00
chenxi
25534ecacb 编译 2023-06-14 15:40:09 +08:00
Fang
6ad7ea4135 编译 2023-06-14 14:54:11 +08:00
Fang
ee97ab1c93 Merge branch 'dev' into fang/dungeon
# Conflicts:
#	Assets/lua/app/config/item.lua.bytes
#	Assets/lua/app/config/localization/localization_global_const.lua.bytes
#	Assets/lua/app/config/skill.lua.bytes
#	Assets/lua/app/config/strings/cn/global.lua.bytes
#	Assets/lua/app/config/strings/cn/item.lua.bytes
#	Assets/lua/app/config/strings/de/item.lua.bytes
#	Assets/lua/app/config/strings/en/global.lua.bytes
#	Assets/lua/app/config/strings/en/item.lua.bytes
#	Assets/lua/app/config/strings/fr/item.lua.bytes
#	Assets/lua/app/config/strings/id/item.lua.bytes
#	Assets/lua/app/config/strings/ja/item.lua.bytes
#	Assets/lua/app/config/strings/ko/item.lua.bytes
#	Assets/lua/app/config/strings/pt/item.lua.bytes
#	Assets/lua/app/config/strings/ru/item.lua.bytes
#	Assets/lua/app/config/strings/th/item.lua.bytes
#	Assets/lua/app/config/strings/vi/item.lua.bytes
#	Assets/lua/app/config/strings/zh/global.lua.bytes
#	Assets/lua/app/config/strings/zh/item.lua.bytes
#	Assets/lua/app/module/battle/battle_const.lua.bytes
#	Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
#	Assets/lua/app/ui/battle/battle_ui.lua.bytes
#	Assets/lua/app/ui/main_city/main_city_ui.lua.bytes
2023-06-14 11:42:03 +08:00
xiekaidong
7e8b46effc 技能音效 2023-06-13 17:44:37 +08:00