260 Commits

Author SHA1 Message Date
xiekaidong
f7c7f3ad27 bug修复 2023-06-30 17:54:39 +08:00
xiekaidong
4aaaf714bd 竞技场敌方自动战斗 2023-06-29 20:52:39 +08:00
chenxi
b56dc5fe04 白名单和审核模式 2023-06-21 11:36:31 +08:00
xiekaidong
a6c85e6741 容错 2023-06-20 22:09:40 +08:00
chenxi
030bf3f315 先屏蔽泰语 2023-06-20 15:45:20 +08:00
xiekaidong
8a358a1604 更新配置 2023-06-20 15:30:04 +08:00
chenxi
fe9ccf4325 更新配置 2023-06-20 14:44:12 +08:00
chenxi
d9befbff7a 开几个语言 2023-06-20 10:08:24 +08:00
xiekaidong
dfc485cab3 增加网络通信失败的上报 2023-06-19 17:28:45 +08:00
Fang
7939d1630d 跨天关闭副本关卡选择界面 2023-06-19 16:00:11 +08:00
xiekaidong
9d0901dc2b 免控 2023-06-19 11:55:52 +08:00
Fang
d275c58ad4 头像昵称 2023-06-19 10:57:28 +08:00
xiekaidong
116fa0ef75 bug修复 2023-06-19 10:13:34 +08:00
chenxi
3f855b2357 界面调整 2023-06-16 17:36:57 +08:00
chenxi
da087b9dff 维护公告 2023-06-16 16:17:09 +08:00
chenxi
f04af250ac 编译 2023-06-16 10:37:25 +08:00
chenxi
daddedf98f 上报 2023-06-15 21:00:18 +08:00
chenxi
c647c867d7 支付参数 2023-06-15 20:28:59 +08:00
xiekaidong
ef7d1f78cd bug修复 2023-06-15 17:53:01 +08:00
xiekaidong
0b5670c7a4 每日挑战任务完成情况上报 2023-06-15 17:30:49 +08:00
xiekaidong
402aaa1ad1 副本开启引导触发、神秘宝箱开启音效 2023-06-15 15:33:09 +08:00
chenxi
d33cddfcc1 编译 2023-06-15 11:10:37 +08:00
chenxi
175653d91d 支付调整 2023-06-15 10:11:55 +08:00
chenxi
358a41e2ed 参数以及上报 2023-06-14 21:43:46 +08:00
xiekaidong
972a339c4a bug修复 2023-06-14 19:05:47 +08:00
xiekaidong
b7a592bd51 日志上报 2023-06-14 16:06:21 +08:00
chenxi
7a141820b4 merge 2023-06-14 15:43:17 +08:00
chenxi
b51d130b3b Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
# Conflicts:
#	Assets/proto/protocol.bytes
2023-06-14 15:41:50 +08:00
chenxi
25534ecacb 编译 2023-06-14 15:40:09 +08:00
Fang
ee97ab1c93 Merge branch 'dev' into fang/dungeon
# Conflicts:
#	Assets/lua/app/config/item.lua.bytes
#	Assets/lua/app/config/localization/localization_global_const.lua.bytes
#	Assets/lua/app/config/skill.lua.bytes
#	Assets/lua/app/config/strings/cn/global.lua.bytes
#	Assets/lua/app/config/strings/cn/item.lua.bytes
#	Assets/lua/app/config/strings/de/item.lua.bytes
#	Assets/lua/app/config/strings/en/global.lua.bytes
#	Assets/lua/app/config/strings/en/item.lua.bytes
#	Assets/lua/app/config/strings/fr/item.lua.bytes
#	Assets/lua/app/config/strings/id/item.lua.bytes
#	Assets/lua/app/config/strings/ja/item.lua.bytes
#	Assets/lua/app/config/strings/ko/item.lua.bytes
#	Assets/lua/app/config/strings/pt/item.lua.bytes
#	Assets/lua/app/config/strings/ru/item.lua.bytes
#	Assets/lua/app/config/strings/th/item.lua.bytes
#	Assets/lua/app/config/strings/vi/item.lua.bytes
#	Assets/lua/app/config/strings/zh/global.lua.bytes
#	Assets/lua/app/config/strings/zh/item.lua.bytes
#	Assets/lua/app/module/battle/battle_const.lua.bytes
#	Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
#	Assets/lua/app/ui/battle/battle_ui.lua.bytes
#	Assets/lua/app/ui/main_city/main_city_ui.lua.bytes
2023-06-14 11:42:03 +08:00
chenxi
45cb348bfc ios支付 2023-06-13 18:19:45 +08:00
chenxi
e86d257330 merge 2023-06-13 10:45:07 +08:00
xiekaidong
3e92da4286 界面处理 2023-06-13 10:20:17 +08:00
chenxi
20aea655a1 支付转菊花 2023-06-12 22:19:42 +08:00
xiekaidong
dd104eae3f 每日挑战不显示每日buff信息 2023-06-12 09:47:25 +08:00
chenxi
0221c6c826 sdk参数 2023-06-09 19:02:30 +08:00
chenxi
13c49e1e6c 支付相关 2023-06-09 17:05:29 +08:00
chenxi
f2708125ec 编译 2023-06-09 11:48:33 +08:00
chenxi
92f0b087c9 编译 2023-06-08 21:38:54 +08:00
xiekaidong
4efa656afe 上报修复 2023-06-08 17:07:51 +08:00
xiekaidong
07a1ca566a bug修复 2023-06-08 16:42:32 +08:00
chenxi
52ad339930 fix bug 2023-06-07 19:50:16 +08:00
chenxi
29832da12e 编译 2023-06-06 18:44:31 +08:00
CloudJ
700804df00 编译 2023-06-06 18:22:26 +08:00
xiekaidong
de983ee4e5 战斗bi日志上报 2023-06-06 18:07:07 +08:00
CloudJ
4b7294b8ad 编译 2023-06-06 17:51:48 +08:00
Fang
49af10d8a9 战斗退出后显示主界面控制 2023-06-06 17:31:34 +08:00
CloudJ
a7756805cb 编译 2023-06-06 17:12:25 +08:00
xiekaidong
cb667f4e9c bug修复 2023-06-06 16:45:39 +08:00
chenxi
f91872672a 音效和ab 2023-06-06 11:30:15 +08:00