diff --git a/Project/Achievement_New/Achievement_New.nut b/Project/Achievement_New/Achievement_New.nut index fceb08b..2905876 100644 --- a/Project/Achievement_New/Achievement_New.nut +++ b/Project/Achievement_New/Achievement_New.nut @@ -126,20 +126,36 @@ class AchievementNC_Item { Info = null; +<<<<<<< HEAD SuccessButton = null; +======= +>>>>>>> b4e775bd708d4e7dbac90434e14b1df50efcc8ec constructor(Window, Idx, Info) { Parent = Window; Img = Window.Img["widget"]; this.Idx = Idx; this.Info = Info; +<<<<<<< HEAD //完成按钮 SuccessButton = Achievement_New_ItemButton(42 + 85 + 85, 420, 15, "完成"); +======= + this.Info = { + Name = "测试的成就名称", + Desc = "0/100", + Exp = sq_getRandom(1, 99).tostring() + }; + + + //完成按钮 + local SuccessButton = Achievement_New_ItemButton(42 + 85 + 85, 420, 15, "完成"); +>>>>>>> b4e775bd708d4e7dbac90434e14b1df50efcc8ec SuccessButton.DWidth = -5; SuccessButton.Width = 50; SuccessButton.SetTextOffset(-4, 1); SuccessButton.OnClick = function() { +<<<<<<< HEAD Parent.SendPackEx({ op = 20093005, cjid = Parent.CurrentTypePage, @@ -149,10 +165,18 @@ class AchievementNC_Item { SuccessButton.SetCallBackFunc(function(Button) { Button.X = (X + 174).tointeger(); Button.Y = (Y + 30).tointeger(); +======= + + }.bindenv(this); + SuccessButton.SetCallBackFunc(function(Button) { + Button.X = (X + 170).tointeger(); + Button.Y = (Y + 20).tointeger(); +>>>>>>> b4e775bd708d4e7dbac90434e14b1df50efcc8ec Button.CutPosY_Start = Parent.Y + 110; Button.CutPosY_End = Parent.Y + 496; }.bindenv(this)); Parent.ItemButtonList.append(SuccessButton); +<<<<<<< HEAD SetInfo(Info ? Info : { Name = "测试的成就名称", @@ -166,6 +190,8 @@ class AchievementNC_Item { function SetInfo(Info) { this.Info = Info; if (this.Info.IsSuccess< 2) SuccessButton.State = 8; +======= +>>>>>>> b4e775bd708d4e7dbac90434e14b1df50efcc8ec } function Show() { @@ -182,6 +208,7 @@ class AchievementNC_Item { L_sq_DrawCode(Info.Desc, X + 60, Y + 30, sq_RGBA(174, 174, 174, 255), 0, 1); } +<<<<<<< HEAD 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); @@ -332,6 +359,13 @@ class AchievementNC_MerchandiseItem { X = (Parent.X + 235 + (Idx % 2 * 248)).tointeger(); Y = (Parent.Y - Parent.ItemScrollRate * Parent.ItemScrollValue + 121 + (Idx / 2 * 72)).tointeger(); } +======= + function Proc() { + X = Parent.X + 235 + (Idx % 2 * 248); + Y = Parent.Y - Parent.ItemScrollRate * Parent.ItemScrollValue + 121 + (Idx / 2 * 72); + } + +>>>>>>> b4e775bd708d4e7dbac90434e14b1df50efcc8ec } class AchievementNC extends LenheartNewUI_Windows { @@ -342,10 +376,16 @@ class AchievementNC extends LenheartNewUI_Windows { // NoWindow = true; //是否可见 +<<<<<<< HEAD Visible = false; //脚本数据 ScriptInfo = null; +======= + // Visible = false; + + EtcInfo = null; +>>>>>>> b4e775bd708d4e7dbac90434e14b1df50efcc8ec //图像对象 Img = null; @@ -372,6 +412,7 @@ class AchievementNC extends LenheartNewUI_Windows { ItemScrollBar = null; //项目滚轮值 ItemScrollRate = 0; +<<<<<<< HEAD ItemScrollValue = 400; //查询成就状态 @@ -387,6 +428,9 @@ class AchievementNC extends LenheartNewUI_Windows { op = 20093021 }); } +======= + ItemScrollValue = 100; +>>>>>>> b4e775bd708d4e7dbac90434e14b1df50efcc8ec constructor(gObjectId, gX, gY, gWidth, gHeight, gTitleH) { Childrens = []; @@ -394,6 +438,7 @@ class AchievementNC extends LenheartNewUI_Windows { ItemButtonList = []; LenheartNewUI_Windows.constructor(gObjectId, gX, gY, gWidth, gHeight, gTitleH); +<<<<<<< HEAD //给一个等级的默认值 Level = { lv = 1, @@ -403,12 +448,23 @@ class AchievementNC extends LenheartNewUI_Windows { //读取pvf数据 InitScriptData(); +======= + //TODO + Level = { + lv = 15, + exp = 100, + maxexp = 200 + } + + +>>>>>>> b4e775bd708d4e7dbac90434e14b1df50efcc8ec //构造Img InitImg(); //构造类型按钮 InitTypeButton(); //构造商店按钮 InitShopButton(); +<<<<<<< HEAD //构造组件按钮 InitWidgetButton(); //构造项目 @@ -488,6 +544,10 @@ class AchievementNC extends LenheartNewUI_Windows { } } }.bindenv(this)); +======= + //构造项目 + InitItem(); +>>>>>>> b4e775bd708d4e7dbac90434e14b1df50efcc8ec } function InitTypeButton() { @@ -498,6 +558,7 @@ class AchievementNC extends LenheartNewUI_Windows { Button.Y = Y + 110 + 60 * Button.Pos - (TypeButtonScrollRate * TypeButtonScrollValue).tointeger(); }.bindenv(this)); Button.OnClickEx = function(Button) { +<<<<<<< HEAD //将其他的选中状态取消选中自己 foreach(Btn in TypeButton) { Btn.isSelect = false; @@ -509,6 +570,13 @@ class AchievementNC extends LenheartNewUI_Windows { ItemScrollBar.Reset(); //查询 QueryTheAchievementStatus(); +======= + foreach(Btn in TypeButton) { + Btn.isSelect = false; + Button.isSelect = true; + } + CurrentTypePage = Button.Pos; +>>>>>>> b4e775bd708d4e7dbac90434e14b1df50efcc8ec }.bindenv(this); TypeButton.append(Button); } @@ -521,6 +589,7 @@ class AchievementNC extends LenheartNewUI_Windows { }.bindenv(this)); } +<<<<<<< HEAD function InitShopButton() { //商店按钮 @@ -531,6 +600,13 @@ class AchievementNC extends LenheartNewUI_Windows { Btn.isSelect = false; } QueryShopInfo(); +======= + function InitShopButton() { + //关闭按钮 + local ShopButton = LenheartNewUI_BaseButton(34, 435, 160, 61, "achievement/shopbutton.img", 0); + ShopButton.OnClick = function() { + CurrentTypePage = -99; +>>>>>>> b4e775bd708d4e7dbac90434e14b1df50efcc8ec }.bindenv(this); Childrens.append(ShopButton); @@ -542,6 +618,7 @@ class AchievementNC extends LenheartNewUI_Windows { }.bindenv(this)); } +<<<<<<< HEAD function InitWidgetButton() { //关闭按钮 local CloseButton = LenheartNewUI_BaseButton(734, 0, 11, 12, "interface/lenheartwindowcommon.img", 276); @@ -551,6 +628,8 @@ class AchievementNC extends LenheartNewUI_Windows { Childrens.append(CloseButton); } +======= +>>>>>>> b4e775bd708d4e7dbac90434e14b1df50efcc8ec function InitImg() { Img = {}; Img["background"] <- Rindro_Image("achievement/background.img"); @@ -578,11 +657,21 @@ class AchievementNC extends LenheartNewUI_Windows { //绘制常规页面 if (CurrentTypePage != -99) { +<<<<<<< HEAD //上背景框 Img["widget"].DrawPng(0, X + 220, Y + 45); //经验 Img["widget"].DrawPng(2, X + 223, Y + 86); setClip(X + 223, Y + 86, X + 229 + (Level.exp.tofloat() / Level.maxexp.tofloat() * 463).tointeger(), Y + 90 + 6); +======= + //上下背景框 + Img["widget"].DrawPng(0, X + 220, Y + 45); + Img["widget"].DrawPng(1, X + 220, Y + 109); + + //经验 + Img["widget"].DrawPng(2, X + 223, Y + 86); + setClip(X + 223, Y + 86, X + 229 + 463 - (Level.exp.tofloat() / Level.maxexp.tofloat() * 463).tointeger(), Y + 90 + 6); +>>>>>>> b4e775bd708d4e7dbac90434e14b1df50efcc8ec Img["widget"].DrawPng(3, X + 229, Y + 90); releaseClip(); //裁切结束 @@ -597,14 +686,20 @@ class AchievementNC extends LenheartNewUI_Windows { DrawNum(format("%02d", Level.lv), X + 274, Y + 63); } +<<<<<<< HEAD //下背景框 Img["widget"].DrawPng(1, X + 220, Y + 109); +======= +>>>>>>> b4e775bd708d4e7dbac90434e14b1df50efcc8ec } +<<<<<<< HEAD +======= +>>>>>>> b4e775bd708d4e7dbac90434e14b1df50efcc8ec function Show(obj) { DrawMain(obj); @@ -627,7 +722,10 @@ class AchievementNC extends LenheartNewUI_Windows { foreach(Item in ItemList) { Item.Show(); } +<<<<<<< HEAD //项目的按钮层 +======= +>>>>>>> b4e775bd708d4e7dbac90434e14b1df50efcc8ec foreach(Window in ItemButtonList) { if (Window.CallBackFunc) Window.CallBackFunc(Window); if (Window.Visible) { @@ -636,12 +734,18 @@ class AchievementNC extends LenheartNewUI_Windows { } } releaseClip(); //裁切结束 +<<<<<<< HEAD //用来显示悬停之类的顶层信息 foreach(Item in ItemList) { Item.TopShow(); } } +======= + } + + +>>>>>>> b4e775bd708d4e7dbac90434e14b1df50efcc8ec RegisFlag = false; //逻辑入口 function Proc(obj) { @@ -714,7 +818,10 @@ class AchievementNC extends LenheartNewUI_Windows { if (Flag) TypeButtonScrollBar.DoStep(-1); if (!Flag) TypeButtonScrollBar.DoStep(1); } +<<<<<<< HEAD +======= +>>>>>>> b4e775bd708d4e7dbac90434e14b1df50efcc8ec //右侧的滚动条判定 if (MousePos_X > (X + 221) && MousePos_X<(X + 733) && MousePos_Y > (Y + 110) && MousePos_Y<(Y + 496)) { if (Flag) ItemScrollBar.DoStep(-1); @@ -730,12 +837,17 @@ class AchievementNC extends LenheartNewUI_Windows { } function OpenCallBack() { +<<<<<<< HEAD Visible = true; //查询 QueryTheAchievementStatus(); } +======= + + } +>>>>>>> b4e775bd708d4e7dbac90434e14b1df50efcc8ec } L_Windows_List <- [];