[周卡]======红点修改提交
parent
054c31caee
commit
dd7a256469
Binary file not shown.
|
After Width: | Height: | Size: 32 KiB |
|
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 633320d923526e54bab6f37b925f3862
|
||||
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: 003903fedececef42a4daf3990f6d3ff
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: ZhouKaAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 MiB |
|
|
@ -3428,7 +3428,7 @@ RectTransform:
|
|||
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: -92, y: -869}
|
||||
m_AnchoredPosition: {x: 0, y: -869}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3791396217311411437
|
||||
|
|
@ -3466,7 +3466,7 @@ MonoBehaviour:
|
|||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 3
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
|
|
@ -11495,7 +11495,7 @@ RectTransform:
|
|||
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: -92, y: -828}
|
||||
m_AnchoredPosition: {x: 0, y: -828}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3791396218843401761
|
||||
|
|
@ -11533,7 +11533,7 @@ MonoBehaviour:
|
|||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 3
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
|
|
|
|||
|
|
@ -1148,12 +1148,13 @@ function this:TabBtnAction(id,actType,data)
|
|||
UIManager.OpenPanel(UIName.EastSeaFindGodPanel,id)
|
||||
elseif id==102 then
|
||||
--检查当前活动是否开启
|
||||
local id = ActivityGiftManager.GetActivityTypeInfo(102)
|
||||
LogError("id.activityId=="..id.activityId)
|
||||
NetManager.QueryWeekCardInfoRequest(id.activityId,function(msg)
|
||||
WeekCardManager.UpdateAllWeekCard(msg)
|
||||
UIManager.OpenPanel(UIName.WeekCardPanel,id.activityId)
|
||||
end)
|
||||
-- local id = ActivityGiftManager.GetActivityTypeInfo(102)
|
||||
-- LogError("id.activityId=="..id.activityId)
|
||||
-- NetManager.QueryWeekCardInfoRequest(id.activityId,function(msg)
|
||||
-- WeekCardManager.UpdateAllWeekCard(msg)
|
||||
-- UIManager.OpenPanel(UIName.WeekCardPanel)
|
||||
-- end)
|
||||
UIManager.OpenPanel(UIName.WeekCardPanel)
|
||||
|
||||
end
|
||||
elseif actType == 2 then
|
||||
|
|
@ -1279,7 +1280,16 @@ function this:OnShow()
|
|||
-- DynamicActivityManager.isopenJingjishilian = false
|
||||
-- end
|
||||
-- end,0.5):Start()
|
||||
|
||||
local id = ActivityGiftManager.GetActivityTypeInfo(102)
|
||||
if id and id.activityId then
|
||||
LogError("id.activityId=="..id.activityId)
|
||||
NetManager.QueryWeekCardInfoRequest(id.activityId,function(msg)
|
||||
WeekCardManager.UpdateAllWeekCard(msg)
|
||||
CheckRedPointStatus(RedPointType.WeekCard)
|
||||
CheckRedPointStatus(RedPointType.WeekCardOpen)
|
||||
CheckRedPointStatus(RedPointType.WeekCardReward)
|
||||
end)
|
||||
end
|
||||
end
|
||||
|
||||
--
|
||||
|
|
@ -1739,13 +1749,9 @@ function this.RefreshActivityShow()
|
|||
|
||||
for k,v in ipairs(activitys) do
|
||||
local showTab = activityTabs[k].go.gameObject.activeSelf
|
||||
if v.Id==244 and showTab then
|
||||
LogError("5555555555")
|
||||
end
|
||||
|
||||
local ishow = DynamicActivityManager.IsQualifiled(v.Id)
|
||||
if v.Id==244 and ishow then
|
||||
LogError("777777777")
|
||||
end
|
||||
|
||||
if ishow then
|
||||
if v.RpType > 0 then
|
||||
--绑定新的红点
|
||||
|
|
@ -1808,9 +1814,7 @@ function this.RefreshActivityShow()
|
|||
else
|
||||
showTab = false
|
||||
end
|
||||
if v.Id==244 and showTab then
|
||||
LogError("666666666666")
|
||||
end
|
||||
|
||||
this.RefreshLayer(showTab,k,v)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@ function WeekCardPanel:InitComponent()
|
|||
self.selectTxt=Util.GetGameObject(self.gameObject, "selectObj/Text"):GetComponent("Text")
|
||||
self.info1=Util.GetGameObject(self.gameObject, "info1"):GetComponent("Text")
|
||||
self.info2=Util.GetGameObject(self.gameObject, "info2"):GetComponent("Text")
|
||||
self.info1.text="购买后可连续7日领取奖励"
|
||||
self.info2.text="每日0点刷新,奖励可累计领取"
|
||||
self.info1.text="·购买后可连续7日领取奖励"
|
||||
self.info2.text="·每日0点刷新,奖励可累计领取"
|
||||
self.titleImg=Util.GetGameObject(self.gameObject, "titleImg"):GetComponent("Image")
|
||||
self.titleImg.sprite=self.spLoader:LoadSprite("r_zhouka_zksh_zh")
|
||||
for i= 1 ,self.grid.transform.childCount do
|
||||
|
|
@ -281,7 +281,8 @@ function WeekCardPanel:ShowCardInfo(index,config)
|
|||
end
|
||||
pre.icon.sprite = self.spLoader:LoadSprite(icon)
|
||||
pre.Text.text = name.."*"..PrintWanNum2(oneNum)
|
||||
pre.hint.text = "共计"..PrintWanNum2(allNum)..name
|
||||
local str=PrintWanNum2(allNum)..name
|
||||
pre.hint.text = "共计: ".."<color=#ffe79a>"..str.."</color>"
|
||||
local rechargeCfg = _RechargeCommodityConfig[config.RechargeId]
|
||||
if not rechargeCfg then
|
||||
return
|
||||
|
|
|
|||
|
|
@ -105,6 +105,7 @@ function this.ResetLocalData(var)--初始化所有本地的每日一刷--1是五
|
|||
PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.XiangYaoTen,0)
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.BaoGeTen,0)
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_ChangeHeroProConfirm",0)
|
||||
PlayerPrefs.SetInt("IsCheckWeekCard_"..PlayerManager.uid, 0)
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."CommonActPage"..ActivityTypeDef.YunYouShangRen,0)
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue