【ID1009604】

【优化】限时心愿招募抽取的普通神将调整为同系卡
dev_chengFeng
jiaoyangna 2021-06-30 19:48:05 +08:00
parent 349404d50e
commit bfd653a98f
8 changed files with 5025 additions and 8 deletions

View File

@ -0,0 +1,106 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: star 4
m_Shader: {fileID: 4800000, guid: 43a4ca9cf05b4fc4c9a47ef6103ea3ba, type: 3}
m_ShaderKeywords: _CA_SOFTPARTICLES_OFF
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Grain:
m_Texture: {fileID: 2800000, guid: 4ac582119a95920408cce78c37350e35, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 7e7488a1bb12eca4d8f87d654c43c1f5, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Main_Tex:
m_Texture: {fileID: 2800000, guid: c27c3fa5087c54a4daede54cdcd766a9, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Mask:
m_Texture: {fileID: 2800000, guid: 7e7488a1bb12eca4d8f87d654c43c1f5, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MaskTex:
m_Texture: {fileID: 2800000, guid: 579d7a890dd5d9346994e0f97c6a56bf, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _CA_SoftParticles: 0
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Grain_U_Speed: 5
- _Grain_V_Speed: 5
- _InvFade: 5
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Rotator: 0
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _U_Speed: 0.5
- _V_Speed: 0
- _ZWrite: 1
m_Colors:
- _Center: {r: 0, g: 0, b: 0, a: 1}
- _Color: {r: 16, g: 16, b: 1.4431373, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _Grain_Color: {r: 1, g: 1, b: 1, a: 1}
- _Main_Color: {r: 1, g: 1, b: 1, a: 1}
- _Normal: {r: 0, g: 0, b: 1, a: 0}
- _Scale: {r: 1, g: 1, b: 1, a: 1}
- _TintColor: {r: 0.12549019, g: 1, b: 0.8301952, a: 1}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d9fcae3d02653ea469a8037ce7cf9698
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: db382058d15766c4bbed6e13d7457f44
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

View File

@ -0,0 +1,99 @@
fileFormatVersion: 2
guid: 7e7488a1bb12eca4d8f87d654c43c1f5
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 1
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: -1
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: 0
spriteTessellationDetail: -1
textureType: 0
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
- serializedVersion: 2
buildTarget: Standalone
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: 24ec4581301f12447bba9532029895d2
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -851,7 +851,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4300363014719737227}
- {fileID: 4724784087974829125}
- {fileID: 7039558217019961945}
m_Father: {fileID: 224014376810088690}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -5615,7 +5615,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1001 &3760684127837706559
--- !u!1001 &1445906946178103075
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
@ -5690,7 +5690,7 @@ PrefabInstance:
- target: {fileID: 8476175074273985914, guid: a05897d7661f3c74b8eef374b02d6fd5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -14
value: -13
objectReference: {fileID: 0}
- target: {fileID: 8476175074273985914, guid: a05897d7661f3c74b8eef374b02d6fd5,
type: 3}
@ -5734,9 +5734,9 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a05897d7661f3c74b8eef374b02d6fd5, type: 3}
--- !u!224 &4724784087974829125 stripped
--- !u!224 &7039558217019961945 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8476175074273985914, guid: a05897d7661f3c74b8eef374b02d6fd5,
type: 3}
m_PrefabInstance: {fileID: 3760684127837706559}
m_PrefabInstance: {fileID: 1445906946178103075}
m_PrefabAsset: {fileID: 0}

View File

@ -76,17 +76,20 @@ function this:OnShow(_parent,...)
if activityType == ActivityTypeDef.LimitUpHero then
local heroConfig=ConfigManager.TryGetConfigData(ConfigName.HeroConfig,heroID)
local wishUpConfig=ConfigManager.TryGetConfigDataByKey(ConfigName.WishActivityUp,"ActivityId",activityId)
local num = 0
local num,pro = 0,0
for i = 1, #wishUpConfig.UpList do
if wishUpConfig.UpList[i][1]==heroID then
num = wishUpConfig.UpList[i][3]
pro = wishUpConfig.UpList[i][4]
break
end
end
UpItemList = {Reward = {heroConfig.Id,1},Weight = num}
for k, v in ConfigPairs(pool) do
local data = {Reward = v.ItemId,Weight = v.GetRate,sort = v.Sort}
table.insert(itemList,data)
if v.Camp == pro then
local data = {Reward = v.ItemId,Weight = v.GetRate,sort = v.Sort}
table.insert(itemList,data)
end
end
table.sort(itemList,function(a,b)
return a.sort < b.sort