xiekaidong
|
950ecacee5
|
bug修复和优化
|
2023-09-05 11:47:28 +08:00 |
|
xiekaidong
|
b63a1e3ee0
|
bug修复
|
2023-09-05 10:47:55 +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
|
c6e44efbd6
|
bug修复
|
2023-09-04 19:25:50 +08:00 |
|
xiekaidong
|
b47d779cfc
|
修复一些bug
|
2023-09-04 18:21:17 +08:00 |
|
xiekaidong
|
d003c8a551
|
bug修复
|
2023-09-04 16:51:34 +08:00 |
|
xiekaidong
|
4d79d3ea6c
|
最大等级
|
2023-09-04 16:43:07 +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 |
|
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 |
|
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 |
|
xiekaidong
|
eb73910628
|
Merge branch 'master' into dev_20230829
|
2023-08-29 16:02:05 +08:00 |
|
xiekaidong
|
20eb5d0a41
|
bug修复
|
2023-08-28 19:15:27 +08:00 |
|
xiekaidong
|
0990640b97
|
每日任务宝箱动画
|
2023-08-28 18:56:20 +08:00 |
|
Fang
|
fcc5114bc5
|
竞技场入口红点添加段位奖励可领取情况
|
2023-08-28 18:19:03 +08:00 |
|
Fang
|
0e0ea61a59
|
段位奖励第一个档位标签显示fix
|
2023-08-28 17:51:04 +08:00 |
|
Fang
|
6ec4c2cd40
|
装备礼包fix
|
2023-08-28 15:25:38 +08:00 |
|
Fang
|
de49d604ad
|
档位奖励进度显示fix
|
2023-08-28 10:14:38 +08:00 |
|
Fang
|
ef77d515f2
|
段位奖励段位图标显示修改
|
2023-08-25 10:36:06 +08:00 |
|
xiekaidong
|
59ef7b2f09
|
Merge branch 'dev_20230829' of http://git.juzugame.com/b6-client/b6-lua into dev_20230829
|
2023-08-24 18:25:55 +08:00 |
|
xiekaidong
|
19399ae3a6
|
更改基金开启时间
|
2023-08-24 18:25:46 +08:00 |
|
陈希
|
5f4bf206df
|
Merge branch 'fang/装备礼包' into 'dev_20230829'
装备升级礼包
See merge request b6-client/b6-lua!13
|
2023-08-24 10:24:21 +00:00 |
|
Fang
|
692277440e
|
定时器处理
|
2023-08-24 18:20:58 +08:00 |
|
Fang
|
e76e7ccab6
|
段位奖励展示修改、添加收集标签红点
|
2023-08-24 18:09:23 +08:00 |
|
Fang
|
2da8da07d0
|
装备升级礼包
|
2023-08-24 17:29:33 +08:00 |
|
xiekaidong
|
b2a829741b
|
界面调整
|
2023-08-23 17:35:27 +08:00 |
|
Fang
|
f15917914c
|
竞技场段位奖励
|
2023-08-23 14:40:52 +08:00 |
|
xiekaidong
|
18cd61d870
|
解锁判定
|
2023-08-22 18:08:51 +08:00 |
|
xiekaidong
|
b57617a85c
|
排序
|
2023-08-22 17:46:28 +08:00 |
|
xiekaidong
|
0549a8b37b
|
bug修复
|
2023-08-21 10:33:14 +08:00 |
|
xiekaidong
|
08553687ae
|
Merge branch 'master' into dev_20230829
# Conflicts:
# lua/app/common/event_manager.lua
|
2023-08-21 09:48:11 +08:00 |
|
xiekaidong
|
0146396ccf
|
报错修复
|
2023-08-21 09:47:01 +08:00 |
|
xiekaidong
|
7babd6aaec
|
英雄排序方式
|
2023-08-18 18:46:44 +08:00 |
|
xiekaidong
|
57682466f6
|
Merge branch 'herofund' into dev_20230829
|
2023-08-18 18:09:20 +08:00 |
|
xiekaidong
|
c880279be1
|
英雄基金
|
2023-08-18 18:08:48 +08:00 |
|
xiekaidong
|
b5fb7a7e28
|
英雄基金
|
2023-08-18 14:39:01 +08:00 |
|