每日豪礼 显示升级礼包 资源修改

dev_chengFeng
ZhangBiao 2020-08-25 17:29:03 +08:00
parent c6293a0566
commit 58aa9c2dce
7 changed files with 293 additions and 30 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 1bf1dd82941d1484c933c19553f1106e
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: 829dee2b1ef0fad488685c3db7774176
vertices: []
indices:
edges: []
weights: []
spritePackingTag: ActivityAltas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: e4fe488f89104bc4b9f64aea3d6001fd
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: f345696dd7e5cdf429754ebd3d518b6b
vertices: []
indices:
edges: []
weights: []
spritePackingTag: ActivityAltas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -4671,7 +4671,7 @@ ParticleSystem:
--- !u!199 &2174788005330899663
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -9328,7 +9328,7 @@ ParticleSystem:
--- !u!199 &6370724710425477747
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -14131,7 +14131,7 @@ ParticleSystem:
--- !u!199 &4277026762018849806
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -14266,6 +14266,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6891459877915491670}
- {fileID: 1858337286414582230}
- {fileID: 1232358333541977880}
m_Father: {fileID: 2666603382833339960}
m_RootOrder: 2
@ -18956,7 +18957,7 @@ ParticleSystem:
--- !u!199 &742725442181815331
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -23728,7 +23729,7 @@ ParticleSystem:
--- !u!199 &1950815648467334135
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -28545,7 +28546,7 @@ ParticleSystem:
--- !u!199 &4239675690679428706
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -33288,7 +33289,7 @@ ParticleSystem:
--- !u!199 &6684033134204796772
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -38060,7 +38061,7 @@ ParticleSystem:
--- !u!199 &3135484667553430532
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -42764,7 +42765,7 @@ ParticleSystem:
--- !u!199 &6978112115618927649
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -47468,7 +47469,7 @@ ParticleSystem:
--- !u!199 &7866373799148366000
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -52389,7 +52390,7 @@ ParticleSystem:
--- !u!199 &4229450001531556512
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -57119,7 +57120,7 @@ ParticleSystem:
--- !u!199 &2574043738631711214
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -61849,7 +61850,7 @@ ParticleSystem:
--- !u!199 &1305699575149293405
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -62308,8 +62309,8 @@ 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: -2, y: -20}
m_SizeDelta: {x: 480, y: 150}
m_AnchoredPosition: {x: -21, y: -20}
m_SizeDelta: {x: 418, y: 148}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1701309697473643081
CanvasRenderer:
@ -62339,7 +62340,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: d7ff0086bd0f4a2418d1c08162c2802f, type: 3}
m_Sprite: {fileID: 21300000, guid: e4fe488f89104bc4b9f64aea3d6001fd, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -66993,7 +66994,7 @@ ParticleSystem:
--- !u!199 &8330290147680022259
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -71659,7 +71660,7 @@ ParticleSystem:
--- !u!199 &6038458938633213501
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -76249,7 +76250,7 @@ ParticleSystem:
--- !u!199 &229368145696154753
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -81224,7 +81225,7 @@ ParticleSystem:
--- !u!199 &4576694311343001597
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -81313,11 +81314,11 @@ RectTransform:
m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
m_Children: []
m_Father: {fileID: 4810961925972088587}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -3}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 95, y: 23}
m_AnchoredPosition: {x: 146, y: 15}
m_SizeDelta: {x: 200, y: 210}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &873408025694133751
@ -81361,7 +81362,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 648
m_Text: 3
--- !u!1 &6530875567309028468
GameObject:
m_ObjectHideFlags: 0
@ -81638,6 +81639,80 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u6BCF\n\u65E5\n\u9650\n\u8D2D\n1\n\u6B21"
LanguageIndex: 10341
--- !u!1 &6865133760093087843
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1858337286414582230}
- component: {fileID: 8392695639743829547}
- component: {fileID: 214811510772124694}
m_Layer: 5
m_Name: dollar
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1858337286414582230
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6865133760093087843}
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: 4810961925972088587}
m_RootOrder: 1
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: 88, y: 16}
m_SizeDelta: {x: 44, y: 86}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8392695639743829547
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6865133760093087843}
m_CullTransparentMesh: 0
--- !u!114 &214811510772124694
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6865133760093087843}
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: 0
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: 1e2d84c75cd281242a2bf1f69edfec36, 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
--- !u!1 &6879166851826757275
GameObject:
m_ObjectHideFlags: 0
@ -86215,7 +86290,7 @@ ParticleSystem:
--- !u!199 &3348382477625199262
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}

