From c21a4495014840ff37caae1b73ae6f7f342a2c4b Mon Sep 17 00:00:00 2001
From: lenheart <947330670@qq.com>
Date: Wed, 11 Jun 2025 09:51:28 +0800
Subject: [PATCH] 11

---
 Project/Achievement_New/Achievement_New.nut | 23 ++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/Project/Achievement_New/Achievement_New.nut b/Project/Achievement_New/Achievement_New.nut
index 2d1b4f5..b40bcf9 100644
--- a/Project/Achievement_New/Achievement_New.nut
+++ b/Project/Achievement_New/Achievement_New.nut
@@ -138,7 +138,6 @@ class AchievementNC_Item {
         SuccessButton = Achievement_New_ItemButton(42 + 85 + 85, 420, 15, "完成");
         SuccessButton.DWidth = -5;
         SuccessButton.Width = 50;
-        SuccessButton.SetTextOffset(-4, 1);
         SuccessButton.OnClick = function() {
             Parent.SendPackEx({
                 op = 20093005,
@@ -165,7 +164,19 @@ class AchievementNC_Item {
 
     function SetInfo(Info) {
         this.Info = Info;
-        if (this.Info.IsSuccess< 2) SuccessButton.State = 8;
+        if (this.Info.IsSuccess == 0) {
+            SuccessButton.State = 8;
+            SuccessButton.TextStr = "未达成"
+            SuccessButton.SetTextOffset(-11, 2);
+        } else if (this.Info.IsSuccess == 1) {
+            SuccessButton.State = 8;
+            SuccessButton.TextStr = "已完成"
+            SuccessButton.SetTextOffset(-11, 2);
+            SuccessButton.Visible = false;
+        } else if (this.Info.IsSuccess == 2) {
+            SuccessButton.TextStr = "完成"
+            SuccessButton.SetTextOffset(-4, 1);
+        }
     }
 
     function Show() {
@@ -440,7 +451,8 @@ class AchievementNC extends LenheartNewUI_Windows {
                 });
                 ItemList.append(Item);
             }
-            ItemScrollValue = ((ItemList.len() - 10) / 2 * 71).tointeger();
+            if (Jso.rawin("scroll_value")) ItemScrollValue = Jso.scroll_value;
+            // ItemScrollValue = ((ItemList.len() - 10) / 2 * 71).tointeger();
         }.bindenv(this));
 
 
@@ -463,6 +475,7 @@ class AchievementNC extends LenheartNewUI_Windows {
                     NeedItemCount2 = obj.reItemNum2,
                 });
                 ItemList.append(Item);
+                if (Jso.rawin("scroll_value")) ItemScrollValue = Jso.scroll_value;
             }
         }.bindenv(this));
     }
@@ -590,6 +603,10 @@ class AchievementNC extends LenheartNewUI_Windows {
             setClip(X + 223, Y + 86, X + 229 + (Level.exp.tofloat() / Level.maxexp.tofloat() * 463).tointeger(), Y + 90 + 6);
             Img["widget"].DrawPng(3, X + 229, Y + 90);
             releaseClip(); //裁切结束
+            //绘制经验值
+            local ExpStr = Level.exp + "/" + Level.maxexp;
+            L_sq_DrawCode(ExpStr, X - LenheartTextClass.GetStringLength(ExpStr) / 2 + 678, Y + 74, sq_RGBA(230, 200, 155, 255), 0, 1);
+
 
             //旗帜
             Img["widget"].DrawPng(4, X + 226, Y + 55);