Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
altair 2020-07-28 17:50:23 +08:00
commit f9b8b938ff
3 changed files with 121 additions and 10 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 72c1840c0fe85b647bd18cbb3c6af183
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: 65
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: 4876735731250874fb216924451e0530
vertices: []
indices:
edges: []
weights: []
spritePackingTag: FindTreasureAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -4,6 +4,7 @@
[3] = "x_xb_shuzi_03",
[4] = "x_xb_shuzi_04",
[5] = "x_xb_shuzi_05",
[6] = "x_xb_shuzi_06",
}
require("Base/BasePanel")
FindTreasureDispatchPanel = Inherit(BasePanel)
@ -467,19 +468,19 @@ function FindTreasureDispatchPanel:SortHeroDatas2(_heroDatas)
end
function FindTreasureDispatchPanel:GetHeroStarImage(star,type)
if type == 1 then
if star < 6 then
-- if star < 6 then
return star
elseif star > 5 then
return star%5
end
-- elseif star > 5 then
-- return star%5
-- end
else
if star < 6 then
-- if star < 6 then
return "ui_1xing"
elseif star > 5 and star < 11 then
return "ui_1yue"
elseif star > 10 then
return "ui_1un"
end
-- elseif star > 5 and star < 11 then
-- return "ui_1yue"
-- elseif star > 10 then
-- return "ui_1un"
-- end
end
end
function FindTreasureDispatchPanel:TimeStampToDateString(second)