gitxsm 8 месяцев назад
Родитель
Сommit
b51cae6d59

+ 5 - 2
script/common/ProtoID.lua

@@ -1604,7 +1604,10 @@ _ENV[1645]="CG_BUY_LIFTTIME_CARD"
 _ENV[1646]="GC_BUY_LIFTTIME_CARD"
 _ENV[1647]="CG_FUWEN_RESET_LOCK"
 
--- _ENV[1648]="CG_CYCLMAKEFOOD_GET_5STARfOODLIST"
--- _ENV[1649]="GC_CYCLMAKEFOOD_GET_5STARfOODLIST"
+_ENV[1648]="CG_CYCLMAKEFOOD_GET_5STARfOODLIST"
+_ENV[1649]="GC_CYCLMAKEFOOD_GET_5STARfOODLIST"
+-- _ENV[1650]="CG_HEROPUB_REWARD_QUERY"
+-- _ENV[1651]="GC_HEROPUB_REWARD_QUERY"
+-- _ENV[1652]="CG_HEROPUB_REWARD_GET"
 
 

+ 1 - 1
script/module/fuwen/FuwenGrid.lua

@@ -14,7 +14,7 @@ FUWEN_SKILL_TOP = FUWEN_SKILL_TOP or {}     --
 FUWEN_SKILL_RARE = FUWEN_SKILL_RARE or {}   --·ûÎÄÏ¡Óм¼ÄÜÁбí
 
 
-local function getFuwenSkillMaxCnt(fuwenConfig)
+function getFuwenSkillMaxCnt(fuwenConfig)
     local nowNum, maxNum = 0, 0
 
     for _, skillInfo in ipairs(fuwenConfig.skillRate) do

+ 4 - 2
script/module/fuwen/FuwenLogic.lua

@@ -618,7 +618,9 @@ function fuwenRefreshQuery(human,fuwenID,fuwenIndex,pos,heroID,heroIndex)
     local skillArray = fuwen.skill
     if skillArray  then
         local skillNum = #skillArray
-        if skillNum > 2 then
+        local fuwenConfig = FuwenExcel.fuwen[fuwen.id]
+        local skillMaxNum = FuwenGrid.getFuwenSkillMaxCnt(fuwenConfig)
+        if skillNum > skillMaxNum then
             local skillTb = {}
             for _, skillId in ipairs(skillArray) do
                 table.insert(skillTb, skillId)
@@ -629,7 +631,7 @@ function fuwenRefreshQuery(human,fuwenID,fuwenIndex,pos,heroID,heroIndex)
             end)
 
             fuwen.skill = {}
-            for i=1, 2 do
+            for i=1, skillMaxNum do
                 fuwen.skill[1] = skillTb[i]
             end