From 82c1d15ca5e1b54c327f9b89fb1089bb4c81db66 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Tue, 14 Nov 2023 16:05:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/dialog/CreateSudGamePopup.java | 20 +-- .../res/layout/sud_game_rule_bottom_popup.xml | 135 ++++++++--------- .../main/res/layout/sud_game_rule_popup.xml | 137 +++++++++--------- common/src/main/res/values-en-rUS/string.xml | 4 +- common/src/main/res/values-zh-rHK/strings.xml | 2 +- common/src/main/res/values-zh-rTW/strings.xml | 2 +- common/src/main/res/values-zh/strings.xml | 6 +- common/src/main/res/values/strings.xml | 6 +- live/src/main/res/values-en/strings.xml | 2 +- 9 files changed, 158 insertions(+), 156 deletions(-) diff --git a/common/src/main/java/com/yunbao/common/dialog/CreateSudGamePopup.java b/common/src/main/java/com/yunbao/common/dialog/CreateSudGamePopup.java index f345a4e6d..46dcb03fd 100644 --- a/common/src/main/java/com/yunbao/common/dialog/CreateSudGamePopup.java +++ b/common/src/main/java/com/yunbao/common/dialog/CreateSudGamePopup.java @@ -202,9 +202,9 @@ public class CreateSudGamePopup extends BottomPopupView { if (TextUtils.equals(currencyType, "3")) { if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { - ToastUtil.show("数量区间为100--5W"); + ToastUtil.show("貨幣數量区间为100--5W"); } else { - ToastUtil.show("The quantity range is 100 to 5 W"); + ToastUtil.show("The amount of money ranges from 100 to 5 W"); } } else { if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { @@ -219,18 +219,18 @@ public class CreateSudGamePopup extends BottomPopupView { if (TextUtils.equals(currencyType, "3")) { if (sill.length() > 6) { if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { - ToastUtil.show("数量区间为100--5W"); + ToastUtil.show("貨幣數量区间为100--5W"); } else { - ToastUtil.show("The quantity range is 100 to 5 W"); + ToastUtil.show("The amount of money ranges from 100 to 5 W"); } return; } else { int sillNumber = Integer.parseInt(sill); if (sillNumber < 100 || sillNumber > 50000) { if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { - ToastUtil.show("数量区间为100--5W"); + ToastUtil.show("貨幣數量区间为100--5W"); } else { - ToastUtil.show("The quantity range is 100 to 5 W"); + ToastUtil.show("The amount of money ranges from 100 to 5 W"); } return; } @@ -246,18 +246,18 @@ public class CreateSudGamePopup extends BottomPopupView { } else { if (sill.length() > 4) { if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { - ToastUtil.show("星幣數量區間為[10 - 1000]"); + ToastUtil.show("貨幣數量区间为[10 - 1000]"); } else { - ToastUtil.show("The number range of star coins is [10-1000]"); + ToastUtil.show("Currency quantity range [10-1000]"); } return; } else { int sillNumber = Integer.parseInt(sill); if (sillNumber < 10 || sillNumber > 1000) { if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { - ToastUtil.show("数量区间为10~1000"); + ToastUtil.show("貨幣數量区间为[10 - 1000]"); } else { - ToastUtil.show("The quantity range is 10 to 1000"); + ToastUtil.show("Currency quantity range [10-1000]]"); } return; } diff --git a/common/src/main/res/layout/sud_game_rule_bottom_popup.xml b/common/src/main/res/layout/sud_game_rule_bottom_popup.xml index b6f79227c..93b16e905 100644 --- a/common/src/main/res/layout/sud_game_rule_bottom_popup.xml +++ b/common/src/main/res/layout/sud_game_rule_bottom_popup.xml @@ -11,82 +11,83 @@ android:layout_height="wrap_content" android:orientation="vertical"> - + android:layout_height="wrap_content"> - - - + android:layout_marginTop="32dp" + android:orientation="vertical"> - + - + - + - + + + + + + + + - - + android:layout_height="wrap_content"> - - - + android:layout_marginTop="32dp" + android:orientation="vertical"> - + - + - + - + + + + + + + + - "Today " 1. Interactive games are a new section provided by PDLIVE for users, who can participate in the game section on the homepage or in the live room; 2. Currently, we have launched \'GoBang\',\' Bumper car \',\' Flying Chess\', \'Minesweeping\', \'Dart Master\', and \'Monster Eliminating\'. We will provide more game types in the future. Stay tuned; - 3. Users can customize the game threshold, which must be between 100 to 50000 gold beans or 10 to 1000 star coins, and the amount must be a multiple of 10; - 4. At the beginning of the game, chips from participating users will be collected. After the game ends, 10% of the chips will be collected as tickets, and all remaining chips will be given to the winning users.In a draw, the corresponding chips will be deducted from the tickets and returned to the users; + 3.Users can customize the game threshold, which must be between 100 to 50000 gold beans , and the amount must be a multiple of 10; + 4.At the beginning of the game, chips from participating users will be collected. After the game ends, 10% of the chips will be collected as tickets, and all remaining chips will be given to the winning users.In a draw, the corresponding chips will be deducted from the tickets and returned to the users; 5. The final interpretation right of the event belongs to PDLIVE. Currency Currency: diff --git a/common/src/main/res/values-zh-rHK/strings.xml b/common/src/main/res/values-zh-rHK/strings.xml index 4b84680ec..9313068f9 100644 --- a/common/src/main/res/values-zh-rHK/strings.xml +++ b/common/src/main/res/values-zh-rHK/strings.xml @@ -1373,7 +1373,7 @@ 1、互動遊戲是PDLIVE為用戶提供的全新板塊，用戶可以在首頁【遊戲專區】或直播間內參與； 2、目前已上線【五子棋】、【碰碰我最強】、【飛行棋】、【扫雷】、【飞镖达人】、【怪兽消消乐】，後續將會提供更多遊戲種類，敬請期待； 3、用戶可自定義設定遊戲門檻，要求在100~50000金豆之間，數額必須為10的倍數； - 4、遊戲開始時將會收取參與遊戲用戶的門檻金豆，在遊戲結束後，將收取10%的金豆作為門票，剩餘金豆將全部給予勝利用戶，平局時將會扣除相應金豆门票後返還給用戶； + 4、 遊戲開始時將會收取參與遊戲用戶的籌碼，在遊戲結束後，將收取10%的籌碼作為門票，剩餘籌碼將全部給予勝利用戶，平局時將會扣除相應籌碼门票後返還給用戶； 5、活動最終解釋權歸PDLIVE所有。 貨幣 貨幣： diff --git a/common/src/main/res/values-zh-rTW/strings.xml b/common/src/main/res/values-zh-rTW/strings.xml index 4223f8ce8..4a2e232d9 100644 --- a/common/src/main/res/values-zh-rTW/strings.xml +++ b/common/src/main/res/values-zh-rTW/strings.xml @@ -1372,7 +1372,7 @@ 1、互動遊戲是PDLIVE為用戶提供的全新板塊，用戶可以在首頁【遊戲專區】或直播間內參與； 2、目前已上線【五子棋】、【碰碰我最強】、【飛行棋】、【扫雷】、【飞镖达人】、【怪兽消消乐】，後續將會提供更多遊戲種類，敬請期待； 3、用戶可自定義設定遊戲門檻，要求在100~50000金豆之間，數額必須為10的倍數； - 4、遊戲開始時將會收取參與遊戲用戶的門檻金豆，在遊戲結束後，將收取10%的金豆作為門票，剩餘金豆將全部給予勝利用戶，平局時將會扣除相應金豆门票後返還給用戶； + 4、 遊戲開始時將會收取參與遊戲用戶的籌碼，在遊戲結束後，將收取10%的籌碼作為門票，剩餘籌碼將全部給予勝利用戶，平局時將會扣除相應籌碼门票後返還給用戶； 5、活動最終解釋權歸PDLIVE所有。 貨幣 貨幣： diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml index 036162336..055f35953 100644 --- a/common/src/main/res/values-zh/strings.xml +++ b/common/src/main/res/values-zh/strings.xml @@ -1369,10 +1369,10 @@ 對局用戶 暫無記錄~ 今日 - 1、互動遊戲是PDLIVE為用戶提供的全新板塊，用戶可以在首頁【遊戲專區】或直播間內參與； + 1、1. 互動遊戲是PDLIVE為用戶提供的全新板塊，用戶可以在首頁【遊戲專區】或直播間內參與； 2、目前已上線【五子棋】、【碰碰我最強】、【飛行棋】、【扫雷】、【飞镖达人】、【怪兽消消乐】，後續將會提供更多遊戲種類，敬請期待； - 3、用戶可自定義設定遊戲門檻，要求在100~50000金豆之間，數額必須為10的倍數； - 4、遊戲開始時將會收取參與遊戲用戶的門檻金豆，在遊戲結束後，將收取10%的金豆作為門票，剩餘金豆將全部給予勝利用戶，平局時將會扣除相應金豆门票後返還給用戶； + 3、 用戶可自定義設定遊戲門檻，要求在100~50000金豆之間，數額必須為10的倍數； + 4、 遊戲開始時將會收取參與遊戲用戶的籌碼，在遊戲結束後，將收取10%的籌碼作為門票，剩餘籌碼將全部給予勝利用戶，平局時將會扣除相應籌碼门票後返還給用戶； 5、活動最終解釋權歸PDLIVE所有。 貨幣 貨幣： diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 9541181a7..1d9a1b650 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -1382,9 +1382,9 @@ Limited ride And limited avatar frame "≤7 days " ≤ 30 days 1. Interactive games are a new section provided by PDLIVE for users, who can participate in the game section on the homepage or in the live room; - 2. Currently, we have launched \'GoBang\',\' Bumper car \',\' Flying Chess\', \'Minesweeping\', \'Dart Master\', and \'Monster Eliminating\'. We will provide more game types in the future. Stay tuned; - 3. Users can customize the game threshold, which must be between 100 to 50000 gold beans or 10 to 1000 star coins, and the amount must be a multiple of 10; - 4. At the beginning of the game, chips from participating users will be collected. After the game ends, 10% of the chips will be collected as tickets, and all remaining chips will be given to the winning users.In a draw, the corresponding chips will be deducted from the tickets and returned to the users; + 2.Currently, we have launched \'GoBang\',\' Bumper car \',\' Flying Chess\', \'Minesweeping\', \'Dart Master\', and \'Monster Eliminating\'. We will provide more game types in the future. Stay tuned; + 3.. Users can customize the game threshold, which must be between 100 to 50000 gold beans , and the amount must be a multiple of 10; + 4.At the beginning of the game, chips from participating users will be collected. After the game ends, 10% of the chips will be collected as tickets, and all remaining chips will be given to the winning users.In a draw, the corresponding chips will be deducted from the tickets and returned to the users; 5. The final interpretation right of the event belongs to PDLIVE. 0-100 coins 100-500 coins diff --git a/live/src/main/res/values-en/strings.xml b/live/src/main/res/values-en/strings.xml index f7ae4556c..afbd1d15e 100644 --- a/live/src/main/res/values-en/strings.xml +++ b/live/src/main/res/values-en/strings.xml @@ -35,7 +35,7 @@ Historical data can be viewed in the anchor center * Non-real-time calculation of data - Be TA\'s guardian, escort for TA! + Guardian, always be there for your anchor~ return Like Open aristocracy