Merge branch 'master' of https://gitee.com/xxkp/pdlivexp

Browse Source

# Conflicts:
#	app/build.gradle
#	common/src/main/res/values-zh-rHK/strings.xml
#	common/src/main/res/values-zh-rTW/strings.xml
#	common/src/main/res/values/strings.xml

...

This commit is contained in:

余前卫

2024-07-10 10:53:01 +08:00

parent 2eea1f1b75 94156e2984

commit 6d6010d023

115 changed files with 1655 additions and 797 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/bg_live_sud_game_back_new2.png Normal file

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

common/src/main/res/mipmap-xxhdpi/icon_min_game_new.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.7 KiB After Width:  |  Height:  |  Size: 4.7 KiB

BIN

common/src/main/res/mipmap-xxhdpi/icon_sud_history_live_new.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.9 KiB After Width:  |  Height:  |  Size: 5.6 KiB

BIN

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

Binary file not shown.

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