Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab

@@ -726,7 +726,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 478.37, y: -181.18}
+  m_AnchoredPosition: {x: 478.37, y: -181}
   m_SizeDelta: {x: 876.74, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7315193775080684413
@@ -1610,7 +1610,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 458.5, y: 0}
+  m_AnchoredPosition: {x: 458.5, y: -0.000015258789}
   m_SizeDelta: {x: 917, y: 45}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &5582656793896342774
@@ -3137,7 +3137,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 478.37, y: -231.23999}
+  m_AnchoredPosition: {x: 478.37, y: -231}
   m_SizeDelta: {x: 876.74, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2151967174801510196
@@ -3563,7 +3563,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 478.37, y: -281.3}
+  m_AnchoredPosition: {x: 478.37, y: -281}
   m_SizeDelta: {x: 876.74, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &418754132621401042
@@ -3739,7 +3739,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 458.5, y: -837}
-  m_SizeDelta: {x: 917, y: 315.1}
+  m_SizeDelta: {x: 917, y: 309.7}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &5787845084316277716
 MonoBehaviour:
@@ -4075,7 +4075,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -364.6, y: 0}
+  m_AnchoredPosition: {x: -364.59998, y: 0}
   m_SizeDelta: {x: -774.9, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7052788287217176819
@@ -4818,8 +4818,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 916, y: 331.36}
+  m_AnchoredPosition: {x: 0, y: 0.00004163427}
+  m_SizeDelta: {x: 916, y: 351}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &5918842748614186787
 MonoBehaviour:
@@ -4837,9 +4837,9 @@ MonoBehaviour:
     m_Left: 40
     m_Right: 0
     m_Top: 31
-    m_Bottom: 0
+    m_Bottom: 20
   m_ChildAlignment: 0
-  m_Spacing: 50.06
+  m_Spacing: 50
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 0
@@ -5489,7 +5489,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: -1.7999878, y: -413}
-  m_SizeDelta: {x: 917, y: 1152.1}
+  m_SizeDelta: {x: 917, y: 1146.7}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &2484587132639556036
 MonoBehaviour:
@@ -6012,7 +6012,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 478.37, y: -331.36}
+  m_AnchoredPosition: {x: 478.37, y: -331}
   m_SizeDelta: {x: 876.74, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3669278989709283071
@@ -6934,7 +6934,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 540, y: -434.96982}
+  m_AnchoredPosition: {x: 540, y: -434.96985}
   m_SizeDelta: {x: 800, y: 64.08}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &181288018036704300
@@ -7286,7 +7286,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 478.37, y: -81.06}
+  m_AnchoredPosition: {x: 478.37, y: -81}
   m_SizeDelta: {x: 876.74, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5022706840854498964
@@ -10501,7 +10501,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 478.37, y: -131.12}
+  m_AnchoredPosition: {x: 478.37, y: -131}
   m_SizeDelta: {x: 876.74, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7288597641011106736

Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab

@@ -9624,8 +9624,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 4.899994, y: -338}
-  m_SizeDelta: {x: 600, y: 115.1}
+  m_AnchoredPosition: {x: -2.0000916, y: -338}
+  m_SizeDelta: {x: 632.8, y: 115.1}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8029727511439798878
 CanvasRenderer:
@@ -9659,14 +9659,14 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
     m_FontSize: 35
     m_FontStyle: 0
-    m_BestFit: 1
+    m_BestFit: 0
     m_MinSize: 3
     m_MaxSize: 35
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
+    m_VerticalOverflow: 1
     m_LineSpacing: 1
   m_Text: "<color=#95523B>\u89E3\u9501\u79D8\u5B9D\uFF0C\u53EF\u4EE5\u9886\u53D6\u989D\u5916\u4E13\u5C5E\u5956\u52B1\uFF0C\u5E76\u76F4\u63A5\u83B7\u5F97200\u79EF\u5206\uFF0C<color=#CC4325>\u53EF\u83B7\u53D61980\u5996\u6676\uFF0C\u90AE\u4EF6\u9886\u53D6</color></color>"
   LanguageIndex: 0
@@ -11983,6 +11983,85 @@ MonoBehaviour:
     m_LineSpacing: 1
   m_Text: "\u786E \u8BA4"
   LanguageIndex: 10123
+--- !u!1 &2570075562108282243
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7858246822778438727}
+  - component: {fileID: 5413660572345632513}
+  - component: {fileID: 643456947987941065}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &7858246822778438727
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2570075562108282243}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4002341678660140781}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -0}
+  m_SizeDelta: {x: 167.6, y: 51.1}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5413660572345632513
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2570075562108282243}
+  m_CullTransparentMesh: 0
+--- !u!114 &643456947987941065
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2570075562108282243}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0.8588236, b: 0.60784316, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
+    m_FontSize: 43
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 51
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "98\u5143"
 --- !u!1 &2608535148006920750
 GameObject:
   m_ObjectHideFlags: 0
@@ -14831,7 +14910,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7801970642132342922
 RectTransform:
   m_ObjectHideFlags: 0
@@ -29573,6 +29652,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 7801970642132342922}
+  - {fileID: 7858246822778438727}
   m_Father: {fileID: 7846968063202130352}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua

