神魂提交

dev_chengFeng
jiaoyangna 2021-11-02 10:20:17 +08:00
parent e049612d3a
commit a41765d10b
15 changed files with 14590 additions and 14 deletions

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 9872bead29e751c45b39edbe7e77708c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,66 @@
%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: dn_alch_fx_inbetweened_sheet_LavaMana
m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _FOG_ON
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}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 0aa6dc242e7ce3146b35e5ef5e72f75c, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BlendOp: 0
- _BumpScale: 1
- _CameraFadingEnabled: 0
- _CameraFarFadeDistance: 2
- _CameraNearFadeDistance: 1
- _ColorMode: 0
- _Cull: 2
- _Cutoff: 0.5
- _DistortionBlend: 0.5
- _DistortionEnabled: 0
- _DistortionStrength: 1
- _DistortionStrengthScaled: 0
- _DstBlend: 0
- _EmissionEnabled: 0
- _FlipbookMode: 0
- _Fog: 1
- _InvFade: 1
- _LightingEnabled: 0
- _Mode: 0
- _SoftParticlesEnabled: 0
- _SoftParticlesFarFadeDistance: 1
- _SoftParticlesNearFadeDistance: 0
- _SrcBlend: 1
- _StencilRef: 0
- _ZWrite: 1
m_Colors:
- _CameraFadeParams: {r: 0, g: 0, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
- _TintColor: {r: 0.14509803, g: 0.6166324, b: 1, a: 0.5}

View File

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

View File

@ -0,0 +1,31 @@
%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: glow_particle
m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _FOG_ON
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 2800000, guid: 4791ab4910be2b74fbb6d15291656985, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _Fog: 1
- _InvFade: 1
- _StencilRef: 0
m_Colors:
- _TintColor: {r: 0.1254902, g: 0.5939194, b: 0.6784314, a: 1}

View File

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

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3bcf6afdc170ad04d81a89d467866209
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

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

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f412e02812576174d8a02580cb84ac88
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 149 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 0aa6dc242e7ce3146b35e5ef5e72f75c
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: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
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
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 4791ab4910be2b74fbb6d15291656985
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: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
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
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -234,6 +234,42 @@ function this.GetGodSoulDataByLv(id,lv,conditionIndex)
return {}
end
function this.MergeGodSoulDataByLv(heroId,lv)
local tempData = {}
for k,v in ipairs(heroConfig[heroId].Soul) do
if v[1] == lv then
local data = {}
data.index = v[2]
data.num = v[4]
local config = heroRankupGroup[v[3]]
if config.Issame == 1 then
data.id = heroConfig[heroId].Id
data.property = 0
data.profession = 0
elseif config.IsId > 0 then
data.id = config.IsId
data.property = 0
data.profession = 0
else
data.id = 0
if config.IsSameClan == 1 then
data.property = heroConfig[heroId].PropertyName
else
data.property = 0
end
if config.IsSameJob == 1 then
data.profession = heroConfig[heroId].Profession
else
data.profession = 0
end
end
data.star = config.StarLimit
table.insert(tempData,data)
end
end
return tempData
end
--检测红点
function this.CheckRedPointGodSoul(curHeroData)
if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.shenhun)

View File

