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
|
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 |
|
Fang
|
bf1e7b7885
|
活动副本
|
2023-06-09 18:46:22 +08:00 |
|
chenxi
|
1d163ad8eb
|
商店
|
2023-06-09 15:41:54 +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 |
|
chenxi
|
4fd27dab0e
|
账号相关
|
2023-06-07 19:44:10 +08:00 |
|
chenxi
|
304ed48943
|
账号相关
|
2023-06-07 19:32:22 +08:00 |
|
xiekaidong
|
c46b80a567
|
新增上报
|
2023-06-07 17:33:54 +08:00 |
|
xiekaidong
|
c800a0cc31
|
日志上报
|
2023-06-07 17:25:08 +08:00 |
|
xiekaidong
|
0b1b9f262e
|
新增一些上报信息
|
2023-06-07 15:27:11 +08:00 |
|
chenxi
|
b621d37dbe
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-06 18:22:55 +08:00 |
|
chenxi
|
3ccfaec8d0
|
战令
|
2023-06-06 18:22:48 +08:00 |
|
xiekaidong
|
ce947c0a34
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-06 18:21:27 +08:00 |
|
xiekaidong
|
fac1e2c2d5
|
更新一下字段
|
2023-06-06 18:20:42 +08:00 |
|
chenxi
|
01054b8e3b
|
merge bireport
|
2023-06-06 18:14:34 +08:00 |
|
chenxi
|
ec3ae95cc4
|
上报相关
|
2023-06-06 18:14:07 +08:00 |
|
xiekaidong
|
6cb971d493
|
战斗bi日志上报
|
2023-06-06 18:06:38 +08:00 |
|
xiekaidong
|
e69b7a14e5
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
# Conflicts:
# lua/app/common/bi_report.lua
|
2023-06-06 17:59:30 +08:00 |
|
xiekaidong
|
8bdd4ae3d3
|
英雄操作bi上报
|
2023-06-06 17:58:58 +08:00 |
|
CloudJ
|
0d2144756d
|
调整上报参数
|
2023-06-06 17:51:18 +08:00 |
|
chenxi
|
0a7c349470
|
merge
|
2023-06-06 17:14:17 +08:00 |
|
chenxi
|
e59e40435d
|
上报玩家升级
|
2023-06-06 17:13:44 +08:00 |
|
CloudJ
|
f84f0a103a
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-06 17:11:18 +08:00 |
|
CloudJ
|
f95926cfde
|
增加一部分上报
|
2023-06-06 17:11:16 +08:00 |
|
chenxi
|
e6435c68ff
|
公共事件增加上报体力
|
2023-06-06 16:43:12 +08:00 |
|
chenxi
|
be043ef0d1
|
支付上报
|
2023-06-06 15:50:33 +08:00 |
|
chenxi
|
f63a2bf876
|
音效
|
2023-06-06 11:29:34 +08:00 |
|
xiekaidong
|
6efff3f554
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-06 11:08:57 +08:00 |
|
xiekaidong
|
b8f08c59a3
|
资源上传
|
2023-06-06 11:08:52 +08:00 |
|
CloudJ
|
17984d56ae
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
# lua/app/common/audio_manager.lua
|
2023-06-06 11:08:52 +08:00 |
|
CloudJ
|
9a5d42c753
|
音效
|
2023-06-06 11:08:37 +08:00 |
|
chenxi
|
04f9000eed
|
白名单
|
2023-06-06 11:07:07 +08:00 |
|
xiekaidong
|
c218e5a359
|
音效
|
2023-06-06 10:59:34 +08:00 |
|
xiekaidong
|
2dbf06a3b0
|
boss预警音效
|
2023-06-06 10:38:43 +08:00 |
|
xiekaidong
|
eb1281f999
|
bi注释
|
2023-06-06 09:44:02 +08:00 |
|
chenxi
|
b0b6b7cee1
|
还原语言相关设置
|
2023-06-05 22:01:49 +08:00 |
|
chenxi
|
976dfc2653
|
上报参数
|
2023-06-05 21:29:54 +08:00 |
|
chenxi
|
0c8613fd6c
|
bi
|
2023-06-05 21:04:38 +08:00 |
|
chenxi
|
74f91dabae
|
上报
|
2023-06-05 19:07:40 +08:00 |
|
chenxi
|
16975e700e
|
充值后没有绑定则提示绑定
|
2023-06-05 18:32:51 +08:00 |
|