zlzw fdbf5aee04 Merge branch 'dev_prank' ...

# Conflicts:
#	common/src/main/java/com/yunbao/common/http/PDLiveApi.java
#	common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java

2022-12-12 14:14:06 +08:00

..

anim

根据文档修改新礼物UI

2022-10-10 11:00:46 +08:00

color

androidx版本首次提交

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

drawable

Merge branch 'dev_prank'

2022-12-12 14:14:06 +08:00

layout

Merge branch 'dev_prank'

2022-12-12 14:14:06 +08:00

mipmap-hdpi

androidx版本首次提交

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

mipmap-mdpi

调整用户卡片齿轮位置

2022-11-17 14:23:06 +08:00

mipmap-xhdpi

Merge branch 'dev_prank'

2022-12-12 14:14:06 +08:00

mipmap-xxxhdpi

多人Pk功能撤回

2022-12-10 16:20:13 +08:00

values

update 自由PK 次数用完了提示用户

2022-12-09 17:51:15 +08:00

values-en

补充多人连麦文案

2022-11-25 13:49:14 +08:00

background_fff.xml

androidx版本首次提交

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