周月礼包替图

dev_chengFeng
zhangqiang 2020-09-04 18:35:30 +08:00
parent cbad6e10cd
commit 6b55198f12
13 changed files with 378 additions and 41 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 885 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 724 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: dc95dfb025accdd4db418ec3c2d1a8dc
guid: 88f173a7c92a04a47a4654966049690e
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -42,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
@ -58,17 +58,6 @@ TextureImporter:
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
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
@ -108,7 +97,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID: 1667ba4202a3d2e4aa431707e6f3827c
spriteID: 7a57b819518e92549919bb8de3d27c53
vertices: []
indices:
edges: []
@ -117,5 +106,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/dynamicatlas/artfont/m_meiyuelibao_banner
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 137 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 247a0a4e8d183e549b6bbd61b78ed56a
guid: 56016e5e76457634880a693941a3218c
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -42,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
@ -58,17 +58,6 @@ TextureImporter:
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
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
@ -108,7 +97,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID: 0caf2370f55f1ed46a6c5d53dab12802
spriteID: c0c907aaf7abb9448bcd82f5103a4416
vertices: []
indices:
edges: []
@ -117,5 +106,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/dynamicatlas/artfont/m_meizhoulibao_banner
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 691 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: f6642148c123e7647ad12d32f3a746ad
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: 58
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: fd2aeda7ef9f01a44baefd56aea1258b
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 137 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: f094579e93c6cf74d89cd2f104ac43e9
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: 58
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: 4130e91031c14524891cb2f2ad9361b0
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 872 KiB

View File

@ -2492,6 +2492,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &229891864309688461
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2321818237876206716}
- component: {fileID: 4863731926673571977}
- component: {fileID: 7696409566687847168}
m_Layer: 5
m_Name: bgTextImage
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2321818237876206716
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 229891864309688461}
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: 230343394163564159}
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: 141, y: -4}
m_SizeDelta: {x: 792, y: 291}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4863731926673571977
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 229891864309688461}
m_CullTransparentMesh: 0
--- !u!114 &7696409566687847168
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 229891864309688461}
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: 56016e5e76457634880a693941a3218c, 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 &233062303329067096
GameObject:
m_ObjectHideFlags: 0
@ -51199,6 +51273,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 719978792710834655}
- {fileID: 2321818237876206716}
m_Father: {fileID: 6170035765897256290}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

View File

