diff --git a/FileConfig.json b/FileConfig.json index dc053ad..1f16fdf 100644 --- a/FileConfig.json +++ b/FileConfig.json @@ -25,10 +25,10 @@ "Base/Interface.nut" ], "ProjectScript": { - "新成就系统": { + "成就系统": { "Private": true, "Script": [ - "Project/Achievement_New/Achievement_New.nut" + "Project/Achievement/Achievement.nut" ], "info": { "ProjectAuthor": "官方 (期限:月)", @@ -37,10 +37,10 @@ "ImageMini": "http://49.234.27.222:8651/dps/download2/Image:chengjiu.png" } }, - "成就系统": { + "新成就系统": { "Private": true, "Script": [ - "Project/Achievement/Achievement.nut" + "Project/Achievement_New/Achievement_New.nut" ], "info": { "ProjectAuthor": "官方 (期限:月)", diff --git a/Project/Achievement_New/Achievement_New.nut b/Project/Achievement_New/Achievement_New.nut index e0e5ec2..0844227 100644 --- a/Project/Achievement_New/Achievement_New.nut +++ b/Project/Achievement_New/Achievement_New.nut @@ -184,9 +184,11 @@ class AchievementNC_Item { function TopShow() { if (IMouse.GetXPos() > X && IMouse.GetXPos()< X + 236 && IMouse.GetYPos() > Y && IMouse.GetYPos()< Y + 66) { - L_sq_DrawWindow(X - 8, Y - 4 - 66, 236, 50, "interface/lenheartwindowcommon.img", 97, 11, 12, 11, 13); - //绘制成就描述 - L_sq_DrawCode_Ex(Info.Explain, X, Y - 4 - 66 + 8, sq_RGBA(174, 174, 174, 255), 0, 1); + if (IMouse.GetYPos() >= Parent.Y + 110 && IMouse.GetYPos() <= Parent.Y + 496) { + L_sq_DrawWindow(X - 8, Y - 4 - 66, 236, 50, "interface/lenheartwindowcommon.img", 97, 11, 12, 11, 13); + //绘制成就描述 + L_sq_DrawCode_Ex(Info.Explain, X, Y - 4 - 66 + 8, sq_RGBA(174, 174, 174, 255), 0, 1); + } } } @@ -250,7 +252,10 @@ class AchievementNC_MerchandiseItem { BuyButton.Width = 50; BuyButton.SetTextOffset(-4, 1); BuyButton.OnClick = function() { - + Parent.SendPackEx({ + op = 20093025, + itemPos = Idx + }); }.bindenv(this); BuyButton.SetCallBackFunc(function(Button) { Button.X = (X + 174).tointeger(); @@ -342,7 +347,7 @@ class AchievementNC extends LenheartNewUI_Windows { // NoWindow = true; //是否可见 - Visible = false; + // Visible = false; //脚本数据 ScriptInfo = null; @@ -459,7 +464,6 @@ class AchievementNC extends LenheartNewUI_Windows { ItemList.append(Item); } }.bindenv(this)); - QueryShopInfo(); } @@ -492,7 +496,7 @@ class AchievementNC extends LenheartNewUI_Windows { function InitTypeButton() { for (local i = 0; i< 6; i++) { - local Button = Achievement_New_TypeButton(171, 50, "achievement/typebutton.img", 0, i, Y + 108, Y + 424) + local Button = Achievement_New_TypeButton(171, 50, "achievement/typebutton.img", i, i, Y + 108, Y + 424) Button.SetCallBackFunc(function(Button) { Button.X = X + 28; Button.Y = Y + 110 + 60 * Button.Pos - (TypeButtonScrollRate * TypeButtonScrollValue).tointeger();