Merge remote-tracking branch 'origin/语音房_6.6.4_'

# Conflicts:
#	common/src/main/res/values-en-rUS/string.xml
#	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
This commit is contained in:
18401019693
2024-01-15 10:03:00 +08:00
70 changed files with 2926 additions and 358 deletions

View File

@@ -84,6 +84,9 @@
<activity
android:name=".activity.WebViewActivityMedal"
android:screenOrientation="portrait" />
<activity
android:name=".activity.SudGameActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.MedalQuestionWebViewActivity"
android:screenOrientation="portrait" />