yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/新潘多拉6.8.1' into 新潘多拉_6.8.2

Browse Source 
# Conflicts:
#	app/tmp/full-r8-config.txt
#	config.gradle
#	lib_faceunity/src/main/java/io/agora/beautyapi/faceunity/agora/SWManager.java
This commit is contained in:
ningwenqiang
2024-09-27 18:07:04 +08:00
parent fef1e49429 380381c3fe
commit 257b4c51aa
26 changed files with 137 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/main/res/values-en-rUS/strings.xml
View File

@@ -796,8 +796,8 @@
<string name="facebook_client_token">6e90a23e0679c8d21b0888d5fa755535</string>
<string name="twitter_key">ui10vIggex2F043HnztYNuA3g</string>
<string name="twitter_secret">J8jvBBeJoZbVojbkWUrvsj0K0UUkuV69CqQ7CEobhJn6tvAKpQ</string>
<string name="twitter_key">JDd7XEXr0kLcx0KkkJGUbD4MQ</string>
<string name="twitter_secret">aq0eV4R1pqMK_AAeKRWnjPr7ErGMGgTPGgZJdm73WeRY-Kluws</string>
<string name="twitter_key2">ZWRrZnRUNlBlcHVxMXpsMzVmb2k6MTpjaQ</string>
<string name="twitter_secret2">aq0eV4R1pqMK_AAeKRWnjPr7ErGMGgTPGgZJdm73WeRY-Kluws</string>

5
common/src/main/res/values-zh/strings.xml
View File

@@ -835,8 +835,9 @@
<string name="facebook_app_id">977019710454991</string>
<string name="facebook_client_token">6e90a23e0679c8d21b0888d5fa755535</string>
<string name="twitter_key">ui10vIggex2F043HnztYNuA3g</string>
<string name="twitter_secret">J8jvBBeJoZbVojbkWUrvsj0K0UUkuV69CqQ7CEobhJn6tvAKpQ</string>
<string name="twitter_key">JDd7XEXr0kLcx0KkkJGUbD4MQ</string>
<string name="twitter_secret">aq0eV4R1pqMK_AAeKRWnjPr7ErGMGgTPGgZJdm73WeRY-Kluws</string>
<string name="twitter_key2">F8t7PgspJ8Xl2k09ccqmnmynf</string>
<string name="twitter_secret2">aq0eV4R1pqMK_AAeKRWnjPr7ErGMGgTPGgZJdm73WeRY-Kluws</string>

4
common/src/main/res/values/strings.xml
View File

@@ -641,8 +641,8 @@
<string name="facebook_app_id">977019710454991</string>
<string name="facebook_client_token">6e90a23e0679c8d21b0888d5fa755535</string>
<string name="twitter_key">ui10vIggex2F043HnztYNuA3g</string>
<string name="twitter_secret">J8jvBBeJoZbVojbkWUrvsj0K0UUkuV69CqQ7CEobhJn6tvAKpQ</string>
<string name="twitter_key">JDd7XEXr0kLcx0KkkJGUbD4MQ</string>
<string name="twitter_secret">aq0eV4R1pqMK_AAeKRWnjPr7ErGMGgTPGgZJdm73WeRY-Kluws</string>
<string name="user_task_text1">Complete the new person\'s pre task</string>
<string name="user_task_text2">Unlock custom features</string>