Skip to content

M
MDPro3
Commit 2ad9dfc0 authored by SherryChaos's avatar SherryChaos
Browse files
Options

ShaderReplacer for dumped shaders

parent c6c7d9da
Hide whitespace changes
Inline Side-by-side
Showing with 1113 additions and 248 deletions
Assets/Materials/Card/NormalStyle3D.mat
View file @ 2ad9dfc0
......@@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: NormalStyle3D
m_Shader: {fileID: 4800000, guid: 281fc2ad740f3c044a444ff08a10d55b, type: 3}
m_Shader: {fileID: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
......@@ -16,7 +16,7 @@ Material:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses:
- MOTIONVECTORS
......
Assets/Materials/Card/RoyalStyle3D.mat
View file @ 2ad9dfc0
......@@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: RoyalStyle3D
m_Shader: {fileID: 4800000, guid: 27b79ee02cb2507438f330137782cf42, type: 3}
m_Shader: {fileID: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
......@@ -16,7 +16,7 @@ Material:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses:
- MOTIONVECTORS
......
Assets/Materials/Card/RoyalStyleUI.mat
View file @ 2ad9dfc0
......@@ -69,7 +69,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: fbfdb4ac60fa02f4b9b2947b30e5dbb8, type: 3}
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MonsterNameTex:
......
Assets/Materials/Card/ShineStyle3D.mat
View file @ 2ad9dfc0
......@@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ShineStyle3D
m_Shader: {fileID: 4800000, guid: 140edad17441bd44c82ff6c61534cb45, type: 3}
m_Shader: {fileID: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
......@@ -16,7 +16,7 @@ Material:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses:
- MOTIONVECTORS
......
Assets/Materials/UIBlur00.mat 0 → 100644
View file @ 2ad9dfc0
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UIBlur00
m_Shader: {fileID: 4800000, guid: fc3613d4d9d46604d8db311c951af12a, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords:
- ETC1_EXTERNAL_ALPHA
m_LightmapFlags: 4
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 2800000, guid: 7b9b634379d3ea84f94fbebfaf600ded, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- Effect: 10
- _QueueControl: 0
- _QueueOffset: 0
- _ReverseHolizontal: 0
- _ReverseVertical: 0
m_Colors:
- _BlendColor: {r: 1, g: 1, b: 1, a: 0}
m_BuildTextureStacks: []
m_AllowLocking: 0
Assets/Materials/UIBlur00.mat.meta 0 → 100644
View file @ 2ad9dfc0
fileFormatVersion: 2
guid: cc557a6b7b6b0a8438a1075a1d7ad04b
timeCreated: 1755118473
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/DuelPrefabs/DuelText/DuelTextDraw/DuelTextDraw.prefab
View file @ 2ad9dfc0
......@@ -364,6 +364,7 @@ Transform:
m_Children:
- {fileID: 4601649044695865}
- {fileID: 4368623022245937}
- {fileID: 4929054916520820535}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
--- !u!114 &114296520819236874
......@@ -410,7 +411,7 @@ PlayableDirector:
serializedVersion: 3
m_PlayableAsset: {fileID: 11400000, guid: 08cc1a2b04c49294d8903e75968aba0d, type: 2}
m_InitialState: 1
m_WrapMode: 0
m_WrapMode: 2
m_DirectorUpdateMode: 1
m_InitialTime: 0
m_SceneBindings:
......@@ -456,6 +457,10 @@ PlayableDirector:
value: {fileID: 95245983747686734}
- key: {fileID: 554891528586394973, guid: 08cc1a2b04c49294d8903e75968aba0d, type: 2}
value: {fileID: 95038109551309262}
- key: {fileID: -7380041521569946435, guid: 08cc1a2b04c49294d8903e75968aba0d, type: 2}
value: {fileID: 4235752624949825275}
- key: {fileID: 6601477132980675946, guid: 08cc1a2b04c49294d8903e75968aba0d, type: 2}
value: {fileID: 6442137507693054750}
m_ExposedReferences:
m_References: []
--- !u!1 &1202426485949053
......@@ -1203,3 +1208,148 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!1 &6442137507693054750
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4929054916520820535}
- component: {fileID: 3464442992129809068}
- component: {fileID: 4235752624949825275}
- component: {fileID: 1725172047529892606}
- component: {fileID: 1830691950934191022}
m_Layer: 0
m_Name: Blur
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &4929054916520820535
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6442137507693054750}
serializedVersion: 2
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: 4681880195466358}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &3464442992129809068
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6442137507693054750}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: cc557a6b7b6b0a8438a1075a1d7ad04b, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: -3
m_Sprite: {fileID: 21300000, guid: 7b9b634379d3ea84f94fbebfaf600ded, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 9.6, y: 5.4}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!95 &4235752624949825275
Animator:
serializedVersion: 7
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6442137507693054750}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 0}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_AnimatePhysics: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!114 &1725172047529892606
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6442137507693054750}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3fb71daa6b393da0efd2dad20def340b, type: 3}
m_Name:
m_EditorClassIdentifier:
applyOnUpdate: 0
fitMode: 5
offsetScale: {x: 0, y: 0, z: 0}
_useDirectSizeSetting: 0
_directSizeSetting: {x: 0, y: 0}
_changePosition: 1
_isUseFixedDepth: 0
_fixedDepth: 10
--- !u!114 &1830691950934191022
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6442137507693054750}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4fb6cc0895c2d824a85ac559d3bbdb53, type: 3}
m_Name:
m_EditorClassIdentifier:
shaderName: Shader Graphs_UIBlur_box_with_t
Assets/Prefabs/DuelPrefabs/DuelText/DuelTextDraw/DuelTextDrawTimeline.playable
View file @ 2ad9dfc0
......@@ -627,6 +627,47 @@ AnimationClip:
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
m_Events: []
--- !u!114 &-7380041521569946435
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d21dcc2386d650c4597f3633c75a1f98, type: 3}
m_Name: Animation Track (9)
m_EditorClassIdentifier:
m_Version: 3
m_AnimClip: {fileID: 0}
m_Locked: 0
m_Muted: 1
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Children: []
m_Clips: []
m_Markers:
m_Objects: []
m_InfiniteClipPreExtrapolation: 1
m_InfiniteClipPostExtrapolation: 1
m_InfiniteClipOffsetPosition: {x: 0, y: 0, z: 0}
m_InfiniteClipOffsetEulerAngles: {x: 0, y: 0, z: 0}
m_InfiniteClipTimeOffset: 0
m_InfiniteClipRemoveOffset: 0
m_InfiniteClipApplyFootIK: 1
mInfiniteClipLoop: 0
m_MatchTargetFields: 63
m_Position: {x: 0, y: 0, z: 0}
m_EulerAngles: {x: 0, y: 0, z: 0}
m_AvatarMask: {fileID: 0}
m_ApplyAvatarMask: 1
m_TrackOffset: 0
m_InfiniteClip: {fileID: -730764646022450281}
m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
m_ApplyOffsets: 0
--- !u!74 &-7330183414882155493
AnimationClip:
m_ObjectHideFlags: 0
......@@ -1213,98 +1254,6 @@ AnimationClip:
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
m_Events: []
--- !u!114 &-6144537191290711959
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 32cfc539d7e738ae1d3ff36450fa821e, type: 3}
m_Name: Sound Track
m_EditorClassIdentifier:
m_Version: 3
m_AnimClip: {fileID: 0}
m_Locked: 0
m_Muted: 0
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 0
m_ClipIn: 0
m_Asset: {fileID: -1787776153598476802}
m_Duration: 1
m_TimeScale: 1
m_ParentTrack: {fileID: -6144537191290711959}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: -1
m_BlendOutDuration: -1
m_MixInCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 0
m_PreExtrapolationMode: 0
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: SoundPlayableAsset
m_Markers:
m_Objects: []
--- !u!74 &-5871146065857058838
AnimationClip:
m_ObjectHideFlags: 0
......@@ -2111,6 +2060,114 @@ MonoBehaviour:
m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
m_ApplyOffsets: 0
--- !u!114 &-3823194875387159545
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 32cfc539d7e738ae1d3ff36450fa821e, type: 3}
m_Name: Sound Track
m_EditorClassIdentifier:
m_Version: 3
m_AnimClip: {fileID: 0}
m_Locked: 0
m_Muted: 0
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 0
m_ClipIn: 0
m_Asset: {fileID: -3312173245788110296}
m_Duration: 1
m_TimeScale: 1
m_ParentTrack: {fileID: -3823194875387159545}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: -1
m_BlendOutDuration: -1
m_MixInCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 0
m_PreExtrapolationMode: 0
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: SoundPlayableAsset
m_Markers:
m_Objects: []
--- !u!114 &-3312173245788110296
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b65cf809bf8c1efbb045ec90f501db43, type: 3}
m_Name: SoundPlayableAsset(Clone)(Clone)(Clone)(Clone)
m_EditorClassIdentifier:
startLabel: SE_DUEL_DRAW
mute: 0
skipDuplicate: 0
LabeledPlayableController: {fileID: 0}
--- !u!74 &-2240769802974047689
AnimationClip:
m_ObjectHideFlags: 0
......@@ -2679,22 +2736,6 @@ AnimationClip:
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
m_Events: []
--- !u!114 &-1787776153598476802
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b65cf809bf8c1efbb045ec90f501db43, type: 3}
m_Name: SoundPlayableAsset
m_EditorClassIdentifier:
startLabel: SE_DUEL_DRAW
mute: 0
skipDuplicate: 0
LabeledPlayableController: {fileID: 0}
--- !u!74 &-1574813209892196802
AnimationClip:
m_ObjectHideFlags: 0
......@@ -3890,20 +3931,299 @@ MonoBehaviour:
m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
m_ApplyOffsets: 0
--- !u!114 &-227777124451093040
MonoBehaviour:
m_ObjectHideFlags: 1
--- !u!74 &-730764646022450281
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d21dcc2386d650c4597f3633c75a1f98, type: 3}
m_Name: Animation Track (4)
m_EditorClassIdentifier:
m_Version: 3
m_AnimClip: {fileID: 0}
m_Name: Recorded (9)
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 1.3166667
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.5
value: 5
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3.5
value: 5
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 4
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: material.Effect
path:
classID: 212
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.3166667
value: 0.843
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.5
value: 0.33
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3.5
value: 0.33
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 4
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: material._BlendColor.w
path:
classID: 212
script: {fileID: 0}
flags: 16
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 2177668292
script: {fileID: 0}
typeID: 212
customType: 22
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
attribute: 831224312
script: {fileID: 0}
typeID: 212
customType: 22
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 4
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 1.3166667
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.5
value: 5
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3.5
value: 5
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 4
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: material.Effect
path:
classID: 212
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.3166667
value: 0.843
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.5
value: 0.33
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3.5
value: 0.33
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 4
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: material._BlendColor.w
path:
classID: 212
script: {fileID: 0}
flags: 16
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
--- !u!114 &-227777124451093040
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d21dcc2386d650c4597f3633c75a1f98, type: 3}
m_Name: Animation Track (4)
m_EditorClassIdentifier:
m_Version: 3
m_AnimClip: {fileID: 0}
m_Locked: 0
m_Muted: 0
m_CustomPlayableFullTypename:
......@@ -3954,7 +4274,9 @@ MonoBehaviour:
- {fileID: -803309427296527695}
- {fileID: -4292591905374941183}
- {fileID: 554891528586394973}
- {fileID: -6144537191290711959}
- {fileID: -7380041521569946435}
- {fileID: 6601477132980675946}
- {fileID: -3823194875387159545}
m_FixedDuration: 0
m_EditorSettings:
m_Framerate: 60
......@@ -5197,6 +5519,111 @@ MonoBehaviour:
m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
m_ApplyOffsets: 0
--- !u!114 &6445613567653347838
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
m_Name: ActivationPlayableAsset
m_EditorClassIdentifier:
--- !u!114 &6601477132980675946
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3}
m_Name: Activation Track
m_EditorClassIdentifier:
m_Version: 3
m_AnimClip: {fileID: 0}
m_Locked: 0
m_Muted: 1
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 1.3166666666666667
m_ClipIn: 0
m_Asset: {fileID: 6445613567653347838}
m_Duration: 2.6833333333333336
m_TimeScale: 1
m_ParentTrack: {fileID: 6601477132980675946}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: 0
m_BlendOutDuration: 0
m_MixInCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 0
m_PreExtrapolationMode: 0
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: Active
m_Markers:
m_Objects: []
m_PostPlaybackState: 3
--- !u!114 &7714436389266335519
MonoBehaviour:
m_ObjectHideFlags: 1
......
Assets/Prefabs/DuelPrefabs/DuelText/DuelTextFinished/DuelTextFinished.prefab
View file @ 2ad9dfc0
......@@ -960,7 +960,7 @@ PlayableDirector:
serializedVersion: 3
m_PlayableAsset: {fileID: 11400000, guid: b98c2d152c296bb46b6f12c317157247, type: 2}
m_InitialState: 1
m_WrapMode: 0
m_WrapMode: 2
m_DirectorUpdateMode: 1
m_InitialTime: 0
m_SceneBindings:
......
Assets/Prefabs/ServantUI/DeckEditorUI.prefab
View file @ 2ad9dfc0
......@@ -21222,7 +21222,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 28.35
m_fontSize: 26.2
m_fontSizeBase: 30
m_fontWeight: 400
m_enableAutoSizing: 1
......@@ -86079,7 +86079,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0.000030517578}
m_SizeDelta: {x: 0, y: 500}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &8957022839683353519
......@@ -89355,8 +89355,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 9fef19921dba8c546945c682f316bf9f, type: 3}
m_Type: 1
m_Sprite: {fileID: 21300000, guid: 90c6e35ef4304f289c279037152a03b7, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
Assets/Scenes/Main.unity
View file @ 2ad9dfc0
......@@ -6350,7 +6350,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 60, y: 59.999878}
m_AnchoredPosition: {x: 60, y: 59.99994}
m_SizeDelta: {x: 60, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1484763997
......
Assets/Scripts/MDPro3/Duel/CardDescription.cs
View file @ 2ad9dfc0
......@@ -53,7 +53,6 @@ namespace MDPro3
while(!matLoad.IsCompleted)
yield return null;
var mat = matLoad.Result;
mat.renderQueue = 3000;
var task = CardImageLoader.LoadCardAsync(code, false);
while(!task.IsCompleted)
......
Assets/Scripts/MDPro3/Helper/ABLoader.cs
View file @ 2ad9dfc0
......@@ -287,13 +287,13 @@ namespace MDPro3
yield return matetial;
}
public static IEnumerator<Shader> LoadShaderAsync(string name)
public static IEnumerator<Shader> LoadShaderAsync(string path)
{
var abr = AssetBundle.LoadFromFileAsync(Path.Combine(Program.root, "MasterDuel/Shader/" + name));
var abr = AssetBundle.LoadFromFileAsync(Path.Combine(Program.root, path));
while (!abr.isDone)
yield return null;
var ab = abr.assetBundle;
var shader = ab.LoadAsset<Shader>(name);
var shader = ab.LoadAsset<Shader>(Path.GetFileNameWithoutExtension(path));
ab.Unload(false);
yield return shader;
}
......
Assets/Scripts/MDPro3/Helper/ShaderReplacer.cs 0 → 100644
View file @ 2ad9dfc0
using System.Collections;
using UnityEngine;
namespace MDPro3
{
[RequireComponent(typeof(Renderer))]
public class ShaderReplacer : MonoBehaviour
{
[SerializeField] private string shaderName;
private bool replaced;
private Renderer _renderer;
private Coroutine coroutine;
private void OnEnable()
{
ReplaceShader();
}
private void OnDisable()
{
if(coroutine != null)
StopCoroutine(coroutine);
coroutine = null;
}
private void ReplaceShader()
{
if(_renderer == null)
_renderer = GetComponent<Renderer>();
if(_renderer == null || string.IsNullOrEmpty(shaderName) || replaced)
return;
coroutine = StartCoroutine(ReplaceShaderAsync());
}
private IEnumerator ReplaceShaderAsync()
{
_renderer.enabled = false;
var load = MaterialLoader.LoadShaderByNameAsync(shaderName);
while (load.MoveNext())
yield return null;
_renderer.material.shader = load.Current;
_renderer.enabled = true;
replaced = true;
}
}
}
\ No newline at end of file
Assets/Scripts/MDPro3/Helper/ShaderReplacer.cs.meta 0 → 100644
View file @ 2ad9dfc0
fileFormatVersion: 2
guid: 4fb6cc0895c2d824a85ac559d3bbdb53
\ No newline at end of file
Assets/Scripts/MDPro3/Managers/TextureManager.cs
View file @ 2ad9dfc0
......@@ -123,7 +123,7 @@ namespace MDPro3
if (renderer == null)
yield break;
var matLoad = MaterialLoader.LoadCardMaterialAsync(code);
var matLoad = MaterialLoader.LoadCardMaterialAsync(code, true);
while (!matLoad.IsCompleted)
yield return null;
var mat = matLoad.Result;
......@@ -142,7 +142,7 @@ namespace MDPro3
while (!task.IsCompleted)
yield return null;
var matLoad = MaterialLoader.LoadCardMaterialAsync(code);
var matLoad = MaterialLoader.LoadCardMaterialAsync(code, true);
while (!matLoad.IsCompleted)
yield return null;
var mat = matLoad.Result;
......
Assets/Scripts/MDPro3/Managers/TimeLineManager.cs
View file @ 2ad9dfc0
......@@ -617,7 +617,7 @@ namespace MDPro3
if (!post)
{
var matLoad = MaterialLoader.LoadCardMaterialAsync(code);
var matLoad = MaterialLoader.LoadCardMaterialAsync(code, true);
while (!matLoad.IsCompleted)
yield return null;
face.material = matLoad.Result;
......
Assets/Scripts/MDPro3/Servant/OcgCore.cs
View file @ 2ad9dfc0
......@@ -1694,6 +1694,8 @@ namespace MDPro3.Servant
}
}
#endregion
#region PracticalizeTools
......@@ -2492,10 +2494,11 @@ namespace MDPro3.Servant
mono.action = () =>
{
PrintDuelLog(endingReason);
Destroy(duelText);
if (condition != Condition.Replay)
{
GetUI<OcgCoreUI>().ShowSaveReplay();
Destroy(mono.gameObject);
}
};
if (result == DuelResult.Win)
......@@ -7303,7 +7306,7 @@ namespace MDPro3.Servant
{
var code = topCard.GetData().Id;
var matLoad = MaterialLoader.LoadCardMaterialAsync(code);
var matLoad = MaterialLoader.LoadCardMaterialAsync(code, true);
while (!matLoad.IsCompleted)
yield return null;
targetMat = matLoad.Result;
......
Assets/Scripts/MDPro3/UI/Function/MaterialLoader.cs
View file @ 2ad9dfc0
......@@ -11,10 +11,15 @@ namespace MDPro3
{
public class MaterialLoader : MonoBehaviour
{
private static readonly ConcurrentDictionary<string, Material> _loadedMaterials = new();
private static readonly ConcurrentDictionary<string, IEnumerator<Material>> _loadingCoroutines = new();
private static MaterialLoader instance;
private void Awake()
{
instance = this;
StartCoroutine(LoadCardMaterials());
}
#region Card Materials
private static Material cardMatNormalUI;
private static Material cardMatShineUI;
......@@ -40,15 +45,9 @@ namespace MDPro3
private const string cardMatMaskName = "_Texture2DAsset_90c6e35ef4304f289c279037152a03b7_Out_0_Texture2D";
private void Awake()
private IEnumerator LoadCardMaterials()
{
instance = this;
StartCoroutine(LoadMaterials());
}
private IEnumerator LoadMaterials()
{
while(!TextureManager.loaded)
while (!TextureManager.loaded)
yield return null;
while (TextureManager.container == null)
yield return null;
......@@ -57,11 +56,11 @@ namespace MDPro3
handle.Completed += (result) => { cardMatSide = result.Result; };
var matLoad = Addressables.LoadAssetAsync<Material>("NormalStyleUI");
while(!matLoad.IsDone)
while (!matLoad.IsDone)
yield return null;
cardMatNormalUI = matLoad.Result;
var shaderLoad = ABLoader.LoadShaderAsync("Shader Graphs_NormalStyleUI");
while(shaderLoad.MoveNext())
var shaderLoad = LoadShaderByNameAsync("Shader Graphs_NormalStyleUI");
while (shaderLoad.MoveNext())
yield return null;
cardMatNormalUI.shader = shaderLoad.Current;
......@@ -69,7 +68,7 @@ namespace MDPro3
while (!matLoad.IsDone)
yield return null;
cardMatShineUI = matLoad.Result;
shaderLoad = ABLoader.LoadShaderAsync("Shader Graphs_ShineStyleUI");
shaderLoad = LoadShaderByNameAsync("Shader Graphs_ShineStyleUI");
while (shaderLoad.MoveNext())
yield return null;
cardMatShineUI.shader = shaderLoad.Current;
......@@ -78,7 +77,7 @@ namespace MDPro3
while (!matLoad.IsDone)
yield return null;
cardMatRoyalUI = matLoad.Result;
shaderLoad = ABLoader.LoadShaderAsync("Shader Graphs_RoyalStyleUI");
shaderLoad = LoadShaderByNameAsync("Shader Graphs_RoyalStyleUI");
while (shaderLoad.MoveNext())
yield return null;
cardMatRoyalUI.shader = shaderLoad.Current;
......@@ -112,7 +111,7 @@ namespace MDPro3
while (!matLoad.IsDone)
yield return null;
cardMatNormal3D = matLoad.Result;
shaderLoad = ABLoader.LoadShaderAsync("Shader Graphs_NormalStyle3D");
shaderLoad = LoadShaderByNameAsync("Shader Graphs_NormalStyle3D");
while (shaderLoad.MoveNext())
yield return null;
cardMatNormal3D.shader = shaderLoad.Current;
......@@ -121,7 +120,7 @@ namespace MDPro3
while (!matLoad.IsDone)
yield return null;
cardMatShine3D = matLoad.Result;
shaderLoad = ABLoader.LoadShaderAsync("Shader Graphs_ShineStyle3D");
shaderLoad = LoadShaderByNameAsync("Shader Graphs_ShineStyle3D");
while (shaderLoad.MoveNext())
yield return null;
cardMatShine3D.shader = shaderLoad.Current;
......@@ -130,7 +129,7 @@ namespace MDPro3
while (!matLoad.IsDone)
yield return null;
cardMatRoyal3D = matLoad.Result;
shaderLoad = ABLoader.LoadShaderAsync("Shader Graphs_RoyalStyle3D");
shaderLoad = LoadShaderByNameAsync("Shader Graphs_RoyalStyle3D");
while (shaderLoad.MoveNext())
yield return null;
cardMatRoyal3D.shader = shaderLoad.Current;
......@@ -171,17 +170,6 @@ namespace MDPro3
material.SetVector("_AttributeSize_Pos", new Vector4(8.31f, 12.26f, -3.19f, -5.13f));
}
private IEnumerator<Material> LoadMaterialCoroutine(string materialName)
{
var loadOperation = ABLoader.LoadMaterialAsync("MasterDuel/Material/" + materialName);
while (loadOperation.MoveNext())
yield return null;
_loadedMaterials.TryAdd(materialName, loadOperation.Current);
_loadingCoroutines.TryRemove(materialName, out _);
yield return loadOperation.Current;
}
private static Color GetMillenniumFrameColor(Card data)
{
Color color;
......@@ -225,51 +213,18 @@ namespace MDPro3
else if ((data.Attribute & (uint)CardAttribute.Fire) > 0)
return new Color(1f, 0f, 0f, 1f);
else if ((data.Attribute & (uint)CardAttribute.Earth) > 0)
return new Color(0.2f, 0.2f, 0.2f, 1f);
return new Color(0.8f, 0.8f, 0.8f, 1f);
else if ((data.Attribute & (uint)CardAttribute.Wind) > 0)
return new Color(0f, 1f, 0f, 1f);
else
return new Color(1f, 1f, 0f, 1f);
}
public static IEnumerator<Material> LoadMaterialByNameAsync(string materialName)
{
if (_loadedMaterials.TryGetValue(materialName, out var material))
{
yield return material;
yield break;
}
if (_loadingCoroutines.TryGetValue(materialName, out var loading))
{
while (loading.MoveNext())
yield return null;
yield return loading.Current;
}
else
{
var coroutine = instance.LoadMaterialCoroutine(materialName);
if(_loadingCoroutines.TryAdd(materialName, coroutine))
{
while (coroutine.MoveNext())
yield return null;
yield return coroutine.Current;
}
else
{
instance.StopCoroutine(coroutine);
while (_loadingCoroutines[materialName].MoveNext())
yield return null;
yield return _loadingCoroutines[materialName].Current;
}
}
}
public static async Task<Material> LoadCardMaterialAsync(int code, bool use3D = false)
{
Material mat = null;
if(code < 0)
if (code < 0)
{
mat = Instantiate(use3D ? cardMatNormal3D : cardMatNormalUI);
mat.SetTexture(cardMatMaskName, TextureManager.container.CardMask001);
......@@ -361,5 +316,108 @@ namespace MDPro3
return mat;
}
#endregion
#region Load Material
private static readonly ConcurrentDictionary<string, Material> _loadedMaterials = new();
private static readonly ConcurrentDictionary<string, IEnumerator<Material>> _loadMaterialCoroutines = new();
private IEnumerator<Material> LoadMaterialCoroutine(string materialName)
{
var loadOperation = ABLoader.LoadMaterialAsync("MasterDuel/Material/" + materialName);
while (loadOperation.MoveNext())
yield return null;
_loadedMaterials.TryAdd(materialName, loadOperation.Current);
_loadMaterialCoroutines.TryRemove(materialName, out _);
yield return loadOperation.Current;
}
public static IEnumerator<Material> LoadMaterialByNameAsync(string materialName)
{
if (_loadedMaterials.TryGetValue(materialName, out var material))
{
yield return material;
yield break;
}
if (_loadMaterialCoroutines.TryGetValue(materialName, out var loading))
{
while (loading.MoveNext())
yield return null;
yield return loading.Current;
}
else
{
var coroutine = instance.LoadMaterialCoroutine(materialName);
if (_loadMaterialCoroutines.TryAdd(materialName, coroutine))
{
while (coroutine.MoveNext())
yield return null;
yield return coroutine.Current;
}
else
{
instance.StopCoroutine(coroutine);
while (_loadMaterialCoroutines[materialName].MoveNext())
yield return null;
yield return _loadMaterialCoroutines[materialName].Current;
}
}
}
#endregion
#region Load Shader
private static readonly ConcurrentDictionary<string, Shader> _loadedShaders = new();
private static readonly ConcurrentDictionary<string, IEnumerator<Shader>> _loadShaderCoroutines = new();
private IEnumerator<Shader> LoadShaderCoroutine(string shaderName)
{
var loadOperation = ABLoader.LoadShaderAsync("MasterDuel/Shader/" + shaderName);
while (loadOperation.MoveNext())
yield return null;
_loadedShaders.TryAdd(shaderName, loadOperation.Current);
_loadShaderCoroutines.TryRemove(shaderName, out _);
yield return loadOperation.Current;
}
public static IEnumerator<Shader> LoadShaderByNameAsync(string shaderName)
{
if (_loadedShaders.TryGetValue(shaderName, out var shader))
{
yield return shader;
yield break;
}
if (_loadShaderCoroutines.TryGetValue(shaderName, out var loading))
{
while (loading.MoveNext())
yield return null;
yield return loading.Current;
}
else
{
var coroutine = instance.LoadShaderCoroutine(shaderName);
if (_loadShaderCoroutines.TryAdd(shaderName, coroutine))
{
while (coroutine.MoveNext())
yield return null;
yield return coroutine.Current;
}
else
{
instance.StopCoroutine(coroutine);
while (_loadShaderCoroutines[shaderName].MoveNext())
yield return null;
yield return _loadShaderCoroutines[shaderName].Current;
}
}
}
#endregion
}
}
}
\ No newline at end of file
Assets/Scripts/MDPro3/Utility/ShaderImporter.cs 0 → 100644
View file @ 2ad9dfc0
using UnityEngine;
public class ShaderImporter : MonoBehaviour
{
// Start is called once before the first execution of Update after the MonoBehaviour is created
void Start()
{
}
// Update is called once per frame
void Update()
{
}
}
Assets/Scripts/MDPro3/Utility/ShaderImporter.cs.meta 0 → 100644
View file @ 2ad9dfc0
fileFormatVersion: 2
guid: 902d44e2384b7aa4caba0ac6313c610b
\ No newline at end of file
Assets/Shaders/Shader Graphs_NormalStyle3D.shader.meta
View file @ 2ad9dfc0
......@@ -6,5 +6,5 @@ ShaderImporter:
nonModifiableTextures:
- _Texture2DAsset_90c6e35ef4304f289c279037152a03b7_Out_0_Texture2D: {fileID: 2800000, guid: f3d3a6083e3b7b747ad9732db0af0a6c, type: 3}
userData:
assetBundleName: shader graphs_normalstyle3d
assetBundleName:
assetBundleVariant:
Assets/Shaders/Shader Graphs_NormalStyleUI.shader.meta
View file @ 2ad9dfc0
......@@ -6,5 +6,5 @@ ShaderImporter:
nonModifiableTextures:
- _Texture2DAsset_90c6e35ef4304f289c279037152a03b7_Out_0_Texture2D: {fileID: 2800000, guid: ec3fe872e2e518246b2c356340f265c3, type: 3}
userData:
assetBundleName: shader graphs_normalstyleui
assetBundleName:
assetBundleVariant:
Assets/Shaders/Shader Graphs_RoyalStyle3D.shader.meta
View file @ 2ad9dfc0
......@@ -6,5 +6,5 @@ ShaderImporter:
nonModifiableTextures:
- _Texture2DAsset_90c6e35ef4304f289c279037152a03b7_Out_0_Texture2D: {fileID: 2800000, guid: ec3fe872e2e518246b2c356340f265c3, type: 3}
userData:
assetBundleName: shader graphs_royalstyle3d
assetBundleName:
assetBundleVariant:
Assets/Shaders/Shader Graphs_RoyalStyleUI.shader.meta
View file @ 2ad9dfc0
......@@ -6,5 +6,5 @@ ShaderImporter:
nonModifiableTextures:
- _Texture2DAsset_90c6e35ef4304f289c279037152a03b7_Out_0_Texture2D: {fileID: 2800000, guid: ec3fe872e2e518246b2c356340f265c3, type: 3}
userData:
assetBundleName: shader graphs_royalstyleui
assetBundleName:
assetBundleVariant:
Assets/Shaders/Shader Graphs_ShineStyle3D.shader.meta
View file @ 2ad9dfc0
......@@ -6,5 +6,5 @@ ShaderImporter:
nonModifiableTextures:
- _Texture2DAsset_90c6e35ef4304f289c279037152a03b7_Out_0_Texture2D: {fileID: 2800000, guid: ec3fe872e2e518246b2c356340f265c3, type: 3}
userData:
assetBundleName: shader graphs_shinestyle3d
assetBundleName:
assetBundleVariant:
Assets/Shaders/Shader Graphs_ShineStyleUI.shader.meta
View file @ 2ad9dfc0
......@@ -6,5 +6,5 @@ ShaderImporter:
nonModifiableTextures:
- _Texture2DAsset_90c6e35ef4304f289c279037152a03b7_Out_0_Texture2D: {fileID: 2800000, guid: ec3fe872e2e518246b2c356340f265c3, type: 3}
userData:
assetBundleName: shader graphs_shinestyleui
assetBundleName:
assetBundleVariant:
Assets/Shaders/Shader Graphs_UIBlur_box_with_t.shader 0 → 100644
View file @ 2ad9dfc0
Shader "Shader Graphs/UIBlur_box_with_t" {
Properties {
Effect ("Effect", Range(0, 20)) = 8
[NoScaleOffset] _MainTex ("MainTex", 2D) = "white" {}
_BlendColor ("BlendColor", Vector) = (1,1,1,0)
[ToggleUI] _ReverseVertical ("ReverseVertical", Float) = 0
[ToggleUI] _ReverseHolizontal ("ReverseHolizontal", Float) = 0
[HideInInspector] _QueueOffset ("_QueueOffset", Float) = 0
[HideInInspector] _QueueControl ("_QueueControl", Float) = -1
[HideInInspector] [NoScaleOffset] unity_Lightmaps ("unity_Lightmaps", 2DArray) = "" {}
[HideInInspector] [NoScaleOffset] unity_LightmapsInd ("unity_LightmapsInd", 2DArray) = "" {}
[HideInInspector] [NoScaleOffset] unity_ShadowMasks ("unity_ShadowMasks", 2DArray) = "" {}
}
//DummyShaderTextExporter
SubShader{
Tags { "RenderType"="Opaque" }
LOD 200
Pass
{
HLSLPROGRAM
#pragma vertex vert
#pragma fragment frag
float4x4 unity_ObjectToWorld;
float4x4 unity_MatrixVP;
float4 _MainTex_ST;
struct Vertex_Stage_Input
{
float4 pos : POSITION;
float2 uv : TEXCOORD0;
};
struct Vertex_Stage_Output
{
float2 uv : TEXCOORD0;
float4 pos : SV_POSITION;
};
Vertex_Stage_Output vert(Vertex_Stage_Input input)
{
Vertex_Stage_Output output;
output.uv = (input.uv.xy * _MainTex_ST.xy) + _MainTex_ST.zw;
output.pos = mul(unity_MatrixVP, mul(unity_ObjectToWorld, input.pos));
return output;
}
Texture2D<float4> _MainTex;
SamplerState sampler_MainTex;
struct Fragment_Stage_Input
{
float2 uv : TEXCOORD0;
};
float4 frag(Fragment_Stage_Input input) : SV_TARGET
{
return _MainTex.Sample(sampler_MainTex, input.uv.xy);
}
ENDHLSL
}
}
Fallback "Hidden/Shader Graph/FallbackError"
//CustomEditor "UnityEditor.ShaderGraph.GenericShaderGraphMaterialGUI"
}
\ No newline at end of file
Assets/Shaders/Shader Graphs_UIBlur_box_with_t.shader.meta 0 → 100644
View file @ 2ad9dfc0
fileFormatVersion: 2
guid: fc3613d4d9d46604d8db311c951af12a
ShaderImporter:
externalObjects: {}
defaultTextures: []
nonModifiableTextures: []
userData:
assetBundleName: shader graphs_uiblur_box_with_t
assetBundleVariant:
Assets/Texture/CardFrames/OCG_Masks/CardMask001.png.meta
View file @ 2ad9dfc0
fileFormatVersion: 2
guid: 90c6e35ef4304f289c279037152a03b7
timeCreated: 1755117404
licenseType: Free
TextureImporter:
serializedVersion: 13
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
......@@ -39,8 +37,8 @@ TextureImporter:
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
......@@ -56,7 +54,7 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 0
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 0
......@@ -82,46 +80,64 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
customData:
physicsShape: []
bones: []
spriteID:
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
output:
textureImportInstructions:
compressedFormat: 0
uncompressedFormat: 0
desiredFormat: 0
usageMode: 0
colorSpace: 0
width: 0
height: 0
depth: 0
cubeIntermediateSize: 0
cubeMode: 0
cubeLayout: 0
compressionQuality: 0
vtOnly: 0
sourceTextureInformation:
width: 0
height: 0
doesTextureContainAlpha: 0
sourceWasHDR: 0
importInspectorWarnings:
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:
userData:
assetBundleName:
assetBundleVariant:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment