Merge branch 'dev_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
#	config.gradle
This commit is contained in:
2024-01-05 14:00:39 +08:00
185 changed files with 5907 additions and 710 deletions

View File

@@ -411,7 +411,7 @@
<string name="live_link_mic_cannot_link_2">Connecting wheat is currently in progress~</string>
<string name="live_link_mic_cannot_pk">You are already in PK</string>
<string name="live_link_mic_pk_1">We</string>
<string name="live_link_mic_pk_2">Other party</string>
<string name="live_link_mic_pk_2">Opponent</string>
<string name="live_coin_not_enough">The balance is insufficient. Do you want to recharge it?</string>
<string name="live_online_anchor">Current online anchor</string>
<string name="link_mic_play_game">The other anchor is in the game</string>
@@ -1393,8 +1393,37 @@ Limited ride And limited avatar frame</string>
<string name="conversion_quantity_need_of_use1">1.One star coin can be exchanged for one ticket. You can customize the exchange quantity according to your needs. Once the ticket is exchanged, it cannot be revoked. Please confirm in advance;</string>
<string name="conversion_quantity_need_of_use2">2.One ticket can be used to watch one episode of a short drama. After successful redemption, you can return to the viewing page and use the ticket to continue watching the movie;</string>
<string name="conversion_quantity_need_of_use3">3.Ticket prohibit illegal activities such as offline trading and acquisitions, and PDLIVE will crack down severely on various profit-making trading activities.</string>
<string name="rule_of_war_hint1">1. When the BattlePass is activated, completing the BattlePass task and increasing the BattlePass level can earn a large amount of level rewards.\n</string>
<string name="rule_of_war_hint2">2. All users can unlock the regular version for free, and when the BattlePass is activated, they can upgrade to the elite version and the luxury version at any time, and receive rich additional exclusive rewards.\n</string>
<string name="pay_cancel">Payment cancellation</string>
<string name="pay_suc">Payment successful</string>
<string name="pay_fail">Payment failed</string>
<string name="upgrade_elite">Upgrade Elite/Luxury BattlePass</string>
<string name="upgrade_elite_type1">Upgrade Elite BattlePass</string>
<string name="upgrade_elite_type2">Upgrade Luxury BattlePass</string>
<string name="upgrade_elite2">You can receive a massive amount of points and exchange more rewards</string>
<string name="rule_of_war_hint3">3.三種戰令都會獎勵積分,可在兌換商城中兌換心 儀的寶貝,部分寶貝兌換有戰令等級要求或兌換數 量限制。</string>
<string name="rule_of_war_hint4">4.每日任務0點刷新未完成任務進度不再累計 每季任務將會在新一季戰令開啟時刷新。</string>
<string name="rule_of_war_hint5">5.任務達成時需主動領取經驗,未领取經驗將會在 任務刷新時自动领取。</string>
<string name="rule_of_war_hint6">6.活動最終解釋權歸PDLIVE所有。</string>
<string name="more_integral">More points</string>
<string name="gift_overvalue">Gifts worth over 200%</string>
<string name="gift_overvalue3">Gifts worth over 300%</string>
<string name="unlock_more_gifts">More Rare outfits</string>
<string name="unlock_more_gifts2">More Collectible outfits</string>
<string name="has_reached_level_after_opening">After openedthe rewards that have reached will be automatically unlocked!</string>
<string name="order_level">My level</string>
<string name="buying_experience_point">Purchase EXP value</string>
<string name="buying_experience">Buy</string>
<string name="this_activity_is_over">This activity has ended. Please collect the unclaimed rewards as soon as possible.Points can be reserved for future use</string>
<string name="exchange_particulars">Exchange Details</string>
<string name="point_exchange">%s(points) exchange</string>
<string name="point_exchange2">exchange</string>
<string name="point_exchange_number">Quantity</string>
<string name="battlepass_exchange_buy_integral">Insufficient points</string>
<string name="battlepass_exchange_buy_max">The quantity of goods exchanged has reached the upper limit</string>
<string name="battlepass_zl_get">Successfully opened</string>
<string name="battlepass_buy_max">You have purchased the BattlePass</string>
</resources>