Merge branch 'master' into dev_680_礼物展馆
# Conflicts: # common/src/main/res/values-zh-rHK/strings.xml # common/src/main/res/values-zh-rTW/strings.xml # common/src/main/res/values-zh/strings.xml # common/src/main/res/values/strings.xml # gradle.properties # live/build.gradle
BIN
common/src/main/res/mipmap-xxhdpi/bg_live_sud_game_back_new2.png
Normal file
|
After Width: | Height: | Size: 5.6 KiB |
BIN
common/src/main/res/mipmap-xxhdpi/guard_buy_tips_cancel_bg.png
Normal file
|
After Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 4.7 KiB |
|
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
|
After Width: | Height: | Size: 2.3 KiB |
BIN
common/src/main/res/mipmap-xxhdpi/sub_1.png
Normal file
|
After Width: | Height: | Size: 4.6 KiB |
BIN
common/src/main/res/mipmap-xxhdpi/sub_2.png
Normal file
|
After Width: | Height: | Size: 4.7 KiB |
BIN
common/src/main/res/mipmap-xxhdpi/sub_3.png
Normal file
|
After Width: | Height: | Size: 5.6 KiB |
BIN
common/src/main/res/mipmap-xxhdpi/sub_again_en.png
Normal file
|
After Width: | Height: | Size: 43 KiB |
BIN
common/src/main/res/mipmap-xxhdpi/sub_again_zh.png
Normal file
|
After Width: | Height: | Size: 41 KiB |
BIN
common/src/main/res/mipmap-xxhdpi/sub_bg.png
Normal file
|
After Width: | Height: | Size: 550 KiB |
BIN
common/src/main/res/mipmap-xxhdpi/sub_bg2.png
Normal file
|
After Width: | Height: | Size: 552 KiB |
BIN
common/src/main/res/mipmap-xxhdpi/sub_draw_en.png
Normal file
|
After Width: | Height: | Size: 109 KiB |
BIN
common/src/main/res/mipmap-xxhdpi/sub_draw_zh.png
Normal file
|
After Width: | Height: | Size: 107 KiB |
BIN
common/src/main/res/mipmap-xxhdpi/sub_leave_en.png
Normal file
|
After Width: | Height: | Size: 34 KiB |
BIN
common/src/main/res/mipmap-xxhdpi/sub_leave_zh.png
Normal file
|
After Width: | Height: | Size: 34 KiB |
BIN
common/src/main/res/mipmap-xxhdpi/sub_loss_en.png
Normal file
|
After Width: | Height: | Size: 82 KiB |
BIN
common/src/main/res/mipmap-xxhdpi/sub_loss_zh.png
Normal file
|
After Width: | Height: | Size: 84 KiB |
BIN
common/src/main/res/mipmap-xxhdpi/sub_over_en.png
Normal file
|
After Width: | Height: | Size: 152 KiB |
BIN
common/src/main/res/mipmap-xxhdpi/sub_over_zh.png
Normal file
|
After Width: | Height: | Size: 154 KiB |
BIN
common/src/main/res/mipmap-xxhdpi/sub_vs.png
Normal file
|
After Width: | Height: | Size: 11 KiB |
BIN
common/src/main/res/mipmap-xxhdpi/sub_win_en.png
Normal file
|
After Width: | Height: | Size: 156 KiB |
BIN
common/src/main/res/mipmap-xxhdpi/sub_win_hat.png
Normal file
|
After Width: | Height: | Size: 28 KiB |
BIN
common/src/main/res/mipmap-xxhdpi/sub_win_zh.png
Normal file
|
After Width: | Height: | Size: 156 KiB |
BIN
common/src/main/res/mipmap-xxhdpi/sud_load_bg_double.png
Normal file
|
After Width: | Height: | Size: 432 KiB |
BIN
common/src/main/res/mipmap-xxhdpi/sud_load_bg_multiple.png
Normal file
|
After Width: | Height: | Size: 395 KiB |
BIN
common/src/main/res/mipmap-xxhdpi/sud_load_double.png
Normal file
|
After Width: | Height: | Size: 12 KiB |
BIN
common/src/main/res/mipmap-xxhdpi/sud_load_en.png
Normal file
|
After Width: | Height: | Size: 10 KiB |
BIN
common/src/main/res/mipmap-xxhdpi/sud_load_multiple.png
Normal file
|
After Width: | Height: | Size: 14 KiB |
BIN
common/src/main/res/mipmap-xxhdpi/sud_load_skip_en.png
Normal file
|
After Width: | Height: | Size: 34 KiB |
BIN
common/src/main/res/mipmap-xxhdpi/sud_load_skip_zh.png
Normal file
|
After Width: | Height: | Size: 35 KiB |
BIN
common/src/main/res/mipmap-xxhdpi/sud_load_zh.png
Normal file
|
After Width: | Height: | Size: 8.5 KiB |