提交成长基金调整

script/module/present/FundLogic.lua

@@ -99,11 +99,26 @@ function query(human, type)
        end
     end
 
+    local nBuyAll = bAllBuy and 1 or 0
+
     if type ~= CONFIG_ID3 and bAllBuy == true then
-       flag = CONFIG_ID2
-       rangeConfig, buyID = getRange(flag)
+        local bAdd = false
+        if flag == CONFIG_ID2 then
+            flag = CONFIG_ID2 + 2
+        elseif flag < CONFIG_ID2 then
+            flag = CONFIG_ID2
+        else
+            flag = flag + 1
+            bAdd = true
+        end
+        rangeConfig, buyID = getRange(flag)
+        
+        if not rangeConfig and not buyID and true == bAdd then
+            rangeConfig, buyID = getRange(flag - 1)
+        end
     end
 
+
     local msgRet = Msg.gc.GC_TEQUAN_ZSJIJIN_QUERY
     local net = msgRet.data
     local len = 0
@@ -158,7 +173,8 @@ function fund(human, funcID, buyConf, isFirst, cnt)
         db.flag = CONFIG_ID3
         YunYingLogic.sendGroupUpdate(YYInfo[funcID], human, PanelDefine.PANEL_ID_3607)
     else
-        if buyType == CONFIG_ID1 or buyType == CONFIG_ID2 then  
+        local trangeConfig, nbuyConfID = getRange(buyType)
+        if buyType == CONFIG_ID1 or buyType == CONFIG_ID2 or (trangeConfig and nbuyConfID == buyID) then 
             db.flag2 = buyType
             YunYingLogic.sendGroupUpdate(YYInfo[funcID], human, PanelDefine.PANEL_ID_3506)
         end