[超值连冲]========活动修改红点修改
parent
a85a96a4ac
commit
d796a106bc
Binary file not shown.
After Width: | Height: | Size: 6.6 KiB |
|
@ -0,0 +1,110 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 909d86c5b4ed8474488ce2fc5988098d
|
||||||
|
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: 56
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 1
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
- 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: d2fa80adef9bb3242b546da2ca520a98
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
spritePackingTag: ContinuePackageAtlas
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
Binary file not shown.
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 33 KiB |
|
@ -877,6 +877,7 @@ GameObject:
|
||||||
- component: {fileID: 2807132439773654813}
|
- component: {fileID: 2807132439773654813}
|
||||||
- component: {fileID: 2752680468297073756}
|
- component: {fileID: 2752680468297073756}
|
||||||
- component: {fileID: 2373637757759864707}
|
- component: {fileID: 2373637757759864707}
|
||||||
|
- component: {fileID: 5860914955678384178}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: PremiumRebatePanel
|
m_Name: PremiumRebatePanel
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
@ -952,6 +953,35 @@ MonoBehaviour:
|
||||||
m_BlockingMask:
|
m_BlockingMask:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Bits: 4294967295
|
m_Bits: 4294967295
|
||||||
|
--- !u!114 &5860914955678384178
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3344270230499337201}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
tweenSequeue:
|
||||||
|
- initV3: {x: 0, y: 0, z: 0}
|
||||||
|
initFloat: 0
|
||||||
|
isInit: 1
|
||||||
|
changeV3: {x: 0, y: 0, z: 0}
|
||||||
|
changeFloat: 1
|
||||||
|
duration: 0.5
|
||||||
|
delay: 0
|
||||||
|
curveType: 1
|
||||||
|
changeType: 6
|
||||||
|
sequeueType: 1
|
||||||
|
loop: 999999999
|
||||||
|
loopType: 1
|
||||||
|
targetObj: {fileID: 1645606937427718578}
|
||||||
|
isPlayAudio: 0
|
||||||
|
isHaveCloseBtn: 0
|
||||||
|
isPlayOnOpen: 1
|
||||||
--- !u!1 &3531134784355024491
|
--- !u!1 &3531134784355024491
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -1918,6 +1948,7 @@ RectTransform:
|
||||||
- {fileID: 8892065666247826579}
|
- {fileID: 8892065666247826579}
|
||||||
- {fileID: 6793231540162019059}
|
- {fileID: 6793231540162019059}
|
||||||
- {fileID: 5560347858770598648}
|
- {fileID: 5560347858770598648}
|
||||||
|
- {fileID: 1645606937427718578}
|
||||||
m_Father: {fileID: 898193909354494019}
|
m_Father: {fileID: 898193909354494019}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 2
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
@ -2321,3 +2352,77 @@ Animator:
|
||||||
m_HasTransformHierarchy: 1
|
m_HasTransformHierarchy: 1
|
||||||
m_AllowConstantClipSamplingOptimization: 1
|
m_AllowConstantClipSamplingOptimization: 1
|
||||||
m_KeepAnimatorControllerStateOnDisable: 0
|
m_KeepAnimatorControllerStateOnDisable: 0
|
||||||
|
--- !u!1 &8376498154863378935
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1645606937427718578}
|
||||||
|
- component: {fileID: 9158256653194201226}
|
||||||
|
- component: {fileID: 7781005891451146957}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: jiantou
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &1645606937427718578
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8376498154863378935}
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 2750471745573935426}
|
||||||
|
m_RootOrder: 5
|
||||||
|
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: -576}
|
||||||
|
m_SizeDelta: {x: 130, y: 150}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &9158256653194201226
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8376498154863378935}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &7781005891451146957
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8376498154863378935}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
|
m_Sprite: {fileID: 21300000, guid: 304cd1273b4e17b44818e6d598d13b88, type: 3}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
|
|
|
@ -7,8 +7,8 @@ local artResourcesConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig
|
||||||
local activityRewardConfig = ConfigManager.GetConfig(ConfigName.ActivityRewardConfig)
|
local activityRewardConfig = ConfigManager.GetConfig(ConfigName.ActivityRewardConfig)
|
||||||
local TabBox = require("Modules/Common/TabBox")
|
local TabBox = require("Modules/Common/TabBox")
|
||||||
local BTNS = {
|
local BTNS = {
|
||||||
[1] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "c_czfl_6yuan",text2 = "c_czfl_6yuan2",showType = 48,actType = ActivityTypeDef.chaozhifanli,goodsType = GoodsTypeDef.chaozhifanli,redpoint= RedPointType.chaozhifanli6,price = 6},
|
--[1] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "c_czfl_6yuan",text2 = "c_czfl_6yuan2",showType = 48,actType = ActivityTypeDef.chaozhifanli,goodsType = GoodsTypeDef.chaozhifanli,redpoint= RedPointType.chaozhifanli6,price = 6},
|
||||||
[2] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "c_czfl_30yuan",text2 = "c_czfl_30yuan2",showType = 49,actType = ActivityTypeDef.chaozhifanli30,goodsType = GoodsTypeDef.chaozhifanli,redpoint= RedPointType.chaozhifanli30,price = 30},
|
[1] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "c_czfl_18yuan",text2 = "c_czfl_18yuan",showType = 49,actType = ActivityTypeDef.chaozhifanli30,goodsType = GoodsTypeDef.chaozhifanli,redpoint= RedPointType.chaozhifanli30,price = 18},
|
||||||
}
|
}
|
||||||
local curPage = 1
|
local curPage = 1
|
||||||
local redList = {}
|
local redList = {}
|
||||||
|
@ -19,7 +19,8 @@ function PremiumRebatePanel:InitComponent()
|
||||||
this.scrollItem = Util.GetGameObject(self.gameObject, "Bg/scroll")
|
this.scrollItem = Util.GetGameObject(self.gameObject, "Bg/scroll")
|
||||||
this.leftTime = Util.GetGameObject(self.gameObject, "Bg/time/leftTime"):GetComponent("Text")
|
this.leftTime = Util.GetGameObject(self.gameObject, "Bg/time/leftTime"):GetComponent("Text")
|
||||||
this.tabbox = Util.GetGameObject(self.gameObject, "Bg/tabbox")
|
this.tabbox = Util.GetGameObject(self.gameObject, "Bg/tabbox")
|
||||||
|
Util.GetGameObject(self.gameObject, "Bg/NameBg/Image"):GetComponent("Text").text="超值连充"
|
||||||
|
this.jiantou=Util.GetGameObject(self.gameObject, "Bg/jiantou")
|
||||||
local rootHight = this.scrollItem.transform.rect.height
|
local rootHight = this.scrollItem.transform.rect.height
|
||||||
local width = this.scrollItem.transform.rect.width
|
local width = this.scrollItem.transform.rect.width
|
||||||
this.scrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.scrollItem.transform,
|
this.scrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.scrollItem.transform,
|
||||||
|
@ -27,7 +28,6 @@ function PremiumRebatePanel:InitComponent()
|
||||||
this.scrollView.moveTween.MomentumAmount = 1
|
this.scrollView.moveTween.MomentumAmount = 1
|
||||||
this.scrollView.moveTween.Strength = 2
|
this.scrollView.moveTween.Strength = 2
|
||||||
this.scrollView.elastic = false
|
this.scrollView.elastic = false
|
||||||
|
|
||||||
this.itemViewList = {}
|
this.itemViewList = {}
|
||||||
this.sortingOrder = 0
|
this.sortingOrder = 0
|
||||||
end
|
end
|
||||||
|
@ -91,7 +91,9 @@ end
|
||||||
|
|
||||||
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
||||||
function PremiumRebatePanel:OnShow()
|
function PremiumRebatePanel:OnShow()
|
||||||
|
this.grid=Util.GetGameObject(self.gameObject, "Bg/scroll/ScrollCycleView/grid"):GetComponent("RectTransform")
|
||||||
this:Refresh(true,true)
|
this:Refresh(true,true)
|
||||||
|
FixedUpdateBeat:Add(this.OnUpdate,self)
|
||||||
this.PageTabCtrl:Init(this.tabbox.gameObject, BTNS,curPage)
|
this.PageTabCtrl:Init(this.tabbox.gameObject, BTNS,curPage)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -115,6 +117,14 @@ function PremiumRebatePanel:Refresh(isTop,isAni)
|
||||||
this:SetTime()
|
this:SetTime()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function this.OnUpdate()
|
||||||
|
if this.grid and this.grid.localPosition.y>2140 then
|
||||||
|
this.jiantou:SetActive(false)
|
||||||
|
else
|
||||||
|
this.jiantou:SetActive(true)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
function PremiumRebatePanel:SetRewardShow(isTop,isAni)
|
function PremiumRebatePanel:SetRewardShow(isTop,isAni)
|
||||||
-- 显示
|
-- 显示
|
||||||
this.scrollView:SetData(this.actData.mission, function (index, item)
|
this.scrollView:SetData(this.actData.mission, function (index, item)
|
||||||
|
@ -219,6 +229,7 @@ end
|
||||||
--界面销毁时调用(用于子类重写)
|
--界面销毁时调用(用于子类重写)
|
||||||
function PremiumRebatePanel:OnDestroy()
|
function PremiumRebatePanel:OnDestroy()
|
||||||
this.spLoader:Destroy()
|
this.spLoader:Destroy()
|
||||||
|
FixedUpdateBeat:Remove(this.OnUpdate,self)
|
||||||
this.itemViewList = {}
|
this.itemViewList = {}
|
||||||
for k,v in pairs(redList) do
|
for k,v in pairs(redList) do
|
||||||
ClearRedPointObject(k,v)
|
ClearRedPointObject(k,v)
|
||||||
|
|
|
@ -851,11 +851,11 @@ function this.CheckRedPointPremium()
|
||||||
if PlayerPrefs.GetInt("chaozhifanli"..PlayerManager.uid) ~= day then
|
if PlayerPrefs.GetInt("chaozhifanli"..PlayerManager.uid) ~= day then
|
||||||
return true
|
return true
|
||||||
else
|
else
|
||||||
if this.CheckRedPointPremiumSingle(ActivityTypeDef.chaozhifanli) then
|
-- if this.CheckRedPointPremiumSingle(ActivityTypeDef.chaozhifanli) then
|
||||||
return true
|
-- return true
|
||||||
else
|
--else
|
||||||
return this.CheckRedPointPremiumSingle(ActivityTypeDef.chaozhifanli30)
|
return this.CheckRedPointPremiumSingle(ActivityTypeDef.chaozhifanli30)
|
||||||
end
|
--end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
return false
|
return false
|
||||||
|
|
Loading…
Reference in New Issue