Merge branch 'china/local' into china/test
commit
4722ab29d6
Binary file not shown.
After Width: | Height: | Size: 389 KiB |
|
@ -0,0 +1,121 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 9859e8fd4d39ca349946f4c527799eb9
|
||||
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: 0
|
||||
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
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 4
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- 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: 57
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5621e4cf5a5876944956f4131c035ca7
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName: lz4/bg/w_wybq_bg
|
||||
assetBundleVariant: unity3d
|
|
@ -106,7 +106,7 @@ function PackageManager.SetVideo(obj, bg)
|
|||
Log("加载Stream视频:"..tostring(this.StreamConfig.LoginPanelVideoBG))
|
||||
if UIManager.IsOpen(UIName.LoginPanel) then
|
||||
local video = obj:GetComponent("VideoPlayer")
|
||||
video.url = "file://" .. UnityEngine.Application.streamingAssetsPath .."/Res/"..tostring(this.StreamConfig.LoginPanelVideoBG)..".mp4"
|
||||
video.url = UnityEngine.Application.streamingAssetsPath .."/Res/"..tostring(this.StreamConfig.LoginPanelVideoBG)..".mp4"
|
||||
video:Play()
|
||||
bg:DOFade(0, 2)
|
||||
obj:SetActive(true)
|
||||
|
|
|
@ -299,16 +299,26 @@ function this.OnPageTabChange(index)
|
|||
subViewList[index].sub:OnShow(orginLayer)
|
||||
end
|
||||
end
|
||||
if tabs[index].UpView and #tabs[index].UpView > 0 then
|
||||
this.upView:OnOpen({showType = tabs[index].UpView[1][1], panelType = tabs[index].UpView[2] })
|
||||
this.upView.gameObject:SetActive(true)
|
||||
else
|
||||
this.upView.gameObject:SetActive(false)
|
||||
end
|
||||
this.SetUpView(tabs[index])
|
||||
DynamicActivityManager.ChangeUIList(tabs[index].Jump)
|
||||
_CurPageIndex = index
|
||||
end
|
||||
|
||||
function this.SetUpView(_data)
|
||||
local data = _data
|
||||
if _data.ActiveType == ActivityTypeDef.DynamicActShop then
|
||||
local actId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicActShop)
|
||||
if actId then
|
||||
data = ConfigManager.GetConfigDataByDoubleKey(ConfigName.ActivityGroups,"ActId",actId,"ActiveType",ActivityTypeDef.DynamicActShop)
|
||||
end
|
||||
end
|
||||
if data.UpView and #data.UpView > 0 then
|
||||
this.upView:OnOpen({showType = data.UpView[1][1], panelType = data.UpView[2] })
|
||||
this.upView.gameObject:SetActive(true)
|
||||
else
|
||||
this.upView.gameObject:SetActive(false)
|
||||
end
|
||||
end
|
||||
|
||||
--界面关闭时调用(用于子类重写)
|
||||
function ActivityMainPanel:OnClose()
|
||||
|
|
|
@ -610,8 +610,12 @@ local jumpDic = {
|
|||
end
|
||||
UIManager.OpenPanel(UIName.MainShopPanel,13)
|
||||
end,
|
||||
[JumpType.Pokemon] = function()--灵兽山(驭兽斋)
|
||||
UIManager.OpenPanel(UIName.PokemonSummonPanel)
|
||||
[JumpType.Pokemon] = function(data)--灵兽山(驭兽斋)
|
||||
if data and data[1] == 1 then
|
||||
UIManager.OpenPanel(UIName.PokemonSummonPanel)
|
||||
elseif data and data[1] == 2 then
|
||||
UIManager.OpenPanel(UIName.PokemonMainPanel)
|
||||
end
|
||||
end,
|
||||
[JumpType.HongMengZhen] = function ()
|
||||
-- body
|
||||
|
|
Loading…
Reference in New Issue