mod:修改换装面板bg问题
parent
57ca35297a
commit
d789048c25
|
@ -16,7 +16,9 @@ MonoBehaviour:
|
||||||
deleteDllAfterBuilds: 1
|
deleteDllAfterBuilds: 1
|
||||||
AutomateForAllAOTPlatforms: 1
|
AutomateForAllAOTPlatforms: 1
|
||||||
automateForPlatforms: 0900000014000000
|
automateForPlatforms: 0900000014000000
|
||||||
|
lastScan: 638322055491964378
|
||||||
lastScan: 638322820025823816
|
lastScan: 638322820025823816
|
||||||
|
lastScan: 638315169427075152
|
||||||
supportSerializedTypes:
|
supportSerializedTypes:
|
||||||
- TypeName: UnityEngine.Animator, UnityEngine.AnimationModule
|
- TypeName: UnityEngine.Animator, UnityEngine.AnimationModule
|
||||||
IsCustom: 0
|
IsCustom: 0
|
||||||
|
@ -25,6 +27,10 @@ MonoBehaviour:
|
||||||
Unity.ResourceManager
|
Unity.ResourceManager
|
||||||
IsCustom: 0
|
IsCustom: 0
|
||||||
Emit: 1
|
Emit: 1
|
||||||
|
- TypeName: UnityEngine.ResourceManagement.AsyncOperations.AsyncOperationHandle,
|
||||||
|
Unity.ResourceManager
|
||||||
|
IsCustom: 0
|
||||||
|
Emit: 1
|
||||||
- TypeName: PMaker.Await.AwaitTimeline, Assembly-CSharp
|
- TypeName: PMaker.Await.AwaitTimeline, Assembly-CSharp
|
||||||
IsCustom: 0
|
IsCustom: 0
|
||||||
Emit: 1
|
Emit: 1
|
||||||
|
@ -43,6 +49,14 @@ MonoBehaviour:
|
||||||
UnityEngine.CoreModule]], mscorlib
|
UnityEngine.CoreModule]], mscorlib
|
||||||
IsCustom: 0
|
IsCustom: 0
|
||||||
Emit: 1
|
Emit: 1
|
||||||
|
- TypeName: System.Collections.Generic.Dictionary`2[[System.Int32, mscorlib],[UnityEngine.ResourceManagement.AsyncOperations.AsyncOperationHandle,
|
||||||
|
Unity.ResourceManager]], mscorlib
|
||||||
|
IsCustom: 0
|
||||||
|
Emit: 1
|
||||||
|
- TypeName: System.Collections.Generic.Dictionary`2[[System.Int32, mscorlib],[UnityEngine.GameObject,
|
||||||
|
UnityEngine.CoreModule]], mscorlib
|
||||||
|
IsCustom: 0
|
||||||
|
Emit: 1
|
||||||
- TypeName: System.Collections.Generic.Dictionary`2[[ObjectItem, Assembly-CSharp],[System.String[],
|
- TypeName: System.Collections.Generic.Dictionary`2[[ObjectItem, Assembly-CSharp],[System.String[],
|
||||||
mscorlib]], mscorlib
|
mscorlib]], mscorlib
|
||||||
IsCustom: 0
|
IsCustom: 0
|
||||||
|
@ -79,6 +93,14 @@ MonoBehaviour:
|
||||||
Unity.TextMeshPro]], mscorlib]], mscorlib
|
Unity.TextMeshPro]], mscorlib]], mscorlib
|
||||||
IsCustom: 0
|
IsCustom: 0
|
||||||
Emit: 1
|
Emit: 1
|
||||||
|
- TypeName: System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.String,
|
||||||
|
mscorlib]], mscorlib
|
||||||
|
IsCustom: 0
|
||||||
|
Emit: 1
|
||||||
|
- TypeName: System.Collections.Generic.Dictionary`2[[TMPro.TMP_FontAsset, Unity.TextMeshPro],[System.Collections.Generic.List`1[[TMPro.TextMeshProUGUI,
|
||||||
|
Unity.TextMeshPro]], mscorlib]], mscorlib
|
||||||
|
IsCustom: 0
|
||||||
|
Emit: 1
|
||||||
- TypeName: System.Collections.Generic.EnumEqualityComparer`1[[UnityTest.ZXL.DialogueType,
|
- TypeName: System.Collections.Generic.EnumEqualityComparer`1[[UnityTest.ZXL.DialogueType,
|
||||||
Assembly-CSharp]], mscorlib
|
Assembly-CSharp]], mscorlib
|
||||||
IsCustom: 0
|
IsCustom: 0
|
||||||
|
@ -103,6 +125,10 @@ MonoBehaviour:
|
||||||
mscorlib],[UnityEngine.GameObject, UnityEngine.CoreModule]], mscorlib]], System.Core
|
mscorlib],[UnityEngine.GameObject, UnityEngine.CoreModule]], mscorlib]], System.Core
|
||||||
IsCustom: 0
|
IsCustom: 0
|
||||||
Emit: 1
|
Emit: 1
|
||||||
|
- TypeName: System.Collections.Generic.HashSet`1[[System.Collections.Generic.Dictionary`2[[System.String,
|
||||||
|
mscorlib],[UnityEngine.GameObject, UnityEngine.CoreModule]], mscorlib]], System.Core
|
||||||
|
IsCustom: 0
|
||||||
|
Emit: 1
|
||||||
- TypeName: System.Collections.Generic.IEqualityComparer`1[[UnityTest.ZXL.DialogueType,
|
- TypeName: System.Collections.Generic.IEqualityComparer`1[[UnityTest.ZXL.DialogueType,
|
||||||
Assembly-CSharp]], mscorlib
|
Assembly-CSharp]], mscorlib
|
||||||
IsCustom: 0
|
IsCustom: 0
|
||||||
|
@ -123,6 +149,10 @@ MonoBehaviour:
|
||||||
Unity.TextMeshPro]], mscorlib
|
Unity.TextMeshPro]], mscorlib
|
||||||
IsCustom: 0
|
IsCustom: 0
|
||||||
Emit: 1
|
Emit: 1
|
||||||
|
- TypeName: System.Collections.Generic.IEqualityComparer`1[[TMPro.TMP_FontAsset,
|
||||||
|
Unity.TextMeshPro]], mscorlib
|
||||||
|
IsCustom: 0
|
||||||
|
Emit: 1
|
||||||
- TypeName: System.Int32, mscorlib
|
- TypeName: System.Int32, mscorlib
|
||||||
IsCustom: 0
|
IsCustom: 0
|
||||||
Emit: 1
|
Emit: 1
|
||||||
|
@ -145,6 +175,17 @@ MonoBehaviour:
|
||||||
mscorlib
|
mscorlib
|
||||||
IsCustom: 0
|
IsCustom: 0
|
||||||
Emit: 1
|
Emit: 1
|
||||||
|
- TypeName: System.Collections.Generic.List`1[[QuestionDatabase+Data, Assembly-CSharp]],
|
||||||
|
mscorlib
|
||||||
|
IsCustom: 0
|
||||||
|
Emit: 1
|
||||||
|
- TypeName: System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib
|
||||||
|
IsCustom: 0
|
||||||
|
Emit: 1
|
||||||
|
- TypeName: System.Collections.Generic.List`1[[TMPro.TextMeshProUGUI, Unity.TextMeshPro]],
|
||||||
|
mscorlib
|
||||||
|
IsCustom: 0
|
||||||
|
Emit: 1
|
||||||
- TypeName: UnityTest.ZXL.ObjectComponent, Assembly-CSharp
|
- TypeName: UnityTest.ZXL.ObjectComponent, Assembly-CSharp
|
||||||
IsCustom: 0
|
IsCustom: 0
|
||||||
Emit: 1
|
Emit: 1
|
||||||
|
@ -156,6 +197,10 @@ MonoBehaviour:
|
||||||
Unity.TextMeshPro]], mscorlib
|
Unity.TextMeshPro]], mscorlib
|
||||||
IsCustom: 0
|
IsCustom: 0
|
||||||
Emit: 1
|
Emit: 1
|
||||||
|
- TypeName: System.Collections.Generic.ObjectEqualityComparer`1[[TMPro.TMP_FontAsset,
|
||||||
|
Unity.TextMeshPro]], mscorlib
|
||||||
|
IsCustom: 0
|
||||||
|
Emit: 1
|
||||||
- TypeName: ObjectItem, Assembly-CSharp
|
- TypeName: ObjectItem, Assembly-CSharp
|
||||||
IsCustom: 0
|
IsCustom: 0
|
||||||
Emit: 1
|
Emit: 1
|
||||||
|
@ -180,6 +225,18 @@ MonoBehaviour:
|
||||||
- TypeName: UnityEngine.ResourceManagement.ResourceProviders.SceneInstance, Unity.ResourceManager
|
- TypeName: UnityEngine.ResourceManagement.ResourceProviders.SceneInstance, Unity.ResourceManager
|
||||||
IsCustom: 0
|
IsCustom: 0
|
||||||
Emit: 1
|
Emit: 1
|
||||||
|
- TypeName: QuestionDatabase+Data, Assembly-CSharp
|
||||||
|
IsCustom: 0
|
||||||
|
Emit: 1
|
||||||
|
- TypeName: QuestionDatabase+Option, Assembly-CSharp
|
||||||
|
IsCustom: 0
|
||||||
|
Emit: 1
|
||||||
|
- TypeName: QuestionDatabase+QusetionType, Assembly-CSharp
|
||||||
|
IsCustom: 0
|
||||||
|
Emit: 1
|
||||||
|
- TypeName: UnityEngine.ResourceManagement.ResourceProviders.SceneInstance, Unity.ResourceManager
|
||||||
|
IsCustom: 0
|
||||||
|
Emit: 1
|
||||||
- TypeName: System.String, mscorlib
|
- TypeName: System.String, mscorlib
|
||||||
IsCustom: 0
|
IsCustom: 0
|
||||||
Emit: 1
|
Emit: 1
|
||||||
|
@ -192,3 +249,9 @@ MonoBehaviour:
|
||||||
- TypeName: TMPro.TMP_FontAsset, Unity.TextMeshPro
|
- TypeName: TMPro.TMP_FontAsset, Unity.TextMeshPro
|
||||||
IsCustom: 0
|
IsCustom: 0
|
||||||
Emit: 1
|
Emit: 1
|
||||||
|
- TypeName: TMPro.TextMeshProUGUI, Unity.TextMeshPro
|
||||||
|
IsCustom: 0
|
||||||
|
Emit: 1
|
||||||
|
- TypeName: TMPro.TMP_FontAsset, Unity.TextMeshPro
|
||||||
|
IsCustom: 0
|
||||||
|
Emit: 1
|
||||||
|
|
|
@ -38,7 +38,7 @@ RenderSettings:
|
||||||
m_ReflectionIntensity: 1
|
m_ReflectionIntensity: 1
|
||||||
m_CustomReflection: {fileID: 0}
|
m_CustomReflection: {fileID: 0}
|
||||||
m_Sun: {fileID: 0}
|
m_Sun: {fileID: 0}
|
||||||
m_IndirectSpecularColor: {r: 0.6336611, g: 0.63196677, b: 0.61535054, a: 1}
|
m_IndirectSpecularColor: {r: 0.5049538, g: 0.5270397, b: 0.5255087, a: 1}
|
||||||
m_UseRadianceAmbientProbe: 0
|
m_UseRadianceAmbientProbe: 0
|
||||||
--- !u!157 &3
|
--- !u!157 &3
|
||||||
LightmapSettings:
|
LightmapSettings:
|
||||||
|
@ -30132,6 +30132,12 @@ MonoBehaviour:
|
||||||
PrefabModificationsReferencedUnityObjects: []
|
PrefabModificationsReferencedUnityObjects: []
|
||||||
PrefabModifications: []
|
PrefabModifications: []
|
||||||
SerializationNodes:
|
SerializationNodes:
|
||||||
|
- Name: sceneInstance
|
||||||
|
Entry: 7
|
||||||
|
Data: UnityEngine.ResourceManagement.ResourceProviders.SceneInstance, Unity.ResourceManager
|
||||||
|
- Name:
|
||||||
|
Entry: 8
|
||||||
|
Data:
|
||||||
- Name: _cache
|
- Name: _cache
|
||||||
Entry: 6
|
Entry: 6
|
||||||
Data:
|
Data:
|
||||||
|
@ -30149,6 +30155,7 @@ MonoBehaviour:
|
||||||
m_SubObjectName:
|
m_SubObjectName:
|
||||||
m_SubObjectType:
|
m_SubObjectType:
|
||||||
m_EditorAssetChanged: 0
|
m_EditorAssetChanged: 0
|
||||||
|
lightProbes: {fileID: 0}
|
||||||
last: -1
|
last: -1
|
||||||
--- !u!4 &386864257
|
--- !u!4 &386864257
|
||||||
Transform:
|
Transform:
|
||||||
|
@ -91741,6 +91748,50 @@ CanvasRenderer:
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1219128256}
|
m_GameObject: {fileID: 1219128256}
|
||||||
m_CullTransparentMesh: 1
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!1 &1221275508
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1221275509}
|
||||||
|
- component: {fileID: 1221275510}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: ZXL
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &1221275509
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1221275508}
|
||||||
|
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_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_RootOrder: 12
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!114 &1221275510
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1221275508}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 5a6b77da47c54d378c48d0f48ced21da, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
--- !u!1 &1221419354
|
--- !u!1 &1221419354
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -67,7 +67,7 @@ TextureImporter:
|
||||||
platformSettings:
|
platformSettings:
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
buildTarget: DefaultTexturePlatform
|
buildTarget: DefaultTexturePlatform
|
||||||
maxTextureSize: 4096
|
maxTextureSize: 8192
|
||||||
resizeAlgorithm: 0
|
resizeAlgorithm: 0
|
||||||
textureFormat: -1
|
textureFormat: -1
|
||||||
textureCompression: 1
|
textureCompression: 1
|
||||||
|
|
|
@ -0,0 +1,159 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: c490c115df2cb004092765fe9f71f0e8
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 12
|
||||||
|
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
|
||||||
|
vTOnly: 0
|
||||||
|
ignoreMasterTextureLimit: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 1
|
||||||
|
aniso: 2
|
||||||
|
mipBias: 0
|
||||||
|
wrapU: 1
|
||||||
|
wrapV: 1
|
||||||
|
wrapW: 0
|
||||||
|
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
|
||||||
|
flipbookRows: 1
|
||||||
|
flipbookColumns: 1
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
ignorePngGamma: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
cookieLightType: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 4096
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 8192
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: iPhone
|
||||||
|
maxTextureSize: 8192
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Android
|
||||||
|
maxTextureSize: 8192
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: WebGL
|
||||||
|
maxTextureSize: 8192
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Server
|
||||||
|
maxTextureSize: 8192
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
nameFileIdTable: {}
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b35b6cef2f04e764cacabaf8dd580e15
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
|
@ -11019,7 +11019,7 @@ MonoBehaviour:
|
||||||
Entry: 8
|
Entry: 8
|
||||||
Data:
|
Data:
|
||||||
hhh: '**************************************'
|
hhh: '**************************************'
|
||||||
startProcessType: 0
|
startProcessType: 2
|
||||||
--- !u!1 &150321891
|
--- !u!1 &150321891
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -67479,7 +67479,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 0
|
||||||
--- !u!224 &783577988
|
--- !u!224 &783577988
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
Binary file not shown.
|
@ -0,0 +1,159 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 2991d8e481cd22c4290f3caba7c0ac2b
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 12
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 1
|
||||||
|
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
|
||||||
|
vTOnly: 0
|
||||||
|
ignoreMasterTextureLimit: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 1
|
||||||
|
seamlessCubemap: 1
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 2
|
||||||
|
aniso: 0
|
||||||
|
mipBias: 0
|
||||||
|
wrapU: 1
|
||||||
|
wrapV: 1
|
||||||
|
wrapW: 1
|
||||||
|
nPOTScale: 1
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 0
|
||||||
|
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: 0
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 0
|
||||||
|
textureShape: 2
|
||||||
|
singleChannelComponent: 0
|
||||||
|
flipbookRows: 1
|
||||||
|
flipbookColumns: 1
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
ignorePngGamma: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
cookieLightType: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 100
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 8192
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: iPhone
|
||||||
|
maxTextureSize: 8192
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Android
|
||||||
|
maxTextureSize: 8192
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: WebGL
|
||||||
|
maxTextureSize: 8192
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Server
|
||||||
|
maxTextureSize: 8192
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
nameFileIdTable: {}
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
|
@ -0,0 +1,19 @@
|
||||||
|
using UnityTest.ZXL;
|
||||||
|
|
||||||
|
namespace Mono.Event
|
||||||
|
{
|
||||||
|
public class GoSetActiveEventArgs : GameEventArgs
|
||||||
|
{
|
||||||
|
public static readonly int EventId = typeof(GoSetActiveEventArgs).GetHashCode();
|
||||||
|
public override int Id => EventId;
|
||||||
|
|
||||||
|
public bool isShow;
|
||||||
|
public GoType goType;
|
||||||
|
|
||||||
|
public GoSetActiveEventArgs(bool isShow, GoType goType)
|
||||||
|
{
|
||||||
|
this.isShow = isShow;
|
||||||
|
this.goType = goType;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,3 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: fd8e25784d02437fa3c07285e06939cb
|
||||||
|
timeCreated: 1696659861
|
|
@ -158,6 +158,8 @@ namespace UnityTest.ZXL
|
||||||
currentTask = ETTask<bool>.Create();
|
currentTask = ETTask<bool>.Create();
|
||||||
currentToken = new ETCancellationToken();
|
currentToken = new ETCancellationToken();
|
||||||
|
|
||||||
|
var uiBg = GameObject.Find("ZXL").GetComponent<UI_BG>();
|
||||||
|
uiBg.ShowBG();
|
||||||
var showUI = UIManager.Instance().ShowUI(UIType.RePlacement);
|
var showUI = UIManager.Instance().ShowUI(UIType.RePlacement);
|
||||||
var rePlacementUI = showUI as RePlacementUI;
|
var rePlacementUI = showUI as RePlacementUI;
|
||||||
rePlacementUI.SetAction(currentTask);
|
rePlacementUI.SetAction(currentTask);
|
||||||
|
@ -168,6 +170,7 @@ namespace UnityTest.ZXL
|
||||||
this.SetPlayDirector(CurrentPlayableDirector, PlayTimelineMode.Resume);
|
this.SetPlayDirector(CurrentPlayableDirector, PlayTimelineMode.Resume);
|
||||||
|
|
||||||
UIManager.Instance().HideUI(UIType.RePlacement);
|
UIManager.Instance().HideUI(UIType.RePlacement);
|
||||||
|
uiBg.HideBG();
|
||||||
}
|
}
|
||||||
|
|
||||||
private async ETTask WaitOperateFinish3_1_4() //
|
private async ETTask WaitOperateFinish3_1_4() //
|
||||||
|
|
|
@ -0,0 +1,35 @@
|
||||||
|
using System;
|
||||||
|
using Mono.Event;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace UnityTest.ZXL
|
||||||
|
{
|
||||||
|
public class GoSetActive : MonoBehaviour
|
||||||
|
{
|
||||||
|
[SerializeField] private GoType _goType;
|
||||||
|
|
||||||
|
private void Awake()
|
||||||
|
{
|
||||||
|
EventManager.Instance.Subscribe(GoSetActiveEventArgs.EventId, GoSetActiveEvent);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnDestroy()
|
||||||
|
{
|
||||||
|
EventManager.Instance.Unsubscribe(GoSetActiveEventArgs.EventId, GoSetActiveEvent);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void GoSetActiveEvent(object sender, GameEventArgs e)
|
||||||
|
{
|
||||||
|
var args = e as GoSetActiveEventArgs;
|
||||||
|
if (_goType == args.goType)
|
||||||
|
{
|
||||||
|
gameObject.SetActive(args.isShow);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public enum GoType
|
||||||
|
{
|
||||||
|
UI_BG,
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,3 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 35b396fb4c7b4243949274132d7020af
|
||||||
|
timeCreated: 1696659764
|
|
@ -0,0 +1,23 @@
|
||||||
|
using System.Collections;
|
||||||
|
using _2;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace UnityTest.ZXL
|
||||||
|
{
|
||||||
|
public class UI_BG : MonoBehaviour
|
||||||
|
{
|
||||||
|
public void ShowBG()
|
||||||
|
{
|
||||||
|
// yield return new WaitForSeconds()
|
||||||
|
var page2 = GameObject.FindObjectOfType<Page2>();
|
||||||
|
page2.transform.Find("BG").gameObject.SetActive(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void HideBG()
|
||||||
|
{
|
||||||
|
// yield return new WaitForSeconds()
|
||||||
|
var page2 = GameObject.FindObjectOfType<Page2>();
|
||||||
|
page2.transform.Find("BG").gameObject.SetActive(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,3 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5a6b77da47c54d378c48d0f48ced21da
|
||||||
|
timeCreated: 1696660886
|
|
@ -149,7 +149,6 @@ PlayerSettings:
|
||||||
preloadedAssets:
|
preloadedAssets:
|
||||||
- {fileID: 0}
|
- {fileID: 0}
|
||||||
- {fileID: 0}
|
- {fileID: 0}
|
||||||
- {fileID: 11400000, guid: 377fab9146e60364fa298d388667a056, type: 2}
|
|
||||||
metroInputSource: 0
|
metroInputSource: 0
|
||||||
wsaTransparentSwapchain: 0
|
wsaTransparentSwapchain: 0
|
||||||
m_HolographicPauseOnTrackingLoss: 1
|
m_HolographicPauseOnTrackingLoss: 1
|
||||||
|
|
Loading…
Reference in New Issue