root
/
miduo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【活动优化】日周月礼包增加角标及妖晶数量变更

dev_chengFeng
ZhangBiao 2021-04-09 11:05:08 +08:00
parent 115b2ee04d
commit 8893dd7d7b
5 changed files with 189 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/l_mrlb_200.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

99
Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/l_mrlb_200.png.meta 100644
View File

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

97
Assets/ManagedResources/Prefabs/UI/View/ItemView.prefab
View File

@ -14639,6 +14639,7 @@ RectTransform:
- {fileID: 224891548581564834}
- {fileID: 4523474928375603261}
- {fileID: 8104267540032568317}
- {fileID: 7236739394091036303}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -44801,7 +44802,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &8104267540032568317
RectTransform:
m_ObjectHideFlags: 0
@ -73199,6 +73200,80 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &9145962355526808892
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7236739394091036303}
- component: {fileID: 957207158026372758}
- component: {fileID: 2514265809793224427}
m_Layer: 5
m_Name: Double
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &7236739394091036303
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9145962355526808892}
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: 224797861638971062}
m_RootOrder: 6
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: 35.5, y: 59.7}
m_SizeDelta: {x: 120, y: 77}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &957207158026372758
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9145962355526808892}
m_CullTransparentMesh: 0
--- !u!114 &2514265809793224427
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9145962355526808892}
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: 0a9e030b1d056e64fbf405d848489322, 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!1001 &2565918367008648710
PrefabInstance:
m_ObjectHideFlags: 0
@ -73286,6 +73361,16 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 4523474928375603261}
m_Modifications:
- target: {fileID: 7411879508304079121, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_Name
value: UI_Effect_jinkuang_Fang
objectReference: {fileID: 0}
- target: {fileID: 7411879508304079121, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalPosition.x
@ -73341,16 +73426,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7411879508304079121, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_Name
value: UI_Effect_jinkuang_Fang
objectReference: {fileID: 0}
- target: {fileID: 7411879508304079121, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 37188270916d7b7408c84c2a0cb12583, type: 3}
--- !u!4 &2199886401291512776 stripped

2
Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua
View File

@ -186,7 +186,7 @@ function GiftPre:SetData(data,_parent,_rechargeNum,sortingOrder)
self.itemList[i] = SubUIManager.Open(SubUIConfig.ItemView,self.grid.transform)
self.itemList[i].gameObject:SetActive(false)
end
self.itemList[i]:OnOpen(false, {self.data.data.shows[i][1],self.data.data.shows[i][2]}, 0.9,false,false,false,sortingOrder)
self.itemList[i]:OnOpen(false, {self.data.data.shows[i][1],self.data.data.shows[i][2],self.data.data.shows[i][3]}, 0.9,false,false,false,sortingOrder)
self.itemList[i].gameObject:SetActive(true)
end

33
Assets/ManagedResources/~Lua/View/ItemView.lua
View File

@ -33,9 +33,8 @@ function ItemView:InitComponent()
self.fragmentIcon=Util.GetGameObject(self.gameObject, "item/fragmentIcon")
--self.heroStage=Util.GetGameObject(self.gameObject, "item/heroShow/heroStage"):GetComponent("Image")
Util.GetGameObject(self.gameObject, "item/heroShow/heroStage"):SetActive(false)
--云梦专用
self.PreciousShow=Util.GetGameObject(self.gameObject, "PreciousShow")
self.PreciousShowText=Util.GetGameObject(self.gameObject, "PreciousShow/Text"):GetComponent("Text")
--双倍妖晶
self.Double=Util.GetGameObject(self.gameObject, "Double")
self.EffectOrginLayer = 0
self.EffectOrginLayerQu = 0
@ -117,7 +116,6 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
self.UI_Effect_jinkuang_Yuan:SetActive(false)
self.UI_effect_ItemView_saoguang:SetActive(false)
self.UI_effect_WuCai_Kuang:SetActive(false)
self.PreciousShow:SetActive(false)
self.frame.sprite = Util.LoadSprite(_itemData.frame)
self.icon.sprite = Util.LoadSprite(_itemData.icon)
self.num:GetComponent("Text").text = PrintWanNum(_itemData.num)
@ -141,19 +139,6 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
-- 卸载头像框特效
self:UnLoadFrameEffect()
local isShowPrecious = _itemData.isShowPrecious or 0
if isShowPrecious == 0 then
elseif isShowPrecious == 1 then
self.PreciousShow:SetActive(true)
self.PreciousShowText.text=Language[12023]
elseif isShowPrecious == 2 then
self.PreciousShow:SetActive(true)
self.PreciousShowText.text=Language[12024]
elseif isShowPrecious == 3 then
self.PreciousShow:SetActive(true)
self.PreciousShowText.text=Language[12025]
end
if _itemData.itemType == 1 or _itemData.itemType == 0 then--物品
--item
if effectLayer > 0 then
@ -363,7 +348,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
self.isRewardItemPop=false
local itemSId = tonumber(_reward[1])
local itemNum = tonumber(_reward[2]) or 0
local isShowPrecious = _reward[3] or 0
self.Double:SetActive((_reward[3] and _reward[3] > 1) and true or false)
local itemDataConFig = ConfigManager.GetConfigData(ConfigName.ItemConfig, itemSId)
self.fragmentIcon:SetActive(false)
self.heroShowGo:SetActive(false)
@ -382,7 +367,6 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
self.UI_Effect_jinkuang_Yuan:SetActive(false)
self.UI_effect_ItemView_saoguang:SetActive(false)
self.UI_effect_WuCai_Kuang:SetActive(false)
self.PreciousShow:SetActive(false)
self.iconGo:SetActive(true)
self.circleFrameBg:SetActive(false)
Util.AddParticleSortLayer(self.UI_Effect_Kuang_JinSe, effectLayer - self.EffectOrginLayerQu)
@ -607,17 +591,6 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
self.num:GetComponent("Text").color = Color.New(1, 1, 1, 1)
end
end
if isShowPrecious == 0 then
elseif isShowPrecious == 1 then
self.PreciousShow:SetActive(true)
self.PreciousShowText.text=Language[12023]
elseif isShowPrecious == 2 then
self.PreciousShow:SetActive(true)
self.PreciousShowText.text=Language[12024]
elseif isShowPrecious == 3 then
self.PreciousShow:SetActive(true)
self.PreciousShowText.text=Language[12025]
end
self.gameObject:GetComponent("RectTransform").localScale = Vector2.New(self.scale, self.scale)
end
function ItemView:OnBtnCkickEvent(itemSId)