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

Merge branch 'master' into dev_6.5.4_tmp

Browse Source 
# Conflicts:
#	common/src/main/java/com/yunbao/common/http/PDLiveApi.java
#	common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
#	common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java
#	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
#	live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
This commit is contained in:
zlzw
2023-08-04 15:41:11 +08:00
parent fe921e25bb 45c256cbbb
commit bf8d88608d
203 changed files with 9611 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
common/src/main/res/values-en-rUS/string.xml
View File

@@ -1254,5 +1254,39 @@ Limited ride And limited avatar frame</string>
<string name="main_anchor_live_notify_info">No matter where you are, I am waiting for you in the live broadcast room ~</string>
<string name="main_anchor_live_notify_live">Watch</string>
<string name="live_notify_settings">LiveNotify</string>
<string name="leveling_points">%s experience upgrade,%s receive rewards</string>
<string name="reach_the_top">You have reached the highest level!</string>
<string name="nothing_in_the_package_yet">There\'s nothing in the package yet</string>
<string name="custom_quantity">Custom quantity</string>
<string name="gift_wall">Gift wall</string>
<string name="has_been_lit">%s has been lit</string>
<string name="codex">Illustrated book</string>
<string name="unlit_icon">unlit</string>
<string name="all_service_champion">All service</string>
<string name="unlit_icon_hint">Love \\ \"ceremony \\\" at the beginning, \\ \"wall \\\" potential light temporarily no light</string>
<string name="lit_icon_hint">No unlit gifts yet</string>
<string name="instant_light">Instant light</string>
<string name="honorary_achievement">Honorary achievement</string>
<string name="lit_icon">Lit</string>
<string name="gift_wall_entrance">Gift Wall Entrance</string>
<string name="gift_wall_entrance1">Personal profile card, personal homepage, live streaming room header button, and by clickingView personal and person\'s profile cards and homepage.</string>
<string name="gift_wall_entrance2">Lighting up gifts</string>
<string name="gift_wall_entrance3">On the gift panel and click on the gift wall of the recipient to light up the gift for gifting, Illuminate the corresponding gift icon in the recipient\'s gift wall. Only diamond gifts Can light up gifts. When the gifts in the event are compared to the gifts in the gift wall and guidebook When the same, give the same gift, first light up the event, gift wall, and picture guide A gift for.</string>
<string name="gift_wall_entrance4">Named gift</string>
<string name="gift_wall_entrance5">Within each cycle, if a certain amount of diamonds are given as a single or cumulative gift Display the most gifts given to a recipient on the gift icon Gift person avatar, clicking on the avatar can also directly reach the giver\'s homepage of the named gift.</string>
<string name="gift_wall_entrance6">When the gift in the guidebook is the same as the gift in the gift wall, give the same gift Objects, first point the gift on the gift wall, and then light up the gift in the guidebook. Honor achievement</string>
<string name="gift_wall_entrance7">Medal of Achievement</string>
<string name="gift_wall_entrance8_1">Medal of achievement</string>
<string name="gift_wall_entrance8_2">Currently, there are three achievements, namely A cloud of good friends， A rich party, Very rich，</string>
<string name="gift_wall_entrance8_3">A cloud of good friends: When the number of gifts received reaches 20, 30, 50, 100When it comes to 200 models, light up the corresponding achievements separately;Rich and capriciou</string>
<string name="gift_wall_entrance8_4">A rich party: When the price of a single gift received exceeds 50000 diamonds, it is sufficient Illuminate the achievement;</string>
<string name="gift_wall_entrance8_5">Very rich: When receiving 100 gifts priced over 3000 diamonds, i.e This achievement can be illuminated.</string>
<string name="gift_wall_entrance8_6">The current user has a total of 4 achievements, namely being rich and capricious, sharing rain and dew, and giving gifts Gift machines, lighting masters.</string>
<string name="gift_wall_entrance8_7">Rich and capricious: Accumulated gifts worth 50K, 2M，10M, 100M, 300M, light up the corresponding achievements separately;</string>
<string name="gift_wall_entrance8_8">Rain and dew evenly: the cumulative Style quantity of gifts given to anchors reaches 10, 20, 50, 100，200, can achieve success;</string>
<string name="gift_wall_entrance8_9">gift machine: The cumulative number of gifts given reaches 200, 1000, 10K，100K，1M,light up the corresponding achievements separately;</string>
<string name="gift_wall_entrance8_10">lighting master: The number of unlocked Gift Walls has reached 10, 30, 50 At 100 and 200, light up the corresponding achievements separately.</string>
<string name="regular_bubble">rule</string>
</resources>