@ -943,6 +943,64 @@ end
--英雄身上魂印属性计算
local function CalculateSoulPrintAddVal(_heroId)
-- local allSoulPrintAddWarPowerVal = 0
-- local curHeroData = HeroManager.GetSingleHeroData(_heroId)
-- if curHeroData then
-- if (table.nums(curHeroData.soulPrintList) >= 1) then
-- for i = 1, #curHeroData.soulPrintList do
-- -- LogError(_heroId)
-- local cursoulPrintConfig = equipConfig[curHeroData.soulPrintList[i].equipId]
-- if cursoulPrintConfig then
-- allSoulPrintAddWarPowerVal = allSoulPrintAddWarPowerVal + cursoulPrintConfig.Score
-- end
-- end
-- end
-- end
-- return allSoulPrintAddWarPowerVal
local addAllProVal = {}
local singleHeroProVal,lvProVal,allHeroProVal,specialProVal
local curHeroData = HeroManager.GetSingleHeroData(_heroId)
if curHeroData then
if(table.nums(curHeroData.soulPrintList) >= 1) then
for i = 1, #curHeroData.soulPrintList do
local cursoulPrintConfig = equipConfig[curHeroData.soulPrintList[i].equipId]
if cursoulPrintConfig then
--基础属性计算
local soulPrintPropertyList = cursoulPrintConfig.Property
if soulPrintPropertyList and #soulPrintPropertyList > 0 then
for i,v in pairs(soulPrintPropertyList) do
if(addAllProVal[v[1]]) then
addAllProVal[v[1]]=v[2]+addAllProVal[v[1]]
else
addAllProVal[v[1]]=v[2]
end
end
end
--被动技能计算
if cursoulPrintConfig.PassiveSkill then
--单体加成 --单体等级限制加成 --团体加成 --减乘
singleHeroProVal,lvProVal,allHeroProVal,specialProVal = this.CalculatePassiveSkillsValList(WarPowerType.SoulPrint,cursoulPrintConfig.PassiveSkill)
end
end
end
end
end
if singleHeroProVal and LengthOfTable(singleHeroProVal) > 0 then
for i,v in pairs(singleHeroProVal) do
if addAllProVal[i] then
addAllProVal[i] = addAllProVal[i] + v
else
addAllProVal[i] = v
end
end
end
return addAllProVal,lvProVal,allHeroProVal,specialProVal
end
--英雄身上魂印属性计算
local function CalculateSoulPrintAddVal2(_heroId)
local allSoulPrintAddWarPowerVal = 0
local curHeroData = HeroManager.GetSingleHeroData(_heroId)
if curHeroData then
@ -1587,8 +1645,8 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt
-- end
--end
--魂印的属性加成
-- local singleHeroSoulPrintProVal,lvSoulPrintProVal,allHeroSoulPrintProVal,specialSoulPrintProVal = CalculateSoulPrintAddVal(curHeroData.dynamicId)
local allSoulPrintAddWarPowerVal = CalculateSoulPrintAddVal(curHeroData.dynamicId)
local singleHeroSoulPrintProVal,lvSoulPrintProVal,allHeroSoulPrintProVal,specialSoulPrintProVal = CalculateSoulPrintAddVal(curHeroData.dynamicId)
local allSoulPrintAddWarPowerVal = CalculateSoulPrintAddVal2(curHeroData.dynamicId)
-- LogError("魂印的单体属性加成 "..allSoulPrintAddWarPowerVal)
--宝器加成 宝器本身属性 + 宝器激活的强化共鸣 和 精炼共鸣
local equipTreasureAddPro = CalculateEquipTreaSureAddVal(curHeroData.dynamicId)
@ -1632,19 +1690,19 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt
this.DoubleTableCompound(allAddProVal, allPokemonPeiJianAddPro)
this.DoubleTableCompound(allAddProVal, guildSkillAllProAdd)
this.DoubleTableCompound(allAddProVal, falismanSingleHeroProVal)
-- this.DoubleTableCompound(allAddProVal,singleHeroSoulPrintProVal)
this.DoubleTableCompound(allAddProVal,singleHeroSoulPrintProVal)
this.DoubleTableCompound(allAddProVal, playerDcorateAdd)
this.DoubleTableCompound(allAddProVal, heroSkillSingleHeroProVal)
this.DoubleTableCompound(allAddProVal, equipTreasureAddPro)
this.DoubleTableCompound(allAddProVal, vipAddPro)
--100等级所有属性合并
this.DoubleTableCompound(lvProVal, falismanLvProVal)
-- this.DoubleTableCompound(lvProVal,lvSoulPrintProVal)
this.DoubleTableCompound(lvProVal,lvSoulPrintProVal)
this.DoubleTableCompound(lvProVal, heroSkillLvProVal)
--团体所有属性合并
if not _isAllHeroProVal then
this.DoubleTableCompound(allHeroProVal, falismanAllHeroProVal)
-- this.DoubleTableCompound(allHeroProVal,allHeroSoulPrintProVal)
this.DoubleTableCompound(allHeroProVal,allHeroSoulPrintProVal)
this.DoubleTableCompound(allHeroProVal, heroSkillAllHeroProVal)
this.DoubleTableCompound(allHeroProVal, teamAddPro)
end
@ -1655,7 +1713,7 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt
-- end
--4公式特殊减乘所有属性加成
this.DoubleTableCompound(specialProVal, falismanSpecialProVal)
-- this.DoubleTableCompound(specialProVal,specialSoulPrintProVal)
this.DoubleTableCompound(specialProVal,specialSoulPrintProVal)
this.DoubleTableCompound(specialProVal, heroSkillSpecialProVal)
--100等级所有属性合并
local forNum = curLvNum - 100

View File

@ -4,8 +4,8 @@ local sortingOrder = 0
local extra=nil--判断周、月礼包
local data = {
[1]={picture = "m_meizhoulibao_banner",}, --周礼包
[2]={picture = "m_meiyuelibao_banner",}, --月礼包
[1]={picture = "m_meiyuelibao_banner1",picture2 = "m_meiyuelibao_banner11",}, --周礼包
[2]={picture = "m_meiyuelibao_banner2",picture2 = "m_meiyuelibao_banner22",}, --月礼包
[3]={picture = "z_zhenqibaoge_banner",}, --珍奇宝阁
[4]={picture = "s_shengxingyouli_banner",}, --升星有礼
[5]={picture = "l_leichong_tu",}, --累计充值
@ -22,6 +22,7 @@ function WeekMonthGiftPackPage:InitComponent(gameObject)
self.itemPre = Util.GetGameObject(gameObject, "rzyBg/ItemPre")
self.bg = Util.GetGameObject(gameObject, "rzyBg")
self.titleBg = Util.GetGameObject(gameObject, "rzyBg/bg"):GetComponent("Image")
self.bgTextImage = Util.GetGameObject(gameObject, "rzyBg/bg/bgTextImage")
self.redPoint=Util.GetGameObject(gameObject,"rzyBg/freeBtn/redPoint")
self.endTime = Util.GetGameObject(gameObject, "rzyBg/endTime"):GetComponent("Text")
self.endTimeBg = Util.GetGameObject(gameObject, "rzyBg/Image")
@ -59,7 +60,12 @@ end
function WeekMonthGiftPackPage:RefreshGiftData()
local shopData = {}
self.titleBg.sprite = Util.LoadSprite(data[extra].picture)
if extra <= 2 then
self.bgTextImage:SetActive(true)
self.bgTextImage:GetComponent("Image").sprite = Util.LoadSprite(data[extra].picture2)
else
self.bgTextImage:SetActive(false)
end
if extra == 1 then--周礼包
self.tip1:SetActive(true)
self.tip2:SetActive(false)