Merge branch 'china/dev' into china/test

Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua

@@ -14,6 +14,7 @@ local buyTimes = 0
 local storeDataId = 0
 local callBack
 local screenwidth
+local isClick = false
 -- local redTrailType = {
 --     [1] = RedPointType.PersonTrailHelp,
 --     [2] = RedPointType.BuddishTrailHelp,
@@ -143,7 +144,6 @@ function MonsterCampNewPanel:BindEvent()
 end
 
 --快速战斗
-local isClick = false
 function this.QuickStartMonsterFightRequest()
     if isClick then
         return
@@ -168,13 +168,13 @@ function this.QuickStartMonsterFightRequest()
             isClick = false  
         else
             
+            Timer.New(function ()
+                isClick = false  
+            end,1):Start()
             MonsterCampManager.monsterWave = MonsterCampManager.monsterWave + 1
             UIManager.OpenPanel(UIName.BattleWinPopup, nil, false, BATTLE_TYPE.MONSTER_CAMP, result, true, true,function()
                 -- UIManager.OpenPanel(UIName.RewardItemPopup,msg.enventDrop,1,function()
                     this.OnShowPanel()--刷新界面
-                    Timer.New(function ()
-                        isClick = false  
-                    end,0.5):Start()
                 -- end)
             end)
         end
@@ -206,6 +206,7 @@ end
 --界面打开时调用（用于子类重写）
 function MonsterCampNewPanel:OnOpen()
     this.UpView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.MonsterCamp })
+    isClick = false
 end
 
 --界面打开时调用（用于子类重写）

Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua

@@ -80,14 +80,11 @@ function RewardItemSingleShowPopup:BindEvent()
                 item.itemNum=compoundNum*_itemData.itemConfig.UsePerCount
                 if endHeroNum > 0 then
                     NetManager.HeroComposeRequest(item,function (drop)
-                        self:ClosePanel()
-                        UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function ()
-                        end,nil,nil,nil,true)
+                        this.SendBackCompoundReCallBack(drop)
                     end)
                     if compoundNum<=0 then
                         PopupTipPanel.ShowTip(Language[10183])
                     end
-                    
                 else
                     PopupTipPanel.ShowTip(Language[12157])
                 end
@@ -226,11 +223,19 @@ end
 
 local callBackFun
 function this.SendBackCompoundReCallBack(drop)
+    --this:ClosePanel()
     UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function ()
+        --UIManager.OpenPanel(UIName.BagPanel)
+        -- if callBackFun then
+        --     callBackFun()
         func()
+        -- end
     end,nil,nil,nil,true)
+    --改为后端刷新了
+    --BagManager.UpdateItemsNum(itemData.id,compoundNum*itemData.itemConfig.UsePerCount)
 end
 
+
 --扣除解锁蓝图材料 并数据
 function this.DeleteActiveLanTuData()
     PopupTipPanel.ShowTip(Language[11515] .. GetLanguageStrById(itemConfigData.Name))

Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua

@@ -433,6 +433,16 @@ end
 function RoleInfoLayout:OnSortingOrderChange()
   
 end
+
+function RoleInfoLayout:IsCanUpLv(curLv, targetLv)
+    if isHeroUpTuPo and curLv == upTuPoRankUpConfig.LimitLevel then
+        return true
+    end
+    if (not curTuPoRankUpConfig and targetLv > 30) or (curTuPoRankUpConfig and targetLv > curTuPoRankUpConfig.OpenLevel) then
+        return false
+    end
+    return true
+end
 --升级按钮点击事件处理
 function RoleInfoLayout:LvUpClick(isSingleLvUp)
     --是否为最大等级
@@ -475,7 +485,7 @@ function RoleInfoLayout:LvUpClick(isSingleLvUp)
             else
                 if isUpLvMaterials then
                     if isSingleLvUp then--是否是单次升级
-                        if not curTuPoRankUpConfig or curHeroData.lv >= curTuPoRankUpConfig.OpenLevel then
+                        if not this:IsCanUpLv(curHeroData.lv, curHeroData.lv + 1) then
                             PopupTipPanel.ShowTip("无法升级")
                             return 
                         end
@@ -507,13 +517,17 @@ function RoleInfoLayout:LvUpClick(isSingleLvUp)
     else
         if isUpLvMaterials then
             if isSingleLvUp then--是否是单次升级
+                -- 判断是否可以升级
+                if not this:IsCanUpLv(curHeroData.lv, curHeroData.lv + 1) then
+                    PopupTipPanel.ShowTip("无法升级")
+                    return 
+                end
                 local curUpLv = curHeroData.lv
                 if isHeroUpTuPo and curHeroData.lv == upTuPoRankUpConfig.LimitLevel then
                     curUpLv = curHeroData.lv
                 else
                     curUpLv = curHeroData.lv + 1
                 end
-                -- --LogGreen("isSingleLvUp       "..tostring(isSingleLvUp))
                 NetManager.HeroLvUpEvent(curHeroData.dynamicId,curUpLv,curHeroData.lv,function (msg)
                     this:DeleteLvUpMaterials(isSingleLvUp,msg)
                 end)
@@ -534,7 +548,8 @@ function RoleInfoLayout:LvUpClick(isSingleLvUp)
 end
 --长按升级结束后请求协议
 function RoleInfoLayout:LongLvUpClick(oldLv)
-    if not curTuPoRankUpConfig or curHeroData.lv >= curTuPoRankUpConfig.OpenLevel then
+    -- 判断是否可以升级
+    if not this:IsCanUpLv(oldLv, curHeroData.lv) then
         PopupTipPanel.ShowTip("无法升级")
         return 
     end