18401019693 c3b5f17f44 Merge branch 'master' into dev_blind_box ...

# Conflicts:
#	common/src/main/res/values-zh/strings.xml
#	common/src/main/res/values/strings.xml

2023-05-27 18:25:14 +08:00

..

attrs.xml

androidx版本首次提交

2022-07-18 15:31:45 +08:00

colors.xml

11111

2022-08-05 18:16:48 +08:00

dimens.xml

11111

2022-08-05 18:16:48 +08:00

strings.xml

Merge branch 'master' into dev_blind_box

2023-05-27 18:25:14 +08:00

style.xml

完善个人资料，编辑页面调整，领取奖励页面构建

2023-05-10 15:30:36 +08:00