11111

Project/Anton/Rindro_Anton.nut

@@ -6,19 +6,6 @@
 */
 
 
-dofile("sqr/Project/Anton/Rindro_Anton_CreateParty.nut");
-dofile("sqr/Project/Anton/Rindro_Anton_FightSituation.nut");
-dofile("sqr/Project/Anton/Rindro_Anton_Noti.nut");
-dofile("sqr/Project/Anton/Rindro_Anton_Party.nut");
-dofile("sqr/Project/Anton/Rindro_Anton_PartyApplyJoin.nut");
-dofile("sqr/Project/Anton/Rindro_Anton_PartyFormation.nut");
-dofile("sqr/Project/Anton/Rindro_Anton_PartyHall.nut");
-dofile("sqr/Project/Anton/Rindro_Anton_PartyInfo.nut");
-dofile("sqr/Project/Anton/Rindro_Anton_PartyMemberInfo.nut");
-dofile("sqr/Project/Anton/Rindro_Anton_PlayerInteractive.nut");
-dofile("sqr/Project/Anton/Rindro_Anton_Reward.nut");
-
-
 //安图恩核心数据类
 class RinDro_Anton extends Rindro_BaseToolClass {
     //基础配置
@@ -98,7 +85,7 @@ class RinDro_Anton extends Rindro_BaseToolClass {
         } else {
             //在安图恩区域的 要转移回普通城镇
             if (L_sq_GetTownIndex() == BaseConfig.town_index) {
-                L_sq_MoveTown(1, 1, 474, 249);
+                L_sq_MoveTown(getroottable().rawin("RindroRaidNormalTown") ? getroottable().RindroRaidNormalTown : 2, getroottable().rawin("RindroRaidNormalArea") ? getroottable().RindroRaidNormalArea : 1, 474, 249);
             }
         }
     }
