xiekaidong
|
33ba5c7ef1
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-19 17:28:08 +08:00 |
|
xiekaidong
|
e573463879
|
增加网络通信失败的上报
|
2023-06-19 17:28:05 +08:00 |
|
Fang
|
45e6b4d856
|
跨天关闭副本关卡选择界面
|
2023-06-19 15:58:51 +08:00 |
|
chenxi
|
3c9a656192
|
获取firebasetoken
|
2023-06-19 11:18:15 +08:00 |
|
Fang
|
f3924368ce
|
头像昵称功能
|
2023-06-19 10:57:39 +08:00 |
|
chenxi
|
0988c47259
|
adjust事件
|
2023-06-19 09:56:07 +08:00 |
|
chenxi
|
13edfce314
|
界面调整
|
2023-06-16 17:32:01 +08:00 |
|
xiekaidong
|
aae6480bf7
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-16 16:59:57 +08:00 |
|
xiekaidong
|
35a4f25366
|
邮件容错
|
2023-06-16 16:59:54 +08:00 |
|
chenxi
|
fb671ca1af
|
维护公告
|
2023-06-16 15:11:37 +08:00 |
|
chenxi
|
212abb61d5
|
谷歌订单
|
2023-06-16 10:26:16 +08:00 |
|
chenxi
|
83c02d3d4e
|
上报
|
2023-06-15 20:59:48 +08:00 |
|
chenxi
|
f810b8105e
|
支付参数
|
2023-06-15 20:28:25 +08:00 |
|
chenxi
|
30cbf7d8cc
|
ios支付
|
2023-06-15 19:54:46 +08:00 |
|
chenxi
|
6d97c5f9bf
|
未完成订单
|
2023-06-15 19:16:39 +08:00 |
|
xiekaidong
|
c11428b80b
|
bug修复
|
2023-06-15 17:52:22 +08:00 |
|
xiekaidong
|
3723335174
|
每日挑战任务完成情况上报
|
2023-06-15 17:30:08 +08:00 |
|
xiekaidong
|
e8b6534d3b
|
副本开启引导触发
|
2023-06-15 15:32:27 +08:00 |
|
chenxi
|
355c8753d9
|
ios 支付参数
|
2023-06-15 11:03:56 +08:00 |
|
chenxi
|
af1c4f72a7
|
支付调整
|
2023-06-15 10:11:08 +08:00 |
|
chenxi
|
9666158491
|
adjust上报
|
2023-06-14 21:43:02 +08:00 |
|
chenxi
|
119a6eaa27
|
支付
|
2023-06-14 18:57:09 +08:00 |
|
chenxi
|
fb18182d6a
|
ios 支付
|
2023-06-14 18:43:04 +08:00 |
|
chenxi
|
27676042fb
|
ios 支付调整
|
2023-06-14 17:36:22 +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
|
34332c6af9
|
merge cdkey
|
2023-06-14 15:04:56 +08:00 |
|
chenxi
|
5934e03198
|
cdkey
|
2023-06-14 15:04:26 +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
|
097812e730
|
fix
|
2023-06-14 10:22:34 +08:00 |
|
chenxi
|
02cdb96b4b
|
ios支付
|
2023-06-13 18:19:01 +08:00 |
|
chenxi
|
1b27a8dfae
|
ios支付参数
|
2023-06-13 18:05:16 +08:00 |
|
chenxi
|
d8b335daf5
|
支付转菊花
|
2023-06-12 22:19:11 +08:00 |
|
chenxi
|
0d916a96e8
|
Merge branch 'dev_shenhe' into dev
|
2023-06-12 18:25:37 +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 |
|
chenxi
|
acccd99660
|
adjust事件
|
2023-06-09 19:00:54 +08:00 |
|
Fang
|
bf1e7b7885
|
活动副本
|
2023-06-09 18:46:22 +08:00 |
|
chenxi
|
4e4719a51e
|
ios 支付
|
2023-06-09 16:39:45 +08:00 |
|
chenxi
|
89d068133e
|
ios支付
|
2023-06-09 16:30:17 +08:00 |
|
xiekaidong
|
1ddb7bd43b
|
ios支付处理
|
2023-06-09 16:08:22 +08:00 |
|
chenxi
|
1d163ad8eb
|
商店
|
2023-06-09 15:41:54 +08:00 |
|
chenxi
|
339d005e73
|
平台名
|
2023-06-09 11:46:47 +08:00 |
|
chenxi
|
822b6baa75
|
商店热卖标签红点
|
2023-06-08 20:51:09 +08:00 |
|
xiekaidong
|
cc8bace10b
|
上报修复
|
2023-06-08 17:07:04 +08:00 |
|
xiekaidong
|
86e6e62fe9
|
bug修复
|
2023-06-08 16:41:07 +08:00 |
|
xiekaidong
|
75bcd50e85
|
支付奖励上报修复
|
2023-06-08 12:06:03 +08:00 |
|
chenxi
|
ba2903a60f
|
Merge branch 'dev_20230607_hotupdate' into dev
|
2023-06-07 20:57:35 +08:00 |
|