Merge branch 'master_develop' into master_tishen_hw

dev_chengFeng
JieLing 2020-09-05 19:06:31 +08:00
commit 007487ed91
5 changed files with 149 additions and 21 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 153 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 4baab2b0c2cb9f14fa189fbac647439d
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: 58
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: 978ea6a965f86aa4cbfc75acbdf4b040
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -363,9 +363,9 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -545, y: 0}
m_SizeDelta: {x: 300.00003, y: 3000.0002}
m_Pivot: {x: 1, y: 0.5}
--- !u!222 &1078295727918778544
CanvasRenderer:
m_ObjectHideFlags: 0
@ -387,14 +387,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 21300000, guid: 4baab2b0c2cb9f14fa189fbac647439d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -452,16 +452,16 @@ RectTransform:
m_GameObject: {fileID: 5312646946365022691}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: -1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224437101117242940}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 542, y: 0}
m_SizeDelta: {x: 300.00003, y: 3000.0002}
m_Pivot: {x: 1, y: 0.5}
--- !u!222 &4066243341870019985
CanvasRenderer:
m_ObjectHideFlags: 0
@ -483,14 +483,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 21300000, guid: 4baab2b0c2cb9f14fa189fbac647439d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

View File

@ -1945,6 +1945,7 @@ GameObject:
m_Component:
- component: {fileID: 4567892664886318}
- component: {fileID: 114611151010125922}
- component: {fileID: 4264889797209096721}
m_Layer: 5
m_Name: UpdatePanel
m_TagString: Untagged
@ -1983,6 +1984,20 @@ MonoBehaviour:
tipsText: {fileID: 6171492345611651074}
slider: {fileID: 114363176137009512}
msgBox: {fileID: 114889054646747368}
--- !u!114 &4264889797209096721
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1760809705854780}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7fdc50ec1a2f1534f93155e67c3708ab, type: 3}
m_Name:
m_EditorClassIdentifier:
bgList:
- {fileID: 1403187064933534}
--- !u!1 &1773781807604024
GameObject:
m_ObjectHideFlags: 0

View File

@ -173,19 +173,22 @@ function UIManager.Adapter()
rectTransform.offsetMin = Vector2.New(rectTransform.offsetMin.x + f, rectTransform.offsetMin.y)
rectTransform.offsetMax = Vector2.New(rectTransform.offsetMax.x - f, rectTransform.offsetMax.y)
local fw = UIManager.UIWidth/2 - f
rectTransform = this.screenMask1:GetComponent("RectTransform")
rectTransform.anchorMin = Vector2.New(0, 0)
rectTransform.anchorMax = Vector2.New(0, 1)
rectTransform.offsetMin = Vector2.New(0, 0)
rectTransform.offsetMax = Vector2.New(0, 0)
rectTransform.sizeDelta = Vector2.New(f*2, 0)
rectTransform.anchoredPosition = Vector2.New(-fw, 0)
-- rectTransform.anchorMin = Vector2.New(0, 0)
-- rectTransform.anchorMax = Vector2.New(0, 1)
-- rectTransform.offsetMin = Vector2.New(0, 0)
-- rectTransform.offsetMax = Vector2.New(0, 0)
-- rectTransform.sizeDelta = Vector2.New(f*2, 0)
rectTransform = this.screenMask2:GetComponent("RectTransform")
rectTransform.anchorMin = Vector2.New(1, 0)
rectTransform.anchorMax = Vector2.New(1, 1)
rectTransform.offsetMin = Vector2.New(0, 0)
rectTransform.offsetMax = Vector2.New(0, 0)
rectTransform.sizeDelta = Vector2.New(f*2, 0)
rectTransform.anchoredPosition = Vector2.New(fw, 0)
-- rectTransform.anchorMin = Vector2.New(1, 0)
-- rectTransform.anchorMax = Vector2.New(1, 1)
-- rectTransform.offsetMin = Vector2.New(0, 0)
-- rectTransform.offsetMax = Vector2.New(0, 0)
-- rectTransform.sizeDelta = Vector2.New(f*2, 0)
else
this.screenMask1:SetActive(false)