@@ -158,7 +145,7 @@ class RinDro_Anton extends Rindro_BaseToolClass {
             }
             //构造CID对应的装备数组方便绘制
             Portrait.rawset(MemberObj.CID, {
-                EquVos = clone(MemberObj.equVos),
+                EquVos = Rindro_Draw_Character(MemberObj.PlayerJob, MemberObj.equVos, "rest.ani", null),
                 Job = MemberObj.PlayerJob,
                 TeamId = MemberObj.characNum,
                 Name = MemberObj.PlayerName,
@@ -172,7 +159,7 @@ class RinDro_Anton extends Rindro_BaseToolClass {
                 JobName = MemberObj.PlayerGrowTypeJob, //职业名
                 Job = MemberObj.PlayerJob, //职业编号
                 StkHasFlag = MemberObj.isPrepare, //是否拥有攻坚材料
-                EquVos = MemberObj.equVos, //装备List 用于显示头像
+                EquVos = Rindro_Draw_Character(MemberObj.PlayerJob, MemberObj.equVos, "rest.ani", null), //装备List 用于显示头像
                 Captain = MemberObj.CaptainBool, //是否为攻坚队队长
                 Cid = MemberObj.CID, //Cid
                 OnlineState = MemberObj.onLineStart, //在线状态

Project/Anton/Rindro_Anton_FightSituation.nut

@@ -401,13 +401,9 @@ class Rindro_AntonFightSituationC extends LenheartNewUI_Windows {
                 local YOffset = 9 + (index * 22);
 
                 //绘制队长头像
-                foreach(AvatarObj in PartyMasterIcon.InfoObj.EquVos) {
-                    local AXpos = AvatarObj.F[0][2] + X + OffsetArr[PartyMasterIcon.InfoObj.Job][0] - 17 + ((PosI % 10) * 24);
-                    local AYpos = AvatarObj.F[0][3] + Y + OffsetArr[PartyMasterIcon.InfoObj.Job][1] + 512 + ((PosI / 10) * 20);
-                    setClip(AXpos + OffsetArr[PartyMasterIcon.InfoObj.Job][2], AYpos + OffsetArr[PartyMasterIcon.InfoObj.Job][3], AXpos + OffsetArr[PartyMasterIcon.InfoObj.Job][2] + 22, AYpos + OffsetArr[PartyMasterIcon.InfoObj.Job][3] + 18); //开始裁切
-                    L_sq_DrawImg("character/" + AvatarObj.B + ".img", AvatarObj.F[0][0], AXpos, AYpos);
-                    releaseClip(); //裁切结束
-                }
+                local AXpos = X + 26 + ((PosI % 10) * 24);
+                local AYpos = Y + 513 + ((PosI / 10) * 20);
+                PartyMasterIcon.InfoObj.EquVos.DrawFace(AXpos, AYpos);
                 PosI++;
             }
         }
@@ -550,14 +546,12 @@ class Rindro_AntonFightSituationC extends LenheartNewUI_Windows {
             local XOffset = 0;
             local YOffset = 9;
 
+
             //绘制队长头像
-            foreach(AvatarObj in CharacV.EquVos) {
-                local AXpos = AvatarObj.F[0][2] + X + OffsetArr[CharacV.Job][0] + DgnObj.X + ImgInfo[3] - 28;
-                local AYpos = AvatarObj.F[0][3] + Y + OffsetArr[CharacV.Job][1] + DgnObj.Y + ImgInfo[4] + 2;
-                setClip(AXpos + OffsetArr[CharacV.Job][2], AYpos + OffsetArr[CharacV.Job][3], AXpos + OffsetArr[CharacV.Job][2] + 22, AYpos + OffsetArr[CharacV.Job][3] + 18); //开始裁切
-                L_sq_DrawImg("character/" + AvatarObj.B + ".img", AvatarObj.F[0][0], AXpos, AYpos);
-                releaseClip(); //裁切结束
-            }
+            local AXpos = X + DgnObj.X + ImgInfo[3] + 16;
+            local AYpos = Y + DgnObj.Y + ImgInfo[4] + 2;
+            CharacV.EquVos.DrawFace(AXpos, AYpos);
+
 
             //绘制队伍人数
             for (local z = 0; z< count; z++) {

Project/Anton/Rindro_Anton_Noti.nut

@@ -87,18 +87,16 @@ class Rindro_Anton_NotiC extends LenheartNewUI_Windows {
 
             if (Ct >= 200) {
                 //绘制队长头像
-                foreach(AvatarObj in PartyMasterIcon.InfoObj.EquVos) {
-                    local AXpos = AvatarObj.F[0][2] + X + OffsetArr[PartyMasterIcon.InfoObj.Job][0] - 9 + 150;
-                    local AYpos = AvatarObj.F[0][3] + Y + OffsetArr[PartyMasterIcon.InfoObj.Job][1] + 184;
-                    setClip(AXpos + OffsetArr[PartyMasterIcon.InfoObj.Job][2], AYpos + OffsetArr[PartyMasterIcon.InfoObj.Job][3], AXpos + OffsetArr[PartyMasterIcon.InfoObj.Job][2] + 22, AYpos + OffsetArr[PartyMasterIcon.InfoObj.Job][3] + 18); //开始裁切
-                    L_sq_DrawImg("character/" + AvatarObj.B + ".img", AvatarObj.F[0][0], AXpos, AYpos);
-                    releaseClip(); //裁切结束
-                }
+                local AXpos = X - 9 + 150 + 44;
+                local AYpos = Y + 184 + 2;
+                PartyMasterIcon.InfoObj.EquVos.DrawFace(AXpos, AYpos);
             }
         }
 
         //绘制消息
         if (Ct >= 200) L_sq_DrawCode(Msg, X + 270 + LenheartTextClass.GetStringLength(Name), Y + 190, sq_RGBA(230, 200, 155, 255), 0, 1);
+
+        if (Ct >= 2000) Msg = null;
     }
 
     function Show(obj) {

Project/Anton/Rindro_Anton_Party.nut

@@ -47,7 +47,6 @@ class Rindro_AntonPartyC extends LenheartNewUI_CommonUi {
 
         //绘制队伍编号
         L_sq_DrawCode(TeamObj.TeamId, X + 22 - LenheartTextClass.GetStringLength(TeamObj.TeamId) / 2, Y + 5, sq_RGBA(134, 120, 79, 255), 0, 1);
-        //绘制队长头像
         L_sq_DrawImg("interface/lenheartwindowcommon.img", 55, X + 52, Y + 7);
         try {
             local channel_index = FiendwarTotal.GetInstance().BaseConfig.channel_index;

Project/Anton/Rindro_Anton_PartyApplyJoin.nut

@@ -205,13 +205,10 @@ class Rindro_AntonApplyJoinC extends LenheartNewUI_Windows {
         L_sq_DrawImg("hud/fiendwarl.img", 14, X + 8, Y + 40);
         //绘制角色头像
         if (AvatarArr) {
-            foreach(AvatarObj in AvatarArr) {
-                local AXpos = AvatarObj.F[0][2] + X + OffsetArr[Job][0] - 8;
-                local AYpos = AvatarObj.F[0][3] + Y + OffsetArr[Job][1] + 40;
-                setClip(AXpos + OffsetArr[Job][2], AYpos + OffsetArr[Job][3], AXpos + OffsetArr[Job][2] + 22, AYpos + OffsetArr[Job][3] + 18); //开始裁切
-                L_sq_DrawImg("character/" + AvatarObj.B + ".img", AvatarObj.F[0][0], AXpos, AYpos);
-                releaseClip(); //裁切结束
-            }
+            //绘制队长头像
+            local AXpos = X + 42 - 8;
+            local AYpos = Y + 1 + 40;
+            AvatarArr.DrawFace(AXpos, AYpos);
         }
         //绘制角色等级
         L_sq_DrawCode(Level, X + 78 - LenheartTextClass.GetStringLength(Level) / 2, Y + 45, sq_RGBA(134, 120, 79, 255), 0, 1);

Project/Anton/Rindro_Anton_PartyHall.nut

@@ -268,7 +268,7 @@ class Rindro_Anton_PartyHallC extends LenheartNewUI_Windows {
         //计算页数
         local PageStr = Page + 1 + " / " + ((PartyList.len() / PageMaxCount) + 1);
         //绘制当前页数
-        L_sq_DrawCode(PageStr, X + 166 + LenheartTextClass.GetStringLength(PageStr) / 2, Y + 402, sq_RGBA(134, 120, 79, 255), 0, 1);
+        L_sq_DrawCode(PageStr, X + 196 - LenheartTextClass.GetStringLength(PageStr) / 2, Y + 402, sq_RGBA(134, 120, 79, 255), 0, 1);
     }
 
     //重置所有选中

Project/Anton/Rindro_Anton_PartyInfo.nut

@@ -45,7 +45,7 @@ class Rindro_AntonPartyInfoC extends LenheartNewUI_Windows {
             Fatigue = Jso.charac.PlayFatigue,
             Combat = Jso.charac.ZL,
             ClearanceCount = Jso.charac.ClearanceCount,
-            AvatarArr = Jso.charac.equVos,
+            AvatarArr = Rindro_Draw_Character(Jso.charac.PlayerJob, Jso.charac.equVos, "rest.ani", null),
             PlayerSession = Jso.charac.PlayerSession
         }
         //没人
@@ -159,7 +159,7 @@ class Rindro_AntonPartyInfoC extends LenheartNewUI_Windows {
         }.bindenv(this);
         JoinPartyButton.SetCallBackFunc(function(window) {
             if (!IsMyTeam && !RinDro_Anton_Obj.MyRaidTeamId)
-                window.X = 10;
+                window.X = X + 10;
             else window.X = 90000;
         }.bindenv(this));
         AddChild(JoinPartyButton);

Project/Anton/Rindro_Anton_PartyMemberInfo.nut

@@ -135,13 +135,9 @@ class Rindro_AntonPartyInfoMemberC extends LenheartNewUI_CommonUi {
 
         sq_DrawBox(X + 42, Y + 1, 22, 18, HandBoxColor[InfoObj.TeamId]);
         //绘制队长头像
-        foreach(AvatarObj in InfoObj.EquVos) {
-            local AXpos = AvatarObj.F[0][2] + X + OffsetArr[InfoObj.Job][0];
-            local AYpos = AvatarObj.F[0][3] + Y + OffsetArr[InfoObj.Job][1];
-            setClip(AXpos + OffsetArr[InfoObj.Job][2], AYpos + OffsetArr[InfoObj.Job][3], AXpos + OffsetArr[InfoObj.Job][2] + 22, AYpos + OffsetArr[InfoObj.Job][3] + 18); //开始裁切
-            L_sq_DrawImg("character/" + AvatarObj.B + ".img", AvatarObj.F[0][0], AXpos, AYpos);
-            releaseClip(); //裁切结束
-        }
+        local AXpos = X + 42;
+        local AYpos = Y + 1;
+        InfoObj.EquVos.DrawFace(AXpos, AYpos);
 
         if (InfoObj.Captain) L_sq_DrawImg("hud/rindroanton.img", 18, X + 42, Y + 1);
 

Project/Anton/Rindro_Anton_Reward.nut

@@ -370,12 +370,9 @@ class Rindro_Anton_RewardC extends LenheartNewUI_Windows {
                                 L_sq_DrawImg("interface2/raid/anton/reward/anton_reward.img", 5 + Rarity, X + 156 + (160 * i), Y + 378, 1, sq_RGBA(255, 255, 255, CradAlphaOffset), OpenRealXrate, 1.0);
 
                                 //绘制物品
-                                if (OpenRealXrate >= 1.0 && i == 3) {
+                                if (OpenRealXrate >= 1.0) {
                                     DrawItemBase(X + 159 + (160 * i), Y + 380, CardInfo.item, CardInfo.num);
                                     L_sq_DrawCode(Name, X + 174 + (160 * i) - LenheartTextClass.GetStringLength(Name) / 2, Y + 416, ItemNameColor[Rarity], 0, 1);
-                                    // if (ActFlag == 5) {
-                                    //     ActFlag = 6;
-                                    // }
                                 }
 
 
@@ -506,14 +503,11 @@ class Rindro_Anton_RewardC extends LenheartNewUI_Windows {
     function DrawProfile(Cid, gx, gy, CodeXOffset) {
         if (RinDro_Anton_Obj.Portrait.rawin(Cid)) {
             local InfoObj = RinDro_Anton_Obj.Portrait[Cid];
+
             //绘制队长头像
-            foreach(AvatarObj in InfoObj.EquVos) {
-                local AXpos = AvatarObj.F[0][2] + X + OffsetArr[InfoObj.Job][0] + gx - 110;
-                local AYpos = AvatarObj.F[0][3] + Y + OffsetArr[InfoObj.Job][1] + gy - 5;
-                setClip(AXpos + OffsetArr[InfoObj.Job][2], AYpos + OffsetArr[InfoObj.Job][3], AXpos + OffsetArr[InfoObj.Job][2] + 22, AYpos + OffsetArr[InfoObj.Job][3] + 18); //开始裁切
-                L_sq_DrawImg("character/" + AvatarObj.B + ".img", AvatarObj.F[0][0], AXpos, AYpos);
-                releaseClip(); //裁切结束
-            }
+            local AXpos = X + gx - 110 + 42;
+            local AYpos = Y + gy - 5 + 1;
+            InfoObj.EquVos.DrawFace(AXpos, AYpos);
 
             L_sq_DrawCode(InfoObj.Name, gx + CodeXOffset - LenheartTextClass.GetStringLength(InfoObj.Name) / 2, gy, 0xff00b1ff, 0, 1);
         } else {