Merge remote-tracking branch 'origin/dev_680_礼物展馆' into dev_680_礼物展馆

Browse Source

# Conflicts:
#	common/src/main/java/com/yunbao/common/http/PDLiveApi.java
#	common/src/main/res/values-zh/strings.xml
#	common/src/main/res/values/strings.xml

...

This commit is contained in:

zlzw

2024-07-13 09:29:11 +08:00

parent 845b217c4d 7edd75e223

commit 9292e6f5c5

51 changed files with 1048 additions and 45 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

common/src/main/res/mipmap-xxhdpi/dialog_gift_wall_achieve.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 488 KiB

BIN

common/src/main/res/mipmap-xxhdpi/dialog_gift_wall_achieve_top_bg.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 119 KiB

BIN

common/src/main/res/mipmap-xxhdpi/dialog_gift_wall_achieve_top_icon.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 15 KiB

BIN

common/src/main/res/mipmap-xxhdpi/dialog_gift_wall_achieve_wear_bg.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 485 KiB

BIN

common/src/main/res/mipmap-xxhdpi/dialog_gift_wall_achieve_wear_cancel.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.4 KiB

BIN

common/src/main/res/mipmap-xxhdpi/dialog_gift_wall_achieve_wear_item_bg.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 41 KiB

BIN

common/src/main/res/mipmap-xxhdpi/dialog_gift_wall_achieve_wear_item_unlock.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.0 KiB

BIN

common/src/main/res/mipmap-xxhdpi/dialog_gift_wall_back.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 824 B

BIN

common/src/main/res/mipmap-xxhdpi/dialog_gift_wall_more.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 871 B