xiekaidong
|
1f85dc4681
|
配置
|
2023-09-05 23:42:01 +08:00 |
|
xiekaidong
|
24a88cf05a
|
bug修复
|
2023-09-05 17:34:17 +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
|
950ecacee5
|
bug修复和优化
|
2023-09-05 11:47:28 +08:00 |
|
xiekaidong
|
9ce3168f39
|
bug修复
|
2023-09-05 10:06:52 +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
|
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
|
b5204ce133
|
跳转
|
2023-09-04 16:31:04 +08:00 |
|
xiekaidong
|
0cdb8515ca
|
侧边栏
|
2023-09-04 16:06:42 +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
|
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
|
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 |
|
xiekaidong
|
594910154b
|
优化
|
2023-08-29 21:32:00 +08:00 |
|
Fang
|
c22b887d48
|
加载资源优化
|
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
|
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
|
36bb8eede2
|
段位奖励添加奖励光效
|
2023-08-28 17:41:52 +08:00 |
|
Fang
|
6ec4c2cd40
|
装备礼包fix
|
2023-08-28 15:25:38 +08:00 |
|
xiekaidong
|
0ebb735e8f
|
封号删除账号
|
2023-08-28 14:12:36 +08:00 |
|
Fang
|
de49d604ad
|
档位奖励进度显示fix
|
2023-08-28 10:14:38 +08:00 |
|
Fang
|
ef77d515f2
|
段位奖励段位图标显示修改
|
2023-08-25 10:36:06 +08:00 |
|
xiekaidong
|
787b04bfc7
|
动画
|
2023-08-24 18:28:56 +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
|
e76e7ccab6
|
段位奖励展示修改、添加收集标签红点
|
2023-08-24 18:09:23 +08:00 |
|
Fang
|
2da8da07d0
|
装备升级礼包
|
2023-08-24 17:29:33 +08:00 |
|
xiekaidong
|
4d5c23a6b6
|
容错
|
2023-08-24 14:30:39 +08:00 |
|
xiekaidong
|
bc42d8e4a8
|
界面处理
|
2023-08-23 17:46:31 +08:00 |
|