167 Commits

Author SHA1 Message Date
xiekaidong
fe19b35f7d 更新配置 2023-06-16 10:09:59 +08:00
xiekaidong
4c476a5188 更新配置 2023-06-16 10:09:30 +08:00
Fang
fa28d96027 修改副本显示顺序、碎片副本奖励逻辑 2023-06-15 16:09:12 +08:00
chenxi
d33cddfcc1 编译 2023-06-15 11:10:37 +08:00
Fang
a5ca47d201 金币副本新增boss抗性 2023-06-15 10:47:11 +08:00
xiekaidong
a3a9ac1fb7 连携提示 2023-06-14 18:21:48 +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
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
chenxi
25c4dcd4bd 编译 2023-06-13 14:38:38 +08:00
xiekaidong
de0b2828a7 新的肉鸽机制-改变effect概率 2023-06-13 11:11:46 +08:00
xiekaidong
3e92da4286 界面处理 2023-06-13 10:20:17 +08:00
xiekaidong
f48f17db38 攻击距离可配置 2023-06-12 10:38:07 +08:00
xiekaidong
dd104eae3f 每日挑战不显示每日buff信息 2023-06-12 09:47:25 +08:00
chenxi
819d3d3a34 编译 2023-06-09 17:23:42 +08:00
chenxi
3c90febf45 多语言 2023-06-08 17:02:48 +08:00
chenxi
29832da12e 编译 2023-06-06 18:44:31 +08:00
xiekaidong
77cd8d33ac 编译lua 2023-06-06 15:06:56 +08:00
chenxi
f245ce203c 编译 2023-06-06 11:46:17 +08:00
chenxi
8a8eb8c14b 编译 2023-06-06 11:45:49 +08:00
CloudJ
f170e50ed8 宝箱UI还原 2023-06-06 11:46:16 +08:00
xiekaidong
c10a2e6b71 显示优化 2023-06-06 11:32:22 +08:00
chenxi
f867b77aa2 编译 2023-06-06 10:49:52 +08:00
chenxi
163ff77186 编译 2023-06-05 21:33:50 +08:00
chenxi
7224512691 充值后提示绑定 2023-06-05 18:33:48 +08:00
Fang
70bb61e9b6 更表 2023-06-05 17:30:58 +08:00
xiekaidong
8f63807099 更新配置 2023-06-05 15:54:49 +08:00
CloudJ
ab33223ea6 编译 2023-06-05 14:10:56 +08:00
CloudJ
aa04bc028b 编译 2023-06-05 10:58:59 +08:00
chenxi
cdd9d6183b 更新配置 2023-06-05 10:08:06 +08:00
chenxi
2fa49ed069 邮箱 2023-06-03 23:54:18 +08:00
CloudJ
30983ba637 编译 2023-06-02 20:35:37 +08:00
chenxi
c475012462 编译 2023-06-02 17:21:20 +08:00
xiekaidong
e4d84563f9 先更新一下格子 2023-06-02 16:54:59 +08:00
xiekaidong
0f8e6d1cf2 bug修复 2023-06-01 17:26:16 +08:00
chenxi
6d8fd7bf5e 功能解锁图标 2023-05-31 20:55:01 +08:00
chenxi
59cfb77e28 账号删除 2023-05-31 17:54:31 +08:00
chenxi
0184cce131 更新配置 2023-05-31 14:32:33 +08:00
xiekaidong
179f1279e4 更新配置 2023-05-31 09:34:42 +08:00
chenxi
e6e294b949 七天乐 2023-05-30 22:23:55 +08:00
xiekaidong
b031fe8a9b 更新配置 2023-05-30 21:30:41 +08:00
chenxi
a58c63a617 ab name 2023-05-30 21:15:29 +08:00
xiekaidong
b5ec3d4eff 显示优化 2023-05-30 18:41:09 +08:00
chenxi
8a6f2ac884 邮箱加一个开启限制 2023-05-30 18:18:56 +08:00
chenxi
e8a737bec6 基金展示 2023-05-30 17:24:34 +08:00
chenxi
20151c0db0 编译 2023-05-30 15:51:17 +08:00
xiekaidong
cd99e669cb 更新配置 2023-05-30 15:08:30 +08:00
chenxi
2fbe01e673 每日挑战 2023-05-30 11:45:27 +08:00
xiekaidong
994fc2e7a2 更新配置 2023-05-30 10:03:53 +08:00