xiekaidong
|
b951d8d2b7
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-15 14:07:13 +08:00 |
|
xiekaidong
|
f215a8124a
|
bug修复
|
2023-06-15 14:07:10 +08:00 |
|
chenxi
|
50046726cf
|
更新recharge
|
2023-06-15 11:10:11 +08:00 |
|
chenxi
|
355c8753d9
|
ios 支付参数
|
2023-06-15 11:03:56 +08:00 |
|
Fang
|
193ea8902f
|
金币副本新增boss抗性
|
2023-06-15 10:46:36 +08:00 |
|
chenxi
|
af1c4f72a7
|
支付调整
|
2023-06-15 10:11:08 +08:00 |
|
chenxi
|
907f1b6b39
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-14 21:43:05 +08:00 |
|
chenxi
|
9666158491
|
adjust上报
|
2023-06-14 21:43:02 +08:00 |
|
xiekaidong
|
2807860d92
|
容错
|
2023-06-14 19:09:26 +08:00 |
|
xiekaidong
|
179deb6438
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-14 19:05:23 +08:00 |
|
xiekaidong
|
3f23f976e3
|
bug修复
|
2023-06-14 19:05:15 +08:00 |
|
chenxi
|
119a6eaa27
|
支付
|
2023-06-14 18:57:09 +08:00 |
|
chenxi
|
119d9c8e22
|
隐私政策
|
2023-06-14 18:56:18 +08:00 |
|
chenxi
|
fb18182d6a
|
ios 支付
|
2023-06-14 18:43:04 +08:00 |
|
xiekaidong
|
5214dd8136
|
伤害数字重叠问题
|
2023-06-14 18:35:20 +08:00 |
|
xiekaidong
|
47d8b479f9
|
连携提示
|
2023-06-14 18:21:42 +08:00 |
|
xiekaidong
|
12a68b6f0c
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-14 18:21:01 +08:00 |
|
xiekaidong
|
e664f4ab0a
|
连携提示
|
2023-06-14 18:20:57 +08:00 |
|
chenxi
|
27676042fb
|
ios 支付调整
|
2023-06-14 17:36:22 +08:00 |
|
chenxi
|
ad09f090fe
|
多语言的缓存bug
|
2023-06-14 16:45:30 +08:00 |
|
chenxi
|
fa1f00dcb4
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-14 16:19:10 +08:00 |
|
chenxi
|
a2a3bb5180
|
多语言
|
2023-06-14 16:19:04 +08:00 |
|
xiekaidong
|
35053faa9b
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-14 16:00:20 +08:00 |
|
xiekaidong
|
17ad018a43
|
日志上报
|
2023-06-14 16:00:17 +08:00 |
|
chenxi
|
d3bb4c3698
|
Merge branch 'dev_ios' into dev
|
2023-06-14 15:40:47 +08:00 |
|
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 |
|
chenxi
|
02cdb96b4b
|
ios支付
|
2023-06-13 18:19:01 +08:00 |
|
chenxi
|
1b27a8dfae
|
ios支付参数
|
2023-06-13 18:05:16 +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 |
|