2293 Commits

Author SHA1 Message Date
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
xiekaidong
b6b342c435 boss_rush战斗 2023-09-01 10:23:48 +08:00
xiekaidong
049d7508ea bossrush 2023-08-31 20:18:14 +08:00
Fang
b40d1acf9d 点击英雄卡面,不显示皮肤fix 2023-08-31 18:10:01 +08:00
xiekaidong
211d7cc71e boss_rush 2023-08-30 19:11:38 +08:00
Fang
e243d51ff8 竞技场战令入口banner修改 2023-08-30 18:12:30 +08:00
Fang
2e20947ff7 竞技场spine修改 2023-08-30 17:44:25 +08:00
Fang
aeb1c8e24a 更换皮肤卡面变化 2023-08-30 17:31:56 +08:00
Fang
52cab75d25 更表 2023-08-30 17:03:50 +08:00
xiekaidong
594910154b 优化 v.1.2.5_android v.1.3.5_ios 2023-08-29 21:32:00 +08:00
xiekaidong
8b47e90f54 bug修复 2023-08-29 21:03:39 +08:00
Fang
c22b887d48 加载资源优化 v.1.2.4_android v.1.3.4_ios 2023-08-29 17:11:27 +08:00
xiekaidong
eb73910628 Merge branch 'master' into dev_20230829 2023-08-29 16:02:05 +08:00
xiekaidong
859bbd42b9 增加容错 2023-08-29 14:54:54 +08:00
xiekaidong
72d90d6499 更新配置 2023-08-29 12:21:59 +08:00
xiekaidong
71709504a7 优化网络设计 2023-08-29 10:58:37 +08:00
xiekaidong
20eb5d0a41 bug修复 2023-08-28 19:15:27 +08:00
xiekaidong
33673c2f17 逻辑调整 2023-08-28 19:11:47 +08:00
xiekaidong
0990640b97 每日任务宝箱动画 2023-08-28 18:56:20 +08:00
xiekaidong
d23ea152e2 Merge branch 'dev_20230829' of http://git.juzugame.com/b6-client/b6-lua into dev_20230829 2023-08-28 18:36:05 +08:00
xiekaidong
6c5f5a16c2 显示修复 2023-08-28 18:36:01 +08:00
Fang
fcc5114bc5 竞技场入口红点添加段位奖励可领取情况 2023-08-28 18:19:03 +08:00
Fang
0e0ea61a59 段位奖励第一个档位标签显示fix 2023-08-28 17:51:04 +08:00