Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
eb156ad3cd
Binary file not shown.
After Width: | Height: | Size: 35 KiB |
|
@ -0,0 +1,99 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 5724c4d71b6000a47a8946c2dc01aeb4
|
||||
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
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5006eb3cdb592284992196779da8f460
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: CommonAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -806,6 +806,8 @@ GameObject:
|
|||
- component: {fileID: 9183493092506596636}
|
||||
- component: {fileID: 4680263559291788476}
|
||||
- component: {fileID: 1713348630478564721}
|
||||
- component: {fileID: 738113598}
|
||||
- component: {fileID: 738113597}
|
||||
m_Layer: 5
|
||||
m_Name: infoPanel
|
||||
m_TagString: Untagged
|
||||
|
@ -912,6 +914,44 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!223 &738113598
|
||||
Canvas:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 536596799022685883}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_RenderMode: 2
|
||||
m_Camera: {fileID: 0}
|
||||
m_PlaneDistance: 100
|
||||
m_PixelPerfect: 0
|
||||
m_ReceivesEvents: 1
|
||||
m_OverrideSorting: 1
|
||||
m_OverridePixelPerfect: 0
|
||||
m_SortingBucketNormalizedSize: 0
|
||||
m_AdditionalShaderChannelsFlag: 0
|
||||
m_SortingLayerID: 0
|
||||
m_SortingOrder: 800
|
||||
m_TargetDisplay: 0
|
||||
--- !u!114 &738113597
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 536596799022685883}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreReversedGraphics: 1
|
||||
m_BlockingObjects: 0
|
||||
m_BlockingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
--- !u!1 &605440688170322811
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -293,13 +293,10 @@ function this.SetActivityInfo(type, Id, state)
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
function this.SetActivityInfoProgress(type, Id,state)
|
||||
for _, missInfo in pairs(this.mission[type].mission) do
|
||||
if missInfo.missionId == Id then
|
||||
missInfo.state = state
|
||||
break
|
||||
end
|
||||
--设置限时抽卡活动up英雄id
|
||||
function this.SetActivityInfoRewardId(type,Id)
|
||||
if this.mission[type] then
|
||||
this.mission[type].choiceRewardId=Id
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -145,7 +145,7 @@ function this:ShowItemInfo(go,data)
|
|||
--显示红包信息
|
||||
Util.AddOnceClick(go,function()
|
||||
this.infoObj.gameObject:SetActive(true)
|
||||
this.numTxt.text=data.config.TotalMoney[1]
|
||||
this.numTxt.text=data.config.Num
|
||||
this.sumTxt.text=data.config.TotalMoney[2]
|
||||
this.rewardImg.sprite=this.spLoader:LoadSprite(GetResourcePath(data.config.IconId))
|
||||
end)
|
||||
|
|
|
@ -29,6 +29,7 @@ function this:BindEvent()
|
|||
end)
|
||||
Util.AddClick(this.confirmBtn,function()
|
||||
NetManager.ChoiceHeroRewardRequest(args[1],currHeroId,function()
|
||||
ActivityGiftManager.SetActivityInfoRewardId(args[1],currHeroId)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Activity.TimeLimitUpHeroChange,currHeroId)
|
||||
parent:ClosePanel()
|
||||
end)
|
||||
|
@ -87,7 +88,6 @@ function this.SingleHeroDataShow(go,_heroData)
|
|||
Util.GetGameObject(_go.transform, "posIcon"):SetActive(false)
|
||||
Util.GetGameObject(_go.transform, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.PropertyName))
|
||||
local starGrid = Util.GetGameObject(_go.transform, "star")
|
||||
LogError("_heroData.Id==".._heroData.Id.." currid="..currHeroId)
|
||||
if _heroData.Id==currHeroId then
|
||||
this.selectObj.transform:SetParent(_go.transform)
|
||||
this.selectObj.transform.localScale=Vector3.one
|
||||
|
|
|
@ -13,6 +13,7 @@ function TaSuiLingXiao:InitComponent()
|
|||
self.btnBack = Util.GetGameObject(self.gameObject, "btnBack")
|
||||
self.btnHelp = Util.GetGameObject(self.gameObject, "btnHelp")
|
||||
self.btnRank = Util.GetGameObject(self.gameObject, "btnRank")
|
||||
self.btnRank:SetActive(false)
|
||||
self.btnBox = Util.GetGameObject(self.gameObject, "progress/box")
|
||||
self.mid = Util.GetGameObject(self.gameObject, "mid")
|
||||
self.finishedText = Util.GetGameObject(self.mid, "FinishedText")
|
||||
|
|
Loading…
Reference in New Issue