@@ -60,6 +60,8 @@ function QianKunBoxBuyOnePanel:BindEvent()
     Util.AddClick(this.openOneAgainButton, function ()
         if isLimitUpHero then
             if this.func then
+                self.bg.gameObject:SetActive(false)
+                self.bg.gameObject:SetActive(true)
                this.func()
             end
             return

Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua

@@ -109,9 +109,12 @@ function this:ReFreshUpItem(UpItem,rateList)
     end
 end
 
+local hero
 --限时up英雄
 function this:ShowUpItem(config,actId)
-    local hero=SubUIManager.Open(SubUIConfig.ItemView,this.itemGrid.transform)
+    if not hero then
+        hero=SubUIManager.Open(SubUIConfig.ItemView,this.itemGrid.transform)
+    end
     local wishUpConfig=ConfigManager.TryGetConfigDataByKey(ConfigName.WishActivityUp,"ActivityId",actId)
     local num=0
     for i = 1, #wishUpConfig.UpList do

Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_GetView.lua

@@ -87,7 +87,6 @@ function this:InitGetView()
             if value.isGet==0 and (config.Num-value.getCount)>0 and isAuto then
                 if config.BaseType~=2 or PlayerManager.dailyRedPack< tonumber(SpecialConfig.Value) then
                     isAuto=false
-                    --LogError("redid============"..value.redId)
                     NetManager.GetRobRedPackageRequest(value.redId,function(msg)
                         local success=msg.isSuccess
                         local itemId=msg.itemId
@@ -105,8 +104,6 @@ function this:InitGetView()
                             LogError(Language[11047])
                             PopupTipPanel.ShowTip(Language[11047])
                         end
-                        this:InitGetView()
-                         --检测可领取红包的数量
                     end)
                     return
                 end

Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_17.lua

@@ -29,9 +29,8 @@ function this.Init(context, root, gameType, gameId, gameParams)
 end
 
 
-local id
-local num
-local itemId
+local resultId
+local stopId
 local isStart
 local timeSpace = 0
 local lastTime = 0
@@ -61,9 +60,8 @@ function this.Show()
         this.btnStart:GetComponent("Button").interactable = false
         TrialMiniGameManager.GameOperate(0, function(msg)
             --转起来         
-            id = msg.drop.itemlist[1].itemId
-            num = msg.drop.itemlist[1].itemNum
-            LogYellow("掉落的Id:"..id.."    数量："..num)
+            resultId = msg.resultId
+            LogYellow("掉落的Id:"..resultId)
             this.test()
             --4秒后显示掉落
             -- Timer.New(function()
@@ -100,11 +98,11 @@ function this.test()
         --     coroutine.wait(0.1)
         -- end
         -- 减速
-        for i = 0, 30 do
+        for i = 0, 20 do
             timeSpace = timeSpace + 0.01
             coroutine.wait(0.1)
         end
-        itemId = id
+        stopId = resultId
     end)
     
     isStart = true
@@ -122,18 +120,18 @@ function this.tableTurnEffect()
     redNext:SetActive(true)
     index = index + 1
     --检测最后的奖励
-    if itemId and id == this.TrialGameConfig[this.list[index]].RewardID and num == this.TrialGameConfig[this.list[index]].Max then
-        -- this.turnEffect:Stop()
+    local cfg = this.TrialGameConfig[this.list[index]]
+    if stopId and stopId == cfg.Id then
         --游戏结束显示掉落
         Timer.New(function()
             if TrialMiniGameManager.IsGameDone() then
                 TrialMiniGameManager.EndGame()
             end
-            local data = TrialMiniGameManager.IdToNameIconNum(id,num)
+            local data = TrialMiniGameManager.IdToNameIconNum(cfg.RewardID, cfg.Max)
             PopupTipPanel.ShowColorTip(data[1],data[2],data[3])
-            isStart = true
-            itemId = nil
         end, 1,1,true):Start()
+        isStart = false
+        stopId = nil
     end
 end
 

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

@@ -253,9 +253,7 @@ function RewardItemSingleShowPopup:OnOpen(...)
     if data[2] then
         func = data[2]
     end
-    if data[4] then
-        isNoShowSureBtn = data[4]
-    end
+    isNoShowSureBtn = data[4] and data[4] or false
 end
 function RewardItemSingleShowPopup:OnShow()
     this.innateImage:SetActive(false)
@@ -281,7 +279,7 @@ function RewardItemSingleShowPopup:OnShow()
         this.btnSure:SetActive(false)
         this.btnSureText.text = Language[10197]
     end
-    this.btnJump:SetActive(itemConfigData.UseJump and itemConfigData.UseJump > 0 and isBagPanel and isNoShowSureBtn)
+    this.btnJump:SetActive(itemConfigData.UseJump and itemConfigData.UseJump > 0 and isBagPanel and not isNoShowSureBtn)
     Log("itemConfigData.Id          " .. itemConfigData.Id)
     this.equipQuaText.text = GetStringByEquipQua(itemConfigData.Quantity, GetQuaStringByEquipQua(itemConfigData.Quantity))
     this.itemName.text = GetStringByEquipQua(itemConfigData.Quantity, GetLanguageStrById(itemConfigData.Name))

Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua

@@ -24,6 +24,7 @@ function this:InitComponent(gameObject)
     this.btnBack = Util.GetGameObject(gameObject, "frame/bg/closeBtn")
     this.dealBtn = Util.GetGameObject(gameObject, "frame/bg/dealBtn")
     this.dealBtnIma = Util.GetGameObject(this.dealBtn, "Image"):GetComponent("Image")
+    this.dealBtnText = Util.GetGameObject(this.dealBtn, "Text"):GetComponent("Text")
     if MoneyUtil.MT == MoneyType.RMB then
         this.dealBtnIma.sprite = this.spLoader:LoadSprite("q_qinlongmibao_jiesuozhenbao198")
     else
@@ -63,14 +64,22 @@ function this:OnShow(_parent,...)
         rewardData = TreasureOfHeavenManger.GetAllRewardData()
         this:showRewardTianGong()
         this.tip.text = Language[12286]
+        this.dealBtnIma.gameObject:SetActive(true)
+        this.dealBtnText.gameObject:SetActive(false)
     elseif curType == 2 then
         rewardData = QinglongSerectTreasureManager.GetAllRewardData()
         this:showRewardQinglong()
         this.tip.text = Language[12287]
+        this.dealBtnIma.gameObject:SetActive(true)
+        this.dealBtnText.gameObject:SetActive(false)
     elseif curType == 3 then 
         rewardData,rewardData1 = EndLessMapManager.GetAllRewardData()
         this:showRewardWuJin(rewardData,rewardData1)
-        this.tip.text = Language[12287]
+        this.tip.text = "<color=#60A22C>解锁秘宝，激活进阶</color><color=#95523B>专属奖励+2000积分，<color=#CC4325>可获取980妖晶</color></color>"
+        this.dealBtnIma.gameObject:SetActive(false)
+        this.dealBtnText.gameObject:SetActive(true)
+        local config = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,type[curType].id)
+        this.dealBtnText.text = MoneyUtil.GetMoneyUnitNameWithMoney(config.Price) 
     end
 end
 

Assets/ManagedResources/~Lua/View/ItemView.lua

@@ -417,7 +417,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
         self.frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity))
         self.icon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID))
         Util.AddOnceClick(self.frameBtn, function()
-            UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop,false)
+            UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop,true)
         end)
     elseif itemDataConFig.ItemType == ItemType.Hero then
         -- 1角色
