Merge branch '0功能/活动' into master_develop
commit
92a2eb18a0
Binary file not shown.
After Width: | Height: | Size: 22 KiB |
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f04db2c77d4bcba4a9df036f738b9c3b
|
||||
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: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 4
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: d2e9f29c997b2f94c9f758bd1d6536e9
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: ActivityAltas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
Before Width: | Height: | Size: 146 KiB After Width: | Height: | Size: 287 KiB |
Binary file not shown.
After Width: | Height: | Size: 496 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d9a48539c989e264397969b5972336a7
|
||||
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: -1
|
||||
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: 2d24e9cfb9f1b8b429a97564cee108a8
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
|
@ -1014,6 +1014,7 @@ ActivityTypeDef = {
|
|||
TreasureOfHeaven=54,--天宫秘宝
|
||||
OpenSeverWelfare=55,--开服福利
|
||||
EightDayGift = 56,--八日登陆
|
||||
SignInfo = 57,--三日七日签到
|
||||
|
||||
}
|
||||
--活动结束需要处理面板关闭类型
|
||||
|
|
|
@ -10,10 +10,22 @@ local CumulativeSignInPage = quick_class("CumulativeSignInPage")
|
|||
local kMaxDay = 31
|
||||
--已领取 再领一次
|
||||
local receiveImage={[1]="s_slbz_yilingqu",[2]="r_meiriqiandao_zailingyici"}
|
||||
local boxImage = {
|
||||
[1] = "r_renwu_box2",
|
||||
[2] = ""
|
||||
}
|
||||
--本地标记可领取次数
|
||||
local receiveNum=0
|
||||
--今日是否充值标记 1未充值 2已充值
|
||||
local rechargeNum=0
|
||||
local items={}
|
||||
local data = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.SignInfo)
|
||||
local SignRewardConfig = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",ActivityTypeDef.SignInfo)
|
||||
|
||||
local pos = {
|
||||
[1] = Vector3.New(-98,184,100),
|
||||
[2] = Vector3.New(188,184,100),
|
||||
}
|
||||
|
||||
|
||||
function CumulativeSignInPage:ctor(mainPanel, gameObject)
|
||||
|
@ -45,7 +57,74 @@ function CumulativeSignInPage:RefreshPanel()
|
|||
self:CreateSignList()
|
||||
end
|
||||
self:RefreshSignList()
|
||||
self:RefreshBox()
|
||||
end
|
||||
|
||||
function CumulativeSignInPage:RefreshBox()
|
||||
|
||||
local content = Util.GetGameObject(self.gameObject, "content")
|
||||
local text = Util.GetGameObject(self.gameObject, "content/day/Text"):GetComponent("Text")
|
||||
local progressBottom = Util.GetGameObject(content, "progressBottom/Image"):GetComponent("Image")
|
||||
local rewardPanel = Util.GetGameObject(self.gameObject, "content/RewardPanel")
|
||||
local maskBtn = Util.GetGameObject(self.gameObject, "content/RewardPanel/rewardMaskBtn")
|
||||
local itemview = Util.GetGameObject(self.gameObject, "content/RewardPanel/ViewRect/ItemView")
|
||||
|
||||
|
||||
local curDay = data.value
|
||||
progressBottom.fillAmount = curDay/7
|
||||
text.text = curDay.."天"
|
||||
rewardPanel:SetActive(false)
|
||||
|
||||
for i = 1, #data.mission do
|
||||
local btnBox = Util.GetGameObject(content,"progressBottom/BoxBtn"..i)
|
||||
local effectKeKaiQi = Util.GetGameObject(btnBox,"UI_Effect_BaoXiang_KeKaiQi")
|
||||
local effectKaiQi = Util.GetGameObject(btnBox,"UI_Effect_BaoXiang_KaiQi")
|
||||
local KaiQi = Util.GetGameObject(effectKaiQi,"KaiQi")
|
||||
|
||||
btnBox:GetComponent("Image").enabled = data.mission[i].state == 0
|
||||
effectKeKaiQi:SetActive((curDay>=SignRewardConfig[i].Values[1][1]) and (data.mission[i].state == 0))
|
||||
effectKaiQi:SetActive(data.mission[i].state == 1)
|
||||
KaiQi:SetActive(data.mission[i].state == 1)
|
||||
btnBox:GetComponent("Button").interactable = data.mission[i].state == 0
|
||||
if data.mission[i].state == 0 then--未领取
|
||||
if curDay<SignRewardConfig[i].Values[1][1] then
|
||||
--点击显示预览
|
||||
Util.AddOnceClick(btnBox,function()
|
||||
local getInfo Util.GetGameObject(rewardPanel,"getInfo"):GetComponent("Text").text = "连续签到"..SignRewardConfig[i].Values[1][1].."天获得:"
|
||||
for j = 1, #SignRewardConfig[i].Reward do
|
||||
if not items[j] then
|
||||
local view = SubUIManager.Open(SubUIConfig.ItemView,Util.GetTransform(rewardPanel, "ViewRect/grid").transform)
|
||||
items[j] = view
|
||||
view.gameObject:SetActive(false)
|
||||
end
|
||||
items[j]:OnOpen(false, {SignRewardConfig[i].Reward[j][1],SignRewardConfig[i].Reward[j][2]}, 0.8,false,false,false,self.sortingOrder)
|
||||
items[j].gameObject:SetActive(true)
|
||||
end
|
||||
rewardPanel:SetActive(true)
|
||||
rewardPanel:GetComponent("RectTransform").localPosition = pos[i]
|
||||
end)
|
||||
|
||||
elseif curDay>=SignRewardConfig[i].Values[1][1] then
|
||||
Util.AddOnceClick(btnBox,function()
|
||||
NetManager.GetActivityRewardRequest(data.mission[i].missionId, data.activityId, function(drop)
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup,drop,1)
|
||||
self:RefreshBox()
|
||||
end)
|
||||
end)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
Util.AddOnceClick(maskBtn,function()
|
||||
for i = 1, #items do
|
||||
items[i].gameObject:SetActive(false)
|
||||
end
|
||||
rewardPanel:SetActive(false)
|
||||
end)
|
||||
end
|
||||
|
||||
function CumulativeSignInPage:OnSortingOrderChange(cursortingOrder)
|
||||
if self.signInRewardList then
|
||||
for i=1, #self.signInRewardList do
|
||||
|
@ -141,6 +220,7 @@ function CumulativeSignInPage:OnSignInClicked(Id, index)
|
|||
self.SignData.state = 1
|
||||
Util.GetGameObject(self.signInList[index], "redPoint"):SetActive(false)
|
||||
self:RefreshSignList()
|
||||
self:RefreshBox()
|
||||
end)
|
||||
elseif receiveNum==0 and rechargeNum==1 then
|
||||
MsgPanel.ShowTwo(Language[11446], function()
|
||||
|
@ -177,4 +257,8 @@ function CumulativeSignInPage:SetIcon(index,root)
|
|||
end
|
||||
end
|
||||
|
||||
function CumulativeSignInPage:OnDestroy()
|
||||
items={}
|
||||
end
|
||||
|
||||
return CumulativeSignInPage
|
|
@ -144,6 +144,7 @@ function OperatingPanel:OnDestroy()
|
|||
ClearRedPointObject(RedPointType.MonthCard)
|
||||
|
||||
self.operatingContents[1]:OnDestroy()
|
||||
self.operatingContents[5]:OnDestroy()
|
||||
end
|
||||
|
||||
function OperatingPanel:OnTabClicked(index)
|
||||
|
|
Loading…
Reference in New Issue