From a18b310ce3007b6436735f04309c50297d63c585 Mon Sep 17 00:00:00 2001
From: huangjian <huangjian@xuanyinyy.com>
Date: Mon, 27 Feb 2023 17:53:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=BA=E5=AE=9D=E7=B2=BE=E7=81=B5:=E7=B2=BE?=
 =?UTF-8?q?=E7=81=B5=E8=AF=95=E7=82=BC=E6=8F=90=E7=A4=BA=E6=96=87=E6=A1=88?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mango/moshen/treasurefairy/FairyViewModel.kt | 8 ++++++--
 .../mango/moshen/treasurefairy/TestFairyRecordAdapter.kt  | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/mango/moshen/treasurefairy/FairyViewModel.kt b/app/src/main/java/com/mango/moshen/treasurefairy/FairyViewModel.kt
index 3cbe38f63..d302aca92 100644
--- a/app/src/main/java/com/mango/moshen/treasurefairy/FairyViewModel.kt
+++ b/app/src/main/java/com/mango/moshen/treasurefairy/FairyViewModel.kt
@@ -240,10 +240,10 @@ class FairyViewModel : BaseViewModel() {
         val array = _compoundFairyInfosLiveData.value ?: SparseArray()
 
         if (array.size() >= 3) {
-            "数量足够了,快去试炼吧!".toast()
+            "试炼炉已满!".toast()
         } else {
             if (fairyInfo.elfNum == 0) {
-                "精灵数量不足".toast()
+                "你还未捕捉到该精灵".toast()
                 return
             }
             array.put(nextIndex(array), fairyInfo)
@@ -290,6 +290,10 @@ class FairyViewModel : BaseViewModel() {
                 compoundFairyInfos.put(nextIndex(compoundFairyInfos), it)
             }
         }
+        if (needNum == 3) {
+            "精灵数量不足".toast()
+            return
+        }
         _compoundFairyInfosLiveData.value = compoundFairyInfos
     }
 
diff --git a/app/src/main/java/com/mango/moshen/treasurefairy/TestFairyRecordAdapter.kt b/app/src/main/java/com/mango/moshen/treasurefairy/TestFairyRecordAdapter.kt
index ac8a007f9..5f69d9f59 100644
--- a/app/src/main/java/com/mango/moshen/treasurefairy/TestFairyRecordAdapter.kt
+++ b/app/src/main/java/com/mango/moshen/treasurefairy/TestFairyRecordAdapter.kt
@@ -21,8 +21,8 @@ class TestFairyRecordAdapter :
         helper.setText(R.id.tv_prize_name, item.elfName)
         helper.setText(
             R.id.tv_prize_type, when (item.elfLevel) {
-                1 -> "史诗试炼"
-                else -> "传说森林"
+                2 -> "史诗试炼"
+                else -> "传说试炼"
             }
         )