diff --git a/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab index d743c35ae5..856de98a80 100644 --- a/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab @@ -2144,7 +2144,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &771717322046565802 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index febe5cc75b..52d8a6b672 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -701,4 +701,5 @@ function this.GetTimeLimitRedPointStatus() return freeTime and freeTime >= 1 end end +this.TimeLimitedTimes = 0 return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/RewardPreview.lua b/Assets/ManagedResources/~Lua/Modules/Operating/RewardPreview.lua index d84fc6f377..1ed5f06850 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/RewardPreview.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/RewardPreview.lua @@ -32,7 +32,7 @@ end function RewardPreview:OnShow() self.gameObject:SetActive(true) local maxtimesId = lotterySetting[RecruitType.TimeLimitSingle].MaxTimes - curtimes = PrivilegeManager.GetPrivilegeUsedTimes(maxtimesId) + curtimes = OperatingManager.TimeLimitedTimes self:RefreshRewarid() self.curtimes.text = Language[12181] .. curtimes self.slider.fillAmount = self:CalculateInterval(curtimes) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua index b1d1a29c19..2504d48353 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua @@ -156,6 +156,7 @@ function TimeLimitedCall:RefreshNextLevelReward() rewarditem = data1[#data1] curLv=data1[#data1].Id end + OperatingManager.TimeLimitedTimes = curTimes local o= SubUIManager.Open(SubUIConfig.ItemView,self.nextReward.transform) o:OnOpen(false, {rewarditem.Reward[1][1],rewarditem.Reward[1][2]}, 0.73, false) o.gameObject:SetActive(true) @@ -226,7 +227,7 @@ end function TimeLimitedCall:GetMissionStateById(num,activityId) --LogBlue("activityId:"..activityId.. ",num:"..num) local mission= ActivityGiftManager.GetActivityInfo(activityId,num) --从后端获取到的阶段数据 - --LogBlue(mission.progress.." "..mission.state) + LogBlue(mission.progress.." "..mission.state) return mission.progress,mission.state end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua index a2cf8d2d60..07fc6ef730 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua @@ -426,8 +426,8 @@ function this.SetPropertyShow(_infos) Util.GetGameObject(obj,"leftTxt"):GetComponent("Text").text=string.format("%s+%s",proper.Info,value.currValue) Util.GetGameObject(obj,"rightTxt"):GetComponent("Text").text= isMax and Language[11089] or value.nextValue else - Util.GetGameObject(obj,"leftTxt"):GetComponent("Text").text=proper.Info.."+"..value.currValue/1000 .."%" - Util.GetGameObject(obj,"rightTxt"):GetComponent("Text").text=isMax and Language[11089] or value.nextValue/1000 .."%" + Util.GetGameObject(obj,"leftTxt"):GetComponent("Text").text=proper.Info.."+"..value.currValue/100 .."%" + Util.GetGameObject(obj,"rightTxt"):GetComponent("Text").text=isMax and Language[11089] or value.nextValue/100 .."%" end obj.gameObject:SetActive(true) index=index+1 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua index b9b74b8bf6..23032646a7 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua @@ -627,12 +627,17 @@ function this:OnClickAllBtn() this:SetSelectBtn() local itemData = BagManager.GetEquipDataByEquipPosition(curHeroData.heroConfig.Profession) this:SortEquipDatas(itemData) + local count = 0 + for i=1,#itemData do + count = count + itemData[i].num + end --加上宝器数据 local curAllEquipTreasure = EquipTreasureManager.GetAllTreasures(curHeroData.heroConfig.PropertyName) --宝器排序 for i = 1, #curAllEquipTreasure do table.insert(itemData, curAllEquipTreasure[i]) end + this.itemNumText.text = Language[10188] .. count + LengthOfTable(curAllEquipTreasure) this:SetItemData(itemData) end @@ -642,6 +647,11 @@ function this:OnClickTabBtn(_index) if _index < 5 then local allEquip = BagManager.GetEquipDataByEquipPosition(curHeroData.heroConfig.Profession, _index) this:SortEquipDatas(allEquip) + local count = 0 + for i=1,#allEquip do + count = count + allEquip[i].num + end + this.itemNumText.text = Language[10188] .. count this:SetItemData(allEquip) else local allEquipTreasure @@ -661,15 +671,14 @@ function this:OnClickTabBtn(_index) end end ) - this:SetItemData(allEquipTreasure) + this.itemNumText.text = Language[10188] .. LengthOfTable(allEquipTreasure) + this:SetItemData(allEquipTreasure) end end --设置背包列表数据 local curHeroCanUpEquipTabs = {} -function this:SetItemData(_itemDatas) - --LogError(" " ..LengthOfTable(_itemDatas) ) - this.itemNumText.text = Language[10188] .. LengthOfTable(_itemDatas) +function this:SetItemData(_itemDatas) if LengthOfTable(_itemDatas) == 0 then this.emptyObj.gameObject:SetActive(true) else @@ -710,6 +719,7 @@ function this.SingleItemDataShow(_go, _itemData) local jewerConfig = ConfigManager.TryGetConfigData(ConfigName.JewelConfig, _itemData.id) local pos = 0 if jewerConfig then + Util.GetGameObject(_go.transform, "num").gameObject:SetActive(false) if jewerConfig.Location == 1 then pos = 5 else @@ -717,6 +727,9 @@ function this.SingleItemDataShow(_go, _itemData) pos = 6 end end + else + Util.GetGameObject(_go.transform, "num").gameObject:SetActive(true) + Util.GetGameObject(_go.transform, "num"):GetComponent("Text").text = _itemData.num end local lvObj = Util.GetGameObject(_go.transform, "lv"):GetComponent("Text") local refineObj = Util.GetGameObject(_go.transform, "refine"):GetComponent("Text") @@ -741,7 +754,6 @@ function this.SingleItemDataShow(_go, _itemData) else refineObj.gameObject:SetActive(false) end - Util.GetGameObject(_go.transform, "num").gameObject:SetActive(false) -- 0.查看属性 1.穿戴 2.卸下 3.交换 --宝物界面 Util.AddOnceClick( diff --git a/data_execl/base_data/HeroConfig.xlsx b/data_execl/base_data/HeroConfig.xlsx index 5cd86f9531..d044ea722d 100644 Binary files a/data_execl/base_data/HeroConfig.xlsx and b/data_execl/base_data/HeroConfig.xlsx differ diff --git a/data_execl/base_data/LotteryRewardConfig.xlsx b/data_execl/base_data/LotteryRewardConfig.xlsx index 6b7e62afbd..5c16ccf1b9 100644 Binary files a/data_execl/base_data/LotteryRewardConfig.xlsx and b/data_execl/base_data/LotteryRewardConfig.xlsx differ diff --git a/data_execl/base_data/MonsterConfig.xlsx b/data_execl/base_data/MonsterConfig.xlsx index 916b588e05..8a1d2daf9a 100644 Binary files a/data_execl/base_data/MonsterConfig.xlsx and b/data_execl/base_data/MonsterConfig.xlsx differ diff --git a/data_execl/base_data/StoreConfig.xlsx b/data_execl/base_data/StoreConfig.xlsx index 92406274ae..8d74b82472 100644 Binary files a/data_execl/base_data/StoreConfig.xlsx and b/data_execl/base_data/StoreConfig.xlsx differ diff --git a/data_execl/base_data/StoreTypeConfig.xlsx b/data_execl/base_data/StoreTypeConfig.xlsx index ced944acd8..ddb97e827e 100644 Binary files a/data_execl/base_data/StoreTypeConfig.xlsx and b/data_execl/base_data/StoreTypeConfig.xlsx differ