@ -144,6 +144,7 @@ function RoleGodSoulLayout:UpdateGodList()
end
end
--index 等级
function RoleGodSoulLayout:UpdataSingleGod(index)
for i = 1,math.max(#self.gridList[index].godLvList,index) do
if index < i then
@ -157,9 +158,9 @@ function RoleGodSoulLayout:UpdataSingleGod(index)
end
--绿色
self.gridList[index].tip.text = string.format("<color=#B5AA95>需要:</color>")
for i = 1,math.max(#self.gridList[index].costList,#self.godDatas[index]) do
--LogGreen("#self.godDatas[index]:"..#self.godDatas[index])
if not self.godDatas[index][i] then
local godDatasByLv = GodSoulManager.MergeGodSoulDataByLv(self.heroConfig.Id,index)
for i = 1,math.max(#self.gridList[index].costList,#godDatasByLv) do
if not godDatasByLv[i] then
self.gridList[index].costList[i].go.gameObject:SetActive(false)
else
if not self.gridList[index].costList[i] then
@ -171,32 +172,32 @@ function RoleGodSoulLayout:UpdataSingleGod(index)
end
self.gridList[index].costList[i].go.gameObject:SetActive(true)
if self.godDatas[index][i].id > 0 then
if self.godDatas[index][i].star > 10 then
if godDatasByLv[i].id > 0 then
if godDatasByLv[i].star > 10 then
self.gridList[index].costList[i].frame.sprite = self.spLoader:LoadSprite("s_shenhunxitong_zuanshitouxiangkuang")
else
self.gridList[index].costList[i].frame.sprite = self.spLoader:LoadSprite("s_shenhunxitong_hong")
end
self.gridList[index].costList[i].icon.gameObject:SetActive(true)
self.gridList[index].costList[i].icon.sprite = self.spLoader:LoadSprite(GetResourcePath(heroConfig[self.godDatas[index][i].id].Icon))
elseif self.godDatas[index][i].property > 0 then
self.gridList[index].costList[i].icon.sprite = self.spLoader:LoadSprite(GetResourcePath(heroConfig[godDatasByLv[i].id].Icon))
elseif godDatasByLv[i].property > 0 then
self.gridList[index].costList[i].icon.gameObject:SetActive(false)
self.gridList[index].costList[i].frame.sprite = self.spLoader:LoadSprite(PropertySmallIcon[self.godDatas[index][i].star][self.godDatas[index][i].property])
elseif self.godDatas[index][i].profession > 0 then
self.gridList[index].costList[i].frame.sprite = self.spLoader:LoadSprite(PropertySmallIcon[godDatasByLv[i].star][godDatasByLv[i].property])
elseif godDatasByLv[i].profession > 0 then
self.gridList[index].costList[i].icon.gameObject:SetActive(false)
self.gridList[index].costList[i].frame.sprite = self.spLoader:LoadSprite(GodSoulProfession[self.godDatas[index][i].star][self.godDatas[index][i].profession])
self.gridList[index].costList[i].frame.sprite = self.spLoader:LoadSprite(GodSoulProfession[godDatasByLv[i].star][godDatasByLv[i].profession])
else
self.gridList[index].costList[i].icon.gameObject:SetActive(false)
self.gridList[index].costList[i].frame.sprite = self.spLoader:LoadSprite(StarImage[self.godDatas[index][i].star])
self.gridList[index].costList[i].frame.sprite = self.spLoader:LoadSprite(StarImage[godDatasByLv[i].star])
end
if not self.addShow then
self.gridList[index].costList[i].num.text = string.format("<color=#B5AA95>×%s</color>",self.godDatas[index][i].num)
self.gridList[index].costList[i].num.text = string.format("<color=#B5AA95>×%s</color>",godDatasByLv[i].num)
Util.SetGray(self.gridList[index].costList[i].frame.gameObject,false)
elseif index >= self.lv + 1 then --未激活时红色,图标置灰
self.gridList[index].costList[i].num.text = string.format("<color=#FF0000>×%s</color>",self.godDatas[index][i].num)
self.gridList[index].costList[i].num.text = string.format("<color=#FF0000>×%s</color>",godDatasByLv[i].num)
Util.SetGray(self.gridList[index].costList[i].frame.gameObject,true)
else --激活时绿色,图标不置灰
self.gridList[index].costList[i].num.text = string.format("<color=#00FF00>×%s</color>",self.godDatas[index][i].num)
self.gridList[index].costList[i].num.text = string.format("<color=#00FF00>×%s</color>",godDatasByLv[i].num)
Util.SetGray(self.gridList[index].costList[i].frame.gameObject,false)
end
end