Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

# Conflicts:
#	Assets/ManagedResources/Icon/LinshiSkill/linshi_2000340_xy.png.meta
#	Assets/ManagedResources/Icon/LinshiSkill/linshi_8810_hh.png.meta
#	Assets/ManagedResources/Icon/LinshiSkill/linshi_ysz_7.png.meta
dev_chengFeng
jiaoyangna 2022-01-14 10:19:54 +08:00
commit ed63358ab6
6 changed files with 125 additions and 7 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.4 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 6065f4d9488b4a34194807751200d2b4
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: 56
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: c106e698d8d377343858c91b233222c0
vertices: []
indices:
edges: []
weights: []
spritePackingTag: FloatingViewAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 385851b7a8171454a91d96aca929cdbf
guid: 4aa2e59504f13d849be242f35f572479
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -75,7 +75,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID: a3887fe19de6e974c85cb61d3400c452
spriteID: 67a5464ea4de74f4f99dcce0dacb7748
vertices: []
indices:
edges: []

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: da730810db5bda743b7dc6db9031ea58
guid: 2a960efbacc298246862127f158bbe6c
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -75,7 +75,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID: a3cb8619fa0e19143821310d662d1faf
spriteID: ac7bd526df714884681df63a3db06206
vertices: []
indices:
edges: []

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 39a83619056f1c04fa1d93f5d9d5dc66
guid: aaaefc739aa622b4b9b5ae4a96591134
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -75,7 +75,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID: 03454f7919db03240be9b3e193ab9340
spriteID: 8ade37842c2c1804cb6d299339284ca8
vertices: []
indices:
edges: []

View File

@ -187,7 +187,7 @@ end
--通过两个id计算两个等级
function this.IdToLevel(id1,id2)
local lv1 = EquipStrengthen[id1] and EquipStrengthen[id1].Level or 0
local lv2 = EquipRankUp[id1] and EquipRankUp[id1].Level or 0
local lv2 = EquipRankUp[id2] and EquipRankUp[id2].Level or 0
return {lv1, lv2}
end
@ -284,6 +284,14 @@ end
--摘星阁
function this.CheckEquipUpgrade()
if this.BuildData[5].level >= HomeLand[6].UnlockLevel[2] then
if this.GetAllCanUpgrade() then
local configData = EquipRankUp[this.levelProId]
if configData.Cost and BagManager.GetTotalItemNum(configData.Cost[1]) >= configData.Cost[2] then
return true
else
return false
end
end
for i = 1, 4 do
if this.CheckSingleEquipUpgrade(i) then
return true