修改精灵逻辑

script/module/elf/ElfLogic.lua

@@ -126,11 +126,6 @@ local function populateMsgSimpleData(net, elfCfg, itemCfg, elfData)
     Grid.makeItem(net.elfUpGradeStarCost, upGradeStarItemId, upGradeStarItemCnt)
 end
 
-local function populateMsgSkill(skillDesc, taretSkillId)
-    local skillCfg = Skill.GetSkillConfig(taretSkillId)
-    skillDesc = skillCfg.desc
-end
-
 local function populateMsgAttr(attrNet, attrCfg, attrId, elfLv, isMax)
     attrNet.nowAttr.key = attrId
     attrNet.nowAttr.value = attrCfg[1] * elfLv + attrCfg[2]
@@ -362,6 +357,15 @@ function Elf_SingleElf_Query(human, elfId)
     local elfNowLv = targetElfData and targetElfData.level or 0
     local elfNowStar = targetElfData and targetElfData.star or 0
 
+    local isMaxLv, isMaxStar = false, false
+    if elfNowLv >= elfCfg.elfMaxLv then
+        isMaxLv = true
+    end
+
+    if elfNowStar >= elfCfg.elfMaxStar then
+        isMaxStar = true
+    end
+
     local elfSkillDataMsg = msgRet.elfSkillData
 
     elfSkillDataMsg.nowSkillDesc = ""
@@ -372,7 +376,7 @@ function Elf_SingleElf_Query(human, elfId)
     end
 
     elfSkillDataMsg.nextSkillDesc = ""
-    local elfNextSkillId = elfCfg.skillArr[elfNowStar+1]
+    local elfNextSkillId = isMaxStar and elfCfg.skillArr[#elfCfg.skillArr] or elfCfg.skillArr[elfNowStar+1]
     local nextSkillCfg = Skill.GetSkillConfig(elfNextSkillId)
     if nextSkillCfg then
         elfSkillDataMsg.nextSkillDesc = nextSkillCfg.desc
@@ -385,16 +389,6 @@ function Elf_SingleElf_Query(human, elfId)
         elfSkillDataMsg.maxSkillDesc = maxSkillCfg.desc
     end
 
-
-    local isMaxLv, isMaxStar = false, false
-    if elfNowLv >= elfCfg.elfMaxLv then
-        isMaxLv = true
-    end
-
-    if elfNowStar >= elfCfg.elfMaxStar then
-        isMaxStar = true
-    end
-
     msgRet.elfLvAttrInfo[0] = 2
     populateMsgAttr(msgRet.elfLvAttrInfo[1], elfCfg.nAttack1, RoleDefine.ATK, elfNowLv, isMaxLv)
     populateMsgAttr(msgRet.elfLvAttrInfo[2], elfCfg.nLife1, RoleDefine.HP, elfNowLv, isMaxLv)
@@ -426,7 +420,7 @@ function Elf_UpGradeLv(human, elfId)
     end
 
     local upGradeLvItemId = elfCfg.upGradeLvItemId
-    local upGradeLvItemCnt = elfNowLv == elfCfg.elfMaxLv and 0 or (elfNowLv + 1) * 3 + 2
+    local upGradeLvItemCnt = (elfNowLv + 1) * 3 + 2
 
     if BagLogic.getItemCnt(human, upGradeLvItemId) < upGradeLvItemCnt then
         return Broadcast.sendErr(human, Lang.COMMON_ITEM_NOT_ENOUGH)