2519 Commits

Author SHA1 Message Date
xiekaidong
1f85dc4681 配置 2023-09-05 23:42:01 +08:00
chenxi
3355f0ae51 更新配置 v.1.2.7_android v.1.3.7_ios 2023-09-05 22:28:39 +08:00
xiekaidong
e073dd09cf Merge branch 'master' into dev_20230905 2023-09-05 22:20:59 +08:00
xiekaidong
05c32acc78 更新配置 2023-09-05 20:53:34 +08:00
xiekaidong
3a7f4576d8 更新配置 2023-09-05 20:24:35 +08:00
xiekaidong
c685261caa 更新配置 2023-09-05 20:22:27 +08:00
xiekaidong
2c7ac4fac8 bug修复 2023-09-05 20:19:51 +08:00
xiekaidong
43c03fd385 皮肤问题修复 2023-09-05 19:57:26 +08:00
xiekaidong
a0daa1e692 更新配置 2023-09-05 18:00:32 +08:00
xiekaidong
d7f60f5002 bossrush阵容 2023-09-05 17:36:43 +08:00
xiekaidong
24a88cf05a bug修复 2023-09-05 17:34:17 +08:00
xiekaidong
f839dc3b57 buff数值上线 2023-09-05 17:14:49 +08:00
xiekaidong
180c12435f 更新配置 2023-09-05 15:59:37 +08:00
xiekaidong
1e918f92f2 等级修改 2023-09-05 15:29:35 +08:00
xiekaidong
35d84fead7 bug修复 2023-09-05 15:28:24 +08:00
xiekaidong
9e75ea15c3 安卓返回键 2023-09-05 15:24:24 +08:00
xiekaidong
d67a0a8b69 优化 2023-09-05 12:01:42 +08:00
xiekaidong
8f06e996d7 bug修复 2023-09-05 11:54:32 +08:00
xiekaidong
950ecacee5 bug修复和优化 2023-09-05 11:47:28 +08:00
xiekaidong
b63a1e3ee0 bug修复 2023-09-05 10:47:55 +08:00
xiekaidong
9ce3168f39 bug修复 2023-09-05 10:06:52 +08:00
xiekaidong
94064c92ed bug修复 2023-09-05 09:58:29 +08:00
xiekaidong
4aff8fd8c2 字段名修复 2023-09-05 09:23:35 +08:00
xiekaidong
408bd933c6 bug修复 2023-09-04 20:21:02 +08:00
xiekaidong
f3d7d1c892 bug修复 2023-09-04 20:06:11 +08:00
xiekaidong
c6e44efbd6 bug修复 2023-09-04 19:25:50 +08:00
xiekaidong
b47d779cfc 修复一些bug 2023-09-04 18:21:17 +08:00
xiekaidong
ec33c7b7df 14天丢图问题 2023-09-04 17:50:32 +08:00
xiekaidong
12d5186557 倒计时优化 2023-09-04 17:25:50 +08:00
xiekaidong
b9beea2c45 倒计时优化 2023-09-04 17:24:28 +08:00
xiekaidong
11f982bd04 主动结算 2023-09-04 17:14:35 +08:00
xiekaidong
d8aa8cce2c bug修复 2023-09-04 16:54:44 +08:00
xiekaidong
d003c8a551 bug修复 2023-09-04 16:51:34 +08:00
xiekaidong
3e06b26e1f 侧边栏 2023-09-04 16:48:15 +08:00
xiekaidong
4718656cdb 经验 2023-09-04 16:45:19 +08:00
xiekaidong
4d79d3ea6c 最大等级 2023-09-04 16:43:07 +08:00
xiekaidong
b5204ce133 跳转 2023-09-04 16:31:04 +08:00
xiekaidong
0cdb8515ca 侧边栏 2023-09-04 16:06:42 +08:00
xiekaidong
e7039061a8 更新配置 2023-09-01 21:20:53 +08:00
xiekaidong
4e5021741d Merge branch 'dev_20230905' into boss_rush
# Conflicts:
#	lua/app/common/bi_report.lua
#	lua/app/common/data_manager.lua
#	lua/app/common/local_data.lua
#	lua/app/common/module_manager.lua
#	lua/app/config/act_fourteen_bounty.lua.meta
#	lua/app/config/act_fourteen_exchange.lua.meta
#	lua/app/config/act_fourteen_quest.lua
#	lua/app/config/act_fourteen_quest.lua.meta
#	lua/app/config/activity_boss_rush_chapter.lua.meta
#	lua/app/config/activity_boss_rush_exchange.lua.meta
#	lua/app/config/activity_boss_rush_rank.lua.meta
#	lua/app/config/activity_exchange.lua.meta
#	lua/app/config/avatar_frame.lua
#	lua/app/config/chapter_board_bossrush.lua.meta
#	lua/app/config/monster_activity.lua.meta
#	lua/app/config/strings/cn/act_fourteen_quest.lua.meta
#	lua/app/config/strings/cn/global.lua
#	lua/app/config/strings/cn/task_type.lua.meta
#	lua/app/config/strings/de/act_fourteen_quest.lua.meta
#	lua/app/config/strings/de/task_type.lua.meta
#	lua/app/config/strings/en/act_fourteen_quest.lua.meta
#	lua/app/config/strings/en/task_type.lua.meta
#	lua/app/config/strings/es/act_fourteen_quest.lua.meta
#	lua/app/config/strings/es/task_type.lua.meta
#	lua/app/config/strings/fr/act_fourteen_quest.lua.meta
#	lua/app/config/strings/fr/task_type.lua.meta
#	lua/app/config/strings/id/act_fourteen_quest.lua.meta
#	lua/app/config/strings/id/task_type.lua.meta
#	lua/app/config/strings/ja/act_fourteen_quest.lua.meta
#	lua/app/config/strings/ja/task_type.lua.meta
#	lua/app/config/strings/ko/act_fourteen_quest.lua.meta
#	lua/app/config/strings/ko/task_type.lua.meta
#	lua/app/config/strings/pt/act_fourteen_quest.lua.meta
#	lua/app/config/strings/pt/task_type.lua.meta
#	lua/app/config/strings/ru/act_fourteen_quest.lua.meta
#	lua/app/config/strings/th/act_fourteen_quest.lua.meta
#	lua/app/config/strings/th/task_type.lua.meta
#	lua/app/config/strings/vi/act_fourteen_quest.lua.meta
#	lua/app/config/strings/vi/task_type.lua.meta
#	lua/app/config/strings/zh/act_fourteen_quest.lua.meta
#	lua/app/config/strings/zh/task_type.lua.meta
#	lua/app/proto/proto_msg_type.lua
2023-09-01 21:18:54 +08:00
xiekaidong
e182698950 红点 2023-09-01 21:16:56 +08:00
xiekaidong
eed3f88d79 首领公开赛 2023-09-01 21:10:05 +08:00
Fang
1743386c44 bug fix 2023-09-01 18:35:38 +08:00
陈希
d05ed879f9 Merge branch 'fang/14天乐' into 'dev_20230905'
新手14天乐

See merge request b6-client/b6-lua!14
2023-09-01 09:45:58 +00:00
Fang
3dbfc8458c review 2023-09-01 17:45:29 +08:00
Fang
6eea9de2e5 代码调整 2023-09-01 15:58:52 +08:00
Fang
89eeac3f2d 新手14天乐 2023-09-01 15:35:19 +08:00
xiekaidong
fe245efaba 接入数据 2023-09-01 11:55:16 +08:00
xiekaidong
54c95564ba 修改一下 2023-09-01 10:52:08 +08:00
xiekaidong
0498aaf75f 战斗波次加密 2023-09-01 10:41:55 +08:00