Commit 93c940ec authored by SherryChaos's avatar SherryChaos

pendulum summon bug fix

parent ef01d6bc
......@@ -13,11 +13,11 @@ MonoBehaviour:
m_Name: AddressableAssetGroupSortSettings
m_EditorClassIdentifier:
sortOrder:
- ca8b8e6916019834fb0ec5578fa0be37
- 3d14943c333f2bc48800481fbfdc1c89
- 303c66afa5d931c4cb2672409c472e2e
- 68af21b94e2bb764b864c60129ab1c8f
- 7c094f02978cc7b4381bcbc23867f4a1
- ca8b8e6916019834fb0ec5578fa0be37
- 480949c4a54091c458e35b8e6fd7b1be
- cb0e49f0e09ecc8499cb1b471f256700
- 678a9e761bbaba144ae5e8b8d9383ad1
MDPro3 v1.3.6更新:
1.新卡片特效:小丑与锁鸟[94145021];
2.修复部分情况下召唤怪兽后卡片悬空的错误;
3.修复语音功能中,[我的回合]角色反转的错误;
4.修复自定义背景不生效的错误。
MDPro3 v1.3.5更新:
1.添加动态卡图功能:
① 支持读取MP4视频文件作为卡图,路径:Video/Art/<卡片ID>.mp4;
......
......@@ -7459,6 +7459,22 @@ PrefabInstance:
propertyPath: m_LocalRotation.z
value: 0.16865766
objectReference: {fileID: 0}
- target: {fileID: 198145946691610353, guid: 8fbb653da5f9d054ab7de54d0777b931, type: 3}
propertyPath: lengthInSec
value: 2.4
objectReference: {fileID: 0}
- target: {fileID: 198145946691610353, guid: 8fbb653da5f9d054ab7de54d0777b931, type: 3}
propertyPath: InitialModule.startLifetime.scalar
value: 2.4
objectReference: {fileID: 0}
- target: {fileID: 198405345196007189, guid: 8fbb653da5f9d054ab7de54d0777b931, type: 3}
propertyPath: lengthInSec
value: 2.4
objectReference: {fileID: 0}
- target: {fileID: 198405345196007189, guid: 8fbb653da5f9d054ab7de54d0777b931, type: 3}
propertyPath: InitialModule.startLifetime.scalar
value: 2.4
objectReference: {fileID: 0}
- target: {fileID: 3009789816381792704, guid: 8fbb653da5f9d054ab7de54d0777b931, type: 3}
propertyPath: m_InitialState
value: 0
......
......@@ -18,7 +18,7 @@ Material:
m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
m_CustomRenderQueue: 3001
stringTagMap: {}
disabledShaderPasses:
- SHADOWCASTER
......
......@@ -18,7 +18,7 @@ Material:
m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
m_CustomRenderQueue: 3001
stringTagMap: {}
disabledShaderPasses:
- SHADOWCASTER
......
......@@ -18,7 +18,7 @@ Material:
m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
m_CustomRenderQueue: 3001
stringTagMap: {}
disabledShaderPasses:
- SHADOWCASTER
......
......@@ -18,7 +18,7 @@ Material:
m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
m_CustomRenderQueue: 3001
stringTagMap: {}
disabledShaderPasses:
- SHADOWCASTER
......
......@@ -18,7 +18,7 @@ Material:
m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
m_CustomRenderQueue: 3001
stringTagMap: {}
disabledShaderPasses:
- SHADOWCASTER
......
......@@ -18,7 +18,7 @@ Material:
m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
m_CustomRenderQueue: 3001
stringTagMap: {}
disabledShaderPasses:
- SHADOWCASTER
......
......@@ -18,7 +18,7 @@ Material:
m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
m_CustomRenderQueue: 3001
stringTagMap: {}
disabledShaderPasses:
- SHADOWCASTER
......
......@@ -18,7 +18,7 @@ Material:
m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
m_CustomRenderQueue: 3001
stringTagMap: {}
disabledShaderPasses:
- SHADOWCASTER
......
......@@ -18,7 +18,7 @@ Material:
m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
m_CustomRenderQueue: 3001
stringTagMap: {}
disabledShaderPasses:
- SHADOWCASTER
......
......@@ -18,7 +18,7 @@ Material:
m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
m_CustomRenderQueue: 3001
stringTagMap: {}
disabledShaderPasses:
- SHADOWCASTER
......
......@@ -18,7 +18,7 @@ Material:
m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
m_CustomRenderQueue: 3001
stringTagMap: {}
disabledShaderPasses:
- SHADOWCASTER
......
......@@ -18,7 +18,7 @@ Material:
m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
m_CustomRenderQueue: 3001
stringTagMap: {}
disabledShaderPasses:
- SHADOWCASTER
......
......@@ -17,7 +17,7 @@ Material:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
m_CustomRenderQueue: 2999
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
......
......@@ -37,9 +37,9 @@ TextureImporter:
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
wrapU: 3
wrapV: 3
wrapW: 3
nPOTScale: 1
lightmap: 0
compressionQuality: 50
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -36,21 +36,21 @@ MonoBehaviour:
- rid: 5650211206403981510
- rid: 5650211206403981511
- rid: 5650211206403981512
- rid: 260124805198250105
- rid: 260125053741695126
- rid: 5650211206403981514
- rid: 5650211206403981515
- rid: 260124805198250106
- rid: 260124805198250107
- rid: 260125053741695127
- rid: 260125053741695128
- rid: 5650211206403981518
- rid: 260124805198250108
- rid: 260125053741695129
- rid: 5650211206403981520
- rid: 260124805198250109
- rid: 260124805198250110
- rid: 260124805198250111
- rid: 260124805198250112
- rid: 260124805198250113
- rid: 260124805198250114
- rid: 260124805198250115
- rid: 260125053741695130
- rid: 260125053741695131
- rid: 260125053741695132
- rid: 260125053741695133
- rid: 260125053741695134
- rid: 260125053741695135
- rid: 260125053741695136
- rid: 5650211206403981528
- rid: 5650211206403981529
- rid: 5650211206403981530
......@@ -96,7 +96,7 @@ MonoBehaviour:
type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2}
- rid: 260124805198250105
- rid: 260125053741695126
type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 0
......@@ -111,14 +111,14 @@ MonoBehaviour:
m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2}
- rid: 260124805198250106
- rid: 260125053741695127
type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 0
m_StripUnusedPostProcessingVariants: 0
m_StripUnusedVariants: 1
m_StripScreenCoordOverrideVariants: 1
- rid: 260124805198250107
- rid: 260125053741695128
type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
......@@ -126,7 +126,7 @@ MonoBehaviour:
m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2}
m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2}
m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2}
- rid: 260124805198250108
- rid: 260125053741695129
type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
......@@ -138,7 +138,7 @@ MonoBehaviour:
m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3}
m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3}
m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3}
- rid: 260124805198250109
- rid: 260125053741695130
type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime}
data:
m_Version: 0
......@@ -151,13 +151,13 @@ MonoBehaviour:
m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3}
m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3}
m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3}
- rid: 260124805198250110
- rid: 260125053741695131
type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3}
m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3}
m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3}
- rid: 260124805198250111
- rid: 260125053741695132
type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
......@@ -170,12 +170,12 @@ MonoBehaviour:
skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3}
renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
- rid: 260124805198250112
- rid: 260125053741695133
type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
m_ProbeVolumeDisableStreamingAssets: 0
- rid: 260124805198250113
- rid: 260125053741695134
type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
......@@ -185,14 +185,14 @@ MonoBehaviour:
probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3}
probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3}
numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3}
- rid: 260124805198250114
- rid: 260125053741695135
type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_version: 0
m_IncludeReferencedInScenes: 0
m_IncludeAssetsByLabel: 0
m_LabelToInclude:
- rid: 260124805198250115
- rid: 260125053741695136
type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
......
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