@@ -455,7 +455,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
             self.fragmentIcon:GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(propertyName))
         end
         Util.AddOnceClick(self.frameBtn, function()
-            UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop,false)
+            UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop,true)
         end)
     elseif itemDataConFig.ItemType == ItemType.Equip then
         --3装备
@@ -487,7 +487,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
         --self.pokemonFrame:GetComponent("Image").sprite = self.spLoader:LoadSprite(YaoHunFrame[itemConfig[itemSId].Quantity])
         --self.pokemonImage.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID))
         Util.AddOnceClick(self.frameBtn, function()
-            UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop,false)
+            UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop,true)
         end)
         if effectLayer > 0 then
             self.UI_Effect_Kuang_JinSe:SetActive(itemConfig[itemSId].Quantity == 5)
@@ -510,7 +510,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
         self.frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity))
         self.icon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID))
         Util.AddOnceClick(self.frameBtn, function()
-            UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop,false)
+            UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop,true)
         end)
         if itemDataConFig.RingLevel > 0 then
             self.innateImage:SetActive(true)
@@ -580,7 +580,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
         self:SetFrameEffectLayer(effectLayer)
         self:SetFrameEffectScale(self.scale * 0.7)
         Util.AddOnceClick(self.frameBtn, function()
-            UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,itemSId,nil,self.isRewardItemPop,false)
+            UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,itemSId,nil,self.isRewardItemPop,true)
         end)
     elseif itemDataConFig.ItemType == ItemType.SelfBox then
         self.frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity))
@@ -601,14 +601,14 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
         local star  = _reward[4] or itemConfig[itemSId].HeroStar[1]
         SetHeroStars(self.starGrid, star,1,Vector2.New(32.5,32.5),-15)
         Util.AddOnceClick(self.frameBtn, function()
-            UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop,false)
+            UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop,true)
         end)
     else
         --，5随机道具，6符文
         self.frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity))
         self.icon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID))
         Util.AddOnceClick(self.frameBtn, function()
-            UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId, nil, self.isRewardItemPop,false)
+            UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId, nil, self.isRewardItemPop,true)
         end)
     end
     if itemNum <= 0 then
@@ -665,7 +665,7 @@ function ItemView:OnBtnCkickEvent(itemSId)
         --道具自选箱
         UIManager.OpenPanel(UIName.RewardBoxPanel,nil,itemDataConFig.Id)
     else
-        UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemDataConFig.Id,nil,self.isRewardItemPop,false)
+        UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemDataConFig.Id,nil,self.isRewardItemPop,true)
     end
 end
 function ItemView:OnShowUIeffectItemViewSaoguang()