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

dev_chengFeng
2han9B1a0 2020-07-09 11:53:10 +08:00
commit 8e853b2758
11 changed files with 24 additions and 10 deletions

View File

@ -2144,7 +2144,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &771717322046565802 --- !u!224 &771717322046565802
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -701,4 +701,5 @@ function this.GetTimeLimitRedPointStatus()
return freeTime and freeTime >= 1 return freeTime and freeTime >= 1
end end
end end
this.TimeLimitedTimes = 0
return this return this

View File

@ -32,7 +32,7 @@ end
function RewardPreview:OnShow() function RewardPreview:OnShow()
self.gameObject:SetActive(true) self.gameObject:SetActive(true)
local maxtimesId = lotterySetting[RecruitType.TimeLimitSingle].MaxTimes local maxtimesId = lotterySetting[RecruitType.TimeLimitSingle].MaxTimes
curtimes = PrivilegeManager.GetPrivilegeUsedTimes(maxtimesId) curtimes = OperatingManager.TimeLimitedTimes
self:RefreshRewarid() self:RefreshRewarid()
self.curtimes.text = Language[12181] .. curtimes self.curtimes.text = Language[12181] .. curtimes
self.slider.fillAmount = self:CalculateInterval(curtimes) self.slider.fillAmount = self:CalculateInterval(curtimes)

View File

