chenxi
|
7ae76d3438
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-14 15:39:24 +08:00 |
|
chenxi
|
d3a00e325c
|
兑换码
|
2023-06-14 15:39:21 +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 |
|
chenxi
|
34332c6af9
|
merge cdkey
|
2023-06-14 15:04:56 +08:00 |
|
chenxi
|
5934e03198
|
cdkey
|
2023-06-14 15:04:26 +08:00 |
|
Fang
|
4d05a6e433
|
命名修改
|
2023-06-14 14:51:12 +08:00 |
|
Fang
|
49d9a4ebd9
|
修改继承类型
|
2023-06-14 14:35:31 +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 |
|
xiekaidong
|
9b24d69fbd
|
交换一下战斗双方死亡的判定顺序
|
2023-06-14 10:41:34 +08:00 |
|
Fang
|
097812e730
|
fix
|
2023-06-14 10:22:34 +08:00 |
|
xiekaidong
|
6cf247d86d
|
对手先手期间，英雄不会播放死亡动作bug修复
|
2023-06-14 10:03:21 +08:00 |
|
chenxi
|
c95991df76
|
先传一下维护公告界面
|
2023-06-13 21:01:11 +08:00 |
|
chenxi
|
8eed1c6a97
|
cdkey临时界面
|
2023-06-13 20:53:53 +08:00 |
|
xiekaidong
|
3c54f4e9c8
|
英雄升级特效
|
2023-06-13 18:49:55 +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 |
|
xiekaidong
|
2b5ec86898
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-13 15:24:51 +08:00 |
|
xiekaidong
|
ee6a38b813
|
修改每日挑战战斗界面的任务入口
|
2023-06-13 15:24:48 +08:00 |
|
chenxi
|
9779e5f4c6
|
删除多余的lua
|
2023-06-13 15:12:47 +08:00 |
|
xiekaidong
|
81f68ec173
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-13 15:08:05 +08:00 |
|
xiekaidong
|
4846a97b75
|
grideffect=6的处理
|
2023-06-13 15:08:02 +08:00 |
|
chenxi
|
844c587d71
|
Merge branch 'dev_shenhe' into dev
|
2023-06-13 15:04:53 +08:00 |
|
chenxi
|
0e62320f31
|
审核模式不显示金猪
|
2023-06-13 15:04:47 +08:00 |
|
chenxi
|
c65113785d
|
更新配置
|
2023-06-13 14:37:42 +08:00 |
|
chenxi
|
58c539a789
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-13 11:59:38 +08:00 |
|
chenxi
|
823dac78f8
|
金猪倒计时
|
2023-06-13 11:59:35 +08:00 |
|
xiekaidong
|
1319417de0
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-13 11:11:09 +08:00 |
|
xiekaidong
|
ad7212ff13
|
新的肉鸽机制-改变effect概率
|
2023-06-13 11:11:06 +08:00 |
|
chenxi
|
95fd46ed94
|
Merge branch 'dev_shenhe' into dev
|
2023-06-13 10:43:59 +08:00 |
|
chenxi
|
00ec7c553d
|
账号绑定的apple处理
|
2023-06-13 10:41:19 +08:00 |
|
xiekaidong
|
90bd77a4b7
|
显示调整
|
2023-06-13 10:36:44 +08:00 |
|
xiekaidong
|
43826faab8
|
界面处理
|
2023-06-13 10:16:58 +08:00 |
|
xiekaidong
|
5def9aed8a
|
战斗
|
2023-06-12 18:54:27 +08:00 |
|
xiekaidong
|
f20f435227
|
Merge branch 'fang/dungeon' of http://git.juzugame.com/b6-client/b6-lua into fang/dungeon
# Conflicts:
# lua/app/config/chapter_dungeon_gold.lua
# lua/app/module/dungeon/dungeon_manager.lua
|
2023-06-12 18:50:40 +08:00 |
|
xiekaidong
|
30bfbb5476
|
接入战斗
|
2023-06-12 18:49:59 +08:00 |
|
Fang
|
decabd89ee
|
补充奖励显示逻辑
|
2023-06-12 18:47:09 +08:00 |
|
chenxi
|
0d916a96e8
|
Merge branch 'dev_shenhe' into dev
|
2023-06-12 18:25:37 +08:00 |
|
chenxi
|
8891f004ff
|
审核模式
|
2023-06-12 18:25:14 +08:00 |
|
xiekaidong
|
59289536d1
|
副本战斗
|
2023-06-12 17:58:40 +08:00 |
|
Fang
|
9d648fb450
|
补充逻辑
|
2023-06-12 17:14:00 +08:00 |
|
xiekaidong
|
e1c54ef97e
|
Merge branch 'dev' into fang/dungeon
|
2023-06-12 16:56:14 +08:00 |
|
xiekaidong
|
87fe40ed94
|
金币副本
|
2023-06-12 16:46:55 +08:00 |
|
xiekaidong
|
71b4b2b4e0
|
战斗任务参数修改
|
2023-06-12 16:30:04 +08:00 |
|
xiekaidong
|
99694fc1d8
|
整合一下战斗任务参数
|
2023-06-12 16:25:11 +08:00 |
|
xiekaidong
|
f07822161f
|
战斗
|
2023-06-12 16:05:58 +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 |
|