Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local

Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Prefab/Effect_c_dhdj_00042_s1_attack_01.prefab

@@ -4773,7 +4773,7 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 7599086031421744739}
+  - component: {fileID: 401453196346661087}
   m_Layer: 0
   m_Name: Effect_c_dhdj_00042_s1_attack_01
   m_TagString: Untagged
@@ -4781,8 +4781,8 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &7599086031421744739
-Transform:
+--- !u!224 &401453196346661087
+RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -4796,6 +4796,11 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   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: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &2395908319297874085
 GameObject:
   m_ObjectHideFlags: 0
@@ -23912,7 +23917,7 @@ Transform:
   m_LocalScale: {x: 270, y: 270, z: 270}
   m_Children:
   - {fileID: 3036545675835963328}
-  m_Father: {fileID: 7599086031421744739}
+  m_Father: {fileID: 401453196346661087}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &7713441863657285848

Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Prefab/Effect_c_dhdj_00042_s1_attack_02.prefab

@@ -67301,7 +67301,7 @@ Transform:
   - {fileID: 815421275675311144}
   - {fileID: 1162331467017374328}
   - {fileID: 2724444954265427672}
-  m_Father: {fileID: 471121379223646905}
+  m_Father: {fileID: 4891602638683704235}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &3186308581313113342
@@ -76876,7 +76876,7 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 471121379223646905}
+  - component: {fileID: 4891602638683704235}
   m_Layer: 0
   m_Name: Effect_c_dhdj_00042_s1_attack_02
   m_TagString: Untagged
@@ -76884,8 +76884,8 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &471121379223646905
-Transform:
+--- !u!224 &4891602638683704235
+RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -76899,6 +76899,11 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   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: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &3814272112604722327
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -241,6 +241,7 @@ function LingShouBaoGe:Recruit(id,RecruitMaxtimesId,itemId,itemNum,state,freeTim
         UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,generalType,
             function()
                 RecruitManager.RecruitRequest(id,function(msg)
+                    PrivilegeManager.RefreshPrivilegeUsedTimes(RecruitMaxtimesId,num)
                     UIManager.OpenPanel(UIName.PokemonSingleResultPanel,id,msg.drop,activityId,function ()
                         this:Refresh()
                     end)
@@ -248,6 +249,7 @@ function LingShouBaoGe:Recruit(id,RecruitMaxtimesId,itemId,itemNum,state,freeTim
             end,itemNum)
     else
         RecruitManager.RecruitRequest(id, function(msg)
+            PrivilegeManager.RefreshPrivilegeUsedTimes(RecruitMaxtimesId,num)
             UIManager.OpenPanel(UIName.PokemonSingleResultPanel,id,msg.drop,activityId,function ()
                 this:Refresh()
             end)

Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua

@@ -39,14 +39,15 @@ function this.SetBasicValues(giftGoodsList)
     end
     for _, giftGoodsInfo in ipairs(giftGoodsList) do
 
-        local rechargeConfig = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, giftGoodsInfo.goodsId)
+        local rechargeConfigLocal = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, giftGoodsInfo.goodsId)
 
-         LogGreen("------充值活动-----------礼包类型："..    rechargeConfig.Type    .."      礼包ID："..    giftGoodsInfo.goodsId    .."      已购："
-         ..giftGoodsInfo.buyTimes.."      开始："..giftGoodsInfo.startTime.."      结束："
-         ..giftGoodsInfo.endTime .. "    可购(没卵用)：" .. giftGoodsInfo.dynamicBuyTimes)
-         if giftGoodsInfo.endTime ~= 0 and giftGoodsInfo.startTime ~= 0 then
-            if giftGoodsInfoList[rechargeConfig.Type] then
-                table.insert(giftGoodsInfoList[rechargeConfig.Type], giftGoodsInfo)
+        --  LogGreen("------充值活动-----------礼包类型："..    rechargeConfigLocal.Type    .."      礼包ID："..    giftGoodsInfo.goodsId    .."      已购："
+        --  ..giftGoodsInfo.buyTimes.."      开始："..giftGoodsInfo.startTime.."      结束："
+        --  ..giftGoodsInfo.endTime .. "    可购(没卵用)：" .. giftGoodsInfo.dynamicBuyTimes)
+         if giftGoodsInfo.endTime == 0 and giftGoodsInfo.startTime == 0 and (rechargeConfigLocal.ShowType == 25 or rechargeConfigLocal.ShowType == 26 or rechargeConfigLocal.ShowType == 8) then
+         else
+            if giftGoodsInfoList[rechargeConfigLocal.Type] then
+                table.insert(giftGoodsInfoList[rechargeConfigLocal.Type], giftGoodsInfo)
             end
         end
     end