@ -156,6 +156,7 @@ function TimeLimitedCall:RefreshNextLevelReward()
rewarditem = data1[#data1] rewarditem = data1[#data1]
curLv=data1[#data1].Id curLv=data1[#data1].Id
end end
OperatingManager.TimeLimitedTimes = curTimes
local o= SubUIManager.Open(SubUIConfig.ItemView,self.nextReward.transform) local o= SubUIManager.Open(SubUIConfig.ItemView,self.nextReward.transform)
o:OnOpen(false, {rewarditem.Reward[1][1],rewarditem.Reward[1][2]}, 0.73, false) o:OnOpen(false, {rewarditem.Reward[1][1],rewarditem.Reward[1][2]}, 0.73, false)
o.gameObject:SetActive(true) o.gameObject:SetActive(true)
@ -226,7 +227,7 @@ end
function TimeLimitedCall:GetMissionStateById(num,activityId) function TimeLimitedCall:GetMissionStateById(num,activityId)
--LogBlue("activityId:"..activityId.. ",num:"..num) --LogBlue("activityId:"..activityId.. ",num:"..num)
local mission= ActivityGiftManager.GetActivityInfo(activityId,num) --从后端获取到的阶段数据 local mission= ActivityGiftManager.GetActivityInfo(activityId,num) --从后端获取到的阶段数据
--LogBlue(mission.progress.." "..mission.state) LogBlue(mission.progress.." "..mission.state)
return mission.progress,mission.state return mission.progress,mission.state
end end

View File

@ -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,"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 Util.GetGameObject(obj,"rightTxt"):GetComponent("Text").text= isMax and Language[11089] or value.nextValue
else else
Util.GetGameObject(obj,"leftTxt"):GetComponent("Text").text=proper.Info.."+"..value.currValue/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/1000 .."%" Util.GetGameObject(obj,"rightTxt"):GetComponent("Text").text=isMax and Language[11089] or value.nextValue/100 .."%"
end end
obj.gameObject:SetActive(true) obj.gameObject:SetActive(true)
index=index+1 index=index+1

View File

@ -627,12 +627,17 @@ function this:OnClickAllBtn()
this:SetSelectBtn() this:SetSelectBtn()
local itemData = BagManager.GetEquipDataByEquipPosition(curHeroData.heroConfig.Profession) local itemData = BagManager.GetEquipDataByEquipPosition(curHeroData.heroConfig.Profession)
this:SortEquipDatas(itemData) this:SortEquipDatas(itemData)
local count = 0
for i=1,#itemData do
count = count + itemData[i].num
end
--加上宝器数据 --加上宝器数据
local curAllEquipTreasure = EquipTreasureManager.GetAllTreasures(curHeroData.heroConfig.PropertyName) local curAllEquipTreasure = EquipTreasureManager.GetAllTreasures(curHeroData.heroConfig.PropertyName)
--宝器排序 --宝器排序
for i = 1, #curAllEquipTreasure do for i = 1, #curAllEquipTreasure do
table.insert(itemData, curAllEquipTreasure[i]) table.insert(itemData, curAllEquipTreasure[i])
end end
this.itemNumText.text = Language[10188] .. count + LengthOfTable(curAllEquipTreasure)
this:SetItemData(itemData) this:SetItemData(itemData)
end end
@ -642,6 +647,11 @@ function this:OnClickTabBtn(_index)
if _index < 5 then if _index < 5 then
local allEquip = BagManager.GetEquipDataByEquipPosition(curHeroData.heroConfig.Profession, _index) local allEquip = BagManager.GetEquipDataByEquipPosition(curHeroData.heroConfig.Profession, _index)
this:SortEquipDatas(allEquip) 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) this:SetItemData(allEquip)
else else
local allEquipTreasure local allEquipTreasure
@ -661,15 +671,14 @@ function this:OnClickTabBtn(_index)
end end
end end
) )
this:SetItemData(allEquipTreasure) this.itemNumText.text = Language[10188] .. LengthOfTable(allEquipTreasure)
this:SetItemData(allEquipTreasure)
end end
end end
--设置背包列表数据 --设置背包列表数据
local curHeroCanUpEquipTabs = {} local curHeroCanUpEquipTabs = {}
function this:SetItemData(_itemDatas) function this:SetItemData(_itemDatas)
--LogError(" " ..LengthOfTable(_itemDatas) )
this.itemNumText.text = Language[10188] .. LengthOfTable(_itemDatas)
if LengthOfTable(_itemDatas) == 0 then if LengthOfTable(_itemDatas) == 0 then
this.emptyObj.gameObject:SetActive(true) this.emptyObj.gameObject:SetActive(true)
else else
@ -710,6 +719,7 @@ function this.SingleItemDataShow(_go, _itemData)
local jewerConfig = ConfigManager.TryGetConfigData(ConfigName.JewelConfig, _itemData.id) local jewerConfig = ConfigManager.TryGetConfigData(ConfigName.JewelConfig, _itemData.id)
local pos = 0 local pos = 0
if jewerConfig then if jewerConfig then
Util.GetGameObject(_go.transform, "num").gameObject:SetActive(false)
if jewerConfig.Location == 1 then if jewerConfig.Location == 1 then
pos = 5 pos = 5
else else
@ -717,6 +727,9 @@ function this.SingleItemDataShow(_go, _itemData)
pos = 6 pos = 6
end end
end end
else
Util.GetGameObject(_go.transform, "num").gameObject:SetActive(true)
Util.GetGameObject(_go.transform, "num"):GetComponent("Text").text = _itemData.num
end end
local lvObj = Util.GetGameObject(_go.transform, "lv"):GetComponent("Text") local lvObj = Util.GetGameObject(_go.transform, "lv"):GetComponent("Text")
local refineObj = Util.GetGameObject(_go.transform, "refine"):GetComponent("Text") local refineObj = Util.GetGameObject(_go.transform, "refine"):GetComponent("Text")
@ -741,7 +754,6 @@ function this.SingleItemDataShow(_go, _itemData)
else else
refineObj.gameObject:SetActive(false) refineObj.gameObject:SetActive(false)
end end
Util.GetGameObject(_go.transform, "num").gameObject:SetActive(false)
-- 0.查看属性 1.穿戴 2.卸下 3.交换 -- 0.查看属性 1.穿戴 2.卸下 3.交换
--宝物界面 --宝物界面
Util.AddOnceClick( Util.AddOnceClick(

Binary file not shown.