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

dev_chengFeng
zhangqiang 2021-03-30 22:22:13 +08:00
commit 0370fb5610
9 changed files with 215 additions and 23 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: ea2de442ac48508468862f907a0e9ba2
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 34f625f0c40d344499cb926f9ef4a540
vertices: []
indices:
edges: []
weights: []
spritePackingTag: TagButtonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 1fd4b794deb7c3a46b1e1d01888ee2b9
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 6583d81138f91a540b041ab0d110de00
vertices: []
indices:
edges: []
weights: []
spritePackingTag: TagButtonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -71,6 +71,7 @@ end
----==========================一级页签相关===========================================
-- tab按钮自定义显示设置
function this.PageTabAdapter(tab, index, status)
tab.gameObject.name = tabs[index].Id
local img = Util.GetGameObject(tab, "img"):GetComponent("Image")
local lock = Util.GetGameObject(tab, "lock")
local redpot = Util.GetGameObject(tab, "redpot")

View File

@ -595,25 +595,28 @@ function this.CreatSingleData(shopData,DataTypeIndex,curSortId,buyType)
return _data
end
local stateSort = {
[1] = 1,
[2] = 4,
[0] = 3,
[-1] = 2,
}
function this.GetMissionDataByActId(activityId)
local actiInfo = ActivityGiftManager.GetActivityInfoByType(activityId)
local havaBought = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.GrowthReward, GlobalActivity[activityId].CanBuyRechargeId[1])--当前礼包ID(101\102\103\104\105)
LogGreen("havaBought:"..havaBought.buyTimes)
local data = {}
LogGreen("actiInfo.mission:"..#actiInfo.mission)
for k,v in ipairs(actiInfo.mission) do
table.insert(data,this.CreatSingleMissionData(v,havaBought))
end
table.sort(data, function(a, b)
if a.state == 0 and b.state ~= 0 then
return true
if stateSort[a.state] == stateSort[b.state] then
return a.missionId < b.missionId
else
return stateSort[a.state] > stateSort[b.state]
end
if a.state ~= 0 and b.state == 0 then
return false
end
if a.state == b.state then
return a.missionId < b.missionId
end
return a.state < b.state
end)
return data
end
@ -625,20 +628,20 @@ function this.CreatSingleMissionData(missionData,havaBought)
data.itemName = itemConfig[data.shows[1][1]].Name
data.content = "达到"..actRewardConfig[data.missionId].Values[1][2].."级可领取"
data.isCanGetReward = PlayerManager.level >= actRewardConfig[data.missionId].Values[1][2]
data.state = data.state
--0 未领取(已达到条件) 1 已领取 -1 未达到等级 2可领取
if data.state == 0 then
--0 未领取(等级已达到,未购买基金) 1 已领取 -1 未达到等级 2可领取
if missionData.state == 0 then
if PlayerManager.level < actRewardConfig[data.missionId].Values[1][2] then
data.state = -1
elseif havaBought.buyTimes > 0 then
data.state = 2
else
data.state = 0
end
else
data.state = data.state
data.state = missionData.state
end
LogGreen("data.state:"..data.state)
return data
end
return this

View File

@ -86,7 +86,8 @@ function GrowthGiftPage:OnShow(_sortingOrder)
end
end
end
end
end
LogGreen("self.curActiId:"..self.curActiId)
if self.actConfig.Icon[3] and self.actConfig.Icon[3] ~= "" then
self.titleBgIma.sprite = Util.LoadSprite(self.actConfig.Icon[3])
end
@ -169,7 +170,7 @@ function GrowthGiftPage:CheckAllGet(curActiId,missionId)
end
return 1
end
function GrowthGiftPage.GrowthGiftPageOnClick(data,curActiId)
function GrowthGiftPage.GrowthGiftPageOnClick(data,curActiId,self)
if data.state == -1 then
PopupTipPanel.ShowTip("未达到等级要求~~~")
elseif data.state == 2 then
@ -177,7 +178,7 @@ function GrowthGiftPage.GrowthGiftPageOnClick(data,curActiId)
UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1)
ActivityGiftManager.SetActivityInfo(curActiId, data.missionId, 1)
RedpotManager.CheckRedPointStatus(RedPointType.GrowthGift)
if this.CheckAllGet(curActiId,data.missionId) == 0 then
if self:CheckAllGet(curActiId,data.missionId) == 0 then
self:RefreshGiftData(false)
return
end

View File

@ -41,7 +41,9 @@ end
--绑定事件(用于子类重写)
function MissionPre:BindEvent()
Util.AddOnceClick(self.btnGet, function()
self.data.OnClick(self.data,self.parent.curActiId)
if self.func then
self.func(self.data,self.parent.curActiId,self.parent)
end
end)
end
@ -56,10 +58,11 @@ end
function MissionPre:OnOpen()
end
function MissionPre:SetData(data,_parent,sortingOrder)
function MissionPre:SetData(data,_parent,sortingOrder,func)
self.data = data
self.parent = _parent
self.sortingOrder = sortingOrder
self.func = func
if self.data.title and self.data.title ~= "" then
self.upLayout.gameObject:SetActive(true)
else
@ -116,9 +119,11 @@ function MissionPre:SetContent1()
end
function MissionPre:SetIcon(_itemdata)
--0 未领取(等级已达到,未购买基金) 1 已领取 -1 未达到等级 2可领取
Util.SetGray(self.btnGet,false)
self.btnGet:GetComponent("Image").sprite = Util.LoadSprite("s_slbz_1anniuongse")
self.redPoint.gameObject:SetActive(false)
self.btnGet:GetComponent("Button").enabled = true
if self.data.state == -1 then
Util.SetGray(self.btnGet,true)
self.btnGetText.text = "领取"
@ -127,7 +132,12 @@ function MissionPre:SetIcon(_itemdata)
self.btnGetText.text = "领取"
elseif self.data.state == 1 then
self.redPoint.gameObject:SetActive(false)
self.btnGet.text = "已领取"
self.btnGetText.text = "已领取"
self.btnGet:GetComponent("Button").enabled = false
Util.SetGray(self.btnGet,true)
elseif self.data.state == 0 then
self.redPoint.gameObject:SetActive(true)
self.btnGetText.text = "领取"
end
end

View File

@ -111,8 +111,9 @@ function EveryDayGift:OnShow(_sortingOrder)
else
self.titleIma.gameObject:SetActive(false)
end
local str = string.split(self.actConfig.TitleText,"|")
if str[1] and str[1] ~= "" then
if self.actConfig.TitleText and self.actConfig.TitleText ~= "" then
local str = string.split(self.actConfig.TitleText,"|")
self.titleTip.text = str[1]
self.titleTip.transform.localPosition = Vector3.New((str[2] or 0),(str[3] or 0),(str[4] or 0))
self.titleTip.gameObject:SetActive(true)