Base/UI/Lenheart_UI_Class.nut

@@ -494,7 +494,7 @@ function CheackMouseInOldWindows() {
                     }
                 } else {
                     //原生窗口里的按钮
-                    if (Flag == 0x184D174) return true;
+                    if(Flag == 0x184D174)return true;
                     return false;
                 }
             }
@@ -1341,19 +1341,6 @@ class Yosin_DragButton extends LenheartNewUI_CommonUi {
             OnChange(CurrentScrollValue);
         }
     }
-
-    //重置
-    function Reset() {
-        Move_Value = 0;
-        CurrentMovePosY = 0;
-        Localtion_Y = BasePos.y;
-        // 更新并回调滚动值
-        if (OnChange) {
-            local Rate = Move_Value.tofloat() / Max_Move_Value.tofloat();
-            CurrentScrollValue = format("%.2f", Rate).tofloat();
-            OnChange(CurrentScrollValue);
-        }
-    }
 }
 
 class Yosin_ScrollBar {
@@ -1422,9 +1409,4 @@ class Yosin_ScrollBar {
     function SetStep(value) {
         Step = value;
     }
-
-    function Reset() {
-        ScrollButton.Reset();
-    }
-
 }

Base/_Tool/BaseTool_Class.nut

@@ -114,13 +114,6 @@ class KeyPressNB {
 //基础工具类
 class Rindro_BaseToolClass {
 
-    function GetItemNameById(ItemId) {
-        local ItemObject = L_sq_GetItem(ItemId);
-        local NamePointer = L_sq_RA(ItemObject + 0x20);
-        local ItemName = NativePointer(L_sq_I2P(NamePointer)).readUnicodeString();
-        return ItemName;
-    }
-
     function SendPack(T) {
         local str = Json.Encode(T);
         L_sq_SendPackType(130);
@@ -135,10 +128,6 @@ class Rindro_BaseToolClass {
         L_sq_SendPack();
     }
 
-    function RegisterPack(Id, CallBack) {
-        Pack_Control.rawset(Id, CallBack);
-    }
-
     //绘制简易静态Ani					// obj --  ani路径  --  X   --  Y  --  第几帧  --  ani名字
     function T_DrawStayAni(obj, aniFileName, x, y, index, aniname) {
         local SelectAni = obj.getVar().GetAnimationMap(aniname, aniFileName);

FileConfig.json

@@ -28,7 +28,7 @@
         "成就系统": {
             "Private": true,
             "Script": [
-                "Project/Achievement_New/Achievement_New.nut"
+                "Project/Achievement/Achievement.nut"
             ],
             "info": {
                 "ProjectAuthor": "官方  （期限:月）",

Project/Achievement_New/Achievement_New.nut

@@ -126,21 +126,11 @@ 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",
@@ -150,48 +140,19 @@ class AchievementNC_Item {
 
         //完成按钮
         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,
-                id = this.Info.Id
-            });
-        }.bindenv(this);
-        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 = "测试的成就名称",
-            Desc = "0/100",
-            Explain = "默认描述",
-            Exp = sq_getRandom(1, 99).tostring(),
-            IsSuccess = 0
-        });
-    }
-
-    function SetInfo(Info) {
-        this.Info = Info;
-        if (this.Info.IsSuccess< 2) SuccessButton.State = 8;
-=======
->>>>>>> b4e775bd708d4e7dbac90434e14b1df50efcc8ec
     }
 
     function Show() {
@@ -208,164 +169,11 @@ 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);
-            //绘制成就描述
-            L_sq_DrawCode_Ex(Info.Explain, X, Y - 4 - 66 + 8, sq_RGBA(174, 174, 174, 255), 0, 1);
-        }
-    }
-
-    //高级绘制文字(带换行)
-    function L_sq_DrawCode_Ex(str, x, y, rgba, mb, jc) {
-        local strarr = [];
-        if (str.find("\\n") == null) L_sq_DrawCode(str, x, y, rgba, mb, jc);
-        else {
-            local Bpos = 0;
-            while (true) {
-                local Npos = str.find("\\n", Bpos);
-                if (!Npos) {
-                    local strbuff = str.slice(Bpos, str.len());
-                    strarr.append(strbuff);
-                    break;
-                }
-                local strbuff = str.slice(Bpos, Npos);
-                strarr.append(strbuff);
-                Bpos = Npos + 2;
-            }
-            for (local z = 0; z< strarr.len(); z++) {
-                L_sq_DrawCode(strarr[z], x, y + (z * 14), rgba, mb, jc);
-            }
-        }
-    }
-
-    function Proc() {
-        X = (Parent.X + 235 + (Idx % 2 * 248)).tointeger();
-        Y = (Parent.Y - Parent.ItemScrollRate * Parent.ItemScrollValue + 121 + (Idx / 2 * 72)).tointeger();
-    }
-}
-
-
-//商品类
-class AchievementNC_MerchandiseItem {
-    //Img
-    Img = null;
-    //UI
-    UI = Rindro_Image("interface/lenheartwindowcommon.img");
-    //编号
-    Idx = null;
-    //父对象
-    Parent = null;
-    //坐标
-    X = 0;
-    Y = 0;
-
-    Info = null;
-
-    BuyButton = null;
-
-    constructor(Window, Idx, Info) {
-        Parent = Window;
-        Img = Window.Img["widget"];
-        this.Idx = Idx;
-        this.Info = Info;
-
-        //购买按钮
-        BuyButton = Achievement_New_ItemButton(42 + 85 + 85, 420, 15, "购买");
-        BuyButton.DWidth = -5;
-        BuyButton.Width = 50;
-        BuyButton.SetTextOffset(-4, 1);
-        BuyButton.OnClick = function() {
-
-        }.bindenv(this);
-        BuyButton.SetCallBackFunc(function(Button) {
-            Button.X = (X + 174).tointeger();
-            Button.Y = (Y + 30).tointeger();
-            Button.CutPosY_Start = Parent.Y + 110;
-            Button.CutPosY_End = Parent.Y + 496;
-        }.bindenv(this));
-        Parent.ItemButtonList.append(BuyButton);
-
-        SetInfo(Info ? Info : {
-            Id = 3037,
-            Name = "测试物品",
-            CurrentLimit = 0,
-            Limit = 0,
-            NeedItemId = 3037,
-            NeedItemCount = 1,
-            NeedItemId2 = 3038,
-            NeedItemCount2 = 1,
-        });
-    }
-
-
-    function SetInfo(Info) {
-        this.Info = Info;
-    }
-
-    function GetItemNeedStr(ItemId, ItemCount) {
-        if (ItemId == 0) return "金币 x" + ItemCount;
-        else if (ItemId != -1) {
-            local Name = Parent.GetItemNameById(ItemId);
-            return Name + " x" + ItemCount;
-        } else {
-            return "";
-        }
-    }
-
-    function Show() {
-        //绘制底槽
-        Img.DrawPng(6, X, Y);
-        Img.DrawPng(6, X, Y);
-        //绘制物品槽
-        Img.DrawPng(5, X + 12, Y + 18);
-        Parent.DrawItemBase(X + 12 + 3, Y + 18 + 3, Info.Id, 1);
-        //绘制物品名称
-        L_sq_DrawCode(format("%s (%d/%d)", Info.Name, Info.CurrentLimit, Info.Limit), X + 60, Y + 12, sq_RGBA(230, 200, 155, 255), 0, 1);
-        //绘制所需物品名称
-        local Str1 = GetItemNeedStr(Info.NeedItemId, Info.NeedItemCount);
-        if (Str1.len() > 0) L_sq_DrawCode("-> " + Str1, X + 60, Y + 30, sq_RGBA(174, 174, 174, 255), 0, 1);
-        local Str2 = GetItemNeedStr(Info.NeedItemId2, Info.NeedItemCount2);
-        if (Str2.len() > 0) L_sq_DrawCode("-> " + Str2, X + 60, Y + 46, sq_RGBA(174, 174, 174, 255), 0, 1);
-    }
-
-    function TopShow() {}
-
-    //高级绘制文字(带换行)
-    function L_sq_DrawCode_Ex(str, x, y, rgba, mb, jc) {
-        local strarr = [];
-        if (str.find("\\n") == null) L_sq_DrawCode(str, x, y, rgba, mb, jc);
-        else {
-            local Bpos = 0;
-            while (true) {
-                local Npos = str.find("\\n", Bpos);
-                if (!Npos) {
-                    local strbuff = str.slice(Bpos, str.len());
-                    strarr.append(strbuff);
-                    break;
-                }
-                local strbuff = str.slice(Bpos, Npos);
-                strarr.append(strbuff);
-                Bpos = Npos + 2;
-            }
-            for (local z = 0; z< strarr.len(); z++) {
-                L_sq_DrawCode(strarr[z], x, y + (z * 14), rgba, mb, jc);
-            }
-        }
-    }
-
-    function Proc() {
-        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 {
@@ -376,16 +184,9 @@ class AchievementNC extends LenheartNewUI_Windows {
     // NoWindow = true;
 
     //是否可见
-<<<<<<< HEAD
-    Visible = false;
-
-    //脚本数据
-    ScriptInfo = null;
-=======
     // Visible = false;
 
     EtcInfo = null;
->>>>>>> b4e775bd708d4e7dbac90434e14b1df50efcc8ec
 
     //图像对象
     Img = null;
@@ -412,25 +213,7 @@ class AchievementNC extends LenheartNewUI_Windows {
     ItemScrollBar = null;
     //项目滚轮值
     ItemScrollRate = 0;
-<<<<<<< HEAD
-    ItemScrollValue = 400;
-
-    //查询成就状态
-    function QueryTheAchievementStatus() {
-        SendPackEx({
-            op = 20093001,
-            cjid = CurrentTypePage
-        });
-    }
-    //查询商店信息
-    function QueryShopInfo() {
-        SendPackEx({
-            op = 20093021
-        });
-    }
-=======
     ItemScrollValue = 100;
->>>>>>> b4e775bd708d4e7dbac90434e14b1df50efcc8ec
 
     constructor(gObjectId, gX, gY, gWidth, gHeight, gTitleH) {
         Childrens = [];
@@ -438,17 +221,6 @@ class AchievementNC extends LenheartNewUI_Windows {
         ItemButtonList = [];
         LenheartNewUI_Windows.constructor(gObjectId, gX, gY, gWidth, gHeight, gTitleH);
 
-<<<<<<< HEAD
-        //给一个等级的默认值
-        Level = {
-            lv = 1,
-            exp = 0,
-            maxexp = 100
-        }
-
-        //读取pvf数据
-        InitScriptData();
-=======
         //TODO
         Level = {
             lv = 15,
@@ -457,97 +229,14 @@ class AchievementNC extends LenheartNewUI_Windows {
         }
 
 
->>>>>>> b4e775bd708d4e7dbac90434e14b1df50efcc8ec
         //构造Img
         InitImg();
         //构造类型按钮
         InitTypeButton();
         //构造商店按钮
         InitShopButton();
-<<<<<<< HEAD
-        //构造组件按钮
-        InitWidgetButton();
         //构造项目
         InitItem();
-
-        //查询成就回包
-        RegisterPack(20093002, function(Chunk) {
-            //清空右侧项目集合
-            ItemList = [];
-            ItemButtonList = [];
-            local Jso = Json.Decode(Chunk);
-            Level.lv = Jso.lv.lv + 1;
-            Level.exp = Jso.lv.exp;
-            Level.maxexp = Jso.lv.maxexp;
-            foreach(Pos, obj in Jso.achievement) {
-                local PvfData = ScriptInfo[CurrentTypePage][obj.id];
-                local Item = AchievementNC_Item(this, Pos, {
-                    Id = obj.id,
-                    Name = PvfData.name,
-                    Explain = PvfData.explain,
-                    Desc = obj.currentNum + "/" + obj.maxNum,
-                    Exp = obj.exp.tostring(),
-                    IsSuccess = obj.achievement
-                });
-                ItemList.append(Item);
-            }
-        }.bindenv(this));
-
-
-        //查询商店回包
-        RegisterPack(20093022, function(Chunk) {
-            //清空右侧项目集合
-            ItemList = [];
-            ItemButtonList = [];
-            local Jso = Json.Decode(Chunk);
-            foreach(Pos, obj in Jso.info) {
-                local ItemName = GetItemNameById(obj.itemId);
-                local Item = AchievementNC_MerchandiseItem(this, Pos, {
-                    Id = obj.itemId,
-                    Name = ItemName,
-                    Limit = obj.limit,
-                    CurrentLimit = obj.currentNum,
-                    NeedItemId = obj.reItemId,
-                    NeedItemCount = obj.reItemNum,
-                    NeedItemId2 = obj.reItemId2,
-                    NeedItemCount2 = obj.reItemNum2,
-                });
-                ItemList.append(Item);
-            }
-        }.bindenv(this));
-        QueryShopInfo();
-    }
-
-
-    function InitScriptData() {
-        ScriptInfo = {};
-        Rindro_Script.GetFileData("etc/rindro/achievement/achievement.etc", function(DataTable, Data) {
-            while (!Data.Eof()) {
-                local Buffer = Data.Get();
-                if (Buffer == "[item]") {
-                    Data.Get();
-                    local Type = Data.Get();
-                    Data.Get();
-                    local Id = Data.Get();
-                    Data.Get();
-                    local namebuf = Data.Get();
-                    namebuf = Sq_ConvertWideChar(namebuf, "big5")
-                    Data.Get();
-                    local explainbuf = Data.Get();
-                    explainbuf = Sq_ConvertWideChar(explainbuf, "big5")
-                    Data.Get();
-                    if (!ScriptInfo.rawin(Type)) ScriptInfo[Type] <- {};
-                    ScriptInfo[Type][Id] <- {
-                        name = namebuf,
-                        explain = explainbuf
-                    }
-                }
-            }
-        }.bindenv(this));
-=======
-        //构造项目
-        InitItem();
->>>>>>> b4e775bd708d4e7dbac90434e14b1df50efcc8ec
     }
 
     function InitTypeButton() {
@@ -558,25 +247,11 @@ 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;
-                }
-                Button.isSelect = true;
-                //设定当前页面类型
-                CurrentTypePage = Button.Pos;
-                //还原右侧滚动条
-                ItemScrollBar.Reset();
-                //查询
-                QueryTheAchievementStatus();
-=======
                 foreach(Btn in TypeButton) {
                     Btn.isSelect = false;
                     Button.isSelect = true;
                 }
                 CurrentTypePage = Button.Pos;
->>>>>>> b4e775bd708d4e7dbac90434e14b1df50efcc8ec
             }.bindenv(this);
             TypeButton.append(Button);
         }
@@ -589,24 +264,11 @@ class AchievementNC extends LenheartNewUI_Windows {
         }.bindenv(this));
     }
 
-<<<<<<< HEAD
-
-    function InitShopButton() {
-        //商店按钮
-        local ShopButton = LenheartNewUI_BaseButton(34, 435, 160, 61, "achievement/shopbutton.img", 0);
-        ShopButton.OnClick = function() {
-            CurrentTypePage = -99;
-            foreach(Btn in TypeButton) {
-                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);
 
@@ -618,18 +280,6 @@ class AchievementNC extends LenheartNewUI_Windows {
         }.bindenv(this));
     }
 
-<<<<<<< HEAD
-    function InitWidgetButton() {
-        //关闭按钮
-        local CloseButton = LenheartNewUI_BaseButton(734, 0, 11, 12, "interface/lenheartwindowcommon.img", 276);
-        CloseButton.OnClick = function() {
-            this.Visible = false;
-        }.bindenv(this);
-        Childrens.append(CloseButton);
-    }
-
-=======
->>>>>>> b4e775bd708d4e7dbac90434e14b1df50efcc8ec
     function InitImg() {
         Img = {};
         Img["background"] <- Rindro_Image("achievement/background.img");
@@ -657,13 +307,6 @@ 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);
@@ -671,7 +314,6 @@ class AchievementNC extends LenheartNewUI_Windows {
             //经验
             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(); //裁切结束
 
@@ -686,20 +328,10 @@ 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);
 
@@ -722,10 +354,6 @@ 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) {
@@ -734,18 +362,9 @@ class AchievementNC extends LenheartNewUI_Windows {
             }
         }
         releaseClip(); //裁切结束
-<<<<<<< HEAD
-        //用来显示悬停之类的顶层信息
-        foreach(Item in ItemList) {
-            Item.TopShow();
-        }
-    }
-
-=======
     }
 
 
->>>>>>> b4e775bd708d4e7dbac90434e14b1df50efcc8ec
     RegisFlag = false;
     //逻辑入口
     function Proc(obj) {
@@ -818,10 +437,6 @@ 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);
@@ -837,17 +452,8 @@ class AchievementNC extends LenheartNewUI_Windows {
     }
 
     function OpenCallBack() {
-<<<<<<< HEAD
-        Visible = true;
-        //查询
-        QueryTheAchievementStatus();
-    }
-
-
-=======
 
     }
->>>>>>> b4e775bd708d4e7dbac90434e14b1df50efcc8ec
 }
 
 L_Windows_List <- [];

Project/AradPass/AradPass.nut

@@ -7,6 +7,7 @@
 // dofile("sqr/Project/AradPass/AradPass_Reward.nut");
 // dofile("sqr/Project/AradPass/AradPass_Quest.nut");
 // dofile("sqr/Project/AradPass/AradPass_Help.nut");
+print("1122");
 class AradPassC extends LenheartNewUI_Windows {
     //调试模式
     // DeBugMode = true;