chenxi
|
68f9a47e00
|
更新配置
|
2023-06-21 14:05:45 +08:00 |
|
chenxi
|
98b2faca16
|
更新配置
|
2023-06-21 12:11:39 +08:00 |
|
chenxi
|
b49e4f261f
|
更新配置
|
2023-06-21 11:21:20 +08:00 |
|
chenxi
|
c7f465dbd0
|
更新配置
|
2023-06-20 22:19:26 +08:00 |
|
xiekaidong
|
b75fe6b754
|
更新配置
|
2023-06-20 21:03:20 +08:00 |
|
chenxi
|
594a6cced5
|
更新配置
|
2023-06-20 19:58:07 +08:00 |
|
xiekaidong
|
749de33dae
|
更新配置
|
2023-06-20 15:29:34 +08:00 |
|
chenxi
|
6f33fc030a
|
更新配置
|
2023-06-20 14:43:14 +08:00 |
|
Fang
|
b45ee34f5f
|
导表
|
2023-06-20 11:44:21 +08:00 |
|
Fang
|
ab4fbf3067
|
添加重命名与当前昵称相同提示
|
2023-06-19 16:25:18 +08:00 |
|
xiekaidong
|
f1b4a21ae6
|
免控
|
2023-06-19 11:55:10 +08:00 |
|
chenxi
|
d2f689e510
|
更新配置
|
2023-06-19 11:05:56 +08:00 |
|
chenxi
|
8032ca378d
|
更新配置
|
2023-06-16 21:34:30 +08:00 |
|
xiekaidong
|
aa5f557c75
|
怪物经验可配置根据血量的分段经验
|
2023-06-16 18:42:41 +08:00 |
|
xiekaidong
|
7dae3a6ab5
|
火蛇海蛇效果
|
2023-06-16 15:13:38 +08:00 |
|
chenxi
|
e402550d92
|
更新配置
|
2023-06-16 12:05:32 +08:00 |
|
xiekaidong
|
c1fb666388
|
更新配置
|
2023-06-16 10:09:20 +08:00 |
|
Fang
|
da6e53abfe
|
修改副本显示顺序、碎片副本奖励逻辑
|
2023-06-15 16:08:37 +08:00 |
|
chenxi
|
50046726cf
|
更新recharge
|
2023-06-15 11:10:11 +08:00 |
|
Fang
|
193ea8902f
|
金币副本新增boss抗性
|
2023-06-15 10:46:36 +08:00 |
|
xiekaidong
|
47d8b479f9
|
连携提示
|
2023-06-14 18:21:42 +08:00 |
|
chenxi
|
d3bb4c3698
|
Merge branch 'dev_ios' into dev
|
2023-06-14 15:40:47 +08:00 |
|
xiekaidong
|
918146dda0
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-14 15:34:25 +08:00 |
|
xiekaidong
|
e3b8eaa04c
|
显示buff
|
2023-06-14 15:34:21 +08:00 |
|
Fang
|
98206fea34
|
Merge branch 'dev' into fang/dungeon
# Conflicts:
# lua/app/config/avatar.lua.meta
# lua/app/config/avatar_frame.lua.meta
# lua/app/config/skill.lua
# lua/app/config/skill_rogue.lua
# lua/app/config/strings/cn/avatar.lua.meta
# lua/app/config/strings/cn/avatar_frame.lua.meta
# lua/app/config/strings/cn/hero.lua
# lua/app/config/strings/cn/item.lua
# lua/app/config/strings/de/avatar.lua.meta
# lua/app/config/strings/de/avatar_frame.lua.meta
# lua/app/config/strings/en/avatar.lua.meta
# lua/app/config/strings/en/avatar_frame.lua.meta
# lua/app/config/strings/fr/avatar.lua.meta
# lua/app/config/strings/fr/avatar_frame.lua.meta
# lua/app/config/strings/id/avatar.lua.meta
# lua/app/config/strings/id/avatar_frame.lua.meta
# lua/app/config/strings/ja/avatar.lua.meta
# lua/app/config/strings/ja/avatar_frame.lua.meta
# lua/app/config/strings/ko/avatar.lua.meta
# lua/app/config/strings/ko/avatar_frame.lua.meta
# lua/app/config/strings/pt/avatar.lua.meta
# lua/app/config/strings/pt/avatar_frame.lua.meta
# lua/app/config/strings/ru/avatar.lua.meta
# lua/app/config/strings/ru/avatar_frame.lua.meta
# lua/app/config/strings/th/avatar.lua.meta
# lua/app/config/strings/th/avatar_frame.lua.meta
# lua/app/config/strings/vi/avatar.lua.meta
# lua/app/config/strings/vi/avatar_frame.lua.meta
# lua/app/config/strings/zh/avatar.lua.meta
# lua/app/config/strings/zh/avatar_frame.lua.meta
|
2023-06-14 11:41:12 +08:00 |
|
Fang
|
ecb24214aa
|
fix
|
2023-06-14 11:38:50 +08:00 |
|
Fang
|
1d68846a85
|
ui细节调整
|
2023-06-13 18:44:47 +08:00 |
|
xiekaidong
|
e010700340
|
技能音效
|
2023-06-13 17:43:55 +08:00 |
|
Fang
|
a788b1cb8c
|
ui资源补充替换
|
2023-06-13 16:16:18 +08:00 |
|
chenxi
|
9779e5f4c6
|
删除多余的lua
|
2023-06-13 15:12:47 +08:00 |
|
chenxi
|
c65113785d
|
更新配置
|
2023-06-13 14:37:42 +08:00 |
|
xiekaidong
|
ad7212ff13
|
新的肉鸽机制-改变effect概率
|
2023-06-13 11:11:06 +08:00 |
|
Fang
|
decabd89ee
|
补充奖励显示逻辑
|
2023-06-12 18:47:09 +08:00 |
|
xiekaidong
|
ee826d12c8
|
Merge branch 'fang/dungeon' of http://git.juzugame.com/b6-client/b6-lua into fang/dungeon
# Conflicts:
# lua/app/common/bi_report.lua
# lua/app/common/data_manager.lua
# lua/app/config/monster_dungeon_gold.lua
# lua/app/config/monster_dungeon_gold.lua.meta
# lua/app/config/skill.lua
# lua/app/config/skill_rogue.lua
# lua/app/module/dungeon/dungeon_manager.lua
# lua/app/ui/dungeon/dungeon_board_cell.lua
# lua/app/ui/dungeon/dungeon_difficulty_ui.lua
# lua/app/ui/main_city/component/dungeon_comp.lua
# lua/app/ui/main_city/main_city_ui.lua
# lua/app/userdata/dungeon/dungeon_data.lua
# lua/app/userdata/dungeon/dungeon_data_base_comp.lua
# lua/app/userdata/dungeon/dungeon_gold_data_comp.lua
# lua/app/userdata/dungeon/dungeon_shards_data_comp.lua
|
2023-06-12 15:43:30 +08:00 |
|
Fang
|
e4dad61f52
|
活动副本
|
2023-06-12 15:39:52 +08:00 |
|
xiekaidong
|
5be91b491c
|
暂存
|
2023-06-12 15:21:26 +08:00 |
|
xiekaidong
|
39dacd3cdc
|
攻击距离可配置
|
2023-06-12 10:36:58 +08:00 |
|
Fang
|
bf1e7b7885
|
活动副本
|
2023-06-09 18:46:22 +08:00 |
|
xiekaidong
|
66db212dd4
|
更新配置
|
2023-06-09 17:34:07 +08:00 |
|
chenxi
|
2fd8f49f32
|
rechargeid
|
2023-06-09 17:08:04 +08:00 |
|
chenxi
|
5b37d50df4
|
多语言
|
2023-06-08 17:01:17 +08:00 |
|
chenxi
|
94ce7bdc8e
|
更新配置
|
2023-06-06 18:40:23 +08:00 |
|
xiekaidong
|
c9558263e2
|
更新配置
|
2023-06-06 14:39:25 +08:00 |
|
CloudJ
|
062d3e54e8
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-06 11:45:01 +08:00 |
|
CloudJ
|
ed3d1898b0
|
调整宝箱界面
|
2023-06-06 11:44:58 +08:00 |
|
xiekaidong
|
24a853e31a
|
显示优化
|
2023-06-06 11:32:07 +08:00 |
|
chenxi
|
952ada512e
|
更新配置
|
2023-06-06 10:49:11 +08:00 |
|
chenxi
|
5790cef72b
|
更新配置
|
2023-06-05 21:30:53 +08:00 |
|
chenxi
|
16975e700e
|
充值后没有绑定则提示绑定
|
2023-06-05 18:32:51 +08:00 |
|
Fang
|
c5c36cbb86
|
更表
|
2023-06-05 17:29:36 +08:00 |
|