View File

@ -13,7 +13,8 @@ local kMaxReward = 4
local rechargeBgDef = {
[1] = "r_mrcz_zi_1",
[2] = "r_mrcz_zi_2",
[3] = "r_mrcz_zi_3"
[3] = "r_mrcz_zi_33",
[4] = "r_mrcz_zi_4",
}
local cursortingOrder
local isFirstOpen = false
@ -23,7 +24,8 @@ function DailyRechargePanel:InitComponent()
self.extraIcon = Util.GetGameObject(self.transform,"frame/bg/descbg/extraIcon"):GetComponent("Image")
self.desc = Util.GetGameObject(self.transform, "frame/bg/descbg/value"):GetComponent("Text")
self.dollar = Util.GetGameObject(self.transform,"frame/bg/descbg/dollar")
self.dollar:SetActive(false)
self.rewardContent = {}
self.rewardContentEffect = {}
self.rewardList = {}
@ -81,16 +83,19 @@ function DailyRechargePanel:RefreshPanel()
local actRewardConfig = ConfigManager.GetConfigData(ConfigName.ActivityRewardConfig, self.missionInfo.missionId)
if self.missionInfo.state == 0 then
if DailyRechargeManager.GetRechargeValue()==0 then
self.extraIcon.sprite = Util.LoadSprite(rechargeBgDef[1])
self.extraIcon.sprite = Util.LoadSprite(rechargeBgDef[4])
self.dollar:SetActive(true)
self.desc.text = actRewardConfig.Values[1][1]
self.dealText.text = Language[10436]
else
if DailyRechargeManager.ReceivedEnabled() then
self.extraIcon.sprite = Util.LoadSprite(rechargeBgDef[3])
self.dollar:SetActive(false)
self.dealText.text = Language[10022]
self.desc.text = ""
else
self.extraIcon.sprite = Util.LoadSprite(rechargeBgDef[2])
self.extraIcon.sprite = Util.LoadSprite(rechargeBgDef[4])
self.dollar:SetActive(true)
local remainValue = actRewardConfig.Values[1][1] - DailyRechargeManager.GetRechargeValue()
remainValue = remainValue < 0 and 0 or remainValue
self.desc.text = remainValue
@ -99,7 +104,8 @@ function DailyRechargePanel:RefreshPanel()
end
else
self.dealText.text = Language[10350]
self.extraIcon.sprite = Util.LoadSprite(rechargeBgDef[2])
self.extraIcon.sprite = Util.LoadSprite(rechargeBgDef[4])
self.dollar:SetActive(true)
end
self.extraIcon:SetNativeSize()
table.walk(self.rewardContent, function(rewardPosItem)

View File

@ -173,8 +173,14 @@ function this:Refresh()
end
Util.GetGameObject(self.gameObject,activityType[curType].comp):SetActive(true)
local level = 0
if (PlayerManager.level)%10 == 8 then
level = PlayerManager.level
else
level = (math.floor(PlayerManager.level/10)-1)*10+8
end
rechargeNum= VipManager.GetChargedNum()
this.tip.text = curType == 1 and Language[12000]..PlayerManager.level..Language[12001] or ""
this.tip.text = curType == 1 and Language[12000]..level..Language[12001] or ""
this.arrowsLeft:SetActive(num > 1)
this.arrowsRight:SetActive(num > 1)
curGiftId = rechargeData.goodsId