Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
After Width: | Height: | Size: 194 KiB |
|
@ -0,0 +1,88 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5781e0ea391fe9e42b940d249e96e16c
|
||||||
|
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: 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: 6e6e359966ed14647ad3661118516fb3
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
spritePackingTag: EightDayAtlas
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
After Width: | Height: | Size: 1.6 MiB |
|
@ -0,0 +1,88 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 4528569438bc7614e88c1a8f819e698a
|
||||||
|
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: 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: 43fd582ca81a1544b87b86df973931d4
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
spritePackingTag: EightDayAtlas
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
Before Width: | Height: | Size: 86 KiB After Width: | Height: | Size: 73 KiB |
Before Width: | Height: | Size: 88 KiB After Width: | Height: | Size: 82 KiB |
Before Width: | Height: | Size: 89 KiB After Width: | Height: | Size: 74 KiB |
Before Width: | Height: | Size: 92 KiB After Width: | Height: | Size: 77 KiB |
|
@ -336,7 +336,7 @@ MonoBehaviour:
|
||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 0
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 0
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: $49.99
|
m_Text: "\uFFE5328"
|
||||||
--- !u!1 &2776762708753556006
|
--- !u!1 &2776762708753556006
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -97,6 +97,15 @@ function EightDayGiftPanel:SetBg(i)
|
||||||
ren:GetComponent("Image").sprite = Util.LoadSprite(bgName)
|
ren:GetComponent("Image").sprite = Util.LoadSprite(bgName)
|
||||||
ren:GetComponent("Image").enabled= true
|
ren:GetComponent("Image").enabled= true
|
||||||
this.btnPreview:SetActive(false)
|
this.btnPreview:SetActive(false)
|
||||||
|
elseif i > 3 then
|
||||||
|
ren.transform.localPosition = Vector3.New(-74,350,0)
|
||||||
|
text = "b_baridenglu_slogan08_zh 1"--文字
|
||||||
|
id = day_picture[i][4]--itemviewId
|
||||||
|
bgName = "b_baridenglu_slogan08_4geren"--动效资源名字
|
||||||
|
tip.sprite = Util.LoadSprite(text)
|
||||||
|
ren:GetComponent("Image").sprite = Util.LoadSprite(bgName)
|
||||||
|
ren:GetComponent("Image").enabled= true
|
||||||
|
this.btnPreview:SetActive(false)
|
||||||
else
|
else
|
||||||
this.btnPreview:SetActive(true)
|
this.btnPreview:SetActive(true)
|
||||||
text = tostring(day_picture[i][3])--文字
|
text = tostring(day_picture[i][3])--文字
|
||||||
|
@ -112,7 +121,7 @@ function EightDayGiftPanel:SetBg(i)
|
||||||
end
|
end
|
||||||
|
|
||||||
else
|
else
|
||||||
if curDay == 3 or curDay ==2 and rewardData.mission[2].state == 1 then
|
if curDay == 3 or (curDay ==2 and rewardData.mission[2].state == 1) then
|
||||||
this.btnPreview:SetActive(false)
|
this.btnPreview:SetActive(false)
|
||||||
ren.transform.localPosition = Vector3.New(-74,100,0)
|
ren.transform.localPosition = Vector3.New(-74,100,0)
|
||||||
text = "b_baridenglu_slogan03_zh"--文字
|
text = "b_baridenglu_slogan03_zh"--文字
|
||||||
|
@ -121,6 +130,15 @@ function EightDayGiftPanel:SetBg(i)
|
||||||
tip.sprite = Util.LoadSprite(text)
|
tip.sprite = Util.LoadSprite(text)
|
||||||
ren:GetComponent("Image").sprite = Util.LoadSprite(bgName)
|
ren:GetComponent("Image").sprite = Util.LoadSprite(bgName)
|
||||||
ren:GetComponent("Image").enabled= true
|
ren:GetComponent("Image").enabled= true
|
||||||
|
elseif curDay > 3 or (curDay == 3 and rewardData.mission[3].state == 1) then
|
||||||
|
this.btnPreview:SetActive(false)
|
||||||
|
ren.transform.localPosition = Vector3.New(-74,350,0)
|
||||||
|
text = "b_baridenglu_slogan08_zh 1"--文字
|
||||||
|
id = day_picture[3][4]--itemviewId
|
||||||
|
bgName = "b_baridenglu_slogan08_4geren"--动效资源名字
|
||||||
|
tip.sprite = Util.LoadSprite(text)
|
||||||
|
ren:GetComponent("Image").sprite = Util.LoadSprite(bgName)
|
||||||
|
ren:GetComponent("Image").enabled= true
|
||||||
else
|
else
|
||||||
this.btnPreview:SetActive(true)
|
this.btnPreview:SetActive(true)
|
||||||
if rewardData.mission[curDay].state == 1 and curDay ~= 8 then
|
if rewardData.mission[curDay].state == 1 and curDay ~= 8 then
|
||||||
|
|